From 32793d9a5b60ef0591c71c12ad75121d9b155adf Mon Sep 17 00:00:00 2001 From: root Date: Mon, 25 Mar 2013 00:05:30 -0700 Subject: Mon Mar 25 00:05:30 PDT 2013 --- community/aria2/PKGBUILD | 8 +- community/clearsilver/PKGBUILD | 8 +- community/fcitx-libpinyin/PKGBUILD | 8 +- community/haddock/PKGBUILD | 6 +- community/mongodb/PKGBUILD | 29 ++- community/mongodb/boost1.50.patch | 237 --------------------- community/mongodb/mongodb.rc | 39 ---- community/mongodb/removeWerror.patch | 11 + community/newsbeuter/PKGBUILD | 17 +- community/newsbeuter/gcc47.patch | 90 ++++++++ community/newsbeuter/libjson.patch | 29 +++ community/newsbeuter/newsbeuter.changelog | 3 + community/notmuch/PKGBUILD | 29 +-- community/passenger/PKGBUILD | 16 +- community/powertop/PKGBUILD | 18 +- community/powertop/powertop.changelog | 3 + community/ruby-cairo/PKGBUILD | 4 +- community/ruby-gtk2/PKGBUILD | 14 +- ...ix-for-syntax-error-https-github.com-ruby.patch | 40 ---- community/ruby-gtk3/PKGBUILD | 12 +- community/ruby-ncurses/PKGBUILD | 16 +- community/simavr/PKGBUILD | 4 +- community/spring/PKGBUILD | 8 +- community/subtle/PKGBUILD | 27 +-- community/supercollider/PKGBUILD | 4 +- community/task/PKGBUILD | 4 +- community/xmms2/PKGBUILD | 9 +- community/xnoise/PKGBUILD | 6 +- extra/gegl/PKGBUILD | 4 +- extra/graphviz/PKGBUILD | 11 +- extra/gummiboot/PKGBUILD | 6 +- extra/kdebindings-korundum/PKGBUILD | 11 +- extra/kdebindings-qtruby/PKGBUILD | 7 +- extra/libebml/PKGBUILD | 8 +- extra/libmatroska/PKGBUILD | 8 +- extra/libreoffice/PKGBUILD | 33 ++- extra/libreoffice/librelogo.diff | 43 ++++ extra/libssh/PKGBUILD | 8 +- extra/ncmpc/PKGBUILD | 41 ++-- extra/nx/PKGBUILD | 7 +- extra/qtwebkit/PKGBUILD | 33 ++- extra/qtwebkit/qwebview.patch | 21 ++ extra/rrdtool/PKGBUILD | 6 +- extra/ruby/PKGBUILD | 4 +- extra/vim/PKGBUILD | 8 +- extra/weechat/PKGBUILD | 14 +- extra/weechat/ruby-2.0.0-crash-fix.diff | 76 +++++++ extra/x2goclient/PKGBUILD | 8 +- extra/x2goserver/PKGBUILD | 10 +- libre/ecasound-libre/PKGBUILD | 2 +- 50 files changed, 538 insertions(+), 530 deletions(-) delete mode 100644 community/mongodb/boost1.50.patch delete mode 100644 community/mongodb/mongodb.rc create mode 100644 community/mongodb/removeWerror.patch create mode 100644 community/newsbeuter/gcc47.patch create mode 100644 community/newsbeuter/libjson.patch delete mode 100644 community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch create mode 100644 extra/libreoffice/librelogo.diff create mode 100644 extra/qtwebkit/qwebview.patch create mode 100644 extra/weechat/ruby-2.0.0-crash-fix.diff diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index cca3dbd97..492116da8 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86453 2013-03-17 13:59:10Z bpiotrowski $ +# $Id: PKGBUILD 86908 2013-03-24 10:25:05Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths pkgname=aria2 -pkgver=1.16.4 +pkgver=1.16.5 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') -source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2) -sha256sums=('7fb5360570ee626b428f9450244435734fbc9e979994e3e61eb672e8ed970319') +source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz) +sha256sums=('00c5d9ef6ce584561e9ffc8626e03d1156073bf2ddcc10dc55750fb49626d1fe') build() { cd $pkgname-$pkgver diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD index 45d19d83a..963483b52 100644 --- a/community/clearsilver/PKGBUILD +++ b/community/clearsilver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64605 2012-02-17 02:32:25Z spupykin $ +# $Id: PKGBUILD 86874 2013-03-23 23:10:33Z td123 $ # Maintainer: Sergej Pupykin # Maintainer : Aaron Griffin # Contributor: William Rea pkgname=clearsilver pkgver=0.10.5 -pkgrel=8 +pkgrel=9 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system" arch=('i686' 'x86_64') url='http://www.clearsilver.net' @@ -38,6 +38,10 @@ build() EOF make +} + +package() { + cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir DESTDIR=$pkgdir install install -Dm644 CS_LICENSE $pkgdir/usr/share/licenses/clearsilver/license.txt diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD index be64771e9..f536b3669 100644 --- a/community/fcitx-libpinyin/PKGBUILD +++ b/community/fcitx-libpinyin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86671 2013-03-21 01:29:43Z fyan $ +# $Id: PKGBUILD 86914 2013-03-24 12:50:46Z fyan $ # Maintainer: Felix Yan # Contributor: poplarch pkgname=fcitx-libpinyin -pkgver=0.2.90 +pkgver=0.2.91 pkgrel=1 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="https://github.com/fcitx/fcitx-libpinyin" license=('GPL') depends=('fcitx' 'libpinyin') makedepends=('cmake' 'intltool' 'wget') -source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +source=("https://github.com/fcitx/$pkgname/archive/$pkgver.tar.gz") install=$pkgname.install build() { @@ -31,4 +31,4 @@ package() { cd "$srcdir/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install } -md5sums=('b19526c18102d8c240f2933d21bbbc81') +md5sums=('060707cb5a296b2cc10542a01fe40de9') diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index 983504248..ceba4311f 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 83992 2013-02-08 04:15:24Z td123 $ +# $Id: PKGBUILD 86893 2013-03-23 23:32:12Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team pkgname=haddock pkgver=2.13.1 -pkgrel=2 +pkgrel=3 pkgdesc='Tool for generating documentation for Haskell libraries' url='http://hackage.haskell.org/package/haddock/' license=('custom:BSD3') arch=('x86_64' 'i686') makedepends=('alex' 'happy') -depends=('ghc=7.6.2-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths=0.1.0.8') +depends=('ghc=7.6.2-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths') install=$pkgname.install source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f') diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 4ea5062fa..85f4842c1 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83665 2013-02-04 10:18:57Z fyan $ +# $Id: PKGBUILD 86909 2013-03-24 11:55:43Z fyan $ # Maintainer: Felix Yan # Contributor: Sven-Hendrik Haase # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,7 +6,7 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.2.3 +pkgver=2.4.1 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') @@ -19,8 +19,8 @@ optdepends=('libpcap: needed for mongosniff') backup=('etc/mongodb.conf') install=mongodb.install source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" - 'mongodb.rc' 'mongodb.conf' 'mongodb.service' - 'SConscript.client.patch' 'boost1.50.patch') + 'mongodb.conf' 'mongodb.service' 'SConscript.client.patch' + 'removeWerror.patch') build() { # fucking mongo aint no fun to package @@ -31,8 +31,8 @@ build() { # fix https://jira.mongodb.org/browse/SERVER-5575 patch -Np1 -i ${srcdir}/SConscript.client.patch - # fix boost incompatibility - patch -Np1 -i ${srcdir}/boost1.50.patch + # failed to build with -Werror since 2.4.0 + patch -Np1 -i "$srcdir/removeWerror.patch" scons all --use-system-boost # --sharedclient currently fails } @@ -54,21 +54,18 @@ package() { scons install --use-system-boost --full --prefix=$pkgdir/usr # --sharedclient currently fails - install -Dm755 $srcdir/mongodb.rc $pkgdir/etc/rc.d/mongodb - install -Dm644 $srcdir/mongodb.conf $pkgdir/etc/mongodb.conf - [[ -f $pkgdir/usr/lib ]] && rm $pkgdir/usr/lib # wtf mongo - install -Dm644 $srcdir/mongodb.service $pkgdir/usr/lib/systemd/system/mongodb.service - install -dm700 $pkgdir/var/lib/mongodb - install -dm755 $pkgdir/var/log/mongodb + install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf" + [[ -f "$pkgdir/usr/lib" ]] && rm "$pkgdir/usr/lib" # wtf mongo + install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service" + install -dm700 "$pkgdir/var/lib/mongodb" + install -dm755 "$pkgdir/var/log/mongodb" # the earlier SConscript patch actually gives us some trouble on x86_64 so we need to hack it out again mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true rm -r ${pkgdir}/usr/lib64 || true - } -md5sums=('4308c72b1342236dc585e0df0201db48' - '9c67e00f4626ad761a8f7d4e037a54d7' +md5sums=('2123758b166144947860b2af490996c1' '4839fe1d638187ca3226e8267b947318' '96ab4517b48974ce0e566d9746a75a4f' 'a9529e2a6e392ffecef7a9178394c814' - 'da8a9d78e4a38d1ed8e92a210d4b5ba7') + 'c980ebfe46df6dc87f4b3380af69a6cc') diff --git a/community/mongodb/boost1.50.patch b/community/mongodb/boost1.50.patch deleted file mode 100644 index 203826ae7..000000000 --- a/community/mongodb/boost1.50.patch +++ /dev/null @@ -1,237 +0,0 @@ -diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp -index 6a80fe9..4a42e73 100644 ---- a/src/mongo/db/db.cpp -+++ b/src/mongo/db/db.cpp -@@ -18,6 +18,7 @@ - - #include "mongo/pch.h" - -+#include - #include - #include - #include -@@ -348,7 +349,7 @@ namespace mongo { - boost::filesystem::path path( dbpath ); - for ( boost::filesystem::directory_iterator i( path ); - i != boost::filesystem::directory_iterator(); ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( boost::filesystem::is_directory( *i ) && - fileName.length() && fileName[ 0 ] == '$' ) - boost::filesystem::remove_all( *i ); -@@ -748,11 +749,6 @@ static int mongoDbMain(int argc, char* argv[]) { - dbExecCommand = argv[0]; - - srand(curTimeMicros()); --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif - - { - unsigned x = 0x12345678; -@@ -1083,7 +1079,7 @@ static int mongoDbMain(int argc, char* argv[]) { - if (params.count("shutdown")){ - bool failed = false; - -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 ) - failed = true; - -diff --git a/src/mongo/db/dur.cpp b/src/mongo/db/dur.cpp -index b83957b..242fe00 100644 ---- a/src/mongo/db/dur.cpp -+++ b/src/mongo/db/dur.cpp -@@ -770,7 +770,7 @@ namespace mongo { - - bool samePartition = true; - try { -- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string(); -+ const string dbpathDir = boost::filesystem::path(dbpath).string(); - samePartition = onSamePartition(getJournalDir().string(), dbpathDir); - } - catch(...) { -diff --git a/src/mongo/db/dur_journal.cpp b/src/mongo/db/dur_journal.cpp -index 9957d41..9f693b9 100644 ---- a/src/mongo/db/dur_journal.cpp -+++ b/src/mongo/db/dur_journal.cpp -@@ -176,7 +176,7 @@ namespace mongo { - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( anyFiles || str::startsWith(fileName, "j._") ) - return true; - } -@@ -194,7 +194,7 @@ namespace mongo { - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - try { - removeOldJournalFile(*i); -diff --git a/src/mongo/db/dur_recover.cpp b/src/mongo/db/dur_recover.cpp -index a7efd4d..e352db6 100644 ---- a/src/mongo/db/dur_recover.cpp -+++ b/src/mongo/db/dur_recover.cpp -@@ -72,7 +72,7 @@ namespace mongo { - i != boost::filesystem::directory_iterator(); - ++i ) { - boost::filesystem::path filepath = *i; -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - unsigned u = str::toUnsigned( str::after(fileName, '_') ); - if( m.count(u) ) { -@@ -85,7 +85,7 @@ namespace mongo { - if( i != m.begin() && m.count(i->first - 1) == 0 ) { - uasserted(13532, - str::stream() << "unexpected file in journal directory " << dir.string() -- << " : " << boost::filesystem::path(i->second).leaf() << " : can't find its preceeding file"); -+ << " : " << boost::filesystem::path(i->second).leaf().string() << " : can't find its preceeding file"); - } - files.push_back(i->second); - } -diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp -index 218fb9e..42794f0 100644 ---- a/src/mongo/db/instance.cpp -+++ b/src/mongo/db/instance.cpp -@@ -833,13 +833,13 @@ namespace mongo { - i != boost::filesystem::directory_iterator(); ++i ) { - if ( directoryperdb ) { - boost::filesystem::path p = *i; -- string dbName = p.leaf(); -+ string dbName = p.leaf().string(); - p /= ( dbName + ".ns" ); - if ( exists( p ) ) - names.push_back( dbName ); - } - else { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" ) - names.push_back( fileName.substr( 0, fileName.length() - 3 ) ); - } -@@ -1102,7 +1102,7 @@ namespace mongo { - } - - void acquirePathLock(bool doingRepair) { -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - - bool oldFile = false; - -diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp -index 0c424f0..9fbbde7 100644 ---- a/src/mongo/db/pdfile.cpp -+++ b/src/mongo/db/pdfile.cpp -@@ -1675,7 +1675,7 @@ namespace mongo { - virtual bool apply( const Path &p ) { - if ( !boost::filesystem::exists( p ) ) - return false; -- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) ); -+ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) ); - return true; - } - virtual const char * op() const { -@@ -1783,7 +1783,7 @@ namespace mongo { - uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ? - "backup" : "_tmp" ); - MONGO_ASSERT_ON_EXCEPTION( boost::filesystem::create_directory( reservedPath ) ); -- string reservedPathString = reservedPath.native_directory_string(); -+ string reservedPathString = reservedPath.string(); - - bool res; - { -diff --git a/src/mongo/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp -index 813705a..d0a3ba4 100644 ---- a/src/mongo/dbtests/framework.cpp -+++ b/src/mongo/dbtests/framework.cpp -@@ -199,7 +199,7 @@ namespace mongo { - boost::filesystem::create_directory(p); - } - -- string dbpathString = p.native_directory_string(); -+ string dbpathString = p.string(); - dbpath = dbpathString.c_str(); - - cmdLine.prealloc = false; -diff --git a/src/mongo/pch.h b/src/mongo/pch.h -index 7044097..6bb9df6 100644 ---- a/src/mongo/pch.h -+++ b/src/mongo/pch.h -@@ -44,7 +44,7 @@ - #include "string.h" - #include "limits.h" - --#define BOOST_FILESYSTEM_VERSION 2 -+#define BOOST_FILESYSTEM_VERSION 3 - #include - #include - #include -diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp -index 60af4f3..fa0d6ad 100644 ---- a/src/mongo/shell/shell_utils_launcher.cpp -+++ b/src/mongo/shell/shell_utils_launcher.cpp -@@ -184,7 +184,7 @@ namespace mongo { - } - #endif - -- _argv.push_back( programPath.native_file_string() ); -+ _argv.push_back( programPath.string() ); - - _port = -1; - -diff --git a/src/mongo/tools/restore.cpp b/src/mongo/tools/restore.cpp -index d7779e6..5c68bde 100644 ---- a/src/mongo/tools/restore.cpp -+++ b/src/mongo/tools/restore.cpp -@@ -174,7 +174,7 @@ public: - log(2) << "drillDown: " << root.string() << endl; - - // skip hidden files and directories -- if (root.leaf()[0] == '.' && root.leaf() != ".") -+ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".") - return; - - if ( is_directory( root ) ) { -@@ -255,7 +255,7 @@ public: - - verify( ns.size() ); - -- string oldCollName = root.leaf(); // Name of the collection that was dumped from -+ string oldCollName = root.leaf().string(); // Name of the collection that was dumped from - oldCollName = oldCollName.substr( 0 , oldCollName.find_last_of( "." ) ); - if (use_coll) { - ns += "." + _coll; -@@ -287,7 +287,7 @@ public: - if (!boost::filesystem::exists(metadataFile.string())) { - // This is fine because dumps from before 2.1 won't have a metadata file, just print a warning. - // System collections shouldn't have metadata so don't warn if that file is missing. -- if (!startsWith(metadataFile.leaf(), "system.")) { -+ if (!startsWith(metadataFile.leaf().string(), "system.")) { - log() << metadataFile.string() << " not found. Skipping." << endl; - } - } else { -diff --git a/src/mongo/tools/tool.cpp b/src/mongo/tools/tool.cpp -index c092cdb..76834fa 100644 ---- a/src/mongo/tools/tool.cpp -+++ b/src/mongo/tools/tool.cpp -@@ -118,12 +118,6 @@ namespace mongo { - // we want durability to be disabled. - cmdLine.dur = false; - --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif -- - _name = argv[0]; - - /* using the same style as db.cpp */ diff --git a/community/mongodb/mongodb.rc b/community/mongodb/mongodb.rc deleted file mode 100644 index 30f2bbf79..000000000 --- a/community/mongodb/mongodb.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# vim: syntax=sh - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof /usr/bin/mongod) -case "$1" in - start) - stat_busy "Starting mongodb" - [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mongodb - stat_done - fi - ;; - stop) - stat_busy "Stopping mongodb" - [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mongodb - while [ ! -z "$(pidof /usr/bin/mongod)" ]; do - sleep 1; - done - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/mongodb/removeWerror.patch b/community/mongodb/removeWerror.patch new file mode 100644 index 000000000..c5220cc1e --- /dev/null +++ b/community/mongodb/removeWerror.patch @@ -0,0 +1,11 @@ +--- a/SConstruct 2013-03-16 02:59:55.000000000 +0800 ++++ b/SConstruct 2013-03-20 10:55:20.009645869 +0800 +@@ -692,7 +692,7 @@ + "-Winvalid-pch"] ) + # env.Append( " -Wconversion" ) TODO: this doesn't really work yet + if linux: +- env.Append( CCFLAGS=["-Werror", "-pipe"] ) ++ env.Append( CCFLAGS=["-pipe"] ) + if not has_option('clang'): + env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's + diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD index 3a06787e7..3e14c70fe 100644 --- a/community/newsbeuter/PKGBUILD +++ b/community/newsbeuter/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 66351 2012-02-23 20:58:14Z jlichtblau $ +# $Id: PKGBUILD 86876 2013-03-23 23:10:35Z td123 $ # Maintainer: Jaroslav Lichtblau # Contributor: Sven Pfleiderer pkgname=newsbeuter pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="A RSS feed reader for the text console with special Podcast support" arch=('i686' 'x86_64') url="http://www.newsbeuter.org/" license=('custom: MIT') -depends=('curl' 'json-c' 'libxml2' 'sqlite3' 'stfl') +depends=('curl' 'json-c' 'libxml2' 'sqlite' 'stfl') makedepends=('swig' 'gettext') optdepends=('ruby') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz) -sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825') +source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz + 'gcc47.patch' + 'libjson.patch') +sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825' + '24f30f83649deb8e2e268ebd2394243eb25824701f0c576a6c20f3f64e70dd52' + '6fa9f8a814474e3262595745309c0263c7f3d40feb4ea8da29d2808ab710e781') build() { cd ${srcdir}/$pkgname-$pkgver + patch -p1 -i "${srcdir}"/gcc47.patch + patch -p1 -i "${srcdir}"/libjson.patch + make prefix=/usr } diff --git a/community/newsbeuter/gcc47.patch b/community/newsbeuter/gcc47.patch new file mode 100644 index 000000000..9cb2e1182 --- /dev/null +++ b/community/newsbeuter/gcc47.patch @@ -0,0 +1,90 @@ +diff -u -r -U5 newsbeuter-2.5/src/controller.cpp newsbeuter-2.5.includes/src/controller.cpp +--- newsbeuter-2.5/src/controller.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/controller.cpp 2012-02-18 15:57:32.525947811 -0500 +@@ -36,10 +36,11 @@ + + #include + #include + #include + #include ++#include + + #include + + #include + #include +diff -u -r -U5 newsbeuter-2.5/src/google_api.cpp newsbeuter-2.5.includes/src/google_api.cpp +--- newsbeuter-2.5/src/google_api.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/google_api.cpp 2012-02-18 15:28:32.287929217 -0500 +@@ -7,10 +7,12 @@ + #include + #include + + #include + ++#include ++ + #define GREADER_LOGIN "https://www.google.com/accounts/ClientLogin" + #define GREADER_API_PREFIX "http://www.google.com/reader/api/0/" + #define GREADER_FEED_PREFIX "http://www.google.com/reader/atom/" + + #define GREADER_SUBSCRIPTION_LIST GREADER_API_PREFIX "subscription/list" +diff -u -r -U5 newsbeuter-2.5/src/pb_controller.cpp newsbeuter-2.5.includes/src/pb_controller.cpp +--- newsbeuter-2.5/src/pb_controller.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/pb_controller.cpp 2012-02-18 15:57:48.241947978 -0500 +@@ -10,10 +10,11 @@ + #include + #include + #include + #include + #include ++#include + + #include + #include + #include + #include +diff -u -r -U5 newsbeuter-2.5/src/queueloader.cpp newsbeuter-2.5.includes/src/queueloader.cpp +--- newsbeuter-2.5/src/queueloader.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/queueloader.cpp 2012-02-18 15:57:59.472948099 -0500 +@@ -5,10 +5,11 @@ + #include + #include + #include + #include + #include ++#include + + using namespace newsbeuter; + + namespace podbeuter { + +diff -u -r -U5 newsbeuter-2.5/src/reloadthread.cpp newsbeuter-2.5.includes/src/reloadthread.cpp +--- newsbeuter-2.5/src/reloadthread.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/reloadthread.cpp 2012-02-18 15:21:21.137924605 -0500 +@@ -1,8 +1,10 @@ + #include + #include + ++#include ++ + namespace newsbeuter { + + reloadthread::reloadthread(controller * c, configcontainer * cf) : ctrl(c), oldtime(0), waittime_sec(0), suppressed_first(false), cfg(cf) { + LOG(LOG_INFO,"reloadthread: waiting %u seconds between reloads",waittime_sec); + } +diff -u -r -U5 newsbeuter-2.5/src/utils.cpp newsbeuter-2.5.includes/src/utils.cpp +--- newsbeuter-2.5/src/utils.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/utils.cpp 2012-02-18 15:01:55.076912171 -0500 +@@ -8,10 +8,11 @@ + #include + #include + #include + #include + #include ++#include + + #include + #include + #include + #include diff --git a/community/newsbeuter/libjson.patch b/community/newsbeuter/libjson.patch new file mode 100644 index 000000000..7c34b5bad --- /dev/null +++ b/community/newsbeuter/libjson.patch @@ -0,0 +1,29 @@ +Description: propagate boolean json type +Apparently the libjson project decided to rename their boolean type to +json_bool... +Author: Nico Golde +Bug-Debian: http://bugs.debian.org/689225 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: vendor +Bug: http://bugs.debian.org/689225 +Bug-Debian: http://bugs.debian.org/689225 +Forwarded: + +Index: newsbeuter-2.5/src/ttrss_api.cpp +=================================================================== +--- newsbeuter-2.5.orig/src/ttrss_api.cpp 2012-09-30 17:25:23.000000000 +0200 ++++ newsbeuter-2.5/src/ttrss_api.cpp 2012-09-30 17:43:24.000000000 +0200 +@@ -220,7 +220,7 @@ + const char * link = json_object_get_string(json_object_object_get(item_obj, "link")); + const char * content = json_object_get_string(json_object_object_get(item_obj, "content")); + time_t updated = (time_t)json_object_get_int(json_object_object_get(item_obj, "updated")); +- boolean unread = json_object_get_boolean(json_object_object_get(item_obj, "unread")); ++ json_bool unread = json_object_get_boolean(json_object_object_get(item_obj, "unread")); + + rsspp::item item; + diff --git a/community/newsbeuter/newsbeuter.changelog b/community/newsbeuter/newsbeuter.changelog index f2a048aa1..794d2b935 100644 --- a/community/newsbeuter/newsbeuter.changelog +++ b/community/newsbeuter/newsbeuter.changelog @@ -1,3 +1,6 @@ +2013-03-07 Andrea Scarpino + * ruby 2.0 rebuild + 2012-02-23 Jaroslav Lichtblau * newsbeuter 2.5-1 diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD index bd3aea280..0896a50ac 100644 --- a/community/notmuch/PKGBUILD +++ b/community/notmuch/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82559 2013-01-20 23:36:23Z dwallace $ +# $Id: PKGBUILD 86877 2013-03-23 23:10:36Z td123 $ # Maintainer: Daniel Wallace # Contributor: fauno # Contributor: Olivier Ramonat @@ -6,7 +6,7 @@ pkgbase=notmuch pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime') -pkgver=0.15 +pkgver=0.15.2 pkgrel=1 arch=('i686' 'x86_64') url="http://notmuchmail.org/" @@ -14,12 +14,13 @@ license=('GPL3') makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc') options=(!distcc !makeflags) source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('a79454042e508c8a1d7aaf1a617526f0') +md5sums=('e86968dfcd7ffaf162b7b87de56b7f18') build() { cd "$srcdir/${pkgname}-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc \ + --includedir=/usr/include make (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt" make ${pkgname}-mutt.1) @@ -33,14 +34,14 @@ build() { cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2} cd "$srcdir/${pkgname}-${pkgver}/bindings/python" - env LD_LIBRARY_PATH="." python setup.py build + #env LD_LIBRARY_PATH="." python setup.py build + find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} + + 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 - + find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} + + #env LD_LIBRARY_PATH="." python2 setup.py build + python2 setup.py build } package_notmuch-runtime(){ @@ -73,15 +74,17 @@ package_notmuch(){ # Install python bindings cd "$srcdir/${pkgname}-${pkgver}/bindings/python2" - env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir" + #env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir" + 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" + #env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir" + python setup.py install --prefix=/usr --root="$pkgdir" # Install ruby bindings cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby" sed -i -e 's,/site_ruby,,g' Makefile - make prefix="${pkgdir}/usr" install + make DESTDIR="$pkgdir" includedir=/usr/include install } diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index c54515013..287b1c96a 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 83664 2013-02-04 10:17:56Z spupykin $ +# $Id: PKGBUILD 86878 2013-03-23 23:10:37Z td123 $ # Maintainer: Sergej Pupykin pkgname=passenger -pkgver=3.0.19 +pkgver=3.9.5.rc3 pkgrel=1 -_pkgdlnr=76675 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') url="http://www.modrails.com" @@ -14,17 +13,20 @@ depends=('ruby' 'ruby-rack' 'curl') makedepends=('apache') install=passenger.install options=('!emptydirs') -source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz) -#https://github.com/FooBarWidget/passenger/archive/release-3.0.19.tar.gz -md5sums=('5df27d7908d55f164853fc2043ee069f') +source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) +md5sums=('60a1e0033fd2f0928607af559e2184f7') build(){ - cd $srcdir/passenger-$pkgver + cd $srcdir/passenger-release-$pkgver sed -i 's/env python/env python2/' lib/phusion_passenger/wsgi/request_handler.py ./bin/passenger-install-apache2-module -a rake nginx +} + +package() { + cd $srcdir/passenger-release-$pkgver mkdir -p $pkgdir/usr/lib/passenger/ cp -R * $pkgdir/usr/lib/passenger/ diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD index 51f1f9065..96dccd3fb 100644 --- a/community/powertop/PKGBUILD +++ b/community/powertop/PKGBUILD @@ -1,31 +1,29 @@ -# $Id: PKGBUILD 85919 2013-03-08 23:40:44Z foutrelis $ +# $Id: PKGBUILD 86900 2013-03-24 05:37:37Z foutrelis $ # Maintainer: Jaroslav Lichtblau # Contributor: Alexander Fehr # Contributor: Xilon pkgname=powertop -pkgver=2.2 -pkgrel=3 +pkgver=2.3 +pkgrel=1 pkgdesc='A tool to diagnose issues with power consumption and power management' arch=('i686' 'x86_64') url='https://01.org/powertop/' license=('GPL2') depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils') changelog=$pkgname.changelog -source=($pkgname-$pkgver.tar.gz::https://github.com/fenrus75/powertop/tarball/v2.1.1) -#https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz) -sha256sums=('e925230cc9006dbc226aec4dea389b97a0f906a7997b33aca40a1d6bc7568dc4') +source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz) +sha256sums=('b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744') build() { - cd ${srcdir}/*-$pkgname-* + cd "$srcdir/$pkgname-$pkgver" - ./autogen.sh ./configure --prefix=/usr make } package() { - cd ${srcdir}/*-$pkgname-* + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } diff --git a/community/powertop/powertop.changelog b/community/powertop/powertop.changelog index d543c3517..1abb36737 100644 --- a/community/powertop/powertop.changelog +++ b/community/powertop/powertop.changelog @@ -1,3 +1,6 @@ +2013-03-23 Evangelos Foutras + * powertop 2.3-1 + 2013-01-05 Jaroslav Lichtblau (Dragonlord) * powertop 2.2-1 diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 3d3e8a819..4007381a3 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85839 2013-03-07 17:16:18Z arodseth $ +# $Id: PKGBUILD 86879 2013-03-23 23:10:42Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella pkgname=ruby-cairo pkgver=1.12.2 -pkgrel=3 +pkgrel=4 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686') # http://cairographics.org/releases/ diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 40eb4807e..9f4751445 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86266 2013-03-14 14:33:19Z arodseth $ +# $Id: PKGBUILD 86880 2013-03-23 23:10:43Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -9,7 +9,7 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') pkgver=1.2.2 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') @@ -25,12 +25,10 @@ build() { #patch -Np1 -i ${srcdir}/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch LANG="en_US.UTF-8" \ ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor - #mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/2.0.0/i686-linux" - #mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/site_ruby/2.0.0/x86_64-linux" - mkdir -p "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/1.9.1/i686-linux" - mkdir -p "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/1.9.1/i686-linux" - mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/site_ruby/1.9.1/i686-linux" - mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux" + mkdir -p "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" + mkdir -p "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" + mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" + mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" make diff --git a/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch b/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch deleted file mode 100644 index d84107f0c..000000000 --- a/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c0d6f9ad4ab23dc980746078a127905ea56c9bf1 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic -Date: Sun, 10 Mar 2013 09:39:45 -0700 -Subject: [PATCH] backport fix for syntax error - https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df - ---- - gdk3/ext/gdk3/rbgdkevent.c | 2 +- - gdk3/ext/gdk3/rbgdkscreen.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gdk3/ext/gdk3/rbgdkevent.c b/gdk3/ext/gdk3/rbgdkevent.c -index 62bb35d..a5478a6 100644 ---- a/gdk3/ext/gdk3/rbgdkevent.c -+++ b/gdk3/ext/gdk3/rbgdkevent.c -@@ -370,7 +370,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self) - VALUE value; - - rb_scan_args(argc, argv, "11", &name, &type); -- if NIL_P(type) -+ if (NIL_P(type)) - gtype = G_TYPE_STRING; - else - gtype = CLASS2GTYPE(type); -diff --git a/gdk3/ext/gdk3/rbgdkscreen.c b/gdk3/ext/gdk3/rbgdkscreen.c -index 8f5bffb..7439ad1 100644 ---- a/gdk3/ext/gdk3/rbgdkscreen.c -+++ b/gdk3/ext/gdk3/rbgdkscreen.c -@@ -214,7 +214,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self) - VALUE value; - - rb_scan_args(argc, argv, "11", &name, &type); -- if NIL_P(type) -+ if (NIL_P(type)) - gtype = G_TYPE_STRING; - else - gtype = CLASS2GTYPE(type); --- -1.8.1.5 - diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index 955fb4412..608698d8d 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86274 2013-03-14 15:41:22Z arodseth $ +# $Id: PKGBUILD 86881 2013-03-23 23:10:44Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -9,21 +9,17 @@ pkgbase=ruby-gtk3 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango') pkgver=1.2.2 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') -source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz" - '0001-backport-fix-for-syntax-error-https-github.com-ruby.patch') -sha256sums=('1dd73c4aa184199f373edad589b715b68da8eb43ae6bdae360e0aa62189a681d' - '0df3571688a18048fac9211df1bf21effd4120e568b34e523fe50a7a63e3e3d6') +source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") +sha256sums=('1dd73c4aa184199f373edad589b715b68da8eb43ae6bdae360e0aa62189a681d') build() { cd "$srcdir/ruby-gtk3-$pkgver" - #patch -Np1 -i \ - # "$srcdir/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch" LANG="en_US.UTF-8" ruby extconf.rb gtk3 gdk3 --vendor make } diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD index f3434fe32..cf6ac2eda 100644 --- a/community/ruby-ncurses/PKGBUILD +++ b/community/ruby-ncurses/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 64613 2012-02-17 02:56:44Z tdziedzic $ +# $Id: PKGBUILD 86883 2013-03-23 23:10:46Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: Jeff Mickey # Contributor: Alessio 'mOLOk' Bolognino + pkgname=ruby-ncurses pkgver=1.3.1 -pkgrel=3 -pkgdesc="Module for interactive text console applications (ncurses)" +pkgrel=4 +pkgdesc='Module for interactive text console applications (ncurses)' arch=('x86_64' 'i686') -url="http://ncurses-ruby.berlios.de/" +url='http://ncurses-ruby.berlios.de/' license=('GPL') -depends=('ruby') +depends=('ruby' 'ncurses') source=("http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2") -md5sums=('63fd3d09a51cdd745e1ed37f85621ea2') +sha256sums=('dca8ce452e989ce1399cb683184919850f2baf79e6af9d16a7eed6a9ab776ec5') build() { cd "$srcdir/ncurses-ruby-$pkgver" @@ -23,7 +24,8 @@ build() { package() { cd "$srcdir/ncurses-ruby-$pkgver" - make DESTDIR="$pkgdir" install + + make includedir="/usr/include" DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/simavr/PKGBUILD b/community/simavr/PKGBUILD index fd6d4357b..aa2e8370f 100644 --- a/community/simavr/PKGBUILD +++ b/community/simavr/PKGBUILD @@ -2,7 +2,7 @@ pkgname=simavr pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc='A lean, mean and hackable AVR simulator' arch=('i686' 'x86_64') url="https://github.com/buserror-uk/simavr" @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/usr" install + make PREFIX="/usr" DESTDIR="$pkgdir/usr" install } md5sums=('82c9704a4e8569548f01931e32ebfe0c') diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index f44e5eb30..f5f97397b 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86298 2013-03-14 20:56:19Z svenstaro $ +# $Id: PKGBUILD 86902 2013-03-24 08:40:39Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Arkham # Contributor: Christoph Zeiler pkgname=spring -pkgver=0.93.2 -_pkgver=93.2 +pkgver=0.94.0 +_pkgver=94.0 pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('f6e1cb11d9254aca38731995c29303ba') +md5sums=('707829e3a5f3f296da83aab8651cd5e5') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD index d1eb91627..fd908af5f 100644 --- a/community/subtle/PKGBUILD +++ b/community/subtle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72816 2012-06-22 21:15:04Z arodseth $ +# $Id: PKGBUILD 86887 2013-03-23 23:10:50Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Angel Velasquez # Contributor: unexist @@ -8,15 +8,15 @@ pkgname=subtle pkgver=0.11.3224 -pkgrel=1 -pkgdesc="Grid-based manual tiling window manager" -arch=("i686" "x86_64") -url="http://subtle.subforge.org" -license=("GPL") -depends=("ruby" "libxft" "libxpm" "libxrandr" "libxft" "libxpm" "libxinerama" - "libxtst") -makedepends=("pkg-config" "libxinerama" "libxrandr" "libxft" "libxpm") -backup=("etc/xdg/subtle/subtle.rb") +pkgrel=2 +pkgdesc='Grid-based manual tiling window manager' +arch=('x86_64' 'i686') +url='http://subtle.subforge.org/' +license=('GPL') +depends=('ruby' 'libxft' 'libxpm' 'libxrandr' 'libxft' 'libxpm' 'libxinerama' + 'libxtst') +makedepends=('pkg-config' 'libxinerama' 'libxrandr' 'libxft' 'libxpm') +backup=('etc/xdg/subtle/subtle.rb') install=subtle.install source=("http://subforge.org/attachments/download/81/$pkgname-$pkgver-xi.tbz2") sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2') @@ -24,7 +24,10 @@ sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2') build() { cd "$srcdir/$pkgname-$pkgver-xi" - # use vendor_ruby instead of site_ruby + # Disable the check for Ruby 1.9 + sed -i 's/ 1 != / 7 == /' Rakefile + sed -i 's/ 9 != / 7 == /' Rakefile + # Use vendor_ruby instead of site_ruby sed -e \ 's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' \ -i Rakefile @@ -33,7 +36,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver-xi" - rake destdir=$pkgdir install + rake destdir=$pkgdir install --trace } # vim:set ts=2 sw=2 et: diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 5421cc3dd..0ad10ea27 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85873 2013-03-08 00:29:18Z speps $ +# $Id: PKGBUILD 86888 2013-03-23 23:10:51Z td123 $ # Maintainer : speps # Contributor: _name=SuperCollider pkgname=supercollider pkgver=3.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') url="http://supercollider.sourceforge.net/" diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index 9a8700cb9..008767395 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -6,14 +6,14 @@ pkgname=task pkgver=2.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64') url="http://taskwarrior.org/projects/show/taskwarrior/" license=('MIT') depends=('lua' 'util-linux') makedepends=('cmake' 'lua') -optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon') +optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'perl-json: for perl export addon') source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz) sha256sums=('cf5171b54b6d2d2dcd9c559f437cf8a2cb3836c7631edf96a16efbf8b4383e36') diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 2da88d1f1..1d113ec48 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79342 2012-11-03 08:25:25Z spupykin $ +# $Id: PKGBUILD 86891 2013-03-23 23:10:55Z td123 $ # Maintainer: Sergej Pupykin pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=9 +pkgrel=10 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -74,6 +74,11 @@ build() { --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` ./waf build +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + ./waf --destdir=${pkgdir} install PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD index bf025944c..a13a71238 100755 --- a/community/xnoise/PKGBUILD +++ b/community/xnoise/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 86373 2013-03-16 02:52:56Z fyan $ +# $Id: PKGBUILD 86895 2013-03-24 01:55:32Z fyan $ # Maintainer: Felix Yan # Contributor: archtux pkgname=xnoise pkgver=0.2.17 -pkgrel=1 +pkgrel=2 pkgdesc="Media player with a slick GUI, great speed and lots of features." arch=('i686' 'x86_64') url="http://www.xnoise-media-player.com/" license=('GPL2') -depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo') +depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg') optdepends=('gst-plugins-base: Basic media codecs' 'gst-plugins-bad: Extra media codecs' 'gst-plugins-ugly: Extra media codecs' diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 6e9cfd9ea..ce98d5f33 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169746 2012-10-27 23:41:47Z eric $ +# $Id: PKGBUILD 180578 2013-03-23 23:09:32Z td123 $ # Maintainer: Daniel Isenmann pkgname=gegl pkgver=0.2.0 -pkgrel=5 +pkgrel=6 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index f77500bc2..f70320e11 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179080 2013-03-03 07:46:56Z bisson $ +# $Id: PKGBUILD 180579 2013-03-23 23:09:33Z td123 $ # Maintainer: Gaetan Bisson # Contributor: kevin # Contributor: John Proctor pkgname=graphviz pkgver=2.30.1 -pkgrel=1 +pkgrel=2 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -35,11 +35,14 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" sed \ - -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \ + -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ -i config/config_ruby.rb + sed \ + -e 's:ruby-1.9:ruby-2.0:g' \ + -e '/LIBPOSTFIX="64"/d' \ + -i configure - sed '/LIBPOSTFIX="64"/d' -i configure source /etc/profile.d/qt4.sh export PYTHON=python2 export LUA=lua5.1 diff --git a/extra/gummiboot/PKGBUILD b/extra/gummiboot/PKGBUILD index 2bd4a9e55..99ca11299 100644 --- a/extra/gummiboot/PKGBUILD +++ b/extra/gummiboot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180109 2013-03-17 07:03:05Z tpowa $ +# $Id: PKGBUILD 180605 2013-03-24 16:16:26Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: Mantas Mikulėnas pkgname="gummiboot" -pkgver="28" +pkgver="29" pkgrel="1" pkgdesc="Simple text-mode UEFI Boot Manager" url="http://freedesktop.org/wiki/Software/gummiboot" @@ -39,6 +39,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}/" make DESTDIR="${pkgdir}" install } -md5sums=('3a3a4f2e68ea72cf76a18b2f34d3b002' +md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2' '6ea803e5179d623716e3be0b636de658' '82bda9612e3a361a74cf8de2a0134b15') diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 83721fc34..8f1d3987a 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179366 2013-03-05 15:29:18Z andrea $ +# $Id: PKGBUILD 180580 2013-03-23 23:09:35Z td123 $ # Maintainer: Andrea Scarpino pkgname=kdebindings-korundum pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" arch=('i686' 'x86_64') @@ -21,13 +21,12 @@ sha1sums=('ba0326225e6d040ea215f1991295f7e43d5aaed4' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') build() { - cd "${srcdir}/korundum-${pkgver}" + cd korundum-${pkgver} patch -p1 -i "${srcdir}/ruby19.patch" + cd ../ - cd "${srcdir}" mkdir build cd build - cmake ../korundum-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ @@ -39,6 +38,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 1b0c53525..a23330a72 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179340 2013-03-05 15:23:35Z andrea $ +# $Id: PKGBUILD 180581 2013-03-23 23:09:36Z td123 $ # Maintainer: Andrea Scarpino pkgname=kdebindings-qtruby pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" arch=('i686' 'x86_64') @@ -16,7 +16,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") sha1sums=('732a5e127ffec591b99b91ed41d00d739d8c0300') build() { - cd "${srcdir}" mkdir build cd build cmake ../qtruby-${pkgver} \ @@ -29,6 +28,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD index 7302de3d0..d4baabe56 100644 --- a/extra/libebml/PKGBUILD +++ b/extra/libebml/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 143796 2011-11-29 12:02:45Z giovanni $ +# $Id: PKGBUILD 180600 2013-03-24 12:10:12Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: 03/08/04 pkgname=libebml -pkgver=1.2.2 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="Extensible Binary Meta Language library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libebml/" license=('LGPL') depends=('gcc-libs') source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('726cc2bd1a525929ff35ff9854c0ebab') +md5sums=('efec729bf5a51e649e1d9d1f61c0ae7a') build() { cd "${srcdir}/${pkgname}-${pkgver}/make/linux" diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD index 78f4f253f..88a3c5b8c 100644 --- a/extra/libmatroska/PKGBUILD +++ b/extra/libmatroska/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 143895 2011-11-30 19:46:58Z giovanni $ +# $Id: PKGBUILD 180602 2013-03-24 12:53:07Z giovanni $ # Maintainer: Giovanni Scafora # Contributor 03/08/04 pkgname=libmatroska -pkgver=1.3.0 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="Matroska library" arch=('i686' 'x86_64') url="http://dl.matroska.org/downloads/libmatroska/" license=('LGPL') depends=('libebml') source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f4a8c411f09d39c754eb726efd616043') +md5sums=('5b83155019589b04a49f9db923b5bf74') build() { cd "${srcdir}/${pkgname}-${pkgver}/make/linux" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 8bd7cf113..ac49b5778 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180554 2013-03-23 07:24:00Z bpiotrowski $ +# $Id: PKGBUILD 180591 2013-03-24 07:51:29Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.1.2 pkgver=4.0.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -78,7 +78,8 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/libmspub-0.0.5.tar.bz2 ${_additional_source_url}/libvisio-0.0.25.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - libreoffice-common.sh libreoffice-common.csh) + libreoffice-common.sh libreoffice-common.csh + librelogo.diff) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 @@ -148,7 +149,8 @@ md5sums=('52c3bacdf46b4648c5697cc55b648784' '92bde158f249b9b27f76f48cc65a0242' '97bf43dda273d79ff90c848ab53b0e3c' 'abcb1b0a7deaffe13ab3d7ca70becb49' - '72790a4103da259a55cadd66db931d00') + '72790a4103da259a55cadd66db931d00' + 'cc07fdb40e005ad2a79ba8a6756b0ad6') build() { @@ -158,6 +160,10 @@ build() { cd ${srcdir}/libreoffice-$_LOver + # make librelogo depend on libreoffice-writer + # http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e69b35674882d8d675a677940805b187cad0bc3 + patch -Np1 -i ${srcdir}/librelogo.diff + # move external sources into place mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources for source in "${noextract[@]}"; do @@ -206,7 +212,6 @@ build() { --enable-gtk3 \ --enable-gstreamer \ --enable-lockdown\ - --enable-mergelibs \ --enable-opengl \ --enable-odk\ --enable-python=system \ @@ -253,7 +258,9 @@ build() { --with-system-clucene\ --without-system-servlet-api -# --without-ppds\ +# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 + +# --without-ppds\ # breaks spadmin permission #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool @@ -274,13 +281,12 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.22.2" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' - 'dbus-glib: adds dbus support' 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'libmythes: for use in thesaurus' 'beanshell: interactive java -- good for prototyping /macros' @@ -337,6 +343,9 @@ package_libreoffice-common() { rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + + # workaround all packages now depend on that file + cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd } package_libreoffice-base() { @@ -388,9 +397,8 @@ package_libreoffice-postgresql-connector() { package_libreoffice-calc() { pkgdesc="Spreadsheet application for LibreOffice." install=libreoffice-calc.install - #depends=('libreoffice-common' 'lpsolve' ) - depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 - depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 + depends=('libreoffice-common' 'lpsolve' ) + #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 groups=('libreoffice') replaces=('libreoffice') @@ -575,6 +583,9 @@ package_libreoffice-writer() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done + + # for workaround this file belongs now to common + rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd } package_libreoffice-en-US() { diff --git a/extra/libreoffice/librelogo.diff b/extra/libreoffice/librelogo.diff new file mode 100644 index 000000000..c17143225 --- /dev/null +++ b/extra/libreoffice/librelogo.diff @@ -0,0 +1,43 @@ +From 939daba04c25a9a3b7be2f3df39692453cf9a304 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Thu, 21 Mar 2013 14:57:18 +0000 +Subject: Missing dependency of librelogo on writer + +...at least due to dependency of librelogo.xcd on writer.xcd, see +82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "Missing dependency." + +Otherwise, having librelogo installed but not writer will cause an uncaught +RuntimeException from configmgr::Components::parseXcdFiles +(configmgr/source/components.cxx) early on in soffice.bin. + +(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3) +Conflicts: + setup_native/source/packinfo/packinfo_office.txt + +Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08 +Reviewed-on: https://gerrit.libreoffice.org/2898 +Reviewed-by: Fridrich Strba +Reviewed-by: Andras Timar +Reviewed-by: Petr Mladek +Tested-by: Petr Mladek +--- +diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt +index 3e8c89e..cbf8c490 100644 +--- a/setup_native/source/packinfo/packinfo_office.txt ++++ b/setup_native/source/packinfo/packinfo_office.txt +@@ -314,10 +314,10 @@ End + Start + module = "gid_Module_Optional_Pyuno_LibreLogo" + solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo" +-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython" ++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython" + packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" +-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" +-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" ++freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" ++requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" + copyright = "2012 The Document Foundation" + solariscopyright = "solariscopyrightfile" + vendor = "The Document Foundation" +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD index c546e7b61..fa668b5be 100644 --- a/extra/libssh/PKGBUILD +++ b/extra/libssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172472 2012-12-03 12:34:31Z tomegun $ +# $Id: PKGBUILD 180604 2013-03-24 15:55:47Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Andrea Scarpino # Contributor: ice-man # Contributor: sergeantspoon pkgname=libssh -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="Library for accessing ssh client services through C libraries" url="http://www.libssh.org/" @@ -13,7 +13,7 @@ license=('LGPL') arch=('i686' 'x86_64') depends=('openssl') makedepends=('cmake' 'doxygen') -source=("https://red.libssh.org/attachments/download/38/${pkgname}-${pkgver}.tar.gz") +source=("https://red.libssh.org/attachments/download/41/${pkgname}-${pkgver}.tar.gz") build() { cd "${srcdir}" @@ -29,4 +29,4 @@ package(){ cd "${srcdir}"/build make DESTDIR="${pkgdir}" install } -md5sums=('9ad01838d3b89d98e900e0f6260a88cc') +md5sums=('b8b4e733c13dfabae33b2688ef82dacc') diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD index 63fdf1565..d6397c819 100644 --- a/extra/ncmpc/PKGBUILD +++ b/extra/ncmpc/PKGBUILD @@ -1,37 +1,36 @@ -# $Id: PKGBUILD 150715 2012-02-21 01:22:44Z angvp $ -# Maintainer: Angel Velasquez +# $Id: PKGBUILD 180582 2013-03-23 23:09:37Z td123 $ +# Maintainer: Gaetan Bisson +# Contributor: Angel Velasquez # Contributor: Andrea Scarpino # Contributor: damir # Contributor: Daniel Bainton pkgname=ncmpc pkgver=0.20 -pkgrel=1 -pkgdesc="A ncurses (command line) interface for MPD" -arch=("i686" "x86_64") -url="http://mpd.wikia.com/wiki/Client:Ncmpc" +pkgrel=2 +pkgdesc='Fully featured MPD client using ncurses' +url='http://mpd.wikia.com/wiki/Client:Ncmpc' +arch=('i686' 'x86_64') license=('GPL') depends=('ncurses' 'glib2' 'libmpdclient') optdepends=('python2: to enable lyrics plugin' - 'ruby: to enable lyrics plugin') + 'ruby: to enable lyrics plugin') source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2") -md5sums=('62b9df0263d9567babf7446c258acc5d') +sha1sums=('da106de4b11a48eb2d63619da1316713f95cc9cb') build() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's#python#python2#' lyrics/30-leoslyrics.py - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --enable-lyrics-screen \ - --with-lyrics-plugin-dir=/usr/share/ncmpc/lyrics - make + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#python#python2#' lyrics/30-leoslyrics.py + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-lyrics-screen \ + --with-lyrics-plugin-dir=/usr/share/ncmpc/lyrics + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - install -d ${pkgdir}/usr/share/ncmpc/lyrics - install -m755 lyrics/{10-hd.sh,15-leoslyrics.sh,20-lyricwiki.rb,30-leoslyrics.py} \ - ${pkgdir}/usr/share/ncmpc/lyrics + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + for i in lyrics/*; do install -Dm755 "$i" "${pkgdir}/usr/share/ncmpc/$i"; done } diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 93d5028e3..bb5e5e4a4 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180572 2013-03-23 15:42:01Z andyrtr $ +# $Id: PKGBUILD 180598 2013-03-24 10:41:11Z andyrtr $ # Maintainer: Andreas Radke pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') pkgver=3.5.0.18 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://wiki.x2go.org/" license=('GPL') @@ -132,7 +132,8 @@ package_x2go-agent() { install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}} # this is a nxagent symlink - cp -a ${srcdir}/fakeinstall/usr/lib/x2go/bin/x2goagent ${pkgdir}/usr/lib/x2go/bin + ln -sv /usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/x2go/bin/x2goagent + # the wrapper cp -a ${srcdir}/fakeinstall/usr/bin/x2goagent ${pkgdir}/usr/bin diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 90ef10954..190c09638 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 178989 2013-03-01 10:24:37Z andrea $ +# $Id: PKGBUILD 180583 2013-03-23 23:09:38Z td123 $ # Maintainer: Andrea Scarpino pkgname=qtwebkit -pkgver=2.3.beta2 -_pkgver=2.3-beta2 -pkgrel=2 +pkgver=2.3.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' @@ -12,10 +11,15 @@ license=('LGPL2.1' 'GPL3') depends=('qt4' 'systemd' 'gstreamer0.10-base') makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${_pkgver}" - 'use-python2.patch') -sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08' - '315b6ff603f35e5492a036f7082f6aa075dfb607') +_qtver=4.8.4 +source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}" + "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" + 'use-python2.patch' + 'qwebview.patch') +sha1sums=('8e0aa2f895376a0a88b55548bfadb270da3708ba' + 'f5880f11c139d7d8d01ecb8d874535f7d9553198' + '315b6ff603f35e5492a036f7082f6aa075dfb607' + 'ef467fcfc9e74aa88356f27acc21792706ed1e4d') build() { cd webkit-qtwebkit-23 @@ -25,17 +29,28 @@ build() { OPTS="--no-webkit2" if [ "${CARCH}" = "i686" ]; then # FS#33418 - OPTS="${OPTS} --no-sse2" + OPTS="${OPTS} --no-force-sse2" fi export QTDIR=/usr + export PATH="/usr/lib/qt4/bin:$PATH" Tools/Scripts/build-webkit --qt \ --makeargs="${MAKEFLAGS}" \ --prefix=/usr \ ${OPTS} + + # Build the QWebView plugin (FS#27914) + cd ../qt-everywhere-opensource-src-${_qtver} + patch -p1 -i "${srcdir}"/qwebview.patch + cd tools/designer/src/plugins/qwebview + qmake-qt4 + make } package() { cd webkit-qtwebkit-23 make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install + + cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview + make INSTALL_ROOT="${pkgdir}" install } diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch new file mode 100644 index 000000000..98f6f0f03 --- /dev/null +++ b/extra/qtwebkit/qwebview.patch @@ -0,0 +1,21 @@ +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 +@@ -1,3 +1,6 @@ ++INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include ++LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib ++ + CONFIG += designer + win32|mac: CONFIG+= debug_and_release + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000 +@@ -2,9 +2,4 @@ + CONFIG += ordered + + REQUIRES = !CONFIG(static,shared|static) +-contains(QT_CONFIG, qt3support): SUBDIRS += widgets +-win32: SUBDIRS += activeqt +-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d + contains(QT_CONFIG, webkit): SUBDIRS += qwebview +-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets +-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 239918d4c..3c829c047 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174294 2013-01-04 03:15:34Z eric $ +# $Id: PKGBUILD 180584 2013-03-23 23:09:38Z td123 $ # Maintainer: Eric Bélanger pkgname=rrdtool pkgver=1.4.7 -pkgrel=4 +pkgrel=5 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" @@ -35,6 +35,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" includedir=/usr/include install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 5f3c8a174..4f17adce2 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley pkgname=('ruby' 'ruby-docs') -pkgver=1.9.3_p392 +pkgver=2.0.0_p0 pkgrel=1 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('a810d64e2255179d2f334eb61fb8519c' +md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index e96680658..cdec798df 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=798 -__hgrev=30b3b1da0350 +_patchlevel=834 +__hgrev=ad7bbe9ea65b _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('e4a759fdb7cf91d91fd4f8e4f44d5d9c' - 'ff8221082bdd0f9b63f57e5cc7773ee7' +md5sums=('f50a7f4e07ae991db324f0c4b3dcad3d' + '57e197f51fbbd22944bfc51041ab89d1' '6e7adfbd5d26c1d161030ec203a7f243' '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 59d848c63..762abed7c 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175728 2013-01-20 12:37:22Z giovanni $ +# $Id: PKGBUILD 180587 2013-03-23 23:09:44Z td123 $ # Maintainer: Giovanni Scafora # Contributor: lucke pkgname=weechat pkgver=0.4.0 -pkgrel=1 +pkgrel=3 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" @@ -13,12 +13,18 @@ depends=('gnutls' 'curl' 'libgcrypt') makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') options=('!libtool') -source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2" + 'ruby-2.0.0-crash-fix.diff') +md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b' + '8bafb0ec603af018e2d66155640685b4') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # fix: https://bugs.archlinux.org/task/34342 + # original commit: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=4fdbb83a079f24a742633fd4d02084911580c19c + patch -Np1 -i ${srcdir}/ruby-2.0.0-crash-fix.diff + mkdir build cd build cmake .. -DPREFIX=/usr \ diff --git a/extra/weechat/ruby-2.0.0-crash-fix.diff b/extra/weechat/ruby-2.0.0-crash-fix.diff new file mode 100644 index 000000000..bfc816ade --- /dev/null +++ b/extra/weechat/ruby-2.0.0-crash-fix.diff @@ -0,0 +1,76 @@ +X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=blobdiff_plain;f=src%2Fplugins%2Fruby%2Fweechat-ruby-api.c;h=101caec961829de03f8097edc63f497eab99aaa3;hp=bbc2fbcbe3c5290a8a975c4676a85a8c7e0998b7;hb=4fdbb83a079f24a742633fd4d02084911580c19c;hpb=55e58811b3df451db4f95b1035a39f5659788989 + +diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c +index bbc2fbc..101caec 100644 +--- a/src/plugins/ruby/weechat-ruby-api.c ++++ b/src/plugins/ruby/weechat-ruby-api.c +@@ -1333,28 +1333,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file, + VALUE description, VALUE string_values, + VALUE min, VALUE max, VALUE default_value, + VALUE value, VALUE null_value_allowed, +- VALUE function_check_value, +- VALUE data_check_value, +- VALUE function_change, +- VALUE data_change, +- VALUE function_delete, +- VALUE data_delete) ++ VALUE callbacks) + { + char *c_config_file, *c_section, *c_name, *c_type, *c_description; + char *c_string_values, *c_default_value, *c_value; + char *c_function_check_value, *c_data_check_value, *c_function_change; + char *c_data_change, *c_function_delete, *c_data_delete, *result; + int c_min, c_max, c_null_value_allowed; +- VALUE return_value; ++ VALUE function_check_value, data_check_value, function_change, data_change; ++ VALUE function_delete, data_delete, return_value; + + API_FUNC(1, "config_new_option", API_RETURN_EMPTY); + if (NIL_P (config_file) || NIL_P (section) || NIL_P (name) || NIL_P (type) + || NIL_P (description) || NIL_P (string_values) || NIL_P (min) + || NIL_P (max) || NIL_P (default_value) || NIL_P (value) +- || NIL_P (null_value_allowed) || NIL_P (function_check_value) +- || NIL_P (data_check_value) || NIL_P (function_change) +- || NIL_P (data_change) || NIL_P (function_delete) +- || NIL_P (data_delete)) ++ || NIL_P (null_value_allowed) || NIL_P (callbacks)) + API_WRONG_ARGS(API_RETURN_EMPTY); + + Check_Type (config_file, T_STRING); +@@ -1368,12 +1361,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file, + Check_Type (default_value, T_STRING); + Check_Type (value, T_STRING); + Check_Type (null_value_allowed, T_FIXNUM); +- Check_Type (function_check_value, T_STRING); +- Check_Type (data_check_value, T_STRING); +- Check_Type (function_change, T_STRING); +- Check_Type (data_change, T_STRING); +- Check_Type (function_delete, T_STRING); +- Check_Type (data_delete, T_STRING); ++ Check_Type (callbacks, T_ARRAY); ++ ++ /* ++ * due to a Ruby limitation (15 arguments max by function), we receive the ++ * the callbacks in an array of 6 strings (3 callbacks + 3 data) ++ */ ++ if (RARRAY_LEN(callbacks) != 6) ++ API_WRONG_ARGS(API_RETURN_EMPTY); ++ ++ function_check_value = rb_ary_entry (callbacks, 0); ++ data_check_value = rb_ary_entry (callbacks, 1); ++ function_change = rb_ary_entry (callbacks, 2); ++ data_change = rb_ary_entry (callbacks, 3); ++ function_delete = rb_ary_entry (callbacks, 4); ++ data_delete = rb_ary_entry (callbacks, 5); + + c_config_file = StringValuePtr (config_file); + c_section = StringValuePtr (section); +@@ -5915,7 +5917,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat) + API_DEF_FUNC(config_new, 3); + API_DEF_FUNC(config_new_section, 14); + API_DEF_FUNC(config_search_section, 2); +- API_DEF_FUNC(config_new_option, 17); ++ API_DEF_FUNC(config_new_option, 12); + API_DEF_FUNC(config_search_option, 3); + API_DEF_FUNC(config_string_to_boolean, 1); + API_DEF_FUNC(config_option_reset, 2); diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD index 75e038641..2f051b7f5 100644 --- a/extra/x2goclient/PKGBUILD +++ b/extra/x2goclient/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179029 2013-03-01 18:54:32Z andrea $ +# $Id: PKGBUILD 180595 2013-03-24 09:37:30Z andyrtr $ # Maintainer: AndyRTR # Contributor: Gerhard Brauer # Contributor: Richard Murri pkgname=x2goclient -pkgver=4.0.0.3 -pkgrel=2 +pkgver=4.0.1.0 +pkgrel=1 pkgdesc="x2go qt4 client" arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-the makedepends=('man2html') install=x2goclient.install source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e08fa2248f0882ee7ed6c5310d47fcfc') +md5sums=('ff223344915b9def9e9e5a01ae919532') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 48b2fe134..25d8a829b 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179012 2013-03-01 14:04:57Z andyrtr $ +# $Id: PKGBUILD 180593 2013-03-24 09:34:13Z andyrtr $ # Maintainer: AndyRTR # Contributor: Gerhard Brauer @@ -7,8 +7,8 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.0.0 -pkgrel=5 +pkgver=4.0.0.1 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/" @@ -20,7 +20,7 @@ options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('1fc38566832c30897c6583e7ffa1fda3' +md5sums=('85dc2a2d52e82eead744a51007155ff9' 'b09799f9203150dc1277a56058be48a8') build() { @@ -43,7 +43,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr DESTDIR="$pkgdir" install + make -j1 PREFIX=/usr DESTDIR="$pkgdir" install # systemd service file - only runs x2gocleansessions install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD index 773aa4dc7..30cbbc641 100644 --- a/libre/ecasound-libre/PKGBUILD +++ b/libre/ecasound-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=ecasound pkgname=ecasound-libre pkgver=2.9.0 -pkgrel=2 +pkgrel=2.1 pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)" arch=('i686' 'x86_64') url="http://www.eca.cx/ecasound/" -- cgit v1.2.3-54-g00ecf