Fixed dependencies; updated sources and upstream URL

2 files changed, 37 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0cbc93159a6..7b5d0b8c416c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
-# Generated by mksrcinfo v8
-# Thu Apr 13 10:10:12 UTC 2017
 pkgbase = process-cpp
-	pkgdesc = C++11 library for handling processes
+	pkgdesc = A simple convenience library for handling processes in C++11
 	pkgver = 3.0.1
-	pkgrel = 1
-	url = https://launchpad.net/process-cpp
+	pkgrel = 2
+	url = https://gitlab.com/ubports/core/lib-cpp/process-cpp/
 	arch = x86_64
+	arch = i686
+	groups = lib-cpp
 	license = LGPL3
 	makedepends = cmake
-	makedepends = doxygen
 	makedepends = boost
-	makedepends = properties-cpp
+	makedepends = doxygen
+	makedepends = graphviz
 	depends = boost-libs
 	depends = gcc-libs
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/process-cpp_3.0.1.orig.tar.gz
-	md5sums = 95e187de74037b70b105679f85047c12
+	depends = properties-cpp
+	source = https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/process-cpp/3.0.1-9/process-cpp_3.0.1.orig.tar.gz
+	source = https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/process-cpp/3.0.1-9/process-cpp_3.0.1-9.debian.tar.xz
+	sha256sums = 33d13d384e99d3f57691c9c572c0c38fe4b67c056f19c8d99f18230f62b94a6b
+	sha256sums = 5357427f51704c2cb3768cd81bf1fb254ada7ff355ef656d14c253b322cf37fe
 
 pkgname = process-cpp
-
diff --git a/PKGBUILD b/PKGBUILD
index a37868b3dd32..e3c1e6d32a7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,41 @@
-# Maintainer:  Iwan Timmer <irtimmer@gmail.com>
+# Contributor: Eric Fung <loseurmarbles [at] gmail [dot] com>
+# Contributor: Iwan Timmer <irtimmer@gmail.com>
 
 pkgname=process-cpp
-pkgdesc="C++11 library for handling processes"
+pkgdesc="A simple convenience library for handling processes in C++11"
 pkgver=3.0.1
-pkgrel=1
-arch=('x86_64')
-url="https://launchpad.net/process-cpp"
+pkgrel=2
+arch=('x86_64' 'i686')
+url='https://gitlab.com/ubports/core/lib-cpp/process-cpp/'
 license=('LGPL3')
-depends=('boost-libs' 'gcc-libs')
-makedepends=('cmake' 'doxygen' 'boost' 'properties-cpp')
-source=("https://launchpad.net/ubuntu/+archive/primary/+files/process-cpp_3.0.1.orig.tar.gz")
-md5sums=('95e187de74037b70b105679f85047c12')
+groups=('lib-cpp')
+depends=('boost-libs' 'gcc-libs' 'properties-cpp')
+makedepends=('cmake' 'boost' 'doxygen' 'graphviz')
+source=('https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/process-cpp/3.0.1-9/process-cpp_3.0.1.orig.tar.gz'
+        'https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/process-cpp/3.0.1-9/process-cpp_3.0.1-9.debian.tar.xz')
+sha256sums=('33d13d384e99d3f57691c9c572c0c38fe4b67c056f19c8d99f18230f62b94a6b'
+            '5357427f51704c2cb3768cd81bf1fb254ada7ff355ef656d14c253b322cf37fe')
 
 prepare() {
-  cd "$srcdir/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Don't build tests
-  truncate -s 0 tests/CMakeLists.txt
+  #Apply debian patches
+  patch -p1 < ../debian/patches/2001-Don-t-run-tests.patch
+  patch -p1 < ../debian/patches/1002-Reproducible-documentation.patch
+  patch -p1 < ../debian/patches/1003-link-pthread.patch
+  patch -p1 < ../debian/patches/1004-spelling-fixes.patch
 }
 
 build() {
-  mkdir -p "$srcdir/${pkgname}-${pkgver}/build"
-  cd "$srcdir/${pkgname}-${pkgver}/build"
+  mkdir -p "${srcdir}/${pkgname}-${pkgver}/_build"
+  cd "${srcdir}/${pkgname}-${pkgver}/_build"
 
-  cmake .. -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  make
+  cmake -DCMAKE_BUILD_TYPE=Release ..
+  cmake --build .
 }
 
 package() {
-  cd "$srcdir/${pkgname}-${pkgver}/build"
+  cd "${srcdir}/${pkgname}-${pkgver}/_build"
 
-  make DESTDIR="$pkgdir/" install
+  cmake --install . --prefix="${pkgdir}/usr"
 }