Date: Saturday, March 5, 2016 @ 20:11:22
  Author: heftig
Revision: 260964

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnome-shell/repos/extra-i686/PKGBUILD
    (from rev 260963, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-i686/gnome-shell.install
    (from rev 260963, gnome-shell/trunk/gnome-shell.install)
  gnome-shell/repos/extra-i686/libsecret-crash.patch
    (from rev 260963, gnome-shell/trunk/libsecret-crash.patch)
  gnome-shell/repos/extra-i686/nm-libexecdir.patch
    (from rev 260963, gnome-shell/trunk/nm-libexecdir.patch)
  gnome-shell/repos/extra-x86_64/PKGBUILD
    (from rev 260963, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-x86_64/gnome-shell.install
    (from rev 260963, gnome-shell/trunk/gnome-shell.install)
  gnome-shell/repos/extra-x86_64/libsecret-crash.patch
    (from rev 260963, gnome-shell/trunk/libsecret-crash.patch)
  gnome-shell/repos/extra-x86_64/nm-libexecdir.patch
    (from rev 260963, gnome-shell/trunk/nm-libexecdir.patch)
Deleted:
  gnome-shell/repos/extra-i686/PKGBUILD
  gnome-shell/repos/extra-i686/gnome-shell.install
  gnome-shell/repos/extra-i686/libsecret-crash.patch
  gnome-shell/repos/extra-i686/nm-libexecdir.patch
  gnome-shell/repos/extra-i686/vpn-secrets.patch
  gnome-shell/repos/extra-x86_64/PKGBUILD
  gnome-shell/repos/extra-x86_64/gnome-shell.install
  gnome-shell/repos/extra-x86_64/libsecret-crash.patch
  gnome-shell/repos/extra-x86_64/nm-libexecdir.patch
  gnome-shell/repos/extra-x86_64/vpn-secrets.patch

------------------------------------+
 /PKGBUILD                          |  112 +++++++++++++++++++++++++++++++++++
 /gnome-shell.install               |   38 +++++++++++
 /libsecret-crash.patch             |   64 ++++++++++++++++++++
 /nm-libexecdir.patch               |   24 +++++++
 extra-i686/PKGBUILD                |   58 ------------------
 extra-i686/gnome-shell.install     |   19 -----
 extra-i686/libsecret-crash.patch   |   32 ----------
 extra-i686/nm-libexecdir.patch     |   12 ---
 extra-i686/vpn-secrets.patch       |   63 -------------------
 extra-x86_64/PKGBUILD              |   58 ------------------
 extra-x86_64/gnome-shell.install   |   19 -----
 extra-x86_64/libsecret-crash.patch |   32 ----------
 extra-x86_64/nm-libexecdir.patch   |   12 ---
 extra-x86_64/vpn-secrets.patch     |   63 -------------------
 14 files changed, 238 insertions(+), 368 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-i686/PKGBUILD 2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ib...@archlinux.org>
-# Contributor: Flamelab <panosfi...@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.18.3
-pkgrel=3
-pkgdesc="The next generation GNOME Shell"
-arch=(i686 x86_64)
-url="http://live.gnome.org/GnomeShell";
-license=(GPL2)
-depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower
-         gnome-session gnome-settings-daemon gnome-themes-standard 
gsettings-desktop-schemas
-         libcanberra-pulse libcroco libgdm libsecret mutter 
nm-connection-editor
-         telepathy-logger telepathy-mission-control unzip gstreamer)
-makedepends=(intltool gtk-doc gnome-control-center evolution-data-server 
python gobject-introspection)
-optdepends=('gnome-control-center: System settings'
-            'evolution-data-server: Evolution calendar integration')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        libsecret-crash.patch vpn-secrets.patch
-        nm-libexecdir.patch)
-sha256sums=('8517baf8606f970ebf38222411eb7563cab2ae5efbfb088954ce23705b67519b'
-            '3c668de4c091dccf3d269b3d549c93f2a9b64e569c87ff3c3466624b5fc735bd'
-            '156d62bcb1281527820c9fd4760354478d7d7f0d424ba291bab6cfa498a54ef6'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  patch -Np1 -i ../libsecret-crash.patch
-  patch -Np1 -i ../vpn-secrets.patch
-
-  # FS#30747 FS#32730 Problems due to libexecdir different from NM
-  patch -Np1 -i ../nm-libexecdir.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Must exist; FS#37412
-  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
-}

Copied: gnome-shell/repos/extra-i686/PKGBUILD (from rev 260963, 
gnome-shell/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD                         (rev 0)
+++ extra-i686/PKGBUILD 2016-03-05 19:11:22 UTC (rev 260964)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ionut Biru <ib...@archlinux.org>
+# Contributor: Flamelab <panosfi...@gmail.com
+
+pkgname=gnome-shell
+pkgver=3.18.4
+pkgrel=1
+pkgdesc="The next generation GNOME Shell"
+arch=(i686 x86_64)
+url="https://wiki.gnome.org/Projects/GnomeShell";
+license=(GPL2)
+depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower
+         gnome-session gnome-settings-daemon gnome-themes-standard 
gsettings-desktop-schemas
+         libcanberra-pulse libcroco libgdm libsecret mutter 
nm-connection-editor
+         telepathy-logger telepathy-mission-control unzip gstreamer)
+makedepends=(intltool gtk-doc gnome-control-center evolution-data-server 
python gobject-introspection)
+optdepends=('gnome-control-center: System settings'
+            'evolution-data-server: Evolution calendar integration')
+install=gnome-shell.install
+groups=(gnome)
+source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        libsecret-crash.patch
+        nm-libexecdir.patch)
+sha256sums=('d959c0aae4c10b194d1fa29e89d34d73a4d35d74f384bf604d78435bf9ced5d7'
+            '3c668de4c091dccf3d269b3d549c93f2a9b64e569c87ff3c3466624b5fc735bd'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i ../libsecret-crash.patch
+
+  # FS#30747 FS#32730 Problems due to libexecdir different from NM
+  patch -Np1 -i ../nm-libexecdir.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/gnome-shell \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Must exist; FS#37412
+  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
+}

Deleted: extra-i686/gnome-shell.install
===================================================================
--- extra-i686/gnome-shell.install      2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-i686/gnome-shell.install      2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: gnome-shell/repos/extra-i686/gnome-shell.install (from rev 260963, 
gnome-shell/trunk/gnome-shell.install)
===================================================================
--- extra-i686/gnome-shell.install                              (rev 0)
+++ extra-i686/gnome-shell.install      2016-03-05 19:11:22 UTC (rev 260964)
@@ -0,0 +1,19 @@
+pkgname=gnome-shell
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/libsecret-crash.patch
===================================================================
--- extra-i686/libsecret-crash.patch    2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-i686/libsecret-crash.patch    2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,32 +0,0 @@
-From 021cecbce289f1d9c68a156d5b8dd204a73bc715 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cferg...@redhat.com>
-Date: Sun, 20 Dec 2015 20:51:52 +0100
-Subject: NetworkAgent: Fix double-unref in get_secrets_keyring_cb()
-
-In get_secrets_keyring_cb, we own a ref on the 'attributes' hash table
-from secret_item_get_attributes), and a ref on the 'secret' object (from
-secret_item_get_secret(), but in the SHELL_KEYRING_SK_TAG case, we unref
-these once before breaking out of the loop, and the second time after
-breaking out of the loop.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759708
----
- src/shell-network-agent.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/shell-network-agent.c b/src/shell-network-agent.c
-index 5d99167..da0f7e5 100644
---- a/src/shell-network-agent.c
-+++ b/src/shell-network-agent.c
-@@ -314,8 +314,6 @@ get_secrets_keyring_cb (GObject            *source,
- 
-               secrets_found = TRUE;
- 
--              g_hash_table_unref (attributes);
--              secret_value_unref (secret);
-               break;
-             }
-         }
--- 
-cgit v0.11.2
-

Copied: gnome-shell/repos/extra-i686/libsecret-crash.patch (from rev 260963, 
gnome-shell/trunk/libsecret-crash.patch)
===================================================================
--- extra-i686/libsecret-crash.patch                            (rev 0)
+++ extra-i686/libsecret-crash.patch    2016-03-05 19:11:22 UTC (rev 260964)
@@ -0,0 +1,32 @@
+From 021cecbce289f1d9c68a156d5b8dd204a73bc715 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cferg...@redhat.com>
+Date: Sun, 20 Dec 2015 20:51:52 +0100
+Subject: NetworkAgent: Fix double-unref in get_secrets_keyring_cb()
+
+In get_secrets_keyring_cb, we own a ref on the 'attributes' hash table
+from secret_item_get_attributes), and a ref on the 'secret' object (from
+secret_item_get_secret(), but in the SHELL_KEYRING_SK_TAG case, we unref
+these once before breaking out of the loop, and the second time after
+breaking out of the loop.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759708
+---
+ src/shell-network-agent.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/shell-network-agent.c b/src/shell-network-agent.c
+index 5d99167..da0f7e5 100644
+--- a/src/shell-network-agent.c
++++ b/src/shell-network-agent.c
+@@ -314,8 +314,6 @@ get_secrets_keyring_cb (GObject            *source,
+ 
+               secrets_found = TRUE;
+ 
+-              g_hash_table_unref (attributes);
+-              secret_value_unref (secret);
+               break;
+             }
+         }
+-- 
+cgit v0.11.2
+

Deleted: extra-i686/nm-libexecdir.patch
===================================================================
--- extra-i686/nm-libexecdir.patch      2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-i686/nm-libexecdir.patch      2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,12 +0,0 @@
-diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js 
gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
---- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js       2013-02-20 
20:31:03.000000000 +0100
-+++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js  
2013-03-10 17:13:46.120907065 +0100
-@@ -686,7 +686,7 @@
-                     } catch(e) { } // ignore errors if key does not exist
-                     let path = binary;
-                     if (!GLib.path_is_absolute(path)) {
--                        path = GLib.build_filenamev([Config.LIBEXECDIR, 
path]);
-+                        path = 
GLib.build_filenamev(["/usr/lib/networkmanager", path]);
-                     }
- 
-                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Copied: gnome-shell/repos/extra-i686/nm-libexecdir.patch (from rev 260963, 
gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- extra-i686/nm-libexecdir.patch                              (rev 0)
+++ extra-i686/nm-libexecdir.patch      2016-03-05 19:11:22 UTC (rev 260964)
@@ -0,0 +1,12 @@
+diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js 
gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
+--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js       2013-02-20 
20:31:03.000000000 +0100
++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js  
2013-03-10 17:13:46.120907065 +0100
+@@ -686,7 +686,7 @@
+                     } catch(e) { } // ignore errors if key does not exist
+                     let path = binary;
+                     if (!GLib.path_is_absolute(path)) {
+-                        path = GLib.build_filenamev([Config.LIBEXECDIR, 
path]);
++                        path = 
GLib.build_filenamev(["/usr/lib/networkmanager", path]);
+                     }
+ 
+                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Deleted: extra-i686/vpn-secrets.patch
===================================================================
--- extra-i686/vpn-secrets.patch        2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-i686/vpn-secrets.patch        2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,63 +0,0 @@
-From 4562a431ad976a3e0df38889d48bb7898f91c672 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkund...@v3.sk>
-Date: Tue, 26 Jan 2016 17:31:34 +0100
-Subject: NetworkAgent: correctly identify the VPN secret requests
-
-The non-interactive requests for 'vpn' settings are forwarded to the UI because
-it is able to talk to the auth helpers. However, the VPN requests are 
identified
-by the connection type instead of setting type. That is incorrect and the UI
-is not prepared to handle such requests; tries to construct a dialog and fails
-miserably:
-
-  Gjs-Message: JS LOG: Invalid connection type: vpn
-
-  (gnome-shell:13133): Gjs-WARNING **: JS ERROR: Error: No property 'text' in 
property list (or its value was undefined)
-  
NetworkSecretDialog<._init@resource:///org/gnome/shell/ui/components/networkAgent.js:60
-  wrapper@resource:///org/gnome/gjs/modules/lang.js:169
-  _Base.prototype._construct@resource:///org/gnome/gjs/modules/lang.js:110
-  
Class.prototype._construct/newClass@resource:///org/gnome/gjs/modules/lang.js:204
-  
NetworkAgent<._handleRequest@resource:///org/gnome/shell/ui/components/networkAgent.js:724
-  wrapper@resource:///org/gnome/gjs/modules/lang.js:169
-  
NetworkAgent<._newRequest@resource:///org/gnome/shell/ui/components/networkAgent.js:715
-  wrapper@resource:///org/gnome/gjs/modules/lang.js:169
-
-https://bugzilla.gnome.org/show_bug.cgi?id=760999
----
- src/shell-network-agent.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/shell-network-agent.c b/src/shell-network-agent.c
-index c6f4b79..8e8c548 100644
---- a/src/shell-network-agent.c
-+++ b/src/shell-network-agent.c
-@@ -366,8 +366,6 @@ shell_network_agent_get_secrets (NMSecretAgent             
    *agent,
- {
-   ShellNetworkAgent *self = SHELL_NETWORK_AGENT (agent);
-   ShellAgentRequest *request;
--  NMSettingConnection *setting_connection;
--  const char *connection_type;
-   GHashTable *attributes;
-   char *request_id;
- 
-@@ -381,9 +379,6 @@ shell_network_agent_get_secrets (NMSecretAgent             
    *agent,
-       shell_agent_request_cancel (request);
-     }
- 
--  setting_connection = nm_connection_get_setting_connection (connection);
--  connection_type = nm_setting_connection_get_connection_type 
(setting_connection);
--
-   request = g_slice_new (ShellAgentRequest);
-   request->self = g_object_ref (self);
-   request->cancellable = g_cancellable_new ();
-@@ -393,7 +388,7 @@ shell_network_agent_get_secrets (NMSecretAgent             
    *agent,
-   request->flags = flags;
-   request->callback = callback;
-   request->callback_data = callback_data;
--  request->is_vpn = !strcmp(connection_type, NM_SETTING_VPN_SETTING_NAME);
-+  request->is_vpn = !strcmp(setting_name, NM_SETTING_VPN_SETTING_NAME);
-   request->entries = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, 
gvalue_destroy_notify);
- 
-   if (request->is_vpn)
--- 
-cgit v0.11.2
-

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD       2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-x86_64/PKGBUILD       2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ib...@archlinux.org>
-# Contributor: Flamelab <panosfi...@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.18.3
-pkgrel=3
-pkgdesc="The next generation GNOME Shell"
-arch=(i686 x86_64)
-url="http://live.gnome.org/GnomeShell";
-license=(GPL2)
-depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower
-         gnome-session gnome-settings-daemon gnome-themes-standard 
gsettings-desktop-schemas
-         libcanberra-pulse libcroco libgdm libsecret mutter 
nm-connection-editor
-         telepathy-logger telepathy-mission-control unzip gstreamer)
-makedepends=(intltool gtk-doc gnome-control-center evolution-data-server 
python gobject-introspection)
-optdepends=('gnome-control-center: System settings'
-            'evolution-data-server: Evolution calendar integration')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        libsecret-crash.patch vpn-secrets.patch
-        nm-libexecdir.patch)
-sha256sums=('8517baf8606f970ebf38222411eb7563cab2ae5efbfb088954ce23705b67519b'
-            '3c668de4c091dccf3d269b3d549c93f2a9b64e569c87ff3c3466624b5fc735bd'
-            '156d62bcb1281527820c9fd4760354478d7d7f0d424ba291bab6cfa498a54ef6'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  patch -Np1 -i ../libsecret-crash.patch
-  patch -Np1 -i ../vpn-secrets.patch
-
-  # FS#30747 FS#32730 Problems due to libexecdir different from NM
-  patch -Np1 -i ../nm-libexecdir.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Must exist; FS#37412
-  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
-}

Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 260963, 
gnome-shell/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD                               (rev 0)
+++ extra-x86_64/PKGBUILD       2016-03-05 19:11:22 UTC (rev 260964)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ionut Biru <ib...@archlinux.org>
+# Contributor: Flamelab <panosfi...@gmail.com
+
+pkgname=gnome-shell
+pkgver=3.18.4
+pkgrel=1
+pkgdesc="The next generation GNOME Shell"
+arch=(i686 x86_64)
+url="https://wiki.gnome.org/Projects/GnomeShell";
+license=(GPL2)
+depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus upower
+         gnome-session gnome-settings-daemon gnome-themes-standard 
gsettings-desktop-schemas
+         libcanberra-pulse libcroco libgdm libsecret mutter 
nm-connection-editor
+         telepathy-logger telepathy-mission-control unzip gstreamer)
+makedepends=(intltool gtk-doc gnome-control-center evolution-data-server 
python gobject-introspection)
+optdepends=('gnome-control-center: System settings'
+            'evolution-data-server: Evolution calendar integration')
+install=gnome-shell.install
+groups=(gnome)
+source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        libsecret-crash.patch
+        nm-libexecdir.patch)
+sha256sums=('d959c0aae4c10b194d1fa29e89d34d73a4d35d74f384bf604d78435bf9ced5d7'
+            '3c668de4c091dccf3d269b3d549c93f2a9b64e569c87ff3c3466624b5fc735bd'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i ../libsecret-crash.patch
+
+  # FS#30747 FS#32730 Problems due to libexecdir different from NM
+  patch -Np1 -i ../nm-libexecdir.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/gnome-shell \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Must exist; FS#37412
+  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
+}

Deleted: extra-x86_64/gnome-shell.install
===================================================================
--- extra-x86_64/gnome-shell.install    2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-x86_64/gnome-shell.install    2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: gnome-shell/repos/extra-x86_64/gnome-shell.install (from rev 260963, 
gnome-shell/trunk/gnome-shell.install)
===================================================================
--- extra-x86_64/gnome-shell.install                            (rev 0)
+++ extra-x86_64/gnome-shell.install    2016-03-05 19:11:22 UTC (rev 260964)
@@ -0,0 +1,19 @@
+pkgname=gnome-shell
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-x86_64/libsecret-crash.patch
===================================================================
--- extra-x86_64/libsecret-crash.patch  2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-x86_64/libsecret-crash.patch  2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,32 +0,0 @@
-From 021cecbce289f1d9c68a156d5b8dd204a73bc715 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cferg...@redhat.com>
-Date: Sun, 20 Dec 2015 20:51:52 +0100
-Subject: NetworkAgent: Fix double-unref in get_secrets_keyring_cb()
-
-In get_secrets_keyring_cb, we own a ref on the 'attributes' hash table
-from secret_item_get_attributes), and a ref on the 'secret' object (from
-secret_item_get_secret(), but in the SHELL_KEYRING_SK_TAG case, we unref
-these once before breaking out of the loop, and the second time after
-breaking out of the loop.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759708
----
- src/shell-network-agent.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/shell-network-agent.c b/src/shell-network-agent.c
-index 5d99167..da0f7e5 100644
---- a/src/shell-network-agent.c
-+++ b/src/shell-network-agent.c
-@@ -314,8 +314,6 @@ get_secrets_keyring_cb (GObject            *source,
- 
-               secrets_found = TRUE;
- 
--              g_hash_table_unref (attributes);
--              secret_value_unref (secret);
-               break;
-             }
-         }
--- 
-cgit v0.11.2
-

Copied: gnome-shell/repos/extra-x86_64/libsecret-crash.patch (from rev 260963, 
gnome-shell/trunk/libsecret-crash.patch)
===================================================================
--- extra-x86_64/libsecret-crash.patch                          (rev 0)
+++ extra-x86_64/libsecret-crash.patch  2016-03-05 19:11:22 UTC (rev 260964)
@@ -0,0 +1,32 @@
+From 021cecbce289f1d9c68a156d5b8dd204a73bc715 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cferg...@redhat.com>
+Date: Sun, 20 Dec 2015 20:51:52 +0100
+Subject: NetworkAgent: Fix double-unref in get_secrets_keyring_cb()
+
+In get_secrets_keyring_cb, we own a ref on the 'attributes' hash table
+from secret_item_get_attributes), and a ref on the 'secret' object (from
+secret_item_get_secret(), but in the SHELL_KEYRING_SK_TAG case, we unref
+these once before breaking out of the loop, and the second time after
+breaking out of the loop.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759708
+---
+ src/shell-network-agent.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/shell-network-agent.c b/src/shell-network-agent.c
+index 5d99167..da0f7e5 100644
+--- a/src/shell-network-agent.c
++++ b/src/shell-network-agent.c
+@@ -314,8 +314,6 @@ get_secrets_keyring_cb (GObject            *source,
+ 
+               secrets_found = TRUE;
+ 
+-              g_hash_table_unref (attributes);
+-              secret_value_unref (secret);
+               break;
+             }
+         }
+-- 
+cgit v0.11.2
+

Deleted: extra-x86_64/nm-libexecdir.patch
===================================================================
--- extra-x86_64/nm-libexecdir.patch    2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-x86_64/nm-libexecdir.patch    2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,12 +0,0 @@
-diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js 
gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
---- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js       2013-02-20 
20:31:03.000000000 +0100
-+++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js  
2013-03-10 17:13:46.120907065 +0100
-@@ -686,7 +686,7 @@
-                     } catch(e) { } // ignore errors if key does not exist
-                     let path = binary;
-                     if (!GLib.path_is_absolute(path)) {
--                        path = GLib.build_filenamev([Config.LIBEXECDIR, 
path]);
-+                        path = 
GLib.build_filenamev(["/usr/lib/networkmanager", path]);
-                     }
- 
-                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Copied: gnome-shell/repos/extra-x86_64/nm-libexecdir.patch (from rev 260963, 
gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- extra-x86_64/nm-libexecdir.patch                            (rev 0)
+++ extra-x86_64/nm-libexecdir.patch    2016-03-05 19:11:22 UTC (rev 260964)
@@ -0,0 +1,12 @@
+diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js 
gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
+--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js       2013-02-20 
20:31:03.000000000 +0100
++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js  
2013-03-10 17:13:46.120907065 +0100
+@@ -686,7 +686,7 @@
+                     } catch(e) { } // ignore errors if key does not exist
+                     let path = binary;
+                     if (!GLib.path_is_absolute(path)) {
+-                        path = GLib.build_filenamev([Config.LIBEXECDIR, 
path]);
++                        path = 
GLib.build_filenamev(["/usr/lib/networkmanager", path]);
+                     }
+ 
+                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Deleted: extra-x86_64/vpn-secrets.patch
===================================================================
--- extra-x86_64/vpn-secrets.patch      2016-03-05 19:10:14 UTC (rev 260963)
+++ extra-x86_64/vpn-secrets.patch      2016-03-05 19:11:22 UTC (rev 260964)
@@ -1,63 +0,0 @@
-From 4562a431ad976a3e0df38889d48bb7898f91c672 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkund...@v3.sk>
-Date: Tue, 26 Jan 2016 17:31:34 +0100
-Subject: NetworkAgent: correctly identify the VPN secret requests
-
-The non-interactive requests for 'vpn' settings are forwarded to the UI because
-it is able to talk to the auth helpers. However, the VPN requests are 
identified
-by the connection type instead of setting type. That is incorrect and the UI
-is not prepared to handle such requests; tries to construct a dialog and fails
-miserably:
-
-  Gjs-Message: JS LOG: Invalid connection type: vpn
-
-  (gnome-shell:13133): Gjs-WARNING **: JS ERROR: Error: No property 'text' in 
property list (or its value was undefined)
-  
NetworkSecretDialog<._init@resource:///org/gnome/shell/ui/components/networkAgent.js:60
-  wrapper@resource:///org/gnome/gjs/modules/lang.js:169
-  _Base.prototype._construct@resource:///org/gnome/gjs/modules/lang.js:110
-  
Class.prototype._construct/newClass@resource:///org/gnome/gjs/modules/lang.js:204
-  
NetworkAgent<._handleRequest@resource:///org/gnome/shell/ui/components/networkAgent.js:724
-  wrapper@resource:///org/gnome/gjs/modules/lang.js:169
-  
NetworkAgent<._newRequest@resource:///org/gnome/shell/ui/components/networkAgent.js:715
-  wrapper@resource:///org/gnome/gjs/modules/lang.js:169
-
-https://bugzilla.gnome.org/show_bug.cgi?id=760999
----
- src/shell-network-agent.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/shell-network-agent.c b/src/shell-network-agent.c
-index c6f4b79..8e8c548 100644
---- a/src/shell-network-agent.c
-+++ b/src/shell-network-agent.c
-@@ -366,8 +366,6 @@ shell_network_agent_get_secrets (NMSecretAgent             
    *agent,
- {
-   ShellNetworkAgent *self = SHELL_NETWORK_AGENT (agent);
-   ShellAgentRequest *request;
--  NMSettingConnection *setting_connection;
--  const char *connection_type;
-   GHashTable *attributes;
-   char *request_id;
- 
-@@ -381,9 +379,6 @@ shell_network_agent_get_secrets (NMSecretAgent             
    *agent,
-       shell_agent_request_cancel (request);
-     }
- 
--  setting_connection = nm_connection_get_setting_connection (connection);
--  connection_type = nm_setting_connection_get_connection_type 
(setting_connection);
--
-   request = g_slice_new (ShellAgentRequest);
-   request->self = g_object_ref (self);
-   request->cancellable = g_cancellable_new ();
-@@ -393,7 +388,7 @@ shell_network_agent_get_secrets (NMSecretAgent             
    *agent,
-   request->flags = flags;
-   request->callback = callback;
-   request->callback_data = callback_data;
--  request->is_vpn = !strcmp(connection_type, NM_SETTING_VPN_SETTING_NAME);
-+  request->is_vpn = !strcmp(setting_name, NM_SETTING_VPN_SETTING_NAME);
-   request->entries = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, 
gvalue_destroy_notify);
- 
-   if (request->is_vpn)
--- 
-cgit v0.11.2
-

Reply via email to