From 0e451980b97b7ed9adddd4e7050ca007a94cbe69 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 27 Sep 2013 14:04:46 +0000 Subject: [PATCH] update to gnome-shell-3.10.0.1 --- x11/gnome/shell/Makefile | 7 +-- x11/gnome/shell/distinfo | 4 +- x11/gnome/shell/patches/patch-configure_ac | 30 +++++----- .../patch-docs_reference_shell_Makefile_am | 16 +++--- x11/gnome/shell/patches/patch-js_ui_panel_js | 57 ++++++++++++------- .../shell/patches/patch-js_ui_sessionMode_js | 12 ++-- x11/gnome/shell/patches/patch-src_Makefile_am | 26 ++++----- x11/gnome/shell/pkg/PLIST | 23 +++++--- 8 files changed, 99 insertions(+), 76 deletions(-) diff --git a/x11/gnome/shell/Makefile b/x11/gnome/shell/Makefile index acfd43c8d61..dee9e837d59 100644 --- a/x11/gnome/shell/Makefile +++ b/x11/gnome/shell/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.58 2013/08/10 12:48:33 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.59 2013/09/27 14:04:46 jasper Exp $ COMMENT= next generation GNOME shell GNOME_PROJECT= gnome-shell -GNOME_VERSION= 3.8.4 -REVISION= 0 +GNOME_VERSION= 3.10.0.1 HOMEPAGE= http://live.gnome.org/GnomeShell @@ -29,7 +28,7 @@ WANTLIB += pthread pthread-stubs pulse pulse-mainloop-glib readline WANTLIB += roken secret-1 smime3 sndfile softokn3 soup-2.4 sqlite3 WANTLIB += ssl3 startup-notification-1 stdc++ telepathy-glib vorbis WANTLIB += vorbisenc vorbisfile wind xcb xcb-aux xcb-render xcb-shm -WANTLIB += xml2 z +WANTLIB += xml2 z gnome-desktop-3 upower-glib xkbfile MODULES= devel/dconf \ devel/gettext \ diff --git a/x11/gnome/shell/distinfo b/x11/gnome/shell/distinfo index c5585f25b57..5edebde4d60 100644 --- a/x11/gnome/shell/distinfo +++ b/x11/gnome/shell/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/gnome-shell-3.8.4.tar.xz) = VH5XHGexQ2oycVsBbuY8Zmr8r+2cWi923ErTvK6/+kc= -SIZE (gnome/gnome-shell-3.8.4.tar.xz) = 1517048 +SHA256 (gnome/gnome-shell-3.10.0.1.tar.xz) = 65jKYnToLkRoNCIbLf2a8OEuXrzmUTGUNVJP1s1fTsk= +SIZE (gnome/gnome-shell-3.10.0.1.tar.xz) = 1518624 diff --git a/x11/gnome/shell/patches/patch-configure_ac b/x11/gnome/shell/patches/patch-configure_ac index afcffb1dfa8..14914461623 100644 --- a/x11/gnome/shell/patches/patch-configure_ac +++ b/x11/gnome/shell/patches/patch-configure_ac @@ -1,29 +1,29 @@ -$OpenBSD: patch-configure_ac,v 1.10 2013/06/10 15:21:06 jasper Exp $ +$OpenBSD: patch-configure_ac,v 1.11 2013/09/27 14:04:46 jasper Exp $ Make Network Manager support optional. https://bugzilla.gnome.org/show_bug.cgi?id=679871 ---- configure.ac.orig Fri Jun 7 21:45:07 2013 -+++ configure.ac Mon Jun 10 17:13:23 2013 -@@ -94,8 +94,6 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MI - libcanberra libcanberra-gtk3 - telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION - polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes -- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION -- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION - libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION) +--- configure.ac.orig Tue Sep 24 22:04:57 2013 ++++ configure.ac Fri Sep 27 15:28:37 2013 +@@ -91,8 +91,6 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION + libcanberra libcanberra-gtk3 + telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION + polkit-agent-1 >= $POLKIT_MIN_VERSION +- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION +- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION + libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION" - PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION) -@@ -121,6 +119,24 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], + PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS) +@@ -128,6 +126,24 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0], [AC_DEFINE([HAVE_BLUETOOTH],[0]) AC_SUBST([HAVE_BLUETOOTH],[0]) AC_MSG_RESULT([no])]) + +network_manager=false +AC_MSG_CHECKING([for Network Manager support]) -+PKG_CHECK_EXISTS([libnm-glib libnm-util], -+ [NM_LIBS=`$PKG_CONFIG --libs libnm-glib libnm-util` -+ NM_CFLAGS=`$PKG_CONFIG --cflags libnm-glib libnm-util` ++PKG_CHECK_EXISTS([libnm-glib libnm-util libnm-gtk], ++ [NM_LIBS=`$PKG_CONFIG --libs libnm-glib libnm-util libnm-gtk` ++ NM_CFLAGS=`$PKG_CONFIG --cflags libnm-glib libnm-util libnm-gtk` + AC_SUBST([NM_LIBS],["$NM_LIBS"]) + AC_SUBST([NM_CFLAGS],["$NM_CFLAGS"]) + AC_DEFINE([HAVE_NETWORK_MANAGER],[1],[Define to 1 if you have Network Manager]) diff --git a/x11/gnome/shell/patches/patch-docs_reference_shell_Makefile_am b/x11/gnome/shell/patches/patch-docs_reference_shell_Makefile_am index 43750bf2cb8..3a3717a807e 100644 --- a/x11/gnome/shell/patches/patch-docs_reference_shell_Makefile_am +++ b/x11/gnome/shell/patches/patch-docs_reference_shell_Makefile_am @@ -1,18 +1,16 @@ -$OpenBSD: patch-docs_reference_shell_Makefile_am,v 1.2 2013/03/30 08:04:19 jasper Exp $ +$OpenBSD: patch-docs_reference_shell_Makefile_am,v 1.3 2013/09/27 14:04:47 jasper Exp $ Make Network Manager support optional. https://bugzilla.gnome.org/show_bug.cgi?id=679871 ---- docs/reference/shell/Makefile.am.orig Thu Jan 10 21:57:21 2013 -+++ docs/reference/shell/Makefile.am Fri Mar 29 20:39:33 2013 -@@ -111,8 +111,8 @@ expand_content_files= - # signals and properties. +--- docs/reference/shell/Makefile.am.orig Thu Sep 12 20:09:56 2013 ++++ docs/reference/shell/Makefile.am Fri Sep 27 15:27:23 2013 +@@ -112,7 +112,7 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) --GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS) --GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell.la -+GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS) $(NM_CFLAGS) -+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(NM_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell.la + GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS) +-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la ++GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(NM_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/x11/gnome/shell/patches/patch-js_ui_panel_js b/x11/gnome/shell/patches/patch-js_ui_panel_js index 2652526d853..e2ed32caaf5 100644 --- a/x11/gnome/shell/patches/patch-js_ui_panel_js +++ b/x11/gnome/shell/patches/patch-js_ui_panel_js @@ -1,26 +1,43 @@ -$OpenBSD: patch-js_ui_panel_js,v 1.8 2013/08/06 18:09:20 jasper Exp $ +$OpenBSD: patch-js_ui_panel_js,v 1.9 2013/09/27 14:04:47 jasper Exp $ Make Network Manager support optional. https://bugzilla.gnome.org/show_bug.cgi?id=679871 ---- js/ui/panel.js.orig Wed Jul 31 00:20:54 2013 -+++ js/ui/panel.js Wed Jul 31 07:54:06 2013 -@@ -933,11 +933,13 @@ if (Config.HAVE_BLUETOOTH) - PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] = - imports.ui.status.bluetooth.Indicator; +--- js/ui/panel.js.orig Tue Sep 24 20:20:37 2013 ++++ js/ui/panel.js Fri Sep 27 15:26:49 2013 +@@ -811,7 +811,12 @@ const AggregateMenu = new Lang.Class({ + this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' }); + this.actor.add_child(this._indicators); --try { -- PANEL_ITEM_IMPLEMENTATIONS['network'] = -- imports.ui.status.network.NMApplet; --} catch(e) { -- log('NMApplet is not supported. It is possible that your NetworkManager version is too old'); -+if (Config.HAVE_NETWORK_MANAGER) { -+ try { -+ PANEL_ITEM_IMPLEMENTATIONS['network'] = -+ imports.ui.status.network.NMApplet; -+ } catch(e) { -+ log('NMApplet is not supported. It is possible that your NetworkManager version is too old'); -+ } - } +- this._network = new imports.ui.status.network.NMApplet(); ++ if (Config.HAVE_NETWORK_MANAGER) { ++ this._network = new imports.ui.status.network.NMApplet(); ++ } else { ++ this._network = null; ++ } ++ + if (Config.HAVE_BLUETOOTH) { + this._bluetooth = new imports.ui.status.bluetooth.Indicator(); + } else { +@@ -826,7 +831,9 @@ const AggregateMenu = new Lang.Class({ + this._screencast = new imports.ui.status.screencast.Indicator(); - const Panel = new Lang.Class({ + this._indicators.add_child(this._screencast.indicators); +- this._indicators.add_child(this._network.indicators); ++ if (this._network) { ++ this._indicators.add_child(this._network.indicators); ++ } + if (this._bluetooth) { + this._indicators.add_child(this._bluetooth.indicators); + } +@@ -840,7 +847,9 @@ const AggregateMenu = new Lang.Class({ + this.menu.addMenuItem(this._volume.menu); + this.menu.addMenuItem(this._brightness.menu); + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); +- this.menu.addMenuItem(this._network.menu); ++ if (this._network) { ++ this.menu.addMenuItem(this._network.menu); ++ } + if (this._bluetooth) { + this.menu.addMenuItem(this._bluetooth.menu); + } diff --git a/x11/gnome/shell/patches/patch-js_ui_sessionMode_js b/x11/gnome/shell/patches/patch-js_ui_sessionMode_js index 31d4c36c89a..075b1c64d8d 100644 --- a/x11/gnome/shell/patches/patch-js_ui_sessionMode_js +++ b/x11/gnome/shell/patches/patch-js_ui_sessionMode_js @@ -1,15 +1,15 @@ -$OpenBSD: patch-js_ui_sessionMode_js,v 1.3 2013/06/10 15:21:06 jasper Exp $ +$OpenBSD: patch-js_ui_sessionMode_js,v 1.4 2013/09/27 14:04:47 jasper Exp $ XXX fix this the correct way (if HAVE_NETWORK_MANAGER) and push it upstream ---- js/ui/sessionMode.js.orig Fri Jun 7 21:45:07 2013 -+++ js/ui/sessionMode.js Mon Jun 10 17:12:35 2013 -@@ -102,7 +102,7 @@ const _modes = { +--- js/ui/sessionMode.js.orig Tue Aug 27 17:59:43 2013 ++++ js/ui/sessionMode.js Fri Sep 27 15:20:13 2013 +@@ -92,7 +92,7 @@ const _modes = { isLocked: false, isPrimary: true, unlockDialog: imports.ui.unlockDialog.UnlockDialog, - components: ['networkAgent', 'polkitAgent', 'telepathyClient', -+ components: ['polkitAgent', 'telepathyClient', - 'keyring', 'recorder', 'autorunManager', 'automountManager'], ++ components: [ 'polkitAgent', 'telepathyClient', + 'keyring', 'autorunManager', 'automountManager'], panel: { left: ['activities', 'appMenu'], diff --git a/x11/gnome/shell/patches/patch-src_Makefile_am b/x11/gnome/shell/patches/patch-src_Makefile_am index eec38f13555..84090502576 100644 --- a/x11/gnome/shell/patches/patch-src_Makefile_am +++ b/x11/gnome/shell/patches/patch-src_Makefile_am @@ -1,11 +1,11 @@ -$OpenBSD: patch-src_Makefile_am,v 1.4 2013/03/30 08:04:19 jasper Exp $ +$OpenBSD: patch-src_Makefile_am,v 1.5 2013/09/27 14:04:47 jasper Exp $ Make Network Manager support optional. https://bugzilla.gnome.org/show_bug.cgi?id=679871 ---- src/Makefile.am.orig Fri Mar 22 20:06:31 2013 -+++ src/Makefile.am Fri Mar 29 21:57:26 2013 -@@ -116,7 +116,6 @@ shell_public_headers_h = \ +--- src/Makefile.am.orig Thu Sep 12 20:09:56 2013 ++++ src/Makefile.am Fri Sep 27 15:19:30 2013 +@@ -103,7 +103,6 @@ shell_public_headers_h = \ shell-invert-lightness-effect.h \ shell-keybinding-modes.h \ shell-mount-operation.h \ @@ -13,15 +13,15 @@ https://bugzilla.gnome.org/show_bug.cgi?id=679871 shell-perf-log.h \ shell-screenshot.h \ shell-slicer.h \ -@@ -159,7 +158,6 @@ libgnome_shell_la_SOURCES = \ - shell-keyring-prompt.h \ - shell-keyring-prompt.c \ +@@ -140,7 +139,6 @@ libgnome_shell_base_la_SOURCES = \ + shell-menu-tracker.c \ + shell-menu-tracker.h \ shell-mount-operation.c \ - shell-network-agent.c \ shell-perf-log.c \ shell-polkit-authentication-agent.h \ shell-polkit-authentication-agent.c \ -@@ -233,6 +231,16 @@ endif BUILD_RECORDER +@@ -242,6 +240,16 @@ endif BUILD_RECORDER ######################################## @@ -38,15 +38,15 @@ https://bugzilla.gnome.org/show_bug.cgi?id=679871 libexec_PROGRAMS += gnome-shell-perf-helper gnome_shell_perf_helper_SOURCES = shell-perf-helper.c -@@ -287,7 +295,10 @@ libgnome_shell_la_LIBADD = \ - libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags) +@@ -331,7 +339,10 @@ INTROSPECTION_GIRS += ShellMenu-0.1.gir + CLEANFILES += ShellMenu-0.1.gir - Shell-0.1.gir: libgnome-shell.la St-1.0.gir + Shell-0.1.gir: gnome-shell St-1.0.gir ShellMenu-0.1.gir -Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 +Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 +if NETWORK_MANAGER +Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 +endif Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir) - Shell_0_1_gir_LIBS = libgnome-shell.la - Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources) + # Hack! we use PROGRAM instead of LIBS so that the soname is not included + # in the typelib. This way the symbols will be resolved with the libgnome-shell diff --git a/x11/gnome/shell/pkg/PLIST b/x11/gnome/shell/pkg/PLIST index 7e74fbb4ee1..ac898878beb 100644 --- a/x11/gnome/shell/pkg/PLIST +++ b/x11/gnome/shell/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.12 2013/06/10 15:21:06 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.13 2013/09/27 14:04:47 jasper Exp $ @conflict gnome-panel-* @conflict gnome-screensaver-* @conflict notification-daemon-* @@ -13,8 +13,10 @@ lib/gnome-shell/ lib/gnome-shell/Gvc-1.0.typelib lib/gnome-shell/Shell-0.1.typelib lib/gnome-shell/ShellJS-0.1.typelib +lib/gnome-shell/ShellMenu-0.1.typelib lib/gnome-shell/St-1.0.typelib lib/gnome-shell/libgnome-shell-js.so +lib/gnome-shell/libgnome-shell-menu.so lib/gnome-shell/libgnome-shell.so lib/mozilla/ lib/mozilla/plugins/ @@ -34,16 +36,15 @@ share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml share/dbus-1/services/org.gnome.Shell.CalendarServer.service share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service share/glib-2.0/schemas/org.gnome.shell.gschema.xml -share/gnome-control-center/keybindings/50-gnome-shell-screenshot.xml share/gnome-control-center/keybindings/50-gnome-shell-system.xml share/gnome-shell/js/ share/gnome-shell/js/extensionPrefs/ share/gnome-shell/js/extensionPrefs/main.js share/gnome-shell/js/gdm/ +share/gnome-shell/js/gdm/authPrompt.js share/gnome-shell/js/gdm/batch.js share/gnome-shell/js/gdm/fingerprint.js share/gnome-shell/js/gdm/loginDialog.js -share/gnome-shell/js/gdm/powerMenu.js share/gnome-shell/js/gdm/realmd.js share/gnome-shell/js/gdm/util.js share/gnome-shell/js/misc/ @@ -56,12 +57,15 @@ share/gnome-shell/js/misc/history.js share/gnome-shell/js/misc/jsParse.js share/gnome-shell/js/misc/loginManager.js share/gnome-shell/js/misc/modemManager.js +share/gnome-shell/js/misc/objectManager.js share/gnome-shell/js/misc/params.js +share/gnome-shell/js/misc/smartcardManager.js share/gnome-shell/js/misc/util.js share/gnome-shell/js/perf/ share/gnome-shell/js/perf/core.js share/gnome-shell/js/ui/ share/gnome-shell/js/ui/altTab.js +share/gnome-shell/js/ui/animation.js share/gnome-shell/js/ui/appDisplay.js share/gnome-shell/js/ui/appFavorites.js share/gnome-shell/js/ui/background.js @@ -76,7 +80,6 @@ share/gnome-shell/js/ui/components/autorunManager.js share/gnome-shell/js/ui/components/keyring.js share/gnome-shell/js/ui/components/networkAgent.js share/gnome-shell/js/ui/components/polkitAgent.js -share/gnome-shell/js/ui/components/recorder.js share/gnome-shell/js/ui/components/telepathyClient.js share/gnome-shell/js/ui/ctrlAltTab.js share/gnome-shell/js/ui/dash.js @@ -86,6 +89,7 @@ share/gnome-shell/js/ui/endSessionDialog.js share/gnome-shell/js/ui/environment.js share/gnome-shell/js/ui/extensionDownloader.js share/gnome-shell/js/ui/extensionSystem.js +share/gnome-shell/js/ui/focusCaretTracker.js share/gnome-shell/js/ui/grabHelper.js share/gnome-shell/js/ui/ibusCandidatePopup.js share/gnome-shell/js/ui/iconGrid.js @@ -106,6 +110,7 @@ share/gnome-shell/js/ui/panel.js share/gnome-shell/js/ui/panelMenu.js share/gnome-shell/js/ui/pointerWatcher.js share/gnome-shell/js/ui/popupMenu.js +share/gnome-shell/js/ui/remoteMenu.js share/gnome-shell/js/ui/remoteSearch.js share/gnome-shell/js/ui/runDialog.js share/gnome-shell/js/ui/screenShield.js @@ -119,18 +124,21 @@ share/gnome-shell/js/ui/sessionMode.js share/gnome-shell/js/ui/shellDBus.js share/gnome-shell/js/ui/shellEntry.js share/gnome-shell/js/ui/shellMountOperation.js +share/gnome-shell/js/ui/slider.js share/gnome-shell/js/ui/status/ share/gnome-shell/js/ui/status/accessibility.js share/gnome-shell/js/ui/status/bluetooth.js +share/gnome-shell/js/ui/status/brightness.js share/gnome-shell/js/ui/status/keyboard.js -share/gnome-shell/js/ui/status/lockScreenMenu.js share/gnome-shell/js/ui/status/network.js share/gnome-shell/js/ui/status/power.js +share/gnome-shell/js/ui/status/rfkill.js +share/gnome-shell/js/ui/status/screencast.js +share/gnome-shell/js/ui/status/system.js share/gnome-shell/js/ui/status/volume.js share/gnome-shell/js/ui/switcherPopup.js share/gnome-shell/js/ui/tweener.js share/gnome-shell/js/ui/unlockDialog.js -share/gnome-shell/js/ui/userMenu.js share/gnome-shell/js/ui/userWidget.js share/gnome-shell/js/ui/viewSelector.js share/gnome-shell/js/ui/wanda.js @@ -161,6 +169,8 @@ share/gnome-shell/theme/logged-in-indicator.svg share/gnome-shell/theme/message-tray-background.png share/gnome-shell/theme/more-results.svg share/gnome-shell/theme/noise-texture.png +share/gnome-shell/theme/page-indicator-active.svg +share/gnome-shell/theme/page-indicator-inactive.svg share/gnome-shell/theme/panel-button-border.svg share/gnome-shell/theme/panel-button-highlight-narrow.svg share/gnome-shell/theme/panel-button-highlight-wide.svg @@ -213,7 +223,6 @@ share/gtk-doc/html/shell/shell-shell-keybinding-modes.html share/gtk-doc/html/shell/shell-shell-polkit-authentication-agent.html share/gtk-doc/html/shell/shell-shell-recorder.html share/gtk-doc/html/shell/shell-shell-util.html -share/gtk-doc/html/shell/shell-shell-xfixes-cursor.html share/gtk-doc/html/shell/shell.devhelp2 share/gtk-doc/html/shell/style.css share/gtk-doc/html/shell/up.png