Revision: 116523 https://trac.macports.org/changeset/116523 Author: devans@macports.org Date: 2014-01-27 08:31:27 -0800 (Mon, 27 Jan 2014) Log Message: ----------- gnome-settings-daemon: update patch file to fix build. Modified Paths: -------------- users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/Portfile users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/Portfile =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/Portfile 2014-01-27 16:28:09 UTC (rev 116522) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/Portfile 2014-01-27 16:31:27 UTC (rev 116523) @@ -52,6 +52,10 @@ # xrandr (works but tries to take over control of display causing problems with Mac OS X) # +pre-patch { + copy ${worksrcpath}/plugins/Makefile.am ${worksrcpath}/plugins/Makefile.am.orig +} + patchfiles patch-plugins.diff use_autoreconf yes Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff 2014-01-27 16:28:09 UTC (rev 116522) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff 2014-01-27 16:31:27 UTC (rev 116523) @@ -18,9 +18,9 @@ dnl --------------------------------------------------------------------------- dnl - datetime ---- plugins/Makefile.am.orig 2013-11-11 09:25:13.000000000 -0800 -+++ plugins/Makefile.am 2013-12-13 09:01:21.000000000 -0800 -@@ -4,11 +4,9 @@ +--- plugins/Makefile.am.orig 2013-12-17 01:29:53.000000000 -0800 ++++ plugins/Makefile.am 2014-01-24 12:46:28.000000000 -0800 +@@ -4,22 +4,23 @@ a11y-keyboard \ a11y-settings \ clipboard \ @@ -32,8 +32,7 @@ housekeeping \ keyboard \ media-keys \ -@@ -16,11 +14,13 @@ - remote-display \ + mouse \ screensaver-proxy \ sound \ - xrandr \ @@ -41,10 +40,11 @@ $(NULL) -disabled_plugins = $(NULL) -+disabled_plugins = color \ -+ power \ -+ xrandr \ -+ $(NULL) ++disabled_plugins = \ ++ color \ ++ power \ ++ xrandr \ ++ $(NULL) if HAVE_PACKAGEKIT enabled_plugins += updates @@ -70,3 +70,33 @@ 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/keyboard/Makefile.am.orig 2014-01-24 12:01:28.000000000 -0800 ++++ plugins/keyboard/Makefile.am 2014-01-24 12:02:57.000000000 -0800 +@@ -43,6 +43,7 @@ + + libkeyboard_la_LIBADD = \ + $(top_builddir)/plugins/common/libcommon.la \ ++ $(top_builddir)/gnome-settings-daemon/libgsd.la \ + $(SETTINGS_PLUGIN_LIBS) \ + $(XF86MISC_LIBS) \ + $(KEYBOARD_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 @@ + libmouse_la_LIBADD = \ + $(MOUSE_LIBS) \ + $(top_builddir)/plugins/common/libcommon.la \ ++ $(top_builddir)/gnome-settings-daemon/libgsd.la \ + $(SETTINGS_PLUGIN_LIBS) + + plugin_in_files = mouse.gnome-settings-plugin.in