diff options
author | 2011-04-03 11:37:27 +0000 | |
---|---|---|
committer | 2011-04-03 11:37:27 +0000 | |
commit | 4b5748377ed34d28035d4b7ee3a2249fab144905 (patch) | |
tree | 99eaa161f36b2bcde09f22678a60f4e5e840a496 /sys-apps/gnome-disk-utility | |
parent | Remove old-style virtual/gzip, bug 358829. (diff) | |
download | historical-4b5748377ed34d28035d4b7ee3a2249fab144905.tar.gz historical-4b5748377ed34d28035d4b7ee3a2249fab144905.tar.bz2 historical-4b5748377ed34d28035d4b7ee3a2249fab144905.zip |
Revision bump to fix optional avahi patch (bug #361183 by Fab) and apply Mandriva patch (also used in Arch) to prevent major problems like freezes and crashes on systems without UTF8 locale (upstream bug #616198). Remove old.
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/gnome-disk-utility')
6 files changed, 221 insertions, 16 deletions
diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog index 3bec56715073..88e415ba8ae6 100644 --- a/sys-apps/gnome-disk-utility/ChangeLog +++ b/sys-apps/gnome-disk-utility/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-apps/gnome-disk-utility # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.42 2011/03/29 16:13:26 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.43 2011/04/03 11:37:27 pacho Exp $ + +*gnome-disk-utility-2.32.1-r1 (03 Apr 2011) + + 03 Apr 2011; Pacho Ramos <pacho@gentoo.org> + -files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch, + +gnome-disk-utility-2.32.1-r1.ebuild, + +files/gnome-disk-utility-2.32.1-non-utf8-crash.patch, + +files/gnome-disk-utility-2.32.1-optional-avahi.patch: + Revision bump to fix optional avahi patch (bug #361183 by Fab) and apply + Mandriva patch (also used in Arch) to prevent major problems like freezes and + crashes on systems without UTF8 locale (upstream bug #616198). Remove old. 29 Mar 2011; Christoph Mende <angelos@gentoo.org> gnome-disk-utility-2.32.1.ebuild: diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index 7be49ea9df77..bed193152dad 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,20 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 -AUX gnome-disk-utility-2.28.1-fix-potfiles_skip.patch 316 RMD160 fabe483052e34e6ed89b5a5cc6cee04bda321efb SHA1 2289c9826fb04b657f622878e14d6d3dcde0a165 SHA256 1afc5c0228a725a079fd86f65ffa687f48678c65b72e97468e6d4082428baebc AUX gnome-disk-utility-2.30.1-optional-avahi.patch 3265 RMD160 f6e29b0421b5b7feb0fab96d8e0c4cc13785858b SHA1 9bcf767d9da569a9469e364b19776ca80ad4843f SHA256 84fa2f6ed58003b881a8169c2f253ea453afdc7f28beca583a76af8a27fd828d +AUX gnome-disk-utility-2.32.1-non-utf8-crash.patch 1044 RMD160 d24bd35f6f3b02c9939e5a48b17ee58657272cf5 SHA1 a4cec1a87279c11d9f79e8b9ffcbec1a1b0f3acb SHA256 818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526 +AUX gnome-disk-utility-2.32.1-optional-avahi.patch 3271 RMD160 6e401303d5bfefa01f843992898dd3c1e4bf4187 SHA1 2672f51196101503688ca73be17bbddae0ee897a SHA256 30965971604b96489857eb7d2703ab0e7ca053ded5cd50fd5fed9ceb34235df2 DIST gnome-disk-utility-2.30.1.tar.bz2 2004770 RMD160 cfdfc38dd5856ddbf6111c6a861b0e434cbc2180 SHA1 a035a52b7fdc50dc557192b6b6fd2884f35e3a61 SHA256 df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7 DIST gnome-disk-utility-2.32.0.tar.bz2 2209712 RMD160 7bc7afb2d8d235085f8a1adfd6f2ff4ade626417 SHA1 f3721db8957596e9772974c1c9da68ae268ad514 SHA256 03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98 DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 RMD160 d3572b44890e2aa89f2268ba684ba80732dd0ea1 SHA1 afd03dc2c59629d4789045e0b967bd17b71f70f2 SHA256 fb3f6c8962eca9706fd96e1f0b431c1284536298bc927e8413e763054c618e99 EBUILD gnome-disk-utility-2.30.1.ebuild 1838 RMD160 61d5374867427dfa27165e92a18fe7d3c9a973b5 SHA1 96ffbe2510a571d7061ce23e30dadd071ab7d88d SHA256 00093d6eac6a763b24b13684e7df02f90ea5e6d9fe451fef84e2e94886634822 EBUILD gnome-disk-utility-2.32.0-r1.ebuild 1948 RMD160 2c0d35b5d7d948208c8db5f343e6f7fba313244f SHA1 0c901bd1920fc5f3d0b086709e5d37a7f55cb7ad SHA256 120c973bb8a79575307bc87084ee9bc9db748747f2153aa68afd051feb76a2de +EBUILD gnome-disk-utility-2.32.1-r1.ebuild 2048 RMD160 d0994bb1860193b3b1872c8d023ea42f77becd86 SHA1 d4b52a31aa66f483510d039d88c8466613cd8a51 SHA256 68fb54c6ec02f15c20857c8b956ed3f735bce90406214124833b7f6262575c61 EBUILD gnome-disk-utility-2.32.1.ebuild 1898 RMD160 48487a47c790d8a4c1537f440420078c16671c2c SHA1 df9e223c53c59e6dcbdd660d1f95c2c8e4e7c916 SHA256 04d058d2a9bcce600950a3e2b04ce0eaee99cc890b124abb3f727d6e34308cc8 -MISC ChangeLog 6839 RMD160 ee499148b6aed774f109d7a078f21eec50ef7349 SHA1 2050ef68967d0fe6221b65f94ead3c84246f23b5 SHA256 69e12de12c20ea60e23a6b103219b9ca16f7dd2c1ff418916735e1e6dc74fb74 +MISC ChangeLog 7375 RMD160 d79625960e1bc09153b469ac39b584dfb2850201 SHA1 796247d26347a4fc5a2ee05cdedd8f52ba4f1db0 SHA256 1469b1f1741f8cdcbe3583db9be34e8f754dacc191363554f727cfcc950f6526 MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk2SBSsACgkQmWq1bYTyC0MB1wD6AvjKeeIf0C8wasz3DukRcEjN -HcuzRolxMlZ6SBB/0sgA/3FuHGlE/H31WaZ2TEdEVPzit0OUfmb1RNm/v7+HTnng -=xw8m +iEYEARECAAYFAk2YW/wACgkQCaWpQKGI+9QHJQCeOrlgqkguK26lhn9RRIUWH9eP +Hx0AnivARQ2Gyy44IYNNDF/P4lCGA1lw +=qI19 -----END PGP SIGNATURE----- diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch deleted file mode 100644 index 645933c2fd6e..000000000000 --- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch +++ /dev/null @@ -1,9 +0,0 @@ -Gentoo bug 313351 -GNOME #616019 ---- po/POTFILES.skip~ 2009-09-11 17:48:29.000000000 +0200 -+++ po/POTFILES.skip 2010-04-19 19:54:00.000000000 +0200 -@@ -1,4 +1,3 @@ --[encoding: UTF-8] - # List of files where to skip translations. - # Please keep this file sorted alphabetically. - data/gdu-notification-daemon.desktop.in diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch new file mode 100644 index 000000000000..262748bfb607 --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch @@ -0,0 +1,32 @@ +From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001 +From: Pascal Terjan <pterjan@mandriva.com> +Date: Mon, 3 May 2010 14:01:22 +0200 +Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198) + +GduPresentable created in gdu pool include intheir id some strings +in local encoding like _("Peripheral Devices"). This patch +enforces them to be UTF-8. + +This fixes a crash of gvfs-gdu-volume-monitor when USB devices are +available on a non UTF-8 system. +--- + src/gdu/gdu-pool.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c +index bd5eccf..cf6be53 100644 +--- a/src/gdu/gdu-pool.c ++++ b/src/gdu/gdu-pool.c +@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass) + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GDU_TYPE_PRESENTABLE); ++#ifdef HAVE_BIND_TEXTDOMAIN_CODESET ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++#endif + } + + static void +-- +1.7.1 + diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch new file mode 100644 index 000000000000..9caaf18042b9 --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch @@ -0,0 +1,92 @@ +From 674d9284bd09a9378f99ff19b2d2ffb8032ce8ea Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek.chauhan@gmail.com> +Date: Tue, 16 Mar 2010 10:58:55 +0530 +Subject: [PATCH] Make avahi support build-time configureable + +--- + configure.ac | 21 ++++++++++++++++++++- + src/gdu-gtk/gdu-connect-to-server-dialog.c | 7 +++++++ + 2 files changed, 27 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 01be5f0..95f2087 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -150,7 +150,26 @@ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) + PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) + PKG_CHECK_MODULES(X11, [x11]) + PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) +-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED]) ++ ++# ************* ++# Avahi ++# ************* ++ ++have_avahi_ui=no ++AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi-ui], [disable use of Avahi for server searching])) ++ ++if test "x$enable_avahi_ui" != "xno"; then ++ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui >= $AVAHI_UI_REQUIRED, ++ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui is available]) ++ have_avahi_ui=yes], have_avahi_ui=no) ++ if test "x$have_avahi_ui" = xno -a "x$enable_avahi_ui" = xyes; then ++ AC_MSG_ERROR([avahi-ui support requested but libraries not found]) ++ fi ++fi ++ ++AC_SUBST(AVAHI_UI_LIBS) ++AC_SUBST(AVAHI_UI_CFLAGS) ++AM_CONDITIONAL(ENABLE_AVAHI_UI, [test "$have_avahi_ui" = "yes"]) + + # ************* + # Remote Access +diff --git a/src/gdu-gtk/gdu-connect-to-server-dialog.c b/src/gdu-gtk/gdu-connect-to-server-dialog.c +index 9ecf08c..5ad47bb 100644 +--- a/src/gdu-gtk/gdu-connect-to-server-dialog.c ++++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c +@@ -24,7 +24,10 @@ + + #include "config.h" + #include <glib/gi18n-lib.h> ++ ++#ifdef HAVE_AVAHI_UI + #include <avahi-ui/avahi-ui.h> ++#endif + + #include "gdu-connect-to-server-dialog.h" + +@@ -143,6 +146,7 @@ gdu_connect_to_server_dialog_get_address (GduConnectToServerDialog *dialog) + + /* ---------------------------------------------------------------------------------------------------- */ + ++#ifdef HAVE_AVAHI_UI + static void + on_dns_sd_clicked (GtkButton *button, + gpointer user_data) +@@ -171,6 +175,7 @@ on_dns_sd_clicked (GtkButton *button, + + gtk_widget_destroy (service_dialog); + } ++#endif + + /* ---------------------------------------------------------------------------------------------------- */ + +@@ -218,6 +223,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object) + GTK_STOCK_CONNECT, + GTK_RESPONSE_OK); + ++#ifdef HAVE_AVAHI_UI + button = gtk_button_new_with_mnemonic (_("_Browse...")); + image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), image); +@@ -235,6 +241,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object) + "clicked", + G_CALLBACK (on_dns_sd_clicked), + dialog); ++#endif + + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + +-- +1.6.4.4 + diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild new file mode 100644 index 000000000000..cf0c6d9fec12 --- /dev/null +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild,v 1.1 2011/04/03 11:37:27 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="no" + +inherit autotools eutils gnome2 + +DESCRIPTION="Disk Utility for GNOME using devicekit-disks" +HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="avahi doc fat gnome-keyring nautilus remote-access" + +CDEPEND=" + >=dev-libs/glib-2.22:2 + >=dev-libs/dbus-glib-0.74 + >=dev-libs/libunique-1:1 + >=x11-libs/gtk+-2.20:2 + =sys-fs/udisks-1.0*[remote-access?] + >=dev-libs/libatasmart-0.14 + >=x11-libs/libnotify-0.6.1 + avahi? ( >=net-dns/avahi-0.6.25[gtk] ) + gnome-keyring? ( || ( + gnome-base/libgnome-keyring + <gnome-base/gnome-keyring-2.29.4 ) ) + nautilus? ( >=gnome-base/nautilus-2.24 ) +" +RDEPEND="${CDEPEND} + x11-misc/xdg-utils + fat? ( sys-fs/dosfstools ) + !!sys-apps/udisks" +DEPEND="${CDEPEND} + sys-devel/gettext + gnome-base/gnome-common + app-text/docbook-xml-dtd:4.1.2 + app-text/scrollkeeper + app-text/gnome-doc-utils + + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35 + >=dev-util/gtk-doc-am-1.13 + + doc? ( >=dev-util/gtk-doc-1.3 )" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + $(use_enable avahi avahi-ui) + $(use_enable nautilus) + $(use_enable remote-access) + $(use_enable gnome-keyring)" + DOCS="AUTHORS NEWS README TODO" +} + +src_prepare() { + sed -i \ + -e '/printf/s:nautilus:xdg-open:' \ + src/palimpsest/gdu-section-volumes.c || die #350919 + + # Keep avahi optional, upstream bug #631986 + epatch "${FILESDIR}/${PN}-2.32.1-optional-avahi.patch" + + # Force GduPresentable ids to be UTF-8 to solve crashes and freezes, upstream bug #616198 + epatch "${FILESDIR}/${PN}-2.32.1-non-utf8-crash.patch" + + intltoolize --force --copy --automake || die + eautoreconf +} + +src_install() { + gnome2_src_install + find "${ED}" -name "*.la" -delete || die "remove of la files failed" +} |