From 093698dc0e0a944b27d661a008223bbbc85c1642 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 19 Aug 2011 11:09:05 +0000 Subject: [PATCH] Bump to 3.0.0, from gnome overlay for GNOME 3 Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- gnome-extra/drwright/Manifest | 24 ++++- gnome-extra/gnome-color-manager/ChangeLog | 10 ++- gnome-extra/gnome-color-manager/Manifest | 24 +++-- .../gnome-color-manager-3.0.0-cc-panel.patch | 54 ++++++++++++ ...nome-color-manager-3.0.0-packagename.patch | 13 +++ .../gnome-color-manager-3.0.0-r2.ebuild | 88 +++++++++++++++++++ gnome-extra/gnome-color-manager/metadata.xml | 16 ++-- 7 files changed, 217 insertions(+), 12 deletions(-) create mode 100644 gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch create mode 100644 gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch create mode 100644 gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild diff --git a/gnome-extra/drwright/Manifest b/gnome-extra/drwright/Manifest index f904257208e6..ed7de68dd940 100644 --- a/gnome-extra/drwright/Manifest +++ b/gnome-extra/drwright/Manifest @@ -1,5 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX drwright-remowe-Werror.patch 427 RMD160 46921699adfd0bec1d1f31847b5365f1a36c2e6d SHA1 70902e947f717a348e2f53c57eb32fab78e9a901 SHA256 65e86ae8518c208b805b18a63a08864e29c3c719e768be433f917c569ffd4fbb DIST drwright-0.17.tar.bz2 261762 RMD160 e94d4ac0fdca80831766bc242502e9d693e2509f SHA1 dbf75a2adc97fe1ae615a2889420d20ffe4ec2ff SHA256 931529384d58a3493f172cae8416367e01a840cdd624b089901f7e7232582e58 +DIST drwright-3.0.2.tar.bz2 1810125 RMD160 15a59f50157db7ebc30e842ec17a7094649bf76e SHA1 1aa724d030f2cdbce103001d52f6d322e4101a1a SHA256 9640100ac69dcdcab1284602a46b57795207e38ea4e96e62ee711ce29e2dae25 EBUILD drwright-0.17.ebuild 995 RMD160 f78cf5fadb707f4b97c011385c2666232b017b60 SHA1 c4b34d5d3a5b2a36d72e32a8595ab663fb6b2a41 SHA256 fc55883c2a05fe4765ed9b318a68c82b1031a9c412067fd4477f7f444597432a -MISC ChangeLog 1846 RMD160 d7d4dae27b63af6c1d765ca66c8f429108927a6a SHA1 60cac67aa5f135dcbbe515d9999383956bfb34a0 SHA256 71dec40026bcbaf88db74d57eac532858072a8b5f9a67025e206ad640b20820e +EBUILD drwright-3.0.2.ebuild 900 RMD160 e368014fb2d2f3ded7563f5b2e385ffcfa3396ac SHA1 bd887649e05ebc40fc55f27f03770b74ef76db6e SHA256 cf209cc2a1166697c6f4645cc476c6f023d8304ffa9a21e14b9d8c38ade27a20 +MISC ChangeLog 2040 RMD160 dc9fdc1bc6fbf50ee4cfca932bc260b3bdacf133 SHA1 df46dddd23c547e148880ee98c72719411891165 SHA256 ec875a5419ad590d1bae8a0c3f38e3237fb0b49e5eb6d731bc3e4ba5f8160b51 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBAgAGBQJOTkSdAAoJEO/kOhxWD91kzbgQAJv0sDvQOGw7MOJ1GOrdTezk +m+mkZ94eLCPrAYX2+pY+PQYYLlOUq/dZtAZo4Ey9VVvprazBIvtvY9s1J2KzIyq5 +t9u5O6c5dJD/neKpX+VNeTOUzxWytre2qpGf9KwHXePdmC/VoEuiaJmpbMi/KIzN +kUc1PmxWtxm5fpwS5bSwtRCQLVok0wFYK7PFB10zrgOFSVm61ueFT9utKaucHIT0 +QDATRlwslDmifHIe0xuqaYIJe1tU/apxr6K6A6FWStK9hP+VVMkOyaejULxliqqR +3Sye1TBUyCRdB98cn7pWOsUIEodm/QIeQmlULXHQMtiVTd1NcLqeRjm0po4PDJhZ +kfrLVgwVWkxY7sQT5DH8s1ltHAhijPuP5yUAj+4ElvRzw0plFNxtEvf5OHRvOhLE +twfow1Yv3I8d71wm6VScyquHIX7hBfn8scpq5JJjPNKRAoLU7J6CsBFI5U8O5CMX +n5RA/5DSdLvm0E4xkYRrBTKVOpQFpH1cx3i9uEhlJGzVeXKWozUzL5W1WPAdLaQh +7ckLGIU1mEaGMt/Cbrtkyt5zIORsWj1Qr+a33jg6NvnsXd4FuODppNqZuZK2c3qW +E6L0fhc9SFHNvwa1NZyNG8ov1wuS7L8/105dT2Y3IMhXGAA5qujg+Y65pv4fIao4 +Dppw44+FNrHevNHZadM5 +=7mcL +-----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-color-manager/ChangeLog b/gnome-extra/gnome-color-manager/ChangeLog index 0b95733a6156..24a6e4aff83e 100644 --- a/gnome-extra/gnome-color-manager/ChangeLog +++ b/gnome-extra/gnome-color-manager/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/gnome-color-manager # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.7 2011/06/07 07:07:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.8 2011/08/19 11:09:04 nirbheek Exp $ + +*gnome-color-manager-3.0.0-r2 (19 Aug 2011) + + 19 Aug 2011; Nirbheek Chauhan + +gnome-color-manager-3.0.0-r2.ebuild, + +files/gnome-color-manager-3.0.0-cc-panel.patch, + +files/gnome-color-manager-3.0.0-packagename.patch, metadata.xml: + Bump to 3.0.0, from gnome overlay for GNOME 3 07 Jun 2011; Diego E. Pettenò gnome-color-manager-2.32.0.ebuild: diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest index 8e53682b46a4..6adf2737ca51 100644 --- a/gnome-extra/gnome-color-manager/Manifest +++ b/gnome-extra/gnome-color-manager/Manifest @@ -2,14 +2,28 @@ Hash: SHA1 AUX gnome-color-manager-2.32.0-libnotify-0.7.patch 732 RMD160 9cfd74dc9f784429d674578c4a02a0bc61f47562 SHA1 1635dfa32b90575da915da896618f0fb90718c15 SHA256 a4ac10d8bda2fb8e9d7580524d086b87cede2b8188f2cace17032f735b7773dd +AUX gnome-color-manager-3.0.0-cc-panel.patch 2114 RMD160 3dbd816ea63bfc3fdaf87e1a114abadc5ee4d3b5 SHA1 9e857439e8937cce1727230eb528a8155fe1b5a1 SHA256 25775951d035c13d10ac249c91a441978bd789f184f75d8a4ad2e57b05d4f98a +AUX gnome-color-manager-3.0.0-packagename.patch 542 RMD160 03befddb6722a9e2f8e9b21f4e0aee25f9a16729 SHA1 aa1fcea6f27a518d3fd8d5447861b0c9409f4c39 SHA256 a1fccee507e00f3a42375250eb6b34e5a3968228f5335e2b0aabab926b47bb2a DIST gnome-color-manager-2.32.0.tar.bz2 2491525 RMD160 6ad3b2d3a4cd84ba78988411d7402abca46aebcf SHA1 18cdc922188c2872c5e0c32b215e6cbea878e289 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf +DIST gnome-color-manager-3.0.0.tar.bz2 3704414 RMD160 2018ab499da9ea65d3644a1739b3c2b92f9290e1 SHA1 51d0efe15b33f144e054096c96eb006e5c616fba SHA256 9e030b2a5dd61010bce25c2e3cdfca6e7ab3954fecb74dbf88f6a8e2c70b7207 EBUILD gnome-color-manager-2.32.0.ebuild 1297 RMD160 75bf0572882607df0bad802d393076b495491e02 SHA1 b293de223b7e4b352a5b7b7f9021cdb7188dacaf SHA256 fa323db3fd0f1a87580811f047a9487c09f866dac8741f1a3d926fe82a7fc028 -MISC ChangeLog 1381 RMD160 fe814ce4c7b1ac6cbc5422fdc3858f8ed6fa4ab2 SHA1 381cde269b2534c4cf5e7a47f8b67839450deb95 SHA256 618a06c18bba437ee02ec9881e2f50aef2e73d993008d96058bad92956243c01 -MISC metadata.xml 268 RMD160 f5013dae2ef1a2751baf01bce26c233f5d5a83c7 SHA1 fb5b48775f0d846f0a3555970e6961e511008e19 SHA256 4d59f5f31e9d7c08685c252c1e65136392d54bdcd408a9729a5bd1123e04f3e6 +EBUILD gnome-color-manager-3.0.0-r2.ebuild 2450 RMD160 173bd9c4e56415fd15635615837b5f86e946d573 SHA1 fb3c3cb2c824a0b6f3c5aacdea405d186a465409 SHA256 15215d2fc711b325086ead46ccc58fb24425a7bad803543925a5c8a9dcf59173 +MISC ChangeLog 1687 RMD160 6873ae259514020337890838a8085b2f6b925a4f SHA1 7ed91ae206a8324c8f0a53844042058650046a9d SHA256 fae97488c67d740014b6c67d5550df0bf1d0ceb8b56e3b99609ee3126c7eb488 +MISC metadata.xml 511 RMD160 e6b7614ec2b755905b01d9f806d2da6d04ab28b3 SHA1 83486d6a4b9626894a8d1503ff7b45508aac3a8c SHA256 7a8bbe7d33dea4e5bd5ec57539f9c8dc182697c0016b516d5b53a8cc3af68055 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3tzkAACgkQAiZjviIA2Xhh1gCgsUkHOssVN5647p2xTBOgY4m9 -vCQAoNW4ICRWStgvAna52aag54lqt3YV -=FX+5 +iQIbBAEBAgAGBQJOTkRYAAoJEO/kOhxWD91kze8P+IzVB/eqCJPTbNrDxnHP0Y+L +0hwnVjV75jHSIjujA9CwxsmMI8FB6K0h/VZ76t7LeiT0k9whhsCcsP6UwNhC3Auw +NdmM6kpZMqbLHkrPVa1ggHGoV8RrQxQDnra98ORdu7fweX3U6ZCefxQMf1ouZati +T4AIcTeAPNczrcgLc1NIeQl51NTutFDhtq5ktrSJhThO8ZFrP5l2PqQ7etbiWo4O +9nKypakGlEK/NpgsFPmbjOS6PJx9DvHXKbwtl0QV8qJvUPFDKGiP73iW+/trZFzb +GG+d7epuvQRZM0Z3C6o7aRKisw/jgV3BUj+SXs+mqdfGyaxZY4lSFTfwWiOi5DF2 +WBAqPslPcXjAWe+A24VaWUN6Lf9YU+NEZ2TuM9myAOHZ0WTKRz/Fu5fGmgMgiuG/ +B9MqqzmSM/XscIUfipgaWWE+sPpZQgX4aeA2xiCOjMALr04Id9MkRGiza8zfNjqA +uk8XEDE+d/dwRmzrKSnp2pDb9DhKwVIpV7ZbSXzNaHcGtCyvOfiYBVxk1lCA2n2W +QQ6qVMwWleX2uw2OnBmFusnLVSpa+YEteRlTTq3/1KRHPWumFoXYcELuPxhyLivR +Lf8jpQ/PsN89We2BhsBEjq9rONi96VsL+HRAlomaXWj7AC6SzxhL+srEverD8ZO0 +/9cL6T90aac1pgAD61U= +=W+Pc -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch new file mode 100644 index 000000000000..92f958878033 --- /dev/null +++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch @@ -0,0 +1,54 @@ +From 66e2933c29964e72fa96f95d518763f2b4e95f79 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Fri, 13 May 2011 18:32:16 +0000 +Subject: Ensure we cancel the initial panel startup if the panel was created and destroyed without ever getting control of the mainloop + +This can happen if you plug in a color sensor, with the color control center +panel already open. +In this case, the g-s-d plugin creates a new instance which seemingly gets +loaded and unloaded and control is returned to to original instance. + +A workaround is either to not have the control panel panel open when pushing in +the device, or to restart the control center after plugging in the hardware. +--- +diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c +index 34ce173..898004e 100644 +--- a/src/cc-color-panel.c ++++ b/src/cc-color-panel.c +@@ -61,6 +61,7 @@ struct _CcColorPanelPrivate { + GSettings *settings; + guint save_and_apply_id; + guint apply_all_devices_id; ++ guint session_startup_id; + GCancellable *cancellable; + }; + +@@ -2270,6 +2271,7 @@ cc_color_panel_startup_idle_cb (CcColorPanel *panel) + g_debug ("getting installed"); + cc_color_panel_is_color_profiles_extra_installed (panel); + out: ++ panel->priv->session_startup_id = 0; + g_free (colorspace_rgb); + g_free (colorspace_cmyk); + return FALSE; +@@ -2452,6 +2454,8 @@ cc_color_panel_finalize (GObject *object) + g_source_remove (panel->priv->save_and_apply_id); + if (panel->priv->apply_all_devices_id != 0) + g_source_remove (panel->priv->apply_all_devices_id); ++ if (panel->priv->session_startup_id > 0) ++ g_source_remove (panel->priv->session_startup_id); + + G_OBJECT_CLASS (cc_color_panel_parent_class)->finalize (object); + } +@@ -2644,7 +2648,8 @@ cc_color_panel_init (CcColorPanel *panel) + if(0) cc_color_panel_setup_drag_and_drop (GTK_WIDGET (panel->priv->main_window)); + + /* do all this after the window has been set up */ +- g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel); ++ panel->priv->session_startup_id = ++ g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel); + out: + return; + } +-- +cgit v0.9 diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch new file mode 100644 index 000000000000..53ab593f5d67 --- /dev/null +++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch @@ -0,0 +1,13 @@ +diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c +index 34ce173..f4307cc 100644 +--- a/src/cc-color-panel.c ++++ b/src/cc-color-panel.c +@@ -2150,7 +2150,7 @@ cc_color_panel_is_color_profiles_extra_installed (CcColorPanel *panel) + GError *error = NULL; + + #ifndef HAVE_PACKAGEKIT +- g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", package_name); ++ g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", GCM_PREFS_PACKAGE_NAME_COLOR_PROFILES_EXTRA); + return; + #endif + diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild new file mode 100644 index 000000000000..01a7e5c02e8d --- /dev/null +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.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-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild,v 1.1 2011/08/19 11:09:04 nirbheek Exp $ + +EAPI="3" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit eutils gnome2 + +DESCRIPTION="Color profile manager for the GNOME desktop" +HOMEPAGE="http://projects.gnome.org/gnome-color-manager/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+introspection packagekit raw scanner" + +# FIXME: raise libusb:1 to 1.0.9 when available +# FIXME: fix detection of docbook2man +COMMON_DEPEND=">=dev-libs/glib-2.25.9:2 + >=dev-libs/libusb-1:1 + >=gnome-base/gnome-control-center-3 + gnome-base/gnome-settings-daemon + + media-libs/lcms:2 + >=media-libs/libcanberra-0.10[gtk3] + media-libs/libexif + media-libs/tiff + net-print/cups + + || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) + x11-libs/libX11 + x11-libs/libXrandr + >=x11-libs/gtk+-2.91:3 + >=x11-libs/libnotify-0.7 + >=x11-libs/vte-0.25.1:2.90 + + introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) + scanner? ( media-gfx/sane-backends ) + packagekit? ( app-admin/packagekit-base ) + raw? ( media-gfx/exiv2 ) +" +RDEPEND="${RDEPEND} + media-gfx/shared-color-profiles +" +# docbook-sgml-{utils,dtd:4.1} needed to generate man pages +DEPEND="${RDEPEND} + app-text/docbook-sgml-dtd:4.1 + app-text/docbook-sgml-utils + app-text/gnome-doc-utils + dev-libs/libxslt + >=dev-util/intltool-0.35 +" + +# FIXME: run test-suite with files on live file-system +RESTRICT="test" + +pkg_setup() { + # Always enable tests since they are check_PROGRAMS anyway + G2CONF="${G2CONF} + --disable-static + --disable-schemas-compile + --disable-scrollkeeper + --enable-tests + $(use_enable packagekit) + $(use_enable introspection) + $(use_enable raw exiv) + $(use_enable scanner sane)" +} + +src_prepare() { + # Fix build + epatch "${FILESDIR}/${P}-packagename.patch" + + # Upstream renamed 95-gcm-colorimeters.rules to 69-gcm-colorimeters.rules + # for next release (see commit dc276cbe) to fix colorimeter udev ACLs. + mv -f rules/{95,69}-gcm-colorimeters.rules || die "mv failed" + sed -e 's:95-gcm-colorimeters.rules:69-gcm-colorimeters.rules:' \ + -i rules/Makefile.* || die "sed rules/Makefile.* failed" + + # Upstream patch to fix a bug in control center panel when plugging in a + # colorimeter; will be in next release + epatch "${FILESDIR}/${P}-cc-panel.patch" + + gnome2_src_prepare +} diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml index 9a0a2f99ef74..564eaa5b730b 100644 --- a/gnome-extra/gnome-color-manager/metadata.xml +++ b/gnome-extra/gnome-color-manager/metadata.xml @@ -1,9 +1,15 @@ - - flameeyes@gentoo.org - Diego Elio Pettenò - - gnome + + flameeyes@gentoo.org + Diego Elio Pettenò + + gnome + + Use dev-libs/gobject-introspection + for introspection + Enable support for the distro-neutral package + manager GUI app-admin/packagekit + -- 2.26.2