[Pkg-xfce-commits] r4367 - in desktop/branches/experimental/thunar/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-03 21:16:15 +0000 (Wed, 03 Nov 2010)
New Revision: 4367

Removed:
   desktop/branches/experimental/thunar/debian/patches/04_fix-link-twp.patch
Modified:
   desktop/branches/experimental/thunar/debian/changelog
   desktop/branches/experimental/thunar/debian/patches/series
Log:
ditto for 04_fix-link-twp.patch


Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog	2010-11-03 21:14:57 UTC (rev 4366)
+++ desktop/branches/experimental/thunar/debian/changelog	2010-11-03 21:16:15 UTC (rev 4367)
@@ -27,7 +27,6 @@
     - 06_fix-sidepane-width.patch: dropped, included upstream.
     - 07_update-cursor-on-delete.patch: dropped.
     - 08_refilter-tree-hidden-dir.patch: dropped.
-    - debian/patches/04_fix-link-twp added fix flags for wallpaper plugin.
   * debian/control:
     - bump build-dep on exo (0.5.1).
     - add build-dep on libxfce4ui (4.7.1).

Deleted: desktop/branches/experimental/thunar/debian/patches/04_fix-link-twp.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/04_fix-link-twp.patch	2010-11-03 21:14:57 UTC (rev 4366)
+++ desktop/branches/experimental/thunar/debian/patches/04_fix-link-twp.patch	2010-11-03 21:16:15 UTC (rev 4367)
@@ -1,44 +0,0 @@
-commit bb2b528df1fc548fcde6f62b0d4ed65754a87b2a
-Author: Jannis Pohlmann <jannis at xfce.org>
-Date:   Tue Oct 19 18:59:32 2010 +0200
-
-    Fix broken compilation with -Wl,-z,defs -Wl,--as-needed.
-
-diff --git a/configure.in b/configure.in
-index 8b1f2aa..b41c6ce 100644
---- a/configure.in
-+++ b/configure.in
-@@ -139,6 +139,11 @@ dnl *** Check for i18n support ***
- dnl ******************************
- XDT_I18N([ar ast be bn ca cs da de dz el en_GB eo es et eu fi fr gl he hr hu id it ja ka kk ko ku lt lv mk nb nl nn pa pl pt_BR pt ro ru si sk sq sv tr ug uk ur_PK ur vi zh_CN zh_TW ])
- 
-+dnl *********************
-+dnl *** Check for X11 ***
-+dnl *********************
-+XDT_CHECK_LIBX11_REQUIRE()
-+
- dnl ***********************************
- dnl *** Check for required packages ***
- dnl ***********************************
-diff --git a/plugins/thunar-wallpaper/Makefile.am b/plugins/thunar-wallpaper/Makefile.am
-index d476325..9455670 100644
---- a/plugins/thunar-wallpaper/Makefile.am
-+++ b/plugins/thunar-wallpaper/Makefile.am
-@@ -19,6 +19,7 @@ thunar_wallpaper_plugin_la_CFLAGS =					\
- 	$(EXO_CFLAGS)							\
- 	$(GLIB_CFLAGS)							\
- 	$(GTK_CFLAGS)							\
-+	$(LIBX11_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
- 
- thunar_wallpaper_plugin_la_LDFLAGS =					\
-@@ -32,7 +33,8 @@ thunar_wallpaper_plugin_la_LIBADD =					\
- 	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
- 	$(EXO_LIBS)							\
- 	$(GLIB_LIBS)							\
--	$(GTK_LIBS)
-+	$(GTK_LIBS)							\
-+	$(LIBX11_LIBS)
- 	
- thunar_wallpaper_plugin_la_DEPENDENCIES =				\
- 	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la

Modified: desktop/branches/experimental/thunar/debian/patches/series
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/series	2010-11-03 21:14:57 UTC (rev 4366)
+++ desktop/branches/experimental/thunar/debian/patches/series	2010-11-03 21:16:15 UTC (rev 4367)
@@ -1,2 +1 @@
 02_thunar-icon-naming-spec-compliance.patch
-04_fix-link-twp.patch