cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to gnome-shell-3.8.0.1

Browse Source
This commit is contained in:
jasper 2013-03-30 08:04:19 +00:00
parent 1263748d51
commit 0a279ef446
9 changed files with 78 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
x11/gnome/shell/Makefile
View File

@ -1,35 +1,34 @@
# $OpenBSD: Makefile,v 1.33 2013/03/27 18:02:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.34 2013/03/30 08:04:19 jasper Exp $
COMMENT= next generation GNOME shell
GNOME_PROJECT= gnome-shell
GNOME_VERSION= 3.6.3.1
REVISION= 0
GNOME_VERSION= 3.8.0.1
HOMEPAGE= http://live.gnome.org/GnomeShell
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += asn1 atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB += FLAC ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xtst asn1
WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB += camel-1.2 canberra canberra-gtk3 clutter-1.0 cogl cogl-pango
WANTLIB += com_err croco-0.6 crypto dbus-1 dbus-glib-1 drm
WANTLIB += ecal-1.2 edataserver-1.2 xkbfile xml2 z graphite2
WANTLIB += execinfo expat ffi fontconfig freetype gck-1 gcr-3
WANTLIB += gcr-base-3 gcrypt gdbm gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += girepository-1.0 gjs glib-2.0 gmodule-2.0 gnome-desktop-3
WANTLIB += gnome-keyring gnome-menu-3 gobject-2.0 gpg-error gssapi
WANTLIB += gstbase-1.0 gstreamer-1.0 gthread-2.0 gtk-3 harfbuzz
WANTLIB += ical icalss icalvcal icudata icule icuuc json json-glib-1.0
WANTLIB += krb5 ltdl m mozjs185 mutter ncurses nspr4 nss3 nssutil3
WANTLIB += ogg p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 plc4 plds4 png polkit-agent-1 polkit-gobject-1
WANTLIB += pthread pthread-stubs pulse pulse-mainloop-glib smime3
WANTLIB += sndfile softokn3 soup-2.4 sqlite3 ssl3 startup-notification-1
WANTLIB += stdc++ telepathy-glib telepathy-logger vorbis vorbisfile
WANTLIB += xcb xcb-aux xcb-render xcb-shm FLAC Xtst vorbisenc
WANTLIB += com_err croco-0.6 crypto dbus-1 dbus-glib-1 ecal-1.2
WANTLIB += edataserver-1.2 execinfo expat ffi fontconfig freetype
WANTLIB += gck-1 gcr-3 gcr-base-3 gcrypt gdbm gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 girepository-1.0 gjs glib-2.0 gmodule-2.0 gnome-menu-3
WANTLIB += gobject-2.0 gpg-error graphite2 gssapi gstbase-1.0
WANTLIB += gstreamer-1.0 gthread-2.0 gtk-3 harfbuzz ical icalss
WANTLIB += icalvcal icudata icule icuuc json json-glib-1.0 krb5
WANTLIB += ltdl m mozjs185 mutter ncurses ncursesw nspr4 nss3
WANTLIB += nssutil3 ogg p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 plc4 plds4 png polkit-agent-1 polkit-gobject-1
WANTLIB += pthread pthread-stubs pulse pulse-mainloop-glib readline
WANTLIB += secret-1 smime3 sndfile softokn3 soup-2.4 sqlite3 ssl3
WANTLIB += startup-notification-1 stdc++ telepathy-glib vorbis
WANTLIB += vorbisenc vorbisfile xcb xcb-aux xcb-render xcb-shm
WANTLIB += xml2 z
MODULES= devel/dconf \
devel/gettext \
@ -44,13 +43,15 @@ BUILD_DEPENDS += textproc/docbook-xsl
# gnome-keybindings.pc
BUILD_DEPENDS += x11/gnome/controlcenter
# onscreen keyboard
BUILD_DEPENDS += x11/gnome/caribou
LIB_DEPENDS= audio/pulseaudio>=2.1 \
databases/evolution-data-server>=3.6.0p3 \
multimedia/gstreamer1/core \
net/telepathy/telepathy-logger \
net/telepathy/telepathy-glib \
sysutils/polkit \
www/libcroco \
x11/gnome/desktop \
x11/gnome/gcr \
x11/gnome/gjs \
x11/gnome/menus \

4
x11/gnome/shell/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-shell-3.6.3.1.tar.xz) = TgMo1DrEQ+fMDEO7Z4lREmQ5UvFM0g//EQnGzFhJ1gM=
SIZE (gnome/gnome-shell-3.6.3.1.tar.xz) = 1408036
SHA256 (gnome/gnome-shell-3.8.0.1.tar.xz) = z5jD0DhwT9BXSJxpamy54u4q5aENtbRd3rpZ+4LVB7g=
SIZE (gnome/gnome-shell-3.8.0.1.tar.xz) = 1500260

20
x11/gnome/shell/patches/patch-configure_ac
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-configure_ac,v 1.8 2012/11/13 18:19:13 jasper Exp $
$OpenBSD: patch-configure_ac,v 1.9 2013/03/30 08:04:19 jasper Exp $
Make Network Manager support optional.
https://bugzilla.gnome.org/show_bug.cgi?id=679871
--- configure.ac.orig Mon Nov 12 22:00:58 2012
+++ configure.ac Tue Nov 13 18:50:30 2012
@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MI
--- configure.ac.orig Wed Mar 27 17:28:24 2013
+++ configure.ac Fri Mar 29 21:54:39 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
telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
- libnm-glib libnm-util gnome-keyring-1
+ gnome-keyring-1
gcr-3 >= $GCR_MIN_VERSION
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
libsecret-unstable gcr-3 >= $GCR_MIN_VERSION)
@@ -140,6 +140,24 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
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],
[AC_DEFINE([HAVE_BLUETOOTH],[0])
AC_SUBST([HAVE_BLUETOOTH],[0])
AC_MSG_RESULT([no])])

8
x11/gnome/shell/patches/patch-docs_reference_shell_Makefile_am
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-docs_reference_shell_Makefile_am,v 1.1 2012/09/30 20:56:42 jasper Exp $
$OpenBSD: patch-docs_reference_shell_Makefile_am,v 1.2 2013/03/30 08:04:19 jasper Exp $
Make Network Manager support optional.
https://bugzilla.gnome.org/show_bug.cgi?id=679871
--- docs/reference/shell/Makefile.am.orig Sun Sep 30 22:49:01 2012
+++ docs/reference/shell/Makefile.am Sun Sep 30 22:49:18 2012
@@ -90,8 +90,8 @@ expand_content_files=
--- 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.
# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)

20
x11/gnome/shell/patches/patch-js_ui_calendar_js
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-js_ui_calendar_js,v 1.1 2012/11/15 08:32:36 ajacoutot Exp $
From a4e29e1244b097fc2bebc371e00d7af30537c376 Mon Sep 17 00:00:00 2001
From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 23 Oct 2012 12:32:27 +0000
Subject: calendar: Handle calendar-server errors
--- js/ui/calendar.js.orig Mon Nov 12 21:18:59 2012
+++ js/ui/calendar.js Thu Nov 15 09:16:05 2012
@@ -270,8 +270,9 @@ const DBusEventSource = new Lang.Class({
this._loadEvents(false);
},
- _onEventsReceived: function([appointments]) {
+ _onEventsReceived: function(results, error) {
let newEvents = [];
+ let appointments = results ? results[0] : null;
if (appointments != null) {
for (let n = 0; n < appointments.length; n++) {
let a = appointments[n];

8
x11/gnome/shell/patches/patch-js_ui_panel_js
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-js_ui_panel_js,v 1.4 2012/09/30 14:45:23 jasper Exp $
$OpenBSD: patch-js_ui_panel_js,v 1.5 2013/03/30 08:04:19 jasper Exp $
Make Network Manager support optional.
https://bugzilla.gnome.org/show_bug.cgi?id=679871
--- js/ui/panel.js.orig Sun Sep 30 13:24:41 2012
+++ js/ui/panel.js Sun Sep 30 13:25:31 2012
@@ -910,11 +910,13 @@ if (Config.HAVE_BLUETOOTH)
--- js/ui/panel.js.orig Mon Mar 18 16:36:03 2013
+++ js/ui/panel.js Fri Mar 29 20:39:33 2013
@@ -883,11 +883,13 @@ if (Config.HAVE_BLUETOOTH)
PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
imports.ui.status.bluetooth.Indicator;

8
x11/gnome/shell/patches/patch-js_ui_sessionMode_js
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-js_ui_sessionMode_js,v 1.1 2012/10/08 11:33:21 ajacoutot Exp $
$OpenBSD: patch-js_ui_sessionMode_js,v 1.2 2013/03/30 08:04:19 jasper Exp $
XXX fix this the correct way (if HAVE_NETWORK_MANAGER) and push it upstream
--- js/ui/sessionMode.js.orig Mon Oct 8 14:59:38 2012
+++ js/ui/sessionMode.js Mon Oct 8 15:00:06 2012
@@ -91,7 +91,7 @@ const _modes = {
--- js/ui/sessionMode.js.orig Tue Mar 26 22:01:00 2013
+++ js/ui/sessionMode.js Fri Mar 29 20:39:33 2013
@@ -101,7 +101,7 @@ const _modes = {
isLocked: false,
isPrimary: true,
unlockDialog: imports.ui.unlockDialog.UnlockDialog,

40
x11/gnome/shell/patches/patch-src_Makefile_am
View File

@ -1,35 +1,27 @@
$OpenBSD: patch-src_Makefile_am,v 1.3 2012/09/30 20:56:42 jasper Exp $
$OpenBSD: patch-src_Makefile_am,v 1.4 2013/03/30 08:04:19 jasper Exp $
Make Network Manager support optional.
https://bugzilla.gnome.org/show_bug.cgi?id=679871
--- src/Makefile.am.orig Tue Sep 18 16:44:03 2012
+++ src/Makefile.am Sun Sep 30 22:46:10 2012
@@ -86,6 +86,7 @@ include Makefile-hotplug-sniffer.am
gnome_shell_cflags = \
$(GNOME_SHELL_CFLAGS) \
$(SYSTEMD_CFLAGS) \
+ $(NM_CFLAGS) \
-I$(srcdir)/tray \
-DVERSION=\"$(VERSION)\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
@@ -117,7 +118,6 @@ shell_public_headers_h = \
--- 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 = \
shell-invert-lightness-effect.h \
shell-mobile-providers.h \
shell-keybinding-modes.h \
shell-mount-operation.h \
- shell-network-agent.h \
shell-perf-log.h \
shell-screenshot.h \
shell-screen-grabber.h \
@@ -164,7 +164,6 @@ libgnome_shell_la_SOURCES = \
shell-slicer.h \
@@ -159,7 +158,6 @@ libgnome_shell_la_SOURCES = \
shell-keyring-prompt.h \
shell-keyring-prompt.c \
shell-mobile-providers.c \
shell-mount-operation.c \
- shell-network-agent.c \
shell-perf-log.c \
shell-polkit-authentication-agent.h \
shell-polkit-authentication-agent.c \
@@ -241,6 +240,16 @@ endif BUILD_RECORDER
@@ -233,6 +231,16 @@ endif BUILD_RECORDER
########################################
@ -46,20 +38,12 @@ 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,6 +296,7 @@ libgnome_shell_la_LIBADD = \
-lm \
$(GNOME_SHELL_LIBS) \
$(SYSTEMD_LIBS) \
+ $(NM_LIBS) \
$(BLUETOOTH_LIBS) \
libst-1.0.la \
libtray.la \
@@ -296,7 +306,10 @@ libgnome_shell_la_LIBADD = \
@@ -287,7 +295,10 @@ libgnome_shell_la_LIBADD = \
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
Shell-0.1.gir: libgnome-shell.la St-1.0.gir
-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 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 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0
-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

21
x11/gnome/shell/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2012/10/16 11:56:12 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.8 2013/03/30 08:04:19 jasper Exp $
@bin bin/gnome-shell
bin/gnome-shell-extension-prefs
bin/gnome-shell-extension-tool
@ -21,7 +21,9 @@ share/GConf/gsettings/gnome-shell-overrides.convert
share/applications/evolution-calendar.desktop
share/applications/gnome-shell-extension-prefs.desktop
share/applications/gnome-shell.desktop
share/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml
share/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
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
@ -43,6 +45,7 @@ share/gnome-shell/js/misc/config.js
share/gnome-shell/js/misc/extensionUtils.js
share/gnome-shell/js/misc/fileUtils.js
share/gnome-shell/js/misc/gnomeSession.js
share/gnome-shell/js/misc/hash.js
share/gnome-shell/js/misc/history.js
share/gnome-shell/js/misc/jsParse.js
share/gnome-shell/js/misc/loginManager.js
@ -55,6 +58,8 @@ share/gnome-shell/js/ui/
share/gnome-shell/js/ui/altTab.js
share/gnome-shell/js/ui/appDisplay.js
share/gnome-shell/js/ui/appFavorites.js
share/gnome-shell/js/ui/background.js
share/gnome-shell/js/ui/backgroundMenu.js
share/gnome-shell/js/ui/boxpointer.js
share/gnome-shell/js/ui/calendar.js
share/gnome-shell/js/ui/checkBox.js
@ -75,7 +80,6 @@ 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/flashspot.js
share/gnome-shell/js/ui/grabHelper.js
share/gnome-shell/js/ui/ibusCandidatePopup.js
share/gnome-shell/js/ui/iconGrid.js
@ -89,7 +93,9 @@ share/gnome-shell/js/ui/main.js
share/gnome-shell/js/ui/messageTray.js
share/gnome-shell/js/ui/modalDialog.js
share/gnome-shell/js/ui/notificationDaemon.js
share/gnome-shell/js/ui/osdWindow.js
share/gnome-shell/js/ui/overview.js
share/gnome-shell/js/ui/overviewControls.js
share/gnome-shell/js/ui/panel.js
share/gnome-shell/js/ui/panelMenu.js
share/gnome-shell/js/ui/pointerWatcher.js
@ -97,9 +103,11 @@ share/gnome-shell/js/ui/popupMenu.js
share/gnome-shell/js/ui/remoteSearch.js
share/gnome-shell/js/ui/runDialog.js
share/gnome-shell/js/ui/screenShield.js
share/gnome-shell/js/ui/screenshot.js
share/gnome-shell/js/ui/scripting.js
share/gnome-shell/js/ui/search.js
share/gnome-shell/js/ui/searchDisplay.js
share/gnome-shell/js/ui/separator.js
share/gnome-shell/js/ui/sessionMode.js
share/gnome-shell/js/ui/shellDBus.js
share/gnome-shell/js/ui/shellEntry.js
@ -112,9 +120,11 @@ 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/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
share/gnome-shell/js/ui/windowAttentionHandler.js
@ -142,6 +152,7 @@ share/gnome-shell/theme/filter-selected-rtl.svg
share/gnome-shell/theme/gnome-shell.css
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/panel-button-border.svg
share/gnome-shell/theme/panel-button-highlight-narrow.svg
@ -156,6 +167,7 @@ share/gnome-shell/theme/toggle-on-intl.svg
share/gnome-shell/theme/toggle-on-us.svg
share/gnome-shell/theme/ws-switch-arrow-down.png
share/gnome-shell/theme/ws-switch-arrow-up.png
share/gnome-shell/wanda.png
share/gtk-doc/html/shell/
share/gtk-doc/html/shell/ShellAppSystem.html
share/gtk-doc/html/shell/ShellEmbeddedWindow.html
@ -176,6 +188,8 @@ share/gtk-doc/html/shell/ch04.html
share/gtk-doc/html/shell/ch05.html
share/gtk-doc/html/shell/ch06.html
share/gtk-doc/html/shell/deprecated-api-index.html
share/gtk-doc/html/shell/gdbus-org.gnome.Shell.SearchProvider.html
share/gtk-doc/html/shell/gdbus-org.gnome.Shell.SearchProvider2.html
share/gtk-doc/html/shell/home.png
share/gtk-doc/html/shell/index.html
share/gtk-doc/html/shell/index.sgml
@ -188,7 +202,6 @@ share/gtk-doc/html/shell/shell-ShellGlobal.html
share/gtk-doc/html/shell/shell-ShellTpClient.html
share/gtk-doc/html/shell/shell-ShellWM.html
share/gtk-doc/html/shell/shell-ShellWindowTracker.html
share/gtk-doc/html/shell/shell-shell-mobile-providers.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
@ -254,6 +267,7 @@ share/locale/eu/LC_MESSAGES/gnome-shell.mo
share/locale/fa/LC_MESSAGES/gnome-shell.mo
share/locale/fi/LC_MESSAGES/gnome-shell.mo
share/locale/fr/LC_MESSAGES/gnome-shell.mo
share/locale/fur/LC_MESSAGES/gnome-shell.mo
share/locale/ga/LC_MESSAGES/gnome-shell.mo
share/locale/gl/LC_MESSAGES/gnome-shell.mo
share/locale/gu/LC_MESSAGES/gnome-shell.mo
@ -292,6 +306,7 @@ share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo
share/locale/sv/LC_MESSAGES/gnome-shell.mo
share/locale/ta/LC_MESSAGES/gnome-shell.mo
share/locale/te/LC_MESSAGES/gnome-shell.mo
share/locale/tg/LC_MESSAGES/gnome-shell.mo
share/locale/th/LC_MESSAGES/gnome-shell.mo
share/locale/tr/LC_MESSAGES/gnome-shell.mo
share/locale/ug/LC_MESSAGES/gnome-shell.mo