Date: Friday, May 29, 2020 @ 16:03:01
  Author: andyrtr
Revision: 387832

upgpkg: x2goclient 4.1.2.2-2: fix reproducable build

Added:
  x2goclient/trunk/reproducible-man-gzip.patch
Modified:
  x2goclient/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   11 ++++++++---
 reproducible-man-gzip.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-05-29 16:02:54 UTC (rev 387831)
+++ PKGBUILD    2020-05-29 16:03:01 UTC (rev 387832)
@@ -4,7 +4,7 @@
 
 pkgname=x2goclient
 pkgver=4.1.2.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('GPL2')
 url="https://wiki.x2go.org/doku.php";
@@ -14,9 +14,11 @@
          '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})
+source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+        reproducible-man-gzip.patch)
 sha256sums=('c9953267c40fa67119ad96a73bacb1f266196da2059f0cdcd1b8d5199421d12a'
-            'SKIP')
+            'SKIP'
+            '8b309f0cc99d89737f47e57b79afdc9cccdd36ca3d0772040b1c3fdc0399a4d2')
 validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31'  # Mike Gabriel 
<mike.gabr...@das-netzwerkteam.de>
               '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') #  "X2go Git 
Administrator <git-ad...@x2go.org>"
 
@@ -24,6 +26,9 @@
   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() {

Added: reproducible-man-gzip.patch
===================================================================
--- reproducible-man-gzip.patch                         (rev 0)
+++ reproducible-man-gzip.patch 2020-05-29 16:03:01 UTC (rev 387832)
@@ -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
+ 

Reply via email to