diff --git a/dev-cpp/clucene/clucene-2.3.3.4.recipe b/dev-cpp/clucene/clucene-2.3.3.4.recipe index f6a716ef3..5bbbf647c 100644 --- a/dev-cpp/clucene/clucene-2.3.3.4.recipe +++ b/dev-cpp/clucene/clucene-2.3.3.4.recipe @@ -21,7 +21,7 @@ COPYRIGHT="2003-2006 Ben van Klinken 2003-2006 CLucene Team 2003-2006 Jos van den Oever" LICENSE="Apache v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://downloads.sourceforge.net/clucene/clucene-core-$portVersion.tar.gz" CHECKSUM_SHA256="ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab" SOURCE_DIR="clucene-core-$portVersion" diff --git a/dev-cpp/clucene/patches/clucene-2.3.3.4.patchset b/dev-cpp/clucene/patches/clucene-2.3.3.4.patchset index 7306bb4de..8fadfa016 100644 --- a/dev-cpp/clucene/patches/clucene-2.3.3.4.patchset +++ b/dev-cpp/clucene/patches/clucene-2.3.3.4.patchset @@ -1,4 +1,4 @@ -From 3089fbbe004c3c18ca50ff9f826560365446861d Mon Sep 17 00:00:00 2001 +From 09014e54d161cd7f3150b2302979e64659d357c9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 8 Nov 2014 17:51:36 +0100 Subject: Fix include paths. @@ -43,10 +43,10 @@ index 0ab402e..1055a4b 100644 ENDFOREACH(file) -- -2.10.2 +2.11.0 -From 6c14fd5afc029f1442e4edb082808f82a733b693 Mon Sep 17 00:00:00 2001 +From 35173dc3b8275fafa0f80851d88235fa85a5fbba Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 24 Mar 2017 23:25:58 +0100 Subject: Fedora patches @@ -110,10 +110,10 @@ index 0152b25..c3f68e9 100644 +Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@ ~ -- -2.10.2 +2.11.0 -From 5b0afa71b2cfd609dd1db919f8df8ddc527f872b Mon Sep 17 00:00:00 2001 +From 914b424e8dd2974dd2247ebc9e053d10a038bf54 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 24 Mar 2017 23:32:16 +0100 Subject: LibreOffice patches @@ -273,10 +273,10 @@ index 0b5f30a..15e766d 100644 #else SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK) -- -2.10.2 +2.11.0 -From ab2f5f09c47ce204f837f1326e020f4c311f87c2 Mon Sep 17 00:00:00 2001 +From 557aec44617afa32a64ec7f0b5bccf048395e965 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 24 Mar 2017 23:41:45 +0100 Subject: Fix include path. @@ -296,5 +296,26 @@ index 7109e02..c6e8fb1 100644 ENDIF ( NOT aname MATCHES "^_.*" ) ENDFOREACH(file) -- -2.10.2 +2.11.0 + + +From a1e92b57f5d2b89be14eedae6e8fb36487e30f74 Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Sun, 2 Apr 2017 16:57:35 +0000 +Subject: Fix pkgconfig file. + + +diff --git a/src/core/libclucene-core.pc.cmake b/src/core/libclucene-core.pc.cmake +index c3f68e9..085f7d2 100644 +--- a/src/core/libclucene-core.pc.cmake ++++ b/src/core/libclucene-core.pc.cmake +@@ -7,5 +7,5 @@ Name: libclucene + Description: CLucene - a C++ search engine, ported from the popular Apache Lucene + Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ + Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared +-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@ ++Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I${prefix}/@LUCENE_SYS_INCLUDES@ + ~ +-- +2.11.0 diff --git a/dev-libs/nss/nss-3.23.recipe b/dev-libs/nss/nss-3.23.recipe index 60f117a8d..417d37b7d 100644 --- a/dev-libs/nss/nss-3.23.recipe +++ b/dev-libs/nss/nss-3.23.recipe @@ -11,7 +11,7 @@ LICENSE=" GNU LGPL v2.1 MPL v2.0 " -REVISION="2" +REVISION="3" NSS_VERSION=`echo $portVersion | sed 's/\./_/g'` SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${NSS_VERSION}_RTM/src/nss-$portVersion.tar.gz" CHECKSUM_SHA256="94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf" @@ -169,7 +169,7 @@ Description: Network Security Services Version: $portVersion Requires: nspr Libs: -L${developLibDir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -Cflags: -I${includedir} +Cflags: -I${includeDir}/nss EOF # devel package