From f0affd9a3b40059778abc476f1137b3b01cdecd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 8 Mar 2016 04:52:28 +0100 Subject: [PATCH] scantailor: update to 0.9.11.1.20160227 --- .../patches/fix-pthread_check.patch | 31 +++++++++++++++++++ srcpkgs/scantailor/template | 13 +++++--- 2 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/scantailor/patches/fix-pthread_check.patch diff --git a/srcpkgs/scantailor/patches/fix-pthread_check.patch b/srcpkgs/scantailor/patches/fix-pthread_check.patch new file mode 100644 index 00000000000..370774eb565 --- /dev/null +++ b/srcpkgs/scantailor/patches/fix-pthread_check.patch @@ -0,0 +1,31 @@ +--- cmake/FindPthreads.cmake 2012-02-27 21:11:05.000000000 +0100 ++++ cmake/FindPthreads.cmake 2016-03-08 04:46:38.516378187 +0100 +@@ -27,7 +27,7 @@ + SET(_aix_flags "-D_THREAD_SAFE:-lpthreads") + + # gcc on various OSes +- SET(_other_flags "-pthread:-pthread") ++ SET(_other_flags "-pthread -fPIC:-pthread") + + IF(CMAKE_SYSTEM_NAME MATCHES "AIX.*") + LIST(APPEND _available_flags ${_aix_flags}) +@@ -59,14 +59,17 @@ + + FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/TestPthreads.c + "#include \n" ++ "void* start_routine(void* arg) { return arg; }\n" + "int main()\n" + "{\n" + " pthread_t th;\n" +- " pthread_create(&th, 0, 0, 0);\n" ++ " pthread_attr_t att;\n" ++ " pthread_attr_init(&att);\n" ++ " pthread_create(&th, &att, start_routine, 0);\n" + " pthread_join(th, 0);\n" +- " pthread_attr_init(0);\n" + " pthread_cleanup_push(0, 0);\n" + " pthread_cleanup_pop(0);\n" ++ " return 0;\n" + "}\n" + ) + diff --git a/srcpkgs/scantailor/template b/srcpkgs/scantailor/template index 720c9cb0455..d3a19049a8d 100644 --- a/srcpkgs/scantailor/template +++ b/srcpkgs/scantailor/template @@ -1,18 +1,21 @@ # Template file for 'scantailor' pkgname=scantailor -version=0.9.11.1.20151014 +version=0.9.11.1.20160227 revision=1 -_gitrev=0e8b89a2240ad6e65a8e7ff7ebfeed5df6686d96 -wrksrc=${pkgname}-${_gitrev} +_version=${version%.*} +wrksrc=${pkgname}-RELEASE_${_version//./_} build_style=cmake +#configure_args="-DPTHREADS_CFLAGS=-pthread -DPTHREADS_LIBS=-pthread" hostmakedepends="cmake qt-devel qt-qmake pkg-config" makedepends="libpng-devel tiff-devel boost-devel qt-devel libXrender-devel" short_desc="Interactive post-processing for scans" maintainer="Jürgen Buchmüller " license="GPL-3" homepage="http://scantailor.org/" -distfiles="http://github.com/${pkgname}/${pkgname}/archive/${_gitrev}.tar.gz>${pkgname}-${version}_${revision}.tar.gz" -checksum=623043fdbfac249d991650305fd907e81274f6ea8e4781eaf42bae61f554666f +distfiles="http://github.com/${pkgname}/${pkgname}/archive/RELEASE_${_version//./_}.tar.gz" +checksum=1555e604eb648e47e03a28484ca9e840dec5c1e3be8ea5503d616424c4f306fc + +CFLAGS="-fPIC" post_install() { vinstall resources/icons/appicon-about.png 644 \