From 3f7cb62ef558ea147661abe007a4293c0069fc62 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 9 Nov 2012 11:33:59 -0800 Subject: Fri Nov 9 11:33:58 PST 2012 --- libre/kdebase-konqueror-libre/PKGBUILD | 4 +- libre/kdebase-runtime-libre/PKGBUILD | 6 +-- libre/kdelibs-libre/PKGBUILD | 12 ++--- .../use-pythondontwritebytecode.patch | 62 +++++++++++++++------- libre/kdenetwork-kopete-libre/PKGBUILD | 17 +++--- libre/kdenetwork-kopete-libre/use-libotr3.patch | 20 +++++++ libre/kdeutils-ark-libre/PKGBUILD | 6 +-- pcr/minidjvu/PKGBUILD | 27 ++++++++++ ~fauno/notmuch/PKGBUILD | 34 +++++++----- 9 files changed, 136 insertions(+), 52 deletions(-) create mode 100644 libre/kdenetwork-kopete-libre/use-libotr3.patch create mode 100644 pcr/minidjvu/PKGBUILD diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 17fafa08c..69951b8cf 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.2 +pkgver=4.9.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66' +sha1sums=('282b8704d54f081a16894bb94aa901e72eb5e694' 'f41541371414dcbe5e76687835e648112b3ff364') pkgdesc='KDE File Manager & Web Browser' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 008b94310..80537f26f 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.2 -pkgrel=2 +pkgver=4.9.3 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -25,7 +25,7 @@ provides=("${_pkgname}=${pkgver}") install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_lite.desktop') -sha1sums=('97c811e404322e520f62320c919eecd73db8c5dd' +sha1sums=('5245c1152680ad22dff21c44dad531eda736e769' '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85') build() { diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 2a4f28f33..33b3e4554 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 169397 2012-10-20 10:02:56Z andrea $ +# $Id: PKGBUILD 170347 2012-11-06 13:29:39Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.2 -pkgrel=3 +pkgver=4.9.3 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -25,9 +25,9 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar. 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' 'khtml-fsdg.diff') -sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b' +sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' + '08c20f4aaad076264402a1d84c559d75b37c66d3' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -37,7 +37,7 @@ build() { patch -p1 -i "${srcdir}"/kde-applications-menu.patch # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151) - patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch + patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch index e221e939a..9734f44fb 100644 --- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch +++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch @@ -1,8 +1,8 @@ ---- cmake/modules/PythonMacros.cmake -+++ cmake/modules/PythonMacros.cmake -@@ -23,40 +23,42 @@ +--- kdelibs-4.9.3/cmake/modules/PythonMacros.cmake~ 2012-11-06 10:32:38.564034292 +0000 ++++ kdelibs-4.9.3/cmake/modules/PythonMacros.cmake 2012-11-06 10:35:51.829341102 +0000 +@@ -23,53 +23,55 @@ # Install the source file. - INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR}) + INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR}) - # Byte compile and install the .pyc file. - GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) @@ -15,11 +15,19 @@ - endif(WIN32) - - SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) -- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) +- +- # Python 3.2 changed the pyc file location +- IF(PYTHON_SHORT_VERSION GREATER 3.1) +- # To get the right version for suffix +- STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION}) +- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc) +- ELSE(PYTHON_SHORT_VERSION GREATER 3.1) +- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) +- ENDIF(PYTHON_SHORT_VERSION GREATER 3.1) - - FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) - -- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") +- SET(_message "Byte-compiling ${_bin_py}") - - GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) - IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. @@ -38,7 +46,13 @@ - DEPENDS ${_absfilename} - ) - ENDIF(_abs_bin_py STREQUAL ${_absfilename}) -+ # Byte compile and install the .pyc file. +- +- IF(PYTHON_SHORT_VERSION GREATER 3.1) +- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/) +- ELSE (PYTHON_SHORT_VERSION GREATER 3.1) +- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}) +- ENDIF (PYTHON_SHORT_VERSION GREATER 3.1) ++ # Byte compile and install the .pyc file. + IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") + GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) + GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) @@ -46,35 +60,47 @@ + GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) + + if(WIN32) -+ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") ++ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") + endif(WIN32) + + SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) -+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) ++ ++ # Python 3.2 changed the pyc file location ++ IF(PYTHON_SHORT_VERSION GREATER 3.1) ++ # To get the right version for suffix ++ STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION}) ++ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc) ++ ELSE(PYTHON_SHORT_VERSION GREATER 3.1) ++ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) ++ ENDIF(PYTHON_SHORT_VERSION GREATER 3.1) + + FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) + -+ SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") ++ SET(_message "Byte-compiling ${_bin_py}") + + GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) + IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. -+ ADD_CUSTOM_COMMAND( ++ ADD_CUSTOM_COMMAND( + TARGET compile_python_files + COMMAND ${CMAKE_COMMAND} -E echo ${_message} + COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} + DEPENDS ${_absfilename} -+ ) ++ ) + ELSE(_abs_bin_py STREQUAL ${_absfilename}) -+ ADD_CUSTOM_COMMAND( ++ ADD_CUSTOM_COMMAND( + TARGET compile_python_files -+ COMMAND ${CMAKE_COMMAND} -E echo ${_message} ++ COMMAND ${CMAKE_COMMAND} -E echo ${_message} + COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} + COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} + DEPENDS ${_absfilename} -+ ) ++ ) + ENDIF(_abs_bin_py STREQUAL ${_absfilename}) - -- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) -+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) ++ ++ IF(PYTHON_SHORT_VERSION GREATER 3.1) ++ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/) ++ ELSE (PYTHON_SHORT_VERSION GREATER 3.1) ++ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}) ++ ENDIF (PYTHON_SHORT_VERSION GREATER 3.1) + ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") + ENDMACRO(PYTHON_INSTALL) diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index d5211499b..2b7a87dfa 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 165994 2012-09-03 21:52:07Z andrea $ +# $Id: PKGBUILD 10325 2012-11-06 13:01:47Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.2 +pkgver=4.9.3 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('6779039e5354fae02cf7faa3442385b95befb430') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'use-libotr3.patch') +sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6' + '808fa0400dc419d446d4ff8a9b536b5fddcb4727') build() { cd "${srcdir}" + patch -p1 -i ./use-libotr3.patch # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" @@ -40,7 +43,7 @@ build() { package_kdenetwork-kopete-libre() { pkgdesc='Instant Messenger (without skype support)' - depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') conflicts=('kdenetwork-kopete') provides=("kdenetwork-kopete=${pkgver}") diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/use-libotr3.patch new file mode 100644 index 000000000..c36d1a00c --- /dev/null +++ b/libre/kdenetwork-kopete-libre/use-libotr3.patch @@ -0,0 +1,20 @@ +--- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~ 2012-11-06 10:51:56.566038215 +0000 ++++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake 2012-11-06 10:53:38.861993686 +0000 +@@ -13,13 +13,13 @@ + SET(LIBOTR_FIND_QUIETLY TRUE) + ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY) + +-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) ++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) + +-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) ++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) + +-# Determine version information from libotr/version.h ++# Determine version information from libotr3/version.h + IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) +- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) ++ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) + STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}") + STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}") + # Check if version is at least 3.2.0 diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 68954e29b..e4d7d69ab 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165999 2012-09-03 21:52:22Z andrea $ +# $Id: PKGBUILD 170330 2012-11-06 13:02:06Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.2 +pkgver=4.9.3 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('180ad836ebfc6bdc26d245e6bd27c2fc7a59918c') +sha1sums=('7bca83a9985e75e2c5c280c6beb5d16e5a136e90') build() { cd "${srcdir}" diff --git a/pcr/minidjvu/PKGBUILD b/pcr/minidjvu/PKGBUILD new file mode 100644 index 000000000..168f035cc --- /dev/null +++ b/pcr/minidjvu/PKGBUILD @@ -0,0 +1,27 @@ +# Contributor: Orivej Desh +# Maintainer: Orivej Desh +pkgname=minidjvu +pkgver=0.8 +pkgrel=3 +pkgdesc="Highly efficient DjVu encoder for black-and-white images" +arch=('i686' 'x86_64') +url="http://minidjvu.sourceforge.net/" +license=('GPL') +depends=("libtiff") +options=("!libtool" "!makeflags") +source=("http://downloads.sourceforge.net/project/minidjvu/minidjvu/$pkgver/minidjvu-$pkgver.tar.gz") +md5sums=('b354eb74d83c6e2d91aab2a6c2879ba7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib + sed -i -e 's#-9 \$(MANDIR)#-9 $(DESTDIR)$(MANDIR)#' Makefile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p "$pkgdir"/usr/{bin,lib,share/man/man1} + make DESTDIR="$pkgdir/" install +} + diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD index b3ff31567..58599073c 100644 --- a/~fauno/notmuch/PKGBUILD +++ b/~fauno/notmuch/PKGBUILD @@ -4,13 +4,13 @@ pkgname=notmuch pkgver=0.14 -pkgrel=1 +pkgrel=2 pkgdesc="Notmuch is not much of an email program" arch=(i686 x86_64 mips64el) url="http://notmuchmail.org/" license=('GPL3') depends=('xapian-core' 'gmime' 'talloc') -makedepends=('python2' 'emacs' 'gnupg' 'ruby' 'pkgconfig') +makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig') optdepends=('emacs: for using the emacs interface' 'vim: for using the vim interface' 'python2: for using the python bindings' @@ -21,7 +21,7 @@ options=(!distcc !makeflags) source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") build() { - cd "$srcdir/${pkgname}-"* + cd "$srcdir/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc make @@ -29,15 +29,26 @@ build() { cd bindings/ruby ruby extconf.rb make + + cp -r $srcdir/${pkgname}-${pkgver}/bindings/python{,2} + + cd $srcdir/${pkgname}-${pkgver}/bindings/python + env LD_LIBRARY_PATH="." python setup.py build + + cd $srcdir/${pkgname}-${pkgver}/bindings/python2 + find "." -name '*.py' -print0 |xargs -0 \ + sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \ + -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' + env LD_LIBRARY_PATH="." python2 setup.py build } check() { - cd "$srcdir/${pkgname}-"* + cd "$srcdir/${pkgname}-${pkgver}" make test } package(){ - cd "$srcdir/${pkgname}-"* + cd "$srcdir/${pkgname}-${pkgver}" make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install install -D notmuch $pkgdir/usr/sbin/notmuch @@ -48,17 +59,14 @@ package(){ # Install python bindings - cd $srcdir/${pkgname}-*/bindings/python - - find "." -name '*.py' -print0 |xargs -0 \ - sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \ - -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' -# ln -s ../../lib/libnotmuch.so.1 libnotmuch.so.1 - env LD_LIBRARY_PATH="." python2 setup.py build + cd $srcdir/${pkgname}-${pkgver}/bindings/python2 env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root=$pkgdir + cd $srcdir/${pkgname}-${pkgver}/bindings/python + env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root=$pkgdir + # Install ruby bindings - cd $srcdir/${pkgname}-*/bindings/ruby + cd $srcdir/${pkgname}-${pkgver}/bindings/ruby sed -i -e 's,/site_ruby,,g' Makefile make prefix=${pkgdir}/usr install -- cgit v1.2.3-54-g00ecf