[arch-commits] Commit in gnome-keyring/trunk (PKGBUILD add-cinnamon.diff)

[Jan Steffens]

    Date: Saturday, March 16, 2019 @ 23:24:36
  Author: heftig
Revision: 348535

more changes (no change to package)

Added:
  gnome-keyring/trunk/add-cinnamon.diff
Modified:
  gnome-keyring/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   12 ++++++------
 add-cinnamon.diff |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-16 23:07:48 UTC (rev 348534)
+++ PKGBUILD	2019-03-16 23:24:36 UTC (rev 348535)
@@ -10,12 +10,13 @@
 license=(GPL LGPL)
 depends=(gcr libcap-ng pam openssh)
 makedepends=(git docbook-xsl python)
-checkdepends=(python2)
 groups=(gnome)
 install=gnome-keyring.install
 _commit=1c834760190ecf5a58c6feee441c41baeea07f5f  # tags/3.31.91^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-keyring.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/gnome-keyring.git#commit=$_commit"
+        add-cinnamon.diff)
+sha256sums=('SKIP'
+            'd05210f5b0a7d4b22c0dff2854854af2eb5708aa2b296095e070dca68e9f815a')
 
 pkgver() {
   cd $pkgname
@@ -24,9 +25,8 @@
 
 prepare() {
   cd $pkgname
-  sed -i 's/MATE/MATE;Cinnamon/' daemon/*.desktop.in.in
-  sed -i '1s/python$/&2/' build/tap-{driver,gtester}
-  autoreconf -fvi
+  patch -Np1 -i ../add-cinnamon.diff
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {

Added: add-cinnamon.diff
===================================================================
--- add-cinnamon.diff	                        (rev 0)
+++ add-cinnamon.diff	2019-03-16 23:24:36 UTC (rev 348535)
@@ -0,0 +1,44 @@
+ daemon/gnome-keyring-pkcs11.desktop.in.in  | 2 +-
+ daemon/gnome-keyring-secrets.desktop.in.in | 2 +-
+ daemon/gnome-keyring-ssh.desktop.in.in     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git c/daemon/gnome-keyring-pkcs11.desktop.in.in i/daemon/gnome-keyring-pkcs11.desktop.in.in
+index b43e1e9d..80434cbd 100644
+--- c/daemon/gnome-keyring-pkcs11.desktop.in.in
++++ i/daemon/gnome-keyring-pkcs11.desktop.in.in
+@@ -3,7 +3,7 @@ Type=Application
+ Name=Certificate and Key Storage
+ Comment=GNOME Keyring: PKCS#11 Component
+ Exec=@bindir@/gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;Unity;MATE;
++OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=PreDisplayServer
+ X-GNOME-AutoRestart=false
+diff --git c/daemon/gnome-keyring-secrets.desktop.in.in i/daemon/gnome-keyring-secrets.desktop.in.in
+index dd9deec7..b6d7b2d0 100644
+--- c/daemon/gnome-keyring-secrets.desktop.in.in
++++ i/daemon/gnome-keyring-secrets.desktop.in.in
+@@ -3,7 +3,7 @@ Type=Application
+ Name=Secret Storage Service
+ Comment=GNOME Keyring: Secret Service
+ Exec=@bindir@/gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;Unity;MATE;
++OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=PreDisplayServer
+ X-GNOME-AutoRestart=false
+diff --git c/daemon/gnome-keyring-ssh.desktop.in.in i/daemon/gnome-keyring-ssh.desktop.in.in
+index 38aa24cb..163ff554 100644
+--- c/daemon/gnome-keyring-ssh.desktop.in.in
++++ i/daemon/gnome-keyring-ssh.desktop.in.in
+@@ -3,7 +3,7 @@ Type=Application
+ Name=SSH Key Agent
+ Comment=GNOME Keyring: SSH Agent
+ Exec=@bindir@/gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;Unity;MATE;
++OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
+ X-GNOME-Autostart-Phase=PreDisplayServer
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true