From 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 4 Nov 2013 17:08:47 +0000 Subject: Slackware 14.1 Mon Nov 4 17:08:47 UTC 2013 Slackware 14.1 x86_64 stable is released! It's been another interesting release cycle here at Slackware bringing new features like support for UEFI machines, updated compilers and development tools, the switch from MySQL to MariaDB, and many more improvements throughout the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-) --- source/l/clucene/clucene.SlackBuild | 10 ++++-- source/l/clucene/clucene.install_contribs_lib.diff | 42 ++++++++++++++++++++++ source/l/clucene/clucene.pkgconfig.diff | 24 +++++++++++++ source/l/clucene/clucene.pkgconfig.patch | 24 ------------- 4 files changed, 73 insertions(+), 27 deletions(-) create mode 100644 source/l/clucene/clucene.install_contribs_lib.diff create mode 100644 source/l/clucene/clucene.pkgconfig.diff delete mode 100644 source/l/clucene/clucene.pkgconfig.patch (limited to 'source/l/clucene') diff --git a/source/l/clucene/clucene.SlackBuild b/source/l/clucene/clucene.SlackBuild index 8600cccff..1b8e351d1 100755 --- a/source/l/clucene/clucene.SlackBuild +++ b/source/l/clucene/clucene.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Heinz Wiesinger -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ PKGNAM=clucene VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} @@ -73,7 +73,10 @@ tar xvf $CWD/clucene-src-$VERSION.tar.?z* || exit 1 cd clucene-src-$VERSION || exit 1 # Fix the pkgconfig file by adding required shared library. -cat $CWD/clucene.pkgconfig.patch | patch -p1 --verbose || exit 1 +zcat $CWD/clucene.pkgconfig.patch.gz | patch -p1 --verbose || exit 1 + +# Fix contrib-libs installation: +zcat $CWD/clucene.install_contribs_lib.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ @@ -91,6 +94,7 @@ cd build -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_CONTRIBS_LIB:BOOL=ON \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ .. make $NUMJOBS || make || exit 1 diff --git a/source/l/clucene/clucene.install_contribs_lib.diff b/source/l/clucene/clucene.install_contribs_lib.diff new file mode 100644 index 000000000..8fbb3c716 --- /dev/null +++ b/source/l/clucene/clucene.install_contribs_lib.diff @@ -0,0 +1,42 @@ +diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt +--- clucene-core-2.3.3.4/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 ++++ clucene-core-2.3.3.4-mod/CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400 +@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) + SET(BUILD_CONTRIBS_LIB 1) + ENDIF ( BUILD_CONTRIBS ) + IF ( BUILD_CONTRIBS_LIB ) +- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL) ++ ADD_SUBDIRECTORY (src/contribs-lib) + ENDIF ( BUILD_CONTRIBS_LIB ) + + +diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt +--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 ++++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400 +@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED + ) + TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) + ++#install public headers. ++FOREACH(file ${HEADERS}) ++ get_filename_component(apath ${file} PATH) ++ get_filename_component(aname ${file} NAME) ++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) ++ IF ( NOT aname MATCHES "^_.*" ) ++ install(FILES ${file} ++ DESTINATION include/${relpath} ++ COMPONENT development) ++ ENDIF ( NOT aname MATCHES "^_.*" ) ++ENDFOREACH(file) ++ + #set properties on the libraries + SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES + VERSION ${CLUCENE_VERSION} + SOVERSION ${CLUCENE_SOVERSION} + COMPILE_DEFINITIONS_DEBUG _DEBUG + ) ++ ++#and install library ++install(TARGETS clucene-contribs-lib ++ DESTINATION ${LIB_DESTINATION} ++ COMPONENT runtime ) diff --git a/source/l/clucene/clucene.pkgconfig.diff b/source/l/clucene/clucene.pkgconfig.diff new file mode 100644 index 000000000..61444799c --- /dev/null +++ b/source/l/clucene/clucene.pkgconfig.diff @@ -0,0 +1,24 @@ +From 7be4a19b76d98260cf95040a47935f854a4ba7a4 Mon Sep 17 00:00:00 2001 +From: Valentin Rusu +Date: Sat, 17 Dec 2011 13:47:58 +0100 +Subject: [PATCH] Fix .pc file by adding clucene-shared library + +--- + src/core/libclucene-core.pc.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/core/libclucene-core.pc.cmake b/src/core/libclucene-core.pc.cmake +index 0152b25..d421e70 100644 +--- a/src/core/libclucene-core.pc.cmake ++++ b/src/core/libclucene-core.pc.cmake +@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/include/CLucene/ext + 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 ++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared + Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext + ~ +-- +1.7.8 + diff --git a/source/l/clucene/clucene.pkgconfig.patch b/source/l/clucene/clucene.pkgconfig.patch deleted file mode 100644 index 61444799c..000000000 --- a/source/l/clucene/clucene.pkgconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7be4a19b76d98260cf95040a47935f854a4ba7a4 Mon Sep 17 00:00:00 2001 -From: Valentin Rusu -Date: Sat, 17 Dec 2011 13:47:58 +0100 -Subject: [PATCH] Fix .pc file by adding clucene-shared library - ---- - src/core/libclucene-core.pc.cmake | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/core/libclucene-core.pc.cmake b/src/core/libclucene-core.pc.cmake -index 0152b25..d421e70 100644 ---- a/src/core/libclucene-core.pc.cmake -+++ b/src/core/libclucene-core.pc.cmake -@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/include/CLucene/ext - 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 -+Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared - Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext - ~ --- -1.7.8 - -- cgit v1.2.3