Revision: 118142 https://trac.macports.org/changeset/118142 Author: devans@macports.org Date: 2014-03-23 08:49:17 -0700 (Sun, 23 Mar 2014) Log Message: ----------- GNOME-3/unstable: gnome-control-center, version 3.8.6, increment revision to rebuild with unstable gnome-desktop, build currently fails. Added Paths: ----------- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-background-libsocialweb.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-background-linker-fix.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-display-new-config-model.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-output-is-laptop.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files-3.11.92/ Removed Paths: ------------- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/ Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/Portfile 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,103 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 117321 2014-02-22 02:34:30Z devans@macports.org $ + +PortSystem 1.0 + +name gnome-control-center +version 3.8.6 +revision 1 +set branch [join [lrange [split ${version} .] 0 1] .] +description GNOME's main interface for configuration of the various \ + aspects of your desktop. +long_description ${description} +maintainers devans openmaintainer +categories gnome +license GPL-2+ +platforms darwin +homepage http://www.gnome.org/ +master_sites gnome:sources/${name}/${branch}/ + +use_xz yes + +checksums rmd160 3419412626e2de69c243423f31a0504c49955126 \ + sha256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a + +depends_build port:pkgconfig \ + port:intltool \ + port:libxslt \ + port:gnome-common \ + port:gtk-doc + +depends_lib port:desktop-file-utils \ + port:gtk3 \ + port:gsettings-desktop-schemas \ + port:gnome-desktop \ + port:fontconfig \ + port:policykit \ + port:libxml2 \ + port:upower \ + port:libgtop \ + port:gnome-settings-daemon \ + port:gnome-menus \ + port:gnome-online-accounts \ + port:accountsservice \ + port:libcanberra \ + port:pulseaudio \ + port:libpwquality \ + port:kerberos5 \ + port:libsocialweb \ + port:shared-mime-info \ + port:xorg-libX11 \ + port:xorg-libXxf86misc \ + port:xorg-libXi + +depends_run port:yelp + +# color panel disabled by patch, dependency colord requires libudev + +patchfiles patch-display-new-config-model.diff \ + patch-output-is-laptop.diff \ + patch-background-linker-fix.diff \ + patch-background-libsocialweb.diff \ + patch-users-logged-in-check.diff \ + patch-disable-color-panel.diff \ + patch-disable-shell-test-hostname.diff \ + patch-panels-user-accounts.diff + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + +configure.args --x-includes=${prefix}/include \ + --x-libraries=${prefix}/lib \ + --with-libsocialweb \ + --without-cheese \ + --disable-ibus \ + --disable-maintainer-mode \ + --disable-update-mimedb \ + --disable-silent-rules + +pre-activate { + if {![catch {set installed [lindex [registry_active gdm] 0]}]} { + set _version [lindex $installed 1] + if {[vercmp $_version 3.0.0] < 0} { + registry_deactivate_composite gdm "" [list ports_nodepcheck 1] + } + } + if {![catch {set installed [lindex [registry_active gnome-media] 0]}]} { + set _version [lindex $installed 1] + if {[vercmp $_version 3.10.0] < 0} { + registry_deactivate_composite gnome-media "" [list ports_nodepcheck 1] + } + } +} + +post-activate { + system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" + system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" +} + +livecheck.type gnome Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-background-libsocialweb.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-background-libsocialweb.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-background-libsocialweb.diff 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,29 @@ +From 97af796dd588d4cce7ef5b927fd3d956f8baa16c Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Tue, 12 Nov 2013 07:45:43 +0000 +Subject: background: Fix compilation with libsocialweb support + +The flickr source files were added to the wrong internal shared +library, so that the panel could be linked, but not the test +application. + +https://bugzilla.gnome.org/show_bug.cgi?id=710829 +--- +diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am +index 2766207..58e39aa 100644 +--- panels/background/Makefile.am ++++ panels/background/Makefile.am +@@ -49,9 +49,9 @@ libbackground_la_SOURCES = \ + libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la + + if WITH_LIBSOCIALWEB +-libbackground_la_SOURCES += bg-flickr-source.c bg-flickr-source.h ++libbackground_chooser_la_SOURCES += bg-flickr-source.c bg-flickr-source.h + INCLUDES += $(SOCIALWEB_CFLAGS) +-libbackground_la_LIBADD += $(SOCIALWEB_LIBS) ++libbackground_chooser_la_LIBADD += $(SOCIALWEB_LIBS) + endif + + noinst_PROGRAMS = test-chooser-dialog +-- +cgit v0.9.2 Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-background-linker-fix.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-background-linker-fix.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-background-linker-fix.diff 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,24 @@ +From acd7785692109a8ad2590e19302ce34170e610f2 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <kalevlember@gmail.com> +Date: Wed, 16 Oct 2013 10:01:36 +0000 +Subject: background: Fix test-chooser-dialog build with some linkers + +List missing libs for the libbackground-chooser.la convenience library. + +https://bugzilla.gnome.org/show_bug.cgi?id=709302 +--- +diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am +index f24f8b3..2766207 100644 +--- panels/background/Makefile.am ++++ panels/background/Makefile.am +@@ -40,6 +40,8 @@ libbackground_chooser_la_SOURCES = \ + bg-colors-source.c \ + bg-colors-source.h + ++libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) ++ + libbackground_la_SOURCES = \ + cc-background-panel.c \ + cc-background-panel.h +-- +cgit v0.9.2 Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-disable-color-panel.diff 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,49 @@ +--- configure.ac.orig 2013-09-13 05:09:33.000000000 -0700 ++++ configure.ac 2013-09-16 09:28:36.000000000 -0700 +@@ -146,10 +146,10 @@ + 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) +-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES +- colord >= $COLORD_REQUIRED_VERSION +- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) ++dnl PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES ++dnl colord >= $COLORD_REQUIRED_VERSION ++dnl colord-gtk >= $COLORD_GTK_REQUIRED_VERSION ++dnl gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) + PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) +--- panels/Makefile.am.orig 2013-01-25 06:42:18.000000000 -0800 ++++ panels/Makefile.am 2013-09-16 09:32:32.000000000 -0700 +@@ -2,7 +2,6 @@ + common \ + background \ + power \ +- color \ + display \ + mouse \ + notifications \ +--- shell/Makefile.am.orig 2013-09-16 17:47:34.000000000 -0700 ++++ shell/Makefile.am 2013-09-16 17:48:10.000000000 -0700 +@@ -51,7 +51,6 @@ + $(top_builddir)/libgd/libgd.la \ + $(top_builddir)/panels/common/liblanguage.la \ + $(top_builddir)/panels/background/libbackground.la \ +- $(top_builddir)/panels/color/libcolor.la \ + $(top_builddir)/panels/datetime/libdate_time.la \ + $(top_builddir)/panels/display/libdisplay.la \ + $(top_builddir)/panels/info/libinfo.la \ +--- shell/cc-panel-loader.c.orig 2013-09-16 17:57:33.000000000 -0700 ++++ shell/cc-panel-loader.c 2013-09-16 17:58:28.000000000 -0700 +@@ -77,7 +77,9 @@ + #ifdef BUILD_BLUETOOTH + PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), + #endif ++#ifdef BUILD_COLOR + PANEL_TYPE("color", cc_color_panel_get_type ), ++#endif + PANEL_TYPE("datetime", cc_date_time_panel_get_type ), + PANEL_TYPE("display", cc_display_panel_get_type ), + PANEL_TYPE("info", cc_info_panel_get_type ), Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-disable-shell-test-hostname.diff 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,10 @@ +--- shell/Makefile.am.orig 2013-09-16 22:44:57.000000000 -0700 ++++ shell/Makefile.am 2013-09-16 22:45:38.000000000 -0700 +@@ -111,6 +111,6 @@ + + EXTRA_DIST += hostnames-test.txt + check-local: test-hostname +- $(builddir)/test-hostname $(srcdir)/hostnames-test.txt > /dev/null ++ + + -include $(top_srcdir)/git.mk Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-display-new-config-model.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-display-new-config-model.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-display-new-config-model.diff 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,177 @@ +From 150466cdb668a81fb3e595ed7f4e965d62a1fced Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagn@redhat.com> +Date: Thu, 08 Aug 2013 12:21:10 +0000 +Subject: display: adapt to the new model for display configuration + +The way we apply the new configuration changed, in that we are +expected to call the apply() method of GnomeRRConfig ourselves, +and that takes care to call to mutter, show the confirmation +dialog, etc. + +https://bugzilla.gnome.org/show_bug.cgi?id=705573 +--- +(limited to 'panels/display/cc-display-panel.c') + +diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c +index 7f0431c..ff585e2 100644 +--- panels/display/cc-display-panel.c ++++ panels/display/cc-display-panel.c +@@ -96,9 +96,6 @@ struct _CcDisplayPanelPrivate + gboolean ignore_gui_changes; + gboolean dragging_top_bar; + +- /* These are used while we are waiting for the ApplyConfiguration method to be executed over D-bus */ +- GDBusProxy *proxy; +- + UpClient *up_client; + gboolean lid_is_closed; + }; +@@ -117,7 +114,6 @@ static gboolean output_overlaps (GnomeRROutputInfo *output, GnomeRRConfig *confi + static void select_current_output_from_dialog_position (CcDisplayPanel *self); + static void monitor_switch_active_cb (GObject *object, GParamSpec *pspec, gpointer data); + static void get_geometry (GnomeRROutputInfo *output, int *w, int *h); +-static void apply_configuration_returned_cb (GObject *proxy, GAsyncResult *res, gpointer data); + static gboolean get_clone_size (GnomeRRScreen *screen, int *width, int *height); + static gboolean output_info_supports_mode (CcDisplayPanel *self, GnomeRROutputInfo *info, int width, int height); + static char *make_resolution_string (int width, int height); +@@ -2302,128 +2298,33 @@ check_required_virtual_size (CcDisplayPanel *self) + } + + static void +-begin_version2_apply_configuration (CcDisplayPanel *self, GdkWindow *parent_window, guint32 timestamp) +-{ +- XID parent_window_xid; +- GError *error = NULL; +- +- parent_window_xid = GDK_WINDOW_XID (parent_window); +- +- self->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, +- G_DBUS_PROXY_FLAGS_NONE, +- NULL, +- "org.gnome.SettingsDaemon", +- "/org/gnome/SettingsDaemon/XRANDR", +- "org.gnome.SettingsDaemon.XRANDR_2", +- NULL, +- &error); +- if (self->priv->proxy == NULL) { +- error_message (self, _("Failed to apply configuration: %s"), error->message); +- g_error_free (error); +- return; +- } +- +- g_dbus_proxy_call (self->priv->proxy, +- "ApplyConfiguration", +- g_variant_new ("(xx)", (gint64) parent_window_xid, (gint64) timestamp), +- G_DBUS_CALL_FLAGS_NONE, +- -1, +- NULL, +- apply_configuration_returned_cb, +- self); +-} +- +-static void +-ensure_current_configuration_is_saved (void) +-{ +- GnomeRRScreen *rr_screen; +- GnomeRRConfig *rr_config; +- +- /* Normally, gnome_rr_config_save() creates a backup file based on the +- * old monitors.xml. However, if *that* file didn't exist, there is +- * nothing from which to create a backup. So, here we'll save the +- * current/unchanged configuration and then let our caller call +- * gnome_rr_config_save() again with the new/changed configuration, so +- * that there *will* be a backup file in the end. +- */ +- +- rr_screen = gnome_rr_screen_new (gdk_screen_get_default (), NULL); /* NULL-GError */ +- if (!rr_screen) +- return; +- +- rr_config = gnome_rr_config_new_current (rr_screen, NULL); +- gnome_rr_config_ensure_primary (rr_config); +- gnome_rr_config_save (rr_config, NULL); /* NULL-GError */ +- +- g_object_unref (rr_config); +- g_object_unref (rr_screen); +-} +- +-static void +-apply_configuration_returned_cb (GObject *proxy, +- GAsyncResult *res, +- gpointer data) ++sanitize_configuration (CcDisplayPanel *self) + { +- CcDisplayPanel *self = data; +- GVariant *result; +- GError *error = NULL; +- +- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, &error); +- if (error) +- error_message (self, _("Failed to apply configuration: %s"), error->message); +- g_clear_error (&error); +- if (result) +- g_variant_unref (result); +- +- g_object_unref (self->priv->proxy); +- self->priv->proxy = NULL; +- +- gtk_widget_set_sensitive (self->priv->panel, TRUE); +-} +- +-static gboolean +-sanitize_and_save_configuration (CcDisplayPanel *self) +-{ +- GError *error; +- + gnome_rr_config_sanitize (self->priv->current_configuration); + gnome_rr_config_ensure_primary (self->priv->current_configuration); + + check_required_virtual_size (self); + + foo_scroll_area_invalidate (FOO_SCROLL_AREA (self->priv->area)); +- +- ensure_current_configuration_is_saved (); +- +- error = NULL; +- if (!gnome_rr_config_save (self->priv->current_configuration, &error)) +- { +- error_message (self, _("Could not save the monitor configuration"), error->message); +- g_error_free (error); +- return FALSE; +- } +- +- return TRUE; + } + + static void + apply (CcDisplayPanel *self) + { +- GdkWindow *window; ++ GError *error; ++ gboolean ok; + + self->priv->apply_button_clicked_timestamp = gtk_get_current_event_time (); + +- if (!sanitize_and_save_configuration (self)) +- return; +- +- g_assert (self->priv->proxy == NULL); +- +- gtk_widget_set_sensitive (self->priv->panel, FALSE); ++ sanitize_configuration (self); + +- window = gtk_widget_get_window (gtk_widget_get_toplevel (self->priv->panel)); ++ error = NULL; ++ ok = gnome_rr_config_apply_persistent (self->priv->current_configuration, ++ self->priv->screen, &error); + +- begin_version2_apply_configuration (self, window, +- self->priv->apply_button_clicked_timestamp); ++ if (!ok) ++ error_message (self, _("Failed to apply configuration"), error->message); ++ g_clear_error (&error); + } + + #if 0 +-- +cgit v0.9.2 Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-output-is-laptop.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-output-is-laptop.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-output-is-laptop.diff 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,22 @@ +--- panels/display/cc-display-panel.c.orig 2014-01-10 12:07:19.000000000 -0800 ++++ panels/display/cc-display-panel.c 2014-01-10 12:29:30.000000000 -0800 +@@ -706,7 +706,7 @@ + output = gnome_rr_screen_get_output_by_name (self->priv->screen, + gnome_rr_output_info_get_name (self->priv->current_output)); + +- display_closed = gnome_rr_output_is_laptop (output); ++ display_closed = gnome_rr_output_is_builtin_display (output); + } + + if ((count_active_outputs (self) > 1 || !gnome_rr_output_info_is_active (self->priv->current_output)) +--- panels/wacom/gsd-wacom-device.c.orig 2014-01-10 12:31:49.000000000 -0800 ++++ panels/wacom/gsd-wacom-device.c 2014-01-10 12:32:24.000000000 -0800 +@@ -576,7 +576,7 @@ + if (!gnome_rr_output_is_connected (rr_outputs[i])) + continue; + +- if (gnome_rr_output_is_laptop(rr_outputs[i])) { ++ if (gnome_rr_output_is_builtin_display(rr_outputs[i])) { + retval = rr_outputs[i]; + break; + } Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-panels-user-accounts.diff 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,10 @@ +--- panels/user-accounts/Makefile.am.orig 2013-09-16 17:32:09.000000000 -0700 ++++ panels/user-accounts/Makefile.am 2013-09-16 17:33:23.000000000 -0700 +@@ -62,7 +62,6 @@ + $(USER_ACCOUNTS_PANEL_LIBS) \ + $(builddir)/../common/liblanguage.la \ + -lpwquality \ +- -lcrypt \ + -lm + + if BUILD_CHEESE Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff (rev 0) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center/files/patch-users-logged-in-check.diff 2014-03-23 15:49:17 UTC (rev 118142) @@ -0,0 +1,29 @@ +From b9836c120a94c21f6d2eb8bc706408741b16b346 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Fri, 10 Jan 2014 17:52:37 +0000 +Subject: users: Improve logged-in check when deleting users + +When deleting a user account, we try to check if the user is +still logged in, but we are using an accountsservice API that +ignores console logins. But deleting a user that is logged +in on the console is just as bad, so use +act_user_is_logged_in_anywhere instead, which includes console +logins. + +https://bugzilla.gnome.org/show_bug.cgi?id=721951 +--- +diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c +index 2c02520..058eaad 100644 +--- panels/user-accounts/um-user-panel.c ++++ panels/user-accounts/um-user-panel.c +@@ -478,7 +478,7 @@ delete_user (GtkButton *button, CcUserPanelPrivate *d) + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), NULL); + } +- else if (act_user_is_logged_in (user)) { ++ else if (act_user_is_logged_in_anywhere (user)) { + dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)), + 0, + GTK_MESSAGE_INFO, +-- +cgit v0.9.2