diff options
61 files changed, 170 insertions, 1637 deletions
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 78104d2e7..229fa1f51 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 <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -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' 'mips64el') 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<llvm::Function>(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<llvm::Function>(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 <alexepico@gmail.com> +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 9e48633d8..1ec2b0265 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 <felixonmars@gmail.com> # Contributor: Yangtse <yangtsesu@gmail.com> # Contributor: WU Jun <quark at lihdd dot net> 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' 'mips64el') 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 <massimiliano.torromeo@gmail.com> # Contributor: Parth Buch <parthbuch115 at gmail dot com> # Contributor: Tom Vincent <http://tlvince.com/contact/> 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 c7fad70bb..2f4ae6bd6 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 <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.16 -pkgrel=1 +pkgrel=2 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index b3f4f689b..4ed0f8643 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 <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,7 +18,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/colord-gtk/PKGBUILD b/extra/colord-gtk/PKGBUILD index 2cf608a6e..0cd7710ce 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) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord-gtk -pkgver=0.1.24 +pkgver=0.1.25 pkgrel=1 pkgdesc="GTK integration for libcolord" arch=('i686' 'x86_64' 'mips64el') @@ -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 6284d818d..6da4df885 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) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> 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' 'mips64el') 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 bc046ff9b..6e88e88f2 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 <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders pkgver=1.7.5 -pkgrel=2.1 +pkgrel=3 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD deleted file mode 100644 index 3a561a5f5..000000000 --- a/extra/gnome-menus/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 175187 2013-01-16 10:52:05Z jgc $ -# Maintainer: Jan de Groot <jan@archlinux.org> - -pkgname=gnome-menus -pkgver=3.6.2 -pkgrel=1 -pkgdesc="GNOME menu specifications" -arch=('i686' 'x86_64' 'mips64el') -depends=('glib2' 'python2-gobject') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool') -license=('GPL' 'LGPL') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - menus.patch) -sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f' - 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') - -build() { - cd "$pkgname-$pkgver" - - patch -Np0 -i "$srcdir/menus.patch" - - PYTHON=/usr/bin/python2 ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package(){ - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - sed -i "1s|#!/usr/bin/env python$|&2|" \ - "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" -} diff --git a/extra/gnome-menus/menus.patch b/extra/gnome-menus/menus.patch deleted file mode 100644 index bf73e86cd..000000000 --- a/extra/gnome-menus/menus.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- layout/applications.menu 2005-06-28 10:16:39.000000000 +0200 -+++ layout/applications.menu 2005-09-12 23:21:20.000000000 +0200 -@@ -7,7 +7,6 @@ - <Directory>Applications.directory</Directory> - - <!-- Scan legacy dirs first, as later items take priority --> -- <KDELegacyDirs/> - <LegacyDir>/etc/X11/applnk</LegacyDir> - <LegacyDir>/usr/share/gnome/apps</LegacyDir> - -@@ -18,6 +17,14 @@ - <!-- Read in overrides and child menus from applications-merged/ --> - <DefaultMergeDirs/> - -+ <!-- Archlinux submenu --> -+ <Menu> -+ <Name>Archlinux</Name> -+ <Directory>Archlinux.directory</Directory> -+ <Include> -+ <Category>Archlinux</Category> -+ </Include> -+ </Menu> <!-- End Archlinux --> - <!-- Accessories submenu --> - <Menu> - <Name>Accessories</Name> diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 65b738e44..36d87ad95 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 <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> 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' 'mips64el') @@ -15,8 +15,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p1 makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') 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/libre/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index 4cbaddd1e..3d0b13a61 100644 --- a/libre/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,12 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 153259 2012-03-12 16:05:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=1.2 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=1 +arch=('i686' 'x86_64') license=('LGPL') makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') url="http://gstreamer.freedesktop.org/" @@ -23,16 +22,21 @@ build() { --disable-schemas-install \ --disable-hal \ --disable-esd \ - --with-package-name="GStreamer Good Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" + --with-package-name="GStreamer Good Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" make sed -e 's/gst sys ext/gst/' -i Makefile } +check() { + cd "${srcdir}/gst-plugins-good-${pkgver}" + make check +} + package_gstreamer0.10-good() { depends=('gstreamer0.10-base>=0.10.34' 'bzip2') - pkgdesc="GStreamer Multimedia Framework Good plugin libraries, Parabola rebranded" + pkgdesc="GStreamer Multimedia Framework Good plugin libraries" cd "${srcdir}/gst-plugins-good-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install @@ -41,7 +45,7 @@ package_gstreamer0.10-good() { package_gstreamer0.10-good-plugins() { depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') - pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good), Parabola rebranded" + pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" groups=('gstreamer0.10-plugins') replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') diff --git a/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install index e343beea5..e343beea5 100644 --- a/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install +++ b/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 9d36b0413..d340e2fa3 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 <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> 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 <andyrtr@archlinux.org> 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 4893e36fd..7bfe5dd38 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 <andyrtr@archlinux.org> 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' 'mips64el') 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 71f807945..a0bb773a8 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 <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.1 -pkgrel=3 +pkgver=0.22.2 +pkgrel=1 arch=(i686 x86_64 mips64el) 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/usermin/PKGBUILD b/extra/usermin/PKGBUILD deleted file mode 100644 index fbf60fa7e..000000000 --- a/extra/usermin/PKGBUILD +++ /dev/null @@ -1,134 +0,0 @@ -# $Id: PKGBUILD 179315 2013-03-05 11:21:55Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=usermin -pkgver=1.540 -pkgrel=1 -pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding" -arch=(i686 x86_64 'mips64el') -license=('custom:usermin') -url="http://www.webmin.com/" -depends=('perl' 'webmin') -makedepends=('perl-net-ssleay') -backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \ -'etc/usermin/at/config' \ -'etc/usermin/man/config' \ -'etc/usermin/ssh/config' \ -'etc/usermin/chfn/config' \ -'etc/usermin/cron/config' \ -'etc/usermin/file/config' \ -'etc/usermin/plan/config' \ -'etc/usermin/proc/config' \ -'etc/usermin/spam/config' \ -'etc/usermin/htaccess/config' \ -'etc/usermin/cshrc/config' \ -'etc/usermin/gnupg/config' \ -'etc/usermin/mysql/config' \ -'etc/usermin/quota/config' \ -'etc/usermin/shell/config' \ -'etc/usermin/theme/config' \ -'etc/usermin/mailbox/config' \ -'etc/usermin/schedule/config' \ -'etc/usermin/config' \ -'etc/usermin/commands/config' \ -'etc/usermin/htaccess-htpasswd/config' \ -'etc/usermin/forward/config' \ -'etc/usermin/telnet/config' \ -'etc/usermin/tunnel/config' \ -'etc/usermin/updown/config' \ -'etc/usermin/procmail/config' \ -'etc/usermin/fetchmail/config' \ -'etc/usermin/changepass/config' \ -'etc/usermin/language/config' \ -'etc/usermin/postgresql/config' \ -'etc/usermin/usermount/config' \ -) -install=usermin.install -source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz - usermin.rc - usermin.service - ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) - -package() { - cd "$srcdir"/$pkgname-$pkgver - - # remove modules we do not support - - #remove config files from other distros - rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') - - # remove caldera theme - rm -rf caldera - - # remove init-scripts from other distros - rm usermin-init - rm usermin-daemon - - # setting perl path - (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - - - # create dirs - mkdir -p "$pkgdir"/opt/usermin - mkdir -p "$pkgdir"/var/log/usermin - mkdir -p "$pkgdir"/etc/usermin - - # install pam stuff - install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin - - # remove other distros and add only Archlinux don't change next line else it will not work! - rm os_list.txt - echo 'Archlinux Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt - - # copy stuff to right dirs - cd "$srcdir"/$pkgname-$pkgver - cp -rp * "$pkgdir"/opt/usermin - cd "$srcdir"/usermin-config - cp -rfp * "$pkgdir"/opt/usermin - - # define parameters for setup.sh - config_dir="$pkgdir"/etc/usermin - var_dir="$pkgdir"/var/log/usermin - perl=/usr/bin/perl - autoos=1 - port=20000 - login=root - crypt="XXX" - ssl=1 - atboot=0 - nostart=1 - nochown=1 - autothird=1 - nouninstall=1 - noperlpath=1 - atbootyn=n - tempdir="$pkgdir"/tmp - export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt - - # Fix setup.sh - sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh - "$pkgdir"/opt/usermin/setup.sh - - # Fixup the config files to use their real locations - sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf - find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \; - - # make it only accessible by localhost - echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf - - # enable user and password login - sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf - - #install systemd service file - install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service - - #install rc file - install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin - - # delete temp dir - rm -r "$pkgdir"/tmp - #install license - install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE -} -md5sums=('d29c9fdebab14c168c33bde8906efe21' - 'cfef4490cd1ef9517c0b39a7bd75c968' - 'a5bd5e5ee779f8a3cf3d776ca77ee36e' - 'ec37a79f948f778224550930d2a7ca07') diff --git a/extra/usermin/usermin-config.tar.bz2 b/extra/usermin/usermin-config.tar.bz2 Binary files differdeleted file mode 100644 index 056bb6298..000000000 --- a/extra/usermin/usermin-config.tar.bz2 +++ /dev/null diff --git a/extra/usermin/usermin.install b/extra/usermin/usermin.install deleted file mode 100644 index 3ace10ea2..000000000 --- a/extra/usermin/usermin.install +++ /dev/null @@ -1,34 +0,0 @@ -# arg 1: the new package version -post_install() { - local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :) - crypt=${crypt//\\/\\\\} - crypt=${crypt//\//\\\/} - sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users -cat << EOF -Note: -==> It is not allowed to install 3rd party modules, or delete existing modules. -==> Please write your own PKGBUILDS for 3rd party modules and additional themes. -Setup: -==> To make usermin start at boot time, add usermin to rc.conf daemons -==> Point your web browser to http://localhost:20000 to use usermin. -==> To change the modules setup please use webmin. - -==> The access is restricted to localhost, if you want to connect from other locations -==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip> -==> If you want to have ssl encryption please install 'perl-net-ssleay' additional. -EOF -# fix man module - cd /opt/usermin/man - gzip -df $(find . -name '*.gz') -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -pre_remove() { - # uninstall unzipped files - rm -r /opt/usermin/man -} diff --git a/extra/usermin/usermin.rc b/extra/usermin/usermin.rc deleted file mode 100644 index af365780a..000000000 --- a/extra/usermin/usermin.rc +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -start=/etc/usermin/start -stop=/etc/usermin/stop -lockfile=/var/lock/usermin - -case "$1" in -'start') - stat_busy "Starting Usermin daemon" - $start >/dev/null 2>&1 </dev/null - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - touch $lockfile >/dev/null 2>&1 - stat_done - else - stat_fail -fi -;; - -'stop') - stat_busy "Stopping Usermin daemon" - $stop >/dev/null 2>&1 </dev/null - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - rm -f $lockfile - stat_done - else - stat_fail -fi -;; - -'restart') - $stop && $start - RETVAL=$? -;; -*) -echo "Usage: $0 { start | stop | restart }" -RETVAL=1 -;; -esac -exit $RETVAL
\ No newline at end of file diff --git a/extra/usermin/usermin.service b/extra/usermin/usermin.service deleted file mode 100644 index e91164c63..000000000 --- a/extra/usermin/usermin.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Usermin - -[Service] -Type=forking -ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf - -[Install] -WantedBy=multi-user.target diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 1685b05ec..61ffeb9d1 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148954 2012-02-05 11:57:34Z ibiru $ +# $Id: PKGBUILD 180557 2013-03-23 09:37:02Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -12,18 +12,13 @@ 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' 'python2-nose' 'doxygen' 'python-sphinx' 'boost' 'python2-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=('b6155afe1ea967917d2be16d98a85404' - '25ef8bc26bc38ee67e5b512d2acd0166') -sha1sums=('6e4981f4ce75932ec62df6523f577c327f885ba0' - '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 65879aa33..8d35420c9 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 <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64' 'mips64el') @@ -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/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD deleted file mode 100644 index 4cccaf3a3..000000000 --- a/extra/webmin/PKGBUILD +++ /dev/null @@ -1,221 +0,0 @@ -# $Id: PKGBUILD 179317 2013-03-05 11:25:58Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=webmin -pkgver=1.620 -pkgrel=1 -pkgdesc="a web-based interface for system administration" -arch=(i686 x86_64 'mips64el') -license=('custom:webmin') -url="http://www.webmin.com/" -depends=('perl' 'perl-perl4-corelibs') -makedepends=('perl-net-ssleay') -backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \ -'etc/webmin/pacman/config' \ -'etc/webmin/at/config' \ -'etc/webmin/acl/config' \ -'etc/webmin/lvm/config' \ -'etc/webmin/net/config' \ -'etc/webmin/nis/config' \ -'etc/webmin/pam/config' \ -'etc/webmin/cron/config' \ -'etc/webmin/file/config' \ -'etc/webmin/grub/config' \ -'etc/webmin/init/config' \ -'etc/webmin/ipfw/config' \ -'etc/webmin/lilo/config' \ -'etc/webmin/proc/config' \ -'etc/webmin/raid/config' \ -'etc/webmin/spam/config' \ -'etc/webmin/sshd/config' \ -'etc/webmin/time/config' \ -'etc/webmin/cluster-passwd/config' \ -'etc/webmin/software/config' \ -'etc/webmin/webminlog/config' \ -'etc/webmin/cluster-webmin/config' \ -'etc/webmin/bind8/config' \ -'etc/webmin/dhcpd/config' \ -'etc/webmin/fdisk/config' \ -'etc/webmin/mount/config' \ -'etc/webmin/mysql/config' \ -'etc/webmin/quota/config' \ -'etc/webmin/samba/config' \ -'etc/webmin/shell/config' \ -'etc/webmin/squid/config' \ -'etc/webmin/adsl-client/config' \ -'etc/webmin/servers/config' \ -'etc/webmin/cluster-shell/config' \ -'etc/webmin/bandwidth/config' \ -'etc/webmin/ppp-client/config' \ -'etc/webmin/lpadmin/config' \ -'etc/webmin/apache/config' \ -'etc/webmin/firewall/config' \ -'etc/webmin/stunnel/config' \ -'etc/webmin/burner/config' \ -'etc/webmin/exports/config' \ -'etc/webmin/backup-config/config' \ -'etc/webmin/custom/config' \ -'etc/webmin/htaccess-htpasswd/config' \ -'etc/webmin/logrotate/config' \ -'etc/webmin/format/config' \ -'etc/webmin/fsdump/config' \ -'etc/webmin/passwd/config' \ -'etc/webmin/cluster-useradmin/config' \ -'etc/webmin/cluster-software/config' \ -'etc/webmin/cluster-copy/config' \ -'etc/webmin/cluster-cron/config' \ -'etc/webmin/telnet/config' \ -'etc/webmin/status/config' \ -'etc/webmin/syslog/config' \ -'etc/webmin/updown/config' \ -'etc/webmin/usermin/config' \ -'etc/webmin/webmin/config' \ -'etc/webmin/xinetd/config' \ -'etc/webmin/openslp/config' \ -'etc/webmin/procmail/config' \ -'etc/webmin/fetchmail/config' \ -'etc/webmin/postgresql/config' \ -'etc/webmin/useradmin/config' \ -'etc/webmin/mailboxes/config' \ -'etc/webmin/inittab/config' \ -'etc/webmin/change-user/config' \ -'etc/webmin/postfix/config' \ -'etc/webmin/proftpd/config' \ -'etc/webmin/pserver/config' \ -'etc/webmin/dnsadmin/config' ) -install=webmin.install -source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz - ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 - ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 - webmin.rc - webmin.service) -options=(!strip) - -package() { - # NOTE: USE --asroot build option to avoid fakeroot error! - cd "$srcdir"/$pkgname-$pkgver - # add patches from webmin.com - #for i in ../*.wbm - #do tar xvf $i - #done - #for i in ../*.wbt - #do tar xvf $i - #done - # delete stuff that's not needed - rm -f mount/freebsd-mounts* - rm -f mount/openbsd-mounts* - rm -f mount/macos-mounts* - - # remove modules we do not support - rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin} - - #remove config files from other distros - rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') - - # remove caldera theme - rm -rf caldera - - # remove init-scripts from other distros - rm webmin-gentoo-init - rm webmin-init - rm webmin-caldera-init - rm webmin-daemon - - # remove update stuff to avoid problems with updating webmin,modules and themes without pacman - rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} - rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} - - # remove modules add because we don't want files installed without pacman control - rm -f webmin/{install_mod.cgi,delete_mod.cgi} - - # setting perl path - (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - - - # create dirs - mkdir -p "$pkgdir"/opt/webmin - mkdir -p "$pkgdir"/var/log/webmin - mkdir -p "$pkgdir"/etc/webmin - - # install pam stuff - install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin - - # remove other distros and add only Archlinux don't change next line else it will not work! - rm os_list.txt - echo 'Archlinux Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt - - # Add rc.conf support to boot and shutdown menu and lock editing of this module - cd init/ - sed -i -e 's:^local_down=.*:local_down=Archlinux RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') - sed -i -e 's:^local_script=.*:local_script=Archlinux RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') - sed -i -e 's:^index_downscript=.*:index_downscript=Archlinux RC.CONF:g' lang/* - sed -i -e 's:^index_script=.*:index_script=Archlinux RC.LOCAL:g' lang/* - sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl - - # Add pacman menu - cd "$srcdir"/$pkgname-$pkgver - cp -rf custom/ pacman - cp -rf mscstyle3/custom mscstyle3/pacman - sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl - sed -i -e '/desc/d' -e '/longdesc/d' pacman/module.info - sed -i -e 's:^name=Custom:name=Pacman:g' pacman/module.info - echo 'category=system' >> pacman/module.info - echo 'desc=Pacman' >> pacman/module.info - sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/* - - # copy stuff to right dirs - cd "$srcdir"/$pkgname-$pkgver - cp -rp * "$pkgdir"/opt/webmin - cd "$srcdir"/webmin-config - cp -rfp * "$pkgdir"/opt/webmin - - # define parameters for setup.sh - config_dir="$pkgdir"/etc/webmin - var_dir="$pkgdir"/var/log/webmin - perl=/usr/bin/perl - autoos=1 - port=10000 - login=root - crypt="XXX" - ssl=1 - atboot=0 - nostart=1 - nochown=1 - autothird=1 - nouninstall=1 - noperlpath=1 - atbootyn=n - tempdir="$pkgdir"/tmp - export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn - - # Fix setup.sh - sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh - "$pkgdir"/opt/webmin/setup.sh - - # Fixup the config files to use their real locations - sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf - find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; - - # make it only accessible by localhost - echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf - - # install pacman menu - cd "$srcdir"/webmin-pacman/config - cp -rfp * "$pkgdir"/etc/webmin/pacman - - #install rc file - install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin - - # install systemd files - install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service - - # delete temp dir - rm -r "$pkgdir"/tmp - # change sticky bit - chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux - # install license - install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE -} -md5sums=('e93bc5057a5b7d7e31ecb2bb228d7044' - 'b0b3e3fb231a12e60165b6b4d604dcfa' - 'bfebb75bb94029b48c46b7f1ba1aa811' - 'c77dfcd621b417a7826d25f56a1e60ae' - 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/extra/webmin/webmin-config.tar.bz2 b/extra/webmin/webmin-config.tar.bz2 Binary files differdeleted file mode 100644 index c7869eebf..000000000 --- a/extra/webmin/webmin-config.tar.bz2 +++ /dev/null diff --git a/extra/webmin/webmin-pacman.tar.bz2 b/extra/webmin/webmin-pacman.tar.bz2 Binary files differdeleted file mode 100644 index e8ad9fd7b..000000000 --- a/extra/webmin/webmin-pacman.tar.bz2 +++ /dev/null diff --git a/extra/webmin/webmin.install b/extra/webmin/webmin.install deleted file mode 100644 index efdd9291d..000000000 --- a/extra/webmin/webmin.install +++ /dev/null @@ -1,35 +0,0 @@ -# arg 1: the new package version -post_install() { - local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :) - crypt=${crypt//\\/\\\\} - crypt=${crypt//\//\\\/} - sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users - -cat << EOF -Note: -==> It is not allowed to install 3rd party modules, or delete existing modules. -==> Please write your own PKGBUILDS for 3rd party modules and additional themes. -Setup: -==> To make webmin start at boot time, add webmin to rc.conf daemons -==> Point your web browser to http://localhost:10000 to use webmin. -==> The access is restricted to localhost, if you want to connect from other locations -==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip> -==> If you want to have ssl encryption please install 'perl-net-ssleay' additional. -EOF -# fix man module - cd /opt/webmin/man - for i in $(find . -name '*.gz'); do - gzip -df $i - done -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -pre_remove() { - # uninstall unzipped files - rm -r /opt/webmin/man -} diff --git a/extra/webmin/webmin.rc b/extra/webmin/webmin.rc deleted file mode 100644 index 6aac8941d..000000000 --- a/extra/webmin/webmin.rc +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -start=/etc/webmin/start -stop=/etc/webmin/stop -lockfile=/var/lock/webmin - -case "$1" in -'start') - stat_busy "Starting Webmin daemon" - $start >/dev/null 2>&1 </dev/null - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - touch $lockfile >/dev/null 2>&1 - add_daemon webmin - stat_done - else - stat_fail -fi -;; - -'stop') - stat_busy "Stopping Webmin daemon" - $stop >/dev/null 2>&1 </dev/null - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - rm -f $lockfile - rm_daemon webmin - stat_done - else - stat_fail -fi -;; - -'restart') - $0 stop - $0 start -;; -*) -echo "Usage: $0 { start | stop | restart }" -RETVAL=1 -;; -esac -exit $RETVAL
\ No newline at end of file diff --git a/extra/webmin/webmin.service b/extra/webmin/webmin.service deleted file mode 100644 index a8a384a8c..000000000 --- a/extra/webmin/webmin.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Webmin - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/etc/webmin/start -ExecStop=/etc/webmin/stop - -[Install] -WantedBy=multi-user.target diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD deleted file mode 100644 index 7c8a888c6..000000000 --- a/extra/xsp/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 168400 2012-10-10 22:19:53Z tomegun $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=xsp -pkgver=2.10.2 -pkgrel=4 -pkgdesc="A simple webserver based on mono - provides ASP.NET support" -arch=(i686 x86_64) -license=('custom') -url="http://www.go-mono.com" -depends=('mono>=2.10.2' 'sqlite') -options=(!makeflags) -install=${pkgname}.install -source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2 - ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service) - -build() { - # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR=${srcdir}/src/weird - mkdir -p "${MONO_SHARED_DIR}" - # import pathes - # build - cd ${srcdir}/${pkgname}-${pkgver} - #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in - ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 - # tweak the xsp shellscript to grab system dll's - for script in scripts/*2; do - sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script - done - #destdir related bugfixes - sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile - sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/ install - # move test files from share to arch' default html home - mkdir -p ${pkgdir}/srv/http/html - mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp - rm -rf ${pkgdir}/usr/share - chown -R http:http ${pkgdir}/srv/http/html/${pkgname} - - # install a deamon - install -D -m755 ${srcdir}/${pkgname}.rc.d \ - ${pkgdir}/etc/rc.d/${pkgname} - # install a deamon configurationfile - install -D -m644 ${srcdir}/$pkgname.conf.d \ - ${pkgdir}/etc/conf.d/${pkgname} - # install a xsp configuration home - install -D -m644 ${srcdir}/${pkgname}.webapp \ - ${pkgdir}/etc/${pkgname}/${pkgname}.webapp - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - # install systemd service file - install -D -m644 ${srcdir}/${pkgname}.service \ - ${pkgdir}/usr/lib/systemd/system/xsp.service -} -md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' - '9575bd7d6f64d51ba05bdd6370665858' - '35d921df0fefc30f47a438c95d420efc' - 'c917c07f68b945691506c29750db482f' - '9d83bd36d209f8d36a11dfbc4fa50819') diff --git a/extra/xsp/xsp.conf.d b/extra/xsp/xsp.conf.d deleted file mode 100644 index 99d634929..000000000 --- a/extra/xsp/xsp.conf.d +++ /dev/null @@ -1,10 +0,0 @@ -# xsp options - - -# note that is just the helping app for mod_mono if you like production like -# quality -# xsp is for ASP testing mainly -- read the manpage for xsp to know what -# options are available. Archlinux will provide xsp configured by a .webapp -# configuration file which rests in /etc/xsp - -XSP_PARAMS="--appconfigdir /etc/xsp" diff --git a/extra/xsp/xsp.install b/extra/xsp/xsp.install deleted file mode 100644 index b8a8f3136..000000000 --- a/extra/xsp/xsp.install +++ /dev/null @@ -1,37 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - ---> xsp is just the helping app for mod_mono if you like a production like ---> server. xsp itself is for ASP testing mainly -- read the manpage for xsp ---> to know which options are available. ---> Archlinux will provide xsp configured by a .webapp configuration file ---> which rests in /etc/xsp. Just put your other webapp files there to let ---> xsp pick them up. ---> xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all ---> your arguments there. Don't forget that you can run xsp from the console ---> as oridinary user, which is safer and for testing absolutely sufficient!! - ---> You can run the testpages simply by starting the server and calling - http://localhost:8080 ---> from your browser's location bar - - -EOM -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} diff --git a/extra/xsp/xsp.rc.d b/extra/xsp/xsp.rc.d deleted file mode 100644 index b4fcda15c..000000000 --- a/extra/xsp/xsp.rc.d +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp - -PID=`pidof -o %PPID /usr/bin/mono` -case "$1" in - start) - stat_busy "Starting Xsp Daemon" - if [ -z "$PID" ]; then - /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon xsp - stat_done - fi - ;; - stop) - stat_busy "Stopping Xsp Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon xsp - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/xsp/xsp.service b/extra/xsp/xsp.service deleted file mode 100644 index 36b802e21..000000000 --- a/extra/xsp/xsp.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=XSP Web Server - -[Service] -ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop - -[Install] -WantedBy=multi-user.target diff --git a/extra/xsp/xsp.webapp b/extra/xsp/xsp.webapp deleted file mode 100644 index a685dd171..000000000 --- a/extra/xsp/xsp.webapp +++ /dev/null @@ -1,8 +0,0 @@ -<apps> - <web-application> - <name>Root</name> - <vpath>/</vpath> - <path>/srv/http/html/xsp</path> - <vhost>localhost</vhost> - </web-application> -</apps> diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 3a7e0556d..59eeda084 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 <andyrtr@archlinux.org> 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' 'mips64el') 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/gnome-desktop2/PKGBUILD b/libre/gnome-desktop2/PKGBUILD deleted file mode 100644 index e8744d4a4..000000000 --- a/libre/gnome-desktop2/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jan@archlinux.org> - -_pkgname=gnome-desktop -pkgname=${_pkgname}2 -pkgver=2.32.1 -pkgrel=2.1 -pkgdesc="Library with common API for various GNOME modules (legacy version), Parabola rebranded" -arch=(i686 x86_64 mips64el) -license=(GPL LGPL) -depends=(gconf gtk2 startup-notification) -makedepends=(gnome-doc-utils intltool) -url="http://www.gnome.org" -options=(!libtool !emptydirs) -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2) -sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-gnome-distributor="Parabola GNU/Linux-libre" \ - --disable-scrollkeeper \ - --disable-gnome-about --disable-desktop-docs - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/libre/gst-libav/PKGBUILD b/libre/gst-libav/PKGBUILD deleted file mode 100644 index 3d92dcd9b..000000000 --- a/libre/gst-libav/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gst-libav -pkgver=1.0.6 -pkgrel=1 -pkgdesc="Gstreamer libav Plugin, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base-libs' 'bzip2') -makedepends=('yasm') -options=(!libtool !emptydirs) -provides=("gst-ffmpeg=$pkgver-$pkgrel") -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('8ab222a52bf7482e913f2c9a4f490cda8f8ed1acfbc429f27451b0558b08044d') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \ - --with-package-name="GStreamer libav Plugin (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} 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/gst-plugins-base/PKGBUILD b/libre/gst-plugins-base/PKGBUILD deleted file mode 100644 index 55ac8e72c..000000000 --- a/libre/gst-plugins-base/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gst-plugins-base -pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.6 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Base Plugins, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') -options=(!libtool !emptydirs) -url="http://gstreamer.freedesktop.org/" -source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('85e5f99af690f720ccde5ea7e793269d35883a3ead80ca9985fa44e18bb1a4a5') - -build() { - cd $pkgbase-$pkgver - sed -i -e '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make - sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile -} - -check() { - cd $pkgbase-$pkgver - # Testsuite fails on one test. Some refcount leak - make check -} - -package_gst-plugins-base-libs() { - pkgdesc="GStreamer Multimedia Framework Base Plugin libraries, Parabola rebranded" - depends=('gstreamer' 'orc' 'libxv') - - cd $pkgbase-$pkgver - make DESTDIR="${pkgdir}" install -} - -package_gst-plugins-base() { - depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') - - cd $pkgbase-$pkgver - make -C gst-libs DESTDIR="${pkgdir}" install - make -C ext DESTDIR="${pkgdir}" install - make -C gst-libs DESTDIR="${pkgdir}" uninstall -} diff --git a/libre/gst-plugins-good/PKGBUILD b/libre/gst-plugins-good/PKGBUILD deleted file mode 100644 index 9101bfdba..000000000 --- a/libre/gst-plugins-good/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gst-plugins-good -pkgver=1.0.6 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Good Plugins, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo') -makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') -options=(!libtool !emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d') - -build() { - cd $pkgname-$pkgver - sed -i -e '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Good Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install -} diff --git a/libre/gst-plugins-ugly/PKGBUILD b/libre/gst-plugins-ugly/PKGBUILD deleted file mode 100644 index e0cc268ff..000000000 --- a/libre/gst-plugins-ugly/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gst-plugins-ugly -pkgver=1.0.6 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Ugly Plugins, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -options=(!libtool !emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('8655ceec7533b5d30080a5051025e26ff8d06bea8d03a6b2af56c2f839d60586') - -build() { - cd $pkgname-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/libre/gstreamer/PKGBUILD b/libre/gstreamer/PKGBUILD deleted file mode 100644 index 2eb34bb72..000000000 --- a/libre/gstreamer/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gstreamer -pkgver=1.0.6 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('libxml2' 'glib2') -optdepends=('sh: feedback script') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') -options=('!libtool') -source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('50d4050cd6a23684b6bbf40a9b7c132edfb39fe9db2d81980adaa6e72f4d5826') - -build() { - cd "${srcdir}/gstreamer-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ - --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" \ - --enable-gtk-doc --disable-static - make -} - -check() { - cd "${srcdir}/gstreamer-${pkgver}" - make check -} - -package() { - cd "${srcdir}/gstreamer-${pkgver}" - make DESTDIR="${pkgdir}" install -} 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 <jgc@archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> 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/gstreamer0.10-base/PKGBUILD b/libre/gstreamer0.10-base/PKGBUILD deleted file mode 100644 index 620c0bd87..000000000 --- a/libre/gstreamer0.10-base/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=('gstreamer0.10-base') -pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') -pkgver=0.10.36 -pkgrel=1.1 -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') -options=(!libtool !emptydirs) -url="http://gstreamer.freedesktop.org/" -source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz) -sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') - -build() { - cd "${srcdir}/gst-plugins-base-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental --disable-gnome_vfs \ - --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - - make - sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile -} - -check() { - cd "${srcdir}/gst-plugins-base-${pkgver}" - make check -} - -package_gstreamer0.10-base() { - pkgdesc="GStreamer Multimedia Framework Base plugin libraries, Parabola rebranded" - depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv') - - cd "${srcdir}/gst-plugins-base-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-base-plugins() { - pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base), Parabola rebranded" - depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') - replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') - conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') - groups=('gstreamer0.10-plugins') - - cd "${srcdir}/gst-plugins-base-${pkgver}" - make -C gst-libs DESTDIR="${pkgdir}" install - make -C ext DESTDIR="${pkgdir}" install - make -C gst-libs DESTDIR="${pkgdir}" uninstall -} diff --git a/libre/gstreamer0.10-ugly/PKGBUILD b/libre/gstreamer0.10-ugly/PKGBUILD deleted file mode 100644 index 6709ab2ea..000000000 --- a/libre/gstreamer0.10-ugly/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gstreamer0.10-ugly -pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') -pkgver=0.10.19 -pkgrel=5.1 -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -url="http://gstreamer.freedesktop.org/" -options=(!libtool) -source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz - opencore-amr.patch - cdio-cd-text-api.patch) -md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' - 'd8feb6c99bfaff8be6b2c48ea4e98e47' - '6c1c665f864387f3a77d32231fedeaab') - -build() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - patch -Np0 -i "${srcdir}/opencore-amr.patch" - patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make - sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile -} - -check() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make check -} - -package_gstreamer0.10-ugly() { - pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries, Parabola rebranded" - depends=('gstreamer0.10-base>=0.10.34') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-ugly-plugins() { - pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly), Parabola rebranded" - depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make -C ext DESTDIR="${pkgdir}" install -} diff --git a/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch b/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch deleted file mode 100644 index cbd16b8e4..000000000 --- a/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 -From: Leon Merten Lohse <leon@green-side.de> -Date: Thu, 03 May 2012 22:50:30 +0000 -Subject: cdio: compensate for libcdio's recent cd-text api changes - -https://bugzilla.gnome.org/show_bug.cgi?id=675112 - -Conflicts: - - ext/cdio/gstcdiocddasrc.c ---- -diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c -index 2f58d18..483ebf5 100644 ---- a/ext/cdio/gstcdio.c -+++ b/ext/cdio/gstcdio.c -@@ -30,12 +30,16 @@ - GST_DEBUG_CATEGORY (gst_cdio_debug); - - void --gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, -+gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, - cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) - { - const gchar *txt; - -+#if LIBCDIO_VERSION_NUM > 83 -+ txt = cdtext_get_const (cdtext, field, track); -+#else - txt = cdtext_get_const (field, cdtext); -+#endif - if (txt == NULL || *txt == '\0') { - GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); - return; -@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, - } - - GstTagList * -+#if LIBCDIO_VERSION_NUM > 83 -+gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) -+{ -+ GstTagList *tags = NULL; -+ -+#else - gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) - { - GstTagList *tags = NULL; -@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) - GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); - return NULL; - } -+#endif - -- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); -- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); -+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, -+ GST_TAG_ARTIST, &tags); -+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, -+ &tags); - - return tags; - } - - void -+#if LIBCDIO_VERSION_NUM > 83 -+gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, -+ GstTagList * tags) -+{ -+#else - gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) - { - cdtext_t *t; -@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) - GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); - return; - } -+#endif - -- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ -- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); -- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); -- -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, -+ GST_TAG_ALBUM_ARTIST, &tags); -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, -+ &tags); -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, -+ &tags); - GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); - } - -diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h -index ef31ed0..c6da580 100644 ---- a/ext/cdio/gstcdio.h -+++ b/ext/cdio/gstcdio.h -@@ -24,22 +24,38 @@ - #include <gst/gst.h> - #include <cdio/cdio.h> - #include <cdio/cdtext.h> -+#include <cdio/version.h> -+ -+#if LIBCDIO_VERSION_NUM <= 83 -+ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER -+ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE -+ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE -+#endif - - GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); - #define GST_CAT_DEFAULT gst_cdio_debug - - void gst_cdio_add_cdtext_field (GstObject * src, - cdtext_t * cdtext, -+ track_t track, - cdtext_field_t field, - const gchar * gst_tag, - GstTagList ** p_tags); - - GstTagList * gst_cdio_get_cdtext (GstObject * src, -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t * t, -+#else - CdIo * cdio, -+#endif - track_t track); - - void gst_cdio_add_cdtext_album_tags (GstObject * src, -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t * t, -+#else - CdIo * cdio, -+#endif - GstTagList * tags); - - #endif /* __GST_CDIO_H__ */ -diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c -index 615a0c8..830839e 100644 ---- a/ext/cdio/gstcdiocddasrc.c -+++ b/ext/cdio/gstcdiocddasrc.c -@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - GstCdioCddaSrc *src; - discmode_t discmode; - gint first_track, num_tracks, i; -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t *cdtext; -+#endif - - src = GST_CDIO_CDDA_SRC (audiocdsrc); - -@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - if (src->read_speed != -1) - cdio_set_speed (src->cdio, src->read_speed); - -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext = cdio_get_cdtext (src->cdio); -+ -+ if (NULL == cdtext) -+ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); -+ else -+ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, -+ cddabasesrc->tags); -+#else - gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, - cddabasesrc->tags); -+#endif - - GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); - -@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - * the right thing here (for cddb id calculations etc. as well) */ - track.start = cdio_get_track_lsn (src->cdio, i + first_track); - track.end = track.start + len_sectors - 1; /* -1? */ -+#if LIBCDIO_VERSION_NUM > 83 -+ if (NULL != cdtext) -+ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, -+ i + first_track); -+#else - track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, - i + first_track); -+#endif - - gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/libre/gstreamer0.10-ugly/opencore-amr.patch b/libre/gstreamer0.10-ugly/opencore-amr.patch deleted file mode 100644 index 0a350dc46..000000000 --- a/libre/gstreamer0.10-ugly/opencore-amr.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ext/amrnb/amrnbdec.h.orig 2012-03-12 16:49:14.417405139 +0000 -+++ ext/amrnb/amrnbdec.h 2012-03-12 16:49:35.393899419 +0000 -@@ -22,7 +22,7 @@ - - #include <gst/gst.h> - #include <gst/audio/gstaudiodecoder.h> --#include <interf_dec.h> -+#include <opencore-amrnb/interf_dec.h> - - G_BEGIN_DECLS - ---- ext/amrnb/amrnbenc.h.orig 2012-03-12 16:49:23.833996062 +0000 -+++ ext/amrnb/amrnbenc.h 2012-03-12 16:49:46.597141876 +0000 -@@ -21,7 +21,7 @@ - #define __GST_AMRNBENC_H__ - - #include <gst/gst.h> --#include <interf_enc.h> -+#include <opencore-amrnb/interf_enc.h> - #include <gst/audio/gstaudioencoder.h> - - G_BEGIN_DECLS ---- ext/amrwbdec/amrwbdec.h.orig 2012-03-12 16:47:48.658100992 +0000 -+++ ext/amrwbdec/amrwbdec.h 2012-03-12 16:48:12.177910733 +0000 -@@ -22,8 +22,8 @@ - - #include <gst/gst.h> - #include <gst/audio/gstaudiodecoder.h> --#include <dec_if.h> --#include <if_rom.h> -+#include <opencore-amrwb/dec_if.h> -+#include <opencore-amrwb/if_rom.h> - - G_BEGIN_DECLS - diff --git a/libre/gstreamer0.10/PKGBUILD b/libre/gstreamer0.10/PKGBUILD deleted file mode 100644 index 416c1cbd9..000000000 --- a/libre/gstreamer0.10/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gstreamer0.10 -pkgver=0.10.36 -pkgrel=1.1 -pkgdesc="GStreamer Multimedia Framework, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('libxml2' 'glib2') -optdepends=('sh: feedback script') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') -options=('!libtool') -source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -md5sums=('15389c73e091b1dda915279c388b9cb2') - -build() { - cd "${srcdir}/gstreamer-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ - --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" \ - --enable-gtk-doc --disable-static - make -} - -check() { - cd "${srcdir}/gstreamer-${pkgver}" - make check -} - -package() { - cd "${srcdir}/gstreamer-${pkgver}" - make DESTDIR="${pkgdir}" install - - #Remove unversioned gst-* binaries to get rid of conflicts - cd "${pkgdir}/usr/bin" - for bins in `ls *-0.10`; do - rm -f ${bins/-0.10/} - done -} diff --git a/libre/libtasn1/PKGBUILD b/libre/libtasn1/PKGBUILD deleted file mode 100644 index 2131a323b..000000000 --- a/libre/libtasn1/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=libtasn1 -pkgver=3.2 -pkgrel=1.1 -pkgdesc="The ASN.1 library used in GNUTLS, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/libtasn1/" -depends=('glibc' 'texinfo') -options=('!libtool') -install=libtasn1.install -source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('1b07629163025b9693aae9b8957842b2' - '67bdae9b78ac7bbfa2ab24c7d46bd577') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-packager="Parabola GNU/Linux-libre" \ - --with-packager-bug-reports="https://labs.parabola.nu/" \ - --with-packager-version=${pkgver}-${pkgrel} - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/libre/libtasn1/libtasn1.install b/libre/libtasn1/libtasn1.install deleted file mode 100644 index 2d1ecc09f..000000000 --- a/libre/libtasn1/libtasn1.install +++ /dev/null @@ -1,18 +0,0 @@ -info_dir=/usr/share/info -info_files=(libtasn1.info) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} 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 1879a8cbc..32c2403c9 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 <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,8 +6,8 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=7.1 -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') diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD index 43b44ed69..1692357e7 100644 --- a/libre/xsp/PKGBUILD +++ b/libre/xsp/PKGBUILD @@ -59,6 +59,6 @@ package(){ } md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' '9575bd7d6f64d51ba05bdd6370665858' - '35d921df0fefc30f47a438c95d420efc' + 'b2063679d9c77a9e7b2d90d1fee76608' 'c917c07f68b945691506c29750db482f' '9d83bd36d209f8d36a11dfbc4fa50819') |