* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/files/, x11-misc/colord/
@ 2012-05-24 6:04 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2012-05-24 6:04 UTC (permalink / raw
To: gentoo-commits
commit: 963f8d17fc0cabc1efcda69d1184b89c3b393df7
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 06:03:25 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 06:03:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=963f8d17
x11-misc/colord: sync with gx86
---
x11-misc/colord/colord-9999.ebuild | 89 +++++++------------
.../files/colord-0.1.11-fix-automagic-vala.patch | 26 ++++++
...-0.1.13-use-dbus-security-for-permissions.patch | 36 --------
.../colord-0.1.15-fix-automagic-libgusb.patch | 33 +++++++
4 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index 75bee2c..4f53794 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="4"
-inherit eutils base
+inherit autotools bash-completion-r1 eutils systemd base
if [[ ${PV} = 9999 ]]; then
GCONF_DEBUG="no"
inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
@@ -23,23 +23,26 @@ SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
-IUSE="doc examples +introspection scanner +udev"
+IUSE="doc examples gtk +gusb +introspection scanner +udev vala"
# FIXME: raise to libusb-1.0.9:1 when available
COMMON_DEPEND="
dev-db/sqlite:3
>=dev-libs/glib-2.28.0:2
- >=dev-libs/libusb-1.0.8:1
>=media-libs/lcms-2.2:2
+ >=sys-auth/polkit-0.103
+ gtk? (
+ x11-libs/gdk-pixbuf:2[introspection?]
+ x11-libs/gtk+:3[introspection?] )
+ gusb? ( >=dev-libs/libgusb-0.1.1 )
introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
scanner? ( media-gfx/sane-backends )
- udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
+ udev? ( sys-fs/udev[gudev] )
"
RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles"
-# Automagic build-time vala dependency if USE=introspection
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/intltool-0.35
@@ -49,7 +52,7 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-util/gtk-doc-1.9
)
- introspection? ( dev-lang/vala:0.14 )
+ vala? ( dev-lang/vala:0.14[vapigen] )
"
if [[ ${PV} =~ 9999 ]]; then
# Needed for generating man pages, not needed for tarballs
@@ -68,44 +71,49 @@ pkg_setup() {
}
src_prepare() {
- # Ubuntu patch to allow root and at_console to access colord without polkit;
- # this behavior matches upstream default polkit settings.
- epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
- [[ ${PV} = 9999 ]] && gnome2_src_prepare
+ epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
+ epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
+
+ if [[ ${PV} = 9999 ]]; then
+ gnome2_src_prepare
+ else
+ eautoreconf
+ fi
}
src_configure() {
- # Disable polkit to allow registering devices when colord is running as
- # non-root; https://bugs.launchpad.net/ubuntu/+source/colord/+bug/837851
+ # Reverse tools require gusb
econf \
--disable-examples \
--disable-static \
- --disable-polkit \
- --enable-reverse \
+ --enable-polkit \
--disable-volume-search \
--with-daemon-user=colord \
--localstatedir="${EPREFIX}"/var \
$(use_enable doc gtk-doc) \
+ $(use_enable gtk) \
+ $(use_enable gusb) \
+ $(use_enable gusb reverse) \
$(use_enable introspection) \
$(use_enable scanner sane) \
$(use_enable udev gudev) \
+ $(use_enable vala) \
+ $(systemd_with_unitdir) \
VAPIGEN=$(type -p vapigen-0.14)
# parallel make fails in doc/api
- use doc && MAKEOPTS=-j1
+ use doc && MAKEOPTS="${MAKEOPTS} -j1"
}
src_install() {
base_src_install
- # Ensure config and profile directories exist and are writable
- local d
- for d in /var/lib/{color,colord}; do
- keepdir "${d}"
- fowners colord:colord "${d}"
- done
+ newbashcomp client/colormgr-completion.bash colormgr
+ rm -vr "${ED}etc/bash_completion.d"
- # additional documentation files not included in tarball releases
- [[ ${PV} = 9999 ]] && use doc && dodoc doc/*.txt doc/*.svg
+ # Ensure config and profile directories exist and /var/lib/colord/*
+ # is writable by colord user
+ keepdir /var/lib/color{,d}/icc
+ fowners colord:colord /var/lib/colord{,/icc}
if use examples; then
insinto /usr/share/doc/${PF}/examples
@@ -114,34 +122,3 @@ src_install() {
find "${D}" -name "*.la" -delete || die
}
-
-pkg_postinst() {
- # <=colord-0.1.11 ran as root and used /var/lib/lib/colord to store
- # configuration files and /var/lib/lib/color for custom color profiles.
- local old_dir="${EROOT}var/lib/lib/colord"
- local new_dir="${EROOT}var/lib/colord"
-
- if [[ -e "${old_dir}/mapping.db" || -e "${old_dir}/storage.db" ]] && \
- ! [[ -e "${new_dir}/mapping.db" || -e "${new_dir}/storage.db" ]]; then
- elog "Old colord configuration files are present in ${old_dir}. If you"
- elog "are upgrading from colord-0.1.11 or older and had previously"
- elog "customized your color management settings, you will need to copy"
- elog "these files to ${new_dir} and then change the file ownership"
- elog "to colord:colord :"
- elog
- elog " # cp ${old_dir}/*.db ${new_dir}"
- elog " # chown colord:colord ${new_dir}/*.db"
- elog
- fi
- old_dir="${EROOT}var/lib/lib/color"
- new_dir="${EROOT}var/lib/color"
- if [[ -e "${old_dir}/icc" && ! -e "${new_dir}/icc" ]]; then
- elog "Old custom color profiles are present in ${old_dir}. If you are"
- elog "upgrading from colord-0.1.11 or older, you will need to copy them"
- elog "to ${new_dir} and then change the ownership to colord:colord :"
- elog
- elog " # cp -r ${old_dir}/icc ${new_dir}"
- elog " # chown -R colord:colord ${new_dir}/icc"
- elog
- fi
-}
diff --git a/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch b/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch
new file mode 100644
index 0000000..6f33190
--- /dev/null
+++ b/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch
@@ -0,0 +1,26 @@
+diff -ur colord-0.1.11//configure.ac colord-0.1.11.new//configure.ac
+--- colord-0.1.11//configure.ac 2011-08-01 14:25:25.000000000 +0530
++++ colord-0.1.11.new//configure.ac 2011-08-14 18:55:45.560334275 +0530
+@@ -218,8 +218,10 @@
+ dnl ---------------------------------------------------------------------------
+ dnl - Build VALA support
+ dnl ---------------------------------------------------------------------------
+-if test x$found_introspection != xno; then
++AC_ARG_ENABLE(vala, AS_HELP_STRING([--enable-vala],[build vala bindings]),
++ enable_vala=$enableval,enable_vala=no)
++if test x$found_introspection != xno -a x$enable_vala != xno; then
+ AC_PATH_PROG([VAPIGEN], [vapigen], [])
+ if test "x$VAPIGEN" = "x"; then
+ has_vapigen="no"
+ AC_MSG_WARN([vapigen not found, will not build Vala binding])
+@@ -228,7 +230,9 @@
+ fi
+ else
+ has_vapigen="no"
+- AC_MSG_WARN([Not introspection found, will not build Vala binding])
++ if test x$found_introspection = xno; then
++ AC_MSG_WARN([introspection not found, will not build Vala binding])
++ fi
+ fi
+ AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$has_vapigen" = "xyes"])
+
diff --git a/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch b/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch
deleted file mode 100644
index 8ae60c2..0000000
--- a/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: colord/data/org.freedesktop.ColorManager.conf.in
-===================================================================
---- colord.orig/data/org.freedesktop.ColorManager.conf.in 2011-09-01 17:59:58.330626765 +1000
-+++ colord/data/org.freedesktop.ColorManager.conf.in 2011-09-01 18:02:25.410628315 +1000
-@@ -16,8 +16,8 @@
- <allow own="org.freedesktop.ColorManager"/>
- </policy>
-
-- <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
-- <policy context="default">
-+ <!-- Use at_console policy rather than PolicyKit to allow running as colord user -->
-+ <policy at_console="true">
- <allow send_destination="org.freedesktop.ColorManager"
- send_interface="org.freedesktop.ColorManager"/>
- <allow send_destination="org.freedesktop.ColorManager"
-@@ -32,5 +32,20 @@
- send_interface="org.freedesktop.DBus.Introspectable"/>
- </policy>
-
-+ <!-- Also allow root to access the API; cupsd needs to talk to colord -->
-+ <policy user="root">
-+ <allow send_destination="org.freedesktop.ColorManager"
-+ send_interface="org.freedesktop.ColorManager"/>
-+ <allow send_destination="org.freedesktop.ColorManager"
-+ send_interface="org.freedesktop.ColorManager.Profile"/>
-+ <allow send_destination="org.freedesktop.ColorManager"
-+ send_interface="org.freedesktop.ColorManager.Device"/>
-+ <allow send_destination="org.freedesktop.ColorManager"
-+ send_interface="org.freedesktop.ColorManager.Sensor"/>
-+ <allow send_destination="org.freedesktop.ColorManager"
-+ send_interface="org.freedesktop.DBus.Properties"/>
-+ <allow send_destination="org.freedesktop.ColorManager"
-+ send_interface="org.freedesktop.DBus.Introspectable"/>
-+ </policy>
- </busconfig>
-
diff --git a/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch b/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
new file mode 100644
index 0000000..8c7e933
--- /dev/null
+++ b/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
@@ -0,0 +1,33 @@
+From db63bbbe6a3d925644401ba001b8e84a84d19369 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 27 Nov 2011 01:33:55 -0500
+Subject: [PATCH] Make libgusb dependency non-automagic
+
+---
+ configure.ac | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4732921..65abf67 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,11 +126,13 @@ dnl ---------------------------------------------------------------------------
+ dnl - Check library dependencies
+ dnl ---------------------------------------------------------------------------
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0)
+-PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1, have_gusb=yes, have_gusb=no)
+-if test x$have_gusb = xyes; then
++AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]),
++ enable_gusb=$enableval, enable_gusb=yes)
++if test x$enable_gusb != xno; then
++ PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1)
+ AC_DEFINE(HAVE_GUSB,1,[whether gusb is available])
+ fi
+-AM_CONDITIONAL(HAVE_GUSB, test x$have_gusb = xyes)
++AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes)
+
+ PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, has_new_lcms=yes, has_new_lcms=no)
+ if test x$has_new_lcms = xyes; then
+--
+1.7.8.rc3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/files/, x11-misc/colord/
@ 2013-01-22 8:12 Alexandre Rostovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Rostovtsev @ 2013-01-22 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 1c85dc6579f92783c1f30e5c560b1be1144a5db1
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 22 07:55:51 2013 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Jan 22 07:55:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1c85dc65
x11-misc/colord: sync with gx86
---
x11-misc/colord/colord-9999.ebuild | 65 +++++++++++---------
.../files/colord-0.1.11-fix-automagic-vala.patch | 26 --------
.../colord-0.1.15-fix-automagic-libgusb.patch | 33 ----------
.../colord-0.1.26-fix-automagic-systemd.patch | 40 ++++++++++++
x11-misc/colord/metadata.xml | 14 ++--
5 files changed, 82 insertions(+), 96 deletions(-)
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index 9b30db3..eac06ce 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
-inherit autotools bash-completion-r1 eutils user systemd base toolchain-funcs vala
+inherit autotools bash-completion-r1 check-reqs eutils user systemd base udev vala
if [[ ${PV} = 9999 ]]; then
GCONF_DEBUG="no"
inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
@@ -20,63 +20,67 @@ else
SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
fi
-LICENSE="GPL-2"
-SLOT="0"
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = libcolord soname version
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-IUSE="doc examples +gusb +introspection scanner +udev vala"
+IUSE="doc examples extra-print-profiles +gusb +introspection systemd +udev vala"
REQUIRED_USE="vala? ( introspection )"
COMMON_DEPEND="
- dev-db/sqlite:3
+ dev-db/sqlite:3=
>=dev-libs/glib-2.28.0:2
- >=media-libs/lcms-2.2:2
+ >=media-libs/lcms-2.2:2=
>=sys-auth/polkit-0.103
gusb? ( >=dev-libs/libgusb-0.1.1 )
introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
- scanner? ( media-gfx/sane-backends )
- udev? ( virtual/udev[gudev] )
-"
+ systemd? ( >=sys-apps/systemd-44 )
+ udev? ( virtual/udev:=[gudev] )"
RDEPEND="${COMMON_DEPEND}
- media-gfx/shared-color-profiles"
+ !media-gfx/shared-color-profiles"
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
- >=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35
>=sys-devel/gettext-0.17
virtual/pkgconfig
- doc? ( app-text/docbook-xml-dtd:4.1.2 )
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gtk-doc-1.9 )
+ extra-print-profiles? ( media-gfx/argyllcms )
vala? ( $(vala_depend) )
"
if [[ ${PV} =~ 9999 ]]; then
# Needed for generating man pages, not needed for tarballs
DEPEND="${DEPEND}
- app-text/docbook-sgml-utils
- doc? ( >=dev-util/gtk-doc-1.9 )"
+ >=dev-util/gtk-doc-am-1.9
+ app-text/docbook-sgml-utils"
fi
# FIXME: needs pre-installed dbus service files
RESTRICT="test"
-DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+# According to upstream comment in colord.spec.in, building the extra print
+# profiles requires >=4G of memory
+CHECKREQS_MEMORY="4G"
+
+pkg_pretend() {
+ use extra-print-profiles && check-reqs_pkg_pretend
+}
pkg_setup() {
+ use extra-print-profiles && check-reqs_pkg_setup
enewgroup colord
enewuser colord -1 -1 /var/lib/colord colord
}
src_prepare() {
- # https://bugs.freedesktop.org/show_bug.cgi?id=55464
- epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
-
- # https://bugs.freedesktop.org/show_bug.cgi?id=55465
- epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
+ use vala && vala_src_prepare
+ epatch "${FILESDIR}/${PN}-0.1.26-fix-automagic-systemd.patch"
eautoreconf
- use vala && vala_src_prepare
}
src_configure() {
@@ -89,11 +93,14 @@ src_configure() {
--with-daemon-user=colord \
--localstatedir="${EPREFIX}"/var \
$(use_enable doc gtk-doc) \
+ $(use_enable extra-print-profiles print-profiles) \
+ $(usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") \
$(use_enable gusb) \
$(use_enable gusb reverse) \
$(use_enable introspection) \
- $(use_enable scanner sane) \
+ $(use_enable systemd libsystemd-login) \
$(use_enable udev gudev) \
+ --with-udevrulesdir="$(udev_get_udevdir)"/rules.d \
$(use_enable vala) \
"$(systemd_with_unitdir)"
@@ -102,10 +109,8 @@ src_configure() {
}
src_install() {
- local udevdir=/lib/udev
- use udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
- base_src_install udevrulesdir="${udevdir}"/rules.d
+ DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+ default
newbashcomp client/colormgr-completion.bash colormgr
rm -vr "${ED}etc/bash_completion.d"
@@ -120,5 +125,5 @@ src_install() {
doins examples/*.c
fi
- prune_libtool_files --all
+ prune_libtool_files --modules
}
diff --git a/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch b/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch
deleted file mode 100644
index 6f33190..0000000
--- a/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur colord-0.1.11//configure.ac colord-0.1.11.new//configure.ac
---- colord-0.1.11//configure.ac 2011-08-01 14:25:25.000000000 +0530
-+++ colord-0.1.11.new//configure.ac 2011-08-14 18:55:45.560334275 +0530
-@@ -218,8 +218,10 @@
- dnl ---------------------------------------------------------------------------
- dnl - Build VALA support
- dnl ---------------------------------------------------------------------------
--if test x$found_introspection != xno; then
-+AC_ARG_ENABLE(vala, AS_HELP_STRING([--enable-vala],[build vala bindings]),
-+ enable_vala=$enableval,enable_vala=no)
-+if test x$found_introspection != xno -a x$enable_vala != xno; then
- AC_PATH_PROG([VAPIGEN], [vapigen], [])
- if test "x$VAPIGEN" = "x"; then
- has_vapigen="no"
- AC_MSG_WARN([vapigen not found, will not build Vala binding])
-@@ -228,7 +230,9 @@
- fi
- else
- has_vapigen="no"
-- AC_MSG_WARN([Not introspection found, will not build Vala binding])
-+ if test x$found_introspection = xno; then
-+ AC_MSG_WARN([introspection not found, will not build Vala binding])
-+ fi
- fi
- AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$has_vapigen" = "xyes"])
-
diff --git a/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch b/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
deleted file mode 100644
index 8c7e933..0000000
--- a/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From db63bbbe6a3d925644401ba001b8e84a84d19369 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 27 Nov 2011 01:33:55 -0500
-Subject: [PATCH] Make libgusb dependency non-automagic
-
----
- configure.ac | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4732921..65abf67 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -126,11 +126,13 @@ dnl ---------------------------------------------------------------------------
- dnl - Check library dependencies
- dnl ---------------------------------------------------------------------------
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0)
--PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1, have_gusb=yes, have_gusb=no)
--if test x$have_gusb = xyes; then
-+AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]),
-+ enable_gusb=$enableval, enable_gusb=yes)
-+if test x$enable_gusb != xno; then
-+ PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1)
- AC_DEFINE(HAVE_GUSB,1,[whether gusb is available])
- fi
--AM_CONDITIONAL(HAVE_GUSB, test x$have_gusb = xyes)
-+AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes)
-
- PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, has_new_lcms=yes, has_new_lcms=no)
- if test x$has_new_lcms = xyes; then
---
-1.7.8.rc3
-
diff --git a/x11-misc/colord/files/colord-0.1.26-fix-automagic-systemd.patch b/x11-misc/colord/files/colord-0.1.26-fix-automagic-systemd.patch
new file mode 100644
index 0000000..50d3027
--- /dev/null
+++ b/x11-misc/colord/files/colord-0.1.26-fix-automagic-systemd.patch
@@ -0,0 +1,40 @@
+From 2847b6fa7c88e34916da19fbd46604f90b51023a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 19 Dec 2012 23:50:23 -0500
+Subject: [PATCH] Fix automagic dep on libsystemd-login
+
+Just because it's installed doesn't mean we want to use it.
+---
+ configure.ac | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ef0df5b..4da2055 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -177,17 +177,14 @@ if test "x$with_systemdsystemunitdir" != "xno"; then
+ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"])
+
+-PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN,
+- [libsystemd-login >= 44],
+- have_libsystemd_login=yes,
+- have_libsystemd_login=no)
+-AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes)
+-if test "x$have_libsystemd_login" = "xyes"; then
++AC_ARG_ENABLE(libsystemd-login, AS_HELP_STRING([--enable-libsystemd-login],[Enable libsystemd-login support]),
++ enable_libsystemd_login=$enableval, enable_libsystemd_login=yes)
++if test x$enable_libsystemd_login != xno; then
++ PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44])
+ AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
+ fi
++AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$enable_libsystemd_login = xyes)
+ AC_SUBST(HAVE_LIBSYSTEMD_LOGIN)
+-AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
+-AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)
+
+ dnl ---------------------------------------------------------------------------
+ dnl - Where to install udev rules
+--
+1.8.0.2
+
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 9840b90..5954305 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <use>
- <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
+ <herd>gnome</herd>
+ <use>
+ <flag name="extra-print-profiles">Generate extra print profiles.
+ Warning: significant build time and memory requirements.</flag>
+ <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
colorimeter drivers</flag>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
- <flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
- </use>
+ <flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/files/, x11-misc/colord/
@ 2011-10-04 4:04 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-10-04 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 5c3fe8d42b5ee65a3b73798f53e09e3c50f8b276
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 4 03:20:08 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 4 03:56:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5c3fe8d4
x11-misc/colord: add 0.1.13
Version bump. Follow Ubuntu's example and disable polkit support,
switching to dbus security instead, to allow users to access colord when
it's running as a non-root user; see
https://bugs.launchpad.net/ubuntu/+source/colord/+bug/837851
This fixes various polkit errors at gnome-3.2 startup.
Also, sync with ebuild changes in gx86.
---
.../{colord-9999.ebuild => colord-0.1.13.ebuild} | 19 +++++++---
x11-misc/colord/colord-9999.ebuild | 19 +++++++---
...-0.1.13-use-dbus-security-for-permissions.patch | 36 ++++++++++++++++++++
3 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-0.1.13.ebuild
similarity index 86%
copy from x11-misc/colord/colord-9999.ebuild
copy to x11-misc/colord/colord-0.1.13.ebuild
index 34b74ca..3615593 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-0.1.13.ebuild
@@ -27,20 +27,19 @@ else
fi
IUSE="doc examples +introspection scanner +udev"
-# XXX: raise to libusb-1.0.9:1 when available
+# FIXME: raise to libusb-1.0.9:1 when available
COMMON_DEPEND="
dev-db/sqlite:3
>=dev-libs/glib-2.28.0:2
>=dev-libs/libusb-1.0.8:1
>=media-libs/lcms-2.2:2
- >=sys-auth/polkit-0.97
introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
scanner? ( media-gfx/sane-backends )
udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
"
RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles"
-# XXX: automagic build-time vala dependency if USE=introspection
+# Automagic build-time vala dependency if USE=introspection
DEPEND="${COMMON_DEPEND}
app-text/docbook-sgml-utils
dev-libs/libxslt
@@ -51,7 +50,7 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-util/gtk-doc-1.9
)
- introspection? ( dev-lang/vala:0.12 )
+ introspection? ( dev-lang/vala:0.14 )
"
# FIXME: needs pre-installed dbus service files
@@ -64,11 +63,19 @@ pkg_setup() {
enewuser colord -1 -1 /var/lib/colord colord
}
+src_prepare() {
+ # Ubuntu patch to allow root and at_console to access colord without polkit;
+ # this behavior matches upstream default polkit settings.
+ epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
+}
+
src_configure() {
+ # Disable polkit to allow registering devices when colord is running as
+ # non-root; https://bugs.launchpad.net/ubuntu/+source/colord/+bug/837851
econf \
--disable-examples \
--disable-static \
- --enable-polkit \
+ --disable-polkit \
--enable-reverse \
--disable-volume-search \
--with-daemon-user=colord \
@@ -77,7 +84,7 @@ src_configure() {
$(use_enable introspection) \
$(use_enable scanner sane) \
$(use_enable udev gudev) \
- VAPIGEN=$(type -p vapigen-0.12)
+ VAPIGEN=$(type -p vapigen-0.14)
# parallel make fails in doc/api
use doc && MAKEOPTS=-j1
}
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index 34b74ca..3615593 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -27,20 +27,19 @@ else
fi
IUSE="doc examples +introspection scanner +udev"
-# XXX: raise to libusb-1.0.9:1 when available
+# FIXME: raise to libusb-1.0.9:1 when available
COMMON_DEPEND="
dev-db/sqlite:3
>=dev-libs/glib-2.28.0:2
>=dev-libs/libusb-1.0.8:1
>=media-libs/lcms-2.2:2
- >=sys-auth/polkit-0.97
introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
scanner? ( media-gfx/sane-backends )
udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
"
RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles"
-# XXX: automagic build-time vala dependency if USE=introspection
+# Automagic build-time vala dependency if USE=introspection
DEPEND="${COMMON_DEPEND}
app-text/docbook-sgml-utils
dev-libs/libxslt
@@ -51,7 +50,7 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-util/gtk-doc-1.9
)
- introspection? ( dev-lang/vala:0.12 )
+ introspection? ( dev-lang/vala:0.14 )
"
# FIXME: needs pre-installed dbus service files
@@ -64,11 +63,19 @@ pkg_setup() {
enewuser colord -1 -1 /var/lib/colord colord
}
+src_prepare() {
+ # Ubuntu patch to allow root and at_console to access colord without polkit;
+ # this behavior matches upstream default polkit settings.
+ epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
+}
+
src_configure() {
+ # Disable polkit to allow registering devices when colord is running as
+ # non-root; https://bugs.launchpad.net/ubuntu/+source/colord/+bug/837851
econf \
--disable-examples \
--disable-static \
- --enable-polkit \
+ --disable-polkit \
--enable-reverse \
--disable-volume-search \
--with-daemon-user=colord \
@@ -77,7 +84,7 @@ src_configure() {
$(use_enable introspection) \
$(use_enable scanner sane) \
$(use_enable udev gudev) \
- VAPIGEN=$(type -p vapigen-0.12)
+ VAPIGEN=$(type -p vapigen-0.14)
# parallel make fails in doc/api
use doc && MAKEOPTS=-j1
}
diff --git a/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch b/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch
new file mode 100644
index 0000000..8ae60c2
--- /dev/null
+++ b/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch
@@ -0,0 +1,36 @@
+Index: colord/data/org.freedesktop.ColorManager.conf.in
+===================================================================
+--- colord.orig/data/org.freedesktop.ColorManager.conf.in 2011-09-01 17:59:58.330626765 +1000
++++ colord/data/org.freedesktop.ColorManager.conf.in 2011-09-01 18:02:25.410628315 +1000
+@@ -16,8 +16,8 @@
+ <allow own="org.freedesktop.ColorManager"/>
+ </policy>
+
+- <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
+- <policy context="default">
++ <!-- Use at_console policy rather than PolicyKit to allow running as colord user -->
++ <policy at_console="true">
+ <allow send_destination="org.freedesktop.ColorManager"
+ send_interface="org.freedesktop.ColorManager"/>
+ <allow send_destination="org.freedesktop.ColorManager"
+@@ -32,5 +32,20 @@
+ send_interface="org.freedesktop.DBus.Introspectable"/>
+ </policy>
+
++ <!-- Also allow root to access the API; cupsd needs to talk to colord -->
++ <policy user="root">
++ <allow send_destination="org.freedesktop.ColorManager"
++ send_interface="org.freedesktop.ColorManager"/>
++ <allow send_destination="org.freedesktop.ColorManager"
++ send_interface="org.freedesktop.ColorManager.Profile"/>
++ <allow send_destination="org.freedesktop.ColorManager"
++ send_interface="org.freedesktop.ColorManager.Device"/>
++ <allow send_destination="org.freedesktop.ColorManager"
++ send_interface="org.freedesktop.ColorManager.Sensor"/>
++ <allow send_destination="org.freedesktop.ColorManager"
++ send_interface="org.freedesktop.DBus.Properties"/>
++ <allow send_destination="org.freedesktop.ColorManager"
++ send_interface="org.freedesktop.DBus.Introspectable"/>
++ </policy>
+ </busconfig>
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-22 8:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-24 6:04 [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/files/, x11-misc/colord/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2013-01-22 8:12 Alexandre Rostovtsev
2011-10-04 4:04 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox