[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-color-manager/files/, gnome-extra/gnome-color-manager/

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-color-manager/files/, gnome-extra/gnome-color-manager/

[Gilles Dartiguelongue]

commit:     ae54ab19ddd94ef75c7c510455618b633abc0635
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 22:33:46 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May  2 22:33:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ae54ab19

gnome-extra/gnome-color-manager: 2.32.0 → 3.0.0

---
 .../gnome-color-manager-3.0.0-packagename.patch    |   13 ++++
 .../gnome-color-manager-3.0.0.ebuild               |   71 ++++++++++++++++++++
 2 files changed, 84 insertions(+), 0 deletions(-)

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 0000000..53ab593
--- /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.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0.ebuild
new file mode 100644
index 0000000..e1e3861
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0.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/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild,v 1.6 2011/03/23 06:10:42 ssuominen Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+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"
+
+# FIXME: raise libusb:1 to 1.0.9 when available
+# FIXME: fix detection of docbook2man
+RDEPEND=">=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-gfx/sane-backends
+	>=media-libs/libcanberra-0.10[gtk3]
+	media-libs/libexif
+	media-libs/tiff
+	net-print/cups
+
+	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 )
+	packagekit? ( app-portage/packagekit )
+	raw? ( media-gfx/exiv2 )
+"
+DEPEND="${RDEPEND}
+	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-sane
+		--enable-tests
+		$(use_enable packagekit)
+		$(use_enable introspection)
+		$(use_enable raw exiv)"
+}
+
+src_prepare() {
+	# Fix build
+	epatch "${FILESDIR}/${P}-packagename.patch"
+
+	gnome2_src_prepare
+}

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-color-manager/files/, gnome-extra/gnome-color-manager/

[Alexandre Restovtsev]

commit:     05590621a810219c602c2d5a20b6651395d2405a
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 04:36:21 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 20 04:53:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=05590621

gnome-extra/gnome-color-manager: 3.0.0 → 3.0.0-r1

Add upstream fixes for colorimeter support (reorder udev rules and fix a
problem when plugging in a colorimeter while gnome-control-center is
running).

---
 .../files/gnome-color-manager-3.0.0-cc-panel.patch |   54 ++++++++++++++++++++
 ....ebuild => gnome-color-manager-3.0.0-r1.ebuild} |   10 ++++
 2 files changed, 64 insertions(+), 0 deletions(-)

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 0000000..92f9588
--- /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 <richard@hughsie.com>
+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/gnome-color-manager-3.0.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r1.ebuild
similarity index 77%
rename from gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0.ebuild
rename to gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r1.ebuild
index 0ddc8bb..965eaac 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r1.ebuild
@@ -67,5 +67,15 @@ 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
 }

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-color-manager/files/, gnome-extra/gnome-color-manager/

[Gilles Dartiguelongue]

commit:     bf4127b1c9b0b0e84c06e3554dc36fa59161afef
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 20 10:49:26 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 20 10:51:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bf4127b1

gnome-extra/gnome-color-manager: 3.30 in ::gentoo

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Manifest-Sign-Key: 0x5A56C8CD0C13248A
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 .../files/3.26-remove-unwanted-check.patch         | 24 --------
 .../gnome-color-manager-3.26.0.ebuild              | 66 ----------------------
 2 files changed, 90 deletions(-)

diff --git a/gnome-extra/gnome-color-manager/files/3.26-remove-unwanted-check.patch b/gnome-extra/gnome-color-manager/files/3.26-remove-unwanted-check.patch
deleted file mode 100644
index 30658f2e..00000000
--- a/gnome-extra/gnome-color-manager/files/3.26-remove-unwanted-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dd43972782c34fe4d8925d52ae82d69add00493a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 27 May 2018 19:27:51 +0200
-Subject: [PATCH] Fix unwanted exiv check in packagekit option handling
-
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index dd0be0b..0721028 100644
---- a/meson.build
-+++ b/meson.build
-@@ -101,7 +101,6 @@ if get_option('enable-exiv')
- endif
- 
- if get_option('enable-packagekit')
--  libexiv = dependency('exiv2')
-   conf.set('HAVE_PACKAGEKIT', '1')
- endif
- 
--- 
-2.17.0
-

diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.26.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.26.0.ebuild
deleted file mode 100644
index 9c49479f..00000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.26.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome-meson virtualx
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="packagekit raw test"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-# vte could be made optional
-RDEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.91
-	>=x11-misc/colord-1.3.1:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2:0= )
-"
-# 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
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=796428
-	"${FILESDIR}"/3.26-remove-unwanted-check.patch
-)
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	gnome-meson_src_configure \
-		$(meson_use raw enable-exiv) \
-		$(meson_use packagekit enable-packagekit) \
-		$(meson_use test enable-tests)
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome-meson_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}