From f1870cacf0dd4037ef74447f50a57b3fad45487a Mon Sep 17 00:00:00 2001 From: Shreeshrii Date: Wed, 9 Mar 2016 13:53:34 +0530 Subject: [PATCH 1/7] Update Leptonica to 1.73 --- mingw-w64-leptonica/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-leptonica/PKGBUILD b/mingw-w64-leptonica/PKGBUILD index 83032ea80ab8f..db7fd5e380dda 100644 --- a/mingw-w64-leptonica/PKGBUILD +++ b/mingw-w64-leptonica/PKGBUILD @@ -3,7 +3,7 @@ _realname=leptonica pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.72 +pkgver=1.73 pkgrel=2 pkgdesc="Leptonica library (mingw-w64)" arch=('any') From 5ded813e905b9b5ee8e38c4625fe89bb9d11eb03 Mon Sep 17 00:00:00 2001 From: Shreeshrii Date: Wed, 9 Mar 2016 14:06:07 +0530 Subject: [PATCH 2/7] leptonica sha256sum & CARCH --- mingw-w64-leptonica/PKGBUILD | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/mingw-w64-leptonica/PKGBUILD b/mingw-w64-leptonica/PKGBUILD index db7fd5e380dda..40db5e0293e4d 100644 --- a/mingw-w64-leptonica/PKGBUILD +++ b/mingw-w64-leptonica/PKGBUILD @@ -2,9 +2,9 @@ _realname=leptonica pkgbase=mingw-w64-${_realname} -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.73 -pkgrel=2 +pkgrel=1 pkgdesc="Leptonica library (mingw-w64)" arch=('any') url="http://www.leptonica.org" @@ -19,31 +19,32 @@ depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs ${MINGW_PACKAGE_PREFIX}-zlib) options=('!libtool' 'strip') source=("http://www.leptonica.org/source/${_realname}-${pkgver}.tar.gz") -sha256sums=('79d5eadd32658c9fea38700c975d60aa3d088eaa3e307659f004d40834de1f56') +sha256sums=('19e4335c674e7b78af9338d5382cc5266f34a62d4ce533d860af48eaa859afc1') prepare() { cd "$srcdir/${_realname}-${pkgver}" } build() { - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir "${srcdir}/build-${MINGW_CHOST}" - cd "${srcdir}/build-${MINGW_CHOST}" + [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}" + mkdir "${srcdir}/build-${CARCH}" + cd "${srcdir}/build-${CARCH}" ../${_realname}-${pkgver}/configure \ + -v --disable-static --disable-dependency-tracking --disable-silent-rules CFLAGS='-g -O2 -DMINIMUM_SEVERITY=L_SEVERITY_WARNING -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized' \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --prefix=${MINGW_PREFIX} - make + make LDFLAGS='-Wc,-static-libgcc' } -check() { - cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 check -} +#check() { +# cd "${srcdir}/build-${CARCH}" +# make -j1 check +#} package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${CARCH}" make DESTDIR="${pkgdir}" install -} + } From 55b1d11dcb420c4bc1e87ff70be2c699059de404 Mon Sep 17 00:00:00 2001 From: Shreeshrii Date: Wed, 9 Mar 2016 14:49:37 +0530 Subject: [PATCH 3/7] split leptonica command arguments per line --- mingw-w64-leptonica/PKGBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw-w64-leptonica/PKGBUILD b/mingw-w64-leptonica/PKGBUILD index 40db5e0293e4d..b4474099ad00e 100644 --- a/mingw-w64-leptonica/PKGBUILD +++ b/mingw-w64-leptonica/PKGBUILD @@ -30,7 +30,11 @@ build() { mkdir "${srcdir}/build-${CARCH}" cd "${srcdir}/build-${CARCH}" ../${_realname}-${pkgver}/configure \ - -v --disable-static --disable-dependency-tracking --disable-silent-rules CFLAGS='-g -O2 -DMINIMUM_SEVERITY=L_SEVERITY_WARNING -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized' \ + -v \ + --disable-static \ + --disable-dependency-tracking \ + --disable-silent-rules \ + CFLAGS='-g -O2 -DMINIMUM_SEVERITY=L_SEVERITY_WARNING -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized' \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ From 7f3f44c930850552d442ae67862fe0f36426358a Mon Sep 17 00:00:00 2001 From: Shreeshrii Date: Wed, 9 Mar 2016 14:51:10 +0530 Subject: [PATCH 4/7] don't use --static-libgcc --- mingw-w64-leptonica/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-leptonica/PKGBUILD b/mingw-w64-leptonica/PKGBUILD index b4474099ad00e..8a6eaed292845 100644 --- a/mingw-w64-leptonica/PKGBUILD +++ b/mingw-w64-leptonica/PKGBUILD @@ -40,7 +40,7 @@ build() { --target=${MINGW_CHOST} \ --prefix=${MINGW_PREFIX} - make LDFLAGS='-Wc,-static-libgcc' + make LDFLAGS='-Wc' } #check() { From 5ecfc59e123af035839c8bb539f1c11e99d9d433 Mon Sep 17 00:00:00 2001 From: Shreeshrii Date: Wed, 9 Mar 2016 14:58:35 +0530 Subject: [PATCH 5/7] fix CFLAGS --- mingw-w64-leptonica/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mingw-w64-leptonica/PKGBUILD b/mingw-w64-leptonica/PKGBUILD index 8a6eaed292845..a5c79cf4320cd 100644 --- a/mingw-w64-leptonica/PKGBUILD +++ b/mingw-w64-leptonica/PKGBUILD @@ -29,12 +29,13 @@ build() { [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}" mkdir "${srcdir}/build-${CARCH}" cd "${srcdir}/build-${CARCH}" + CFLAGS='-g -O2 -DMINIMUM_SEVERITY=L_SEVERITY_WARNING -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized' ../${_realname}-${pkgver}/configure \ -v \ --disable-static \ --disable-dependency-tracking \ --disable-silent-rules \ - CFLAGS='-g -O2 -DMINIMUM_SEVERITY=L_SEVERITY_WARNING -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized' \ + --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -51,4 +52,4 @@ build() { package() { cd "${srcdir}/build-${CARCH}" make DESTDIR="${pkgdir}" install - } +} From 140cd13d582a770bc6c5f7b63df791e8c2900f73 Mon Sep 17 00:00:00 2001 From: Shreeshrii Date: Wed, 9 Mar 2016 15:00:10 +0530 Subject: [PATCH 6/7] Update PKGBUILD --- mingw-w64-leptonica/PKGBUILD | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mingw-w64-leptonica/PKGBUILD b/mingw-w64-leptonica/PKGBUILD index a5c79cf4320cd..5cc8ece8171f8 100644 --- a/mingw-w64-leptonica/PKGBUILD +++ b/mingw-w64-leptonica/PKGBUILD @@ -31,16 +31,14 @@ build() { cd "${srcdir}/build-${CARCH}" CFLAGS='-g -O2 -DMINIMUM_SEVERITY=L_SEVERITY_WARNING -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized' ../${_realname}-${pkgver}/configure \ - -v \ - --disable-static \ - --disable-dependency-tracking \ - --disable-silent-rules \ - + -v \ + --disable-static \ + --disable-dependency-tracking \ + --disable-silent-rules \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --prefix=${MINGW_PREFIX} - make LDFLAGS='-Wc' } From 7767609737145d8ab77774fff08b8d984ca8abf7 Mon Sep 17 00:00:00 2001 From: Shreeshrii Date: Wed, 9 Mar 2016 15:38:34 +0530 Subject: [PATCH 7/7] fix CFLAGS etc --- mingw-w64-leptonica/PKGBUILD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mingw-w64-leptonica/PKGBUILD b/mingw-w64-leptonica/PKGBUILD index 5cc8ece8171f8..4a7e0e1d1bd2a 100644 --- a/mingw-w64-leptonica/PKGBUILD +++ b/mingw-w64-leptonica/PKGBUILD @@ -29,17 +29,16 @@ build() { [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}" mkdir "${srcdir}/build-${CARCH}" cd "${srcdir}/build-${CARCH}" - CFLAGS='-g -O2 -DMINIMUM_SEVERITY=L_SEVERITY_WARNING -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized' + CFLAGS='-DMINIMUM_SEVERITY=L_SEVERITY_WARNING' ../${_realname}-${pkgver}/configure \ -v \ - --disable-static \ --disable-dependency-tracking \ --disable-silent-rules \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --prefix=${MINGW_PREFIX} - make LDFLAGS='-Wc' + make } #check() {