diff --git a/common/shlibs b/common/shlibs index a2bf256bb85..8145b8a8a0b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -809,9 +809,9 @@ libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1 libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1 liboauth.so.0 liboauth-0.9.4_1 liblcms2.so.2 lcms2-2.2_1 -libcolord.so.1 libcolord-0.1.23_3 -libcolordprivate.so.1 libcolord-0.1.31_1 -libcolorhug.so.1 libcolord-0.1.31_1 +libcolord.so.2 libcolord-1.1.7_1 +libcolordprivate.so.2 libcolord-1.1.7_1 +libcolorhug.so.2 libcolord-1.1.7_1 libnm-gtk.so.0 libnm-gtk-0.9.1.95_1 libcaribou.so.0 caribou-0.4.0_1 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1 diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index ae4742c9c76..a8fc2920abd 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -1,18 +1,14 @@ # Template file for 'colord' pkgname=colord -version=1.0.6 -revision=2 +version=1.1.7 +revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-vala - --with-udevrulesdir=/usr/lib/udev/rules.d --disable-bash-completion - --enable-polkit --enable-volume-search --with-daemon-user=colord" -hostmakedepends="pkg-config intltool docbook2x" -makedepends="vala-devel>=0.20 libgudev-devel polkit-devel lcms2-devel dbus-devel - libusb-devel libgusb-devel>=0.1.6 systemd-devel sqlite-devel shared-color-profiles" -depends="shared-color-profiles shadow" + --with-udevrulesdir=/usr/lib/udev/rules.d --with-daemon-user=colord + --enable-polkit --enable-gusb --enable-udev --enable-sane" conf_files="/etc/colord.conf" -lib32disabled=yes +replaces="shared-color-profiles>=0" system_accounts="colord" colord_homedir="/var/lib/colord" make_dirs=" @@ -23,19 +19,25 @@ maintainer="Juan RP " homepage="http://www.freedesktop.org/software/colord" license="GPL-2" distfiles="$homepage/releases/$pkgname-$version.tar.xz" -checksum=a40bbceaa3d3b1d6fd2777b181bf641b4eb49ad249796823585136c146ad7e8e +checksum=295395526ee0be30917ae9c352e68bfeb20c7fc266a605725bef969f20547f44 + +hostmakedepends="pkg-config intltool docbook2x" +makedepends="vala-devel>=0.20 libgudev-devel polkit-devel lcms2-devel dbus-devel + libusb-devel libgusb-devel>=0.1.6 sqlite-devel sane-devel bash-completion" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libtool glib-devel colord" fi # Package build options -build_options="gir" +build_options="gir systemd" +build_options_default="systemd" desc_option_gir="Enable support for building gobject introspection data" +desc_option_systemd="Enable support for systemd" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" + build_options_default+=" gir" fi if [ "$build_option_gir" ]; then @@ -45,6 +47,13 @@ else configure_args+=" --disable-introspection" fi +if [ "$build_option_systemd" ]; then + configure_args+=" --enable-systemd-login" + makedepends+=" systemd-devel" +else + configure_args+=" --disable-systemd-login" +fi + pre_configure() { if [ "$CROSS_BUILD" ]; then # Use host cd-create-profile instead.