[arch-commits] Commit in x2goclient/repos/extra-x86_64 (3 files)

[Andreas Radke]

    Date: Friday, May 29, 2020 @ 16:03:11
  Author: andyrtr
Revision: 387833

archrelease: copy trunk to extra-x86_64

Added:
  x2goclient/repos/extra-x86_64/PKGBUILD
    (from rev 387832, x2goclient/trunk/PKGBUILD)
  x2goclient/repos/extra-x86_64/reproducible-man-gzip.patch
    (from rev 387832, x2goclient/trunk/reproducible-man-gzip.patch)
Deleted:
  x2goclient/repos/extra-x86_64/PKGBUILD

-----------------------------+
 PKGBUILD                    |   83 ++++++++++++++++++++++--------------------
 reproducible-man-gzip.patch |   11 +++++
 2 files changed, 55 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-29 16:03:01 UTC (rev 387832)
+++ PKGBUILD	2020-05-29 16:03:11 UTC (rev 387833)
@@ -1,39 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Gerhard Brauer <gerbra at archlinux.de>
-# Contributor: Richard Murri <admin at richardmurri.com>
-
-pkgname=x2goclient
-pkgver=4.1.2.2
-pkgrel=1
-arch=('x86_64')
-license=('GPL2')
-url="https://wiki.x2go.org/doku.php"
-pkgdesc="a graphical client (Qt5) for the X2Go system"
-makedepends=('qt5-tools' 'man2html' 'xdg-utils' 'xorg-xauth')
-depends=('qt5-x11extras' 'qt5-svg'
-         'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme')
-# FS#48088
-optdepends=('xorg-xauth: may be required by X2goservers running a different linux distribution giving MIT-COOKIE errors')
-source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha256sums=('c9953267c40fa67119ad96a73bacb1f266196da2059f0cdcd1b8d5199421d12a'
-            'SKIP')
-validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31'  # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-              '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') #  "X2go Git Administrator <git-admin at x2go.org>"
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  sed -i "s:-o root -g root ::" Makefile
-  sed -i -e 's/qt4/qt5/' Makefile
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  make PREFIX=/usr
-  make PREFIX=/usr build_man
-}
-
-package() {
-  
-  cd ${pkgbase}-${pkgver}
-  make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
-}

Copied: x2goclient/repos/extra-x86_64/PKGBUILD (from rev 387832, x2goclient/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-29 16:03:11 UTC (rev 387833)
@@ -0,0 +1,44 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Gerhard Brauer <gerbra at archlinux.de>
+# Contributor: Richard Murri <admin at richardmurri.com>
+
+pkgname=x2goclient
+pkgver=4.1.2.2
+pkgrel=2
+arch=('x86_64')
+license=('GPL2')
+url="https://wiki.x2go.org/doku.php"
+pkgdesc="a graphical client (Qt5) for the X2Go system"
+makedepends=('qt5-tools' 'man2html' 'xdg-utils' 'xorg-xauth')
+depends=('qt5-x11extras' 'qt5-svg'
+         'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme')
+# FS#48088
+optdepends=('xorg-xauth: may be required by X2goservers running a different linux distribution giving MIT-COOKIE errors')
+source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+        reproducible-man-gzip.patch)
+sha256sums=('c9953267c40fa67119ad96a73bacb1f266196da2059f0cdcd1b8d5199421d12a'
+            'SKIP'
+            '8b309f0cc99d89737f47e57b79afdc9cccdd36ca3d0772040b1c3fdc0399a4d2')
+validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31'  # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+              '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') #  "X2go Git Administrator <git-admin at x2go.org>"
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i "s:-o root -g root ::" Makefile
+  sed -i -e 's/qt4/qt5/' Makefile
+
+  # remove timestamp to solve reproducible build
+  patch -Np1 -i ../reproducible-man-gzip.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  make PREFIX=/usr
+  make PREFIX=/usr build_man
+}
+
+package() {
+  
+  cd ${pkgbase}-${pkgver}
+  make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
+}

Copied: x2goclient/repos/extra-x86_64/reproducible-man-gzip.patch (from rev 387832, x2goclient/trunk/reproducible-man-gzip.patch)
===================================================================
--- reproducible-man-gzip.patch	                        (rev 0)
+++ reproducible-man-gzip.patch	2020-05-29 16:03:11 UTC (rev 387833)
@@ -0,0 +1,11 @@
+--- x2goclient-4.1.2.2/Makefile	2020-05-29 14:08:58.007273439 +0200
++++ x2goclient-4.1.2.2/Makefile.new	2020-05-29 17:39:44.803801609 +0200
+@@ -115,7 +115,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
+ 	$(INSTALL_FILE) man/man1/x2goclient.1    $(DESTDIR)$(MANDIR)/man1/x2goclient.1
+-	gzip -f $(DESTDIR)$(MANDIR)/man1/x2goclient.1
++	gzip -f -n $(DESTDIR)$(MANDIR)/man1/x2goclient.1
+ 
+ uninstall: uninstall_client uninstall_man
+