diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/gnome-disk-utility/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/gnome-disk-utility/files')
-rw-r--r-- | sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch | 46 | ||||
-rw-r--r-- | sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-raise-gsd-dependency.patch | 35 |
2 files changed, 81 insertions, 0 deletions
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch new file mode 100644 index 000000000000..c6d414c0ae97 --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch @@ -0,0 +1,46 @@ +From cfefd62c7f23625fd1b07dacb35681bdf5aafa04 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson <andreas@fatal.se> +Date: Fri, 5 Apr 2013 12:42:06 +0200 +Subject: [PATCH 1/2] 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 cce9d62..d8f6198 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -120,7 +120,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]) + PKG_CHECK_MODULES(LIBLZMA, [liblzma >= $LIBLZMA_REQUIRED]) + +@@ -157,7 +156,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.8.3.2 + diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-raise-gsd-dependency.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-raise-gsd-dependency.patch new file mode 100644 index 000000000000..f5ff3cec5359 --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-raise-gsd-dependency.patch @@ -0,0 +1,35 @@ +From f05af64dd29a5119f36d0c34f0d6aa9f04567933 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson <andreas@fatal.se> +Date: Fri, 5 Apr 2013 12:30:55 +0200 +Subject: [PATCH 2/2] 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 d8f6198..2604798 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -109,7 +109,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 + LIBLZMA_REQUIRED=5.0.5 + +-- +1.8.3.2 + |