scantailor: update to 0.9.11.1.20160227

This commit is contained in:
Jürgen Buchmüller 2016-03-08 04:52:28 +01:00
parent a502d15030
commit f0affd9a3b
2 changed files with 39 additions and 5 deletions

View file

@ -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 <pthread.h>\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"
)

View file

@ -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 <pullmoll@t-online.de>"
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 \