[arch-commits] Commit in gnome-keyring/repos/extra-x86_64 (6 files)
Jan Steffens
heftig at archlinux.org
Fri Mar 26 23:01:59 UTC 2021
Date: Friday, March 26, 2021 @ 23:01:59
Author: heftig
Revision: 411075
archrelease: copy trunk to extra-x86_64
Added:
gnome-keyring/repos/extra-x86_64/PKGBUILD
(from rev 411074, gnome-keyring/trunk/PKGBUILD)
gnome-keyring/repos/extra-x86_64/add-cinnamon.diff
(from rev 411074, gnome-keyring/trunk/add-cinnamon.diff)
gnome-keyring/repos/extra-x86_64/gnome-keyring.install
(from rev 411074, gnome-keyring/trunk/gnome-keyring.install)
Deleted:
gnome-keyring/repos/extra-x86_64/PKGBUILD
gnome-keyring/repos/extra-x86_64/add-cinnamon.diff
gnome-keyring/repos/extra-x86_64/gnome-keyring.install
-----------------------+
PKGBUILD | 121 +++++++++++++++++++++++-------------------------
add-cinnamon.diff | 88 +++++++++++++++++-----------------
gnome-keyring.install | 14 ++---
3 files changed, 110 insertions(+), 113 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-26 23:01:48 UTC (rev 411074)
+++ PKGBUILD 2021-03-26 23:01:59 UTC (rev 411075)
@@ -1,62 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan De Groot <jgc at archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=3.36.0
-pkgrel=3
-epoch=1
-pkgdesc="Stores passwords and encryption keys"
-url="https://wiki.gnome.org/Projects/GnomeKeyring"
-arch=(x86_64)
-license=(GPL LGPL)
-depends=(gcr libcap-ng pam openssh)
-makedepends=(git docbook-xsl python)
-provides=(org.freedesktop.secrets)
-groups=(gnome)
-install=gnome-keyring.install
-_commit=6cc50f97575d1d978cd7d24e6466f585d37947ed # tags/3.36.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-keyring.git#commit=$_commit"
- add-cinnamon.diff)
-sha256sums=('SKIP'
- 'd05210f5b0a7d4b22c0dff2854854af2eb5708aa2b296095e070dca68e9f815a')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- # https://bugs.archlinux.org/task/68664
- git cherry-pick -n ebc7bc9efacc17049e54da8d96a4a29943621113
-
- # Autolaunch in Cinnamon
- git apply -3 ../add-cinnamon.diff
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --with-pam-dir=/usr/lib/security \
- --disable-static \
- --disable-schemas-compile
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd $pkgname
- # Secure memory tests fail
- dbus-run-session make -k check || :
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-keyring/repos/extra-x86_64/PKGBUILD (from rev 411074, gnome-keyring/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-26 23:01:59 UTC (rev 411075)
@@ -0,0 +1,59 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan De Groot <jgc at archlinux.org>
+
+pkgname=gnome-keyring
+pkgver=40.0
+pkgrel=1
+epoch=1
+pkgdesc="Stores passwords and encryption keys"
+url="https://wiki.gnome.org/Projects/GnomeKeyring"
+arch=(x86_64)
+license=(GPL LGPL)
+depends=(gcr libcap-ng pam openssh)
+makedepends=(git docbook-xsl python)
+provides=(org.freedesktop.secrets)
+groups=(gnome)
+install=gnome-keyring.install
+_commit=a9c867468b86719afc9fb62479dc5c48244f5926 # tags/40.0^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-keyring.git#commit=$_commit"
+ add-cinnamon.diff)
+sha256sums=('SKIP'
+ 'd05210f5b0a7d4b22c0dff2854854af2eb5708aa2b296095e070dca68e9f815a')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # Autolaunch in Cinnamon
+ git apply -3 ../add-cinnamon.diff
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --with-pam-dir=/usr/lib/security \
+ --disable-static \
+ --disable-schemas-compile
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd $pkgname
+ # Secure memory tests fail
+ dbus-run-session make -k check || :
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Deleted: add-cinnamon.diff
===================================================================
--- add-cinnamon.diff 2021-03-26 23:01:48 UTC (rev 411074)
+++ add-cinnamon.diff 2021-03-26 23:01:59 UTC (rev 411075)
@@ -1,44 +0,0 @@
- 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
Copied: gnome-keyring/repos/extra-x86_64/add-cinnamon.diff (from rev 411074, gnome-keyring/trunk/add-cinnamon.diff)
===================================================================
--- add-cinnamon.diff (rev 0)
+++ add-cinnamon.diff 2021-03-26 23:01:59 UTC (rev 411075)
@@ -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
Deleted: gnome-keyring.install
===================================================================
--- gnome-keyring.install 2021-03-26 23:01:48 UTC (rev 411074)
+++ gnome-keyring.install 2021-03-26 23:01:59 UTC (rev 411075)
@@ -1,7 +0,0 @@
-post_install() {
- setcap cap_ipc_lock+ep usr/bin/gnome-keyring-daemon
-}
-
-post_upgrade() {
- post_install
-}
Copied: gnome-keyring/repos/extra-x86_64/gnome-keyring.install (from rev 411074, gnome-keyring/trunk/gnome-keyring.install)
===================================================================
--- gnome-keyring.install (rev 0)
+++ gnome-keyring.install 2021-03-26 23:01:59 UTC (rev 411075)
@@ -0,0 +1,7 @@
+post_install() {
+ setcap cap_ipc_lock+ep usr/bin/gnome-keyring-daemon
+}
+
+post_upgrade() {
+ post_install
+}
More information about the arch-commits
mailing list