* [gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/files/, sys-apps/gnome-disk-utility/
@ 2011-02-04 5:08 nirbheek
0 siblings, 0 replies; 4+ messages in thread
From: nirbheek @ 2011-02-04 5:08 UTC (permalink / raw
To: gentoo-commits
commit: 7bd1f66d909a917dd479b5bb5bf9eb0f6f49a644
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 4 04:21:17 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb 4 04:21:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7bd1f66d909a917dd479b5bb5bf9eb0f6f49a644
sys-apps/gnome-disk-utility: 2.32.1 -> 2.91.6
---
sys-apps/gnome-disk-utility/Manifest | 6 ++--
...gnome-disk-utility-2.91.6-optional-avahi.patch} | 25 +++----------------
...2.1.ebuild => gnome-disk-utility-2.91.6.ebuild} | 8 +++---
3 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 4f514ba..c2033a6 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,3 +1,3 @@
-AUX gnome-disk-utility-2.30.1-optional-avahi.patch 3265 RMD160 f6e29b0421b5b7feb0fab96d8e0c4cc13785858b SHA1 9bcf767d9da569a9469e364b19776ca80ad4843f SHA256 84fa2f6ed58003b881a8169c2f253ea453afdc7f28beca583a76af8a27fd828d
-DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 RMD160 d3572b44890e2aa89f2268ba684ba80732dd0ea1 SHA1 afd03dc2c59629d4789045e0b967bd17b71f70f2 SHA256 fb3f6c8962eca9706fd96e1f0b431c1284536298bc927e8413e763054c618e99
-EBUILD gnome-disk-utility-2.32.1.ebuild 1728 RMD160 4cdb93db9b104863a37e2c573ed32e345bbe332c SHA1 ab52a8174f5f012efa0813b810a97693d22bdb12 SHA256 66cf9f2235766665de09a5352e9d4b01459d95058ded75d5786a2b3f97e1c228
+AUX gnome-disk-utility-2.91.6-optional-avahi.patch 2659 RMD160 19e5f0bb34a4d96ad31c6d3cbecdb877f36e0825 SHA1 ac398930d4656dd353ce31d66538260067e8483d SHA256 70b00a61b0eec931b1a5f52cd6e03f71239114384336fa75a3f718f677f81263
+DIST gnome-disk-utility-2.91.6.tar.bz2 2230455 RMD160 dcd3f7e33c6c64457a18ac84fa8efab14b684ae0 SHA1 51cce8938e3d83e03e0a43aa9d3ac40bb3383732 SHA256 9ea50bea3b2dd5609658fd4e7cce17dbd96a47940275a484e7be743339eadea1
+EBUILD gnome-disk-utility-2.91.6.ebuild 1738 RMD160 0e62866e26ac8b824f59762f549d14f4d30933b5 SHA1 8c0580444552a34f27a648ff5894992e490cc32f SHA256 b7ed539ac05e1def4661d16eb172cce7f87739470a8010dacb219e2b1259dccf
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
similarity index 72%
rename from sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch
rename to sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
index 65c4726..ad58b0d 100644
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
@@ -1,22 +1,10 @@
-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])
+-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED])
+
+# *************
+# Avahi
@@ -26,11 +14,11 @@ index 01be5f0..95f2087 100644
+AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi], [disable use of Avahi for server searching]))
+
+if test "x$enable_avahi" != "xno"; then
-+ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui >= $AVAHI_UI_REQUIRED,
-+ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui is available])
++ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED,
++ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui-gtk3 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])
++ AC_MSG_ERROR([avahi-ui-gtk3 support requested but libraries not found])
+ fi
+fi
+
@@ -40,8 +28,6 @@ index 01be5f0..95f2087 100644
# *************
# 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 @@
@@ -87,6 +73,3 @@ index 9ecf08c..5ad47bb 100644
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.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild
similarity index 91%
rename from sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
rename to sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild
index 9d3504e..5e736c3 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.6.ebuild
@@ -18,15 +18,15 @@ 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
- >=x11-libs/gtk+-2.20:2
+ >=dev-libs/libunique-2.90.1:3
+ >=x11-libs/gtk+-2.90.7:3
=sys-fs/udisks-1.0*[remote-access?]
>=dev-libs/libatasmart-0.14
>=x11-libs/libnotify-0.6.1
>=gnome-base/nautilus-2.24
- avahi? ( >=net-dns/avahi-0.6.25[gtk] )
+ avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
gnome-keyring? ( || (
gnome-base/libgnome-keyring
<gnome-base/gnome-keyring-2.29.4 ) )
@@ -58,7 +58,7 @@ pkg_setup() {
src_prepare() {
# Keep avahi optional, upstream bug #631986
- epatch "${FILESDIR}/${PN}-2.30.1-optional-avahi.patch"
+ epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch"
intltoolize --force --copy --automake || die
eautoreconf
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/files/, sys-apps/gnome-disk-utility/
@ 2011-04-05 0:57 Nirbheek Chauhan
0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05 0:57 UTC (permalink / raw
To: gentoo-commits
commit: f4aa23aeeae737941dfdead1b69b1cc8d35fbd67
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 19:00:07 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 21:20:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f4aa23ae
sys-apps/gnome-disk-utility: 2.91.7 → 3.0.0
---
.../gnome-disk-utility-2.91.6-optional-avahi.patch | 4 ++--
...91.7.ebuild => gnome-disk-utility-3.0.0.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
index ad58b0d..b9080ea 100644
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
@@ -11,9 +11,9 @@
+# *************
+
+have_avahi_ui=no
-+AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi], [disable use of Avahi for server searching]))
++AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi-ui], [disable use of Avahi for server searching]))
+
-+if test "x$enable_avahi" != "xno"; then
++if test "x$enable_avahi_ui" != "xno"; then
+ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED,
+ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui-gtk3 is available])
+ have_avahi_ui=yes], have_avahi_ui=no)
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.7.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild
similarity index 98%
rename from sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.7.ebuild
rename to sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild
index 1c43488..a072a5b 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.91.7.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild
@@ -30,7 +30,7 @@ CDEPEND="
>=dev-libs/libatasmart-0.14
>=x11-libs/libnotify-0.6.1
- >=gnome-base/nautilus-2.24
+ >=gnome-base/nautilus-2.91.0
avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
gnome-keyring? ( || (
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/files/, sys-apps/gnome-disk-utility/
@ 2012-10-27 19:46 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-27 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 7a85838c287045ebdd8497e01e3afc0b48b179b7
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 19:46:36 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 19:46:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7a85838c
gnome-extra/gnome-disk-utility: 3.6.0 → 3.6.1
---
.../gnome-disk-utility-2.91.6-optional-avahi.patch | 75 --------------------
....6.0.ebuild => gnome-disk-utility-3.6.1.ebuild} | 0
2 files changed, 0 insertions(+), 75 deletions(-)
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
deleted file mode 100644
index b9080ea..0000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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-gtk3 >= $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-gtk3 >= $AVAHI_UI_REQUIRED,
-+ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui-gtk3 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-gtk3 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
---- 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));
-
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
similarity index 100%
rename from sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.0.ebuild
rename to sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/files/, sys-apps/gnome-disk-utility/
@ 2013-10-12 23:39 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2013-10-12 23:39 UTC (permalink / raw
To: gentoo-commits
commit: d4483cafc40f3dc9091a322df5c2297ae7269ece
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 23:38:45 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 23:39:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d4483caf
sys-apps/gnome-disk-utility: 3.8.2 → 3.10.0
---
...me-disk-utility-3.10.0-kill-gsd-automagic.patch | 46 ++++++++++++++++++
...-disk-utility-3.10.0-raise-gsd-dependency.patch | 35 ++++++++++++++
.../gnome-disk-utility-3.10.0.ebuild | 55 ++++++++++++++++++++++
.../gnome-disk-utility-9999.ebuild | 28 ++++++++---
4 files changed, 158 insertions(+), 6 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 0000000..c6d414c
--- /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 0000000..f5ff3ce
--- /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
+
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild
new file mode 100644
index 0000000..d042d73
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat +gnome systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.31:2
+ >=sys-fs/udisks-2.1.1:2
+ >=x11-libs/gtk+-3.5.8:3
+ app-arch/xz-utils
+ >=app-crypt/libsecret-0.7
+ dev-libs/libpwquality
+ systemd? ( >=sys-apps/systemd-44 )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=media-libs/libdvdread-4.2.0
+ >=media-libs/libcanberra-0.1[gtk3]
+ >=x11-libs/libnotify-0.7:=
+ >=x11-themes/gnome-icon-theme-symbolic-2.91
+ fat? ( sys-fs/dosfstools )
+ gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Fix USE=-gnome, bug #478820
+ epatch "${FILESDIR}"/${PN}-3.10.0-kill-gsd-automagic.patch
+ epatch "${FILESDIR}"/${PN}-3.10.0-raise-gsd-dependency.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable gnome gsd-plugin) \
+ $(use_enable systemd libsystemd-login)
+}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
index ef6bc72..b31c886 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,23 +16,29 @@ HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
LICENSE="GPL-2+"
SLOT="0"
-IUSE="fat"
+IUSE="fat +gnome systemd"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
fi
COMMON_DEPEND="
>=dev-libs/glib-2.31:2
- >=sys-fs/udisks-1.99.0:2
+ >=sys-fs/udisks-2.1.1:2
>=x11-libs/gtk+-3.5.8:3
+ app-arch/xz-utils
>=app-crypt/libsecret-0.7
dev-libs/libpwquality
+ systemd? ( >=sys-apps/systemd-44 )
"
RDEPEND="${COMMON_DEPEND}
+ >=media-libs/libdvdread-4.2.0
+ >=media-libs/libcanberra-0.1[gtk3]
+ >=x11-libs/libnotify-0.7:=
>=x11-themes/gnome-icon-theme-symbolic-2.91
fat? ( sys-fs/dosfstools )
+ gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.50
@@ -40,7 +46,17 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
+src_prepare() {
+ # Fix USE=-gnome, bug #478820
+ epatch "${FILESDIR}"/${PN}-3.10.0-kill-gsd-automagic.patch
+ epatch "${FILESDIR}"/${PN}-3.10.0-raise-gsd-dependency.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
src_configure() {
- G2CONF="${G2CONF} --disable-libsystemd-login"
- gnome2_src_configure
+ gnome2_src_configure \
+ $(use_enable gnome gsd-plugin) \
+ $(use_enable systemd libsystemd-login)
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-12 23:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-27 19:46 [gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/files/, sys-apps/gnome-disk-utility/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2013-10-12 23:39 Gilles Dartiguelongue
2011-04-05 0:57 Nirbheek Chauhan
2011-02-04 5:08 nirbheek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox