From e5ed1894daac4561f674db2ec9ecb511ff3dda35 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 15 Aug 2011 12:26:09 +0000 Subject: [PATCH] Bump to 3.0.2, from gnome overlay for GNOME 3 Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64 --- gnome-base/nautilus/ChangeLog | 9 +- gnome-base/nautilus/Manifest | 23 +++-- ...fault-in-gtk_icon_info_load_symbolic.patch | 88 +++++++++++++++++++ gnome-base/nautilus/metadata.xml | 5 +- gnome-base/nautilus/nautilus-3.0.2.ebuild | 88 +++++++++++++++++++ sys-apps/gnome-disk-utility/ChangeLog | 9 +- sys-apps/gnome-disk-utility/Manifest | 21 ++++- ...e-disk-utility-2.91.6-optional-avahi.patch | 75 ++++++++++++++++ .../gnome-disk-utility-3.0.2.ebuild | 71 +++++++++++++++ 9 files changed, 376 insertions(+), 13 deletions(-) create mode 100644 gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch create mode 100644 gnome-base/nautilus/nautilus-3.0.2.ebuild create mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch create mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index ed8a36f15522..df0125b7a987 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/nautilus # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.380 2011/08/13 17:29:28 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.381 2011/08/15 12:26:09 nirbheek Exp $ + +*nautilus-3.0.2 (15 Aug 2011) + + 15 Aug 2011; Nirbheek Chauhan +nautilus-3.0.2.ebuild, + +files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch, + metadata.xml: + Bump to 3.0.2, from gnome overlay for GNOME 3 13 Aug 2011; Raúl Porcel nautilus-2.32.2.1-r1.ebuild: alpha/ia64/sh/sparc stable wrt #369909 diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index b32c1a16e7ba..8fc5a5d1f199 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,16 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch 3222 RMD160 34dc109adfebd83c7e47a41690c804fbf1944396 SHA1 11b096e78f594005058b0f59a27d7692349d098b SHA256 d053fb1094995c26c0fa6ac0c368ad14154984db3c73e5ce72607202ff4bb0a8 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 RMD160 44f6fd3f76dd96f265a9e47220930bf65055c4b6 SHA1 2d839f3f358828d9779a20f4792193b53c369c88 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 +DIST nautilus-3.0.2.tar.bz2 5636620 RMD160 f133abc4934e6fec0e2a2688ba5a212e923279a6 SHA1 f2a926132a8f6c21be1a0c931588b7fb526ea04a SHA256 6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22 EBUILD nautilus-2.32.2.1-r1.ebuild 2237 RMD160 f17abe2207cf76e49f1dc61ced3aaa4cc425b4ae SHA1 8fe3d032148add0f7be8f40c45b555f51ee0e0e3 SHA256 2077a46450a2fbe4cba3314a3e0b875aa9afa318ee135c93c33720d571a178fa EBUILD nautilus-2.32.2.1.ebuild 2077 RMD160 649e3c582283c58d51c4be76a9e11920e308d226 SHA1 65b8bb73a3a8103503fb045736eefb39a4b6d748 SHA256 b593e355936851547e90e65c0ed608ab6e1369d4bbd485a82cc6b8c06d45f354 -MISC ChangeLog 56303 RMD160 3287cdfd4baf6caffa10be87ee330fa63a878656 SHA1 6e3ed8dd8b7b1809d075c56e171a24f3fb576fbd SHA256 75fe256087c877a39ddd9262a77e7223d26e08a86ebed22757718d07b1b51842 -MISC metadata.xml 274 RMD160 4a3e5603446a099b3e704fccbc8ccbd78a2660a1 SHA1 4215e0c0bb615596928a5a5fd7ec06b588d2b4b3 SHA256 d0e640b1d069f6546748707f63dc6c709546026b09ab863b26c77c041185002e +EBUILD nautilus-3.0.2.ebuild 2449 RMD160 de6a85e7a6de5f97b7c40751ce74b4ec5058fe99 SHA1 f6a7d68cd11f572cdf9534564dcb463558529efa SHA256 033856cc77bf066ebc18a2cf10cfffdc593aa3770b55f84249fcbf21b9c1d7ec +MISC ChangeLog 56549 RMD160 366eb6a19d4d099a8589dd9fd17c42afb8313135 SHA1 f20a76f0af1118b1724d0cdb1bfa7d130d504526 SHA256 eb45cfe9ec87c836aaef330e2b6a4aa7a55bd4d1dc41363ed0f167e6de239383 +MISC metadata.xml 382 RMD160 1ebea648fbaed962049cb7f95f8c12dc530afc31 SHA1 f651d184f369b1aface2ab9a7d2ba13869ae0453 SHA256 c7243f8999b72a07e46dedc00e9e2568b30ab261971b9eb78a85595f4e2b07a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5GtH4ACgkQuQc30/atMkAyogCfTsGzGEygSnaExZwtvklWMDkB -PxoAn1yud8kZ2sjRXcOOE7cvCg7lyvCo -=DBkI +iQIcBAEBAgAGBQJOSRBtAAoJEO/kOhxWD91k+vUP/16VgKb//iGMXSoertqnREuy +yNh4TzwuWqzGL+bdV44Tvlj3eoWfjGTk+8tTHCrgPH0E5zSbaqAUPHbmF7LihHLn +0d1+4xWedXuKV4lvyzYAIDa2Zk5u+BQcaly1VtSBIHTE9vaQHbxIVSdBXQXLqgvr +A0MJ4pNN7DEiI1eIXVIvXtRpUs1jCmvmposRa/QBOTgBM8ek9QlwtODeK7TBVfeq +tN3eBqW7+EQyDwe1EFrpGGhfNnIDRrxc1MQq67DEqiWpJK51C4OmLODnGgUbGnJR +feHEo4TusJTfDhtn9Flkn64BhpOwXmcQzZATVAx/uaBKbvqoxqi498qwtR589S3y +cCzCVsQETf4+BtSg/NCAg+4yYIQOHpYMRukSSG6Og/1TmXDNGgmPSMaU4pTA9j+X +ArQgiiuFC6PlHdFl5A6Sc5tPA06o6v8uyuGix8F2BuIWxFs67YWa1Z8NdIVTnbZu +JA/aobTBh55kQZA0xFTAqd+hmk1JDSfMIit8iVOOedTBa/d3kE4Fe3lSz/KMvIAZ +MAnQxhfa1H/2BNXWcZlMhFIjby0uglphoWFC1gtyQsgVePUXqftyg7I86QE3LTPZ +HDBSDEoXroBRnUjyvYdBHIW+Ty1zcGi7v2WnlPkr3JqwRyS27aD61WfW6uoWyc5E +/xCOefQoaH4TY31WAb0A +=ikqz -----END PGP SIGNATURE----- diff --git a/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch b/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch new file mode 100644 index 000000000000..82781f7ed5e7 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch @@ -0,0 +1,88 @@ +From a37ecf869f4772b1ea3b578b687b5b83dd4bd067 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 27 May 2011 01:10:24 -0400 +Subject: [PATCH] Prevent segfault in gtk_icon_info_load_symbolic when icon is not found (gnome bug 651209) + +Users of Gentoo and Fedora have reported segfaults in nautilus-3.0.x +in gtk_icon_info_load_symbolic (see Gentoo bug 365779, Fedora bug +690357). One of them was helpful enough to post a backtrace with +debugging information: https://bugzilla.redhat.com/attachment.cgi?id=489928 + +The backtrace shows that the crash occurs because we are passing a +NULL icon_info to gtk_icon_info_load_symbolic in lookup_and_color_symbolic_find +in nautilus-search-bar.c; indeed, icon_info will be NULL if +gtk_icon_theme_lookup_icon fails to find an icon. + +An identical problem exists in get_eject_icon in nautilus-places-sidebar.c, +where gtk_icon_info_load_symbolic_for_context and +gtk_icon_theme_lookup_by_gicon are used. + +The solution is to check for the NULL icon_info, and return a +NULL GdkPixbuf. Note that returning a NULL from +lookup_and_color_symbolic_find and get_eject_icon is +safe: in both cases, the return value is only used in functions +that can safely deal with a NULL. +--- + src/nautilus-places-sidebar.c | 11 ++++++----- + src/nautilus-search-bar.c | 9 +++++---- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c +index aa08f14..de53cd1 100644 +--- a/src/nautilus-places-sidebar.c ++++ b/src/nautilus-places-sidebar.c +@@ -214,7 +214,7 @@ static GdkPixbuf * + get_eject_icon (NautilusPlacesSidebar *sidebar, + gboolean highlighted) + { +- GdkPixbuf *eject; ++ GdkPixbuf *eject = NULL; + GtkIconInfo *icon_info; + GIcon *icon; + int icon_size; +@@ -227,10 +227,11 @@ get_eject_icon (NautilusPlacesSidebar *sidebar, + icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, icon_size, 0); + + style = gtk_widget_get_style_context (GTK_WIDGET (sidebar)); +- eject = gtk_icon_info_load_symbolic_for_context (icon_info, +- style, +- NULL, +- NULL); ++ if (icon_info != NULL) ++ eject = gtk_icon_info_load_symbolic_for_context (icon_info, ++ style, ++ NULL, ++ NULL); + + if (highlighted) { + GdkPixbuf *high; +diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c +index 6148807..17412d9 100644 +--- a/src/nautilus-search-bar.c ++++ b/src/nautilus-search-bar.c +@@ -160,7 +160,7 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar) + { + GtkIconInfo *icon_info; + GdkRGBA color; +- GdkPixbuf *icon; ++ GdkPixbuf *icon = NULL; + GtkStyleContext *context; + + context = gtk_widget_get_style_context (GTK_WIDGET (bar)); +@@ -172,9 +172,10 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar) + "edit-find-symbolic", + nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU), + GTK_ICON_LOOKUP_GENERIC_FALLBACK); +- icon = gtk_icon_info_load_symbolic (icon_info, &color, +- NULL, NULL, NULL, +- NULL, NULL); ++ if (icon_info != NULL) ++ icon = gtk_icon_info_load_symbolic (icon_info, &color, ++ NULL, NULL, NULL, ++ NULL, NULL); + + gtk_style_context_restore (context); + +-- +1.7.5.rc3 + diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml index 492a4f76bce6..e13a63fed6b0 100644 --- a/gnome-base/nautilus/metadata.xml +++ b/gnome-base/nautilus/metadata.xml @@ -3,8 +3,9 @@ gnome - Use - dev-libs/gobject-introspection for + Use dev-libs/gobject-introspection for introspection + Enable the nautilus-sendto extension to send files to + various locations/devices diff --git a/gnome-base/nautilus/nautilus-3.0.2.ebuild b/gnome-base/nautilus/nautilus-3.0.2.ebuild new file mode 100644 index 000000000000..2fe3adfbfa5b --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.0.2.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.0.2.ebuild,v 1.1 2011/08/15 12:26:09 nirbheek Exp $ + +EAPI="3" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 virtualx + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="http://live.gnome.org/Nautilus" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" +IUSE="doc exif gnome +introspection sendto xmp" + +COMMON_DEPEND=">=dev-libs/glib-2.28.0:2 + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.0.8:3[introspection?] + >=dev-libs/libxml2-2.7.8:2 + >=gnome-base/gnome-desktop-3.0.0:3 + + gnome-base/gsettings-desktop-schemas + >=x11-libs/libnotify-0.7 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + + exif? ( >=media-libs/libexif-0.6.20 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) + xmp? ( >=media-libs/exempi-2.1.0 )" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.40.1 + sys-devel/gettext + x11-proto/xproto + doc? ( >=dev-util/gtk-doc-1.4 )" +RDEPEND="${COMMON_DEPEND} + sendto? ( !gnome-extra/nautilus-sendto )" +# For eautoreconf +# gnome-base/gnome-common +# dev-util/gtk-doc-am" +PDEPEND="gnome? ( + >=x11-themes/gnome-icon-theme-1.1.91 + x11-themes/gnome-icon-theme-symbolic ) + >=gnome-base/gvfs-0.1.2" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-maintainer-mode + --disable-update-mimedb + --disable-packagekit + $(use_enable exif libexif) + $(use_enable introspection) + $(use_enable sendto nst-extension) + $(use_enable xmp)" + DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" +} + +src_prepare() { + # Gentoo bug #365779 + https://bugzilla.gnome.org/show_bug.cgi?id=651209 + epatch "${FILESDIR}/${PN}-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch" + + gnome2_src_prepare + + # Remove crazy CFLAGS + sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ + || die "sed 1 failed" +} + +src_test() { + addpredict "/root/.gnome2_private" + unset SESSION_MANAGER + unset ORBIT_SOCKETDIR + unset DBUS_SESSION_BUS_ADDRESS + Xemake check || die "Test phase failed" +} + +pkg_postinst() { + gnome2_pkg_postinst + + elog "nautilus can use gstreamer to preview audio files. Just make sure" + elog "to have the necessary plugins available to play the media type you" + elog "want to preview" +} diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog index 4889f015fd7a..d823459053de 100644 --- a/sys-apps/gnome-disk-utility/ChangeLog +++ b/sys-apps/gnome-disk-utility/ChangeLog @@ -1,6 +1,13 @@ # 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.52 2011/08/13 18:23:18 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.53 2011/08/15 12:26:09 nirbheek Exp $ + +*gnome-disk-utility-3.0.2 (15 Aug 2011) + + 15 Aug 2011; Nirbheek Chauhan + +files/gnome-disk-utility-2.91.6-optional-avahi.patch, + +gnome-disk-utility-3.0.2.ebuild: + Bump to 3.0.2, from gnome overlay for GNOME 3 13 Aug 2011; Raúl Porcel gnome-disk-utility-2.32.1-r1.ebuild: diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index 6ab80c41eb6e..359cd4bfb295 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -4,15 +4,28 @@ Hash: SHA1 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 +AUX gnome-disk-utility-2.91.6-optional-avahi.patch 2665 RMD160 e6019f814f03ebacb7f4607dfd2e91f0a5bc3ced SHA1 131f04f14fa105712d555c617d699fc02fb18215 SHA256 2698b158a2552a9650d07634e478d6d15a26cd18c881f065cd14f81dadf5d867 DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 RMD160 d3572b44890e2aa89f2268ba684ba80732dd0ea1 SHA1 afd03dc2c59629d4789045e0b967bd17b71f70f2 SHA256 fb3f6c8962eca9706fd96e1f0b431c1284536298bc927e8413e763054c618e99 +DIST gnome-disk-utility-3.0.2.tar.xz 2002052 RMD160 7355f13be7c67f10f3fb337cccfe8bea7ec2e36d SHA1 61718232756657542c89a0b3355a4fdee78b7ffd SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5 EBUILD gnome-disk-utility-2.32.1-r1.ebuild 2043 RMD160 a92ba13b84fab2fe95a096f6006ddec376e4150c SHA1 d5b48e361893f9527f320a3b16e3379fd473700b SHA256 afe3043e4b657db9874f90d5014feea6723d20bb033a426dd5b1caa3657f21e4 EBUILD gnome-disk-utility-2.32.1.ebuild 1893 RMD160 2d68d23e4583e77ab7b5bc233f41d1ecfd9f6837 SHA1 83848de6aeccb689d43d0511f451df44444e59ca SHA256 619d308a3125a821a0c4c56e45089e78dda2801b20b698a91db23c9920a89347 -MISC ChangeLog 8349 RMD160 e84bf203b434f800dc3942ad365eb8943ab2cf60 SHA1 2cb3276490ef5ff35b2617b3bce67814fcd10dff SHA256 8ee8a25dc0ad2c8d12d7ac6528d192e0d590fead5b9813130e94d37a5c50a6dd +EBUILD gnome-disk-utility-3.0.2.ebuild 1840 RMD160 297d8677f250ca194e3eb407ce8571722166ff5a SHA1 f0fc276fb82f3e6165e8fb7f50c6683f5361093e SHA256 013847c257b48457df9431e3ddb29de06f6c51147d925584b5da20ba48b23162 +MISC ChangeLog 8587 RMD160 15bfa9a796a41066bd0561195e9becebf4f62da3 SHA1 a00738a8f8b4c5635f0380c5f69de251a9ccaac6 SHA256 3e82655f671d8b83d5aaeaa658d6ad56d6bca7c4a3e2968ea104dda27359ac16 MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5GwRwACgkQuQc30/atMkAPswCgnpXUxVU2XcQuAaLeahEVjwpY -P+UAoJxP1P2gzApWNIa5ZOEnCWv8E3Ui -=5MB1 +iQIcBAEBAgAGBQJOSRBkAAoJEO/kOhxWD91kBDkP/16AqZr+sZ98fhHYyMWZWI4Y +dk88WoyEvlV1sSuFwVWclxR3gO5+uz38Tf7lqOzuHfJG0NpLZH8M84kiXtR4g9Y3 +g2YcwtZkfKw0m5knS9fY4Luo/i574kmb8JWovGROTiBBAy5Ee+fj4W09fYNKWy4W +yfof3GwPyPQatm+W/Mz8aU2lrBWQCwsxCOGALJAoeC+WfxcnmqfboYjZuKpGTNJe +E3ipb3jz+WR9DaTInsJgEmDg/Oj0bjiQPkJgr3rLjF7SpQ8A4CKwQ7k7MnMGPdf7 +Qp00sB3Ti4+Sp+OU0LBAerun0tj6np9o2jTy4GfdSwsKOJnk3jZEDNoiFo2Fjjzq +hQ6wv3InlgsIOBW8AAndoafUEqpQbX/TyAlV5IxKVMzT4IS0LisSeLtMPG47TCjz +QN+K18KhXr7LBfjrC2sguRRy0MZ4yhp59pBOiWYuSPGqq6cwf9vPeQ2OyxbTVi/j +c7KMOmCYAwXN7VNN+bw4d21q9lGXzcBbncf2bq/GeqlwojsNBCy4LseTA0NNF6ai +1BNkK8me8n1xB+d1NZBF0p3EpQvHwq6z7+C9e6/duFAcFRtcDP/ZaRmbusYV33la +zHaqI/rG4zvMj+HfeJvFpEkSxHXpzKY/SeoImSVPEw3yEmPvm/Dqv0l8//fLhRlJ +R8YAWsona0v0MI+XmWIK +=y7Io -----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..b9080ea06ae0 --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch @@ -0,0 +1,75 @@ +--- 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 ++ ++#ifdef HAVE_AVAHI_UI + #include ++#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.0.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild new file mode 100644 index 000000000000..c4c81f211f4f --- /dev/null +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild @@ -0,0 +1,71 @@ +# 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-3.0.2.ebuild,v 1.1 2011/08/15 12:26:09 nirbheek Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +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" +IUSE="avahi doc fat gnome-keyring nautilus remote-access" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" + +CDEPEND=" + >=dev-libs/glib-2.22:2 + >=dev-libs/dbus-glib-0.74 + >=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 + + avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) + gnome-keyring? ( || ( + gnome-base/libgnome-keyring + =gnome-base/nautilus-2.91.0 ) +" +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 -e '/printf/s:nautilus:xdg-open:' \ + -i src/palimpsest/gdu-section-volumes.c || die "#350919" + + # Keep avahi optional, upstream bug #631986 + epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch" + intltoolize --force --copy --automake || die + eautoreconf + + gnome2_src_prepare +} -- 2.26.2