gnome-base/gnome-shell: 3.12.2 → 3.14.0

6 files changed, 34 insertions, 38 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index d5406849..d745d479 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST gnome-shell-3.12.1.tar.xz 1541420 SHA256 d5a475f390d992de03ccf8ffeafec90595da700594eba9fc0688cbb1652b5516 SHA512 a6c811def3933107eb9e69614bb484ef7cf308ee32a7447560d38e0d2115fddd8ba9fb839c683222c5c7a9691db9afded0ddc0725f498a0adb79670b544cb3bf WHIRLPOOL cbe84c2ae7d9d78e2151ad01a34ddeddbcbcc6209434d2cb6590bd931fb56a8a52c9b480b3ef4421832076fcbec25f42658d9568a3147538a860594670a1dade
+DIST gnome-shell-3.14.0.tar.xz 1583024 SHA256 4c665fbc8ea1d3c78f184b9e64a87d9cba1c1834167fbd1c0770c91553934011 SHA512 9d5e94f4bb67e284a20139f71808e9e68d46f1aeb3e6c99682a5472c3e1c28348818d48cb1a8681700cc0103a51fa1035e06cb1cd42ff7c9e566880c576a0008 WHIRLPOOL 339038ed66f8dd9504d92828d82392690a49eabedfd9a25d17ded088d0e95c3a7638cac922c3cdbda5eb3df4e438b29fb5fdecf490d8e048da42a2f19bb1241e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREKAAYFAlNVjUUACgkQ1fmVwcYIWAYBkwCdGoA+8N8NSyzD0+hyUUt97HX1
-TDgAn1yBGS9MUTv06Q/dp59V5yjE2BEk
-=6CIj
+iEYEAREKAAYFAlQ6pNkACgkQ1fmVwcYIWAb2owCg1WZbxAdmQ3eSd7y6ZCMEU79m
+AAIAoJPScFZajfkJcuLo0vn8fQqyrMBT
+=uUrb
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.12.0-bluetooth-flag.patch
index 2fa93af2..2fa93af2 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.12.0-bluetooth-flag.patch
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch
index b688dd62..cc2b2e65 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch
@@ -1,4 +1,4 @@
-From 9f056842fad21dc69a51fd9f01543cd85a6d4047 Mon Sep 17 00:00:00 2001
+From 6b43368c9b10ba112e4272f66c507a0da9cf7e13 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Sat, 15 Mar 2014 17:48:41 -0400
 Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
@@ -14,10 +14,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=726435
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index f489a56..79838a3 100644
+index a73eaae..c8fd46f 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -320,7 +320,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
+@@ -315,7 +315,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
  libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
  
  libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
@@ -25,7 +25,7 @@ index f489a56..79838a3 100644
 +libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) $(BLUETOOTH_LIBS) libgnome-shell-base.la
  libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
  
- if HAVE_MUTTER_WAYLAND
+ ShellMenu-0.1.gir: libgnome-shell-menu.la
 -- 
-1.9.0
+2.1.2
 
diff --git a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-defaults.patch
index 80634c10..b6064225 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-defaults.patch
@@ -1,4 +1,4 @@
-From 4fd7696fc9f392a11b91fa3fc7fe14ac7734ee62 Mon Sep 17 00:00:00 2001
+From 6b658660e822a550da55c735c826ec75b6c0efee Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Tue, 10 Dec 2013 23:33:51 +0100
 Subject: [PATCH 1/3] Alter list of default applications
@@ -8,18 +8,18 @@ Subject: [PATCH 1/3] Alter list of default applications
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
-index dc27e47..e8de0ed 100644
+index 92cef3f..9e783bb 100644
 --- a/data/org.gnome.shell.gschema.xml.in.in
 +++ b/data/org.gnome.shell.gschema.xml.in.in
-@@ -22,7 +22,7 @@
+@@ -31,7 +31,7 @@
        </_description>
      </key>
      <key name="favorite-apps" type="as">
--      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
-+      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
+-      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
++      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
        <_summary>List of desktop file IDs for favorite applications</_summary>
        <_description>
          The applications corresponding to these identifiers
 -- 
-1.8.5.1
+2.1.2
 
diff --git a/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.0.ebuild
index e3681128..2c5acc8f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.14.0.ebuild
@@ -21,7 +21,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
 #  * gstreamer support is currently automagic
-#  * mutter/mutter-wayland support is automagic
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-atk-2.5.3
 	>=dev-libs/atk-2[introspection]
@@ -29,7 +28,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.39.1:2
 	>=dev-libs/gjs-1.39
 	>=dev-libs/gobject-introspection-0.10.1
-	>=x11-libs/gtk+-3.7.9:3[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection]
 	>=media-libs/clutter-1.15.90:1.0[introspection]
 	>=dev-libs/json-glib-0.13.2
 	>=dev-libs/libcroco-0.6.8:0.6
@@ -44,7 +43,7 @@ COMMON_DEPEND="
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-libs/libXfixes-5.0
 	x11-libs/libXtst
-	>=x11-wm/mutter-3.12.1[introspection]
+	>=x11-wm/mutter-3.14[introspection]
 	>=x11-libs/startup-notification-0.11
 
 	${PYTHON_DEPS}
@@ -84,11 +83,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
 	>=app-accessibility/caribou-0.4.8
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
-	sys-power/upower[introspection]
+	>=sys-power/upower-0.99[introspection]
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3
@@ -106,6 +103,9 @@ RDEPEND="${COMMON_DEPEND}
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
 "
+# avoid circular dependency
+PDEPEND=">=gnome-base/gdm-3.5[introspection]
+"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.17
@@ -119,14 +119,14 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	# Change favorites defaults, bug #479918
-	epatch "${FILESDIR}/${PN}-defaults.patch"
+	epatch "${FILESDIR}/${PN}-3.14.0-defaults.patch"
 
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.12-bluetooth-flag.patch"
+	epatch "${FILESDIR}/${PN}-3.12.0-bluetooth-flag.patch"
 
 	# Fix silent bluetooth linking failure with ld.gold, bug #503952
 	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
-	epatch "${FILESDIR}/${PN}-3.10.4-bluetooth-gold.patch"
+	epatch "${FILESDIR}/${PN}-3.14.0-bluetooth-gold.patch"
 
 	epatch_user
 
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index fdf36781..79a45b3d 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -28,10 +28,6 @@ fi
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
 #  * gstreamer support is currently automagic
-#  * mutter/mutter-wayland support is automagic
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-atk-2.5.3
 	>=dev-libs/atk-2[introspection]
@@ -39,7 +35,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.39.1:2
 	>=dev-libs/gjs-1.39
 	>=dev-libs/gobject-introspection-0.10.1
-	>=x11-libs/gtk+-3.7.9:3[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection]
 	>=media-libs/clutter-1.15.90:1.0[introspection]
 	>=dev-libs/json-glib-0.13.2
 	>=dev-libs/libcroco-0.6.8:0.6
@@ -54,7 +50,7 @@ COMMON_DEPEND="
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-libs/libXfixes-5.0
 	x11-libs/libXtst
-	>=x11-wm/mutter-3.12.1[introspection]
+	>=x11-wm/mutter-3.14[introspection]
 	>=x11-libs/startup-notification-0.11
 
 	${PYTHON_DEPS}
@@ -94,11 +90,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
 	>=app-accessibility/caribou-0.4.8
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
-	sys-power/upower[introspection]
+	>=sys-power/upower-0.99[introspection]
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3
@@ -116,6 +110,9 @@ RDEPEND="${COMMON_DEPEND}
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
 "
+# avoid circular dependency
+PDEPEND=">=gnome-base/gdm-3.5[introspection]
+"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.17
@@ -129,14 +126,14 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	# Change favorites defaults, bug #479918
-	epatch "${FILESDIR}/${PN}-defaults.patch"
+	epatch "${FILESDIR}/${PN}-3.14.0-defaults.patch"
 
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.12-bluetooth-flag.patch"
+	epatch "${FILESDIR}/${PN}-3.12.0-bluetooth-flag.patch"
 
 	# Fix silent bluetooth linking failure with ld.gold, bug #503952
 	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
-	epatch "${FILESDIR}/${PN}-3.10.4-bluetooth-gold.patch"
+	epatch "${FILESDIR}/${PN}-3.14.0-bluetooth-gold.patch"
 
 	epatch_user
 
@@ -149,7 +146,6 @@ src_configure() {
 	gnome2_src_configure \
 		--enable-browser-plugin \
 		--enable-man \
-		--disable-jhbuild-wrapper-script \
 		$(use_enable !openrc-force systemd) \
 		$(use_with bluetooth) \
 		$(use_enable networkmanager) \