<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7df110cef7500f2a6b09ea02095af0297987a243">https://github.com/macports/macports-ports/commit/7df110cef7500f2a6b09ea02095af0297987a243</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7df110cef7500f2a6b09ea02095af0297987a243
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Jul 8 21:30:25 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-settings-daemon: update to version 3.24.2, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * refresh autogen.sh
</span><span style='display:block; white-space:pre;color:#404040;'> * no longer uses gnome-common
</span>---
gnome/gnome-settings-daemon/Portfile | 7 +-
gnome/gnome-settings-daemon/files/autogen.sh | 54 +++++++++-------
.../gnome-settings-daemon/files/patch-plugins.diff | 74 +++++++---------------
3 files changed, 57 insertions(+), 78 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 790f726..3437514 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name gnome-settings-daemon
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24.2
</span> license GPL-2 LGPL-2.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Gnome 3 settings daemon.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,12 +17,11 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ec6a5be00ee26eb418366583b779ca2da5563bd6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 476acaf26f2bbcf9e04f31cb9cf81217e82eeacd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4aa9d72644e3ee8a30096a38986b0e9543fca92f586c561f6c8a11fb8148dcca
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-common \
</span> port:autoconf \
port:automake \
port:libtool \
<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><span style='display:block; white-space:pre;color:#808080;'>index 9bf57ae..7e92e3e 100644
</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;'>+++ b/gnome/gnome-settings-daemon/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +1,42 @@
</span> #!/bin/sh
# Run this to generate all the initial makefiles, etc.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test -n "$srcdir" || srcdir=$(dirname "$0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test -n "$srcdir" || srcdir=.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-REQUIRED_AUTOMAKE_VERSION=1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-USE_GNOME2_MACROS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+olddir=$(pwd)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-srcdir=`dirname $0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cd $srcdir
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_NAME="gnome-settings-daemon"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f $srcdir/configure.ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && test -d $srcdir/gnome-settings-daemon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && test -f $srcdir/gnome-settings-daemon/gnome-settings-manager.h) || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " top-level gnome-settings-daemon directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(test -f configure.ac) || {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-which gnome-autogen.sh || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You need to install gnome-common from the GNOME SVN"
</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:#e0ffe0;'>+# shellcheck disable=SC2016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "*** If you wish to pass any to it, please specify them on the" >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "*** '$0' command line." >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "" >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span>
# Fetch submodules if needed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# if test ! -f plugins/media-keys/gvc/Makefile.am; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# echo "+ Setting up submodules"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# git submodule init
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# git submodule update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git submodule update --init
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+aclocal --install || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+glib-gettextize --force --copy || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+intltoolize --force --copy --automake || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf --verbose --force --install || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cd "$olddir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ "$NOCONFIGURE" = "" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $srcdir/configure "$@" || exit 1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-. gnome-autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$1" = "--help" ]; then exit 0 else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Now type 'make' to compile $PKG_NAME" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Skipping configure process."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</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><span style='display:block; white-space:pre;color:#808080;'>index bd5d13b..737474f 100644
</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;'>+++ b/gnome/gnome-settings-daemon/files/patch-plugins.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/screensaver-proxy/Makefile.am.orig 2013-11-11 09:25:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/screensaver-proxy/Makefile.am 2013-12-13 08:52:02.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libscreensaver_proxy_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libscreensaver_proxy_la_LIBADD = $(SETTINGS_PLUGIN_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libscreensaver_proxy_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(top_builddir)/gnome-settings-daemon/libgsd.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libexec_PROGRAMS = gsd-test-screensaver-proxy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/mouse/Makefile.am.orig 2014-01-24 12:12:34.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/mouse/Makefile.am 2014-01-24 12:13:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmouse_la_LIBADD = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MOUSE_LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(top_builddir)/plugins/common/libcommon.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(top_builddir)/gnome-settings-daemon/libgsd.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SETTINGS_PLUGIN_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugin_in_files = mouse.gnome-settings-plugin.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/media-keys/Makefile.am.orig 2014-06-25 02:50:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/media-keys/Makefile.am 2014-06-25 08:51:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,6 +67,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmedia_keys_la_LIBADD = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(top_builddir)/plugins/common/libcommon.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(top_builddir)/gnome-settings-daemon/libgsd.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(top_builddir)/plugins/media-keys/gvc/libgvc.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MEDIA_KEYS_LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SETTINGS_PLUGIN_LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/keyboard/Makefile.am.orig 2014-09-11 10:30:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/keyboard/Makefile.am 2014-09-15 19:36:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libkeyboard_la_LIBADD = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(top_builddir)/plugins/common/libcommon.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(top_builddir)/gnome-settings-daemon/libgsd.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SETTINGS_PLUGIN_LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> --- plugins/Makefile.am.orig 2015-06-10 16:44:14.000000000 -0700
+++ plugins/Makefile.am 2015-06-10 16:46:21.000000000 -0700
@@ -4,23 +4,24 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,9 +30,9 @@
</span>
if SMARTCARD_SUPPORT
enabled_plugins += smartcard
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-10-11 04:31:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-10-11 15:55:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-05-09 09:30:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2017-07-08 20:08:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span> GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
case $host_os in
darwin*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,12 +41,24 @@
</span> ;;
esac
AC_SUBST([GSD_PLUGIN_LDFLAGS])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -245,7 +245,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl - color
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,13 +158,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk+-x11-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x11)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CHECK_MODULES(COLOR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- colord >= 1.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libcanberra-gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lcms2 >= $LCMS_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libnotify)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl PKG_CHECK_MODULES(COLOR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl colord >= 1.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl libcanberra-gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl lcms2 >= $LCMS_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl libnotify)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl - datetime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES(DATETIME,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION
</span></pre><pre style='margin:0'>
</pre>