commit:     c1298d1702e448ba60a6e322967e80af9bb1cfea
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 19:02:40 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:02:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c1298d17

Revert "Revert "gnome-base/gnome-settings-daemon: bump""

This reverts commit 7f482f50c0bbf6485cda4e2e4c94dae2fbd60ccb.

 .../files/3.24.2-udevrulesdir-configure.patch      |  48 ++++++
 .../files/3.24.3-fix-wayland-build.patch           |  53 +++++++
 .../files/3.26.1-optional.patch                    | 169 +++++++++++++++++++++
 .../gnome-settings-daemon-3.26.1.ebuild            | 156 +++++++++++++++++++
 4 files changed, 426 insertions(+)

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
new file mode 100644
index 00000000..16988f94
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
@@ -0,0 +1,48 @@
+From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <l...@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
new file mode 100644
index 00000000..4a06889a
--- /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 <e...@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.26.1-optional.patch 
b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
new file mode 100644
index 00000000..608784c4
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
@@ -0,0 +1,169 @@
+From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <m...@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 <e...@gentoo.org>
+Signed-off-by: Timo Tambet <ttam...@gmail.com>
+Signed-off-by: Yuh-Horng Chen <yhch...@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.26.1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
new file mode 100644
index 00000000..0dd04c34
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
@@ -0,0 +1,156 @@
+# 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.53.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
+       # 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
+}

Reply via email to