From: Gilles Dartiguelongue Date: Sun, 11 Jan 2015 17:28:36 +0000 (+0000) Subject: Version bump for Cinnamon 2.4, bug #529816. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3161e29c38c2519896fbfa182aba9861ce2f3ec1;p=gentoo.git Version bump for Cinnamon 2.4, bug #529816. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xC6085806 --- diff --git a/gnome-extra/cinnamon-settings-daemon/ChangeLog b/gnome-extra/cinnamon-settings-daemon/ChangeLog index f5ae82d4d418..72753c9db4eb 100644 --- a/gnome-extra/cinnamon-settings-daemon/ChangeLog +++ b/gnome-extra/cinnamon-settings-daemon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/cinnamon-settings-daemon -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.10 2014/09/26 20:36:16 pacho Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.11 2015/01/11 17:28:32 eva Exp $ + +*cinnamon-settings-daemon-2.4.3 (11 Jan 2015) + + 11 Jan 2015; Gilles Dartiguelongue + +cinnamon-settings-daemon-2.4.3.ebuild, + +files/cinnamon-settings-daemon-2.4.3-optional.patch: + Version bump for Cinnamon 2.4, bug #529816. 26 Sep 2014; Pacho Ramos cinnamon-settings-daemon-2.2.4.ebuild: diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest index 1ce9e5f16c7a..4cdb80716612 100644 --- a/gnome-extra/cinnamon-settings-daemon/Manifest +++ b/gnome-extra/cinnamon-settings-daemon/Manifest @@ -2,14 +2,17 @@ Hash: SHA256 AUX cinnamon-settings-daemon-2.2.2-optional.patch 3058 SHA256 8d87f2ca35f5fd3d14e7ad926f87252cc528c33ab78677aeb60a7f9275503c03 SHA512 8f0899c587f8fefb892901ea460760b7391acd0c651e5fb9403ec30cee189e75a3b51ebce130fb836926121872ebcdaa5257fa51b107bc8f613f0d0cea60c71e WHIRLPOOL 89ec15936315963775a755706194d2d32d5a3151f0d16fcc8103cae9f373340f8e9676bb44537097c38e9ff2566df182b826d98244b39792469596c46bcf6ad4 +AUX cinnamon-settings-daemon-2.4.3-optional.patch 3056 SHA256 b0043cb4745cf19c64fc38a9026c9fc4722e5cc04789eb43c9e1c18715f18c9e SHA512 0a167d19e3e698ef23973fe2a05fe99fb00cdbb552347563307b4252134ed0b32a05df859b42233cf327d989df437b78e712e4d8c9022f3d9e3cef25cf0421e6 WHIRLPOOL bc572458dbc647441c9ab45ed5495ceca54ef1c977055437b9fd681c2636fa318791c15064269f962f958726ae381e8f0d90a833d1b0c47403aedda2aff7d355 DIST cinnamon-settings-daemon-2.2.4.tar.gz 2995813 SHA256 5ee1f3d3af20fdadd5a6b948be667a0968c94f99f7b5a1992f03be0e876ff414 SHA512 442314bc685397a13772e5768067083e1188ab2a85a33d5ef5c670b234445508cf5454e0ffbd43065d78e5d32b9c30eda067689b9d0a146507741accf74805ec WHIRLPOOL 54ded63f6c67bf7f44805c453202f11391f539da24bbf89418a84579ffe2d89581605fbefa22ae0ac9e3c8d2c2c27527b602e3b4cbbe2e4dc8918866796c70e3 +DIST cinnamon-settings-daemon-2.4.3.tar.gz 2998895 SHA256 1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2 SHA512 a70b04fbbddf735582043554c809f6dc098b58938b7245de8b1398ac4a38e9483f43e8b08ec7810d81cc3afabbad74045a1abfa6d2ed4e8b672f5df971e7c916 WHIRLPOOL 9416bd0af5f1bc27358768d46c6d51c25f49436825ac201b01c6986b80aebb78a91baaa79e72bc0577f818330bf19046e5f3dcdafb245779ddc47f3714d47eea EBUILD cinnamon-settings-daemon-2.2.4.ebuild 2192 SHA256 29571465f6ad693c2cc4ebc4f85ceafdab8a329f594f0eee91a593eb47f6f64f SHA512 2d8d5e0fa67c39b53a97032cf43602860a2d6b077a28ffb3b881bb4466d9872d41939ba93177255bdaf0700e5bf5a89251c3be3a92fade9e2c6624156ab3f209 WHIRLPOOL c5b2a0defb5b2fa80c467f7259d97dea915af8a462615c43b08c3492fd5d981b7fb744864ff9ec8274c95be68217e2cecde932d7bebef138da96d961adc13fd3 -MISC ChangeLog 2096 SHA256 d626a1b872df5205d80be287e8530157672cd1f3dab7598c684e398ef411ef90 SHA512 3ab61762e79735b514427a6f4bfe11f2d656c0d19220fba6601f764f80e6cbad7ed5ebe364742f34d3ac44c6bae6fb7f519bf33663dede2e05f1ea035349300f WHIRLPOOL cdeee3458851fc1c0b89840340ea72ffbc2f8cc97934cc7dbb13292800c0dace57e7c530ed9ec20bc5c58c21f108d6f257e831a0c39578d6a47095169b1871f1 +EBUILD cinnamon-settings-daemon-2.4.3.ebuild 2884 SHA256 7184ab1717575610036ca194d4bf349c5af4d182bdb92a03fcabbf9d7e041137 SHA512 0b75f14fa6615f2123fd39bb485854a01ec8407e89e790ec3a05aac9009df66737cf121a5180e78d613f81c3e4034bbde1e82557fc077c1e068d5e3a8f8556bf WHIRLPOOL e6afed85d4cbb8f31eb2bad1e352ba44005fe8d63fff617058a5e525d6d25c63c28ed6acbc7364477d14314ff4bfb080d2958146278392563304f66b256f8943 +MISC ChangeLog 2340 SHA256 deaa9d87c0999686fb163c02b29e0186f4608f28cd36b68e83d5bdd71f80a4ce SHA512 63f62c80d16c268c94d286f71030956dd0e1ed52e7469aee8f9cda38d8bc7b8d37f6a349dfb699cc7468ce0b5abe789016254953de6dde97261dec6aac1819b8 WHIRLPOOL 1f2078bafac599fb2c87133e8410db2e4c4aeec39327d5ed684321a147716416f213e4d4bb3abaf919e34872f4fce31e8d8cc87e603cd08bd9c0d878f00328d0 MISC metadata.xml 257 SHA256 8d6f87c88d3da1d9a4e3f7c1bbfe1f5b6bdc74bf2a785531d8479dc74f92f3b7 SHA512 865f4729d377504a8848dee7aee28d33d99106d097608e7d4eb01f127922b4e48f072506963532c08b432d31192c074da3b2d7cde2d9182e3018fe6125a4f580 WHIRLPOOL 6b5d874e8edc033b2b738ab962ee87aaedfa57819cb194183ccece1729b17e8a829b89319c45f9cb0390de9fc67e5cf9b1000287bafc0769a5871967cb0634d3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQlzkEACgkQCaWpQKGI+9SkpgCcCfcDEO49YFkigrD0q962kXRE -P+AAnRfgIa0erzEHnzJ0jslCu579ecby -=mo2O +iEYEAREIAAYFAlSyssIACgkQ1fmVwcYIWAY9uACg1x2Tab7V4ysI9FihhlCziTf8 +aCsAoLaAFJGqiX+XdWFUW456ZpEthrAh +=wNHb -----END PGP SIGNATURE----- diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild new file mode 100644 index 000000000000..0141a65f71b7 --- /dev/null +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild,v 1.1 2015/01/11 17:28:32 eva Exp $ + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 virtualx + +DESCRIPTION="Cinnamon's settings daemon" +HOMEPAGE="http://cinnamon.linuxmint.com/" +SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+colord cups input_devices_wacom smartcard systemd" + +# udev is non-optional since lots of plugins, not just gudev, pull it in +RDEPEND=" + >=dev-libs/glib-2.38:2 + >=gnome-base/libgnomekbd-2.91.1 + >=gnome-base/librsvg-2.36.2 + >=gnome-extra/cinnamon-desktop-1.0:0= + media-libs/fontconfig + >=media-libs/lcms-2.2:2 + media-libs/libcanberra:0=[gtk3] + >=media-sound/pulseaudio-0.9.16:0= + sys-apps/dbus + >=sys-auth/polkit-0.97 + || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils ) + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.7.8:3 + >=x11-libs/libnotify-0.7.3:0= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxklavier + virtual/libgudev:= + + colord? ( >=x11-misc/colord-0.1.9:= ) + cups? ( >=net-print/cups-1.4[dbus] ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + x11-drivers/xf86-input-wacom + x11-libs/libXtst ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + systemd? ( sys-apps/systemd:0= ) + !systemd? ( sys-auth/consolekit:0= ) +" +DEPEND="${RDEPEND} + dev-libs/libxml2:2 + >=dev-util/intltool-0.37.1 + x11-proto/kbproto + virtual/pkgconfig +" + +src_prepare() { + # make colord and wacom optional + epatch "${FILESDIR}"/${PN}-2.4.3-optional.patch + + # Disable broken test + sed -e '/g_test_add_func ("\/color\/edid/d' \ + -i plugins/color/gcm-self-test.c || die + + # Fix intltool unittest + cat >>"${S}"/po/POTFILES.in < +Date: Mon, 5 May 2014 21:50:25 -0400 +Subject: [PATCH] Make colord and wacom support optional and non-automagic + +--- + configure.ac | 20 +++++++++++++++++--- + plugins/Makefile.am | 7 ++++++- + 2 files changed, 23 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6a17530..e5a752c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -260,15 +260,28 @@ fi + dnl --------------------------------------------------------------------------- + dnl - color + dnl --------------------------------------------------------------------------- ++AC_ARG_ENABLE(color, ++ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),, ++ enable_color=yes) ++build_color=false ++if test x"$enable_color" != x"no" ; then ++ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) ++ build_color=true ++fi + +-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) ++AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"]) + + dnl --------------------------------------------------------------------------- + dnl - wacom + dnl --------------------------------------------------------------------------- ++AC_ARG_ENABLE(wacom, ++ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),, ++ enable_wacom=auto) + build_wacom=false +-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0], +- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) ++if test x"$enable_wacom" != x"no" ; then ++ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0], ++ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) ++fi + + AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") + +@@ -604,6 +617,7 @@ echo " + LCMS DICT support: ${have_new_lcms} + Libnotify support: ${have_libnotify} + ++ Colord support: ${build_color} + Wacom support: ${build_wacom} + + Smartcard support: ${have_smartcard_support} +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index b9cb3a6..f37eec0 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -6,7 +6,6 @@ enabled_plugins = \ + automount \ + background \ + clipboard \ +- color \ + cursor \ + dummy \ + datetime \ +@@ -23,6 +22,12 @@ enabled_plugins = \ + + disabled_plugins = $(NULL) + ++if BUILD_COLOR ++enabled_plugins += color ++else ++disabled_plugins += color ++endif ++ + if BUILD_WACOM + enabled_plugins += wacom + else +-- +2.2.1 +