From 171120794a952c6e0e75aef6ecdf46cd6d5154c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sun, 2 Feb 2014 03:29:07 +0000 Subject: Sun Feb 2 03:26:29 UTC 2014 --- community/bind/PKGBUILD | 8 +-- community/chrony/PKGBUILD | 8 +-- community/gambit-c/PKGBUILD | 33 +++++++++ community/gambit-c/gambit-c.install | 16 +++++ community/geary/PKGBUILD | 6 +- community/kiwi/PKGBUILD | 4 +- community/mpv/PKGBUILD | 8 +-- community/opencolorio/PKGBUILD | 34 --------- community/openimageio/PKGBUILD | 42 ----------- community/openimageio/fix32bit-fail.patch | 13 ---- community/openshadinglanguage/PKGBUILD | 48 ------------- community/openshadinglanguage/llvm32.patch | 71 ------------------ community/openssh-askpass/PKGBUILD | 10 +-- community/opusfile/PKGBUILD | 8 +-- community/pymol/PKGBUILD | 29 +++++--- community/pymol/pymol.install | 11 +++ community/python-pmw/LICENSE.txt | 21 ------ community/python-pmw/PKGBUILD | 33 --------- community/python2-pmw/LICENSE.txt | 21 ++++++ community/python2-pmw/PKGBUILD | 37 ++++++++++ community/sage-mathematics/PKGBUILD | 39 +++------- ...-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch | 47 ------------ ...-all-addresses-in-first-connection-attemp.patch | 47 ------------ core/curl/PKGBUILD | 19 ++--- core/e2fsprogs/PKGBUILD | 10 +-- extra/bluefish/PKGBUILD | 21 +++--- extra/freetds/PKGBUILD | 18 ++--- extra/i8kutils/PKGBUILD | 26 ++++--- extra/i8kutils/i8kutils-probe.diff | 84 ++++++++++++++++++++++ extra/mpg123/PKGBUILD | 6 +- extra/xf86-video-intel/PKGBUILD | 8 +-- libre/soundkonverter-libre/PKGBUILD | 52 -------------- 32 files changed, 304 insertions(+), 534 deletions(-) create mode 100644 community/gambit-c/PKGBUILD create mode 100644 community/gambit-c/gambit-c.install delete mode 100644 community/opencolorio/PKGBUILD delete mode 100644 community/openimageio/PKGBUILD delete mode 100644 community/openimageio/fix32bit-fail.patch delete mode 100644 community/openshadinglanguage/PKGBUILD delete mode 100644 community/openshadinglanguage/llvm32.patch create mode 100644 community/pymol/pymol.install delete mode 100644 community/python-pmw/LICENSE.txt delete mode 100644 community/python-pmw/PKGBUILD create mode 100644 community/python2-pmw/LICENSE.txt create mode 100644 community/python2-pmw/PKGBUILD delete mode 100644 core/curl/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch delete mode 100644 core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch create mode 100644 extra/i8kutils/i8kutils-probe.diff delete mode 100644 libre/soundkonverter-libre/PKGBUILD diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD index 49e896ab1..210fbc029 100644 --- a/community/bind/PKGBUILD +++ b/community/bind/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 103933 2014-01-13 17:38:54Z seblu $ +# $Id: PKGBUILD 105129 2014-02-01 10:10:45Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Gaetan Bisson # Contributor: judd # Contributor: Mario Vazquez pkgname=bind -_pkgver=9.9.4-P2 -pkgver=${_pkgver//-/.} +_pkgver=9.9.5 +pkgver=9.9.5 pkgrel=1 pkgdesc='The ISC BIND nameserver' url='http://www.isc.org/software/bind/' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc} 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('9471a6df92732da1a879115e0416e23b9369544a' +sha1sums=('f3fe8000628ec57f332aec1ad9587b767208a38f' 'SKIP' '029f89c49550c40ec7a95116b6a33f0e5a041094' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index c04c7d4a1..926638dc2 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99445 2013-10-29 00:06:24Z thestinger $ +# $Id: PKGBUILD 105122 2014-01-31 23:52:20Z thestinger $ # Maintainer: Sergej Pupykin # Maintainer: Daniel Micay # Contributor: Bartłomiej Piotrowski @@ -8,8 +8,8 @@ # Contributor: Elisamuel Resto pkgname=chrony -pkgver=1.29 -pkgrel=2 +pkgver=1.29.1 +pkgrel=1 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64') url="http://chrony.tuxfamily.org/" @@ -19,7 +19,7 @@ depends=('readline' 'libcap') backup=('etc/chrony.conf') source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz service) -sha256sums=('c685f072ba0663ab026a7f56870ab2c246bd97ca4629dd2e1899617bd16ad39b' +sha256sums=('658c9bb4d8c8d8ec7d0908429aa266e5f8413ba86bd4acbfd2f9669f6065af27' 'bef4305fa7e5828e1a1fd43aa8e631f22f21902f6cdc2d3b5b41a57bd9a175dc') build() { diff --git a/community/gambit-c/PKGBUILD b/community/gambit-c/PKGBUILD new file mode 100644 index 000000000..e4eef8645 --- /dev/null +++ b/community/gambit-c/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Christian Babeux + +_distname=gambc-v4_7_1 +pkgname=gambit-c +pkgver=4.7.1 +pkgrel=2 +pkgdesc='Scheme R5RS interpreter and compiler (via C)' +arch=('x86_64' 'i686') +url='http://dynamo.iro.umontreal.ca/wiki/index.php/Main_Page' +license=('LGPL2.1' 'Apache') +install="$pkgname.install" +source=(http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/${_distname}.tgz) +sha256sums=('6b7d58f1e28169d2c873386a1cf7e321e96d23ffd4b3238b105d66ca6bdd7472') + +build() { + cd "$_distname" + + ./configure --prefix=/usr --docdir=/usr/share/doc/gambit-c \ + --infodir=/usr/share/info --libdir=/usr/lib/gambit-c \ + --enable-gcc-opts --enable-single-host + make +} + +package() { + make -C "$_distname" install DESTDIR="$pkgdir" + # gsc conflicts with the one provided by ghostscript + mv "$pkgdir/usr/bin/gsc" "$pkgdir/usr/bin/gambitc" + ln -sf /usr/bin/gambitc "$pkgdir/usr/bin/gsc-script" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gambit-c/gambit-c.install b/community/gambit-c/gambit-c.install new file mode 100644 index 000000000..ed08d59db --- /dev/null +++ b/community/gambit-c/gambit-c.install @@ -0,0 +1,16 @@ +_infodir=/usr/share/info +_iinfoargs="$_infodir/gambit-c.info.gz $_infodir/dir" + +post_install() { + install-info ${_iinfoargs} +} + +post_upgrade() { + post_install $@ +} + +pre_remove() { + install-info --delete ${_iinfoargs} +} + +# vim:set ts=2 sw=2 et: diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD index 707aa6905..adb83f731 100755 --- a/community/geary/PKGBUILD +++ b/community/geary/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102595 2013-12-16 08:40:54Z alucryd $ +# $Id: PKGBUILD 105142 2014-02-01 15:05:47Z alucryd $ # Maintainer: Maxime Gauduin # Contributor : sebikul # Contributor : Massimiliano Torromeo pkgname=geary -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc='A lightweight email client for the GNOME desktop' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('desktop-file-utils' 'gmime' 'libcanberra' 'libgee' 'libnotify' 'webkit makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala') install="${pkgname}.install" source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('7f3f442b2b7349e339b380de474d94e9a8ad625d16277277ea500747c3b7a5af') +sha256sums=('12561187c7d2b8aa1115ca52d8959270ff38dd6db774df1cd39c9719a76bb1d1') build() { cd ${pkgname}-${pkgver} diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD index b532a6e6c..e9e3a493d 100644 --- a/community/kiwi/PKGBUILD +++ b/community/kiwi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85550 2013-03-03 03:09:38Z cinelli $ +# $Id: PKGBUILD 105127 2014-02-01 09:34:22Z lfleischer $ # Maintainer: Federico Cinelli # Contributor: Douglas Soares de Andrade # Contributor: William Rea pkgname=kiwi pkgver=1.9.29 -pkgrel=2 +pkgrel=3 pkgdesc="A set of classes and wrappers for PyGTK" arch=('i686' 'x86_64') url="http://www.async.com.br/projects/kiwi" diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 6cf602e3f..9a47e7bf2 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104371 2014-01-19 16:29:35Z bpiotrowski $ +# $Id: PKGBUILD 105136 2014-02-01 12:59:23Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Eivind Uggedal pkgname=mpv -pkgver=0.3.3 -pkgrel=2 +pkgver=0.3.4 +pkgrel=1 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') @@ -18,7 +18,7 @@ makedepends=('mesa' 'python-docutils' 'waf') options=('!emptydirs' '!buildflags') install=mpv.install source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz) -md5sums=('bdf40570d1fc025058f9f2aabb91899f') +md5sums=('274bf45367df99774512cf43659004d5') build() { cd $pkgname-$pkgver diff --git a/community/opencolorio/PKGBUILD b/community/opencolorio/PKGBUILD deleted file mode 100644 index 4c3b01a98..000000000 --- a/community/opencolorio/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: Dumitru Ursu - -pkgname=opencolorio -pkgver=1.0.9 -pkgrel=1 -pkgdesc="A color management framework for visual effects and animation" -arch=('i686' 'x86_64') -url="http://opencolorio.org" -license=('BSD') -depends=('python') -makedepends=('cmake') -source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver) -sha1sums=('a015cb51b9b0ea0cdb3989fc23e1c18ad69511e0') - -build() -{ - mv imageworks-OpenColorIO-* $pkgname-$pkgver - cd $pkgname-$pkgver - - cmake -DCMAKE_INSTALL_PREFIX=/usr . - make -} - -package() -{ - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -# vim:set ts=2 sw=2 et: diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD deleted file mode 100644 index 5acccb045..000000000 --- a/community/openimageio/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 103941 2014-01-13 19:39:24Z svenstaro $ -# Contributor: SpepS -# Maintainer: Sven-Hendrik Haase - -pkgname=openimageio -pkgver=1.3.11 -pkgrel=1 -pkgdesc="A library for reading and writing images, including classes, utilities, and applications" -arch=(i686 x86_64) -url="http://www.openimageio.org/" -license=('custom') -depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-tbb') -makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa') -optdepends=('qt4: iv image viewer' - 'python2: bindings support') -source=(https://github.com/OpenImageIO/oiio/archive/Release-${pkgver}.tar.gz) -md5sums=('a1b6b4cbc863fa49259d0f32da4288d7') - -build() { - cd oiio-Release-$pkgver - - [[ -d build ]] && rm -r build - mkdir build && cd build - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \ - -DUSE_EXTERNAL_TBB=ON \ - -DOIIO_BUILD_TESTS=OFF \ - .. - make -} - -package() { - cd oiio-Release-$pkgver/build - - make DESTDIR="$pkgdir" install - - # license - cd .. - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/openimageio/fix32bit-fail.patch b/community/openimageio/fix32bit-fail.patch deleted file mode 100644 index 5d9bbbe36..000000000 --- a/community/openimageio/fix32bit-fail.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- orig/src/libutil/SHA1.cpp 2012-11-17 01:02:42.000000000 +0200 -+++ fixed/src/libutil/SHA1.cpp 2012-12-14 14:37:37.552042793 +0200 -@@ -8,9 +8,9 @@ - - // If compiling with MFC, you might want to add #include "StdAfx.h" - -+#include "SHA1.h" - #include "hash.h" - #include "dassert.h" --#include "SHA1.h" - - #ifdef SHA1_UTILITY_FUNCTIONS - #define SHA1_MAX_FILE_BUFFER 8000 diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD deleted file mode 100644 index 7029bfc7e..000000000 --- a/community/openshadinglanguage/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 103863 2014-01-12 20:24:24Z foutrelis $ -# Maintainer: Sven-Hendrik Haase -pkgname=openshadinglanguage -pkgver=1.5.4dev -pkgrel=1 -pkgdesc="Advanced shading language for production GI renderers" -arch=(i686 x86_64) -url="https://github.com/imageworks/OpenShadingLanguage" -license=('custom') -depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm') -makedepends=('boost' 'cmake' 'clang') -source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz - https://github.com/imageworks/OpenShadingLanguage/pull/320.patch) -md5sums=('4dda1fb2919d3440344d36ecbdf13d47' - '590137809ea344b41b1ad1e0fc81738c') - -build() { - cd OpenShadingLanguage-Release-$pkgver - - # LLVM 3.4 build fix - patch -Np1 < $srcdir/320.patch - - cd src - - [[ -d build ]] && rm -r build - mkdir build && cd build - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLLVM_STATIC=0 \ - ../.. - make -} - -package() { - cd OpenShadingLanguage-Release-$pkgver/src/build - - make DESTDIR="$pkgdir/" install - - mkdir -p "$pkgdir"/usr/share/OSL/ - mkdir -p "$pkgdir"/usr/share/licenses/$pkgname - mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit - mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/ - mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc - mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders -} - -# vim:set ts=2 sw=2 et: diff --git a/community/openshadinglanguage/llvm32.patch b/community/openshadinglanguage/llvm32.patch deleted file mode 100644 index 5eb63bcf3..000000000 --- a/community/openshadinglanguage/llvm32.patch +++ /dev/null @@ -1,71 +0,0 @@ -commit c391ceb1936459b70147d6f8ac389ded26a7e028 -Author: Sven-Hendrik Haase -Date: Fri Dec 28 09:00:33 2012 +0100 - - Fix for LLVM 3.2 - -diff --git a/src/liboslexec/llvm_headers.h b/src/liboslexec/llvm_headers.h -index 41a7a11..5ff4384 100644 ---- a/src/liboslexec/llvm_headers.h -+++ b/src/liboslexec/llvm_headers.h -@@ -45,10 +45,18 @@ namespace llvm = LLVM_NAMESPACE; - #include - #include - #include -+#if OSL_LLVM_VERSION >= 32 -+#include -+#else - #include -+#endif - #include - #include - #include -+#if OSL_LLVM_VERSION >= 32 -+#include -+#else - #include -+#endif - - #endif /* OSL_LLVM_HEADERS_H */ -diff --git a/src/liboslexec/llvm_instance.cpp b/src/liboslexec/llvm_instance.cpp -index 8709c8b..3e42557 100644 ---- a/src/liboslexec/llvm_instance.cpp -+++ b/src/liboslexec/llvm_instance.cpp -@@ -1273,13 +1273,21 @@ RuntimeOptimizer::llvm_setup_optimization_passes () - // - m_llvm_func_passes = new llvm::FunctionPassManager(llvm_module()); - llvm::FunctionPassManager &fpm (*m_llvm_func_passes); -+#if OSL_LLVM_VERSION >= 32 -+ fpm.add (new llvm::DataLayout(llvm_module())); -+#else - fpm.add (new llvm::TargetData(llvm_module())); -+#endif - - // Specify module-wide (interprocedural optimization) passes - // - m_llvm_passes = new llvm::PassManager; - llvm::PassManager &passes (*m_llvm_passes); -+#if OSL_LLVM_VERSION >= 32 -+ passes.add (new llvm::DataLayout(llvm_module())); -+#else - passes.add (new llvm::TargetData(llvm_module())); -+#endif - - if (shadingsys().llvm_optimize() >= 1 && shadingsys().llvm_optimize() <= 3) { - // For LLVM 3.0 and higher, llvm_optimize 1-3 means to use the -diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp -index 135da2e..4e0eefe 100644 ---- a/src/liboslexec/llvm_util.cpp -+++ b/src/liboslexec/llvm_util.cpp -@@ -42,7 +42,11 @@ namespace pvt { - llvm::Type * - RuntimeOptimizer::llvm_type_union(const std::vector &types) - { -+#if OSL_LLVM_VERSION >= 32 -+ llvm::DataLayout target(llvm_module()); -+#else - llvm::TargetData target(llvm_module()); -+#endif - size_t max_size = 0; - size_t max_align = 1; - for (size_t i = 0; i < types.size(); ++i) { diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index feae299a7..2a6124ade 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: Massimiliano Torromeo pkgname=openssh-askpass -pkgver=2.0.0 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64') -url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' +url='http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=0' license=('GPL') depends=('openssh' 'qt4') makedepends=('cmake') provides=('x11-ssh-askpass') conflicts=('x11-ssh-askpass') -source=("http://www.phenix.bnl.gov/WWW/publish/hpereira/software/tgz/$pkgname-$pkgver.tar.gz" +source=("http://hugo.pereira.free.fr/software/tgz/$pkgname-$pkgver.tar.gz" "$pkgname.sh") build() { @@ -32,5 +32,5 @@ package() { install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" } -md5sums=('99b31e5bc2c12f91cc88869661ad92be' +md5sums=('c196971941ff3773d9f977b52015b214' 'baec3f0499b851aca6705968fa9e0df7') diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD index c61e4d72c..59c65dd42 100644 --- a/community/opusfile/PKGBUILD +++ b/community/opusfile/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102291 2013-12-07 11:02:30Z bpiotrowski $ +# $Id: PKGBUILD 105124 2014-02-01 00:48:22Z eric $ # Maintainer: Bartłomiej Piotrowski # Contributor: DrZaius pkgname=opusfile -pkgver=0.4 +pkgver=0.5 pkgrel=1 pkgdesc='Library for opening, seeking, and decoding .opus files' arch=('i686' 'x86_64') url='http://www.opus-codec.org/' -license=('custom') +license=('BSD') depends=('libogg' 'openssl' 'opus') source=(http://downloads.xiph.org/releases/opus/${pkgname}-${pkgver}.tar.gz) -md5sums=('80f3d4106106905255ff84def1b5d9ae') +md5sums=('6c96ae240ada27fafff423f96a8814cb') build() { cd $pkgname-$pkgver diff --git a/community/pymol/PKGBUILD b/community/pymol/PKGBUILD index aa1d7a270..d09c49cbc 100644 --- a/community/pymol/PKGBUILD +++ b/community/pymol/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 103273 2014-01-02 00:34:19Z arcanis $ +# $Id: PKGBUILD 105152 2014-02-01 20:46:24Z arcanis $ # Maintainer: Evgeniy Alekseev # Contributor: graysky # Contributor: Tomasz Żok pkgname=pymol -pkgver=1.6.0.0 -pkgrel=3 -pkgdesc="A USER-SPONSORED molecular visualization system on an OPEN-SOURCE foundation" +pkgver=1.7.0.0 +pkgrel=1 +pkgdesc="Molecular visualization system on an Open Source foundation" arch=('i686' 'x86_64') url="http://pymol.org/" license=('custom') -depends=('glut' 'glew' 'mesa' 'python-pmw' 'tcl' 'tcsh' 'tk') -source=("http://downloads.sourceforge.net/project/pymol/pymol/1.6/pymol-v${pkgver}.tar.bz2") -md5sums=('6f5db5beea7497f5a414c8e0cf1ae53d') +depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh') +makedepends=('desktop-file-utils' 'gendesk') +source=("http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2") +install="${pkgname}.install" +md5sums=('36fc735f6104e59802f109d0d25b6676') prepare() { + # create desktop file + gendesk --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="PyMOL" --categories="Science;Chemistry" + # suppress non-zero exit code that breaks makepkg sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py" # change python to python2 @@ -31,10 +36,12 @@ build() { package() { cd "${srcdir}/${pkgname}" - python2 setup.py install --prefix="usr/" --root="${pkgdir}" - sed -i "s|${pkgdir}||g" pymol - install -D -m755 "pymol" "${pkgdir}/usr/bin/pymol" - install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + python2 setup.py install --prefix=/usr --root="${pkgdir}" + sed -i "s|"${pkgdir}"||g" pymol + install -Dm755 "pymol" "${pkgdir}/usr/bin/pymol" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "${srcdir}/pymol.desktop" "${pkgdir}/usr/share/applications/pymol.desktop" + install -Dm644 "${srcdir}/pymol.png" "${pkgdir}/usr/share/pixmaps/pymol.png" } # vim:set ts=2 sw=2 et: diff --git a/community/pymol/pymol.install b/community/pymol/pymol.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/community/pymol/pymol.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/python-pmw/LICENSE.txt b/community/python-pmw/LICENSE.txt deleted file mode 100644 index de9a58260..000000000 --- a/community/python-pmw/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) 2007,2008 David M. Cooke -Copyright (c) 2009,2010 Francesc Alted -Copyright (c) 2011- See AUTHORS.txt - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/community/python-pmw/PKGBUILD b/community/python-pmw/PKGBUILD deleted file mode 100644 index 1e19d7f2b..000000000 --- a/community/python-pmw/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 103272 2014-01-02 00:34:07Z arcanis $ -# Maintainer: Evgeniy Alekseev -# Contributor: kfgz -# Contributor: Michael Krauss -# Contributor: dsa - -pkgname=python-pmw -pkgver=1.3.3b -pkgrel=3 -pkgdesc="A toolkit for high-level compound widgets in Python using the Tkinter module" -arch=('i686' 'x86_64') -url="http://pmw.sourceforge.net/doc/index.html" -license=('MIT') -depends=('python2' 'tk') -source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/pmw/files/Pmw/Pmw.1.3.3/Pmw_1_3_3b.tar.gz/download - "LICENSE.txt") -md5sums=('d8b998b921584db32a5eeeddc6bc606c' - '28b047a148c1780eddcf4bed6b150123') - -prepare() { - # change python to python2 - sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/tests/ManualTests.py" - sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/demos/All.py" - sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/tests/All.py" - sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/bin/bundlepmw.py" -} - -package() { - cd "Pmw" - python2 setup.py build - python2 setup.py install --prefix=/usr --root="${pkgdir}" - install -D -m644 "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/python2-pmw/LICENSE.txt b/community/python2-pmw/LICENSE.txt new file mode 100644 index 000000000..de9a58260 --- /dev/null +++ b/community/python2-pmw/LICENSE.txt @@ -0,0 +1,21 @@ +Copyright (c) 2007,2008 David M. Cooke +Copyright (c) 2009,2010 Francesc Alted +Copyright (c) 2011- See AUTHORS.txt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/community/python2-pmw/PKGBUILD b/community/python2-pmw/PKGBUILD new file mode 100644 index 000000000..739d1cfd3 --- /dev/null +++ b/community/python2-pmw/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 105149 2014-02-01 19:59:28Z arcanis $ +# Maintainer: Evgeniy Alekseev +# Contributor: kfgz +# Contributor: Michael Krauss +# Contributor: dsa + +pkgname=python2-pmw +pkgver=1.3.3b +pkgrel=1 +pkgdesc="A toolkit for high-level compound widgets in Python using the Tkinter module" +arch=('i686' 'x86_64') +url="http://pmw.sourceforge.net/doc/index.html" +license=('MIT') +depends=('python2' 'tk') +source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/pmw/files/Pmw/Pmw.1.3.3/Pmw_1_3_3b.tar.gz/download + "LICENSE.txt") +md5sums=('d8b998b921584db32a5eeeddc6bc606c' + '28b047a148c1780eddcf4bed6b150123') + +prepare() { + # change python to python2 + sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/tests/ManualTests.py" + sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/demos/All.py" + sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/tests/All.py" + sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/bin/bundlepmw.py" +} + +build() { + cd "Pmw" + python2 setup.py build +} + +package() { + cd "Pmw" + python2 setup.py install --prefix=/usr --root="${pkgdir}" + install -D -m644 "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 1a6718f5c..573840fd4 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102937 2013-12-24 15:23:39Z arcanis $ +# $Id: PKGBUILD 105155 2014-02-01 21:30:09Z arcanis $ # Maintainer: Evgeniy Alekseev # Contributor: Daniel Wallace # Contributor: Antonio Rojas @@ -8,8 +8,8 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=6.0 -pkgrel=2 +pkgver=6.1 +pkgrel=1 pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab" arch=('i686' 'x86_64') url="http://www.sagemath.org" @@ -26,7 +26,7 @@ source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgv "fix-pil.patch" "sage.service") install="${pkgname}.install" -md5sums=('da1bacf90fc291e736aaa71431e8874e' +md5sums=('75130374fcdb9395955db81f1ed28422' 'de54cb818d74c070a524fc3fd5208b2c' '985da1c1d1dcdc3ea9aa73035cb7996b') @@ -51,21 +51,6 @@ X-KDE-Username=" mkdir "${srcdir}/build" # according to FS#34769 - # NOTE: there is an error in pil build (freetype/fterrors.h not found) - cd "${srcdir}/sage-${pkgver}/upstream/" - tar xjfv pil-1.1.6.tar.bz2 - rm -r pil-1.1.6.tar.bz2 - patch -p0 -i "${srcdir}/fix-pil.patch" - tar cjvf pil-1.1.6.tar.bz2 pil-1.1.6 - rm -rf pil-1.1.6 - # fix checksums - SUMS=$(md5sum pil-1.1.6.tar.bz2 | awk '{print $1}') - sed "s/md5=[0-9a-f]\{32\}/md5=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" - SUMS=$(sha1sum pil-1.1.6.tar.bz2 | awk '{print $1}') - sed "s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" - SUMS=$(cksum pil-1.1.6.tar.bz2 | awk '{print $1}') - sed "s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" - # disable freetype build rm -rf freetype-* sed -i -e 's/FREETYPE/#FREETYPE/' "${srcdir}/sage-${pkgver}/build/install" } @@ -100,7 +85,6 @@ build() { # only build sage, no documents #make build make - ./sage --bdist "${pkgver}" } << COMMENT @@ -115,24 +99,19 @@ check() { COMMENT package() { - cd "sage-${pkgver}" + cd "${srcdir}/sage-${pkgver}/" + # remove build logs + rm -f *.log + rm -rf spkg/{base,build,logs,standarts} # cp because make install is experimental and will corrupt the install install -d "${pkgdir}/opt/sage" - cp -dpr --no-preserve=ownership dist/sage-"${pkgver}-$CARCH-Linux/"* "${pkgdir}/opt/sage/" + cp -r * "${pkgdir}/opt/sage/" # move SageTeX files to more appropriate directory install -d "${pkgdir}/usr/share" mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share" - # remove build logs - rm -f "${pkgdir}/opt/sage/*.log" - rm -rf "${pkgdir}/opt/sage/spkg/logs" - - # remove source packages, since they are rarely needed, they are 300mb in size (compressed) - rm -f "${pkgdir}/opt/sage/spkg/base/*spkg" - rm -f "${pkgdir}/opt/sage/spkg/standard/*spkg" - # according to FS#37090 # install scripts install -d "${pkgdir}/usr/bin" diff --git a/core/curl/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch b/core/curl/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch deleted file mode 100644 index 97858e3f5..000000000 --- a/core/curl/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2715d7f948c8eb7cd3cba38f3dff6d4148e7cfaf Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Sun, 22 Dec 2013 23:36:11 +0100 -Subject: [PATCH] FILE: don't wait due to CURLOPT_MAX_RECV_SPEED_LARGE - -The FILE:// code doesn't support this option - and it doesn't make sense -to support it as long as it works as it does since then it'd only block -even longer. - -But: setting CURLOPT_MAX_RECV_SPEED_LARGE would make the transfer first -get done and then libcurl would wait until the average speed would get -low enough. This happened because the transfer happens completely in the -DO state for FILE:// but then it would still unconditionally continue in -to the PERFORM state where the speed check is made. - -Starting now, the code will skip from DO_DONE to DONE immediately if no -socket is set to be recv()ed or send()ed to. - -Bug: http://curl.haxx.se/bug/view.cgi?id=1312 -Reported-by: Mohammad AlSaleh ---- - lib/multi.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/lib/multi.c b/lib/multi.c -index ec45ecb..191c9b8 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -1381,7 +1381,14 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, - Curl_move_handle_from_send_to_recv_pipe(data, data->easy_conn); - /* Check if we can move pending requests to send pipe */ - Curl_multi_process_pending_handles(multi); -- multistate(data, CURLM_STATE_WAITPERFORM); -+ -+ /* Only perform the transfer if there's a good socket to work with. -+ Having both BAD is a signal to skip immediately to DONE */ -+ if((data->easy_conn->sockfd != CURL_SOCKET_BAD) || -+ (data->easy_conn->writesockfd != CURL_SOCKET_BAD)) -+ multistate(data, CURLM_STATE_WAITPERFORM); -+ else -+ multistate(data, CURLM_STATE_DONE); - result = CURLM_CALL_MULTI_PERFORM; - break; - --- -1.8.5.2 - diff --git a/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch b/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch deleted file mode 100644 index f3428c7d5..000000000 --- a/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= -Date: Sat, 28 Dec 2013 13:42:57 +0100 -Subject: [PATCH] connect: Try all addresses in first connection attempt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes a bug when all addresses in the first family fail immediately, due -to "Network unreachable" for example, curl would hang and never try the -next address family. - -Iterate through all address families when to trying establish the first -connection attempt. - -Bug: http://curl.haxx.se/bug/view.cgi?id=1315 -Reported-by: Michal Górny and Anthony G. Basile ---- - lib/connect.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/connect.c b/lib/connect.c -index 4b6ee00..588ac28 100644 ---- a/lib/connect.c -+++ b/lib/connect.c -@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ - conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2; - - /* start connecting to first IP */ -- res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0])); -- while(res != CURLE_OK && -- conn->tempaddr[0] && -- conn->tempaddr[0]->ai_next && -- conn->tempsock[0] == CURL_SOCKET_BAD) -- res = trynextip(conn, FIRSTSOCKET, 0); -+ while(conn->tempaddr[0]) { -+ res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0])); -+ if(res == CURLE_OK) -+ break; -+ conn->tempaddr[0] = conn->tempaddr[0]->ai_next; -+ } - - if(conn->tempsock[0] == CURL_SOCKET_BAD) - return res; --- -1.8.5.2 - diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 929275905..78801016e 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 204043 2014-01-14 15:06:13Z dreisner $ +# $Id: PKGBUILD 204940 2014-02-01 03:04:49Z dreisner $ # Maintainer: Dave Reisner # Contributor: Angel Velasquez # Contributor: Eric Belanger @@ -6,8 +6,8 @@ # Contributor: Daniel J Griffiths pkgname=curl -pkgver=7.34.0 -pkgrel=3 +pkgver=7.35.0 +pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -16,22 +16,11 @@ depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib') provides=('libcurl.so') options=('strip' 'debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - 0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch - 0001-connect-Try-all-addresses-in-first-connection-attemp.patch curlbuild.h) -md5sums=('d5b7edccbd1793e3549842e01331da20' +md5sums=('f5ae45ed6e86debb721b68392b5ce13c' 'SKIP' - 'ba766acdb7568aac0b23d479ebecd591' - 'ee755b0e886207fc1e8154e426c46ca7' '751bd433ede935c8fae727377625a8ae') -prepare() { - cd "$pkgname-$pkgver" - - patch -Np1 <"$srcdir"/0001-connect-Try-all-addresses-in-first-connection-attemp.patch - patch -Np1 <"$srcdir"/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch -} - build() { cd "$pkgname-$pkgver" diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index c20e5e71c..561e3e1c4 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197436 2013-10-26 01:07:56Z allan $ +# $Id: PKGBUILD 204953 2014-02-01 17:23:07Z ronald $ # Maintainer: Ronald van Haren # Contributor: judd pkgname=e2fsprogs -pkgver=1.42.8 -pkgrel=2 +pkgver=1.42.9 +pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') @@ -17,7 +17,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk backup=('etc/mke2fs.conf') options=('staticlibs') install=${pkgname}.install -sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897' +sha1sums=('fb8e3662302bcab1682d567d6ee0ff051faa1bbd' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { @@ -44,7 +44,7 @@ package() { sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et" # remove static libraries with a shared counterpart - rm ${pkgdir}/usr/lib/lib{com_err,e2p,ext2fs,ss}.a + rm "${pkgdir}"/usr/lib/lib{com_err,e2p,ext2fs,ss}.a # install MIT license install -Dm644 "${srcdir}/MIT-LICENSE" \ diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD index a1e1e6628..f8095da0f 100644 --- a/extra/bluefish/PKGBUILD +++ b/extra/bluefish/PKGBUILD @@ -1,33 +1,36 @@ -# $Id: PKGBUILD 197875 2013-10-30 11:24:20Z allan $ +# $Id: PKGBUILD 204944 2014-02-01 05:29:28Z eric $ # Maintainer: Eric Bélanger pkgname=bluefish -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=1 pkgdesc="A powerful HTML editor for experienced web designers and programmers" arch=('i686' 'x86_64') url="http://bluefish.openoffice.nl/" license=('GPL3') -depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils') makedepends=('gucharmap' 'intltool') optdepends=('gucharmap: for using the charmap plugin') install=bluefish.install source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig}) -sha1sums=('b65310617b5fd525a8c57f7681e023f6f4496378' - '6ff0474602c520e2a638436c5423957cfe4be4d0') +sha1sums=('efdd577a20a439e58f14f68e725f00be230d5de1' + 'SKIP') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ src/plugin_zencoding/zencoding/{,filters/,actions/}*.py \ data/{cssmin.py,jsbeautify,jsmin.py,lorem-ipsum-generator} - +} + +build() { + cd ${pkgname}-${pkgver} PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-spell-check --disable-update-databases --disable-xml-catalog-update make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD index 713e930fa..0fb991713 100644 --- a/extra/freetds/PKGBUILD +++ b/extra/freetds/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 197962 2013-10-30 11:56:55Z allan $ +# $Id: PKGBUILD 204952 2014-02-01 16:16:26Z eric $ # Maintainer: -# Contributor: Aaron Malone pkgname=freetds pkgver=0.91 -pkgrel=3 +pkgrel=4 pkgdesc='Library for accessing Sybase and MS SQL Server databases' url='http://www.freetds.org' arch=('i686' 'x86_64') license=('LGPL') -depends=('unixodbc') +depends=('openssl' 'unixodbc') backup=('etc/freetds/freetds.conf' 'etc/freetds/locales.conf' 'etc/freetds/pool.conf') @@ -17,12 +16,13 @@ source=("ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${pkgver}.tar.bz2") md5sums=('e88e96800c89d62307812315b235eb18') build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0 - make + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc/freetds --enable-msdblib \ + --with-tdsver=7.0 --with-unixodbc=/usr --with-openssl + make } package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD index 120c6a2fd..5eac42783 100644 --- a/extra/i8kutils/PKGBUILD +++ b/extra/i8kutils/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 185227 2013-05-12 10:04:52Z eric $ -# Maintainer: Thayer Williams -# Contributor: Eric Johnson +# $Id: PKGBUILD 204963 2014-02-01 21:25:15Z eric $ +# Maintainer: pkgname=i8kutils -pkgver=1.33 +pkgver=1.40 pkgrel=3 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities" arch=('i686' 'x86_64') -url="http://people.debian.org/~dz/i8k/" -license=('GPL2') -depends=('glibc') +url="https://launchpad.net/i8kutils" +license=('GPL') +depends=('bash') optdepends=('tk: for i8kmon deamon') -conflicts=('i8kmon') -provides=('i8kmon') -replaces=('i8kmon') backup=('etc/i8kutils/i8kmon.conf') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz - i8kmon.service) -md5sums=('1ab077b301dbb0f4be8ef52eb3b97628' - '32c159616f72ab65969db95b9e824ced') +source=(http://ftp.de.debian.org/debian/pool/main/i/${pkgname}/${pkgname}_${pkgver}.tar.gz + i8kmon.service i8kutils-probe.diff) +sha1sums=('584edfbd90aa167885520b84848381585d9212fb' + '5c20f5241de7e60b46117269f4e867b08734cdc8' + 'ab9058f92adb3e8b9306568005d5751908fb1765') prepare() { cd $pkgname-$pkgver + patch -p0 -i "$srcdir"/i8kutils-probe.diff # conform to Arch Linux guidelines sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1 diff --git a/extra/i8kutils/i8kutils-probe.diff b/extra/i8kutils/i8kutils-probe.diff new file mode 100644 index 000000000..60485d737 --- /dev/null +++ b/extra/i8kutils/i8kutils-probe.diff @@ -0,0 +1,84 @@ +=== modified file 'i8kmon' +--- i8kmon 2013-11-23 19:41:17 +0000 ++++ i8kmon 2013-11-23 20:30:47 +0000 +@@ -27,6 +27,7 @@ + sysconfig /etc/i8kmon.conf + userconfig ~/.i8kmon + i8kfan /usr/bin/i8kfan ++ acpi "acpi" + geometry {} + use_conf 1 + auto 1 +@@ -202,22 +202,15 @@ + + set status(acpi_timer) [expr 60 / $config(timeout)] + +- set cmd "acpi -a"; set acpi_ac [eval exec $cmd] +- set cmd2 "acpitool -a"; set acpi_ac2 [eval exec $cmd2] +- set ret [string first "on-line" $acpi_ac] +- set ret2 [string first "online" $acpi_ac2] +- if {$ret >= 0 | $ret2 >= 0} { ++ set acpi_ac [exec {*}$config(acpi)] ++ if {[string match *on-line* $acpi_ac] || [string match *online* $acpi_ac]} { + set status(ac) 1 + } else { + set status(ac) 0 + } + + if {$config(verbose) > 0} { +- if {$ret >= 0} { +- puts "[clock seconds] acpi: $acpi_ac" +- } elseif {$ret2 >= 0} { +- puts "[clock seconds] acpi: $acpi_ac2" +- } ++ puts "[clock seconds] acpi: $acpi_ac" + } + + return 0 +@@ -495,8 +487,8 @@ + -a|--auto control automatically the fans + -na|--noauto don\x27t control automatically the fans + -d|--daemon run in daemon mode without user interface +- -nd|--nodaemon don\x27 run as daemon, open the user interface +- -nc|--nouserconfig don't use \$HOME/.i8kmon ++ -nd|--nodaemon don\x27t run as daemon, open the user interface ++ -nc|--nouserconfig don\x27t use \$HOME/.i8kmon + -v|--verbose report status on stdout + -g|--geometry set applet geometry + -t|--timeout set poll timeout +@@ -556,7 +548,7 @@ + } + + if {$config(verbose) > 0} { +- set copyright "Copyright (C) 2013 i8kutils " ++ set copyright "Copyright (C) 2013 Vitor Augusto " + puts "i8kmon $PROG_VERSION - $copyright" + parray config + parray status +@@ -596,8 +588,25 @@ + set status(rightspeed) "0 $rspeed1 $rspeed2 $rspeed3" + } + ++# probe external tools ++proc probe_tools {} { ++ ++ # The possibility of choosing 'acpi' or 'acpitool' is for compatibility ++ # between different architectures: amd64, i386, kFreeBSD ++ # This code below is strictly related on package dependency stated at ++ # keyword 'Depends:' on file 'debian/control' ++ if {![catch {exec acpi}]} { ++ set config(acpi) "acpi" ++ } elseif {[catch {exec acpitool}]} { ++ set config(acpi) "acpitool" ++ } else { ++ puts stderr "Package dependency problem: neither 'acpi' nor 'acpitool' package is installed" ++ } ++} ++ + proc main {} { + probe_fan_speed ++ probe_tools + read_config + parse_options + make_ui + diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 0b7fbb569..52e2f9f9e 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 203182 2014-01-05 00:11:38Z eric $ +# $Id: PKGBUILD 204942 2014-02-01 04:52:42Z eric $ # Maintainer: Eric Bélanger pkgname=mpg123 -pkgver=1.17.0 +pkgver=1.18.0 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('sdl: for sdl audio support' 'jack: for jack audio support' 'libpulse: for pulse audio support') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('8185f06ab94651adb2fc7a1ab860f0fd154b6f80' +sha1sums=('d6e59eeb972a7d11dfcc7505cf1f3e0ae875f439' 'SKIP') build() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 44e41a8f2..efc847fdb 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204358 2014-01-17 21:31:02Z andyrtr $ +# $Id: PKGBUILD 204961 2014-02-01 20:25:59Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.99.907 -pkgrel=2 +pkgver=2.99.909 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -24,7 +24,7 @@ conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERS 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d0b02255f0ff4baa863f762bef49707ce0b4094a267a26e32e4270abe141117b') +sha256sums=('7541187161ee379f07591e1d2655f51e2d9772d98b34e8f21d7159d28ce70f55') build() { cd ${pkgname}-${pkgver} diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD deleted file mode 100644 index aba64f230..000000000 --- a/libre/soundkonverter-libre/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 103245 2013-12-31 11:33:47Z stativ $ -# Maintainer: Lukas Jirkovsky -# Contributor: Mateusz Herych -# Contributor: Eric Belanger -# Contributor: Darwin Bautista -# Maintainer (Parabola): André Silva - -_pkgname=soundkonverter -pkgname=soundkonverter-libre -pkgver=2.0.5 -pkgrel=1 -pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" -arch=('i686' 'x86_64') -url="http://www.kde-apps.org/content/show.php?content=29024" -license=('GPL') -depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib') -makedepends=('automoc4' 'cmake') -optdepends=('cdrkit: cdda2wav backend' - 'faad2: faad backend' - 'ffmpeg: ffmpeg backend' - 'flac: flac backend' - 'fluidsynth: flouidsynth backend' - 'lame: lame backend' - 'mplayer: mplayer backend' - 'mp3gain: mp3gain backend' - 'opus-tools: opus backend' - 'speex: speexenc, speexdec backends' - 'timidity++: midi backend' - 'twolame: twolame backend' - 'vorbisgain: vorbisgain backend' - 'vorbis-tools: vorbis tools backend' - 'wavpack: wavpack backend' - 'sox: sox plugin (change sample rate, various effects)') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -install=$_pkgname.install -source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('42f7dd8fe5f4d8d18d41c2b1302322ee') - -build() { - cd "$srcdir"/$_pkgname-$pkgver - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir"/$_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} -- cgit v1.2.3