Fix translation issues noticed with at least xdg-user-dirs wrt #360853 as reported...

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 544ec8533cb85ea96476ab40dfd1e2ee75f47ea1..e3b82228304a1e299c7c243f27c3264f57921a47 100644 (file)
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.123 2011/06/07 09:14:20 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.124 2011/08/09 11:02:29 ssuominen Exp $
+
+*thunar-1.2.2-r1 (09 Aug 2011)
+
+  09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +thunar-1.2.2-r1.ebuild,
+  +files/thunar-1.2.2-locale.patch:
+  Fix translation issues noticed with at least xdg-user-dirs wrt #360853 as
+  reported by Martin Jürgens. Patch is from upstream #4746 by Mark Trompell.
 
   07 Jun 2011; Christoph Mende <angelos@gentoo.org> thunar-1.2.1.ebuild,
   thunar-1.2.2.ebuild:

diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index d43492fc024e7b94594b5849ee418c949c52ae76..3f6803ba215cacf974331ad224749a65c16ea4fd 100644 (file)
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX thunar-1.2.2-locale.patch 1545 RMD160 6603ff42aa9082790f926d9ba37631068f061a8c SHA1 0616860d7ae8502ca6d579373cbef09b63ac64af SHA256 ac461632f734489311d8101bc5d73066f7a4e4839c405d1275dc0686242cf32e
 DIST Thunar-1.2.1.tar.bz2 4181843 RMD160 ae2892e730a42f866ef2d171762c2cb8a3f8586f SHA1 3517faff327b11871d7ef89aae2a8b9974d6edd7 SHA256 67e9886895771cf3b51af1ac5e13cb9e3892d2546a1a814869f83be06409a49b
 DIST Thunar-1.2.2.tar.bz2 4158257 RMD160 b921b574711a4164cf1b1c73dbef7cd019e1d719 SHA1 314e3d53ec7be1ea578da4d842ecc8dc5958b1bd SHA256 56b07dddde423ae7854c5edd433948a912c27afe2a60689ffc50df3d981e90f6
 EBUILD thunar-1.2.1.ebuild 2071 RMD160 3235f476f77d5a810a11ff213cf98524941ed6e8 SHA1 77f5d67f89caabc9007c92686039875420cbe32a SHA256 8a7ea65f66cfbb7f71cc88625b491dbb4f497646f6a75a82f8eaf13e37651521
+EBUILD thunar-1.2.2-r1.ebuild 2129 RMD160 caeca88ed787c781567f0f9f334ede863b26e014 SHA1 4f01986bdf77c8bbc2c56ea8c5aecc7688a33578 SHA256 db7fd7958dbbf947a96ab991e7291a9a4aa203eee0687bab594dfa2b8049ea7c
 EBUILD thunar-1.2.2.ebuild 2078 RMD160 b2589b8eabfa3b46d1ab5ecf2aba35cd34d8cccd SHA1 29ef66e34aa60e0c28fed1199a9e7f255aba76c1 SHA256 b2dd5872f664cf1483b34298349e01b0eb431191de46ac2072528551604232ff
-MISC ChangeLog 15861 RMD160 800e50e3f1ab7866e75d3a3a611088c5251b5fd6 SHA1 d2a41d3cb7bc8ba9c6ae60cbedbb005c040449c3 SHA256 a4e245f1f8704527615dcce81f12d814c641571dca2e8d2eec0ed59be5d351a7
+MISC ChangeLog 16165 RMD160 ca90546f7abbc8aabd0a2dad7efee5ae7dfe7ef5 SHA1 d1f49e0584422496050474837f7abb1bf9ef7685 SHA256 f02dcb4d52679b2cc80d60e61871091acef5fb580cc83030488cec2a5c944b25
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3t6/IACgkQmWq1bYTyC0OtbQD+MLKGnXZFV9ddzYqNCKJZRO56
-necS9Kg2pJolFJhiDRoA/3j8npsTO3wBDSkOhp08jf681axhAPxyDQXQbModYJwX
-=xsGJ
+iF4EAREIAAYFAk5BE78ACgkQXkR9YqOcLPFPrwD/defqlprYanrJzixzQHjH4niq
+xdXHuQpYc1DF9BMtmMoA/j/4Q0zHO8sBg2NgzlbFt6a4JgDAZn8A3hEHfexwcvlZ
+=7LbA
 -----END PGP SIGNATURE-----

diff --git a/xfce-base/thunar/files/thunar-1.2.2-locale.patch b/xfce-base/thunar/files/thunar-1.2.2-locale.patch
new file mode 100644 (file)
index 0000000..1b2f810
--- /dev/null
+++ b/xfce-base/thunar/files/thunar-1.2.2-locale.patch
@@ -0,0 +1,45 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=4746#c4
+
+diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
+index 2aae575..2ed70d3 100644
+--- a/thunar/thunar-shortcuts-model.c
++++ b/thunar/thunar-shortcuts-model.c
+@@ -878,7 +878,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model)
+ #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */
+ 
+       /* save the old locale */
+-      old_locale = setlocale (LC_MESSAGES, NULL);
++      old_locale = g_strdup(setlocale (LC_MESSAGES, NULL));
+ 
+       /* set the new locale */
+       locale = _thunar_get_xdg_user_dirs_locale ();
+@@ -938,7 +938,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model)
+ 
+       /* restore the old locale */
+       setlocale (LC_MESSAGES, old_locale);
+-
++      g_free(old_locale);
+       gtk_tree_path_free (path);
+ 
+       /* we try to save the obtained new model */
+diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
+index d258d8f..a387e3a 100644
+--- a/thunar/thunar-window.c
++++ b/thunar/thunar-window.c
+@@ -618,7 +618,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window)
+ #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */
+ 
+   /* save the old locale */
+-  old_locale = setlocale (LC_MESSAGES, NULL);
++  old_locale = g_strdup(setlocale (LC_MESSAGES, NULL));
+ 
+   /* set the new locale */
+   locale = _thunar_get_xdg_user_dirs_locale ();
+@@ -656,6 +656,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window)
+   g_object_unref (home_dir);
+ 
+   setlocale (LC_MESSAGES, old_locale);
++  g_free (old_locale);
+ }
+ 
+ 

diff --git a/xfce-base/thunar/thunar-1.2.2-r1.ebuild b/xfce-base/thunar/thunar-1.2.2-r1.ebuild
new file mode 100644 (file)
index 0000000..b64c049
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.2.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.2-r1.ebuild,v 1.1 2011/08/09 11:02:30 ssuominen Exp $
+
+EAPI=4
+inherit virtualx xfconf
+
+MY_P=${P/t/T}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/thunar/ http://thunar.xfce.org/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/1.2/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.6.7"
+COMMON_DEPEND=">=xfce-base/exo-0.6
+       >=dev-libs/glib-2.18:2
+       >=x11-libs/gtk+-2.14:2
+       >=xfce-base/libxfce4util-4.8
+       >=xfce-base/libxfce4ui-4.8
+       >=dev-lang/perl-5.6
+       dbus? ( >=dev-libs/dbus-glib-0.88 )
+       exif? ( >=media-libs/libexif-0.6.19 )
+       libnotify? ( x11-libs/libnotify )
+       pcre? ( >=dev-libs/libpcre-6 )
+       startup-notification? ( x11-libs/startup-notification )
+       udev? ( || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
+       xfce_plugins_trash? ( >=dev-libs/dbus-glib-0.88
+               >=xfce-base/xfce4-panel-4.8 )"
+RDEPEND="${COMMON_DEPEND}
+       x11-misc/shared-mime-info
+       dev-util/desktop-file-utils
+       dbus? ( ${GVFS_DEPEND} )
+       udev? ( ${GVFS_DEPEND}[gdu,udev] )
+       xfce_plugins_trash? ( ${GVFS_DEPEND} )"
+DEPEND="${COMMON_DEPEND}
+       dev-util/intltool
+       dev-util/pkgconfig
+       sys-devel/gettext"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       PATCHES=( "${FILESDIR}"/${P}-locale.patch )
+
+       XFCONF=(
+               --docdir="${EPREFIX}"/usr/share/doc/${PF}
+               $(use_enable dbus)
+               $(use_enable startup-notification)
+               $(use_enable udev gudev)
+               $(use_enable libnotify notifications)
+               $(xfconf_use_debug)
+               $(use_enable exif)
+               $(use_enable pcre)
+               --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+               )
+
+       if use xfce_plugins_trash; then
+               XFCONF+=( --enable-dbus )
+       else
+               XFCONF+=( --disable-tpa-plugin )
+       fi
+
+       DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+}
+
+src_test() {
+       Xemake check
+}