revision

2 files changed, 43 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6ce5a646a5f..be4c59f42975 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 pkgbase = zmqpp-git
-	pkgdesc = ZMQPP's git 'develop' branch
-	pkgver = 4.2.git040420
-	pkgrel = 1
-	url = https://github.com/zeromq/zmqpp
+	pkgdesc = High-level C++ binding for ZMQ
+	pkgver = 4.2.0.r47.gba4230d
+	pkgrel = 2
+	url = https://zeromq.github.io/zmqpp/
 	arch = x86_64
-	makedepends = make
-	depends = libsodium
+	license = MPL2
+	makedepends = git
+	makedepends = boost
+	depends = glibc
+	depends = gcc-libs
+	depends = boost-libs
 	depends = zeromq
-	provides = libzmqpp
+	provides = zmqpp
 	conflicts = zmqpp
-	source = git+https://github.com/zeromq/zmqpp#commit=85ae96020f2376c53d2176e04e88e8e51021b748
-	md5sums = SKIP
+	source = git+https://github.com/zeromq/zmqpp.git#branch=develop
+	source = https://github.com/zeromq/zmqpp/pull/238/commits/4c0f99a4afd5a88e5e894d84f3eef0e0fb17f58d.patch
+	sha256sums = SKIP
+	sha256sums = 11ccea23fe6482debb9083ccf4e724d87544b43401cacbc20b09a4f745855fc6
 
 pkgname = zmqpp-git
-
diff --git a/PKGBUILD b/PKGBUILD
index cd6bdf5faf96..910177e6116a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,39 @@
-# Maintainer: ThePuzzlemaker <tpzker at thepuzzlemaker dot info>
+# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
+# Contributor: ThePuzzlemaker <tpzker at thepuzzlemaker dot info>
 
 pkgname=zmqpp-git
-pkgver=4.2.git040420
-pkgrel=1
-commit_hash=85ae96020f2376c53d2176e04e88e8e51021b748
-pkgdesc="ZMQPP's git 'develop' branch"
-arch=('x86_64')
-url='https://github.com/zeromq/zmqpp'
-licence=('MIT')
-depends=('libsodium' 'zeromq')
-makedepends=('make')
-provides=('libzmqpp')
-conflicts=("zmqpp")
-source=("git+$url#commit=$commit_hash")
-md5sums=('SKIP')
+pkgver=4.2.0.r47.gba4230d
+pkgrel=2
+pkgdesc="High-level C++ binding for ZMQ"
+arch=(x86_64)
+url="https://zeromq.github.io/zmqpp/"
+license=(MPL2)
+depends=(glibc gcc-libs boost-libs zeromq)
+makedepends=(git boost)
+provides=(zmqpp)
+conflicts=(zmqpp)
+source=("git+https://github.com/zeromq/zmqpp.git#branch=develop"
+        "https://github.com/zeromq/zmqpp/pull/238/commits/4c0f99a4afd5a88e5e894d84f3eef0e0fb17f58d.patch")
+sha256sums=('SKIP'
+            '11ccea23fe6482debb9083ccf4e724d87544b43401cacbc20b09a4f745855fc6')
+
+pkgver() {
+  cd zmqpp
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 prepare() {
-    cd zmqpp
-    git submodule update --init --recursive
-    PKGDIR_ESCAPE=$(echo "${pkgdir}" | sed 's/\//\\\//g')
-    sed -i "s/\/usr\/local/${PKGDIR_ESCAPE}\/usr/g" Makefile
+  cd zmqpp
+  patch -Np1 -i ../4c0f99a4afd5a88e5e894d84f3eef0e0fb17f58d.patch
 }
 
 build() {
-    cd zmqpp
-    make
-    make client
+  cd zmqpp
+  make
+  make client
 }
 
 package() {
-    cd zmqpp
-    make install
-    # basic fix to #237, I sent a PR to fix it in the makefile
-    cd "${pkgdir}/usr"
-    mv bin zmqpp
-    mkdir -p bin
-    mv zmqpp bin
+  cd zmqpp
+  make PREFIX="/usr/" DESTDIR="${pkgdir}/" install
 }