Revision: 118268 https://trac.macports.org/changeset/118268 Author: devans@macports.org Date: 2014-03-28 02:56:45 -0700 (Fri, 28 Mar 2014) Log Message: ----------- GNOME-3/stable: patch to disable power panel which uses deprecated API which has been removed in upower 0.99.0. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile Added Paths: ----------- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-power-panel.diff Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-28 00:33:40 UTC (rev 118267) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-28 09:56:45 UTC (rev 118268) @@ -54,6 +54,7 @@ depends_run port:yelp # color panel disabled by patch, dependency colord requires libudev +# power panel disabled by patch, doesn't support upower 0.99 API patchfiles patch-display-new-config-model.diff \ patch-output-is-laptop.diff \ @@ -62,6 +63,7 @@ patch-users-logged-in-check.diff \ patch-disable-color-panel.diff \ patch-disable-shell-test-hostname.diff \ + patch-disable-power-panel.diff \ patch-panels-user-accounts.diff pre-configure { Added: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-power-panel.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-power-panel.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/files/patch-disable-power-panel.diff 2014-03-28 09:56:45 UTC (rev 118268) @@ -0,0 +1,48 @@ +--- configure.ac.orig 2014-03-28 01:56:30.000000000 -0700 ++++ configure.ac 2014-03-28 01:58:35.000000000 -0700 +@@ -144,8 +144,8 @@ + PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) + PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0) + PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) +-PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 +- gnome-settings-daemon >= $GSD_REQUIRED_VERSION) ++dnl PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 ++dnl gnome-settings-daemon >= $GSD_REQUIRED_VERSION) + dnl PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES + dnl colord >= $COLORD_REQUIRED_VERSION + dnl colord-gtk >= $COLORD_GTK_REQUIRED_VERSION +diff -ur panels.orig/Makefile.am panels/Makefile.am +--- panels.orig/Makefile.am 2014-03-28 01:56:56.000000000 -0700 ++++ panels/Makefile.am 2014-03-28 02:01:27.000000000 -0700 +@@ -1,7 +1,6 @@ + SUBDIRS= \ + common \ + background \ +- power \ + display \ + mouse \ + notifications \ +diff -ur shell.orig/Makefile.am shell/Makefile.am +--- shell.orig/Makefile.am 2014-03-28 01:57:06.000000000 -0700 ++++ shell/Makefile.am 2014-03-28 02:03:45.000000000 -0700 +@@ -58,7 +58,6 @@ + $(top_builddir)/panels/mouse/libmouse-properties.la \ + $(top_builddir)/panels/notifications/libnotifications.la \ + $(top_builddir)/panels/online-accounts/libonline-accounts.la \ +- $(top_builddir)/panels/power/libpower.la \ + $(top_builddir)/panels/privacy/libprivacy.la \ + $(top_builddir)/panels/region/libregion.la \ + $(top_builddir)/panels/search/libsearch.la \ +diff -ur shell.orig/cc-panel-loader.c shell/cc-panel-loader.c +--- shell.orig/cc-panel-loader.c 2014-03-28 01:57:06.000000000 -0700 ++++ shell/cc-panel-loader.c 2014-03-28 02:05:14.000000000 -0700 +@@ -90,7 +90,9 @@ + #endif + PANEL_TYPE("notifications", cc_notifications_panel_get_type), + PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), ++#ifdef BUILD_POWER + PANEL_TYPE("power", cc_power_panel_get_type ), ++#endif + #ifdef BUILD_PRINTERS + PANEL_TYPE("printers", cc_printers_panel_get_type ), + #endif