summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Rogoża2018-06-19 02:19:43 +0200
committerPiotr Rogoża2018-06-19 02:19:43 +0200
commitd861e9b92bc6eff39461a8aefec5e44a76f64ff9 (patch)
treef2d7722903d3675e3873976de29066d9ed7a2aa4
parent855ca18826aaff6018d8c41e25ce6feebb3cad05 (diff)
downloadaur-d861e9b92bc6eff39461a8aefec5e44a76f64ff9.tar.gz
Fixed broken patch
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--ZThread-destdir.patch22
-rw-r--r--zthread.patch2
4 files changed, 31 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 461e2ee7600..5077d27d62f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Mar 17 21:06:15 UTC 2016
+# Tue Jun 19 00:18:57 UTC 2018
pkgbase = zthread
pkgdesc = A platform-independent, multi-threading and synchronization library for C++
pkgver = 2.3.2
- pkgrel = 2
+ pkgrel = 3
url = http://zthread.sourceforge.net/
arch = i686
arch = x86_64
@@ -12,11 +12,11 @@ pkgbase = zthread
depends = bash
options = !emptydirs
options = libtool
- source = zthread-2.3.2.tar.gz::http://prdownloads.sourceforge.net/zthread/ZThread-2.3.2.tar.gz
+ source = ZThread-2.3.2.tar.gz::https://sourceforge.net/projects/zthread/files/ZThread/2.3.2/ZThread-2.3.2.tar.gz
source = zthread.patch
source = https://raw.github.com/freddix/pkgs.old/master/ZThread/ZThread-destdir.patch
sha256sums = 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854
- sha256sums = d0c996aad95f90d7465171b184c0f062145e8b0bea7a74df9ddc2e659f3f13f4
+ sha256sums = c5f5894386ab06aa40dd45c25c2cdc4babe09c48b43ad2db43bcb3e692b8216b
sha256sums = 67401dc12da4f96d598689aa8aa0f2caa9e6a82a31cad62f0d6d9a3eb7fdbb6c
pkgname = zthread
diff --git a/PKGBUILD b/PKGBUILD
index c260e903fce..32fd2357b17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: dracorp aka Piotr Rogoza <piotr.r.public@gmail.com>
+# Maintainer: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
pkgname=zthread
_pkgname=ZThread
pkgver=2.3.2
-pkgrel=2
+pkgrel=3
pkgdesc='A platform-independent, multi-threading and synchronization library for C++'
arch=('i686' 'x86_64')
url='http://zthread.sourceforge.net/'
@@ -11,12 +11,12 @@ license=('MIT')
depends=(bash)
makedepends=('automake=1.7')
options=(!emptydirs libtool)
-source=("$pkgname-$pkgver.tar.gz::http://prdownloads.sourceforge.net/zthread/ZThread-${pkgver}.tar.gz"
+source=("$_pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/zthread/files/ZThread/2.3.2/ZThread-2.3.2.tar.gz"
zthread.patch
https://raw.github.com/freddix/pkgs.old/master/ZThread/ZThread-destdir.patch
)
sha256sums=('950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854'
- 'd0c996aad95f90d7465171b184c0f062145e8b0bea7a74df9ddc2e659f3f13f4'
+ 'c5f5894386ab06aa40dd45c25c2cdc4babe09c48b43ad2db43bcb3e692b8216b'
'67401dc12da4f96d598689aa8aa0f2caa9e6a82a31cad62f0d6d9a3eb7fdbb6c')
prepare(){
cd "$srcdir"/$_pkgname-$pkgver
diff --git a/ZThread-destdir.patch b/ZThread-destdir.patch
new file mode 100644
index 00000000000..762d0d9bff5
--- /dev/null
+++ b/ZThread-destdir.patch
@@ -0,0 +1,22 @@
+--- ZThread-2.3.2/Makefile.am.orig 2005-03-13 10:56:18.000000000 +0100
++++ ZThread-2.3.2/Makefile.am 2008-09-10 18:36:38.836984794 +0200
+@@ -27,14 +27,14 @@
+
+ ## install the config script
+ install-exec-hook:
+- $(mkinstalldirs) $(bindir)
+- $(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir)
++ $(mkinstalldirs) $(DESTDIR)$(bindir)
++ $(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(DESTDIR)$(bindir)
+
+ ## install the config script & m4 macros
+ install-data-hook:
+- $(mkinstalldirs) $(datadir)/aclocal
+- $(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(datadir)/aclocal
+- $(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(datadir)/aclocal
++ $(mkinstalldirs) $(DESTDIR)$(datadir)/aclocal
++ $(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(DESTDIR)$(datadir)/aclocal
++ $(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(DESTDIR)$(datadir)/aclocal
+ mkdir -p $(DESTDIR)$(includedir)/zthread
+ cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/
+
diff --git a/zthread.patch b/zthread.patch
index 8c8d36131fa..ce6fe6c5fb3 100644
--- a/zthread.patch
+++ b/zthread.patch
@@ -7,7 +7,7 @@ index 4ad0545..e17c071 100755
fi
gentoo_lt_version="1.5.10"
-gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'`
-+gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'`
++gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6