From 9a6b691757346035549dbd12d1323301d04a6675 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 26 Jun 2012 00:01:48 +0000 Subject: Tue Jun 26 00:01:48 UTC 2012 --- extra/bluez/PKGBUILD | 14 ++-- extra/bluez/rc.bluetooth | 25 +++---- extra/burp/PKGBUILD | 6 +- extra/clucene/PKGBUILD | 78 ++++++++++++++++++++++ ...clucene-core-2.3.3.4-install_contribs_lib.patch | 42 ++++++++++++ extra/clucene/clucene-core-2.3.3.4-pkgconfig.patch | 12 ++++ extra/clucene/clucene-debug.patch | 11 +++ extra/clucene/clucene-gcc-atomics.patch | 31 +++++++++ extra/clucene/clucene-multimap-put.patch | 10 +++ extra/clucene/clucene-narrowing-conversions.patch | 25 +++++++ extra/clucene/clucene-warnings.patch | 54 +++++++++++++++ extra/clucene/fix_zlib_detections.diff | 21 ++++++ extra/dbus/PKGBUILD | 11 +-- extra/ddrescue/PKGBUILD | 12 ++-- extra/graphicsmagick/PKGBUILD | 13 ++-- extra/libtiff/PKGBUILD | 6 +- extra/live-media/PKGBUILD | 6 +- extra/opennx/PKGBUILD | 37 ++++++++++ extra/smb4k/PKGBUILD | 6 +- extra/wireshark/PKGBUILD | 10 +-- 20 files changed, 370 insertions(+), 60 deletions(-) create mode 100644 extra/clucene/PKGBUILD create mode 100644 extra/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch create mode 100644 extra/clucene/clucene-core-2.3.3.4-pkgconfig.patch create mode 100644 extra/clucene/clucene-debug.patch create mode 100644 extra/clucene/clucene-gcc-atomics.patch create mode 100644 extra/clucene/clucene-multimap-put.patch create mode 100644 extra/clucene/clucene-narrowing-conversions.patch create mode 100644 extra/clucene/clucene-warnings.patch create mode 100644 extra/clucene/fix_zlib_detections.diff create mode 100644 extra/opennx/PKGBUILD (limited to 'extra') diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 3e167e710..f6270a7ad 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162066 2012-06-19 12:10:02Z tomegun $ +# $Id: PKGBUILD 162308 2012-06-24 20:46:50Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Andrea Scarpino # Contributor: Geoffroy Carrier pkgname=bluez -pkgver=4.100 +pkgver=4.101 pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -26,14 +26,11 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" 'bluetooth.conf.d' - 'rc.bluetooth' - 'org.bluez.service') + 'rc.bluetooth') build() { cd "${srcdir}/${pkgname}-${pkgver}" - cp ../org.bluez.service src/ - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -81,7 +78,6 @@ package() { "${pkgdir}"/usr/bin/bluez-test-device \ "${pkgdir}"/usr/bin/bluez-test-input } -md5sums=('54809d476c52665ff64594b6828016b5' +md5sums=('902b390af95c6c5d6d1a17d94c8344ab' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789' - '54c7de598327bf11d56592235d0702f4') + '864cbd24e6efc3592e9284b0b5fb2cfd') diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth index a46ee2abb..0feeaeab6 100644 --- a/extra/bluez/rc.bluetooth +++ b/extra/bluez/rc.bluetooth @@ -21,14 +21,14 @@ DUND_EXEC="/usr/bin/dund" DAEMON_ENABLE="true" HIDD_ENABLE="false" RFCOMM_ENABLE="false" -DUND_ENABLE="false" PAND_ENABLE="false" +DUND_ENABLE="false" RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" HIDD_OPTIONS="" -DUND_OPTIONS="" PAND_OPTIONS="" +DUND_OPTIONS="" [ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth @@ -40,10 +40,6 @@ case "$1" in $DAEMON_EXEC sleep 1 fi - if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then - stat_append " $SDPD_NAME" - $SDPD_EXEC - fi if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then stat_append " $HIDD_NAME" $HIDD_EXEC $HIDD_OPTIONS @@ -52,26 +48,26 @@ case "$1" in stat_append " $RFCOMM_NAME" $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then stat_append " $PAND_NAME" $PAND_EXEC $PAND_OPTIONS fi + if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then + stat_append " $DUND_NAME" + $DUND_EXEC $DUND_OPTIONS + fi add_daemon bluetooth stat_done ;; stop) stat_busy "Stopping bluetooth subsystem:" - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - stat_append " $DUND_NAME" killall $DUND_NAME >/dev/null 2>&1 + stat_append " $PAND_NAME" + killall $PAND_NAME >/dev/null 2>&1 + if [ -x "$RFCOMM_EXEC" ]; then stat_append " $RFCOMM_NAME" $RFCOMM_EXEC release all >/dev/null 2>&1 @@ -80,9 +76,6 @@ case "$1" in stat_append " $HIDD_NAME" killall $HIDD_NAME >/dev/null 2>&1 - stat_append " $SDPD_NAME" - killall $SDPD_NAME >/dev/null 2>&1 - stat_append " $DAEMON_NAME" killall $DAEMON_NAME >/dev/null 2>&1 diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD index 4851bf32c..e119d3e6e 100644 --- a/extra/burp/PKGBUILD +++ b/extra/burp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156101 2012-04-14 03:07:41Z dreisner $ +# $Id: PKGBUILD 162259 2012-06-24 15:44:41Z dreisner $ # Maintainer: Dave Reisner pkgname=burp -pkgver=1.6.8 +pkgver=1.6.9 pkgrel=1 pkgdesc="A simple AUR uploader" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('glibc' 'curl') makedepends=('perl') source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('57b0043994e8a9a3f8f5a27d7fef5bb4') +md5sums=('3ae883cf6283e860f613668619b8d3ce') build() { make -C "$pkgname-$pkgver" diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD new file mode 100644 index 000000000..dbeb16810 --- /dev/null +++ b/extra/clucene/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 162256 2012-06-24 14:30:07Z andyrtr $ +# Maintainer: AndyRTR +# Contributor: Alexander Rødseth +# Contributor: Alois Nespor +# Contributor: Tobias Powalowski +pkgname=clucene +pkgver=2.3.3.4 +pkgrel=5 +pkgdesc="C++ port of the high-performance text search engine Lucene" +arch=('x86_64' 'i686') +url="http://clucene.sourceforge.net/" +license=('APACHE' 'LGPL') +depends=('gcc-libs' 'zlib' 'boost-libs') +makedepends=('cmake' 'boost') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz + # Fedora patches + clucene-core-2.3.3.4-pkgconfig.patch + clucene-core-2.3.3.4-install_contribs_lib.patch + # upstream patch + fix_zlib_detections.diff + # LibreOffice patches + clucene-warnings.patch + clucene-gcc-atomics.patch + clucene-debug.patch + clucene-narrowing-conversions.patch + clucene-multimap-put.patch) +sha256sums=('ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab' + '10c808ce483d997d7ff349cc3ec97b8785c365f956d6eef45458e9caf4e5e88d' + '3d3f73685f75b4ceacf1941e50b6108941bded3ca558ac1343c35b1b7d0e78dc' + 'e1a6a58dc344d8d5e3218137a5e7a689900eb6ea4cce1dc426e861706ab78889' + 'a66922411eca00c1cd171dd15ac462eec7a832cf067dbb0231773553554242ef' + 'b11dca0d6b889f6ddfa4fd2566373717f54fed9590bf0daee054dea5e39a9f46' + 'c944b9de6b18e49bb065d10c5d045446eeb15f680d6af4b5ac7e4f5fbda8f2a0' + 'cfc88dae46efb2a17ffdc088fd78ca28655e653c9d183b83bdae18c0192a8ddd' + '917c8bfc1dd3313a716ecacf398dbcaf0aa02ce61b41ca2d3d7eb84fa160fce3') + +build() { + cd $srcdir/$pkgname-core-$pkgver + + # add missing contrib-libs needed by LibO 3.6, patch by FC + patch -Np1 -i ${srcdir}/clucene-core-2.3.3.4-install_contribs_lib.patch + # pkgconfig file is missing clucene-shared (upstream ID: 3461512), patch by FC + patch -Np1 -i ${srcdir}/clucene-core-2.3.3.4-pkgconfig.patch + # one upstream postrelease commit for proper zlib detection + patch -Np1 -i ${srcdir}/fix_zlib_detections.diff + # LibreOffice patches http://cgit.freedesktop.org/libreoffice/core/tree/clucene/patches + patch -Np0 -i ${srcdir}/clucene-warnings.patch + patch -Np0 -i ${srcdir}/clucene-gcc-atomics.patch + patch -Np0 -i ${srcdir}/clucene-debug.patch + patch -Np0 -i ${srcdir}/clucene-narrowing-conversions.patch + patch -Np0 -i ${srcdir}/clucene-multimap-put.patch + + mkdir build + pushd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_ASCII_MODE=OFF \ + -DENABLE_PACKAGING=OFF \ + -DBUILD_CONTRIBS_LIB:BOOL=ON \ + -DLIB_DESTINATION:PATH=/usr/lib \ + -DLUCENE_SYS_INCLUDES:PATH=/usr/lib \ + -DDISABLE_MULTITHREADING=OFF + popd + make -C build +} + +#check() { +# cd $srcdir/$pkgname-core-$pkgver +# make cl_test -C build +# make test -C build || /bin/true # currently fails the tests as expected (see FC comment) +#} + +package() { + cd $srcdir/$pkgname-core-$pkgver + make DESTDIR="$pkgdir" install -C build + rm -rf $pkgdir/usr/lib/CLuceneConfig.cmake +} diff --git a/extra/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch b/extra/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch new file mode 100644 index 000000000..8fbb3c716 --- /dev/null +++ b/extra/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch @@ -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/extra/clucene/clucene-core-2.3.3.4-pkgconfig.patch b/extra/clucene/clucene-core-2.3.3.4-pkgconfig.patch new file mode 100644 index 000000000..aff20d7b4 --- /dev/null +++ b/extra/clucene/clucene-core-2.3.3.4-pkgconfig.patch @@ -0,0 +1,12 @@ +diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake +--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes 2011-03-16 19:21:07.000000000 -0500 ++++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake 2012-03-19 09:01:00.689263954 -0500 +@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i + 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 +-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext ++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared ++Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@ + ~ diff --git a/extra/clucene/clucene-debug.patch b/extra/clucene/clucene-debug.patch new file mode 100644 index 000000000..640454e2f --- /dev/null +++ b/extra/clucene/clucene-debug.patch @@ -0,0 +1,11 @@ +--- src/core/CLucene/index/TermInfosReader.cpp ++++ src/core/CLucene/index/TermInfosReader.cpp +@@ -111,7 +111,7 @@ + //destroy their elements + #ifdef _DEBUG + for ( int32_t i=0; i 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) + return __sync_add_and_fetch(theInteger, 1); + #else + SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK) +@@ -193,7 +193,7 @@ + #endif + } + int32_t atomic_threads::atomic_decrement(_LUCENE_ATOMIC_INT *theInteger){ +- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS ++ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) + return __sync_sub_and_fetch(theInteger, 1); + #else + SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK) +--- src/shared/CLucene/LuceneThreads.h 2012-02-23 12:36:28.388299322 +0000 ++++ src/shared/CLucene/LuceneThreads.h 2012-02-23 12:37:23.131885433 +0000 +@@ -70,7 +70,7 @@ + void NotifyAll(); + }; + +- #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS ++ #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) + #define _LUCENE_ATOMIC_INT uint32_t + #define _LUCENE_ATOMIC_INT_SET(x,v) x=v + #define _LUCENE_ATOMIC_INT_GET(x) x diff --git a/extra/clucene/clucene-multimap-put.patch b/extra/clucene/clucene-multimap-put.patch new file mode 100644 index 000000000..36ed1fe22 --- /dev/null +++ b/extra/clucene/clucene-multimap-put.patch @@ -0,0 +1,10 @@ +--- src/core/CLucene/util/VoidMap.h ++++ src/core/CLucene/util/VoidMap.h +@@ -316,6 +316,7 @@ public: + if ( _this::dk || _this::dv ) + _this::remove(k); + ++ (*this)[k] = v; + } + }; + diff --git a/extra/clucene/clucene-narrowing-conversions.patch b/extra/clucene/clucene-narrowing-conversions.patch new file mode 100644 index 000000000..f0e971c55 --- /dev/null +++ b/extra/clucene/clucene-narrowing-conversions.patch @@ -0,0 +1,25 @@ +--- src/core/CLucene/queryParser/QueryParser.cpp.sav 2011-03-17 01:21:07.000000000 +0100 ++++ src/core/CLucene/queryParser/QueryParser.cpp 2012-03-09 18:20:58.000000000 +0100 +@@ -79,7 +79,7 @@ + _T("") + }; + +-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000}; ++const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,int32_t(0x80000000),0x20000000,int32_t(0x80000000),0x10000,0x80000,0x10000,0x1f68000}; + const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0}; + + struct QueryParser::JJCalls { +--- src/core/CLucene/queryParser/QueryParserTokenManager.cpp.sav 2011-03-17 01:21:07.000000000 +0100 ++++ src/core/CLucene/queryParser/QueryParserTokenManager.cpp 2012-03-09 18:20:24.000000000 +0100 +@@ -15,9 +15,9 @@ + + CL_NS_DEF(queryParser) + +-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)}; ++const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff))}; + const int64_t QueryParserTokenManager::jjbitVec0[] = { +- _ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff) ++ int64_t(_ILONGLONG(0xfffffffffffffffe)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff)) + }; + const int32_t QueryParserTokenManager::jjnextStates[]={ + 15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27, diff --git a/extra/clucene/clucene-warnings.patch b/extra/clucene/clucene-warnings.patch new file mode 100644 index 000000000..b9676d902 --- /dev/null +++ b/extra/clucene/clucene-warnings.patch @@ -0,0 +1,54 @@ +--- src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:37:22.531637934 +0000 ++++ src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:39:15.369916728 +0000 +@@ -7,6 +7,8 @@ + #ifndef _lucene_analysis_AnalysisHeader_ + #define _lucene_analysis_AnalysisHeader_ + ++#pragma GCC system_header ++ + #include "CLucene/index/Payload.h" + #include "CLucene/util/VoidList.h" + #include "CLucene/LuceneThreads.h" +--- src/core/CLucene/search/Searchable.h 2012-02-22 12:37:22.513637729 +0000 ++++ src/core/CLucene/search/Searchable.h 2012-02-22 12:38:51.073641550 +0000 +@@ -7,6 +7,7 @@ + #ifndef _lucene_search_Searcher_ + #define _lucene_search_Searcher_ + ++#pragma GCC system_header + + //#include "CLucene/index/IndexReader.h" + CL_CLASS_DEF(index,Term) +--- src/core/CLucene/store/IndexInput.h 2012-02-22 12:37:22.508637673 +0000 ++++ src/core/CLucene/store/IndexInput.h 2012-02-22 12:39:00.465747935 +0000 +@@ -7,6 +7,8 @@ + #ifndef _lucene_store_IndexInput_ + #define _lucene_store_IndexInput_ + ++#pragma GCC system_header ++ + #include "CLucene/LuceneThreads.h" + #include "CLucene/util/Equators.h" + +--- src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 +0000 ++++ src/core/CLucene/util/Array.h 2012-02-22 12:38:33.714444884 +0000 +@@ -7,6 +7,8 @@ + #ifndef _lucene_util_Array_ + #define _lucene_util_Array_ + ++#pragma GCC system_header ++ + #include + #include + +--- src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:37:22.510637696 +0000 ++++ src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:38:40.316519685 +0000 +@@ -7,6 +7,8 @@ + #ifndef _lucene_util_PriorityQueue_ + #define _lucene_util_PriorityQueue_ + ++#pragma GCC system_header ++ + #include + + CL_NS_DEF(util) diff --git a/extra/clucene/fix_zlib_detections.diff b/extra/clucene/fix_zlib_detections.diff new file mode 100644 index 000000000..2b08883f5 --- /dev/null +++ b/extra/clucene/fix_zlib_detections.diff @@ -0,0 +1,21 @@ +From: Veit Jahns +Date: Thu, 26 May 2011 11:35:28 +0000 (+0200) +Subject: Fixing ZLIB configuration in shared's CMakeLists +X-Git-Url: http://clucene.git.sourceforge.net/git/gitweb.cgi?p=clucene%2Fclucene;a=commitdiff_plain;h=772481ca94071ddfe65102a451926e4f9aeb4d2c;hp=a834f87bad3543b2a0331cef7202c15ded4245be + +Fixing ZLIB configuration in shared's CMakeLists +--- + +diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt +index 68314a7..3d1975e 100644 +--- a/src/shared/CMakeLists.txt ++++ b/src/shared/CMakeLists.txt +@@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions) + find_package(ZLIB) + IF ( ZLIB_FOUND ) + SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} ) +-ELSEIF ( ZLIB_FOUND ) ++ELSE ( ZLIB_FOUND ) + MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" ) + SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib ) + SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR}) diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index 0941c2f9e..d3cc74e8a 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 156107 2012-04-14 07:40:10Z andyrtr $ +# $Id: PKGBUILD 162316 2012-06-24 22:30:50Z dreisner $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus -pkgver=1.4.20 +pkgver=1.6.0 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') depends=("dbus-core>=${pkgver}" 'libx11') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} 30-dbus) -md5sums=('79eca2f2c1894ac347acce128314428b' +md5sums=('16dcae2dd0c76e398381601ac9acdec4' + '0ebde9920bde83fe26ce32351a7d8954' '9fafe8b28460aeaa6054309ef4c5ed92') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ --with-system-pid-file=/var/run/dbus.pid \ --disable-verbose-mode --disable-static \ diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD index 2e8575fb5..53165693c 100644 --- a/extra/ddrescue/PKGBUILD +++ b/extra/ddrescue/PKGBUILD @@ -1,8 +1,10 @@ -# $Id: PKGBUILD 149619 2012-02-08 20:30:46Z pierre $ -# Maintainer: Paul Mattal +# $Id: PKGBUILD 162261 2012-06-24 16:23:55Z schiv $ +# Maintainer: Ray Rashif +# Contributor: Pierre Schmitz +# Contributor: Paul Mattal pkgname=ddrescue -pkgver=1.15 +pkgver=1.16 pkgrel=1 pkgdesc="GNU data recovery tool" arch=('i686' 'x86_64') @@ -12,8 +14,8 @@ depends=('gcc-libs') install=$pkgname.install source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig") -md5sums=('6b445f6246074a7fa02f3b2599031096' - '53bc7e1f5b2a260def5207eb358b7dca') +md5sums=('57b67407e882c6418531d48a2f20d16b' + 'bf072280587665d82829be15eb6fc9ad') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index 31ab66def..a650c965a 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 160481 2012-06-02 10:26:14Z bluewind $ +# $Id: PKGBUILD 162322 2012-06-25 01:51:33Z bisson $ # Maintainer: Ronald van Haren # Maintainer: Gaetan Bisson # Contributor: Jaroslav Lichtblau # Contributor: Anton Leontiev pkgname=graphicsmagick -pkgver=1.3.15 -pkgrel=2 +pkgver=1.3.16 +pkgrel=1 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64') @@ -16,16 +16,11 @@ depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') options=('!libtool') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") -sha1sums=('d5df4000d5531fad3ede9e008f9c8dc2d085d546') +sha1sums=('3949030b101d66811242a0d30abc9965481ed035') build() { cd "${srcdir}/GraphicsMagick-${pkgver}" - # fix typemap bug - # https://rt.cpan.org/Public/Bug/Display.html?id=70150 - # http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.7.7/PerlMagick/typemap - echo 'Graphics::Magick T_PTROBJ' > typemap - ./configure \ --prefix=/usr \ --with-perl \ diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index b22c91572..2606aa16c 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153433 2012-03-13 21:01:28Z eric $ +# $Id: PKGBUILD 162307 2012-06-24 20:44:52Z eric $ # Maintainer: Eric Bélanger pkgname=libtiff -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=1 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('freeglut') optdepends=('freeglut: for using tiffgt') options=('!libtool') source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('8baf382231c9051a1b3eb294581289aa21447171') +sha1sums=('d84b7b33a6cfb3d15ca386c8c16b05047f8b5352') build() { cd "${srcdir}/tiff-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index c6e28b53e..6542721cb 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161806 2012-06-14 18:07:58Z giovanni $ +# $Id: PKGBUILD 162236 2012-06-24 06:52:55Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2012.06.12 +pkgver=2012.06.23 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('0c952d4debc674ac896fe3d231b21a0a') +md5sums=('c1e6a597c8259a1c9d86a15605277a02') build() { cd ${srcdir}/live diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD new file mode 100644 index 000000000..9ee9d9e0b --- /dev/null +++ b/extra/opennx/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 162243 2012-06-24 08:25:53Z andyrtr $ +# Maintainer: AndyRTR +# Contributor: Armin Luntzer +# Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk + +pkgname=opennx +pkgver=0.16.0.712 +pkgrel=1 +pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser" +url="http://opennx.sf.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl') +makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat') +#optdepends=('cups: for full local printing support') +source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz) +md5sums=('f9cf99a9dc13de9ef6d219db83dec344') + +build() { + cd $srcdir/opennx* + ./configure --prefix=/usr \ + --enable-usbip + make +} + +package() { + cd $srcdir/opennx* + make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install-man + + # fix some file locations + install -dm755 ${pkgdir}/usr/share/applications + cp -aR ${pkgdir}/usr/share/applnk/xdg/* ${pkgdir}/usr/share/applications + rm -rf ${pkgdir}/usr/share/applnk + + sed -i -e "s:Exec=/usr/NX/bin/opennx:Exec=/usr/bin/opennx:" ${pkgdir}/usr/share/applications/*.desktop +} diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 5f6736583..03645c208 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160665 2012-06-03 10:41:33Z giovanni $ +# $Id: PKGBUILD 162238 2012-06-24 07:45:21Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Emanuele Rampichini pkgname=smb4k -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('e1c895044faaf18d90ea4b564412455e') +md5sums=('943b4ccf1a481600784538148d86d3e4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 4a0c77d07..6da9facd8 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 159382 2012-05-22 20:52:55Z guillaume $ +# $Id: PKGBUILD 162251 2012-06-24 12:43:16Z guillaume $ # Maintainer: Guillaume ALAUX # Contributor: Florian Pritz pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.6.8 +pkgver=1.8.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua') +makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' + 'libgcrypt' 'lua' 'python') url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('dcdc5f4904af5804b622c955a30974e2') +md5sums=('3eca81253800a0089d0f957e75853b05') build() { cd "${srcdir}/${pkgbase}-${pkgver}" + ./autogen.sh ./configure \ --prefix=/usr \ --with-ssl \ -- cgit v1.2.3-54-g00ecf