[Pkg-xfce-commits] r4326 - in desktop/branches/experimental/thunar/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Oct 19 05:14:38 UTC 2010
Author: corsac
Date: 2010-10-19 17:14:32 +0000 (Tue, 19 Oct 2010)
New Revision: 4326
Added:
desktop/branches/experimental/thunar/debian/patches/01_fix-file-handling.patch
desktop/branches/experimental/thunar/debian/patches/03_fix-build-as-needed.patch
desktop/branches/experimental/thunar/debian/patches/04_fix-link-twp.patch
Modified:
desktop/branches/experimental/thunar/debian/changelog
desktop/branches/experimental/thunar/debian/control
desktop/branches/experimental/thunar/debian/patches/series
desktop/branches/experimental/thunar/debian/rules
Log:
- link with --as-needed, -z,defs and -O1.
- 01_fix-file-handling added, fix file handling so Thunar doesn't ask
about file association everytime a file is opened.
- 03_fix-build-as-needed added, fix build with -Wl,--as-needed.
+ add build-dep on xfce4-dev-tools and run it before configure
- debian/patches/04_fix-link-twp added fix flags for wallpaper plugin.
Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog 2010-10-17 21:05:34 UTC (rev 4325)
+++ desktop/branches/experimental/thunar/debian/changelog 2010-10-19 17:14:32 UTC (rev 4326)
@@ -14,6 +14,7 @@
- drop enable-final and disable-gnome-thumbnailers from configure flags.
- drop thunar trash applet (tpa) things for now.
- configure *FLAGS using dpkg-buildflags.
+ - link with --as-needed, -z,defs and -O1.
- change thunarx libname to 2 in chrpath call.
- rename lib dir from thunar to Thunar.
- ignore thunarx plugins in dh_makeshlibs.
@@ -25,6 +26,11 @@
- 06_fix-sidepane-width.patch: dropped, included upstream.
- 07_update-cursor-on-delete.patch: dropped.
- 08_refilter-tree-hidden-dir.patch: dropped.
+ - 01_fix-file-handling added, fix file handling so Thunar doesn't ask
+ about file association everytime a file is opened.
+ - 03_fix-build-as-needed added, fix build with -Wl,--as-needed.
+ + add build-dep on xfce4-dev-tools and run it before configure
+ - 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).
@@ -67,7 +73,7 @@
* debian/libthunarx-2-0.symbols: added.
* debian/libthunarx-2-0.shlib: dropped.
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 05 Sep 2010 19:02:08 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Oct 2010 18:46:31 +0200
thunar (1.0.2-1) unstable; urgency=low
Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control 2010-10-17 21:05:34 UTC (rev 4325)
+++ desktop/branches/experimental/thunar/debian/control 2010-10-19 17:14:32 UTC (rev 4326)
@@ -8,7 +8,7 @@
libfam-dev, libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
chrpath, libpcre3-dev, libjpeg-dev,
libstartup-notification0-dev (>= 0.4), intltool, libxfce4ui-1-dev (>= 4.7.1),
- libnotify-dev, libgudev-1.0-dev [linux-any]
+ libnotify-dev, libgudev-1.0-dev [linux-any], xfce4-dev-tools, libtool, gtk-doc-tools
Build-Conflicts: libgamin-dev [!hurd-i386]
Standards-Version: 3.9.1
Homepage: http://thunar.xfce.org
Added: desktop/branches/experimental/thunar/debian/patches/01_fix-file-handling.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/01_fix-file-handling.patch (rev 0)
+++ desktop/branches/experimental/thunar/debian/patches/01_fix-file-handling.patch 2010-10-19 17:14:32 UTC (rev 4326)
@@ -0,0 +1,66 @@
+commit 8fae46156ce617d3639486e10a3d91b878c75f17
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date: Tue Oct 19 15:53:11 2010 +0200
+
+ Change how Thunar picks the default handler for a file (bug #6167).
+
+ It appears that g_file_query_default_handler() prefers URI scheme
+ handlers over content type handlers. This is inappropriate if we want to
+ open a file for which we already know the content type (as is the case
+ with most local files).
+
+ Using g_file_query_default_handler() as the only way to pick the default
+ handler for a file somewhat collides with exo-gio-module, which sets the
+ default handler for a few URI schemes, such as http:// and file://.
+
+ This was problematic only when launching a file from outside (e.g. by
+ running "Thunar <file>" or by calling the D-Bus Launch() method. In
+ internal situations, Thunar used thunar_file_list_get_applications()
+ which prioritizes the content type.
+
+ We now use g_app_info_get_default_for_content_type() first and only fall
+ back to g_file_query_default_handler() if the content type is unknown or
+ we don't have a default handler for it.
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index b8b80fb..75b0a02 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -1,7 +1,7 @@
+ /* $Id$ */
+ /*-
+ * Copyright (c) 2005-2007 Benedikt Meurer <benny at xfce.org>
+- * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
++ * Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+@@ -1797,8 +1797,27 @@ thunar_file_get_size (const ThunarFile *file)
+ GAppInfo *
+ thunar_file_get_default_handler (const ThunarFile *file)
+ {
++ const gchar *content_type;
++ GAppInfo *app_info = NULL;
++ gboolean must_support_uris = FALSE;
++ gchar *path;
++
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+- return g_file_query_default_handler (THUNAR_FILE ((file))->gfile, NULL, NULL);
++
++ content_type = thunar_file_get_content_type (file);
++ if (content_type != NULL)
++ {
++ path = g_file_get_path (file->gfile);
++ must_support_uris = (path == NULL);
++ g_free (path);
++
++ app_info = g_app_info_get_default_for_type (content_type, must_support_uris);
++ }
++
++ if (app_info == NULL)
++ app_info = g_file_query_default_handler (file->gfile, NULL, NULL);
++
++ return app_info;
+ }
+
+
Added: desktop/branches/experimental/thunar/debian/patches/03_fix-build-as-needed.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/03_fix-build-as-needed.patch (rev 0)
+++ desktop/branches/experimental/thunar/debian/patches/03_fix-build-as-needed.patch 2010-10-19 17:14:32 UTC (rev 4326)
@@ -0,0 +1,132 @@
+commit 6cb1271328235d533d594c0b94bde075f74865a3
+Author: Jannis Pohlmann <jannis at xfce.org>
+Date: Mon Sep 6 00:02:39 2010 +0200
+
+ Fix build with -W1,--as-needed by linking against missing libraries.
+
+diff --git a/plugins/thunar-apr/Makefile.am b/plugins/thunar-apr/Makefile.am
+index 9ec59f9..2ed32de 100644
+--- a/plugins/thunar-apr/Makefile.am
++++ b/plugins/thunar-apr/Makefile.am
+@@ -29,6 +29,8 @@ thunar_apr_la_SOURCES = \
+ thunar_apr_la_CFLAGS = \
+ $(EXIF_CFLAGS) \
+ $(EXO_CFLAGS) \
++ $(GLIB_CFLAGS) \
++ $(GTK_CFLAGS) \
+ $(PLATFORM_CFLAGS)
+
+ thunar_apr_la_LDFLAGS = \
+@@ -39,7 +41,15 @@ thunar_apr_la_LDFLAGS = \
+ $(PLATFORM_LDFLAGS)
+
+ thunar_apr_la_LIBADD = \
+- $(EXIF_LIBS)
++ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
++ $(EXIF_LIBS) \
++ $(EXO_LIBS) \
++ $(GLIB_LIBS) \
++ $(GTK_LIBS)
++
++thunar_apr_la_DEPENDENCIES = \
++ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
++
+
+ EXTRA_DIST = \
+ README
+diff --git a/plugins/thunar-sbr/Makefile.am b/plugins/thunar-sbr/Makefile.am
+index 6231444..7d87564 100644
+--- a/plugins/thunar-sbr/Makefile.am
++++ b/plugins/thunar-sbr/Makefile.am
+@@ -34,6 +34,7 @@ thunar_sbr_la_SOURCES = \
+ thunar_sbr_la_CFLAGS = \
+ $(EXIF_CFLAGS) \
+ $(EXO_CFLAGS) \
++ $(GLIB_CFLAGS) \
+ $(PCRE_CFLAGS) \
+ $(PLATFORM_CFLAGS)
+
+@@ -45,8 +46,14 @@ thunar_sbr_la_LDFLAGS = \
+ $(PLATFORM_LDFLAGS)
+
+ thunar_sbr_la_LIBADD = \
+- $(PCRE_LIBS) \
+- $(EXIF_LIBS)
++ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
++ $(EXIF_LIBS) \
++ $(EXO_LIBS) \
++ $(GLIB_LIBS) \
++ $(PCRE_LIBS)
++
++thunar_sbr_la_DEPENDENCIES = \
++ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
+
+ EXTRA_DIST = \
+ README
+diff --git a/plugins/thunar-uca/Makefile.am b/plugins/thunar-uca/Makefile.am
+index 2e37016..8c66d76 100644
+--- a/plugins/thunar-uca/Makefile.am
++++ b/plugins/thunar-uca/Makefile.am
+@@ -36,11 +36,6 @@ thunar_uca_la_CFLAGS = \
+ $(LIBXFCE4UI_CFLAGS) \
+ $(PLATFORM_CFLAGS)
+
+-thunar_uca_la_LIBADD = \
+- $(EXO_LIBS) \
+- $(LIBXFCE4UTIL_LIBS) \
+- $(LIBXFCE4UI_LIBS)
+-
+ thunar_uca_la_LDFLAGS = \
+ -avoid-version \
+ -export-dynamic \
+@@ -48,6 +43,15 @@ thunar_uca_la_LDFLAGS = \
+ -module \
+ $(PLATFORM_LDFLAGS)
+
++thunar_uca_la_LIBADD = \
++ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
++ $(EXO_LIBS) \
++ $(LIBXFCE4UTIL_LIBS) \
++ $(LIBXFCE4UI_LIBS)
++
++thunar_uca_la_DEPENDENCIES = \
++ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
++
+ defaultsdir = $(sysconfdir)/xdg/Thunar
+ defaults_in_files = uca.xml.in
+ defaults_DATA = $(defaults_in_files:.xml.in=.xml)
+diff --git a/plugins/thunar-wallpaper/Makefile.am b/plugins/thunar-wallpaper/Makefile.am
+index 5846794..d476325 100644
+--- a/plugins/thunar-wallpaper/Makefile.am
++++ b/plugins/thunar-wallpaper/Makefile.am
+@@ -16,16 +16,25 @@ thunar_wallpaper_plugin_la_SOURCES = \
+ thunar-wallpaper-plugin.c
+
+ thunar_wallpaper_plugin_la_CFLAGS = \
+- $(PLATFORM_CFLAGS) \
+- $(THUNARX_CFLAGS) \
+- $(EXO_CFLAGS)
++ $(EXO_CFLAGS) \
++ $(GLIB_CFLAGS) \
++ $(GTK_CFLAGS) \
++ $(PLATFORM_CFLAGS)
+
+ thunar_wallpaper_plugin_la_LDFLAGS = \
+ -avoid-version \
+ -export-dynamic \
+ -export-symbols-regex "^thunar_extension_(shutdown|initialize|list_types)" \
+ -module \
+- $(PLATFORM_LDFLAGS) \
+- $(THUNARX_LDFLAGS)
++ $(PLATFORM_LDFLAGS)
++
++thunar_wallpaper_plugin_la_LIBADD = \
++ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
++ $(EXO_LIBS) \
++ $(GLIB_LIBS) \
++ $(GTK_LIBS)
++
++thunar_wallpaper_plugin_la_DEPENDENCIES = \
++ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
+
+ # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Added: desktop/branches/experimental/thunar/debian/patches/04_fix-link-twp.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/04_fix-link-twp.patch (rev 0)
+++ desktop/branches/experimental/thunar/debian/patches/04_fix-link-twp.patch 2010-10-19 17:14:32 UTC (rev 4326)
@@ -0,0 +1,44 @@
+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-10-17 21:05:34 UTC (rev 4325)
+++ desktop/branches/experimental/thunar/debian/patches/series 2010-10-19 17:14:32 UTC (rev 4326)
@@ -1 +1,4 @@
+01_fix-file-handling.patch
02_thunar-icon-naming-spec-compliance.patch
+03_fix-build-as-needed.patch
+04_fix-link-twp.patch
Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules 2010-10-17 21:05:34 UTC (rev 4325)
+++ desktop/branches/experimental/thunar/debian/rules 2010-10-19 17:14:32 UTC (rev 4326)
@@ -1,13 +1,14 @@
#!/usr/bin/make -f
-#LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
%:
dh $@
override_dh_auto_configure:
+ NOCONFIGURE=1 xdt-autogen
dh_auto_configure -- --enable-dbus --enable-startup-notification --enable-apr-plugin \
--enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin \
--docdir=\$${prefix}/share/doc/thunar-data
More information about the Pkg-xfce-commits
mailing list