From 31416859638d756d88136e4e0eb78027c16ac17f Mon Sep 17 00:00:00 2001 From: root Date: Sun, 24 Mar 2013 00:48:02 -0700 Subject: Sun Mar 24 00:47:57 PDT 2013 --- community/gambas3/PKGBUILD | 16 +++---- .../gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch | 45 ------------------ community/gambas3/uninstall-with-XDG_UTILS.patch | 13 ------ .../00fec992f5c760f546a1db933fb08325fc9cccbf.patch | 25 ++++++++++ community/libpinyin/PKGBUILD | 14 ++++-- community/meteorjs/PKGBUILD | 38 ++++++++++----- community/meteorjs/node010.patch | 11 +++++ community/pdf2djvu/PKGBUILD | 4 +- extra/calligra/PKGBUILD | 4 +- extra/colord-gtk/PKGBUILD | 6 +-- extra/colord/PKGBUILD | 8 ++-- extra/evas_generic_loaders/PKGBUILD | 4 +- extra/gnutls/PKGBUILD | 8 ++-- extra/inkscape/PKGBUILD | 4 +- extra/libreoffice/PKGBUILD | 26 +++-------- extra/nx/PKGBUILD | 16 +++++-- extra/nx/keyboard_rule.diff | 11 +++++ extra/nx/nx-cflags.patch | 54 ---------------------- extra/poppler/PKGBUILD | 16 +++---- extra/vigra/PKGBUILD | 17 +++---- extra/wayland/PKGBUILD | 11 ++--- libre/cups-filters-libre/PKGBUILD | 8 ++-- libre/gst-plugins-bad-libre/PKGBUILD | 2 +- libre/gstreamer0.10-bad-libre/PKGBUILD | 6 +-- libre/pacman-mirrorlist-libre/PKGBUILD | 2 +- libre/texlive-bin-libre/PKGBUILD | 6 +-- 26 files changed, 159 insertions(+), 216 deletions(-) delete mode 100644 community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch delete mode 100644 community/gambas3/uninstall-with-XDG_UTILS.patch create mode 100644 community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch create mode 100644 community/meteorjs/node010.patch create mode 100644 extra/nx/keyboard_rule.diff delete mode 100644 extra/nx/nx-cflags.patch diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 273129d0a..bbcdb0c64 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85767 2013-03-06 23:21:50Z lcarlier $ +# $Id: PKGBUILD 86854 2013-03-23 07:25:46Z bpiotrowski $ # Maintainer: Laurent Carlier # Contributor : sebikul @@ -16,19 +16,19 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') pkgver=3.4.0 -pkgrel=4 +pkgrel=6 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" license=('GPL2') groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' +makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' + 'zlib' 'mesa' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' - 'gmime' 'glu') + 'gmime') options=(!emptydirs) source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" fix-xfce4-terminal.patch) @@ -153,7 +153,7 @@ package_gambas3-gb-db-form() { } package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') + depends=('gambas3-gb-db' 'libmariadbclient') pkgdesc="MySQL database access component" cd ${srcdir}/fakeinstall @@ -335,7 +335,7 @@ package_gambas3-gb-gsl() { } package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') + depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext') pkgdesc="GTK+ toolkit OpenGL component" cd ${srcdir}/fakeinstall diff --git a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch b/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch deleted file mode 100644 index 61224b9b0..000000000 --- a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp gambas3-3.3.4/gb.jit/src/jit_codegen.cpp ---- gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp 2012-09-25 17:04:41.000000000 +0300 -+++ gambas3-3.3.4/gb.jit/src/jit_codegen.cpp 2012-12-25 03:55:54.000000000 +0200 -@@ -3614,7 +3614,7 @@ void TryExpression::codegen(){ - create_gep(temp_errcontext1, TARGET_BITS, 0, TARGET_BITS, 0)); - - llvm::Function* f = llvm::cast(get_global_function(_setjmp, 'i', "p")); -- f->addFnAttr(llvm::Attribute::ReturnsTwice); -+ f->addFnAttr(llvm::Attributes::ReturnsTwice); - - llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); - -@@ -3665,7 +3665,7 @@ void LargeTryExpression::codegen(){ - create_gep(temp_errcontext2, TARGET_BITS, 0, TARGET_BITS, 0)); - - llvm::Function* f = llvm::cast(get_global_function(_setjmp, 'i', "p")); -- f->addFnAttr(llvm::Attribute::ReturnsTwice); -+ f->addFnAttr(llvm::Attributes::ReturnsTwice); - - llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); - -diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp ---- gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp 2012-09-25 17:04:41.000000000 +0300 -+++ gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp 2012-12-25 03:38:36.000000000 +0200 -@@ -25,7 +25,7 @@ - - #include "llvm/Pass.h" - #include "llvm/Function.h" --#include "llvm/Support/IRBuilder.h" -+#include "llvm/IRBuilder.h" - #include "llvm/Support/raw_ostream.h" - - #include "main.h" -diff -upr gambas3-3.3.4.orig/gb.jit/src/jit.h gambas3-3.3.4/gb.jit/src/jit.h ---- gambas3-3.3.4.orig/gb.jit/src/jit.h 2012-09-25 17:04:41.000000000 +0300 -+++ gambas3-3.3.4/gb.jit/src/jit.h 2012-12-25 03:38:23.000000000 +0200 -@@ -39,7 +39,7 @@ - #include "llvm/Support/TargetSelect.h" - #include "llvm/Support/ManagedStatic.h" - #include "llvm/Support/raw_ostream.h" --#include "llvm/Support/IRBuilder.h" -+#include "llvm/IRBuilder.h" - #include "llvm/Support/DynamicLibrary.h" - #include "llvm/Support/CFG.h" - #include "llvm/PassManager.h" diff --git a/community/gambas3/uninstall-with-XDG_UTILS.patch b/community/gambas3/uninstall-with-XDG_UTILS.patch deleted file mode 100644 index 0b7b9b8d7..000000000 --- a/community/gambas3/uninstall-with-XDG_UTILS.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur gambas3-3.4.0/main/Makefile.am gambas3-3.4.0b/main/Makefile.am ---- gambas3-3.4.0/main/Makefile.am 2013-02-03 19:20:59.000000000 +0000 -+++ gambas3-3.4.0b/main/Makefile.am 2013-02-21 15:28:16.941250567 +0000 -@@ -27,5 +27,7 @@ - uninstall-local: - @rm -f $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION) - @rm -rf $(DESTDIR)$(gblibdir)/info -- @xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; -- @xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; -+ @if test x"$(XDG_UTILS)" != x; then \ -+ xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; \ -+ xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; \ -+ fi diff --git a/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch b/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch new file mode 100644 index 000000000..c895adf4c --- /dev/null +++ b/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch @@ -0,0 +1,25 @@ +From 00fec992f5c760f546a1db933fb08325fc9cccbf Mon Sep 17 00:00:00 2001 +From: Peng Wu +Date: Sat, 23 Mar 2013 09:52:46 +0800 +Subject: [PATCH] fixes import dict + +--- + src/storage/phrase_large_table2.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/storage/phrase_large_table2.h b/src/storage/phrase_large_table2.h +index 368d03d..34bb12d 100644 +--- a/src/storage/phrase_large_table2.h ++++ b/src/storage/phrase_large_table2.h +@@ -133,7 +133,7 @@ static inline int reduce_tokens(const PhraseTokens tokens, + } + + /* the following line will be removed in future after code are verified. */ +- assert(0 == num || 1 == num); ++ assert(0 <= num && num <= 3); + + return num; + } +-- +1.8.1.5 + diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 08c377e9d..12b2c07a0 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 86670 2013-03-21 01:28:41Z fyan $ +# $Id: PKGBUILD 86857 2013-03-23 08:32:34Z fyan $ # Maintainer: Felix Yan # Contributor: Yangtse # Contributor: WU Jun pkgname=libpinyin pkgver=0.8.93 -pkgrel=1 -pkgdesc="Library to deal with pinyin." +pkgrel=2 +pkgdesc="Library to deal with pinyin" arch=('i686' 'x86_64') url="https://github.com/libpinyin/libpinyin" license=('GPL') depends=('db' 'glib2') options=(!libtool) source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz" - "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz") + "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz" + "https://github.com/epico/libpinyin/commit/00fec992f5c760f546a1db933fb08325fc9cccbf.patch") noextract=("model5.text.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../00fec992f5c760f546a1db933fb08325fc9cccbf.patch + cp "${srcdir}/model5.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/" sed -i '/wget.*model5\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am @@ -30,4 +33,5 @@ package() { make DESTDIR="${pkgdir}" install } md5sums=('1d9a768496c8a4368d3488639cadd554' - 'a83812e2d3be5695be54f95d9d7a3aa0') + 'a83812e2d3be5695be54f95d9d7a3aa0' + '2163a85183c36f69d65d19b2bc9e2c9b') diff --git a/community/meteorjs/PKGBUILD b/community/meteorjs/PKGBUILD index 76a775371..26ec54615 100644 --- a/community/meteorjs/PKGBUILD +++ b/community/meteorjs/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86490 2013-03-18 11:33:33Z mtorromeo $ +# $Id: PKGBUILD 86868 2013-03-23 12:46:57Z mtorromeo $ # Maintainer: Massimiliano Torromeo # Contributor: Parth Buch # Contributor: Tom Vincent pkgname=meteorjs pkgver=0.5.9 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source platform for building top-quality web apps in a fraction of the time." arch=('i686' 'x86_64') url="https://github.com/meteor/meteor" @@ -14,7 +14,8 @@ depends=('nodejs' 'mongodb') options=('!strip') sha256sums=('43e228e09c66bc167108c2a8375e23e472d19e82b216ad0875efed94073ef5ba' - 'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7') + 'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7' + 'af74a9bd6fa7c8c556f7ed17e76983ff416309b02c0e86c97d1606236f2dd39e') if [ "$CARCH" = "x86_64" ]; then _arch="amd64" @@ -23,19 +24,31 @@ else sha256sums[0]='f28ca14d923e19e1035adff506cac8f839c1ec97410d4617a2c2a20cc733d879' fi -source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor) +source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor node010.patch) + +build() { + [ -d build ] && rm -rf build + mkdir build + tar xf data.tar.gz -C build ./usr/lib/meteor + cd build/usr/lib/meteor + + patch -p0 -i "$srcdir/node010.patch" + + # rebuild fibers + cd lib/node_modules/fibers/ + rm -rf bin/* + PATH="/usr/lib/node_modules/npm/bin/node-gyp-bin:$PATH" node build.js + rm -rf build +} package() { - tar xf data.tar.gz -C "$pkgdir" ./usr/lib/meteor + cp -a "$srcdir/build/"* "$pkgdir" + cd "$pkgdir/usr/lib/meteor" - install -Dm644 "$pkgdir/usr/lib/meteor/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" install -Dm755 "$srcdir/meteor" "$pkgdir/usr/bin/meteor" - cd "$pkgdir/usr/lib/meteor" - rm -rf LICENSE.txt lib/node lib/dtrace lib/node_modules/npm share include \ - lib/node_modules/mongodb/node_modules/bson/build/Release/obj.target/bson.node \ - lib/node_modules/websocket/build/Release/obj.target/xor.node \ - lib/node_modules/websocket/build/Release/obj.target/validation.node + rm -rf LICENSE.txt lib/node lib/dtrace lib/node_modules/npm share include # mongodb links rm -rf mongodb @@ -49,4 +62,7 @@ package() { ln -s /usr/bin/node bin/node ln -s /usr/bin/node-waf bin/node-waf ln -s /usr/bin/npm bin/npm + + # remove build dirs + find -type d -name build -exec rm -rf {} + } diff --git a/community/meteorjs/node010.patch b/community/meteorjs/node010.patch new file mode 100644 index 000000000..8b252399d --- /dev/null +++ b/community/meteorjs/node010.patch @@ -0,0 +1,11 @@ +--- lib/node_modules/connect/lib/middleware/static.js.orig 2013-03-23 13:30:36.479309260 +0100 ++++ lib/node_modules/connect/lib/middleware/static.js 2013-03-23 13:30:13.661917828 +0100 +@@ -126,7 +126,7 @@ + if (!root && ~path.indexOf('..')) return utils.forbidden(res); + + // join / normalize from optional root dir +- path = normalize(join(root, path)); ++ path = normalize(join(root || '', path)); + + // malicious path + if (root && 0 != path.indexOf(root)) return fn diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index a032ac75e..92ef3dedd 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82217 2013-01-12 08:15:31Z andrea $ +# $Id: PKGBUILD 86853 2013-03-23 07:25:44Z bpiotrowski $ # Contributor: Paulo Matias # Maintainer: Jelle van der Waa pkgname=pdf2djvu pkgver=0.7.16 -pkgrel=1 +pkgrel=2 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 2ed945e90..b01af8eee 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179991 2013-03-13 21:33:19Z andrea $ +# $Id: PKGBUILD 180550 2013-03-23 07:23:55Z bpiotrowski $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -18,7 +18,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/colord-gtk/PKGBUILD b/extra/colord-gtk/PKGBUILD index 46415c588..d218302e2 100644 --- a/extra/colord-gtk/PKGBUILD +++ b/extra/colord-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175994 2013-01-25 16:27:49Z ioni $ +# $Id: PKGBUILD 180561 2013-03-23 09:51:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Ionut Biru pkgname=colord-gtk -pkgver=0.1.24 +pkgver=0.1.25 pkgrel=1 pkgdesc="GTK integration for libcolord" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('lcms2' 'gtk3' 'colord') makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc') source=($url/releases/$pkgname-$pkgver.tar.xz) options=('!libtool') -sha1sums=('6711d50d45150e54ebcfcd8d242b6a0d83ac73c2') +sha1sums=('ffb27568ff25860fbcc09cc32ba05469655b099d') build() { cd "$pkgname-$pkgver" diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 2976ba21e..04cba601c 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180252 2013-03-18 22:06:34Z heftig $ +# $Id: PKGBUILD 180560 2013-03-23 09:51:07Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Ionut Biru pkgname=colord -pkgver=0.1.30 -pkgrel=2 +pkgver=0.1.31 +pkgrel=1 pkgdesc="System daemon for managing color devices" arch=(i686 x86_64) url="http://www.freedesktop.org/software/colord" @@ -16,7 +16,7 @@ options=('!libtool') install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('54442a4736192aab65a7fa306142ae1cc30cda15') +sha1sums=('f4a00282aaae0fb8a5d24abfc78377e010261e75') build() { cd $pkgname-$pkgver diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 0c227f4dd..300515304 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175032 2013-01-12 08:15:25Z andyrtr $ +# $Id: PKGBUILD 180552 2013-03-23 07:23:57Z bpiotrowski $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=evas_generic_loaders pkgver=1.7.5 -pkgrel=2 +pkgrel=3 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') url="http://www.enlightenment.org" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index c3a4e00a2..bb04902df 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178865 2013-02-27 20:55:22Z andyrtr $ +# $Id: PKGBUILD 180567 2013-03-23 15:06:13Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgname=gnutls -pkgver=3.1.9 +pkgver=3.1.10 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ options=('!libtool' '!zipman') depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('valgrind' 'strace' 'datefudge') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('0674032fe6de0d90d08eed81fcac2e1d' - '503f49f55459ef4229fa4f35841fde2f') +md5sums=('9e73aa5c3ef3b7358159a31302e25aa7' + '062dd4fe7d527dadbb3d9e9fb240510f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 8c5257506..febf4bc16 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180311 2013-03-20 02:35:33Z eric $ +# $Id: PKGBUILD 180553 2013-03-23 07:23:58Z bpiotrowski $ # Maintainer: Gaetan Bisson # Contributor: Tobias Kieslich # Contributor: tobias pkgname=inkscape pkgver=0.48.4 -pkgrel=4 +pkgrel=5 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 4bf3fb358..8bd7cf113 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179822 2013-03-09 21:04:13Z andyrtr $ +# $Id: PKGBUILD 180554 2013-03-23 07:24:00Z bpiotrowski $ # 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=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.20.5' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -275,7 +275,7 @@ 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" - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.20.5" + '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' @@ -344,7 +344,6 @@ package_libreoffice-base() { install=libreoffice-base.install depends=('libreoffice-common') optdepends=('libreoffice-postgresql-connector') - backup=() groups=('libreoffice') replaces=('libreoffice') @@ -389,9 +388,9 @@ package_libreoffice-postgresql-connector() { package_libreoffice-calc() { pkgdesc="Spreadsheet application for LibreOffice." install=libreoffice-calc.install - depends=('libreoffice-common' 'lpsolve' ) - optdepends=() - backup=() + #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 groups=('libreoffice') replaces=('libreoffice') @@ -413,8 +412,6 @@ package_libreoffice-draw() { pkgdesc="Drawing Application for LibreOffice." install=libreoffice-draw.install depends=('libreoffice-common') - optdepends=() - backup=() groups=('libreoffice') replaces=('libreoffice') @@ -435,7 +432,6 @@ package_libreoffice-draw() { package_libreoffice-gnome() { pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3 - backup=() groups=('libreoffice') # create directories from *list.txt file @@ -457,7 +453,6 @@ package_libreoffice-impress() { install=libreoffice-impress.install depends=('libreoffice-common') optdepends=('glu: for the OGLTrans extension') - backup=() groups=('libreoffice') replaces=('libreoffice') @@ -499,8 +494,6 @@ package_libreoffice-kde4() { package_libreoffice-math() { pkgdesc="Equation Editor Application for LibreOffice." depends=('libreoffice-common') - optdepends=() - backup=() groups=('libreoffice') replaces=('libreoffice') @@ -521,8 +514,6 @@ package_libreoffice-math() { package_libreoffice-sdk() { pkgdesc="Software Development Kit for LibreOffice." depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - optdepends=() - backup=() groups=('libreoffice') # create directories from *list.txt file @@ -545,8 +536,6 @@ package_libreoffice-sdk() { package_libreoffice-sdk-doc() { pkgdesc="Software Development Kit documentation for LibreOffice" depends=('libreoffice-common' 'libreoffice-sdk') - optdepends=() - backup=() groups=('libreoffice') # create directories from *list.txt file @@ -571,7 +560,6 @@ package_libreoffice-writer() { install=libreoffice-writer.install depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') - backup=() groups=('libreoffice') replaces=('libreoffice') diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 955f8d778..93d5028e3 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175081 2013-01-13 09:33:31Z andyrtr $ +# $Id: PKGBUILD 180572 2013-03-23 15:42:01Z andyrtr $ # Maintainer: Andreas Radke pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') -pkgver=3.5.0.17 -pkgrel=3 +pkgver=3.5.0.18 +pkgrel=1 arch=('i686' 'x86_64') url="http://wiki.x2go.org/" license=('GPL') @@ -12,12 +12,18 @@ license=('GPL') makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime dependencies from subpackages 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends ) -source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz) -md5sums=('aac9a999d4b38dedd476409e5fc2c4aa') +source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz + keyboard_rule.diff) +md5sums=('cb321b520c3e157619e4ed5315c9e44c' + 'f681bc66827cd7ddff4b81b983c20401') build() { cd "${srcdir}/nx-libs-$pkgver" + # fix keyboard layout with xkeyboard-config >= 2.6 - doesn't solve proper layout detection + # upstream needs to do much more work in that area + patch -Np1 -i ${srcdir}/keyboard_rule.diff + # debug flags # export CFLAGS="-march=x86-64 -O1 -g -pipe" # export CXXFLAGS="-march=x86-64 -O1 -g -pipe" diff --git a/extra/nx/keyboard_rule.diff b/extra/nx/keyboard_rule.diff new file mode 100644 index 000000000..dccab160b --- /dev/null +++ b/extra/nx/keyboard_rule.diff @@ -0,0 +1,11 @@ +--- nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c 2013-01-04 13:25:49.000000000 +0100 ++++ nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c.new 2013-03-15 18:24:54.084216888 +0100 +@@ -140,7 +140,7 @@ + #define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" + #endif + #ifndef XKB_DFLT_RULES_FILE +-#define XKB_DFLT_RULES_FILE "xfree86" ++#define XKB_DFLT_RULES_FILE "base" + #endif + #ifndef XKB_ALTS_RULES_FILE + #define XKB_ALTS_RULES_FILE "xorg" diff --git a/extra/nx/nx-cflags.patch b/extra/nx/nx-cflags.patch deleted file mode 100644 index 35562939c..000000000 --- a/extra/nx/nx-cflags.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100 -+++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100 -@@ -7,8 +7,7 @@ - - dnl Set our default compilation flags. - --CXXFLAGS="-O3 -fno-rtti -fno-exceptions" --CFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" - - dnl Reset default linking directives. - ---- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100 -+++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(NXlib.h) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CFLAGS="-O3" -- - dnl Reset default linking directives. - - LIBSTATIC="" ---- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100 -+++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(Shadow.h) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- - dnl Reset default linking directives. - - LIBSTATIC="" ---- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100 -+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(Main.c) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- - dnl Prefer headers and libraries from nx-X11 if present. - - if test -d "../nx-X11/exports/include" ; then diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 5f328fd67..32e197ba7 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178974 2013-03-01 10:22:47Z andrea $ +# $Id: PKGBUILD 180549 2013-03-23 07:23:53Z bpiotrowski $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.1 -pkgrel=3 +pkgver=0.22.2 +pkgrel=1 arch=(i686 x86_64) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') @@ -13,13 +13,15 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('50c259fdda538c1ba94b62aa25f7ec87' +md5sums=('3939740201c59c470bc7198003450a20' '9dc64c254a31e570507bdd4ad4ba629a') build() { . /etc/profile.d/qt4.sh - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}" + ln -sf test-${_testtag} test + cd ${pkgbase}-${pkgver} sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac @@ -36,9 +38,7 @@ build() { } check() { - cd "${srcdir}" - ln -sf test-${_testtag} test - cd ${pkgbase}-${pkgver} + cd "${srcdir}/${pkgbase}-${pkgver}" LANG=en_US.UTF8 make check } diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index fe4b87cda..de2f174dc 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,29 +1,24 @@ -# $Id: PKGBUILD 148954 2012-02-05 11:57:34Z ibiru $ +# $Id: PKGBUILD 180557 2013-03-23 09:37:02Z andyrtr $ # Maintainer: AndyRTR # Contributor: Lukas Jirkovsky pkgbase=vigra pkgname=('vigra' 'vigra-doc') -pkgver=1.8.0 -pkgrel=3 +pkgver=1.9.0 +pkgrel=1 arch=('i686' 'x86_64') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') makedepends=(# runtime deps 'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' # additional makedeps - 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') + 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy') options=('!libtool') -source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz - vigra-1.7.1.gcc460.patch) -md5sums=('15c5544448e529ee60020758ab6be264' - '25ef8bc26bc38ee67e5b512d2acd0166') -sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2' - '1de6381a74dd136ea25df5a27f249187b0dbd17e') +source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz) +md5sums=('b6155afe1ea967917d2be16d98a85404') build() { cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DWITH_VIGRANUMPY=1 \ diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 3342dd822..d1596f352 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178061 2013-02-15 01:24:43Z tomegun $ +# $Id: PKGBUILD 180543 2013-03-23 00:31:47Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb pkgname=wayland -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -17,7 +17,8 @@ source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --disable-static make } @@ -26,6 +27,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } - -# vim:set ts=2 sw=2 et: -md5sums=('e2e9ebfbaf9b013471c620b99938d764') +md5sums=('936a2590aea69fa3c0cf234d54b9137c') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 939410301..7d812a0d6 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 179657 2013-03-09 09:03:03Z andyrtr $ +# $Id: PKGBUILD 180418 2013-03-21 18:28:18Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.30 +pkgver=1.0.31 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters (without foomatic-db-nonfree recommendation)" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0') +depends=('lcms2' 'poppler>=0.22.2' 'qpdf>=4.0.0') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' @@ -19,7 +19,7 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) -md5sums=('0d338e63f445e98d29c963620e5b1420' +md5sums=('5cc999de2ca310e042adb8cb658b9445' '4c9f97eae201798000483c4e7109e690') replaces=("${_pkgname}") conflicts=("${_pkgname}") diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 7a12f8ca9..a1a0d68b0 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=gst-plugins-bad pkgname=gst-plugins-bad-libre pkgver=1.0.6 pkgrel=1 -pkgdesc='GStreamer Multimedia Framework Bad Plugins, with nonfree faac support removed and Parabola rebranded' +pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' arch=( i686 x86_64 diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 30c475d39..1fddeb016 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 168313 2012-10-08 14:04:19Z heftig $ # Maintainer: Jan de Groot # Maintainer (Parabola): fauno -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') @@ -33,7 +33,7 @@ build() { #} package_gstreamer0.10-bad-libre() { - pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), with non free faac support removed and Parabola rebranded" + pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), without nonfree faac support" depends=('gstreamer0.10-base>=0.10.34') provides=("gstreamer0.10-bad=$pkgver") conflicts=('gstreamer0.10-bad') @@ -44,7 +44,7 @@ package_gstreamer0.10-bad-libre() { } package_gstreamer0.10-bad-libre-plugins() { - pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), with non free faac support removed and Parabola rebranded" + pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), without nonfree faac support" depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus') groups=('gstreamer0.10-plugins') install=gstreamer0.10-bad-plugins.install diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD index 6563cff19..c29fe14f5 100644 --- a/libre/pacman-mirrorlist-libre/PKGBUILD +++ b/libre/pacman-mirrorlist-libre/PKGBUILD @@ -15,7 +15,7 @@ source=(mirrorlist::${url}) conflicts=(pacman-mirrorlist) replaces=(pacman-mirrorlist) provides=(pacman-mirrorlist) -md5sums=('0ee6833595a007a60ca36eca98ae9781') +md5sums=('d83594593b9856ae1c0a22f16af94520') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 4a9d427ef..674e047bf 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174736 2013-01-05 21:14:18Z remy $ +# $Id: PKGBUILD 180321 2013-03-20 07:47:12Z remy $ # Maintainer: Rémy Oudompheng # Contributor: francois # Maintainer (Parabola): Michał Masłowski @@ -6,8 +6,8 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=7 -pkgdesc="TeX Live binaries" +pkgrel=8 +pkgdesc="TeX Live binaries, Parabola rebranded" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') -- cgit v1.2.3-54-g00ecf