diff options
4 files changed, 97 insertions, 3 deletions
diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog index 7a6781cd99eb..2b429fcee8f1 100644 --- a/sys-apps/gnome-disk-utility/ChangeLog +++ b/sys-apps/gnome-disk-utility/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/gnome-disk-utility # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.84 2013/07/27 13:45:16 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.85 2013/08/10 10:28:50 eva Exp $ + + 10 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> + gnome-disk-utility-3.8.2.ebuild, + +files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch, + +files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch: + Fix pseudo-automagic dependency on gnome-settings-daemon, bug #478820. 478820 27 Jul 2013; Gilles Dartiguelongue <eva@gentoo.org> gnome-disk-utility-3.8.2.ebuild: diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch new file mode 100644 index 000000000000..0ab654b114fb --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch @@ -0,0 +1,45 @@ +From 57936f7012688af08328a5f5ffc9cd5e4b5c041f Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson <andreas@fatal.se> +Date: Fri, 5 Apr 2013 12:42:06 +0200 +Subject: [PATCH] Avoid needing gsd during build when --disable-gsd-plugin is + used + +PKG_CHECK_MODULES was previously unconditionally requiring +gnome-settings-daemon to be available, even when it was later +not going to be used because the --disable-gsd-plugin configure +switch was passed. + +Move the check to only require g-s-d when it's actually going to be +used. + +While at it, also fix the indentation of the msg_gsd_plugin=yes line. + +https://bugzilla.gnome.org/show_bug.cgi?id=697146 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9cf1011..054d9d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -98,7 +98,6 @@ PKG_CHECK_MODULES(LIBSECRET1, [libsecret-1 >= $LIBSECRET1_REQUIRED]) + PKG_CHECK_MODULES(PWQUALITY, [pwquality >= $PWQUALITY_REQUIRED]) + PKG_CHECK_MODULES(CANBERRA, [libcanberra-gtk3 >= $CANBERRA_REQUIRED]) + PKG_CHECK_MODULES(LIBDVDREAD, [dvdread >= $LIBDVDREAD_REQUIRED]) +-PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= GSD_PLUGIN_REQUIRED]) + PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= LIBNOTIFY_REQUIRED]) + + gsd_plugindir='${libdir}/gnome-settings-daemon-3.0' +@@ -134,7 +133,8 @@ dnl ************************************* + AC_ARG_ENABLE(gsd_plugin, AS_HELP_STRING([--disable-gsd-plugin],[don't build gnome-settings-daemon plug-in])) + msg_gsd_plugin=no + if test "x$enable_gsd_plugin" != "xno"; then +- msg_gsd_plugin=yes ++ msg_gsd_plugin=yes ++ PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= GSD_PLUGIN_REQUIRED]) + fi + AM_CONDITIONAL(USE_GSD_PLUGIN, [test "$msg_gsd_plugin" = "yes"]) + +-- +1.7.10.4
\ No newline at end of file diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch new file mode 100644 index 000000000000..b9f20c733009 --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch @@ -0,0 +1,34 @@ +From a0ed8e8e80dcba96e5c35888c01f3f9b39aef02f Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson <andreas@fatal.se> +Date: Fri, 5 Apr 2013 12:30:55 +0200 +Subject: [PATCH] Bump required version of gnome-settings-daemon to 3.8 + +Reported by Pacho Ramos in https://bugzilla.gnome.org/697146 +and from the references gentoo bug report: + +With gnome-base/gnome-settings-daemon-3.6.4: + +gdusdmanager.c: At top level: +gdusdmanager.c:42:1: error: unknown type name 'GduSdClass' +gdusdmanager.c:80:1: warning: 'gdu_sd_manager_start' defined but not used [-Wunused-function] +gdusdmanager.c:124:1: warning: 'gdu_sd_manager_new' defined but not used [-Wunused-function] +make[3]: *** [libgdu_sd_la-gdusdmanager.lo] Error 1 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b40d58f..9cf1011 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,7 +88,7 @@ LIBSECRET1_REQUIRED=0.7 + PWQUALITY_REQUIRED=1.0.0 + CANBERRA_REQUIRED=0.1 + LIBDVDREAD_REQUIRED=4.2.0 +-GSD_PLUGIN_REQUIRED=3.6 ++GSD_PLUGIN_REQUIRED=3.8 + LIBNOTIFY_REQUIRED=0.7 + + PKG_CHECK_MODULES(GLIB2, [gmodule-2.0 gio-unix-2.0 >= $GLIB2_REQUIRED]) +-- +1.7.10.4
\ No newline at end of file diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.8.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.8.2.ebuild index ab3a1b0c2169..a4c0dfffb81f 100644 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.8.2.ebuild +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.8.2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2013 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-3.8.2.ebuild,v 1.4 2013/07/27 13:45:16 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.8.2.ebuild,v 1.5 2013/08/10 10:28:50 eva Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit gnome2 +inherit autotools eutils gnome2 DESCRIPTION="Disk Utility for GNOME using udisks" HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility" @@ -38,6 +38,15 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " +src_prepare() { + # Fix USE=-gnome, bug #478820 + epatch "${FILESDIR}"/${PN}-3.8.2-kill-gsd-automagic.patch + epatch "${FILESDIR}"/${PN}-3.8.2-raise-gsd-dependency.patch + + eautoreconf + gnome2_src_prepare +} + src_configure() { gnome2_src_configure \ $(use_enable gnome gsd-plugin) \ |