<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c65197582d0a3339937ffcec910503ce4072e427">https://github.com/macports/macports-ports/commit/c65197582d0a3339937ffcec910503ce4072e427</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c65197582d0 gnome-settings-daemon: update to 3.38.2
</span>c65197582d0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c65197582d0a3339937ffcec910503ce4072e427
</span>Author: Mohamed Akram <mohd.akram@outlook.com>
AuthorDate: Mon Jul 17 14:23:51 2023 +0400
<span style='display:block; white-space:pre;color:#404040;'> gnome-settings-daemon: update to 3.38.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67749
</span>---
gnome/gnome-settings-daemon/Portfile | 115 +++++++++------------
gnome/gnome-settings-daemon/files/autogen.sh | 42 --------
.../files/patch-meson-build.diff | 22 ++++
.../gnome-settings-daemon/files/patch-plugins.diff | 61 -----------
4 files changed, 72 insertions(+), 168 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-settings-daemon/Portfile b/gnome/gnome-settings-daemon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28f86903cb2..1c923e9c9fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-settings-daemon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-settings-daemon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,98 +2,83 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name gnome-settings-daemon
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.26.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.38.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gnome
</span> license GPL-2 LGPL-2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {devans @dbevans} openmaintainer
</span> description Gnome 3 settings daemon.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories gnome
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage https://www.gnome.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/${name}/${branch}/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites gnome:sources/${name}/${branch}/
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 013f9ff67a09cfb88804b56291e0a97469f9f3d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 17d1397e3317823ccb7bd011bdbb0974d3d8250a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 32c3d516cce1115ef08ef25f3a718d163b7b333b9068ccf2a6806ddcf21dd78c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1439328
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:docbook-xsl-nons \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:docbook-xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable unexpected download of subprojects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+meson.wrap_mode nodownload
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsettings-desktop-schemas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-desktop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lcms2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libnotify \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span> port:fontconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:geocode-glib \
</span> port:geoclue2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:geocode-glib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnome-desktop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsettings-desktop-schemas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span> port:libcanberra \
port:libgweather \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libnotify \
</span> port:policykit \
port:pulseaudio \
port:upower \
port:xorg-xorgproto \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXtst \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libxkbfile \
</span> port:xorg-libXfixes \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXi \
</span> port:xorg-libXrandr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libxkbfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# uses x11 specific gdk api so gtk3 +x11 is required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Without libcanberra +x11 gnome-settings-daemon will fail to find the libcanberra-gtk3 package, aborting configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants path:lib/pkgconfig/gtk+-3.0.pc:gtk3 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants port:libcanberra x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the following plugins are disabled by patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# color (requires colord)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# power (requires X server support for Xtst extension and segfaults when it doesn't find it)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xrandr (works but tries to take over control of display causing problems with Mac OS X)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/plugins/Makefile.am ${worksrcpath}/plugins/Makefile.am.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-plugins.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --x-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-libraries=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-compile-warnings=minimum \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gudev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-network-manager \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-smartcard-support \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-rfkill \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-maintainer-mode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXtst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dalsa=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcolord=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgudev=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dnetwork_manager=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Drfkill=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsmartcard=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsystemd=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwayland=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwwan=false
</span>
platform darwin {
if {${os.major} < 10} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-cups
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcups=false
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uses x11 specific gdk api so gtk3 +x11 is required
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Without libcanberra +x11 gnome-settings-daemon will fail to find the libcanberra-gtk3 package, aborting configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants path:lib/pkgconfig/gtk+-3.0.pc:gtk3 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants port:libcanberra x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-settings-daemon/files/autogen.sh b/gnome/gnome-settings-daemon/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7e92e3e01ac..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-settings-daemon/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$srcdir" || srcdir=$(dirname "$0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$srcdir" || srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-olddir=$(pwd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $srcdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f configure.ac) || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# shellcheck disable=SC2016
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** If you wish to pass any to it, please specify them on the" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** '$0' command line." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fetch submodules if needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git submodule update --init
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-aclocal --install || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-glib-gettextize --force --copy || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-intltoolize --force --copy --automake || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf --verbose --force --install || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd "$olddir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ "$NOCONFIGURE" = "" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $srcdir/configure "$@" || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$1" = "--help" ]; then exit 0 else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Now type 'make' to compile $PKG_NAME" || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Skipping configure process."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-settings-daemon/files/patch-meson-build.diff b/gnome/gnome-settings-daemon/files/patch-meson-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8038149090a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-settings-daemon/files/patch-meson-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2021-04-14 18:58:02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2023-07-17 14:15:05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Workaround for meson's bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/mesonbuild/meson/pull/1896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if get_option('b_ndebug') == true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if get_option('b_ndebug') == 'true'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common_flags += ['-DG_DISABLE_ASSERT']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/common/meson.build.orig 2021-04-14 18:58:02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/common/meson.build 2023-07-17 14:10:26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ldflags = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if host_is_darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ldflags += ['-Wl,-bundle_loader,@0@'.format(join_paths(), meson.build_root(), meson.project_name(), meson.project_name())]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ldflags += ['-Wl,-bundle_loader,@0@'.format(join_paths(meson.build_root(), meson.project_name(), meson.project_name()))]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcommon = static_library(
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-settings-daemon/files/patch-plugins.diff b/gnome/gnome-settings-daemon/files/patch-plugins.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0ee930dc55c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-settings-daemon/files/patch-plugins.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,61 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2017-05-09 09:30:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2017-07-08 20:08:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GSD_PLUGIN_LDFLAGS="${GSD_PLUGIN_LDFLAGS} -Wl,-bundle_loader,\$(top_builddir)/gnome-settings-daemon/gnome-settings-daemon"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GSD_PLUGIN_LDFLAGS="${GSD_PLUGIN_LDFLAGS} -Wl,-bundle_loader,\$(top_builddir)/gnome-settings-daemon/.libs/gnome-settings-daemon"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST([GSD_PLUGIN_LDFLAGS])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,13 +159,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk+-x11-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_MODULES(COLOR,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- colord >= 1.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libcanberra-gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lcms2 >= $LCMS_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libnotify)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl PKG_CHECK_MODULES(COLOR,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl colord >= 1.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl libcanberra-gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl lcms2 >= $LCMS_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl libnotify)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CHECK_MODULES(DATETIME,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libnotify >= $LIBNOTIFY_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/Makefile.am.orig 2017-09-01 05:12:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/Makefile.am 2017-09-12 03:25:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,21 +4,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a11y-keyboard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a11y-settings \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clipboard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- color \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- datetime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dummy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- power \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- housekeeping \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- keyboard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- media-keys \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mouse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- screensaver-proxy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sharing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sound \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xsettings \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--disabled_plugins = $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+disabled_plugins = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ color \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ power \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sharing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if SMARTCARD_SUPPORT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enabled_plugins += smartcard
</span></pre><pre style='margin:0'>
</pre>