[135381] users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon
devans at macports.org
devans at macports.org
Thu Apr 23 08:22:36 PDT 2015
Revision: 135381
https://trac.macports.org/changeset/135381
Author: devans at macports.org
Date: 2015-04-23 08:22:36 -0700 (Thu, 23 Apr 2015)
Log Message:
-----------
GNOME-3/stable: gnome-settings-daemon, update to version 3.16.1, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/autogen.sh
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome-settings-daemon:108265-127228
/users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon:116416-118153,119624-125720
+ /trunk/dports/gnome/gnome-settings-daemon:108265-127228
/users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon:116416-118153,119624-125720,132288-134381
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2015-04-23 15:22:35 UTC (rev 135380)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2015-04-23 15:22:36 UTC (rev 135381)
@@ -5,7 +5,7 @@
PortGroup active_variants 1.1
name gnome-settings-daemon
-version 3.14.2
+version 3.16.1
license GPL-2 LGPL-2.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Gnome 3 settings daemon.
@@ -18,11 +18,15 @@
use_xz yes
-checksums rmd160 fe89c29d93de8947e9cef5ebfa3ce88f768f1767 \
- sha256 066bc8ed751c5f6b5a9590911a0fb2b51b0c3436ae1caccfa42e0791c34fedee
+checksums rmd160 76b1bab75086036942f6d4addb25d4e6812d43e9 \
+ sha256 aa8dad75582f7eaee1ad3efe3efc9c8a30f24b80f2fbea701cef947d1281c1d0
depends_build port:pkgconfig \
port:intltool \
+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool \
port:docbook-xsl \
port:docbook-xml
@@ -54,6 +58,7 @@
#
# color (requires colord)
# power (requires X server support for Xtst extension and segfaults when it doesn't find it)
+# sharing
# xrandr (works but tries to take over control of display causing problems with Mac OS X)
#
@@ -63,9 +68,14 @@
patchfiles patch-plugins.diff
-use_autoreconf yes
-autoreconf.args -fvi
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd ./autogen.sh
+
configure.args --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
--disable-gudev \
Added: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/autogen.sh 2015-04-23 15:22:36 UTC (rev 135381)
@@ -0,0 +1,32 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+REQUIRED_AUTOMAKE_VERSION=1.5
+USE_GNOME2_MACROS=1
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gnome-settings-daemon"
+
+(test -f $srcdir/configure.ac \
+ && test -d $srcdir/gnome-settings-daemon \
+ && test -f $srcdir/gnome-settings-daemon/gnome-settings-manager.h) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level gnome-settings-daemon directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME SVN"
+ exit 1
+}
+
+# Fetch submodules if needed
+# if test ! -f plugins/media-keys/gvc/Makefile.am; then
+# echo "+ Setting up submodules"
+# git submodule init
+# fi
+# git submodule update
+
+. gnome-autogen.sh
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff 2015-04-23 15:22:35 UTC (rev 135380)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff 2015-04-23 15:22:36 UTC (rev 135381)
@@ -10,16 +10,6 @@
libexec_PROGRAMS = gsd-test-screensaver-proxy
---- plugins/cursor/Makefile.am.orig 2014-01-24 11:55:28.000000000 -0800
-+++ plugins/cursor/Makefile.am 2014-01-24 11:55:52.000000000 -0800
-@@ -26,6 +26,7 @@
-
- libcursor_la_LIBADD = \
- $(top_builddir)/plugins/common/libcommon.la \
-+ $(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(CURSOR_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
-
--- plugins/mouse/Makefile.am.orig 2014-01-24 12:12:34.000000000 -0800
+++ plugins/mouse/Makefile.am 2014-01-24 12:13:16.000000000 -0800
@@ -28,6 +28,7 @@
@@ -40,38 +30,6 @@
$(top_builddir)/plugins/media-keys/gvc/libgvc.la \
$(MEDIA_KEYS_LIBS) \
$(SETTINGS_PLUGIN_LIBS) \
---- plugins/Makefile.am.orig 2014-06-25 02:50:36.000000000 -0700
-+++ plugins/Makefile.am 2014-06-25 12:58:02.000000000 -0700
-@@ -4,23 +4,24 @@
- a11y-keyboard \
- a11y-settings \
- clipboard \
-- color \
- cursor \
- datetime \
- dummy \
-- power \
- housekeeping \
- keyboard \
- media-keys \
- mouse \
- screensaver-proxy \
-- sharing \
- sound \
-- xrandr \
- xsettings \
- $(NULL)
-
--disabled_plugins = $(NULL)
-+disabled_plugins = \
-+ color \
-+ power \
-+ sharing \
-+ xrandr \
-+ $(NULL)
-
- if SMARTCARD_SUPPORT
- enabled_plugins += smartcard
--- plugins/keyboard/Makefile.am.orig 2014-09-11 10:30:30.000000000 -0700
+++ plugins/keyboard/Makefile.am 2014-09-15 19:36:10.000000000 -0700
@@ -33,6 +33,7 @@
@@ -93,7 +51,7 @@
;;
esac
AC_SUBST([GSD_PLUGIN_LDFLAGS])
-@@ -242,7 +242,7 @@
+@@ -236,7 +236,7 @@
dnl - color
dnl ---------------------------------------------------------------------------
@@ -102,3 +60,34 @@
dnl ---------------------------------------------------------------------------
dnl - datetime
+--- plugins/Makefile.am.orig 2015-03-13 13:32:32.000000000 -0700
++++ plugins/Makefile.am 2015-03-23 22:42:06.000000000 -0700
+@@ -4,22 +4,23 @@
+ a11y-keyboard \
+ a11y-settings \
+ clipboard \
+- color \
+ datetime \
+ dummy \
+- power \
+ housekeeping \
+ keyboard \
+ media-keys \
+ mouse \
+ screensaver-proxy \
+- sharing \
+ sound \
+- xrandr \
+ xsettings \
+ $(NULL)
+
+-disabled_plugins = $(NULL)
++disabled_plugins = \
++ color \
++ power \
++ sharing \
++ xrandr \
++ $(NULL)
+
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150423/074360ee/attachment-0001.html>
More information about the macports-changes
mailing list