* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2015-08-23 16:01 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2015-08-23 16:01 UTC (permalink / raw
To: gentoo-commits
commit: ee21ce0103d95a74236f23a750d65a3b6fcee8e4
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 15:38:25 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 15:39:08 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee21ce01
gnome-base/gnome-settings-daemon: drop old revision
Package-Manager: portage-2.2.20.1
gnome-base/gnome-settings-daemon/Manifest | 1 -
.../gnome-settings-daemon-3.12.0-optional.patch | 82 -----------
.../gnome-settings-daemon-3.14.2.ebuild | 152 ---------------------
3 files changed, 235 deletions(-)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index d883b7d..4e0b0a5 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,4 +1,3 @@
-DIST gnome-settings-daemon-3.14.2.tar.xz 1612184 SHA256 066bc8ed751c5f6b5a9590911a0fb2b51b0c3436ae1caccfa42e0791c34fedee SHA512 3cd125ed89d47b03439f473df861d41696f6281c9df84218f3fe29d86570fbcd13dd2bedb3f63b354e06043d7d8fda0d1304e03a6ca39b9bcbd369a908d88ba2 WHIRLPOOL 157195486a9ed8db18fe851ea8a567d2c53beeaf3cfc6d21f5e25a876f2e5b6847ccb6e848bae6accdd3861c96b16a0bfd5642f8e0fce3f8c3d4923599d49260
DIST gnome-settings-daemon-3.14.4.tar.xz 1650276 SHA256 ce4453f83a19328e4f031251430325cb6ae832b83fa9fce80a8cde1d4bb0a2a5 SHA512 c6c62f7e13f93fd3dcff7990571289e10c9ef341ebb9d6deab67adf705a32a13142b7e8aebccd4a71d39f191a472d427fdea5acebc5fcf6f6106c641af320a32 WHIRLPOOL 145e694c74364f6fec6543976cf1e0abb6049f8a13c8f0c8b95a481d849a94255f68ade1a4926f0207c19cdbc8927f55edbcae68b01e7ef95046c3786cb07cbb
DIST gnome-settings-daemon-3.16.2.tar.xz 1602508 SHA256 d8d536584ebb8fb1403050eb65e7ee3328eba14b123542369ff1917e727fa69a SHA512 04f62429b6f3edf6d7c11b0fbe8b5b74a3be3d6309ec7a9019dc77d2f8557ad26242a210bcfb36b393b99d93c33590c595c6d7dca9c1272f04bdf5cfc7144076 WHIRLPOOL 95f69752b3a9ad7d22489123555cd84dffb6c0ac4872dd5febbfb444013eb2417a0f50f53b311f640cc3d4ac8b662c0b2a102fbe3e32de0614161ed9cf646579
DIST gnome-settings-daemon-3.16.3.tar.xz 1651880 SHA256 8752f79ba2ee76701744b4806140d1b88c665ad7cd44e7ff58b4e78e1063daea SHA512 d11c16b9ccf17683c0917ed8bee8b5142bfcc3d2099073df5318e8a1f801a9b7e07f2dfe68818edee568d6fb2cc8571580b072c1de46dc22aee4bbffddfc3ff5 WHIRLPOOL 1dec35ba84975bd297b69622733ab33db981a4b569cf67711f8b526bc3285515ca8fd522131888f6419459d6382ac493aed54b073a4e5950a837cca3f55f2ccf
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
deleted file mode 100644
index cb117d7..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index dd95dd4..03d651c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -248,7 +248,20 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE([color],
-+ AS_HELP_STRING([--disable-color],
-+ [turn off color plugin]),
-+ [with_color=$enableval],
-+ [with_color=yes]) dnl Default value
-+
-+if test x$with_color = xyes; then
-+ PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
-
- dnl ---------------------------------------------------------------------------
- dnl - datetime
-@@ -279,15 +292,25 @@ case $host_os in
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
- have_wacom=no
- else
-+ have_wacom=no
- if test x$enable_gudev != xno; then
-- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+ AC_ARG_ENABLE([wacom],
-+ AS_HELP_STRING([--disable-wacom],
-+ [turn off wacom plugin]),
-+ [with_wacom=$enableval],
-+ [with_wacom=no]) dnl Default value
-+ if test x$with_wacom = xyes; then
-+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+ have_wacom=yes
-+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-+ fi
-+ AC_SUBST(WACOM_CFLAGS)
-+ AC_SUBST(WACOM_LIBS)
- else
- AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
- fi
-- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-- have_wacom=yes
- fi
- ;;
- *)
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 04f8e2a..55ed94c 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins = \
- a11y-keyboard \
- a11y-settings \
- clipboard \
-- color \
- cursor \
- datetime \
- dummy \
-@@ -21,6 +20,12 @@ enabled_plugins = \
-
- disabled_plugins = $(NULL)
-
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
- else
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
deleted file mode 100644
index d7aa155..0000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
-REQUIRED_USE="
- input_devices_wacom? ( udev )
- smartcard? ( udev )
- test? ( ${PYTHON_REQUIRED_USE} )
-"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.7:2
- >=x11-libs/gtk+-3.7.8:3
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.9.91.1
- >=gnome-base/librsvg-2.36.2
- media-fonts/cantarell
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.99:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
- x11-misc/xkeyboard-config
-
- >=app-misc/geoclue-2.1.2:2.0
- >=dev-libs/libgweather-3.9.5:2
- >=sci-geosciences/geocode-glib-3.10
- >=sys-auth/polkit-0.103
-
- colord? ( >=x11-misc/colord-1.0.2:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20
- x11-drivers/xf86-input-wacom
- virtual/libgudev:= )
- networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- !openrc-force? ( sys-apps/systemd )
- >=x11-themes/gnome-themes-standard-2.91
- >=x11-themes/gnome-icon-theme-2.91
- >=x11-themes/gnome-icon-theme-symbolic-2.91
- !<gnome-base/gnome-control-center-2.22
- !<gnome-extra/gnome-color-manager-3.1.1
- !<gnome-extra/gnome-power-manager-3.1.3
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
- cups? ( sys-apps/sed )
- test? (
- ${PYTHON_DEPS}
- dev-python/pygobject[${PYTHON_USEDEP}] )
- dev-libs/libxml2:2
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-proto/inputproto
- x11-proto/xf86miscproto
- >=x11-proto/xproto-7.0.15
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=621836
- # Apparently this change severely affects touchpad usability for some
- # people, so revert it if USE=short-touchpad-timeout.
- # Revisit if/when upstream adds a setting for customizing the timeout.
- use short-touchpad-timeout &&
- epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
-
- # Make colord and wacom optional; requires eautoreconf
- epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
-
- epatch_user
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-man \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable networkmanager network-manager) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_test() {
- python_export_best
- Xemake check
-}
-
-src_install() {
- gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! systemd_is_booted; then
- ewarn "${PN} needs Systemd to be *running* for working"
- ewarn "properly. Please follow the this guide to migrate:"
- ewarn "http://wiki.gentoo.org/wiki/Systemd"
- fi
-
- if use openrc-force; then
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
- ewarn "this can lead to unexpected problems and is not supported neither by"
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
- ewarn "you will need to disable this USE flag system wide and retest before"
- ewarn "opening any bug report."
- fi
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2016-11-03 8:19 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2016-11-03 8:19 UTC (permalink / raw
To: gentoo-commits
commit: c0d1ed75b190f8bb2a9b5356a660c835d3c3d793
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 08:18:37 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 08:19:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d1ed75
gnome-base/gnome-settings-daemon: cleanup old revision
Package-Manager: portage-2.3.2
gnome-base/gnome-settings-daemon/Manifest | 1 -
...ings-daemon-3.7.90-short-touchpad-timeout.patch | 25 ----
.../gnome-settings-daemon-3.18.3.ebuild | 149 ---------------------
gnome-base/gnome-settings-daemon/metadata.xml | 2 -
4 files changed, 177 deletions(-)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 34f95c6..edbcb4f 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,4 +1,3 @@
-DIST gnome-settings-daemon-3.18.3.tar.xz 1657000 SHA256 36e6170768ef17f5e089090f943ee93e632fa5abb64502a2f68a54974f08bf1f SHA512 2449bc2056887dbf00367bd064fc42ed416647b6533015626fe53160983ba6657554d5cc0f500cf4585ac30e73d8ac78595883cbf8390523d89e2614fb75b39b WHIRLPOOL 0784bdcc9b6d3e4ee919df83dbe19596c624ca948dcf199b7fb7a36aa3723fc60ed6c09692295ac6ae0150d4c81d66706aff4d1641ae8657e138892635b6a30a
DIST gnome-settings-daemon-3.20.1.tar.xz 1650928 SHA256 e84a075d895ca3baeefb8508e0a901027b66f7d5a7ee8c966e31d301b38e78e7 SHA512 4d8ec7c8d508a0dead00c08ef591c9814bf1c33d0016626c6cd5153bd2aad601ea1146b0e5617465ee276b44d8d622b664817a83e045cece69c2be76c5e33a84 WHIRLPOOL 14736006a40d4e84bebcc9c17eff8f3fa2c5db36e4ecb546d24a4db006479b6005f583aa9db31caa65988ba0b65beeabb1efa12b0b6a480cfb7e03f6f8e0f4cc
DIST gnome-settings-daemon-3.20.2.tar.xz 1620696 SHA256 1dd7a084449a2c240308d253f86d60f3efe25f59322c3f5ec3b9e2e9f5eabb45 SHA512 b23ac4cfc5c1fe4b1eeb4ba37cae448b2a23e11b988ae609c3d23168a9c22502829b68a4ab5fc8291bde91b429fcb4159c0f37bef78437838de6c6f3417817ed WHIRLPOOL 94463af0fcc3c3e36ded002e359aa1049d8a6171ae9b7edbf1e3ceeda5f1d2ee9389c09fa2929c2197b20a48fa613cc35fb31dc3eed30feec5f370868b1b4e49
DIST gnome-settings-daemon-3.22.1.tar.xz 1622420 SHA256 b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba SHA512 7afd550d5e018524e1aadad540d85816d4f42245af025356d079c28fe78754120b3b0d1de2746603331122659e1f43496d5a1160db069e4b1e9669c3404619b2 WHIRLPOOL d9cb415c3874ba9e650dbfc95d3482b83f6dab8ce2fb17a98e4c892230d8e82a34acb43bbb7fe2d620864d09a068dd32467f08063e7fe56a3589d30acfe83159
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
deleted file mode 100644
index 7dc410f..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bc0f7c1da87b17839ebf71dc102c19b7d7b6c65a Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Mon, 25 Feb 2013 17:24:25 +0330
-Subject: [PATCH] gnome-settings-daemon-3.7.90-short-touchpad-timeout
-
----
- plugins/mouse/gsd-mouse-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
-index a62800a..e7d39e1 100644
---- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -583,7 +583,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
-
- g_ptr_array_add (args, "syndaemon");
- g_ptr_array_add (args, "-i");
-- g_ptr_array_add (args, "1.0");
-+ g_ptr_array_add (args, "0.5");
- g_ptr_array_add (args, "-t");
- g_ptr_array_add (args, "-K");
- g_ptr_array_add (args, "-R");
---
-1.8.1.2
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.3.ebuild
deleted file mode 100644
index 97789c5..00000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
-REQUIRED_USE="
- input_devices_wacom? ( udev )
- smartcard? ( udev )
- test? ( ${PYTHON_REQUIRED_USE} )
-"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.7:2[dbus]
- >=x11-libs/gtk+-3.15.3:3
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.15.4
- >=gnome-base/librsvg-2.36.2
- media-fonts/cantarell
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.99:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
- x11-misc/xkeyboard-config
-
- >=app-misc/geoclue-2.1.2:2.0
- >=dev-libs/libgweather-3.9.5:2
- >=sci-geosciences/geocode-glib-3.10
- >=sys-auth/polkit-0.103
-
- colord? ( >=x11-misc/colord-1.0.2:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20
- x11-drivers/xf86-input-wacom
- virtual/libgudev:= )
- networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- !openrc-force? ( sys-apps/systemd )
- !<gnome-base/gnome-control-center-2.22
- !<gnome-extra/gnome-color-manager-3.1.1
- !<gnome-extra/gnome-power-manager-3.1.3
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
- cups? ( sys-apps/sed )
- test? (
- ${PYTHON_DEPS}
- dev-python/pygobject[${PYTHON_USEDEP}] )
- dev-libs/libxml2:2
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-proto/inputproto
- x11-proto/xf86miscproto
- >=x11-proto/xproto-7.0.15
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=621836
- # Apparently this change severely affects touchpad usability for some
- # people, so revert it if USE=short-touchpad-timeout.
- # Revisit if/when upstream adds a setting for customizing the timeout.
- use short-touchpad-timeout &&
- epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
-
- # Make colord and wacom optional; requires eautoreconf
- epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
-
- epatch_user
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-man \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable networkmanager network-manager) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_test() {
- python_export_best
- Xemake check
-}
-
-src_install() {
- gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! systemd_is_booted; then
- ewarn "${PN} needs Systemd to be *running* for working"
- ewarn "properly. Please follow the this guide to migrate:"
- ewarn "https://wiki.gentoo.org/wiki/Systemd"
- fi
-
- if use openrc-force; then
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
- ewarn "this can lead to unexpected problems and is not supported neither by"
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
- ewarn "you will need to disable this USE flag system wide and retest before"
- ewarn "opening any bug report."
- fi
-}
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index a242ebb..7ddc604 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -12,7 +12,5 @@
enabling this flag will become your setup to be fully
unsupported by upstream and downstream Gnome team. Do not
try to enable it unless completely needed</flag>
- <flag name="short-touchpad-timeout">Change the touchpad timeout so that
- it's effective for fast typists</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2017-03-08 12:11 Mart Raudsepp
0 siblings, 0 replies; 13+ messages in thread
From: Mart Raudsepp @ 2017-03-08 12:11 UTC (permalink / raw
To: gentoo-commits
commit: 5f4515ef307ec91b186e7e06064f46b9eb8db15d
Author: Timo Tambet <ttambet <AT> gmail <DOT> com>
AuthorDate: Sat Feb 25 14:07:51 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 12:10:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4515ef
gnome-base/gnome-settings-daemon: bump to 3.23.90
Blocks older gnome-session, because the daemon was split up into several
smaller daemons, but old gnome-session requires the big settings daemon.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
gnome-base/gnome-settings-daemon/Manifest | 1 +
.../gnome-settings-daemon-3.23.90-optional.patch | 145 ++++++++++++++++++++
.../gnome-settings-daemon-3.23.90.ebuild | 151 +++++++++++++++++++++
3 files changed, 297 insertions(+)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 30a5a9f6953..2cd1df7d4c0 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,2 +1,3 @@
DIST gnome-settings-daemon-3.20.2.tar.xz 1620696 SHA256 1dd7a084449a2c240308d253f86d60f3efe25f59322c3f5ec3b9e2e9f5eabb45 SHA512 b23ac4cfc5c1fe4b1eeb4ba37cae448b2a23e11b988ae609c3d23168a9c22502829b68a4ab5fc8291bde91b429fcb4159c0f37bef78437838de6c6f3417817ed WHIRLPOOL 94463af0fcc3c3e36ded002e359aa1049d8a6171ae9b7edbf1e3ceeda5f1d2ee9389c09fa2929c2197b20a48fa613cc35fb31dc3eed30feec5f370868b1b4e49
DIST gnome-settings-daemon-3.22.1.tar.xz 1622420 SHA256 b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba SHA512 7afd550d5e018524e1aadad540d85816d4f42245af025356d079c28fe78754120b3b0d1de2746603331122659e1f43496d5a1160db069e4b1e9669c3404619b2 WHIRLPOOL d9cb415c3874ba9e650dbfc95d3482b83f6dab8ce2fb17a98e4c892230d8e82a34acb43bbb7fe2d620864d09a068dd32467f08063e7fe56a3589d30acfe83159
+DIST gnome-settings-daemon-3.23.90.tar.xz 1614204 SHA256 c9e860558a8132763f6441f317e1df47fc5fe64bc5517bcc9ff9d44a08824fac SHA512 995eae1876df7918746a0050fd4fa08fd50d6bef9e0c5474da33eb5fd7fc53a1f4214179035f6b0716f60620f198697cef4eaf70cb24c510ce5a30cfc761bdcb WHIRLPOOL 45b21a328a57c08fd6872fd1b7e1df30a5f2a47ffd2dc32d41b85ccc3e7c0937c505aa9aa7b21910140759c0f30d90bc5a9afba773547755805866822cf061fb
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch
new file mode 100644
index 00000000000..64c47a92e3f
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch
@@ -0,0 +1,145 @@
+From 22f6a45b665e604f874e82a817d45bb976d8c5ae Mon Sep 17 00:00:00 2001
+From: Timo Tambet <ttambet@gmail.com>
+Date: Sat, 25 Feb 2017 14:48:19 +0200
+Subject: [PATCH 1/1] [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac | 56 +++++++++++++++++++++++++++++++----------------
+ plugins/Makefile.am | 9 ++++++--
+ plugins/dummy/Makefile.am | 5 ++++-
+ 3 files changed, 48 insertions(+), 22 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0d169c8f..792195aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
+ gtk+-x11-3.0
+ x11)
+
+-PKG_CHECK_MODULES(COLOR,
+- colord >= 1.0.2
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+- libcanberra-gtk3
+- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+- lcms2 >= $LCMS_REQUIRED_VERSION
+- libnotify)
++AC_ARG_ENABLE([color],
++ AS_HELP_STRING([--disable-color],
++ [turn off color plugin]),
++ [],
++ [enable_color=yes])
++
++AS_IF([test "$enable_color" = "yes"],
++ [PKG_CHECK_MODULES(COLOR,
++ colord >= 1.0.2
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++ libcanberra-gtk3
++ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ lcms2 >= $LCMS_REQUIRED_VERSION
++ libnotify)
++ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++ ])
++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
+
+ PKG_CHECK_MODULES(DATETIME,
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+@@ -268,23 +278,31 @@ case $host_os in
+ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+ have_wacom=no
+ else
+- if test x$enable_gudev != xno; then
+- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
+- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
+- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
+- else
++ have_wacom=no
++ AS_IF([test "$enable_gudev" != "no"],
++ [AC_ARG_ENABLE([wacom],
++ AS_HELP_STRING([--disable-wacom],
++ [turn off wacom plugin]),
++ [],
++ [enable_wacom=no]) dnl Default value
++ AS_IF([test "$enable_wacom" = "xyes"],
++ [
++ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
++ PKG_CHECK_MODULES(WACOM, [gtk+-3.0, pango >= $PANGO_REQUIRED_VERSION])
++ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++ have_wacom=yes
++ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
++ ])
++ ], [
+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+- fi
+- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
+- have_wacom=yes
++ ])
+ fi
+ ;;
+ *)
+- have_wacom=no
+- ;;
++ have_wacom=no
++ ;;
+ esac
+-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
++AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
+
+ dnl ---------------------------------------------------------------------------
+ dnl - common
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 9324b406..ee78d6d0 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins = \
+ a11y-keyboard \
+ a11y-settings \
+ clipboard \
+- color \
+ datetime \
+ dummy \
+ power \
+@@ -22,13 +21,19 @@ enabled_plugins = \
+
+ disabled_plugins = $(NULL)
+
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
+ else
+ disabled_plugins += smartcard
+ endif
+
+-if HAVE_WACOM
++if BUILD_WACOM
+ enabled_plugins += wacom
+ else
+ disabled_plugins += wacom
+diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
+index cb5856cf..06ac595a 100644
+--- a/plugins/dummy/Makefile.am
++++ b/plugins/dummy/Makefile.am
+@@ -22,10 +22,13 @@ gsd_dummy_LDADD = $(DUMMY_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la
+ desktopdir = $(sysconfdir)/xdg/autostart
+
+ desktop_DATA =
++if !BUILD_COLOR
++desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
++endif
+ if !SMARTCARD_SUPPORT
+ desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
+ endif
+-if !HAVE_WACOM
++if !BUILD_WACOM
+ desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
+ endif
+ if !BUILD_PRINT_NOTIFICATIONS
+--
+2.11.1
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild
new file mode 100644
index 00000000000..a0aa249cabb
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils gnome2 python-any-r1 systemd udev virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
+REQUIRED_USE="
+ input_devices_wacom? ( udev )
+ smartcard? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.44.0:2[dbus]
+ >=x11-libs/gtk+-3.15.3:3
+ >=gnome-base/gnome-desktop-3.11.1:3=
+ >=gnome-base/gsettings-desktop-schemas-3.23.3
+ >=gnome-base/librsvg-2.36.2:2
+ media-fonts/cantarell
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/libcanberra[gtk3]
+ >=media-sound/pulseaudio-2
+ >=sys-power/upower-0.99:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/libnotify-0.7.3:=
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ x11-libs/libXi
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXtst
+ x11-libs/libXxf86misc
+ x11-misc/xkeyboard-config
+
+ >=app-misc/geoclue-2.3.1:2.0
+ >=dev-libs/libgweather-3.9.5:2=
+ >=sci-geosciences/geocode-glib-3.10
+ >=sys-auth/polkit-0.103
+
+ colord? (
+ >=media-libs/lcms-2.2:2
+ >=x11-misc/colord-1.0.2:= )
+ cups? ( >=net-print/cups-1.4[dbus] )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=x11-libs/pango-1.20
+ x11-drivers/xf86-input-wacom
+ virtual/libgudev:= )
+ networkmanager? ( >=net-misc/networkmanager-1.0 )
+ smartcard? ( >=dev-libs/nss-3.11.2 )
+ udev? ( virtual/libgudev:= )
+ wayland? ( dev-libs/wayland )
+"
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+# systemd needed for power and session management, bug #464944
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/dconf
+ !openrc-force? ( sys-apps/systemd )
+ !<gnome-base/gnome-control-center-2.22
+ !<gnome-extra/gnome-color-manager-3.1.1
+ !<gnome-extra/gnome-power-manager-3.1.3
+ !<gnome-base/gnome-session-3.23.2
+"
+# xproto-7.0.15 needed for power plugin
+# FIXME: tests require dbus-mock
+DEPEND="${COMMON_DEPEND}
+ cups? ( sys-apps/sed )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+ gnome-base/gnome-session )
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-devel/gettext
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ x11-proto/inputproto
+ x11-proto/xf86miscproto
+ >=x11-proto/xproto-7.0.15
+"
+
+python_check_deps() {
+ use test && has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Make colord and wacom optional; requires eautoreconf
+ eapply "${FILESDIR}"/${P}-optional.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --enable-man \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable debug more-warnings) \
+ $(use_enable networkmanager network-manager) \
+ $(use_enable smartcard smartcard-support) \
+ $(use_enable udev gudev) \
+ $(use_enable input_devices_wacom wacom) \
+ $(use_enable wayland)
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if ! systemd_is_booted; then
+ ewarn "${PN} needs Systemd to be *running* for working"
+ ewarn "properly. Please follow the this guide to migrate:"
+ ewarn "https://wiki.gentoo.org/wiki/Systemd"
+ fi
+
+ if use openrc-force; then
+ ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+ ewarn "this can lead to unexpected problems and is not supported neither by"
+ ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+ ewarn "you will need to disable this USE flag system wide and retest before"
+ ewarn "opening any bug report."
+ fi
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2017-03-21 0:23 Mart Raudsepp
0 siblings, 0 replies; 13+ messages in thread
From: Mart Raudsepp @ 2017-03-21 0:23 UTC (permalink / raw
To: gentoo-commits
commit: eb2de89d3aad4930f7c15d74fb8a77754a5b81d7
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 00:17:23 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 00:19:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb2de89d
gnome-base/gnome-settings-daemon: p.masked bump to 3.24.0 and sync with 3.22.2 changes
The 3.24.0 bump is untested personally, only diffed and checked the udevrulesdir patch applies.
But this is still p.masked anyway and in all likelyhood works fine, so don't let it differ
from unmasked version.
The bump itself might fix (compared to 3.23.90) some startup or delayed by minutes crashes that
bring down whole (wayland?) session.
gnome-base/gnome-settings-daemon/Manifest | 2 +-
...=> gnome-settings-daemon-3.24.0-optional.patch} | 0
....ebuild => gnome-settings-daemon-3.24.0.ebuild} | 23 ++++++++++------------
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 65ec7082be8..bf8f3402709 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,3 @@
DIST gnome-settings-daemon-3.20.2.tar.xz 1620696 SHA256 1dd7a084449a2c240308d253f86d60f3efe25f59322c3f5ec3b9e2e9f5eabb45 SHA512 b23ac4cfc5c1fe4b1eeb4ba37cae448b2a23e11b988ae609c3d23168a9c22502829b68a4ab5fc8291bde91b429fcb4159c0f37bef78437838de6c6f3417817ed WHIRLPOOL 94463af0fcc3c3e36ded002e359aa1049d8a6171ae9b7edbf1e3ceeda5f1d2ee9389c09fa2929c2197b20a48fa613cc35fb31dc3eed30feec5f370868b1b4e49
DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 WHIRLPOOL edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a
-DIST gnome-settings-daemon-3.23.90.tar.xz 1614204 SHA256 c9e860558a8132763f6441f317e1df47fc5fe64bc5517bcc9ff9d44a08824fac SHA512 995eae1876df7918746a0050fd4fa08fd50d6bef9e0c5474da33eb5fd7fc53a1f4214179035f6b0716f60620f198697cef4eaf70cb24c510ce5a30cfc761bdcb WHIRLPOOL 45b21a328a57c08fd6872fd1b7e1df30a5f2a47ffd2dc32d41b85ccc3e7c0937c505aa9aa7b21910140759c0f30d90bc5a9afba773547755805866822cf061fb
+DIST gnome-settings-daemon-3.24.0.tar.xz 1620184 SHA256 4f31a68aebdd4e0c37336306a4eea4cf219d46ed8fc59e3f3081b7a3088900c4 SHA512 94bf904cb424baa4201fc49e7ea978f86c6e7ede74794fefec784ca125e86b949e8ea7585284377a586d73d438a9fcf0ef9d9e0dc26c4fcba60250b384ec797a WHIRLPOOL e86332a1872bff33511d84d213f4ecb11be0510a1d1e87513f35efcc51a56b3c5d0233bb000671ccb3c5f49f975621a35a315b2353ccd3c02aaec135c0f842bb
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.24.0-optional.patch
similarity index 100%
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch
rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.24.0-optional.patch
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild
similarity index 92%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild
index 558378672a3..e6ce7e8faeb 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild
@@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+GNOME2_EAUTORECONF="yes"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit autotools eutils gnome2 python-any-r1 systemd udev virtualx
+inherit gnome2 python-any-r1 systemd udev virtualx
DESCRIPTION="Gnome Settings Daemon"
HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
@@ -91,6 +92,13 @@ DEPEND="${COMMON_DEPEND}
>=x11-proto/xproto-7.0.15
"
+PATCHES=(
+ # Make colord and wacom optional; requires eautoreconf
+ "${FILESDIR}"/${P}-optional.patch
+ # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
+ "${FILESDIR}"/3.22.2-udevrulesdir-configure.patch
+)
+
python_check_deps() {
use test && has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
}
@@ -99,17 +107,10 @@ pkg_setup() {
use test && python-any-r1_pkg_setup
}
-src_prepare() {
- # Make colord and wacom optional; requires eautoreconf
- eapply "${FILESDIR}"/${P}-optional.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
src_configure() {
gnome2_src_configure \
--disable-static \
+ --with-udevrulesdir="$(get_udevdir)"/rules.d \
$(use_enable colord color) \
$(use_enable cups) \
$(use_enable debug) \
@@ -125,10 +126,6 @@ src_test() {
virtx emake check
}
-src_install() {
- gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
-}
-
pkg_postinst() {
gnome2_pkg_postinst
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2017-07-09 0:36 Mart Raudsepp
0 siblings, 0 replies; 13+ messages in thread
From: Mart Raudsepp @ 2017-07-09 0:36 UTC (permalink / raw
To: gentoo-commits
commit: 77cd248086005aec8854caf0b2eb5574ffe08cae
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 00:24:30 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 00:24:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77cd2480
gnome-base/gnome-settings-daemon: fix optional wacom plugin building
Gentoo-bug: 620486
Thanks-to: Yuh-Horng Chen
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../gnome-settings-daemon-3.22.0-optional.patch | 2 +-
.../gnome-settings-daemon-3.22.2-r1.ebuild | 149 +++++++++++++++++++++
2 files changed, 150 insertions(+), 1 deletion(-)
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
index 3188337445f..9b5369bb346 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
@@ -51,7 +51,7 @@ index 6d9408a..628af0e 100644
+ [turn off wacom plugin]),
+ [],
+ [enable_wacom=no]) dnl Default value
-+ AS_IF([test "$enable_wacom" = "xyes"],
++ AS_IF([test "x$enable_wacom" = "xyes"],
+ [
+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild
new file mode 100644
index 00000000000..ae86f10d52e
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit gnome2 python-any-r1 systemd udev virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
+REQUIRED_USE="
+ input_devices_wacom? ( udev )
+ smartcard? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.7:2[dbus]
+ >=x11-libs/gtk+-3.15.3:3
+ >=gnome-base/gnome-desktop-3.11.1:3=
+ >=gnome-base/gsettings-desktop-schemas-3.20
+ >=gnome-base/librsvg-2.36.2:2
+ media-fonts/cantarell
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/libcanberra[gtk3]
+ >=media-sound/pulseaudio-2
+ >=sys-power/upower-0.99:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/libnotify-0.7.3:=
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ x11-libs/libXi
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXtst
+ x11-libs/libXxf86misc
+ x11-misc/xkeyboard-config
+
+ >=app-misc/geoclue-2.3.1:2.0
+ >=dev-libs/libgweather-3.9.5:2=
+ >=sci-geosciences/geocode-glib-3.10
+ >=sys-auth/polkit-0.103
+
+ colord? (
+ >=media-libs/lcms-2.2:2
+ >=x11-misc/colord-1.0.2:= )
+ cups? ( >=net-print/cups-1.4[dbus] )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=x11-libs/pango-1.20
+ x11-drivers/xf86-input-wacom
+ virtual/libgudev:= )
+ networkmanager? ( >=net-misc/networkmanager-1.0 )
+ smartcard? ( >=dev-libs/nss-3.11.2 )
+ udev? ( virtual/libgudev:= )
+ wayland? ( dev-libs/wayland )
+"
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+# systemd needed for power and session management, bug #464944
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/dconf
+ !openrc-force? ( sys-apps/systemd )
+ !<gnome-base/gnome-control-center-2.22
+ !<gnome-extra/gnome-color-manager-3.1.1
+ !<gnome-extra/gnome-power-manager-3.1.3
+"
+# xproto-7.0.15 needed for power plugin
+# FIXME: tests require dbus-mock
+DEPEND="${COMMON_DEPEND}
+ cups? ( sys-apps/sed )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+ gnome-base/gnome-session )
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ sys-devel/gettext
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ x11-proto/inputproto
+ x11-proto/xf86miscproto
+ >=x11-proto/xproto-7.0.15
+"
+
+PATCHES=(
+ # Make colord and wacom optional; requires eautoreconf
+ "${FILESDIR}"/${PN}-3.22.0-optional.patch
+ # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
+ "${FILESDIR}"/${PV}-udevrulesdir-configure.patch
+)
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+ fi
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --enable-man \
+ --with-udevrulesdir="$(get_udevdir)"/rules.d \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable debug more-warnings) \
+ $(use_enable networkmanager network-manager) \
+ $(use_enable smartcard smartcard-support) \
+ $(use_enable udev gudev) \
+ $(use_enable input_devices_wacom wacom) \
+ $(use_enable wayland)
+}
+
+src_test() {
+ virtx emake check
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if ! systemd_is_booted; then
+ ewarn "${PN} needs Systemd to be *running* for working"
+ ewarn "properly. Please follow the this guide to migrate:"
+ ewarn "https://wiki.gentoo.org/wiki/Systemd"
+ fi
+
+ if use openrc-force; then
+ ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+ ewarn "this can lead to unexpected problems and is not supported neither by"
+ ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+ ewarn "you will need to disable this USE flag system wide and retest before"
+ ewarn "opening any bug report."
+ fi
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2017-08-18 7:50 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2017-08-18 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 652f112eafe9f29a060a10c67feab82d58079c14
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 07:46:24 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 07:50:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652f112e
gnome-base/gnome-settings-daemon: fix build issue with USE="udev -wayland", bug #627966
Package-Manager: Portage-2.3.7, Repoman-2.3.3
.../files/3.24.3-fix-wayland-build.patch | 53 ++++++++++++++++++++++
.../gnome-settings-daemon-3.24.3.ebuild | 2 +
2 files changed, 55 insertions(+)
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
new file mode 100644
index 00000000000..4a06889aaa2
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
@@ -0,0 +1,53 @@
+From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 18 Aug 2017 09:42:56 +0200
+Subject: [PATCH] Fix build issue when gudev is detected in the absence of
+ wayland
+
+See https://bugs.gentoo.org/show_bug.cgi?id=627966
+---
+ configure.ac | 5 +++++
+ plugins/common/Makefile.am | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 908b3a3a..c89d5e2d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
+ AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]),
+ enable_wayland=$enableval, enable_wayland=auto)
+ if test x$enable_wayland != xno; then
++ AS_IF([test "$have_udev" = no],
++ [AC_MSG_ERROR([udev is required for Wayland support])])
++
+ PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no)
+ if test x$have_wayland = xyes; then
+ AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available])
++ GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
+ else
+ if test x$enable_wayland = xyes; then
+ AC_MSG_ERROR([Wayland enabled but not found])
+ fi
+ fi
+ fi
++AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
+
+ dnl ================================================================
+ dnl Plugins
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
+index 107e4d3b..760f3198 100644
+--- a/plugins/common/Makefile.am
++++ b/plugins/common/Makefile.am
+@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \
+ gsd-shell-helper.c \
+ gsd-shell-helper.h
+
+-if HAVE_GUDEV
++if HAVE_WAYLAND
+ libcommon_la_SOURCES += \
+ gsd-device-manager-udev.c \
+ gsd-device-manager-udev.h
+--
+2.14.1
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
index 22f909e01a9..3534c5fa68f 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
@@ -108,6 +108,8 @@ PATCHES=(
"${FILESDIR}"/3.24.2-remove-unneeded-gtk-init.patch
# Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf
"${FILESDIR}"/3.24.2-reduce-memory-usage.patch
+ # Fix build issue when gudev is present but not wayland, bug #627966
+ "${FILESDIR}"/3.24.3-fix-wayland-build.patch
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2017-09-25 16:56 Mart Raudsepp
0 siblings, 0 replies; 13+ messages in thread
From: Mart Raudsepp @ 2017-09-25 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 6da92d43fd40ccf450ad0687a8ee7d719834e28b
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 16:54:18 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 16:54:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da92d43
gnome-base/gnome-settings-daemon: remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
gnome-base/gnome-settings-daemon/Manifest | 1 -
.../files/3.24.2-fix-color-tests.patch | 85 -----------
.../gnome-settings-daemon-3.22.2.ebuild | 149 -------------------
.../gnome-settings-daemon-3.24.2.ebuild | 160 ---------------------
4 files changed, 395 deletions(-)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index bff715e5361..b185d4f051b 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,2 @@
DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 WHIRLPOOL edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a
-DIST gnome-settings-daemon-3.24.2.tar.xz 1621368 SHA256 4aa9d72644e3ee8a30096a38986b0e9543fca92f586c561f6c8a11fb8148dcca SHA512 fa75a499750c9e8f8fd2c1af44d033e55f90f97ef39c4159fa58a2957aeae036b4ae505dede6333b640b0dfcd0400eacd3715aeb184fc021c1d787230b1a1f12 WHIRLPOOL 305f16567488b54be4f7ec359f4a1249c18de74e967a410e18fd4bc8b84748bd5146a3bd2b86852d9e6a37bc829b281e79a38c7a3cfcece5f80ae516d062780f
DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 SHA256 68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593 SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6 WHIRLPOOL 90fa96f9e1c641a63ba4eac2160f6fbc141f31009eaa93be7a4d3737d086553bb5f3fec7a75c32c2e9a364071216a36c578948f60d89867b6e12f8d12948dab4
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch
deleted file mode 100644
index 70069589dae..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 63b73af23efd97de34a9dde58938c5c772040974 Mon Sep 17 00:00:00 2001
-From: Iain Lane <iain@orangesquash.org.uk>
-Date: Fri, 19 May 2017 16:38:07 +0100
-Subject: [PATCH] color: Make the testcase able to run uninstalled
-
-Distributions might want to be able to run their tests during package
-builds, for example.
-
-Compile the schema and set GSETTINGS_SCHEMA_DIR to the build dir.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=782170
----
- Makefile.am | 2 +-
- plugins/color/Makefile.am | 11 ++++++++++-
- plugins/color/gcm-self-test.c | 6 ++++++
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0a32954..096c245 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,8 +2,8 @@ NULL =
-
- SUBDIRS = \
- gnome-settings-daemon \
-- plugins \
- data \
-+ plugins \
- po \
- tests \
- $(NULL)
-diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
-index a280ba8..35dcad4 100644
---- a/plugins/color/Makefile.am
-+++ b/plugins/color/Makefile.am
-@@ -30,6 +30,15 @@ gcm_self_test_LDADD = \
-
- TESTS = gcm-self-test
-
-+BUILT_SOURCES = gschemas.compiled
-+
-+CLEANFILES = gschemas.compiled
-+
-+gschemas.compiled: $(top_builddir)/data/org.gnome.settings-daemon.plugins.color.gschema.xml
-+ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --schema-file=$< --targetdir=$(builddir)
-+
-+all-am: gschemas.compiled
-+
- libexec_PROGRAMS = gsd-color
- gsd_color_SOURCES = \
- main.c \
-@@ -80,7 +89,7 @@ EXTRA_DIST = \
- test-data/Lenovo-T61-Internal.bin \
- test-data/LG-L225W-External.bin
-
--CLEANFILES = \
-+CLEANFILES += \
- $(desktop_DATA)
-
- DISTCLEANFILES = \
-diff --git a/plugins/color/gcm-self-test.c b/plugins/color/gcm-self-test.c
-index 83c06c5..3f00b60 100644
---- a/plugins/color/gcm-self-test.c
-+++ b/plugins/color/gcm-self-test.c
-@@ -281,11 +281,17 @@ gcm_test_frac_day (void)
- int
- main (int argc, char **argv)
- {
-+ char *schema_dir;
-+
- g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
-
- gtk_init (&argc, &argv);
- g_test_init (&argc, &argv, NULL);
-
-+ schema_dir = g_test_build_filename (G_TEST_BUILT, "", NULL);
-+ g_setenv("GSETTINGS_SCHEMA_DIR", schema_dir, TRUE);
-+ g_free (schema_dir);
-+
- g_test_add_func ("/color/edid", gcm_test_edid_func);
- g_test_add_func ("/color/sunset-sunrise", gcm_test_sunset_sunrise);
- g_test_add_func ("/color/sunset-sunrise/fractional-timezone", gcm_test_sunset_sunrise_fractional_timezone);
---
-2.10.2
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild
deleted file mode 100644
index b748cd5fa44..00000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
-REQUIRED_USE="
- input_devices_wacom? ( udev )
- smartcard? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.7:2[dbus]
- >=x11-libs/gtk+-3.15.3:3
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.20
- >=gnome-base/librsvg-2.36.2:2
- media-fonts/cantarell
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.99:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
- x11-misc/xkeyboard-config
-
- >=app-misc/geoclue-2.3.1:2.0
- >=dev-libs/libgweather-3.9.5:2=
- >=sci-geosciences/geocode-glib-3.10
- >=sys-auth/polkit-0.103
-
- colord? (
- >=media-libs/lcms-2.2:2
- >=x11-misc/colord-1.0.2:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20
- x11-drivers/xf86-input-wacom
- virtual/libgudev:= )
- networkmanager? ( >=net-misc/networkmanager-1.0 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- !openrc-force? ( sys-apps/systemd )
- !<gnome-base/gnome-control-center-2.22
- !<gnome-extra/gnome-color-manager-3.1.1
- !<gnome-extra/gnome-power-manager-3.1.3
-"
-# xproto-7.0.15 needed for power plugin
-# FIXME: tests require dbus-mock
-DEPEND="${COMMON_DEPEND}
- cups? ( sys-apps/sed )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- gnome-base/gnome-session )
- app-text/docbook-xsl-stylesheets
- dev-libs/libxml2:2
- dev-libs/libxslt
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-proto/inputproto
- x11-proto/xf86miscproto
- >=x11-proto/xproto-7.0.15
-"
-
-PATCHES=(
- # Make colord and wacom optional; requires eautoreconf
- "${FILESDIR}"/${PN}-3.22.0-optional.patch
- # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
- "${FILESDIR}"/${PV}-udevrulesdir-configure.patch
-)
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-man \
- --with-udevrulesdir="$(get_udevdir)"/rules.d \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable networkmanager network-manager) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_test() {
- virtx emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! systemd_is_booted; then
- ewarn "${PN} needs Systemd to be *running* for working"
- ewarn "properly. Please follow the this guide to migrate:"
- ewarn "https://wiki.gentoo.org/wiki/Systemd"
- fi
-
- if use openrc-force; then
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
- ewarn "this can lead to unexpected problems and is not supported neither by"
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
- ewarn "you will need to disable this USE flag system wide and retest before"
- ewarn "opening any bug report."
- fi
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild
deleted file mode 100644
index 2b68c5d1b65..00000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
-REQUIRED_USE="
- input_devices_wacom? ( udev )
- smartcard? ( udev )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.44.0:2[dbus]
- >=x11-libs/gtk+-3.15.3:3[X]
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.23.3
- >=gnome-base/librsvg-2.36.2:2
- media-fonts/cantarell
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.99:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
- x11-misc/xkeyboard-config
-
- >=app-misc/geoclue-2.3.1:2.0
- >=dev-libs/libgweather-3.9.5:2=
- >=sci-geosciences/geocode-glib-3.10
- >=sys-auth/polkit-0.103
-
- colord? (
- >=media-libs/lcms-2.2:2
- >=x11-misc/colord-1.0.2:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20
- x11-drivers/xf86-input-wacom
- virtual/libgudev:= )
- networkmanager? ( >=net-misc/networkmanager-1.0 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- !openrc-force? ( sys-apps/systemd )
- !<gnome-base/gnome-control-center-2.22
- !<gnome-extra/gnome-color-manager-3.1.1
- !<gnome-extra/gnome-power-manager-3.1.3
- !<gnome-base/gnome-session-3.23.2
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
- cups? ( sys-apps/sed )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
- gnome-base/gnome-session )
- dev-libs/libxml2:2
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-proto/inputproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
- >=x11-proto/xproto-7.0.15
-"
-
-# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
-RESTRICT="test"
-# RESTRICT="!test? ( test )"
-
-PATCHES=(
- # Make colord and wacom optional; requires eautoreconf
- "${FILESDIR}"/${PV}-optional.patch
- # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
- "${FILESDIR}"/${PV}-udevrulesdir-configure.patch
- # Fix uninstalled (during build) color plugin test run
- "${FILESDIR}"/${PV}-fix-color-tests.patch
- # Reduce memory usage by not initing GTK+ where not needed
- "${FILESDIR}"/${PV}-remove-unneeded-gtk-init.patch
- # Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf
- "${FILESDIR}"/${PV}-reduce-memory-usage.patch
-)
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --with-udevrulesdir="$(get_udevdir)"/rules.d \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable networkmanager network-manager) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_test() {
- virtx emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! systemd_is_booted; then
- ewarn "${PN} needs Systemd to be *running* for working"
- ewarn "properly. Please follow the this guide to migrate:"
- ewarn "https://wiki.gentoo.org/wiki/Systemd"
- fi
-
- if use openrc-force; then
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
- ewarn "this can lead to unexpected problems and is not supported neither by"
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
- ewarn "you will need to disable this USE flag system wide and retest before"
- ewarn "opening any bug report."
- fi
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2018-02-03 20:56 Mart Raudsepp
0 siblings, 0 replies; 13+ messages in thread
From: Mart Raudsepp @ 2018-02-03 20:56 UTC (permalink / raw
To: gentoo-commits
commit: e37e07c96faead88e87c679fe78265903b1466ee
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 20:12:08 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 20:55:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37e07c9
gnome-base/gnome-settings-daemon: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
gnome-base/gnome-settings-daemon/Manifest | 1 -
.../files/3.22.2-udevrulesdir-configure.patch | 48 -------
.../gnome-settings-daemon-3.22.0-optional.patch | 111 ---------------
.../gnome-settings-daemon-3.22.2-r1.ebuild | 149 ---------------------
4 files changed, 309 deletions(-)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 58b5a2fa553..3d64a49cf41 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,2 +1 @@
-DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 BLAKE2B 4582793b2c13b4cecb1e93ff5053f94af16dc72436fbfe83a74b21b21c4bf8473409f52acae30e717176b01fd60165e43a69ae16787883ee862fe7fa3b9c448c SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3
DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6
diff --git a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch
deleted file mode 100644
index d0436ecdc6e..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 19394974869513ab4a98d72593dce18f08105983 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 21 Mar 2017 01:30:52 +0200
-Subject: [PATCH] build: Get udevrulesdir from pkg-config
-
-Use the standard way to find the udev rules directory via pkg-config by default,
-and support specifying it, should it be necessary.
-This is the same logic as in colord.
----
- configure.ac | 9 +++++++++
- plugins/rfkill/Makefile.am | 1 -
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8d4f5cb..5390404 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -135,6 +135,15 @@ fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
-
- dnl ---------------------------------------------------------------------------
-+dnl - Where to install udev rules
-+dnl ---------------------------------------------------------------------------
-+AC_ARG_WITH([udevrulesdir],
-+ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
-+ [],
-+ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d])
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-+
-+dnl ---------------------------------------------------------------------------
- dnl - ALSA integration (default enabled)
- dnl ---------------------------------------------------------------------------
- ALSA_PKG=""
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
-index fed7adc..05f2c78 100644
---- a/plugins/rfkill/Makefile.am
-+++ b/plugins/rfkill/Makefile.am
-@@ -59,7 +59,6 @@ plugin_in_files = rfkill.gnome-settings-plugin.in
-
- plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
--udevrulesdir = $(prefix)/lib/udev/rules.d
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
-
- EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA)
---
-2.10.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
deleted file mode 100644
index 9b5369bb346..00000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 2aa9a92b06418642339cf27a3df5051f63eb8ddb Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <mail@ole-reifschneider.de>
-Date: Sat, 11 Apr 2015 23:10:21 +0200
-Subject: [PATCH] Make colord and wacom support optional
-
----
- configure.ac | 41 ++++++++++++++++++++++++++++++-----------
- plugins/Makefile.am | 9 +++++++--
- 2 files changed, 37 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6d9408a..628af0e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,7 +245,17 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
-+AC_ARG_ENABLE([color],
-+ AS_HELP_STRING([--disable-color],
-+ [turn off color plugin]),
-+ [],
-+ [enable_color=yes])
-+
-+AS_IF([test "$enable_color" = "yes"],
-+ [PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
-+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+ ])
-+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
-
- dnl ---------------------------------------------------------------------------
- dnl - datetime
-@@ -270,22 +280,31 @@ case $host_os in
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
- have_wacom=no
- else
-- if test x$enable_gudev != xno; then
-- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-- else
-- AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-- fi
-- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-- have_wacom=yes
-+ have_wacom=no
-+ AS_IF([test "$enable_gudev" != "no"],
-+ [AC_ARG_ENABLE([wacom],
-+ AS_HELP_STRING([--disable-wacom],
-+ [turn off wacom plugin]),
-+ [],
-+ [enable_wacom=no]) dnl Default value
-+ AS_IF([test "x$enable_wacom" = "xyes"],
-+ [
-+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+ have_wacom=yes
-+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-+ ])
-+ ], [
-+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-+ ])
- fi
- ;;
- *)
- have_wacom=no
- ;;
- esac
--AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
-+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
-
- dnl ==============================================
- dnl smartcard section
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 9324b40..ee78d6d 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins = \
- a11y-keyboard \
- a11y-settings \
- clipboard \
-- color \
- datetime \
- dummy \
- power \
-@@ -22,13 +21,19 @@ enabled_plugins = \
-
- disabled_plugins = $(NULL)
-
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if SMARTCARD_SUPPORT
- enabled_plugins += smartcard
- else
- disabled_plugins += smartcard
- endif
-
--if HAVE_WACOM
-+if BUILD_WACOM
- enabled_plugins += wacom
- else
- disabled_plugins += wacom
---
-2.10.1
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild
deleted file mode 100644
index 76625b33ba7..00000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
-REQUIRED_USE="
- input_devices_wacom? ( udev )
- smartcard? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.7:2[dbus]
- >=x11-libs/gtk+-3.15.3:3
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.20
- >=gnome-base/librsvg-2.36.2:2
- media-fonts/cantarell
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.99:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
- x11-misc/xkeyboard-config
-
- >=app-misc/geoclue-2.3.1:2.0
- >=dev-libs/libgweather-3.9.5:2=
- >=sci-geosciences/geocode-glib-3.10
- >=sys-auth/polkit-0.103
-
- colord? (
- >=media-libs/lcms-2.2:2
- >=x11-misc/colord-1.0.2:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20
- x11-drivers/xf86-input-wacom
- virtual/libgudev:= )
- networkmanager? ( >=net-misc/networkmanager-1.0 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- !openrc-force? ( sys-apps/systemd )
- !<gnome-base/gnome-control-center-2.22
- !<gnome-extra/gnome-color-manager-3.1.1
- !<gnome-extra/gnome-power-manager-3.1.3
-"
-# xproto-7.0.15 needed for power plugin
-# FIXME: tests require dbus-mock
-DEPEND="${COMMON_DEPEND}
- cups? ( sys-apps/sed )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- gnome-base/gnome-session )
- app-text/docbook-xsl-stylesheets
- dev-libs/libxml2:2
- dev-libs/libxslt
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-proto/inputproto
- x11-proto/xf86miscproto
- >=x11-proto/xproto-7.0.15
-"
-
-PATCHES=(
- # Make colord and wacom optional; requires eautoreconf
- "${FILESDIR}"/${PN}-3.22.0-optional.patch
- # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
- "${FILESDIR}"/${PV}-udevrulesdir-configure.patch
-)
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-man \
- --with-udevrulesdir="$(get_udevdir)"/rules.d \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable networkmanager network-manager) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_test() {
- virtx emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! systemd_is_booted; then
- ewarn "${PN} needs Systemd to be *running* for working"
- ewarn "properly. Please follow the this guide to migrate:"
- ewarn "https://wiki.gentoo.org/wiki/Systemd"
- fi
-
- if use openrc-force; then
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
- ewarn "this can lead to unexpected problems and is not supported neither by"
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
- ewarn "you will need to disable this USE flag system wide and retest before"
- ewarn "opening any bug report."
- fi
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2018-04-29 0:08 Mart Raudsepp
0 siblings, 0 replies; 13+ messages in thread
From: Mart Raudsepp @ 2018-04-29 0:08 UTC (permalink / raw
To: gentoo-commits
commit: 59d0395d06b0cbf566702184211e3c35d3fed3e2
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 23:46:40 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 23:46:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d0395d
gnome-base/gnome-settings-daemon: remove old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
gnome-base/gnome-settings-daemon/Manifest | 1 -
.../files/3.24.2-reduce-memory-usage.patch | 177 ---------------------
.../files/3.24.2-remove-unneeded-gtk-init.patch | 77 ---------
.../files/3.24.2-udevrulesdir-configure.patch | 48 ------
.../files/3.24.3-fix-wayland-build.patch | 53 ------
.../files/3.24.3-optional.patch | 169 --------------------
.../gnome-settings-daemon-3.24.3.ebuild | 160 -------------------
7 files changed, 685 deletions(-)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 3316056fff1..9bde0ee5da1 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6
DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb
DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch
deleted file mode 100644
index 9e683b06d3b..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 386f456eda7a027dfc706ebb675602d6f067f5c6 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Mon, 27 Mar 2017 00:17:59 -0700
-Subject: [PATCH 5/5] common: avoid loading Adwaita CSS theme into memory
-
-The various Gtk programs are not dependent on any specific theme being
-loaded. Therefore, the parsing the Adwaita CSS theme (which is quite a
-detailed theme) is unnecessary and a few MB of overhead to each gsd
-subprocess.
-
-By setting the GTK_THEME environment variable in main() and providing an
-alternate CSS file (which is empty), we can force Gtk to never load the
-default theme, but instead our empty theme. This is important as otherwise
-GtkSettings can force-load Adwaita upon first use, and that fragments the
-heap.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780555
----
- configure.ac | 1 +
- plugins/common/Makefile.am | 10 ++++++++++
- plugins/common/Makefile.am.gresources | 34 ++++++++++++++++++++++++++++++++++
- plugins/common/daemon-skeleton-gtk.h | 28 ++++++++++++++++++++++++++++
- plugins/common/gsd.gresources.xml | 6 ++++++
- plugins/common/gtk.css | 0
- 6 files changed, 79 insertions(+)
- create mode 100644 plugins/common/Makefile.am.gresources
- create mode 100644 plugins/common/gsd.gresources.xml
- create mode 100644 plugins/common/gtk.css
-
-diff --git a/configure.ac b/configure.ac
-index 475821d..df86831 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,6 +73,7 @@ AC_SUBST([GSD_PLUGIN_LDFLAGS])
-
- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
- AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-+AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
-
- LT_LIB_M
- AC_SUBST(LIBM)
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 239c601..706be12 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -33,6 +33,8 @@ libcommon_la_SOURCES = \
- gsd-device-mapper.h \
- gsd-input-helper.c \
- gsd-input-helper.h \
-+ gsd-resources.c \
-+ gsd-resources.h \
- gsd-settings-migrate.c \
- gsd-settings-migrate.h \
- gsd-shell-helper.c \
-@@ -68,3 +70,11 @@ EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h daemon-skeleton-gtk.h
-
- CLEANFILES = \
- $(GSD_COMMON_ENUM_FILES)
-+
-+DISTCLEANFILES =
-+
-+glib_resources_c = gsd-resources.c
-+glib_resources_h = gsd-resources.h
-+glib_resources_xml = gsd.gresources.xml
-+glib_resources_namespace = gsd
-+include Makefile.am.gresources
-diff --git a/plugins/common/Makefile.am.gresources b/plugins/common/Makefile.am.gresources
-new file mode 100644
-index 0000000..1441d0e
---- /dev/null
-+++ b/plugins/common/Makefile.am.gresources
-@@ -0,0 +1,34 @@
-+resources_xml=$(addprefix $(srcdir)/,$(glib_resources_xml))
-+resources_srcdir=$(dir $(resources_xml))
-+
-+DISTCLEANFILES += $(glib_resources_h) $(glib_resources_c)
-+BUILT_SOURCES += $(glib_resources_h) $(glib_resources_c)
-+CLEANFILES += stamp-resources $(glib_resources_c) $(glib_resources_h)
-+EXTRA_DIST += \
-+ $(glib_resources_xml) \
-+ $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml)) \
-+ $(NULL)
-+
-+stamp-resources: $(glib_resources_c) $(resources_xml)
-+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
-+ --target=xgen-gr.h \
-+ --sourcedir=$(resources_srcdir) \
-+ --generate-header \
-+ --c-name $(glib_resources_namespace) \
-+ $(resources_xml) \
-+ && (cmp -s xgen-gr.h $(glib_resources_h) || cp -f xgen-gr.h $(glib_resources_h)) \
-+ && rm -f xgen-gr.h \
-+ && echo timestamp > $(@F)
-+
-+$(glib_resources_h): stamp-resources
-+ @true
-+
-+$(glib_resources_c): $(resources_xml) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml))
-+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
-+ --target=xgen-gr.c \
-+ --sourcedir=$(resources_srcdir) \
-+ --generate-source \
-+ --c-name $(glib_resources_namespace) \
-+ $(resources_xml) \
-+ && (cmp -s xgen-gr.c $(glib_resources_c) || cp -f xgen-gr.c $(glib_resources_c)) \
-+ && rm -f xgen-gr.c
-diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
-index 3bfd618..3ba0422 100644
---- a/plugins/common/daemon-skeleton-gtk.h
-+++ b/plugins/common/daemon-skeleton-gtk.h
-@@ -163,6 +163,30 @@ register_with_gnome_session (void)
- NULL);
- }
-
-+static void
-+set_empty_gtk_theme (gboolean set)
-+{
-+ static char *old_gtk_theme = NULL;
-+
-+ if (set) {
-+ /* Override GTK_THEME to reduce overhead of CSS engine. By using
-+ * GTK_THEME environment variable, GtkSettings is not allowed to
-+ * initially parse the Adwaita theme.
-+ *
-+ * https://bugzilla.gnome.org/show_bug.cgi?id=780555 */
-+ old_gtk_theme = g_strdup (g_getenv ("GTK_THEME"));
-+ g_setenv ("GTK_THEME", "Disabled", TRUE);
-+ } else {
-+ /* GtkSettings has loaded, so we can drop GTK_THEME used to initialize
-+ * our internal theme. Only the main thread accesses the GTK_THEME
-+ * environment variable, so this is safe to release. */
-+ if (old_gtk_theme != NULL)
-+ g_setenv ("GTK_THEME", old_gtk_theme, TRUE);
-+ else
-+ g_unsetenv ("GTK_THEME");
-+ }
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -172,6 +196,8 @@ main (int argc, char **argv)
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
-+ set_empty_gtk_theme (TRUE);
-+
- /* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
- g_type_ensure (G_TYPE_DBUS_CONNECTION);
- g_type_ensure (G_TYPE_DBUS_PROXY);
-@@ -187,6 +213,8 @@ main (int argc, char **argv)
- exit (1);
- }
-
-+ set_empty_gtk_theme (FALSE);
-+
- if (verbose)
- g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
-
-diff --git a/plugins/common/gsd.gresources.xml b/plugins/common/gsd.gresources.xml
-new file mode 100644
-index 0000000..e4ac1cd
---- /dev/null
-+++ b/plugins/common/gsd.gresources.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<gresources>
-+ <gresource prefix="/org/gtk/libgtk/theme/Disabled">
-+ <file>gtk.css</file>
-+ </gresource>
-+</gresources>
-diff --git a/plugins/common/gtk.css b/plugins/common/gtk.css
-new file mode 100644
-index 0000000..e69de29
---
-2.10.2
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch
deleted file mode 100644
index e47ba34c60d..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b567ec92d5b3004ad52fa02fb02990fcafb63373 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 27 Mar 2017 18:47:54 +0200
-Subject: [PATCH 1/3] housekeeping: Don't init GTK+
-
-We don't use it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780555
----
- plugins/housekeeping/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/housekeeping/main.c b/plugins/housekeeping/main.c
-index 5ccd83d..89c12f7 100644
---- a/plugins/housekeeping/main.c
-+++ b/plugins/housekeeping/main.c
-@@ -4,4 +4,4 @@
- #define MANAGER GsdHousekeepingManager
- #include "gsd-housekeeping-manager.h"
-
--#include "daemon-skeleton-gtk.h"
-+#include "daemon-skeleton.h"
---
-2.10.2
-
-
-From 92d45cd2ce2c4f252db21993f30777433ed84623 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 27 Mar 2017 18:49:35 +0200
-Subject: [PATCH 2/3] print-notifications: Don't init GTK+
-
-We don't use it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780555
----
- plugins/print-notifications/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/print-notifications/main.c b/plugins/print-notifications/main.c
-index 57155d0..a0dd406 100644
---- a/plugins/print-notifications/main.c
-+++ b/plugins/print-notifications/main.c
-@@ -4,4 +4,4 @@
- #define MANAGER GsdPrintNotificationsManager
- #include "gsd-print-notifications-manager.h"
-
--#include "daemon-skeleton-gtk.h"
-+#include "daemon-skeleton.h"
---
-2.10.2
-
-
-From e7e4b2145efebf132f1398da77790849becd7f6b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 27 Mar 2017 18:50:01 +0200
-Subject: [PATCH 3/3] wacom: Don't init GTK+
-
-We don't use it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780555
----
- plugins/wacom/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/wacom/main.c b/plugins/wacom/main.c
-index a19a71b..ad1367c 100644
---- a/plugins/wacom/main.c
-+++ b/plugins/wacom/main.c
-@@ -4,4 +4,4 @@
- #define MANAGER GsdWacomManager
- #include "gsd-wacom-manager.h"
-
--#include "daemon-skeleton-gtk.h"
-+#include "daemon-skeleton.h"
---
-2.10.2
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
deleted file mode 100644
index 16988f945d2..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 29 May 2017 00:38:57 +0300
-Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
-
-Use the standard way to find the udev rules directory via pkg-config by default,
-and support specifying it, should it be necessary.
-This is the same logic as in colord.
----
- configure.ac | 9 +++++++++
- plugins/rfkill/Makefile.am | 1 -
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1107578..475821d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -104,6 +104,15 @@ fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
-
- dnl ---------------------------------------------------------------------------
-+dnl - Where to install udev rules
-+dnl ---------------------------------------------------------------------------
-+AC_ARG_WITH([udevrulesdir],
-+ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
-+ [],
-+ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d])
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-+
-+dnl ---------------------------------------------------------------------------
- dnl - ALSA integration (default enabled)
- dnl ---------------------------------------------------------------------------
- ALSA_PKG=""
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
-index 3c5ec47..bfc34c6 100644
---- a/plugins/rfkill/Makefile.am
-+++ b/plugins/rfkill/Makefile.am
-@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
--udevrulesdir = $(prefix)/lib/udev/rules.d
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
-
- EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
---
-2.10.2
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
deleted file mode 100644
index 4a06889aaa2..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 18 Aug 2017 09:42:56 +0200
-Subject: [PATCH] Fix build issue when gudev is detected in the absence of
- wayland
-
-See https://bugs.gentoo.org/show_bug.cgi?id=627966
----
- configure.ac | 5 +++++
- plugins/common/Makefile.am | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 908b3a3a..c89d5e2d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
- AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]),
- enable_wayland=$enableval, enable_wayland=auto)
- if test x$enable_wayland != xno; then
-+ AS_IF([test "$have_udev" = no],
-+ [AC_MSG_ERROR([udev is required for Wayland support])])
-+
- PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no)
- if test x$have_wayland = xyes; then
- AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available])
-+ GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
- else
- if test x$enable_wayland = xyes; then
- AC_MSG_ERROR([Wayland enabled but not found])
- fi
- fi
- fi
-+AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
-
- dnl ================================================================
- dnl Plugins
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 107e4d3b..760f3198 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \
- gsd-shell-helper.c \
- gsd-shell-helper.h
-
--if HAVE_GUDEV
-+if HAVE_WAYLAND
- libcommon_la_SOURCES += \
- gsd-device-manager-udev.c \
- gsd-device-manager-udev.h
---
-2.14.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch
deleted file mode 100644
index 608784c43bb..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <mail@ole-reifschneider.de>
-Date: Tue, 15 Aug 2017 18:51:42 +0200
-Subject: [PATCH 1/6] Make colord and wacom support optional
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-Signed-off-by: Timo Tambet <ttambet@gmail.com>
-Signed-off-by: Yuh-Horng Chen <yhchens@gmail.com>
----
- configure.ac | 54 ++++++++++++++++++++++++++++++----------------
- plugins/Makefile.am | 9 ++++++--
- plugins/common/Makefile.am | 7 ++++--
- plugins/dummy/Makefile.am | 5 ++++-
- 4 files changed, 52 insertions(+), 23 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 73fe91e6..d8778c93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
- gtk+-x11-3.0
- x11)
-
--PKG_CHECK_MODULES(COLOR,
-- colord >= 1.0.2
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-- libcanberra-gtk3
-- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
-- lcms2 >= $LCMS_REQUIRED_VERSION
-- libnotify)
-+AC_ARG_ENABLE([color],
-+ AS_HELP_STRING([--disable-color],
-+ [turn off color plugin]),
-+ [],
-+ [enable_color=yes])
-+
-+AS_IF([test "$enable_color" = "yes"],
-+ [PKG_CHECK_MODULES(COLOR,
-+ colord >= 1.0.2
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+ libcanberra-gtk3
-+ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
-+ lcms2 >= $LCMS_REQUIRED_VERSION
-+ libnotify)
-+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+ ])
-+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
-
- PKG_CHECK_MODULES(DATETIME,
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION
-@@ -268,23 +278,31 @@ case $host_os in
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
- have_wacom=no
- else
-- if test x$enable_gudev != xno; then
-- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
-- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
-- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-- else
-- AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-- fi
-- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-- have_wacom=yes
-+ have_wacom=no
-+ AS_IF([test "$enable_gudev" != "no"],
-+ [AC_ARG_ENABLE([wacom],
-+ AS_HELP_STRING([--disable-wacom],
-+ [turn off wacom plugin]),
-+ [],
-+ [enable_wacom=no]) dnl Default value
-+ AS_IF([test "$enable_wacom" = "yes"],
-+ [
-+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-+ PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
-+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+ have_wacom=yes
-+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-+ ])
-+ ], [
-+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-+ ])
- fi
- ;;
- *)
- have_wacom=no
- ;;
- esac
--AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
-+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
-
- dnl ---------------------------------------------------------------------------
- dnl - common
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 9324b406..ee78d6d0 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins = \
- a11y-keyboard \
- a11y-settings \
- clipboard \
-- color \
- datetime \
- dummy \
- power \
-@@ -22,13 +21,19 @@ enabled_plugins = \
-
- disabled_plugins = $(NULL)
-
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if SMARTCARD_SUPPORT
- enabled_plugins += smartcard
- else
- disabled_plugins += smartcard
- endif
-
--if HAVE_WACOM
-+if BUILD_WACOM
- enabled_plugins += wacom
- else
- disabled_plugins += wacom
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 239c6015..65de4007 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \
- -I$(top_builddir)/gnome-settings-daemon \
- -I$(top_srcdir)/data/
-
--libcommon_la_CFLAGS = $(COMMON_CFLAGS)
-+libcommon_la_CFLAGS = \
-+ $(COMMON_CFLAGS) \
-+ $(LIBWACOM_CFLAGS)
-
- libcommon_la_LDFLAGS = \
- $(GSD_PLUGIN_LDFLAGS)
-
- libcommon_la_LIBADD = \
- $(top_builddir)/gnome-settings-daemon/libgsd.la \
-- $(COMMON_LIBS)
-+ $(COMMON_LIBS) \
-+ $(LIBWACOM_LIBS)
-
- libexec_PROGRAMS = gsd-test-input-helper
-
-diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
-index cb5856cf..d8e8bc4e 100644
---- a/plugins/dummy/Makefile.am
-+++ b/plugins/dummy/Makefile.am
-@@ -25,7 +25,10 @@ desktop_DATA =
- if !SMARTCARD_SUPPORT
- desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
- endif
--if !HAVE_WACOM
-+if !BUILD_COLOR
-+desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
-+endif
-+if !BUILD_WACOM
- desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
- endif
- if !BUILD_PRINT_NOTIFICATIONS
---
-2.14.1
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
deleted file mode 100644
index f8ecb153f4d..00000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
-REQUIRED_USE="
- input_devices_wacom? ( udev )
- smartcard? ( udev )
- wayland? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.44.0:2[dbus]
- >=x11-libs/gtk+-3.15.3:3[X,wayland?]
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.23.3
- >=gnome-base/librsvg-2.36.2:2
- media-fonts/cantarell
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.99:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
- x11-misc/xkeyboard-config
-
- >=app-misc/geoclue-2.3.1:2.0
- >=dev-libs/libgweather-3.9.5:2=
- >=sci-geosciences/geocode-glib-3.10
- >=sys-auth/polkit-0.103
-
- colord? (
- >=media-libs/lcms-2.2:2
- >=x11-misc/colord-1.0.2:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20
- x11-drivers/xf86-input-wacom
- virtual/libgudev:= )
- networkmanager? ( >=net-misc/networkmanager-1.0 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- !openrc-force? ( sys-apps/systemd )
- !<gnome-base/gnome-control-center-2.22
- !<gnome-extra/gnome-color-manager-3.1.1
- !<gnome-extra/gnome-power-manager-3.1.3
- !<gnome-base/gnome-session-3.23.2
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
- cups? ( sys-apps/sed )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
- gnome-base/gnome-session )
- dev-libs/libxml2:2
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-proto/inputproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
- >=x11-proto/xproto-7.0.15
-"
-
-# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- # Make colord and wacom optional; requires eautoreconf
- "${FILESDIR}"/${PV}-optional.patch
- # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
- "${FILESDIR}"/3.24.2-udevrulesdir-configure.patch
- # Reduce memory usage by not initing GTK+ where not needed
- "${FILESDIR}"/3.24.2-remove-unneeded-gtk-init.patch
- # Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf
- "${FILESDIR}"/3.24.2-reduce-memory-usage.patch
- # Fix build issue when gudev is present but not wayland, bug #627966
- "${FILESDIR}"/3.24.3-fix-wayland-build.patch
-)
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --with-udevrulesdir="$(get_udevdir)"/rules.d \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable networkmanager network-manager) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_test() {
- virtx emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! systemd_is_booted; then
- ewarn "${PN} needs Systemd to be *running* for working"
- ewarn "properly. Please follow the this guide to migrate:"
- ewarn "https://wiki.gentoo.org/wiki/Systemd"
- fi
-
- if use openrc-force; then
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
- ewarn "this can lead to unexpected problems and is not supported neither by"
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
- ewarn "you will need to disable this USE flag system wide and retest before"
- ewarn "opening any bug report."
- fi
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2019-03-30 22:21 Mart Raudsepp
0 siblings, 0 replies; 13+ messages in thread
From: Mart Raudsepp @ 2019-03-30 22:21 UTC (permalink / raw
To: gentoo-commits
commit: 645a7def930e5891efe2942f7bb29bbfa2e0d7d5
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 21:59:58 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 21:59:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645a7def
gnome-base/gnome-settings-daemon: remove old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gnome-settings-daemon/Manifest | 4 -
.../files/3.28.1-fix-non-wayland-build.patch | 88 --------------
.../gnome-settings-daemon-3.26.2-r1.ebuild | 132 ---------------------
.../gnome-settings-daemon-3.28.1-r1.ebuild | 132 ---------------------
.../gnome-settings-daemon-3.30.2.ebuild | 130 --------------------
5 files changed, 486 deletions(-)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 150fea5e155..419a91fa4d5 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,8 +1,4 @@
DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb
DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0
-DIST gnome-settings-daemon-3.26.2-patchset.tar.xz 42408 BLAKE2B 3b54dd1b161f4137eeb7c110be70444e3b8eb602a7d1c12ec6aaa32d887d46c3e1dc61df2a04895b7c6e2d67a68edeced5f758f688533caa9900deace7b6d542 SHA512 3ab36a03e2892ad193f420722025753990158ac450c686b9fba490cda4e7e1be69574dd4d3b9c8ed5e238f23933065abc28aee480ff1e2e5dad28e364c04fc0b
-DIST gnome-settings-daemon-3.26.2.tar.xz 1589696 BLAKE2B f1fd18e80caf5badb0da1f07cbe994b73a99ace004bf3b568114d6cd6110ebd092ee3a023a1ec818f3946f6f7cdb7ee21417782e271c8aa9ebd9d1d4c35ea286 SHA512 7785ebcb7df466c50557b75a3092f568e375adcf5a40f73e31d5cc69fa63bc556a4447a96e6e612c3bf523735e67168afae0b9c1fab32912d41014436d33b7ff
-DIST gnome-settings-daemon-3.28.1-patchset.tar.xz 5216 BLAKE2B eab85f6475c1da9c8beb1dea7d7d79bdaf2e57ac82e90a4ab877e5ffbd8423df8ed5dbd03ac6586a3aadf2be16b89e2955267be24af71db8c89cc407241e0bc9 SHA512 f56a5d62ba45976a01c8fcab63c4d7afd21dbe7a4c75158cc54fc60552faf875b0ca1be7a882c11d814566e7a4ded63ce52d10d214bd1f7926c2d7b0dbaf1590
-DIST gnome-settings-daemon-3.28.1.tar.xz 1362420 BLAKE2B d809696ea7a2df3b89b1e2badbd015623e624c38f44a087e26d167c7ba9a5499a33e6e4ebb12448f69d8aa645154bc176a156f1b9e4a749684e5a497a7be6fc6 SHA512 22e42ce92a6f3ad67a0ef7d1676a6dd3d533b0bc91193d8b2a19a51d7c9601c87caf391c233bb1b96e8a1270d610aca52523d0ae12a38b0e3911065c3a67e10f
DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B b8f2573e806ee5aedcc1476de3550cdc39933c869d64c9d13e463cdf27fa7695e69e57612738fa5438988eda78ae998808508c94fbf841ec037eb1f103921458 SHA512 7318029f4145379b05f7a95686917b4ea7623fd0059559930072350db12170d6083d75c170578516bcede5282da677013086c343abe779b9d1696bd882b7e34d
DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60 SHA512 517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84
diff --git a/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch
deleted file mode 100644
index dd003d6c069..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 91d5e708835b4c7810835d59b8ef5968454cfd0a Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Fri, 15 Jun 2018 23:05:01 +0800
-Subject: [PATCH 1/2] common: Fix build with wayland disabled on FreeBSD
-
-HAVE_WAYLAND is always defined. We should check whether it is set to a
-non-zero value instead of checking whether it is defined.
-
-(cherry picked from commit 34199fa54641abae15199a311002ac726f47aa89)
----
- plugins/common/gsd-device-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/common/gsd-device-manager.c b/plugins/common/gsd-device-manager.c
-index 541f2948..ff72ad69 100644
---- a/plugins/common/gsd-device-manager.c
-+++ b/plugins/common/gsd-device-manager.c
-@@ -275,7 +275,7 @@ gsd_device_manager_get (void)
- manager = g_object_get_data (G_OBJECT (screen), "gsd-device-manager-data");
-
- if (!manager) {
--#ifdef HAVE_WAYLAND
-+#if HAVE_WAYLAND
- if (gnome_settings_is_wayland ()) {
- manager = g_object_new (GSD_TYPE_UDEV_DEVICE_MANAGER,
- NULL);
---
-2.17.0
-
-
-From 218f1ff0a3c6c500fd36601a4db6902fc1c57a43 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Fri, 22 Jun 2018 20:12:50 +0200
-Subject: [PATCH 2/2] build: Fix build when wayland support is disabled
-
-The udev based device manager used for wayland environments was built
-based on the state of the gudev option instead of the wayland option.
-This resulted in an build error when building with `-Dwayland=false`
-since the gdk/gdkwayland.h header file is not present on systems without
-gdk-wayland-3.0.
-
-This patch puts the compilation of the udev based device manager behind
-the wayland option and the gdk-wayland-3.0 dependency
-
-(cherry picked from commit 51088a9c27d713bbe63359b865603c833eb5a930)
----
- meson.build | 3 ++-
- plugins/common/meson.build | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 79c493a1..27fdd049 100644
---- a/meson.build
-+++ b/meson.build
-@@ -129,11 +129,12 @@ if enable_colord
- colord_dep = dependency('colord', version: '>= 1.0.2')
- endif
-
--# Check for libwayland-client
-+# Check for wayland dependencies
- enable_wayland = get_option('wayland')
- if enable_wayland
- assert(enable_gudev, 'GUDev support is required for wayland support.')
- wayland_client_dep = dependency('wayland-client')
-+ wayland_gdk_dep = dependency('gdk-wayland-3.0')
- endif
- config_h.set10('HAVE_WAYLAND', enable_wayland)
-
-diff --git a/plugins/common/meson.build b/plugins/common/meson.build
-index 65a0757c..6bda2d2a 100644
---- a/plugins/common/meson.build
-+++ b/plugins/common/meson.build
-@@ -42,10 +42,10 @@ if host_is_darwin
- ldflags += ['-Wl,-bundle_loader,@0@'.format(join_paths(), meson.build_root(), meson.project_name(), meson.project_name())]
- endif
-
--if enable_gudev
-+if enable_wayland
- sources += files('gsd-device-manager-udev.c')
-
-- deps += gudev_dep
-+ deps += [wayland_gdk_dep, gudev_dep]
- endif
-
- if enable_wacom
---
-2.17.0
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
deleted file mode 100644
index b7c6a9990f9..00000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit smartcard systemd test +udev wayland"
-REQUIRED_USE="
- ^^ ( elogind systemd )
- input_devices_wacom? ( udev )
- smartcard? ( udev )
- wayland? ( udev )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.53.0:2
- >=x11-libs/gtk+-3.15.3:3[X,wayland?]
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.23.3
- >=gnome-base/librsvg-2.36.2:2
- media-fonts/cantarell
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.99:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
- x11-misc/xkeyboard-config
-
- >=app-misc/geoclue-2.3.1:2.0
- >=dev-libs/libgweather-3.9.5:2=
- >=sci-geosciences/geocode-glib-3.10
- >=sys-auth/polkit-0.103
-
- colord? (
- >=media-libs/lcms-2.2:2
- >=x11-misc/colord-1.0.2:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20
- x11-drivers/xf86-input-wacom
- virtual/libgudev:= )
- networkmanager? ( >=net-misc/networkmanager-1.0 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
-"
-# logind needed for power and session management, bug #464944
-# gnome-session-3.25.4 adapts to Orientation and XRANDR components removal (moved to mutter)
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- elogind? ( sys-auth/elogind )
- systemd? ( sys-apps/systemd )
- !<gnome-base/gnome-session-3.25.4
-"
-DEPEND="${COMMON_DEPEND}
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
- gnome-base/gnome-session )
- dev-libs/libxml2:2
- dev-util/glib-utils
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-
-# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.28+
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- # upstream gnome-3-26 branch up to its abandonment in February 2018 (many unreleased fixes); requires eautoreconf
- # Make colord and wacom optional; requires eautoreconf
- # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
- # Fix build system to require gudev with wayland, bug #627966; requires eautoreconf
- "${WORKDIR}"/patches/
- "${FILESDIR}"/glib-2.58-compat.patch # included in 3.29.1+, might be backported to 3.28 too
-)
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --with-udevrulesdir="$(get_udevdir)"/rules.d \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable networkmanager network-manager) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild
deleted file mode 100644
index 16058730679..00000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
-
-inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland"
-REQUIRED_USE="
- ^^ ( elogind systemd )
- input_devices_wacom? ( udev )
- wayland? ( udev )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# >=polkit-0.114 for ITS translation rules of .policy files
-COMMON_DEPEND="
- >=sci-geosciences/geocode-glib-3.10
- >=dev-libs/glib-2.53.0:2
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.23.3
- >=x11-libs/gtk+-3.15.3:3[X,wayland?]
- >=dev-libs/libgweather-3.9.5:2=
- colord? (
- >=x11-misc/colord-1.0.2:=
- >=media-libs/lcms-2.2:2 )
- media-libs/libcanberra[gtk3]
- >=app-misc/geoclue-2.3.1:2.0
- >=x11-libs/libnotify-0.7.3
- >=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.114
- >=sys-power/upower-0.99:=
- x11-libs/libX11
- x11-libs/libXtst
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
- input_devices_wacom? ( >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20.0
- x11-libs/gdk-pixbuf:2 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- cups? ( >=net-print/cups-1.4[dbus] )
- networkmanager? ( >=net-misc/networkmanager-1.0 )
- media-libs/alsa-lib
- x11-libs/libXi
- x11-libs/libXext
- media-libs/fontconfig
-"
-# logind needed for power and session management, bug #464944
-# gnome-session-3.27.90 and gdm-3.27.9 adapt to A11yKeyboard component removal (moved to shell dealing with it)
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- elogind? ( sys-auth/elogind )
- systemd? ( sys-apps/systemd )
- !<gnome-base/gnome-session-3.27.90
- !<gnome-base/gdm-3.27.90
-"
-# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
-DEPEND="${COMMON_DEPEND}
- sys-kernel/linux-headers
- dev-util/glib-utils
- dev-util/gdbus-codegen
- x11-base/xorg-proto
- ${PYTHON_DEPS}
- test? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
- gnome-base/gnome-session )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.30+ (incompatible build system python needs until then as well)
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- # upstream gnome-3-28 branch up to its abandonment in August 2018 (small bug fixes)
- # Allow disabling udev and networkmanager on Linux
- # Make colord and wacom optional
- # glib 2.58 compatibility fix; included in 3.29.1+
- "${WORKDIR}"/patches/
- # Fix non-wayland builds; 3.32 won't have this device manager code anymore, so nothing to upstream
- "${FILESDIR}"/${PV}-fix-non-wayland-build.patch
-)
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
- -Dudev_dir="$(get_udevdir)"
- -Dalsa=true
- $(meson_use udev gudev)
- $(meson_use colord)
- $(meson_use cups)
- $(meson_use networkmanager network_manager)
- -Drfkill=true
- $(meson_use smartcard)
- $(meson_use input_devices_wacom wacom)
- $(meson_use wayland)
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild
deleted file mode 100644
index 98e4f1b2b1b..00000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
-
-inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland"
-REQUIRED_USE="
- ^^ ( elogind systemd )
- input_devices_wacom? ( udev )
- wayland? ( udev )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# >=polkit-0.114 for ITS translation rules of .policy files
-COMMON_DEPEND="
- >=sci-geosciences/geocode-glib-3.10
- >=dev-libs/glib-2.53.0:2
- >=gnome-base/gnome-desktop-3.11.1:3=
- >=gnome-base/gsettings-desktop-schemas-3.27.90
- >=x11-libs/gtk+-3.15.3:3[X,wayland?]
- >=dev-libs/libgweather-3.9.5:2=
- colord? (
- >=x11-misc/colord-1.0.2:=
- >=media-libs/lcms-2.2:2 )
- media-libs/libcanberra[gtk3]
- >=app-misc/geoclue-2.3.1:2.0
- >=x11-libs/libnotify-0.7.3
- >=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.114
- >=sys-power/upower-0.99:=
- x11-libs/libX11
- x11-libs/libXtst
- udev? ( virtual/libgudev:= )
- wayland? ( dev-libs/wayland )
- input_devices_wacom? ( >=dev-libs/libwacom-0.7
- >=x11-libs/pango-1.20.0
- x11-libs/gdk-pixbuf:2 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- cups? ( >=net-print/cups-1.4[dbus] )
- networkmanager? ( >=net-misc/networkmanager-1.0 )
- media-libs/alsa-lib
- x11-libs/libXi
- x11-libs/libXext
- media-libs/fontconfig
-"
-# logind needed for power and session management, bug #464944
-# gnome-session-3.27.90 and gdm-3.27.9 adapt to A11yKeyboard component removal (moved to shell dealing with it)
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- elogind? ( sys-auth/elogind )
- systemd? ( sys-apps/systemd )
- !<gnome-base/gnome-session-3.27.90
- !<gnome-base/gdm-3.27.90
-"
-# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
-DEPEND="${COMMON_DEPEND}
- sys-kernel/linux-headers
- dev-util/glib-utils
- dev-util/gdbus-codegen
- x11-base/xorg-proto
- ${PYTHON_DEPS}
- test? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
- gnome-base/gnome-session )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.30+ (incompatible build system python needs until then as well)
-#RESTRICT="!test? ( test )"
-
-PATCHES=(
- # Translation updates from gnome-3-30 branch
- # Allow disabling udev and networkmanager on Linux
- # Make colord and wacom optional
- "${WORKDIR}"/patches/
-)
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
- has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
- -Dudev_dir="$(get_udevdir)"
- -Dalsa=true
- $(meson_use udev gudev)
- $(meson_use colord)
- $(meson_use cups)
- $(meson_use networkmanager network_manager)
- -Drfkill=true
- $(meson_use smartcard)
- $(meson_use input_devices_wacom wacom)
- $(meson_use wayland)
- -Dexperimental_suspend_then_hibernate=false
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2020-02-24 21:05 Mart Raudsepp
0 siblings, 0 replies; 13+ messages in thread
From: Mart Raudsepp @ 2020-02-24 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 079fc0ca922964e6705420084e5c63e8912ec38b
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 21:03:32 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 21:04:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079fc0ca
gnome-base/gnome-settings-daemon: fix USE="input_devices_wacom -wayland" build
Closes: https://bugs.gentoo.org/677494
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../files/3.32.1-fix-wacom-no-wayland.patch | 25 ++++++++++++++++++++++
.../gnome-settings-daemon-3.32.1-r1.ebuild | 1 +
2 files changed, 26 insertions(+)
diff --git a/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
new file mode 100644
index 00000000000..ea343c44b6f
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.32.1-fix-wacom-no-wayland.patch
@@ -0,0 +1,25 @@
+From ec6982cc8b3fccc35dbd5df3c4e22ab94709c66d Mon Sep 17 00:00:00 2001
+From: Vlad Banea <vlb@xiphos.ca>
+Date: Tue, 31 Dec 2019 15:35:41 -0500
+Subject: [PATCH] plugins/wacom: Fix build without WAYLAND
+
+---
+ plugins/wacom/gsd-wacom-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
+index e1c8eaa7..92fd96c3 100644
+--- a/plugins/wacom/gsd-wacom-manager.c
++++ b/plugins/wacom/gsd-wacom-manager.c
+@@ -190,7 +190,7 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass)
+ static gchar *
+ get_device_path (GdkDevice *device)
+ {
+-#ifdef HAVE_WAYLAND
++#if HAVE_WAYLAND
+ if (gnome_settings_is_wayland ())
+ return g_strdup (gdk_wayland_device_get_node_path (device));
+ else
+--
+2.20.1
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
index ae8ba7216b1..10a45fa6a23 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1-r1.ebuild
@@ -85,6 +85,7 @@ PATCHES=(
# Allow disabling udev and networkmanager on Linux
# Make colord and wacom optional
"${WORKDIR}"/patches/
+ "${FILESDIR}"/${PV}-fix-wacom-no-wayland.patch #677494, fixed in 3.36
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2021-11-12 19:44 Mike Gilbert
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert @ 2021-11-12 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 1106846c19996c2273d25bf4a1bd7ff27e470e68
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 12 19:43:47 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 19:44:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1106846c
gnome-base/gnome-settings-daemon: backport meson fix
Closes: https://bugs.gentoo.org/823134
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...emon-40.0.1-build-fix-str-bool-comparison.patch | 29 ++++++++++++++++++++++
.../gnome-settings-daemon-40.0.1.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch
new file mode 100644
index 00000000000..19cb682ca29
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch
@@ -0,0 +1,29 @@
+From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 16 Jul 2021 16:02:36 +0200
+Subject: [PATCH] build: Fix str/bool comparison
+
+gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==.
+The result of this is undefined and will become a hard error in a future Meson release.
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fdf71713..ba2a90ca 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release')
+ common_flags += ['-DG_DISABLE_CAST_CHECKS']
+ endif
+
+-# Workaround for meson's bug
+-# https://github.com/mesonbuild/meson/pull/1896
+-if get_option('b_ndebug') == true
++if get_option('b_ndebug') == 'true'
+ common_flags += ['-DG_DISABLE_ASSERT']
+ endif
+
+--
+GitLab
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
index 199826b093c..d0b070e0d12 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
@@ -93,6 +93,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
"${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
+ "${FILESDIR}"/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/
@ 2022-03-23 6:14 Matt Turner
0 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2022-03-23 6:14 UTC (permalink / raw
To: gentoo-commits
commit: 72c94dab3debdbe8eddb02df923ba0b91a0473b5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 06:12:41 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 06:14:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c94dab
gnome-base/gnome-settings-daemon: Version bump to 42.1
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gnome-base/gnome-settings-daemon/Manifest | 1 +
...wacom-optional-and-controllable-via-meson.patch | 40 ++++++
.../gnome-settings-daemon-42.1.ebuild | 147 +++++++++++++++++++++
3 files changed, 188 insertions(+)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 70eeb5a866c5..a0ec3b528cb3 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1 +1,2 @@
DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a
+DIST gnome-settings-daemon-42.1.tar.xz 1481432 BLAKE2B d045b2e2a17c6c54f0014db03e1b2d645086d907383b849de82f972af39463acf06ab1207817f171fd3b7a33b60303d058f04495158bb49aab7899da740f732c SHA512 20e87fc2318d77af016ec071cc6070f43ac42eaaf60a1f9bdb4278f59e038268e0a37759f0ab31068d8701b9dc64d142c0a875f0eeaa700ad47e0dbca3b9d141
diff --git a/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
new file mode 100644
index 000000000000..3956b7413978
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
@@ -0,0 +1,40 @@
+From 1e07481d4fd989828a7237c365e5420f50196ddd Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 14 Mar 2019 09:43:00 +0200
+Subject: [PATCH] build: Make wacom optional and controllable via meson_options
+
+---
+ meson.build | 4 ++--
+ meson_options.txt | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a8955a49..0ac4f3ba 100644
+--- a/meson.build
++++ b/meson.build
+@@ -154,8 +154,8 @@ if enable_wayland
+ endif
+ config_h.set10('HAVE_WAYLAND', enable_wayland)
+
+-# wacom (disabled for s390/s390x and non Linux platforms)
+-enable_wacom = host_is_linux_not_s390
++# wacom
++enable_wacom = get_option('wacom')
+ if enable_wacom
+ assert(enable_gudev, 'GUDev support is required for wacom support.')
+ libwacom_dep = dependency('libwacom', version: '>= 0.7')
+diff --git a/meson_options.txt b/meson_options.txt
+index 3e04cf64..010053e2 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -9,6 +9,7 @@ option('network_manager', type: 'boolean', value: true, description: 'build with
+ option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
+ option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
+ option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
++option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support')
+ option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
+ option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
+ option('colord', type: 'boolean', value: true, description: 'build with colord support')
+--
+2.34.1
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
new file mode 100644
index 000000000000..43fc4b23d465
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ ^^ ( elogind systemd )
+ input_devices_wacom? ( udev )
+ wayland? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+DEPEND="
+ >=sci-geosciences/geocode-glib-3.10
+ >=dev-libs/glib-2.58:2
+ >=gnome-base/gnome-desktop-3.37.1:3=
+ >=gnome-base/gsettings-desktop-schemas-42
+ >=x11-libs/gtk+-3.15.3:3[X,wayland?]
+ >=dev-libs/libgweather-4.0.0:4=
+ colord? (
+ >=x11-misc/colord-1.4.5:=
+ >=media-libs/lcms-2.2:2
+ )
+ media-libs/libcanberra[gtk3]
+ >=app-misc/geoclue-2.3.1:2.0
+ >=x11-libs/libnotify-0.7.3
+ >=media-sound/pulseaudio-12.99.3[glib]
+ >=sys-auth/polkit-0.114
+ >=sys-power/upower-0.99.12:=
+ x11-libs/libX11
+ >=x11-libs/libXfixes-6.0.0
+ udev? ( dev-libs/libgudev:= )
+ wayland? ( dev-libs/wayland )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=x11-libs/pango-1.20.0
+ x11-libs/gdk-pixbuf:2
+ )
+ smartcard? ( >=dev-libs/nss-3.11.2 )
+ cups? ( >=net-print/cups-1.4[dbus] )
+ modemmanager? (
+ >=app-crypt/gcr-3.7.5:=
+ >=net-misc/modemmanager-1.0:=
+ )
+ networkmanager? ( >=net-misc/networkmanager-1.0 )
+ media-libs/alsa-lib
+ x11-libs/libXi
+ x11-libs/libXext
+ media-libs/fontconfig
+ systemd? (
+ >=sys-apps/systemd-243
+ )
+"
+# logind needed for power and session management, bug #464944
+# gnome-session-3.33.90/gdm-3.33.90/gnome-shell-extensions-3.34.1/gnome-flashback-3.33.1 adapt to Clipboard and Mouse component removals (moved to mutter)
+RDEPEND="${DEPEND}
+ gnome-base/dconf
+ elogind? ( sys-auth/elogind )
+ !<gnome-base/gnome-session-3.33.90
+ !<gnome-base/gdm-3.33.90
+ !<gnome-extra/gnome-shell-extensions-3.34.1
+ !<gnome-base/gnome-flashback-3.33.1
+"
+# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
+BDEPEND="
+ sys-kernel/linux-headers
+ dev-util/glib-utils
+ dev-util/gdbus-codegen
+ x11-base/xorg-proto
+ ${PYTHON_DEPS}
+ test? (
+ $(python_gen_any_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
+ ')
+ gnome-base/gnome-session
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
+ "${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
+ "${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
+)
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+ fi
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
+ -Dudev_dir="$(get_udevdir)"
+ $(meson_use systemd)
+ -Dalsa=true
+ $(meson_use udev gudev)
+ $(meson_use colord)
+ $(meson_use cups)
+ $(meson_use networkmanager network_manager)
+ $(meson_use udev rfkill)
+ $(meson_use smartcard)
+ $(meson_use input_devices_wacom wacom)
+ $(meson_use wayland)
+ $(meson_use modemmanager wwan)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ # Don't auto-suspend by default on AC power
+ insinto /usr/share/glib-2.0/schemas
+ doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-03-23 6:14 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-30 22:21 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2022-03-23 6:14 Matt Turner
2021-11-12 19:44 Mike Gilbert
2020-02-24 21:05 Mart Raudsepp
2018-04-29 0:08 Mart Raudsepp
2018-02-03 20:56 Mart Raudsepp
2017-09-25 16:56 Mart Raudsepp
2017-08-18 7:50 Gilles Dartiguelongue
2017-07-09 0:36 Mart Raudsepp
2017-03-21 0:23 Mart Raudsepp
2017-03-08 12:11 Mart Raudsepp
2016-11-03 8:19 Gilles Dartiguelongue
2015-08-23 16:01 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox