From 02e1f1221ec9570de0aaec8f15edb6d2af336bff Mon Sep 17 00:00:00 2001 From: root Date: Wed, 26 Jun 2013 01:38:17 -0700 Subject: Wed Jun 26 01:37:43 PDT 2013 --- core/cronie/PKGBUILD | 27 ++++++++++----------------- core/cronie/cron.deny | 1 - core/cronie/deny | 1 + core/cronie/service | 2 +- core/procps-ng/PKGBUILD | 6 +++--- core/procps-ng/sysctl.conf | 3 --- 6 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 core/cronie/cron.deny create mode 100644 core/cronie/deny (limited to 'core') diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index e45d47fa8..128087d4e 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.9 -pkgrel=4 +pkgrel=5 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -14,31 +14,25 @@ optdepends=('pm-utils: defer anacron on battery power' 'smtp-forwarder: forward job output to email server') source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'cron.deny' 'service' - 'pam.d') + 'pam.d' + 'deny') sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' - '0f279b8fb820340267d578dc85511c980715f91e' - 'de455f11a310e64d6930390e57726ed70f3295d0' - '5eff7fb31f6bc0a924243ff046704726cf20c221') + 'eb8ed1e22dbe9c02075fe4bbe925b6eeb9954649' + '5eff7fb31f6bc0a924243ff046704726cf20c221' + '0f279b8fb820340267d578dc85511c980715f91e') -backup=('etc/anacrontab' - 'etc/conf.d/crond' +backup=('etc/cron.deny' 'etc/pam.d/crond' - 'etc/cron.deny') + 'etc/cron.d/0hourly' + 'etc/anacrontab') conflicts=('cron') provides=('cron') groups=('base') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -60,11 +54,10 @@ package() { install -d "${pkgdir}"/var/spool/{ana,}cron install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} + install -Dm644 ../deny "${pkgdir}"/etc/cron.deny install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond - install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service - install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron diff --git a/core/cronie/cron.deny b/core/cronie/cron.deny deleted file mode 100644 index 06e685cc8..000000000 --- a/core/cronie/cron.deny +++ /dev/null @@ -1 +0,0 @@ -# without this file, only users listed in /etc/cron.allow can use crontab diff --git a/core/cronie/deny b/core/cronie/deny new file mode 100644 index 000000000..06e685cc8 --- /dev/null +++ b/core/cronie/deny @@ -0,0 +1 @@ +# without this file, only users listed in /etc/cron.allow can use crontab diff --git a/core/cronie/service b/core/cronie/service index cc671f7b6..84145251c 100644 --- a/core/cronie/service +++ b/core/cronie/service @@ -3,7 +3,7 @@ Description=Periodic Command Scheduler [Service] ExecStart=/usr/bin/crond -n -ExecReload=/bin/kill -HUP $MAINPID +ExecReload=/usr/bin/kill -HUP $MAINPID KillMode=process Restart=always diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index e2f1a9751..c08ca8b5b 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186686 2013-05-30 13:43:55Z bisson $ +# $Id: PKGBUILD 188912 2013-06-25 10:40:52Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Eric Bélanger pkgname=procps-ng pkgver=3.3.8 -pkgrel=1 +pkgrel=2 pkgdesc='Utilities for monitoring your system and its processes' url='http://gitorious.org/procps' license=('GPL' 'LGPL') @@ -15,7 +15,7 @@ backup=('etc/sysctl.conf') source=("${pkgname}-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}" 'sysctl.conf') sha1sums=('63aed46ba4b5b05698beb25d2aa3eee6779d7f45' - '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53') + 'bc4e929a0ddcdcd627e8d15d30abcf185aa33fab') conflicts=('procps') provides=('procps') diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf index 4695cdd92..fae2c6082 100644 --- a/core/procps-ng/sysctl.conf +++ b/core/procps-ng/sysctl.conf @@ -36,6 +36,3 @@ net.ipv6.conf.all.forwarding = 0 # Reboot 600 seconds after kernel panic or oops. #kernel.panic_on_oops = 1 #kernel.panic = 600 - -# Disable SysRq key to avoid console security issues. -kernel.sysrq = 0 -- cgit v1.2.3-54-g00ecf From 7851c02115b35e64fc3b827b29c79023d4518f6f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Jun 2013 01:08:30 -0700 Subject: Thu Jun 27 01:08:30 PDT 2013 --- community/bitcoin/PKGBUILD | 8 +- community/darktable/PKGBUILD | 8 +- community/lua-zlib/PKGBUILD | 11 +- community/megaglest/PKGBUILD | 22 ++-- community/megaglest/lol.patch | 43 ------ community/python-psycopg2/PKGBUILD | 6 +- core/isl/PKGBUILD | 8 +- extra/gnumeric/PKGBUILD | 18 +-- extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch | 104 --------------- extra/goffice/PKGBUILD | 6 +- java/java-json-android/PKGBUILD | 50 +++++++ libre-testing/systemd/rePKGBUILD | 2 +- libre/abuse-libre/PKGBUILD | 2 +- libre/atool-libre/PKGBUILD | 2 +- libre/audacity-libre/PKGBUILD | 2 +- libre/blackbox-libre/PKGBUILD | 2 +- libre/blender-addon-luxrender/PKGBUILD | 2 +- libre/cgminer-libre/PKGBUILD | 6 +- libre/epdfview-libre/PKGBUILD | 2 +- ...Make-the-Reset-Firefox-feature-more-gener.patch | 8 +- libre/iceweasel-libre/PKGBUILD | 47 +++++-- .../iceweasel-20.0.1-fixed-loading-icon.png | Bin 0 -> 12184 bytes ...-do-not-fallback-to-manual-proxy-settings.patch | 36 +++++ libre/iceweasel-libre/libre.patch | 32 +++-- libre/iceweasel-libre/mozconfig | 2 +- libre/iceweasel-libre/mozconfig.pgo | 2 +- libre/lilo/PKGBUILD | 2 +- libre/mariadb/PKGBUILD | 141 -------------------- libre/mariadb/mariadb.install | 26 ---- libre/mariadb/mariadbd | 77 ----------- libre/mariadb/my.cnf | 145 --------------------- libre/mariadb/mysql.install | 26 ---- libre/mariadb/mysqld | 77 ----------- libre/mozilla-searchplugins/PKGBUILD | 2 +- libre/parabola-keyring/PKGBUILD | 6 +- pcr/chiliproject/PKGBUILD | 2 +- pcr/cinepaint-lts/PKGBUILD | 2 +- pcr/clusterit/PKGBUILD | 2 +- pcr/collada-dom/PKGBUILD | 2 +- pcr/corosync/PKGBUILD | 2 +- pcr/ganglia/PKGBUILD | 2 +- pcr/gimp-art/PKGBUILD | 2 +- pcr/gimp-art/gimp-splash-artwork.license | 6 +- pcr/gimp-toolkit-gps/PKGBUILD | 2 +- pcr/lcmc/PKGBUILD | 2 +- pcr/libav/PKGBUILD | 2 +- pcr/mednafen-server/PKGBUILD | 2 +- pcr/python2-paramiko/PKGBUILD | 33 ----- pcr/sipwitch/PKGBUILD | 2 +- pcr/spacenav-daemon/PKGBUILD | 2 +- pcr/torque/PKGBUILD | 2 +- pcr/xf86-input-wizardpen/PKGBUILD | 2 +- social/sipwitch/PKGBUILD | 2 +- ~coadde/mariadb/PKGBUILD | 141 ++++++++++++++++++++ ~coadde/mariadb/mariadb.install | 26 ++++ ~coadde/mariadb/mariadbd | 77 +++++++++++ ~coadde/mariadb/my.cnf | 145 +++++++++++++++++++++ ~coadde/mariadb/mysql.install | 26 ++++ ~coadde/mariadb/mysqld | 77 +++++++++++ ~emulatorman/hunspell-gl/PKGBUILD | 2 +- ~emulatorman/raider/PKGBUILD | 2 +- ~emulatorman/xchat-xsys-noaudacious/PKGBUILD | 2 +- ~emulatorman/xonotic-data/PKGBUILD | 2 +- ~emulatorman/xonotic/PKGBUILD | 2 +- 64 files changed, 712 insertions(+), 794 deletions(-) delete mode 100644 community/megaglest/lol.patch delete mode 100644 extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch create mode 100644 java/java-json-android/PKGBUILD create mode 100644 libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png create mode 100644 libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch delete mode 100644 libre/mariadb/PKGBUILD delete mode 100644 libre/mariadb/mariadb.install delete mode 100755 libre/mariadb/mariadbd delete mode 100644 libre/mariadb/my.cnf delete mode 100644 libre/mariadb/mysql.install delete mode 100644 libre/mariadb/mysqld delete mode 100644 pcr/python2-paramiko/PKGBUILD create mode 100644 ~coadde/mariadb/PKGBUILD create mode 100644 ~coadde/mariadb/mariadb.install create mode 100755 ~coadde/mariadb/mariadbd create mode 100644 ~coadde/mariadb/my.cnf create mode 100644 ~coadde/mariadb/mysql.install create mode 100644 ~coadde/mariadb/mysqld (limited to 'core') diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index e3040c51b..572ddd10c 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 92952 2013-06-20 11:00:24Z tredaelli $ +# $Id: PKGBUILD 93162 2013-06-26 14:39:47Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: shahid pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.8.2 -pkgrel=2 +pkgver=0.8.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') license=('MIT') source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) -sha256sums=('e15d3134f4efd8d60e243c7177edba06ac471619674ca07a42a1dced5f498728') +sha256sums=('c6003a6af947e6978b13ab55d7bb7ec97aedc55022fb4924d08792a8d4f83a35') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 27b69d8da..ba15607a6 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 92273 2013-06-03 13:36:04Z spupykin $ +# $Id: PKGBUILD 93153 2013-06-26 11:50:34Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika pkgname=darktable -pkgver=1.2.1 +pkgver=1.2.2 _pkgver=1.2 -pkgrel=2 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('f970573777752b1b4447997d1f1f65fa') +md5sums=('df2a2b02d6d855cfd8f1cf77c7e12995') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD index 8243438d4..d5c789cdf 100644 --- a/community/lua-zlib/PKGBUILD +++ b/community/lua-zlib/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 93120 2013-06-25 09:38:45Z spupykin $ +# $Id: PKGBUILD 93160 2013-06-26 13:34:20Z spupykin $ # Maintainer: Sergej Pupykin -pkgname=(lua-zlib lua51-zlib) +#pkgname=(lua-zlib lua51-zlib) +pkgname=(lua51-zlib) pkgbase=lua-zlib pkgver=0.2 -pkgrel=6 +pkgrel=8 _gitver=8d07669 url="http://github.com/brimworks/lua-zlib" pkgdesc='Simple streaming interface to zlib for Lua.' @@ -19,10 +20,10 @@ build() { cp -a $srcdir/brimworks-lua-zlib-${_gitver} $srcdir/brimworks-lua51-zlib-${_gitver} cd $srcdir/brimworks-lua-zlib-${_gitver} - gcc -o zlib.so -O2 -fPIC -shared lua_zlib.c -llua + gcc -o zlib.so -O2 -fPIC -shared lua_zlib.c -llua -lz cd $srcdir/brimworks-lua51-zlib-${_gitver} - gcc -o zlib.so -O2 -fPIC -shared -I/usr/include/lua5.1 lua_zlib.c -llua5.1 + gcc -o zlib.so -O2 -fPIC -shared -I/usr/include/lua5.1 lua_zlib.c -llua5.1 -lz } package_lua-zlib() { diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index d38a1aee6..30c6d9479 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 90059 2013-05-06 19:38:20Z foutrelis $ +# $Id: PKGBUILD 93166 2013-06-26 17:55:13Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Larry Hajali pkgname=megaglest -pkgver=3.7.1 -pkgrel=2 +pkgver=3.8.0beta1 +_pkgver=3.8.0-beta1 +pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" @@ -12,27 +13,24 @@ license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew' 'libircclient' 'miniupnpc' 'wxgtk' 'glu') makedepends=('ftjam' 'cmake' 'mesa') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" - lol.patch) -md5sums=('e7a960ec73784aa0f7b951d2ad963456' - '68fd326b73ed1c75981004fbdef6b73a') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz") +md5sums=('1da8707d435ffb2342f03ca466d4eeed') build() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - - #patch -Np1 < "$srcdir/lol.patch" + cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ [[ -d build ]] && rm -r build mkdir build && cd build + cmake .. \ -DWANT_SVN_STAMP=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + -DCMAKE_BUILD_TYPE=Release make } package() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ + cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ cd build make DESTDIR="$pkgdir" install diff --git a/community/megaglest/lol.patch b/community/megaglest/lol.patch deleted file mode 100644 index 56f94c852..000000000 --- a/community/megaglest/lol.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h -index 8fcfb27..3cb7a41 100644 ---- a/source/shared_lib/include/graphics/math_util.h -+++ b/source/shared_lib/include/graphics/math_util.h -@@ -184,10 +184,10 @@ public: - - Rect2 computeBoundingRect() const{ - return Rect2i( -- min(p[0].x, p[1].x), -- min(p[0].y, p[2].y), -- max(p[2].x, p[3].x), -- max(p[1].y, p[3].y)); -+ std::min(p[0].x, p[1].x), -+ std::min(p[0].y, p[2].y), -+ std::max(p[2].x, p[3].x), -+ std::max(p[1].y, p[3].y)); - } - - bool isInside(const Vec2 &pt) const{ -diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp -index b09c972..ddebd03 100644 ---- a/source/shared_lib/sources/platform/posix/ircclient.cpp -+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp -@@ -13,6 +13,7 @@ - #include "ircclient.h" - #include "util.h" - #include "platform_common.h" -+#include "libirc_rfcnumeric.h" - #include "libircclient.h" - - #include -diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp -index 05478fc..c27aa62 100644 ---- a/source/shared_lib/sources/util/util.cpp -+++ b/source/shared_lib/sources/util/util.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include // for open() -+#include - - #ifdef WIN32 - #include // for open() diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index 9dc317d66..2cdabb5cf 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87852 2013-04-08 09:24:14Z spupykin $ +# $Id: PKGBUILD 93151 2013-06-26 09:20:17Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Angel 'angvp' Velasquez # Maintainer: Douglas Soares de Andrade pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.5 +pkgver=2.5.1 pkgrel=1 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://initd.org/psycopg/" license=('LGPL3') makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz) -md5sums=('facd82faa067e99b80146a0ee2f842f6') +md5sums=('1b433f83d50d1bc61e09026e906d84c7') build() { cd "$srcdir/psycopg2-$pkgver" diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index ac1fc27bc..5044ad60c 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182768 2013-04-15 01:13:42Z allan $ +# $Id: PKGBUILD 188940 2013-06-26 05:31:47Z allan $ # Maintainer: Allan McRae pkgname=isl -pkgver=0.11.2 +pkgver=0.12 pkgrel=1 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ depends=('gmp') license=('MIT') options=('!libtool') source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('c40daa17d2995d1c98a0c1aca607541f') +md5sums=('eaa1968dda763f12dc84e45a892cd428') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,7 +29,7 @@ package() { make -j1 DESTDIR="$pkgdir/" install install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.2-gdb.py + mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.0-gdb.py install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE } diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 05788a0c6..fe2fc1c0d 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 186380 2013-05-26 09:24:31Z bluewind $ +# $Id: PKGBUILD 188945 2013-06-26 11:13:30Z foutrelis $ # Maintainer: Eric Belanger # Contributor: Kritoke pkgname=gnumeric -pkgver=1.12.2 -pkgrel=2 +pkgver=1.12.3 +pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/gnumeric/" license=('GPL') depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils' - 'gobject-introspection' 'optipng') + 'gobject-introspection') optdepends=('python2-gobject: for python plugin support' 'perl: for perl plugin support' 'psiconv: for Psion 5 file support' @@ -19,27 +19,19 @@ optdepends=('python2-gobject: for python plugin support' install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - gnumeric-1.12.1-automake-1.13.patch revert-warnings.patch) -sha256sums=('d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874' - '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275' +sha256sums=('b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch patch -Np0 -i ../revert-warnings.patch # Remove invalid mime type. (FS#26338) sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in autoreconf -fi - - # Fix invalid PNG images to work with libpng 1.6 - # https://bugzilla.gnome.org/show_bug.cgi?id=699683 - # XXX: PNGs have been fixed upsteam; remove when gnumeric 1.12.3 is out - find -name '*.png' -exec optipng -quiet -force -fix {} + } build() { diff --git a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch deleted file mode 100644 index 1ae1fb955..000000000 --- a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -up gnumeric-1.12.0/test/Makefile.am.automake-1_13 gnumeric-1.12.0/test/Makefile.am ---- gnumeric-1.12.0/test/Makefile.am.automake-1_13 2011-05-18 02:54:24.000000000 +0200 -+++ gnumeric-1.12.0/test/Makefile.am 2013-01-05 18:25:56.380686587 +0100 -@@ -25,7 +25,99 @@ - # - # 90xx: Misc stuff. - --TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl)) -+TESTS = \ -+t1000-statfuns.pl \ -+t1001-mathfuns.pl \ -+t1002-finfuns.pl \ -+t1003-engfuns.pl \ -+t1004-textfuns.pl \ -+t1005-logfuns.pl \ -+t1006-datefuns.pl \ -+t1007-dbfuns.pl \ -+t1008-infofuns.pl \ -+t1009-lookfuns.pl \ -+t1010-bitwise.pl \ -+t1011-yalta2008.pl \ -+t1100-chitest.pl \ -+t1101-ftest.pl \ -+t1102-ttest.pl \ -+t1103-sumif.pl \ -+t1104-linest.pl \ -+t1800-operators.pl \ -+t1900-array.pl \ -+t1901-regress.pl \ -+t1902-array-intersection.pl \ -+t2000-names-insdel.pl \ -+t2001-func-help.pl \ -+t2002-nonascii-numbers.pl \ -+t2003-random-generators.pl \ -+t2800-style-optimizer.pl \ -+t5900-sc.pl \ -+t5901-qpro.pl \ -+t5902-applix.pl \ -+t5903-sylk.pl \ -+t5904-mps.pl \ -+t6000-statfuns.pl \ -+t6001-mathfuns.pl \ -+t6002-objs.pl \ -+t6003-lookfuns.pl \ -+t6004-chart-tests.pl \ -+t6004-finfuns.pl \ -+t6100-statfuns-ods.pl \ -+t6101-mathfuns-ods.pl \ -+t6102-objs-ods.pl \ -+t6103-lookfuns-ods.pl \ -+t6104-finfuns-ods.pl \ -+t7000-goal-seek.pl \ -+t7100-solver-blend.pl \ -+t7101-solver-afiro.pl \ -+t7110-solver-Misra1a.pl \ -+t7111-solver-Chwirut2.pl \ -+t7112-solver-Chwirut1.pl \ -+t7113-solver-Lanczos3.pl \ -+t7114-solver-Gauss1.pl \ -+t7115-solver-Gauss2.pl \ -+t7116-solver-DanWood.pl \ -+t7117-solver-Misra1b.pl \ -+t7120-solver-Kirby2.pl \ -+t7121-solver-Hahn1.pl \ -+t7122-solver-Nelson.pl \ -+t7123-solver-MGH17.pl \ -+t7124-solver-Lanczos1.pl \ -+t7125-solver-Lanczos2.pl \ -+t7126-solver-Gauss3.pl \ -+t7127-solver-Misra1c.pl \ -+t7128-solver-Misra1d.pl \ -+t7129-solver-Roszman1.pl \ -+t7130-solver-ENSO.pl \ -+t7140-solver-MGH09.pl \ -+t7141-solver-Thurber.pl \ -+t7142-solver-BoxBOD.pl \ -+t7143-solver-Rat42.pl \ -+t7144-solver-MGH10.pl \ -+t7145-solver-Eckerle4.pl \ -+t7146-solver-Rat43.pl \ -+t7147-solver-Bennett5.pl \ -+t8000-valgrind.pl \ -+t8001-valgrind-xls.pl \ -+t8002-valgrind-gnumeric.pl \ -+t8003-valgrind-pdf.pl \ -+t8004-valgrind-xls-macro.pl \ -+t8005-valgrind-chart-fit.pl \ -+t8050-valgrind-sstest.pl \ -+t8100-null-false.pl \ -+t8101-gfree.pl \ -+t8102-glade-visible.pl \ -+t8103-gtk.pl \ -+t8104-glade-parsing.pl \ -+t8200-gslice1.pl \ -+t8201-gslice2.pl \ -+t8202-gslice3.pl \ -+t9000-ssindex.pl \ -+t9100-number-match.pl \ -+t9999-epilogue.pl -+ -+ - SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp - - import-db: diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 98659b508..9a55c19ea 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183875 2013-04-29 09:27:35Z jgc $ +# $Id: PKGBUILD 188943 2013-06-26 11:06:57Z foutrelis $ # Maintainer: Aaron Griffin pkgname=goffice -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7d38769a7af655c0f0373738c786318734400d71b6bbc8d1ce6b6de99bb95674') +sha256sums=('1fd0048b25f7687eede9b0a8d712922113995db74a095bf43ad150d01b236bf2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD new file mode 100644 index 000000000..3b0a08195 --- /dev/null +++ b/java/java-json-android/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Luke Shumaker + +pkgname=java-json-android +_pkgver=4.2.2_r1 +pkgdesc="Java org.json implementation developed as part of Android's libcore" +url="https://android.googlesource.com/platform/libcore/" +license=(Apache2) + +pkgver=${_pkgver//_/.} +provides=(java-json) +conflicts=(java-json) + +pkgrel=1 +arch=(any) + +depends=(java-runtime) +makedepends=(java-environment junit) + +source=("libre://android-libcore-$_pkgver.tar.gz") +md5sums=('367769bb9d7fe571ff4e1e82b99e99ed') + +mkdepends=(git) +mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}") +mkmd5sums=('SKIP') + +build() { + cd "$srcdir"/android-libcore-$_pkgver + sed 11q < NOTICE > json/NOTICE + cd json/src/main/java + javac org/json/*.java + jar cf json.jar org/json/*.class +} + +check() { + cd "$srcdir"/android-libcore-$_pkgver/json/src/test/java + + # disable test for known bug: + sed -i 's/test64BitHexValues()/x&/' org/json/ParsingTest.java + + local cp="/usr/share/java/junit.jar:../../main/java/json.jar" + javac -cp "$cp" org/json/*.java + printf '%s\n' org/json/*.java | sed 's|/|.|g;s|\.java$||' > tests.txt + java -cp "$cp:." org.junit.runner.JUnitCore $(cat tests.txt) +} + +package() { + cd "$srcdir"/android-libcore-$_pkgver/json + install -Dm644 NOTICE "pkgdir"/usr/share/licenses/$pkgname + install -Dm644 src/main/java/json.jar "pkgdir"/usr/share/java/json.jar +} diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD index 0487320e7..8b9e59932 100644 --- a/libre-testing/systemd/rePKGBUILD +++ b/libre-testing/systemd/rePKGBUILD @@ -4,7 +4,7 @@ # then please put 'unknown'. # Maintainer: Nicolas Reynolds -# Maintainer: André Silva +# Maintainer: André Silva source PKGBUILD unset build package md5sums source check _repo=testing diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD index 196fb2c85..1b7ed9072 100644 --- a/libre/abuse-libre/PKGBUILD +++ b/libre/abuse-libre/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Lukas Fleischer # Contributor: jlvsimoes # Contributor: kevin -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva _pkgname=abuse pkgname=abuse-libre diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD index ea1dfec52..0745630ad 100644 --- a/libre/atool-libre/PKGBUILD +++ b/libre/atool-libre/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: leif_thande # Contributor: tranquility # Contributor: Daniel J Griffiths -# Contributor (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva _pkgname=atool pkgname=atool-libre diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD index 6d6f287b3..610404545 100644 --- a/libre/audacity-libre/PKGBUILD +++ b/libre/audacity-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $ # Maintainer: Eric Bélanger -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva _pkgname=audacity pkgname=audacity-libre diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD index c76d7cba5..1c0c49a15 100644 --- a/libre/blackbox-libre/PKGBUILD +++ b/libre/blackbox-libre/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Sergej Pupykin # Contributor: durbatuluk # Contributor: Steve Ponsford -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva _pkgname=blackbox pkgname=${_pkgname}-libre diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 6637e134c..040eeccf4 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=blender-addon-luxrender _pkgname=${pkgname:14:3}${pkgname::5}25 diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 001cd00f2..0fb3b9116 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93076 2013-06-24 03:20:38Z fyan $ +# $Id: PKGBUILD 93146 2013-06-26 07:01:43Z fyan $ # Maintainer: Felix Yan # Contributor: monson # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.3.0 +pkgver=3.3.1 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('65af0ace6627d2ff50203d9a789f52da' +md5sums=('1e6ccf16c4695fc086581bbb95923abe' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD index 28c77eed8..626e653f2 100644 --- a/libre/epdfview-libre/PKGBUILD +++ b/libre/epdfview-libre/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay # Contributor: Tom K # Contributor: Thayer Williams -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgname=epdfview-libre _pkgname=epdfview diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index d89e4d1ae..f561d5d39 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -3,7 +3,7 @@ Date: Tue, 5 Jun 2012 08:57:06 +0200 Subject: Bug 756390 - Make the "Reset Firefox" feature more generic diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js -index 0e8ccf5..fa46c08 100644 +index 91c5c1c..2f8bd1a 100644 --- a/browser/components/migration/content/migration.js +++ b/browser/components/migration/content/migration.js @@ -249,7 +249,7 @@ var MigrationWizard = { @@ -184,7 +184,7 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index fa45115..1fcf3cd 100644 +index 0541ebf..f983ae4 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -42,7 +42,7 @@ toolkit.jar: @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index b08f8ce..446ee74 100644 +index 17f5598..0b9a24a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun() +@@ -3743,7 +3743,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index eebf10e57..bf6f8fe83 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -1,10 +1,10 @@ +# Maintainer (Parabola): André Silva +# Maintainer (Parabola): Márcio Silva # Contributor (ConnochaetOS): Henry Jensen # Contributor (Parabola): Luke Shumaker # Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando -# Contributor (Parabola): André Silva -# Contributor (Parabola): Márcio Silva # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=21.0 +_debver=22.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,20 +22,21 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) +makedepends=(autoconf2.13 diffutils imagemagick libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) fi -optdepends=('networkmanager: Location detection via available WiFi networks') +optdepends=('networkmanager: Location detection via available WiFi networks' + 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install replaces=('firefox') @@ -51,18 +52,22 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js shared-libs.patch replace-urls.txt + $_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch + $_pkgname-20.0.1-fixed-loading-icon.png Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('0a7c51bb494463c327af918bae6c4ee4' - 'c17121a4ffd40f463e16d7828445d96e' - 'e1e903ca91997f18b428c54ef604f27d' - '383e8e2a97a8b13fe56d153adb6878b6' - '2930f3bffe0d7a6b9845f8c006821bc2' +md5sums=('45d7121606cc3b21cd2797c87b5dc3bd' + 'bf0440dd8c31527359d797daaf0d3edd' + '2d7ac85c32df6a4ccfcc6de7a1420bf7' + 'df08eaa1ac3bc6c2356be4fbf8ec8932' + '0bbedfc161291de9dc61c531bf062c22' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '85e67561e0e491cd538ce018dfc2d948') + 'bc27a39d08ab3f6705e487c85598d8bf' + '6e335a517c68488941340ee1c23f97b0' + '86d4045285a9a15c20a62f46535809cb') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -131,6 +136,10 @@ prepare() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # Should be fixed in Iceweasel 23 + # https://bugzilla.mozilla.org/show_bug.cgi?id=817533 + patch -Np1 -i ../$_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch + # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in @@ -143,15 +152,27 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix tab loading icon (flickers with libpng 1.6) + # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 + cp "$srcdir/$_pkgname-20.0.1-fixed-loading-icon.png" \ + browser/themes/linux/tabbrowser/loading.png } build() { + export DEBIAN_BUILD="mozilla-release" + cd "$srcdir/$DEBIAN_BUILD" export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" + # Work around memory address space exhaustion during linking on i686 + if [[ $CARCH == i686 ]]; then + LDFLAGS+=' -Wl,--no-keep-memory' + fi + if $_pgo; then export DISPLAY=:99 Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & @@ -167,6 +188,8 @@ build() { } package() { + export DEBIAN_BUILD="mozilla-release" + cd "$srcdir/$DEBIAN_BUILD" make -f client.mk DESTDIR="$pkgdir" install diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png new file mode 100644 index 000000000..55f25e591 Binary files /dev/null and b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png differ diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch new file mode 100644 index 000000000..56e4bfc45 --- /dev/null +++ b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch @@ -0,0 +1,36 @@ + +# HG changeset patch +# User Patrick McManus +# Date 1365623297 14400 +# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb +# Parent 2bb26d742f5ffd2d946291fd3c688dc3d6d34f67 +bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell + +diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp +--- a/netwerk/base/src/nsProtocolProxyService.cpp ++++ b/netwerk/base/src/nsProtocolProxyService.cpp +@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal + + // Proxy auto config magic... + if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) { + // Do not query PAC now. + *usePACThread = true; + return NS_OK; + } + +- // proxy info values ++ // If we aren't in manual proxy configuration mode then we don't ++ // want to honor any manual specific prefs that might be still set ++ if (mProxyConfig != PROXYCONFIG_MANUAL) ++ return NS_OK; ++ ++ // proxy info values for manual configuration mode + const char *type = nullptr; + const nsACString *host = nullptr; + int32_t port = -1; + + uint32_t proxyFlags = 0; + + if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && + !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { + diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 3bb39d215..b5f0a4126 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,7 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2013-05-18 13:47:28.091097903 -0300 -@@ -1203,12 +1203,6 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-06-26 23:50:49.004052388 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-06-26 23:45:52.697802427 -0300 +@@ -1208,12 +1208,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -11,12 +11,12 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br -pref("social.manifest.cliqz", "{\"builtin\": \"true\",\"origin\": \"https://mozsocial.cliqz.com\",\"name\": \"Cliqz\",\"description\": \"Cliqz for Firefox Social\",\"author\": \"Cliqz\",\"homepageURL\": \"https://mozsocial.cliqz.com/\",\"version\": \"0.9\",\"workerURL\": \"https://mozsocial.cliqz.com/worker\",\"sidebarURL\": \"https://mozsocial.cliqz.com/sidebar\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wKEgkPNcdyEiIAAANaSURBVDjLVZNPUJR1HMY/39/77vLXZYFhKf4sbEKRTlrjFFIzFgtlJmQyddAmrOlgjdIAt+yQp04Wzti9sUZwPFgzOdg0sIuThaGUOBROEqLAimsoiqy77Lvvt0s09ZyeZ+Z5ntPzCKvo2w+7Poe+/YXAQeBtEINqX9gX+2JT3mKpgznT0zhwpyvaTE/jAAACQG8H7D4CJ/YZHFkA/ICi4JW01FtXWFco5NjcPxweXMN/YADw/KMyEkHEj7qKugJQQZxlR4klUEvI74o0H/hfQXc0DG8cgd7uLah5Gle1oWSt7KzYyIH1WyXotYknYHBGJDIHk/fc1tXw5lPbsIaPXuXg2aZ1Wcn5L/3OzbKkeGVTyXpa86u044lmuRC7pkOxCbGMhTGqapuKqnfqArPHrvTP9k4inZFwgSLXz8cTvnDldj0zPcXrj+5gauZPQUT7fo9KVWUJo7f/wJDi2eoACSt1yxa79VzL6Z+lK9L0yVJ65cONpW26u/ZdOT87wUJqCUln9NvpC9IQXK8dT+2Qk5NDvFq7BdsYfWton4zfu9ydbbyHbYW2omw/raGXpGf4OP6cAurL6xCF0O0Ae598hUPnTuDPd4gtzVOc6xdLLIyx6tWYLAPUPJRbzuJyhkNj/fy6cFXzvblqWbZU+AM6Mjshlf4AP8Z+I+Wm+GFmmLG743iNXSyqxlZ0xWNl54SKgnzz2kfM3YnL7L1bpB1H60qCUr6mRPOycqTS9yZluaWMLPzC3sf28P3ckDt6+1LGatjzyDaQ4ONFm/jp2hQ3kotcvxvn1uJfYtse8myvLK08IJlOUVZQSI0vpM8FnuHFsudrkunUBemKNrcLenQxZeuxcVtWXME4GVh6oJlsj3Q07NQNxdXSffYzNqzNxRjFqKXv1bZLla/yvnFd97gqA/leR8r9adRRzSSSmlFXWF7WUEGpXIxfpcAnOLpC2nVIaWp810Bb9Wh87CsB6Iy+kJVlrA8u3+X9Gzfd0Mik8+9NPF6vbq57WJJ5N7FtC4X7ItI+vL3/awDpijbR0zgIQOdguEqMmU6kVCdiLhkX2Ri0UIuxiw88EYWMoB8Pt3yXWJ2zrJLOSBOHw4N0RppeFuGkCDkArnLJQrZ+2jgwv+ptOLWN4ZbTAPwNmUptT0KshT0AAAAASUVORK5CYII=\",\"icon32URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTOwK3bfUAAAj8SURBVFjDnZd5cFXlGcZ/7znnLslNCIEkQBJI2IksAWpcgmjFugRxA41lwFKmTgd0tB2qqVVpLXWGAk4V1y5IxRnRCR2tWIgwWhYxCJECYQmEVWQLSch2c7dz73n7x80NIVKgfn+d78x3zvu8z/d+z/e8wtWMt2YJkA88ATwA5AF+YBOwFKhk7orA02sLkkSwAP/ikhotqyhgcUnNZX8tVwgMc1fAW7OWAPMA47uLFNT8bEafHStzkyOliqQBu4EFi0tqzlwpN7mK4OuB2y9E6/aNQo5V5+9v1bmuywqrx1CvxFfUA/2B8OVYMK4QfFFHcL00YMUtkXCedSZJwVNV73EUHI2vzgTe+35b8NYsgBuArRdlrQoiF2U/xHWivbfZ7ANBFTK8sbYxvcOpjkriu75A3f8CcmkG5q4AeK87SJ/hBtuOA0EBgwyzydB4MAxRGsNmqj9itBmoCIoqpd9nC24FBnVE6kx39oiJzC+YDOqQl9SL61Iy2xx1kkTQYIzwcb/VXN1kNa086jM2nkmqP9zqag3G5AaA4vKi/wOAmmWoRFFT4ruviuNwU99hLPjRDCUQ4rMpT+u2GYt8PieFuqC0H26zjFZbegqaHoyJN6r0POF39djR6L35xvKiSZWlVVcH4NcVIxaOc1dPutazxxrlPtjgNcJ+VIRohCl5hQpItiadG9I7WzAw+voKA+fCZiqKSwQVEQTMlogREVAHegp8XlxeNOhSLFiJh7KKggGqbDsfNrIscQwR1SQCGePdNdGacH5bD7M3Pm9SaiQS0dPHq7MSxXm2LeQRcFQQVAURRNBWW+jlcUSMzhzXV5ZWDSkuL6IrG0ZZRQFlFQVeoFJE+zZHjLAhEAgHpL9ngLaEok6kqd64N+caF6Brd20WnADlX6+XxqbzbD6wL9Re394eCLRKRKMoiqMqLbYSdSKECBmKqqoOLi4v+nn3rTA6KvRlIEcAv23YkWhEl5e8S/n0D2XONfOt9kA0uaSg2APIJzVf8NTtj/HIyt8G+70ylZgZ1WWT/5B65vHN3N93Il7bIs1IZkzK0OTSQdOdZwqfc/tsn0j8+L74HR3oyD4IqIHK1joz+sS4F6xpYx4kbIfVdERcvxlHdHE1pmWS9quJ+sW85bK5dkfkiY1L3c8U/0QX3jlXAFr8rfr+rn/JDwYXUtRvZKd+LK98m2Wn/4yoABQC1QkmDGB253kX6O8bHp425kE9eOZI9HD9SQKREAOzCzAtk6bWZrvV9suYnKGMyx7mTnL5dOEdcwTgmVUvB9NSekhuj36c9Td26oeqkpGUgaNOIumpF9UAcGdiEtMYj46bGwPk2fVvRHPTsmTLsd1MG3UrAB/u2+T6cdHkMMDRxlM8XTxdEGHNzk3U2Oe8AEcaDzoBuyHQRb7jmV24SyZ0PwWjExPbjnFT3m0+gH/WVuL+eLHGVOWXEx6OA9i/iceKpynAmsNfsfSBeQDM3/A2f5zyuAB8fWpbtOXs2WS71c/EwTfH8jLzzb0NezDEAEWAEd11ICcxyU4ZqaYlZkNTQ9TRqPuDA5/Jqj3rKM6PY1xbs0VLht/oBTjeeFr7pPbG3+5nd+NR7hh2PXHg1U5LuJlRA0ZrXma+Wf1NNWvOrU7sP0Cf7gy4OwGkjhCAUNS2EFGX5aWw32AAak8dY1juYDEMg2AwqP0y+gjAp/u3UvbDRwDYeWQ/flzORw99TC9fljS3NTPn80eR1HgtAIiIqzsDwc7Lxp0OQG5mP56b8DPZMuNVxmcOAeDT2m3cOTSe5eZDO4LjBxQA4HG7eeHWeB2vOVjJu1N/n9zLl6XRqM2bX77OXcNLmNTnNgp7jsWHD9ux/V3vBgv4FhgOEIi0kKjcFyfPYd3eL7k+fxQA645sZ+rYeDF+XlvlDMobiKpyT+EttLb78VhuVtd+yYZJb6Ad1+Ozdz3fmWkoEuK0/xSvb301uerNXTmVpVWnEgzsSiyqqd8ExPUc0AUb3qE51AbAlm+rtTHQqgCVx3anNAZaAyLCifrTnGs7D0DV4e34vMkqIrgsl3al2uv2MjB9EH+6e6k81X/evsQZsYA1wMMAQRp4f/vzMijz7tjKnZVm5dnd7N14gnEZQ2gNnufFje9Er80a6jrceJJl2z+Woj7DdcG6ZbLlF3/j0Mlj4IXjdSelOdxgN9r1rohGsMRFmjuN3JRcstNzAGTRXUvSjqw49PeP+GS2lFUUJM6nAhKLRTnRmtqyaq8nFbdloIpHXITVhpDd5o4ZqVGN4VgExO1OnjKsmNUzF/GXzf9gzr9fJie5HyNy6traJZga1SimmHitJNI96QxMHshjY59kSOYQXbPrE7l3x72ZibtgQYdyqWlapCaFzZ5phOOQhDBRgBB2LCWiURwUomqoSeyW/LEKsOWbPSAmpwJ1rWFPyGu4DHW73ZguE1sinIvU8VXz1qr71kye/8Hulc7dY+9h9LmRs40O7/47oDoBoofLsfLSIyKidgc5NoGIdpU0VL2EIu15afHjuPXUXsVB8zPtmKO4uvlN7VDEsv2zD704a/PMCa99/cqx+0bff4fRxa/dAuwAxGupN8XlyLDMsE3MaCdg28QcL8iFwhJRIk7KquoNQUCP1B+TdF/U3zc96tbvel0BVleWVm0sLi8i8qRue2n3ohu2BiozzMSKCTMzQ4tLav46YWbmGYUs2zGCvb2xpGxPKHS8wUiL2+G44bgg8cK+s7XhHccPuo9Evm0fk20ni9dwuosNcBq4rv9DOZ1mZOT4gnY7K7LzIqhdW6l3vhqUeqDZ3WoKHKiz2rYcdVt1TaYLwUI6rLqCx6OhgtxQsGeaZQQxephes3v6a4GfVpZW1Xd9mXBGl23NyioKlqjylCFKKCrRpoBhH6izAu0R6e0yNDwg3WnPTY+lpXgcsR0xtrX5pqtQKiIZQC2wHPhPZWlVqLsVu2JrlmCjrKLgeEczqqBiCEhHi6LaYQbjL55cMrnmte7/+V+BL2/LoWtXOwHYFwcrOCrEVMRRUaWzJBYumVzzWoemXDQuF/yyALqwcAq4EXipq8noYO8b4DbguatpxS81/gvSJCNlZUMZjgAAAABJRU5ErkJggg==\",\"icon64URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTJxa2MboAABYBSURBVHjazZt5fFXlue+/z1p7SnYmMjHPMwJaNAhxQFTUWJHj0FBrK7W2tdajtYPYW/3ce+w5tz2N3rannh7s7amntLXHwxFbtYpinTUKQcFAEhAhEAghZCLJTva01nruH3vI3mEnjNL7fj7wgb3e913v83vm53mXcCbHmlVw11pYs8oAioFy4CZgITAJ8AD9wG7gTeC/gQbuWtuRtv4sDvkUiP8McC9wPVA4aJZmeOceYD3wKHetbTvbIMgZJv4nwLcA7zAEZxoakwy9hbt+9zzA6g2zvw9UAuOAZuBp4EdVFQ26esNsqioa/j8AYIDw/Lg4LzsJogdjoCAy09v82PJRzV8xRP0ZtrHjoDwDnBEQjNNaHSO+BHjvtIlXQya5DjYXaMfdtR2eABBWRQdNNOPqUlVV0cDqDbP/hhKwZlUCwEPAyFMnPjZKjfbmye5DY0FQhRy3c6CsJDTeUVGRjPveXlXR8Nu/DQAx4gV4A7j09I6gamJHLvTuCFtq5saJVUeRsdnWgZkFkUwgJMAuBjpORxWMUxZ9+D9x4vX06Ddkurup1cbISyFSDFFt7neNbg26OkRUhmDcv56uHThVCTgf2HL6NljVQAMXemtzHMxMZ1HLoXfpmKDPEPUMcdw8oPdUgTBOQfSJuyQ9ffpFRpttQQdjKEaIy9C87Z2e9mEOevfZU4GY1f/7eFR3fOlRe8DDDSGApWZnRFWGAVO0M2yOOhoxWjN4BQU+f3bc4AD3f3pC3FdleeEczN5wDKoECKrx5QrgZEl4VKqB0+TfiiqWrViOovVdHmxFog6W7RBBUVBR5dyzZwPWrPom8MsTmmtH2XL9P9B5tIurXnwE8v0Dz4JhvLaB5Qs2l/kbx2qcD6qoiIoq/V0RI9gdFaffMkKWUuAo/mm5dme2S51slxMs9dmlxT67s8DrjHWUOVUVOxs+fRWAfzhh3Y9EOX/cdJbNW8j3Z14d47wC4Qg7bvlnmr/5ODe6xrkUAR0gPhCVxp09LmnuN/MCUaPEUcYbkOsSNTrCRtQULQ1ZxsSmgNu3rcNbuq3du9ctOvXTVYE1q2DNbYtRSlAkBsHwOMwtnAQCqsqPl98Bnb2A8o/n38Q5oyZSmJXDU3f8vDTcGU3Iod0aNPbtCbgm20qWCG4RGPgjdEekQJVIzHwiirg6w+aUv7blrC5fVzYGoHxd2acAwF1rQd13ATbi9IMoaoLKEBZOuXri/JiOiYApzMsbC5EQ9y64GlVFRDDchiwbd7WKgd3UZxxpDZmTTBk6oDSErK6IEUh5LHGAzgU+KF9XNre6subMAJAaZz/08sxvnefZfukF3h1mmac+6wLvds711u8qMjt3ooYcIwyOzXXj56chkuXyUpJVRF52jooMUDB/1Dxp7OVQT9QYY8jw0bSI0hE2+g1SAqPYkjAwCqgpX1eWezJSMJwEeFZvmP3l+1+cHWoPmf/LLdZEQ1QNUTFExSeRmTPcTbMW+mr35BmBXhQnKQ1Rh8umpAEgTR9vazzHMvYOpjDPW9rXGWK8CHp8myz0W1KkYA3QryCE4v/1Ae8CcqIguIbgvAn8BVgmorSHXFGJnVwGXIdgIyro1DmePf2tdtHhRmvCGByr55Ks0ihCUdLoB4N6uPvA5Al9o9NqBKqqLf2dfpdpxJPhE+CYkBWIykG/i7EJ9ymGGCnyMA/4SXVlzepTkoB4VFUXT28RoC1kdqYeTuOMFpCYx5asUrNzzDjrkzr21JsVE+cXpVrJDVveFPKy2dK8MxbZJNaLyNY9uy0nZDTG4v3jOxgRpc+S0pT8wBZDxgxy6/eXryubdFIAJHR+9YbZzwAzUxAnEDUKBokcUTtKxIoko5ZDPZ5DB9uYAVbn8tkXozqgpy/UvQ1uNw4Wv3nzGUQGIr/1O14Lhdt0UvgozSBRTcZCmhoZpUWGPVHjiCSCaUNaMxgOBZ44KQDiBYY7gRtSXxuypVNiCQeqiqI4fQ7LS1fwxYmrcPWY0tjlaznQ5SlB1O3y55XOnTCDVEP359o3Yv+IRrnnhZ/yxGvrpT/Q59z+qwdp94aCGCpWQEf17e8+0t/VLf3BfhAh4sRdpKaRJkFbvPHtRd3qcsRJk8z4WFq+rmz+8WyBpHDfA4QHFzY6Q8b+2k7vRIn79Cmuaaz9/B/weDwA9Pf1WwUPX+WK+g0FleUTF/Hclx9JHqito52R378Ysrw8vbKKm9f9AFzSCozE7wPT6KE3lFvozuG52x6Vi+acr798aa3cs+VR7pi6nCcbX8bIcsWNBhhiIGowP9+xjYhpTiycFOgP9+U060HIjs2Jg6/A+urKms8d1wjGuf+zweGxKvTbkgNgOxbn55fx+I3/nmY5sv3ZrqrL79Rvv/crQeCzM8vTnPTzH7wOuTnML53OTRdfw/17a3mk7mmTbF/SEUwuHNu++e+fKC7OL0RV5e5rVrG+biO/vuVHnPPSVL734S+4anI5V41ZRGn2CCblj2FW6RQKCwoVyAF49v1nebj+IbJys1KZe3P5ujI3EB0qPjBWb5jN6g2z3cA3B2ucCBp1pFAE8p0RPPZ3a9KI19jgxnOXCsEghIOsmHVxmig+v+MtME2Wz4sVjqpuW02u5c1JvisU0tfu/GVRnPik6vzm1h8DcN81dzBDRjN/1AzuW7KKL5RdT/mMC7SwoNBM8SasWLSCaFs0E423DmsD4lb/7szJkUrYkoBlR/nh0h/hMl1J4roC3Y7EBiX5hWBZFGQXM2pESZr+v7DrXSUa5oZzLkus1RvnXOZDENThwUtul0nFYyU1GVRVJo+akHzXlZMXY9n2kElc4n1jfeMyldsrh4sOE/z8ekZ7C0RU+s/NW0D5tKRoa9OR/dHH/vqknVjTerQDXC5WzLgozVXu3LfbtoywZHlyOH/ynMRBZfyIkQDkGFk8fNXXSXWLL25+nT9UP59GmKgQtELHteh5nvzBLBSgYlgJWL1hdg4we6gYtDcUtL6z6P7kgUREbl17f/iCqfPdqiqqyvt7a8Hr4rrp6fr/yq7NXfj93Dzv8rQ9u/sDgPKDi76I6TIREVSVcCjMZ9fe3/KnHW8GUuc3tO3hcKDjuBlYtic74+/l68pmDicB1wy36VTfdD1nwjlJrn7c1MA7Bz8KTSscqwlC39q/DWyHilnlaWufrN1YjGOFV553VZpdqGvZA1GL715ySyr3eWDdT5Viz+jKCytyUufXtm4Pd/Yd2Juq85mGZVtDkXHhUO7QABYP3a9yuGXequwUruoT76/vpKC4+N39tZIQ0Q273mdqwST82SkccGBT83YQaf3svEvS7MLbB7Zzw8yleDyeJPejkSj/suUZwVZWzh+QmKZD+ykq6vX2RHZN6e3vSYCufcF+AsE0QaEr2DUUKecNZQdcwJyhmhr9oSAXTanIT7HO8vvtG724TL7yl5/gx0NleQX7uvfz7bI70vT/1Y/eBb+HZRPK8lN33ntwP1Gjj68vuC5NXf7vq+ugwMPyaRchhpHc5836mqP+An+BiMGq9V+Um8ZXsmV/jeT5c3sevvmfkgGaIOwJfkKRFmYyhNOGU4HJQ+l/kWuq5vpzzAT3jna3c6ivO4IqeF2sfPZBXN9bDHnZXDttUZo4/2VnNXhcesO8y/JT93y5rhr8fq6Zk64u//b+M4DNvRfenLbPf9W+7TcMM4zCQesA/1z/j4wYXaAP3/xPeaqadJ3/8sLPyB+fl0k9BJgwXCA0aqiHs0ZekgbM7ubGfrKzRhALCyE7BxuF/n6unLkwLZ17tu5tsIPy+flXpvn3l3dv4oopC9Pe09bRTn3XJ+SWjoztkwrY3vfck71mc2G2PSYYDsqPLq1i+dwVaXu+VfsWTx78He4i91CkFA8nATmZ9d9mXP7cNESbe7oE00hv6CKcM2oWidK+qhIMBtnXu5/xBRMYkZOfqv/60p7NVMxYlPau/968EQpyuG/hzWlq9ElTI5YnSm/YLLVtSx67fA3L565IiwMOt7dwz8Zv4C5yD2kc43WCIQEwMxZ1HYvS7OlpxksMMyuWEcWTd8cBhaunXZi29oWtb0Ken+tmpIv54bZWDdtHuWjsvLTDbty9OZbDXnxrmvi/vONdyPVrf9Db8eiSn7FkxmVpz1s7W7nlyZXkTMpJk4hMxZ3hAMgYPzqOTaE/XTsun7MQjvYKakNvD09UPACdnSyZeG7awV7c9R6YwrIpFyR/V1Verd8UJcvDBeNnpx323aZa7rngJnKz/Wm/v/zxJrAj8vvlPyxZMv3yNCL7+/v1tie/QP/IAI468crEkKN/OBvQBxQcA4A6eN3+tN9yc3J54cv/xp/q3+T+y7/IyJwivmJFuGzqgmMPLhEumXTeQDQnwmu7awLiy/O63OmFqHNLpvKL5d85houv7Klh8Tmf4fr5l5qpkWFvX69z82N/Z8g4YaprGoZjEFWLzmgHtmljmVGiGk0EbqjqsAC0ZAIABNuxBjV7lGsXXMq1C2KJzUtb3sJTOJo8f25yTiAQ4FB/C+TmUpw/Im39hrrq/tGjRhQN3vOvD/w6rfihqhw43ExI+vjaBcuPAeZw12F55r7n1e/LPkbmWztb2XF4O5uPvM8rjRvp8Xbj9XgPDKcCezM9ME2TrsBhMiUdifFcw9t8Zsz0NGJe2V4NednMLkz3PKFgiJaeg/jdvmP2VFU6urvS9n/xo7ch10v52LmDmaDTx02XTMQDjCwcyRVzruSBS3/A+pXPcoVrGX29fecveWFxXjllGQHYkVE0DDdNR2uHaPvFWPXEthfxmu40Yl7b8wG43eR4s9LmV9dvgWxfSW8kqIP3EhG27qlL22fjrk0ATBgxMt0Qi5xQO88wDAqyCvhJ5aPcO+k7/kib1cQzx9xawwCqM5eKTDbtfzpTqQkR4dG//AfhLIfa1r1pc97ZXwsKDe37kxwTEbY0NYDH4zvcc6R9cJiy9ZM6wthp73lp9yZwHHxu76k3PuPS9ZWld/CDeQ/l97YE3rs7cod50bqFaQC8NFQm0Gp/xLY9bx0j+h837eX+N9aA281Rq5c/ffBqcs62lp0xW2D369M1r2iCYzta9sRcp9rRmsYdmoziEK78+Tf47IIlyT2aW1sImrG6YNiKnt4NkDgI1y24Xr85/Z4Z7z1Z85t3KzenFUQiwNZjU03B5XLzxIdfY9OuDRzubNLG1mbnuQ9fZ87PvgB5WbFAyHRx47oHeWXHexxqbQFvvK5ruuRzf3ygd937L2FZFge6DsdLmq68rz1bJXuPHOTjln1cUfVVSqakFzJer9sEeX4Qk7ZAV7xwFNLWzlZnT+sn1LfUsb2llo8ObaPu8A52te7iQMcBugPdGVU1DoJ8Y9ldOjYwdlX5+rK5g4uidwKPZ9J1EQj2hckzx/BUQ0FgT1erH78v1g5LhMQCEna4qGQW73Q2gCvu5gKho4Qi+ZdM+IzsPtLEYe1VhA6y3cX5+LGtKAEJcs+ilfzium8n33v7rx/ity1vgRXlx4u+SmNrM2FjX6DbaQsfNbqKgk6QKFEsx8JrevEYXvLceRR5ihibNY6y4gu5/twVuL3HhsZ7D+3l2qeWfbjru3vPB5DErcvVG2brUBcdQDAN5andeQ2N7d7Zx1bhNVMm3UxfaFwSpERfSRVys5pBxwCCY/Pnyh+zYu6S5OJJ/+Na9vtiRRPsGJ8WTgz0uXJdhqI+QGLbSfyexLH5n9Nrc9O4lXxn2fcwTTNVGvSr/3G77C7eOc8K2TuMlPs1jwyhRMRb+IzJjRa4TKf9WG1J62PHxCYc8ZNogIik55sRKysepYAVYenkBakRGPu7mxIlSTAFhIDHJ0cRshJ1SEk26CQZ8CR+F0MwC1z6X0f/2HPJ2sVH/7j1DwSCAU2owl2L79Yjje3fra6sidUE432Bh4DQUGUnVfCbjjGjJOzgyHBXYwTb6cRyRmRMs0WUiOWL9yDw+wqSgZSqUl33wYB9iedXpqkd6jFKdZhs55hyqSJe0/uvdr61+Kd1jzx9x0u3ScPBehURzp91AcXR4i8li6JVFQ3EjeGdHNuLSeynBV6nIM9rl/p9dnNGmGJJkkMwoogMfTNKNRvL7gaYVzIlzWK/07gNsnyJ1FpRZHShZSjiPtEYIOX8P3Q5rp0ffKn2c81O8y23vrrSeWPX6wBcNulyc8lzixek9QarKhp+B/xnJhBUkQKP02arMKsklINof5ryxyxmlGC0HUeLj9voD0U9QLDQl5v2nk1NDSl1BRWPy+maUBT1ZLghdjw5eLS6siZcXVlD+boyqj9X85Q/N3vBt96/++Pff7hWrphyJR2HOpYO7g0CfAl4fTAIIjDCa4+2laDL1PwZxeFOHJE4l2LhXDjaQtQuHob7Awd0tICI3d3Y1ZIG1LbDHye7AzjSPXdU0I9p+Ia4LzwU94PAA4lCaAKEd27aXJuTk7Pw8d2/bNja8yGRgHWekaE1bldVNFweB8EZJFJmgcfpACjMtsaV5kbjqqA2YWsvYWtC3DrJCUQoSihS2nDk47YPGusH3FTH/qQBnF4a6nOb2o6QfxLEC/CF6soaJ7UQmvy3Q7dLXPP+89AfWgtHj5g01P0A4iDcA+xKlqOBcX4rW1WwVZhQGCkpyY7W0Wd1EY5OiXNeTkJMDdT0Xfbbe3vXbX4ZjdjgUnAITxgRaS32W2PEbbhPkvjHqytr/jxUGby6soa3Vr5nu93uiw23UXLcw8YbJwuBL6uyUEQL3jyU1Vnoc/qm5Ebn+lxqbqjzHqxvcU+O3x87mbuHiqrgMg66s7LGzXWP1q19+2TKaLupJMcep6qGmWP2AjknaABfqq6sqShfV8Zw7bDE8/J1ZTeeCADHfJnx4MuzfmU7fN2JeT31uFRervfu/fCge4zjiA85SRxUwe06INnmyGnFkZaiLGuio4KYHDCzzfEnuMsb1ZU1S49H/GAQTvq2eNxQlgBHEmKnirpNlX2dZucrO709bUfNScR6t8dBInY9EovQ7HHR3rIpFp/0uq2oI6MFxfSb3Qh5Q3A/de//Cfzv6soa56STpVPNslZvmP14PG5IIUXFUXEOdpmt6z/y9UWjMm3gC4CUA+sACQV+Z+vnFwSn5/o0W0QNVaH+qHtrW8Q1zpVtlhyH8HpgObD3ZO8HnhYAcSnwAV3EvhBLvVShhqh4XNDSYzTvOOQ62t5nlkQsSh0VDFHH5+bwmHy749yx0fG5Xi2I2ANHUUVNUWlzXIvqA76lIrIMKIq/JxIvcNYBv62urHknVZzPGgApQFwHPJ+ptZYAIpkigNqKJL4MUAVHYzYkxccnVOrbj1zb8PMUfc2NAx4Bek9F1D8VAOIg/DtwB6f50VTK+lerKhquPJPfBn6aEpCIIDdyWp/NJddtA8oA62wQf0YkIA6EN55D3HAKICTmbwaurKpo6OUsDuMM7ROuqmi4EfgVKfd4T3DYwItVFQ0XAmeV+DMmAYPUoQK4D7hqGPeVGO8Aa6oqGv7I32jImdwsBYQsYh8930rsktJcYtcYw8BOYCPwO2BfVUVDgL/h+H+8Ex3DrupO9wAAAABJRU5ErkJggg==\"}"); -pref("social.manifest.msnnow", "{\"builtin\": \"true\",\"origin\": \"https://now.msn.com\",\"name\": \"msnNOW\",\"workerURL\": \"https://now.msn.com/js/firefoxworker\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MomNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5RjUxOThGOTJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5RjUxOThGODJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTVCMTdDQ0M1MkFFMjExODNDRENFQTc0Q0EwNzEyMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ppp4JKMAAABiSURBVHjaYvz//z8DJYCJgULAAmNwJEwk2Sk/FuQzUuyCUQMGgwGM+FIitrQBintKXKCG0wVA27Cl0t9IfEUgfoDmGuwuAEkAAbLzJdE14/UC1DUwOW6ggS/ICkRiAECAAQBDhCEtt+sSkAAAAABJRU5ErkJggg==\",\"icon32URL\": \"data:image/gif;base64,R0lGODlhIAAgAMQAAABgkm+lwf///y99psDY5K/N3c/h6k+RtA9pmO/1+I+5zz+HrR9zn7/X5N/r8V+bu3+vyJ/D1oCwySB0oGCcu+Ht80CIrRBqmTB+pwAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAAAgACAAAAXAICCOZGmeaKqubOu+cCzPdG3fraDvfO//OhFwSNwJi0jfUQBpKCCRnQNCdQgMDV0iK9haBcvS4ooYIZyAAjMtUAC4YUYiwQAkDgBIAgIYJAAPAnWBDAxGAEZjAgtvYYgHCAYAFpEACoeJOowNZVZ/CAIFfRcOfQBfYIhBipsPfRADgDoTshgABzxhrG8JjCILCToBb21smEUODahIS0nOzc7MAATU1dbX1qjYBDUSOhQ4JN7g4SMS5OXp6uvs7eshADs=\",\"icon64URL\": \"data:image/gif;base64, R0lGODlhQABAAPcAAABgkonIVjuOhf///7tnLwhnmY6bU8/h6gGO/7/X5H+vyK/N3WBaW0+RtACSnF+buy6Gl0uy/9l7J6PXeV6HaO/1+PvIIwyNxY+5z02acCpfghaw6hR5mPh2FKlXUn/I8v+UcgJ2wSCwoyB0oD+HrfB5TpuZV4TDXsyyOiCc/9/r8Uuf0G+lwdtcPACvoESShBGt+Z/D1iN6hIbFUid/rQea/Ri79x2Cwt9VFZPRYf1bB3B8jHhmYwNnoD1tdjeIjwN7yG+0YK2oRQtokRGV/xKupgWcpLBoTx7E6QWAxy99pueyQJ3Rj1i5/+pJPUmahwl7qjBsjw2m+wC3qQGblftlDB9jgkCIrVGfgn1nUJrRbRzC9h9zn+eEIi+k/5HMYhi33iaqlsHZ5SaKyRBqmRa2+P9PBfH3+Quh+wCllzB+pwNupmC5+WCcuwWV/YrHWBFti4zJWxCUxKxPVJfPaQ5omYCwyabZfjBhfuHt83CmwgCZmQmGxgC8rdHj61CStLHP3YHK+QR4uhaX/1C0/w+TxASjo6HF1xCq+o3MWh7G9RKv+ZG70QOS/kSVgQme/Ad5yQCxo5rSbgqj+xOx+QSV/xKV/43JXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAABAAEAAAAj/AAEIHEiwoMGDCBMqXMiwocOHECNKnEixosWLGDNq3Mixo8ePIC2uCPSBRkiNYyJEaMKmwMmLPSzJTOHlxkuLIdzodIMA0s2IO6IITIKmKJoaQH5CBFECDwA+i6IikiJI6cMjZnAAuGCjaxlKazJeKTjW4BU1B0eUBcBAR5UshcCAUaRow8UrMQboTTAi714yAEYk0Lt37BU7ZwgnQEuggwQoVNIYQSLn4oAzba60SYxZ85kEABac+TNCzZ8YdgDotXPFswoAVrrM0bDHhQtDHCy3GdhmwJ+BegYASKAiM+CBAzAQ/DMArQ8nHhxM6RPmBByLA9ZeyT5wOwA1fggP//CD1jfB7WV5tIBQRISkS0Gwa+cu0Ht3zSr8qF4LAL1AIRYYwMQdWsQRgAAV0defgt7pgdZAC+in4IJlUWABCj9MQMcbiWCR4HzzhXZZAgkkttuE/glkwhIAvPDFDDk8UdEVxwFABo0D3VifHTzqMUJ9NdqIo0EyZODIEBWRqOSSTDbp5JNQRvmkQOJVaeWVWGap5ZZ6Ucnll2CGeaWXYpZpZpZknqmmmmmu6WaYbb4pp5ZxVlkBiQdoeecCCww2p5VxkmBjAoLmqICVKjxgEAsV6FWBApD6qZcKkPpFGAaVVhmoQg+Id0CQBCmhgl4/AqCEeMoJ1KheBwyEgaaqVf9ZqEANKNAAQX5WECQJSoSqV6oAjKpXrwJZysJAqxK2qY156hXDQJ0OoMBAorJKLAB5VeDqpAQ1QBgXAkUr3rIkVAkuAOUOcC4ZyQ7QKq163WrqrwU1+q6IsFpZaLqE7dslvFUSy4VeCww06rml5nVsYGPGKp6/DwtUrrYCHSorcnodh8G7IxQMgLfnWpzvxeiSnC60+mI8wMJKLMzCAMeBJpCwI0dcss3pHjeweBTf7O5A5+apKADnbtdwyj7rBfHQAIg7gLwAvErYgwKNQHBBltbcr8Qmc0utAiyca2O7zw70csY5tjuuw1snPQDEA5SNkKSOEtTsAEw7rbXSXONxLN4CYgN9t3hDW02YxwAMvre7eFZ5QONVLqDAAw8oQPefwrGN+ebKas755nV+Pmfoor9Jeulrno76mQJJ6frrSyZW5WevWzXQ5WdQbXtDdOe+O0SS+v77Q34KP7xDgxl/PO/KL8/QAro7L/301FcfUkAAOw==\",\"sidebarURL\": \"https://now.msn.com/sidebar\",\"description\": \"See what's trending in realtime on Twitter, Facebook, Bing, YouTube and more.\",\"author\": \"Microsoft\",\"homepageURL\": \"https://now.msn.com/now-for-firefox\"}"); - - pref("social.sidebar.open", true); - pref("social.sidebar.unload_timeout_ms", 10000); - pref("social.toast-notifications.enabled", true); + // comma separated list of domain origins (e.g. https://domain.com) for + // providers that can install from their own website without user warnings. + // entries are diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-20 17:49:18.467307120 -0300 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-06-26 22:53:37.285513294 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-06-26 22:57:20.932228108 -0300 @@ -3,69 +3,41 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -130,7 +130,7 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil , "https://www.gnu.org/software/gnuzilla/addons.html" ]; -@@ -139,10 +111,6 @@ +@@ -203,10 +175,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); logoElt.src = searchEngineInfo.image; @@ -155,9 +155,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-15 19:14:45.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200 -@@ -3,19 +3,12 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-18 08:01:12.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-26 22:44:10.393864883 -0300 +@@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -171,17 +171,15 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio - -# This is the default set of web based feed handlers shown in the reader -# selection UI --browser.contentHandlers.types.0.title=Google --browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s --browser.contentHandlers.types.1.title=My Yahoo! --browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.0.title=My Yahoo! +-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s +browser.search.order.1=DuckDuckGo HTML +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -24,20 +17,10 @@ +@@ -22,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 21d56e13c..a5af10e63 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -25,10 +25,10 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification ac_add_options --enable-gstreamer +ac_add_options --enable-pulseaudio ac_add_options --disable-crashreporter ac_add_options --disable-updater -ac_add_options --disable-tests ac_add_options --disable-installer # Parabola features diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index 2f4ebe32b..71ba205a4 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -1,3 +1,3 @@ # PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' +mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run' diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD index a896613ee..7bca08571 100644 --- a/libre/lilo/PKGBUILD +++ b/libre/lilo/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Eric Belanger # Contributor: judd -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva pkgname=lilo pkgver=23.2 diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD deleted file mode 100644 index a5b733e9f..000000000 --- a/libre/mariadb/PKGBUILD +++ /dev/null @@ -1,141 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Andrea Scarpino -# Contributor: Douglas Soares de Andrade -# Maintainer (Parabola): Márcio Silva - -falsename=mysql -_falsename=MySQL -pkgbase=mariadb -_pkgbase=MariaDB -pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") -pkgver=5.5.23 -pkgrel=1.5 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.${pkgbase}.org/" -makedepends=('cmake' 'openssl' 'zlib') -options=('!libtool') -source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz" - "${falsename}d" - 'my.cnf') -md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' - '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6') - -build() { - cd "${srcdir}" - mkdir build - cd build - - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ - - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/${falsename} \ - -DMYSQL_DATADIR=/var/lib/${falsename} \ - -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_unicode_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/${falsename}/docs \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/${falsename} \ - -DINSTALL_DOCREADMEDIR=share/${falsename} \ - -DINSTALL_SUPPORTFILESDIR=share/${falsename} \ - -DINSTALL_MYSQLSHAREDIR=share/${falsename} \ - -DINSTALL_DOCDIR=share/${falsename}/docs \ - -DINSTALL_SHAREDIR=share/${falsename} \ - -DWITH_READLINE=ON \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITH_PBXT_STORAGE_ENGINE=1 \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 - - make -} - -package_libmariadbclient(){ - pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})" - depends=('openssl') - conflicts=("lib${falsename}client") - provides=("lib${falsename}client=${pkgver}") - - cd "${srcdir}"/build - for dir in include lib${falsename} lib${falsename}d libservices; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - install -d "${pkgdir}"/usr/bin - install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/ - install -d "${pkgdir}"/usr/share/man/man1 - for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done -} - -package_mariadb-clients(){ - pkgdesc="${_pkgbase} client tools (branch of ${_falsename})" - depends=("lib${pkgbase}client") - conflicts=("${falsename}-clients") - provides=("${falsename}-clients=${pkgver}") - - cd "${srcdir}"/build - make -C client DESTDIR="${pkgdir}" install - - # install man pages - install -d "${pkgdir}"/usr/share/man/man1 - for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done - - # provided by mariadb - rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test} -} - -package_mariadb(){ - pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}" - backup=("etc/${pkgbase}/my.cnf") - install=${falsename}.install - depends=("${pkgbase}-clients") - optdepends=('perl-dbi' "perl-dbd-${falsename}") - conflicts=("${falsename}") - provides=("${falsename}=${pkgver}") - options=('emptydirs') - - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf - install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d - - # provided by libmariadbclient - rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded} - rm "${pkgdir}"/usr/lib/lib${falsename}* - rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1 - - # provided by mariadb-clients - rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap} - rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1 - - # not needed - rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/${falsename} -} diff --git a/libre/mariadb/mariadb.install b/libre/mariadb/mariadb.install deleted file mode 100644 index f56a0dcaa..000000000 --- a/libre/mariadb/mariadb.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null - /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mariadb - chown -R mysql:mysql /var/lib/mariadb &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/libre/mariadb/mariadbd b/libre/mariadb/mariadbd deleted file mode 100755 index 3ae612096..000000000 --- a/libre/mariadb/mariadbd +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MariaDB Server" - [ ! -d /var/run/mariadb ] && install -d -g mysql -o mysql /var/run/mariadb &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mariadb/mariadb.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MariaDB Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mariadb/mariadb.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/libre/mariadb/my.cnf b/libre/mariadb/my.cnf deleted file mode 100644 index 9a41b4fc3..000000000 --- a/libre/mariadb/my.cnf +++ /dev/null @@ -1,145 +0,0 @@ -# MySQL config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) -# -# MySQL programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, see: -# http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -# Here follows entries for some specific programs - -# The MySQL server -[mysqld] -port = 3306 -socket = /var/run/mysqld/mysqld.sock -datadir = /var/lib/mysql -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, -# MASTER_USER=, MASTER_PASSWORD= ; -# -# where you replace , , by quoted strings and -# by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /var/lib/mysql -#innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -#innodb_buffer_pool_size = 16M -#innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -#innodb_log_file_size = 5M -#innodb_log_buffer_size = 8M -#innodb_flush_log_at_trx_commit = 1 -#innodb_lock_wait_timeout = 50 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/libre/mariadb/mysql.install b/libre/mariadb/mysql.install deleted file mode 100644 index 9a4479215..000000000 --- a/libre/mariadb/mysql.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr - chown -R mysql:mysql var/lib/mysql &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/libre/mariadb/mysqld b/libre/mariadb/mysqld deleted file mode 100644 index 1ac88a7cc..000000000 --- a/libre/mariadb/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MySQL Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MySQL Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 0d1d14cd0..b2e362899 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando -# Contributor (Parabola): Márcio Silva +# Contributor (Parabola): Márcio Silva # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index d5a1e561d..d2c38b7d6 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: André Silva pkgname=parabola-keyring -pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgver=$(LC_ALL=C date -u +%Y%m%d).1 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -15,5 +15,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('ad747cf1f710e5962aa6b0931fcb580f' - 'c1030ca1c960d2ee6cfe11d798a7b471') +md5sums=('007c35459478f86484f66323bf90b1e0' + 'SKIP') diff --git a/pcr/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD index 4f933934a..976316dc4 100644 --- a/pcr/chiliproject/PKGBUILD +++ b/pcr/chiliproject/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=chiliproject pkgver=3.3.0 diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD index c680ac904..da085729f 100644 --- a/pcr/cinepaint-lts/PKGBUILD +++ b/pcr/cinepaint-lts/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgname=cinepaint-lts pkgver=1.0 diff --git a/pcr/clusterit/PKGBUILD b/pcr/clusterit/PKGBUILD index c325a003b..59ef12be3 100644 --- a/pcr/clusterit/PKGBUILD +++ b/pcr/clusterit/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=clusterit pkgver=2.5 diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD index ebcc90448..1b42c921c 100644 --- a/pcr/collada-dom/PKGBUILD +++ b/pcr/collada-dom/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=collada-dom pkgver=2.4.0 diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD index 7bd87f791..a24064722 100644 --- a/pcr/corosync/PKGBUILD +++ b/pcr/corosync/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=corosync _pkgflag=lts diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD index 9fed072aa..efa005071 100644 --- a/pcr/ganglia/PKGBUILD +++ b/pcr/ganglia/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=ganglia pkgver=3.6.0 diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD index 11c3b191b..cd38b329d 100644 --- a/pcr/gimp-art/PKGBUILD +++ b/pcr/gimp-art/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=gimp-art pkgver=2.8.2 diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license index 64267a6c0..0f060c013 100644 --- a/pcr/gimp-art/gimp-splash-artwork.license +++ b/pcr/gimp-art/gimp-splash-artwork.license @@ -1,7 +1,7 @@ GIMP LIBRE SPLASH LICENSE -Logo and Effects is created by Zé Lara and Márcio Silva -Idea by André Silva +Logo and Effects is created by Zé Lara and Márcio Silva +Idea by André Silva The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street, @@ -10,4 +10,4 @@ Suite 900, Mountain View, California, 94041, USA. Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain). To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. This work is published from: United States. -https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg \ No newline at end of file +https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg diff --git a/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD index fae564053..9f5784608 100644 --- a/pcr/gimp-toolkit-gps/PKGBUILD +++ b/pcr/gimp-toolkit-gps/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=gimp-toolkit-gps _pkgname=${pkgname:13} diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD index 538949f60..6b27ff5f4 100644 --- a/pcr/lcmc/PKGBUILD +++ b/pcr/lcmc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=lcmc pkgver=1.5.1 diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD index 23f03db2d..782e12a15 100644 --- a/pcr/libav/PKGBUILD +++ b/pcr/libav/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva static=false _pkgname=libav diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD index 0db1b1068..9968dde38 100644 --- a/pcr/mednafen-server/PKGBUILD +++ b/pcr/mednafen-server/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=mednafen-server _pkgname=${pkgname%-server} diff --git a/pcr/python2-paramiko/PKGBUILD b/pcr/python2-paramiko/PKGBUILD deleted file mode 100644 index da62b4e28..000000000 --- a/pcr/python2-paramiko/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Chris Brannon -# Contributor: Douglas Soares de Andrade -# Contributor: Mario Danic - -pkgbase=python-paramiko -pkgname=python2-paramiko -pkgver=1.9.0 -pkgrel=1 -pkgdesc="Python module that implements the SSH2 protocol" -url="http://www.lag.net/paramiko/" -license=('LGPL') -arch=('any') -depends=('python2-crypto') -conflicts=() -replaces=() -source=(http://pypi.python.org/packages/source/p/paramiko/paramiko-$pkgver.tar.gz) - - -package_python2-paramiko() { - cd "$srcdir/paramiko-$pkgver" - - python2 setup.py install --root="$pkgdir" --optimize=1 - install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" - install -dm755 "$pkgdir/usr/share/doc/$pkgname/demos" - install -m644 demos/* "$pkgdir/usr/share/doc/$pkgname/demos" - chmod 755 "$pkgdir/usr/share/doc/$pkgname/demos/"*.py - - find "$pkgdir" -name '*.py' -print0 |xargs -0 \ - sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \ - -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' -} -md5sums=('b78472021ff6586dd61ad6972032f54f') diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD index 22852780c..eba2bb854 100644 --- a/pcr/sipwitch/PKGBUILD +++ b/pcr/sipwitch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Serban # Contributors: David Zaragoza, Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva pkgname=sipwitch pkgver=1.2.4 diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD index 0f06af418..fb1229ae4 100644 --- a/pcr/spacenav-daemon/PKGBUILD +++ b/pcr/spacenav-daemon/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=spacenav-daemon _pkgname=${pkgname%-daemon} diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD index 5f469fa5f..850aa3b7d 100644 --- a/pcr/torque/PKGBUILD +++ b/pcr/torque/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=torque pkgver=4.2.2 diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD index 4b40ebea2..dfad17f34 100644 --- a/pcr/xf86-input-wizardpen/PKGBUILD +++ b/pcr/xf86-input-wizardpen/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=xf86-input-wizardpen _pkgname=${pkgname:11} diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD index 8cb84fad5..6ab789ccc 100644 --- a/social/sipwitch/PKGBUILD +++ b/social/sipwitch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Serban # Contributors: David Zaragoza, Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva pkgname=sipwitch pkgver=1.2.4 diff --git a/~coadde/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD new file mode 100644 index 000000000..256b6e9ae --- /dev/null +++ b/~coadde/mariadb/PKGBUILD @@ -0,0 +1,141 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino +# Contributor: Douglas Soares de Andrade +# Maintainer (Parabola): Márcio Silva + +falsename=mysql +_falsename=MySQL +pkgbase=mariadb +_pkgbase=MariaDB +pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") +pkgver=5.5.23 +pkgrel=1.5 +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://www.${pkgbase}.org/" +makedepends=('cmake' 'openssl' 'zlib') +options=('!libtool') +source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz" + "${falsename}d" + 'my.cnf') +md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' + '2234207625baa29b2ff7d7b4f088abce' + '1c949c0dbea5206af0db14942d9927b6') + +build() { + cd "${srcdir}" + mkdir build + cd build + + # CFLAGS/CXXFLAGS as suggested upstream + CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ + + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/${falsename} \ + -DMYSQL_DATADIR=/var/lib/${falsename} \ + -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ + -DDEFAULT_CHARSET=utf8 \ + -DDEFAULT_COLLATION=utf8_unicode_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/${falsename}/docs \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/${falsename} \ + -DINSTALL_DOCREADMEDIR=share/${falsename} \ + -DINSTALL_SUPPORTFILESDIR=share/${falsename} \ + -DINSTALL_MYSQLSHAREDIR=share/${falsename} \ + -DINSTALL_DOCDIR=share/${falsename}/docs \ + -DINSTALL_SHAREDIR=share/${falsename} \ + -DWITH_READLINE=ON \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITH_PBXT_STORAGE_ENGINE=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + + make +} + +package_libmariadbclient(){ + pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})" + depends=('openssl') + conflicts=("lib${falsename}client") + provides=("lib${falsename}client=${pkgver}") + + cd "${srcdir}"/build + for dir in include lib${falsename} lib${falsename}d libservices; do + make -C ${dir} DESTDIR="${pkgdir}" install + done + + install -d "${pkgdir}"/usr/bin + install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/ + install -d "${pkgdir}"/usr/share/man/man1 + for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done +} + +package_mariadb-clients(){ + pkgdesc="${_pkgbase} client tools (branch of ${_falsename})" + depends=("lib${pkgbase}client") + conflicts=("${falsename}-clients") + provides=("${falsename}-clients=${pkgver}") + + cd "${srcdir}"/build + make -C client DESTDIR="${pkgdir}" install + + # install man pages + install -d "${pkgdir}"/usr/share/man/man1 + for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done + + # provided by mariadb + rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test} +} + +package_mariadb(){ + pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}" + backup=("etc/${pkgbase}/my.cnf") + install=${falsename}.install + depends=("${pkgbase}-clients") + optdepends=('perl-dbi' "perl-dbd-${falsename}") + conflicts=("${falsename}") + provides=("${falsename}=${pkgver}") + options=('emptydirs') + + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf + install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d + + # provided by libmariadbclient + rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded} + rm "${pkgdir}"/usr/lib/lib${falsename}* + rm -r "${pkgdir}"/usr/include/ + rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1 + + # provided by mariadb-clients + rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap} + rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1 + + # not needed + rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench} + rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1 + + install -dm700 "${pkgdir}"/var/lib/${falsename} +} diff --git a/~coadde/mariadb/mariadb.install b/~coadde/mariadb/mariadb.install new file mode 100644 index 000000000..f56a0dcaa --- /dev/null +++ b/~coadde/mariadb/mariadb.install @@ -0,0 +1,26 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null + /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mariadb + chown -R mysql:mysql /var/lib/mariadb &>/dev/null +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/~coadde/mariadb/mariadbd b/~coadde/mariadb/mariadbd new file mode 100755 index 000000000..3ae612096 --- /dev/null +++ b/~coadde/mariadb/mariadbd @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MariaDB Server" + [ ! -d /var/run/mariadb ] && install -d -g mysql -o mysql /var/run/mariadb &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mariadb/mariadb.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MariaDB Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mariadb/mariadb.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/~coadde/mariadb/my.cnf b/~coadde/mariadb/my.cnf new file mode 100644 index 000000000..9a41b4fc3 --- /dev/null +++ b/~coadde/mariadb/my.cnf @@ -0,0 +1,145 @@ +# MySQL config file for medium systems. +# +# This is for a system with little memory (32M - 64M) where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +port = 3306 +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 1M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +log-bin=mysql-bin + +# binary logging format - mixed recommended +binlog_format=mixed + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted +server-id = 1 + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, +# MASTER_USER=, MASTER_PASSWORD= ; +# +# where you replace , , by quoted strings and +# by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +#innodb_data_home_dir = /var/lib/mysql +#innodb_data_file_path = ibdata1:10M:autoextend +#innodb_log_group_home_dir = /var/lib/mysql +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +#innodb_buffer_pool_size = 16M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +#innodb_log_file_size = 5M +#innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +#innodb_lock_wait_timeout = 50 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/~coadde/mariadb/mysql.install b/~coadde/mariadb/mysql.install new file mode 100644 index 000000000..9a4479215 --- /dev/null +++ b/~coadde/mariadb/mysql.install @@ -0,0 +1,26 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + usr/bin/mysql_install_db --user=mysql --basedir=/usr + chown -R mysql:mysql var/lib/mysql &>/dev/null +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/~coadde/mariadb/mysqld b/~coadde/mariadb/mysqld new file mode 100644 index 000000000..1ac88a7cc --- /dev/null +++ b/~coadde/mariadb/mysqld @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MySQL Server" + [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MySQL Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD index 210fda175..8c791a2fe 100644 --- a/~emulatorman/hunspell-gl/PKGBUILD +++ b/~emulatorman/hunspell-gl/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Adrián Chaves Fernández (Gallaecio) , 2009-2010. -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=hunspell-gl pkgver=2.9b diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD index 960164820..c5629e9fc 100644 --- a/~emulatorman/raider/PKGBUILD +++ b/~emulatorman/raider/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: M.Carreira # Contributor: M.Carreira -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=raider pkgver=0.10.0 pkgrel=1 diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD index 977999a38..7ed44c2e3 100644 --- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD +++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD @@ -1,5 +1,5 @@ # Contributor: Gökmen Görgen -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=xchat-xsys-noaudacious pkgver=2.2.0 pkgrel=3 diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD index 114954fc3..13f4d5c12 100644 --- a/~emulatorman/xonotic-data/PKGBUILD +++ b/~emulatorman/xonotic-data/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Alexander Suhoverhov -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=xonotic-data pkgver=0.5.0 diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD index 236474d3d..a51606cd5 100644 --- a/~emulatorman/xonotic/PKGBUILD +++ b/~emulatorman/xonotic/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Sven-Hendrik Haase # Contributor: Alexander Suhoverhov -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=xonotic pkgver=0.5.0 -- cgit v1.2.3-54-g00ecf From 8421e68301cd00265bc8db838e69254316c7133a Mon Sep 17 00:00:00 2001 From: root Date: Sat, 29 Jun 2013 01:17:51 -0700 Subject: Sat Jun 29 01:17:51 PDT 2013 --- community/gloobus-preview/PKGBUILD | 85 --------- .../gloobus-preview/fix-gtksource-include.patch | 39 ----- community/gloobus-preview/fix-unoconv.patch | 46 ----- community/gloobus-preview/gloobus-preview.install | 12 -- community/gloobus-preview/use-xdg-open.patch | 20 --- community/gsoap/PKGBUILD | 6 +- community/ipsec-tools/PKGBUILD | 43 ----- .../ipsec-tools/ipsec-tools-linux-3.7-compat.patch | 50 ------ community/ipsec-tools/ipsec.service | 12 -- community/ipsec-tools/racoon.service | 10 -- community/luaposix/PKGBUILD | 6 +- community/newton-dynamics/PKGBUILD | 46 ----- community/newton-dynamics/assert-fix.patch | 13 -- community/oss/PKGBUILD | 121 ------------- community/oss/linux-3.8.patch | 40 ----- community/oss/oss.install | 30 ---- community/oss/oss.service | 12 -- community/oss/remove-hal.patch | 20 --- community/oss/rm-init-scripts.patch | 52 ------ community/oss/soundon.patch | 28 --- community/tomoyo-tools/PKGBUILD | 37 ---- community/tomoyo-tools/tomoyo-tools.install | 11 -- community/xbmc/ChangeLog | 69 -------- community/xbmc/PKGBUILD | 112 ------------ community/xbmc/xbmc.install | 16 -- community/xbmc/xbmc.service | 13 -- core/curl/PKGBUILD | 7 +- extra/gtkmm/PKGBUILD | 8 +- extra/libwebp/PKGBUILD | 8 +- extra/rrdtool/PKGBUILD | 16 +- extra/rrdtool/rrdtool-pangofont.patch | 39 +++++ libre/bbswitch-libre/PKGBUILD | 4 +- libre/cdfs-libre/PKGBUILD | 4 +- libre/dkms-libre/01-broken-uninstall.patch | 22 +++ libre/dkms-libre/02-no-kernel-hook.patch | 13 ++ libre/dkms-libre/PKGBUILD | 66 +++++++ libre/dkms-libre/dkms.default | 9 + libre/dkms-libre/dkms.hook | 12 ++ libre/dkms-libre/dkms.install | 13 ++ libre/dkms-libre/dkms.service | 11 ++ libre/dkms-libre/dkms.systemd | 61 +++++++ libre/ipsec-tools-libre/PKGBUILD | 48 ++++++ .../ipsec-tools-linux-3.7-compat.patch | 50 ++++++ libre/ipsec-tools-libre/ipsec.service | 12 ++ libre/ipsec-tools-libre/racoon.service | 10 ++ libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 14 +- libre/linux-libre-lts/config.i686 | 4 +- libre/linux-libre-lts/config.x86_64 | 4 +- libre/linux-libre/PKGBUILD | 14 +- libre/linux-libre/config.i686 | 4 +- libre/linux-libre/config.i686.3.10 | 10 +- libre/linux-libre/config.x86_64 | 4 +- libre/linux-libre/config.x86_64.3.10 | 10 +- libre/lirc-libre/PKGBUILD | 6 +- libre/newton-dynamics-libre/PKGBUILD | 50 ++++++ libre/newton-dynamics-libre/assert-fix.patch | 13 ++ libre/oss-libre/PKGBUILD | 104 +++++++++++ libre/oss-libre/linux-3.8.patch | 40 +++++ libre/oss-libre/oss.install | 25 +++ libre/oss-libre/oss.service | 12 ++ libre/oss-libre/remove-hal.patch | 20 +++ libre/oss-libre/rm-init-scripts.patch | 52 ++++++ libre/oss-libre/soundon.patch | 28 +++ libre/tomoyo-tools-libre/PKGBUILD | 42 +++++ libre/tomoyo-tools-libre/tomoyo-tools.install | 11 ++ libre/tp_smapi-libre/PKGBUILD | 4 +- libre/vhba-module-libre/PKGBUILD | 4 +- libre/virtualbox-libre-modules/PKGBUILD | 9 +- libre/xarchiver-libre/PKGBUILD | 4 +- libre/xbmc-libre/ChangeLog | 69 ++++++++ libre/xbmc-libre/PKGBUILD | 116 +++++++++++++ libre/xbmc-libre/xbmc.install | 16 ++ libre/xbmc-libre/xbmc.service | 13 ++ pcr/cluster-glue/PKGBUILD | 191 +++++++-------------- pcr/cluster-glue/fixing-path.sed | 29 ++++ pcr/cluster-glue/ha-log.service | 12 ++ .../replace-linux_os-to-gnulinux_os-term.sed | 73 ++++++++ .../replace-opensource-to-free-term.sed | 19 ++ social/miniupnpc/PKGBUILD | 22 --- 80 files changed, 1248 insertions(+), 1166 deletions(-) delete mode 100644 community/gloobus-preview/PKGBUILD delete mode 100644 community/gloobus-preview/fix-gtksource-include.patch delete mode 100644 community/gloobus-preview/fix-unoconv.patch delete mode 100644 community/gloobus-preview/gloobus-preview.install delete mode 100644 community/gloobus-preview/use-xdg-open.patch delete mode 100644 community/ipsec-tools/PKGBUILD delete mode 100644 community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch delete mode 100644 community/ipsec-tools/ipsec.service delete mode 100644 community/ipsec-tools/racoon.service delete mode 100644 community/newton-dynamics/PKGBUILD delete mode 100644 community/newton-dynamics/assert-fix.patch delete mode 100644 community/oss/PKGBUILD delete mode 100644 community/oss/linux-3.8.patch delete mode 100644 community/oss/oss.install delete mode 100644 community/oss/oss.service delete mode 100644 community/oss/remove-hal.patch delete mode 100644 community/oss/rm-init-scripts.patch delete mode 100644 community/oss/soundon.patch delete mode 100644 community/tomoyo-tools/PKGBUILD delete mode 100644 community/tomoyo-tools/tomoyo-tools.install delete mode 100644 community/xbmc/ChangeLog delete mode 100644 community/xbmc/PKGBUILD delete mode 100644 community/xbmc/xbmc.install delete mode 100644 community/xbmc/xbmc.service create mode 100644 extra/rrdtool/rrdtool-pangofont.patch create mode 100644 libre/dkms-libre/01-broken-uninstall.patch create mode 100644 libre/dkms-libre/02-no-kernel-hook.patch create mode 100644 libre/dkms-libre/PKGBUILD create mode 100644 libre/dkms-libre/dkms.default create mode 100644 libre/dkms-libre/dkms.hook create mode 100644 libre/dkms-libre/dkms.install create mode 100644 libre/dkms-libre/dkms.service create mode 100644 libre/dkms-libre/dkms.systemd create mode 100644 libre/ipsec-tools-libre/PKGBUILD create mode 100644 libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch create mode 100644 libre/ipsec-tools-libre/ipsec.service create mode 100644 libre/ipsec-tools-libre/racoon.service create mode 100644 libre/newton-dynamics-libre/PKGBUILD create mode 100644 libre/newton-dynamics-libre/assert-fix.patch create mode 100644 libre/oss-libre/PKGBUILD create mode 100644 libre/oss-libre/linux-3.8.patch create mode 100644 libre/oss-libre/oss.install create mode 100644 libre/oss-libre/oss.service create mode 100644 libre/oss-libre/remove-hal.patch create mode 100644 libre/oss-libre/rm-init-scripts.patch create mode 100644 libre/oss-libre/soundon.patch create mode 100644 libre/tomoyo-tools-libre/PKGBUILD create mode 100644 libre/tomoyo-tools-libre/tomoyo-tools.install create mode 100644 libre/xbmc-libre/ChangeLog create mode 100644 libre/xbmc-libre/PKGBUILD create mode 100644 libre/xbmc-libre/xbmc.install create mode 100644 libre/xbmc-libre/xbmc.service create mode 100644 pcr/cluster-glue/fixing-path.sed create mode 100644 pcr/cluster-glue/ha-log.service create mode 100644 pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed create mode 100644 pcr/cluster-glue/replace-opensource-to-free-term.sed delete mode 100644 social/miniupnpc/PKGBUILD (limited to 'core') diff --git a/community/gloobus-preview/PKGBUILD b/community/gloobus-preview/PKGBUILD deleted file mode 100644 index d460e6610..000000000 --- a/community/gloobus-preview/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 91027 2013-05-18 11:44:36Z bgyorgy $ -# Maintainer: Balló György - -pkgname=gloobus-preview -pkgver=0.4.5.290 -_pkgver=0.4.5-ubuntu11~ppa290 -pkgrel=1 -pkgdesc="Gnome application designed to enable a full screen preview of any kind of file" -arch=('i686' 'x86_64') -url="http://gloobus.net/" -license=('GPL') -depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils') -makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') -optdepends=('djvulibre: Preview DjVu documents' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-good-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' - 'gstreamer0.10-ugly-plugins: Extra media codecs' - 'libspectre: Preview PostScript documents' - 'p7zip: View content of 7z archives' - 'unoconv: Preview LibreOffice compatible documents' - 'unrar: View content of RAR archives' - 'unzip: View content of .ZIP archives') -options=('!libtool') -install=$pkgname.install -source=(https://launchpad.net/~gloobus-dev/+archive/$pkgname/+files/${pkgname}_$_pkgver.orig.tar.xz - gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi - fix-gtksource-include.patch - fix-unoconv.patch - use-xdg-open.patch) -md5sums=('27b3db2043ecaf47fa928940bbb4f32a' - 'SKIP' - 'ca15a3e31cec01d3d4fc5a4e1720f692' - '03379c173e67ad1b6804bc609336451d' - 'd6d9e2b3e001f0ea8440cccdf90480af') - -prepare() { - cd "$srcdir/$pkgname-$_pkgver" - - # Python2 fix - sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration - - # Fix build - patch -Np1 -i "$srcdir/fix-gtksource-include.patch" - sed -i 's/-Werror//' configure.ac src/Makefile.am - - # Fix unoconv support - patch -Np1 -i "$srcdir/fix-unoconv.patch" - - # Use xdg-open - patch -Np1 -i "$srcdir/use-xdg-open.patch" - - ### Prepare gloobus-sushi - cd "$srcdir/gloobus-sushi" - - # Python2 fix - sed -i 's/python /python2 /' src/gloobus-sushi.in -} - - -build() { - cd "$srcdir/$pkgname-$_pkgver" - - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make - - ### Build gloobus-sushi - cd "$srcdir/gloobus-sushi" - - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd "$srcdir/$pkgname-$_pkgver" - make DESTDIR="$pkgdir" install - - ### Install gloobus-sushi - cd "$srcdir/gloobus-sushi" - make DESTDIR="$pkgdir" install - - # Rename service file to avoid conflict with sushi - mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service} -} diff --git a/community/gloobus-preview/fix-gtksource-include.patch b/community/gloobus-preview/fix-gtksource-include.patch deleted file mode 100644 index 053169a43..000000000 --- a/community/gloobus-preview/fix-gtksource-include.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h 2013-05-17 06:27:37.833360264 +0200 -@@ -1,8 +1,7 @@ - #ifndef _ITEXT_ - #define _ITEXT_ - --#include --#include -+#include - //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview - - #include "gloobus-preview-interface-main.h" -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp 2013-05-17 06:28:19.300984059 +0200 -@@ -1,6 +1,6 @@ - #include "gloobus-preview-plugin-manager.h" - #include --#include -+#include - - vector PluginManager::plugins; - map PluginManager::filetypes; -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h 2013-05-17 06:26:26.788384315 +0200 -@@ -3,10 +3,7 @@ - - #ifndef PLUGIN_LOADER - --#include --#include --#include --#include -+#include - #include - - #include "../gloobus-preview-config.h" diff --git a/community/gloobus-preview/fix-unoconv.patch b/community/gloobus-preview/fix-unoconv.patch deleted file mode 100644 index f918f3019..000000000 --- a/community/gloobus-preview/fix-unoconv.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp 2013-05-18 10:24:33.558221788 +0200 -@@ -87,7 +87,7 @@ - - if( NULL == uri && Utils::isProgramAvailable("unoconv") ) { - gchar *path = g_file_get_path(file); -- gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp); -+ gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path); - - if( system(cmd) == 0) { - uri = pathToUri(tmp); -@@ -123,4 +123,4 @@ - { - path = "file://" + path; - return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false); --} -\ No newline at end of file -+} -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h 2013-05-18 10:33:02.352806550 +0200 -@@ -6,15 +6,21 @@ - PluginManager::register_plugin("office"); - - PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1); -+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1); - PluginManager::register_filetype("application/msword", 1); - PluginManager::register_filetype("application/rtf", 1); - PluginManager::register_filetype("application/vnd.ms-excel", 1); - PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1); -+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1); - PluginManager::register_filetype("application/vnd.ms-powerpoint", 1); -+PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1); -+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1); - PluginManager::register_filetype("application/vnd.sun.xml.calc", 1); -+PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1); -+ - - // TODO: add more filetypes supported by abiword and/or OpenOffice - - #endif - --#endif /* OFFICE_PLUGIN_H */ -\ No newline at end of file -+#endif /* OFFICE_PLUGIN_H */ diff --git a/community/gloobus-preview/gloobus-preview.install b/community/gloobus-preview/gloobus-preview.install deleted file mode 100644 index 16ad7278f..000000000 --- a/community/gloobus-preview/gloobus-preview.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/gloobus-preview/use-xdg-open.patch b/community/gloobus-preview/use-xdg-open.patch deleted file mode 100644 index 68e219e6a..000000000 --- a/community/gloobus-preview/use-xdg-open.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp 2013-05-18 09:49:24.833574800 +0200 -@@ -560,12 +560,12 @@ - string label(gtk_menu_item_get_label(item)); - if(label == _("Settings")) - cmd = "gloobus-preview-configuration"; -- else if(label == _("Report a Bug")) -- cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\""; -+ else if(label == _("Report a Problem")) -+ cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\""; - else if(label == _("Blog")) -- cmd = "gnome-open \"http://gloobus.wordpress.com\"" ; -+ cmd = "xdg-open \"http://gloobus.wordpress.com\"" ; - else if(label == _("Donate")) -- cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0¤cy_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ; -+ cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0¤cy_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ; - else if(label == _("About")) - ui->create_about(); - else if(label == _("Quit")) diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index b5f17fb81..a0452fa3a 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87262 2013-03-29 11:58:05Z spupykin $ +# $Id: PKGBUILD 93225 2013-06-28 19:02:51Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Tor Krill # Contributor: Lee.MaRS pkgname=gsoap -pkgver=2.8.14 +pkgver=2.8.15 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('a032616b7c3b613ce67260a89db9df74' +md5sums=('abd244644446ae08d3aa36ece9113ad4' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD deleted file mode 100644 index 16bf75bdf..000000000 --- a/community/ipsec-tools/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 91860 2013-05-28 17:37:17Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Allan Henriksen - -pkgname=ipsec-tools -pkgver=0.8.1 -pkgrel=4 -pkgdesc="KAME IPSec tools ported to Linux" -arch=('i686' 'x86_64') -url="http://ipsec-tools.sourceforge.net/" -depends=('readline' 'openssl' 'krb5') -makedepends=('linux-headers') -license=('GPL') -options=('!makeflags' '!libtool') -source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 - racoon.service - ipsec.service - ipsec-tools-linux-3.7-compat.patch) -md5sums=('d38b39f291ba2962387c3232e7335dd8' - '3a64a9e3b498c6da90450ffb0b758aea' - '387a0b0c4f10e42b2bb62282885cdc9c' - 'ae1dd20c83dcfce3dedb46ee73e83613') - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch - sed -i 's#-Werror##' configure.ac - - ./bootstrap - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ - --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ - --enable-adminport --enable-gssapi \ - --with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service - install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service -} diff --git a/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch deleted file mode 100644 index 46b11ee51..000000000 --- a/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -74,9 +74,10 @@ case "$host_os" in - [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) - - AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , -- [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, -- KERNEL_INCLUDE=/usr/src/linux/include , -- [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) -+ [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, , -+ [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, -+ KERNEL_INCLUDE=/usr/src/linux/include , -+ [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] ) - AC_SUBST(KERNEL_INCLUDE) - # We need the configure script to run with correct kernel headers. - # However we don't want to point to kernel source tree in compile time, -@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes, - #ifdef SADB_X_EXT_NAT_T_TYPE - yes - #endif --], [kernel_natt="yes"]) -+], [kernel_natt="yes"], [ -+ AC_EGREP_CPP(yes, -+ [#include -+ #ifdef SADB_X_EXT_NAT_T_TYPE -+ yes -+ #endif -+ ], [kernel_natt="yes"]) -+]) - ;; - freebsd*|netbsd*) - # NetBSD case ---- a/src/include-glibc/Makefile.am -+++ b/src/include-glibc/Makefile.am -@@ -1,14 +1,7 @@ -- --.includes: ${top_builddir}/config.status -- ln -snf $(KERNEL_INCLUDE)/linux -- touch .includes -- --all: .includes -- - EXTRA_DIST = \ - glibc-bugs.h \ - net/pfkeyv2.h \ - netinet/ipsec.h \ - sys/queue.h - --DISTCLEANFILES = .includes linux -+DISTCLEANFILES = linux diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service deleted file mode 100644 index 483a5b58d..000000000 --- a/community/ipsec-tools/ipsec.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Load IPSec Security Policy Database -After=syslog.target network.target - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/bin/setkey -f /etc/ipsec.conf -ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F - -[Install] -WantedBy=multi-user.target diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service deleted file mode 100644 index 95324bd5d..000000000 --- a/community/ipsec-tools/racoon.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Racoon IKEv1 key management daemon for IPSEC -After=syslog.target network.target - -[Service] -Type=forking -ExecStart=/usr/bin/racoon - -[Install] -WantedBy=multi-user.target diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index 2fc912623..e937311b8 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93034 2013-06-22 17:02:30Z seblu $ +# $Id: PKGBUILD 93201 2013-06-28 13:21:16Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: SpepS # Contributor: Laszlo Papp @@ -6,7 +6,7 @@ pkgbase=luaposix pkgname=('lua-posix' 'lua51-posix') -pkgver=5.1.28 +pkgver=29 pkgrel=1 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ license=('GPL' 'LGPL') makedepends=('lua' 'lua51' 'lua51-bitop' 'git') options=('!libtool') source=("$pkgname-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/v$pkgver.tar.gz") -md5sums=('0ea20ea21bd9f92b79041beb6d41393e') +md5sums=('5c3e49c51caeee6eb5f9dcb2bb082bed') prepare() { # do bootstrap in prepare, as it clone external git diff --git a/community/newton-dynamics/PKGBUILD b/community/newton-dynamics/PKGBUILD deleted file mode 100644 index defe9db75..000000000 --- a/community/newton-dynamics/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: Josh Taylor (deficite) -# Contributor: Christophe Robin (bombstrike) -pkgname=newton-dynamics -pkgver=2.33 -pkgrel=2 -pkgdesc="A simple physics API" -arch=('i686' 'x86_64') -url="http://www.newtondynamics.com" -license=('custom') -depends=() -makedepends=('unrar') -source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar" - 'assert-fix.patch') -md5sums=('b8394c7c3f4e8a1bd41ffa07c5979a9e' - 'fa747c99d0516d66f03175fca1f1ba34') - -build() { - _srcdir="${srcdir}/newton-dynamics-${pkgver}" - [ "$CARCH" = "i686" ] && platform="linux32" - [ "$CARCH" = "x86_64" ] && platform="linux64" - builddir="${_srcdir}/coreLibrary_200/projets/${platform}" - - # clean build directory - [ -d "${_srcdir}" ] && rm -Rf "${_srcdir}" - - # decompress package - cd "${srcdir}" - unrar x "newton-dynamics-${pkgver}.rar" - - # needed for building - mkdir -p "${_srcdir}/packages/${platform}" - - # patch issue with an _ASSERT call instead of _ASSERTE - cd "${_srcdir}/coreLibrary_200" - patch -p0 < "${srcdir}/assert-fix.patch" - - ## build lib - cd "${builddir}" - sed -i 's/ -o libNewton.so/ -lpthread -lstdc++ -o libNewton.so/' makefile - make - - install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a" - install -D -m755 "${builddir}/libNewton.so" "${pkgdir}/usr/lib/libNewton.so" - install -D -m644 "${_srcdir}/coreLibrary_200/source/newton/Newton.h" "${pkgdir}/usr/include/Newton.h" -} diff --git a/community/newton-dynamics/assert-fix.patch b/community/newton-dynamics/assert-fix.patch deleted file mode 100644 index 83dfdd790..000000000 --- a/community/newton-dynamics/assert-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: source/core/dgTypes.cpp -=================================================================== ---- source/core/dgTypes.cpp (revision 506) -+++ source/core/dgTypes.cpp (working copy) -@@ -515,7 +515,7 @@ - return 0; - } - _ASSERTE (compareCount <= dgInt32 (strideInBytes / sizeof (dgFloat64))); -- _ASSERT (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64)))); -+ _ASSERTE (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64)))); - - dgInt32 stride = strideInBytes / dgInt32 (sizeof (dgFloat64)); - dgInt32 stride2 = stride + 2; diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD deleted file mode 100644 index b90a4c5eb..000000000 --- a/community/oss/PKGBUILD +++ /dev/null @@ -1,121 +0,0 @@ -# $Id: PKGBUILD 92254 2013-06-03 11:15:27Z allan $ -# Maintainer: Kyle Keen -# Contributor: Florian Pritz -# Contributor: Paulo Matias -# Contributor: Daniel J Griffiths - -pkgbase=oss -pkgname=oss -true && pkgname=(oss libflashsupport-oss) -pkgver=4.2_2007 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://developer.opensound.com/" -license=('GPL2') -makedepends=('gtk2') -source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" - "rm-init-scripts.patch" - "soundon.patch" - "remove-hal.patch" - "linux-3.8.patch" - "oss.service" -) -md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' - 'b9a380a0ac8896390d71ac13676f27e1' - '65f07fe241bfbf912f76d8b6d8f276b5' - 'cd7f1dc6166bba8c94d96f3a28e948a5' - 'effecefb774f1d08ef9f0af0ad205c34' - '39c46b10a6bc56fc146d669a61bd3028') -_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl - -build() { - cd "${srcdir}/${_dir}" - - # Avoid these flags conflicting with OSS build system. - unset CFLAGS - unset LDFLAGS - unset OSFLAGS - unset LIBRARIES - export NO_WARNING_CHECKS=yes - - # Compile libflashsupport.so only in packaging time, so we avoid - # conflicts with other packages and ease package management. - msg "Building libflashsupport.so." - cd oss/lib - gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so - - msg "Preparing the build environment." - cd "${srcdir}" - - # Create build directory and configure - rm -rf build - mkdir build && cd build - "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm - - # ossvermagic hardcodes /lib/modules *grumble* - sed -i 's|/lib/modules|/usr&|' \ - os_cmd/Linux/ossvermagic/ossvermagic.c - - pushd "$srcdir/$_dir" - patch -p0 -i "${srcdir}/linux-3.8.patch" - popd - - msg "Building OSS." - make build - - msg "Patching init scripts." - cd "${srcdir}/build/prototype" - rm usr/lib/oss/etc/S89oss - patch -p0 -i "${srcdir}/rm-init-scripts.patch" - patch -p0 -i "${srcdir}/soundon.patch" - # remove hal dependency - patch -p0 -i "${srcdir}/remove-hal.patch" - rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi - - # fix kernel module directories - sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon - sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh - sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh - sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh - sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \ - usr/lib/oss/build/install.sh \ - usr/lib/oss/scripts/restore_drv.sh \ - usr/lib/oss/scripts/setup-alsa.sh \ - usr/lib/oss/scripts/remove_drv.sh \ - usr/lib/oss/build/Makefile.tmpl \ - usr/lib/oss/build/Makefile.osscore \ - usr/lib/oss/cuckoo/Makefile -} - -package_oss() { - pkgdesc="Open Sound System UNIX audio architecture" - depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed') - optdepends=('gtk2: for graphical mixer (ossxmix)' - 'libflashsupport-oss: Adobe flash plugin support') - conflicts=('oss-linux' 'oss-linux-free' 'oss-testing') - backup=('usr/lib/oss/soundon.user') - install=oss.install - - cd "${srcdir}/build/prototype" - cp -a * "${pkgdir}" - - cd "$pkgdir" - mv usr/sbin/* usr/bin - rmdir usr/sbin - chmod -R a+r . # All files can have read permission (FS#13815) - find . -type d -exec chmod a+x '{}' \; # Make namcap happy - install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service -} - -package_libflashsupport-oss() { - pkgdesc="Adobe flash plugin support lib (OSSv4)" - conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') - depends=('oss') - - cd "${srcdir}/${_dir}" - - install -dm755 "$pkgdir/usr/lib" - ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/oss/linux-3.8.patch b/community/oss/linux-3.8.patch deleted file mode 100644 index 46200e01a..000000000 --- a/community/oss/linux-3.8.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- setup/Linux/oss/build/pci_wrapper.inc 2009-08-27 05:19:07.000000000 +0300 -+++ setup/Linux/oss/build/pci_wrapper.inc 2013-02-08 13:56:10.519794975 +0200 -@@ -17,7 +17,11 @@ - static dev_map_t dev_map[MAX_INSTANCE]; - static int n_devmap = 0; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) - static int __devinit -+#else -+static int -+#endif - osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid) - { - oss_device_t *osdev; -@@ -65,7 +69,11 @@ - return 0; - } - --static void __devexit -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) -+static int __devexit -+#else -+static int -+#endif - osspci_remove (struct pci_dev *pcidev) - { - int i; -@@ -80,10 +88,11 @@ - pci_disable_device (dev_map[i].pcidev); - osdev_delete (osdev); - -- return; -+ return 0; - } - - printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n"); -+ return -EIO; - } - - void diff --git a/community/oss/oss.install b/community/oss/oss.install deleted file mode 100644 index 672d63644..000000000 --- a/community/oss/oss.install +++ /dev/null @@ -1,30 +0,0 @@ -post_install() { - echo "Running OSS install script..." - sh /usr/lib/oss/build/install.sh &>/dev/null - echo - echo " Note that OSS can't currently work together with kernel" - echo " ALSA modules, so they were moved out by the OSS install" - echo " scripts. If you want the ALSA kernel modules back, you can" - echo " just remove this package using pacman." -} - -post_upgrade() { - echo "Running OSS update script..." - sh /usr/lib/oss/build/install.sh &>/dev/null - - if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then - echo "libflashsupport.so has been split into a seperate package." - echo "If you want flash to use oss, please install libflashsupport-oss" - fi -} - -pre_remove() { - # Restore any replaced ALSA drivers. - sh /usr/lib/oss/scripts/restore_drv.sh -} - -post_remove() { - echo " Open Sound System was now removed, and the ALSA kernel" - echo " modules were restored." -} - diff --git a/community/oss/oss.service b/community/oss/oss.service deleted file mode 100644 index 0200d2477..000000000 --- a/community/oss/oss.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Open Sound System v4 -Before=sound.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/soundon -ExecStop=/usr/bin/soundoff - -[Install] -WantedBy=multi-user.target diff --git a/community/oss/remove-hal.patch b/community/oss/remove-hal.patch deleted file mode 100644 index 27e2ef2de..000000000 --- a/community/oss/remove-hal.patch +++ /dev/null @@ -1,20 +0,0 @@ -Date: Tue Aug 2 16:37:31 CEST 2011 -Author: Florian Pritz -This removes all hal dependencies - -References: -http://www.archlinux.org/todo/92/ - ---- usr/lib/oss/build/install_2011-08-02_162647.sh 2011-08-02 16:26:47.000000000 +0200 -+++ usr/lib/oss/build/install.sh 2011-08-02 16:27:13.000000000 +0200 -@@ -336,10 +336,4 @@ - echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs - fi - --# Hal 0.5.0+ hotplug --mkdir -p /usr/lib/hal/scripts --ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/ --mkdir -p /usr/share/hal/fdi/policy/20thirdparty/ --ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/ -- - exit 0 diff --git a/community/oss/rm-init-scripts.patch b/community/oss/rm-init-scripts.patch deleted file mode 100644 index 981ff605f..000000000 --- a/community/oss/rm-init-scripts.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- usr/lib/oss/build/install.sh.orig 2008-09-25 11:41:47.180167692 -0300 -+++ usr/lib/oss/build/install.sh 2008-09-25 11:41:47.180167692 -0300 -@@ -290,38 +290,6 @@ - echo - fi - --if ! test -d /etc/init.d --then -- mkdir /etc/init.d --fi -- --rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss --cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss -- --chmod 744 /etc/init.d/oss -- --if test -x /sbin/chkconfig --then -- /sbin/chkconfig oss on > /dev/null 2>&1 --else -- if test -x /usr/sbin/update-rc.d -- then -- /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1 -- else -- if test -d etc/rc.d/rc3.d -- then -- rm -f /etc/rc.d/rc3.d/S89oss -- ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss -- else -- if test -d /etc/rc3.d -- then -- rm -f /etc/rc3.d/S89oss -- ln -s /etc/init.d/oss /etc/rc3.d/S89oss -- fi -- fi -- fi --fi -- - # Install ALSA interface module (Cuckoo) - #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 - #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1 ---- usr/lib/oss/scripts/restore_drv.sh.orig 2008-09-25 11:41:47.210168487 -0300 -+++ usr/lib/oss/scripts/restore_drv.sh 2008-09-25 11:41:47.210168487 -0300 -@@ -18,8 +18,6 @@ - fi - fi - --rm -f /etc/init.d/oss -- - if ! test -d /lib/modules/`uname -r`/kernel/sound - then - if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2 diff --git a/community/oss/soundon.patch b/community/oss/soundon.patch deleted file mode 100644 index 4702b8680..000000000 --- a/community/oss/soundon.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- usr/sbin/soundon.old 2009-09-04 06:35:26.000000000 +0100 -+++ usr/sbin/soundon 2009-11-15 13:59:53.000000000 +0000 -@@ -255,7 +255,10 @@ - then - if test "`uname -m` " = "x86_64 " - then -- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 -+ # Fix for compatibility with Arch's directory structure -+ # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed -+ ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2 -+ #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 - #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 - else - if test -s /lib/libasound.so.2 -@@ -278,8 +281,11 @@ - then - if test "`uname -m` " = "x86_64 " - then -- ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 -- ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 -+ # Fix for compatibility with Arch's directory structure -+ ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib -+ ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib -+ #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 -+ #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 - else - if test -s /lib/libasound.so.2 - then diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD deleted file mode 100644 index a89950e46..000000000 --- a/community/tomoyo-tools/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 92639 2013-06-10 09:54:10Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer: Jamie Nguyen - -pkgname=tomoyo-tools -_basever=2.5.0 -_timestamp=20130406 -_file=53357 -pkgver=${_basever}.${_timestamp} -pkgrel=1 -pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' -arch=('i686' 'x86_64') -url='http://tomoyo.sourceforge.jp' -#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' -license=('GPL') -depends=('ncurses' 'linux>=3.2') -install=tomoyo-tools.install -source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('8888f83fcb87823d714ff551e8680d0d') - -prepare() { - cd "${srcdir}/${pkgname}" - sed -i \ - -e 's|usr/sbin|usr/bin|g' \ - -e 's|sbin|usr/bin|g' \ - usr_lib_tomoyo/init_policy.c -} - -build() { - cd "${srcdir}/${pkgname}" - make USRSBINDIR=/usr/bin SBINDIR=/usr/bin -} - -package() { - cd "${srcdir}/${pkgname}" - make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install -} diff --git a/community/tomoyo-tools/tomoyo-tools.install b/community/tomoyo-tools/tomoyo-tools.install deleted file mode 100644 index 8f769d0db..000000000 --- a/community/tomoyo-tools/tomoyo-tools.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - echo - echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/sbin/init' to the kernel" - echo " boot options and initialize policy with this command:" - echo " /usr/lib/tomoyo/init_policy" - echo -} - -post_upgrade () { - post_install $1 -} diff --git a/community/xbmc/ChangeLog b/community/xbmc/ChangeLog deleted file mode 100644 index 66ae97e3b..000000000 --- a/community/xbmc/ChangeLog +++ /dev/null @@ -1,69 +0,0 @@ -2010-04-10 BlackEagle - * 9.11-15 : - Made it back compliant with FHS ( thx pierre for pointing that out ) - namcap checked and modified to fit its needs as far as it was possible - -2009-03-07 [vEX] - - * 8.10-10 : - Try and fix some autoconf issues (thanks Gentoo ebuild). - -2009-02-08 [vEX] - - * 8.10-9 : - Replace some libtool 'ltmain.sh' scripts with the one from libtool - installed with Arch. - Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault - on systems using the nvidia driver. - -2009-01-30 [vEX] - - * 8.10-8 : - Fix some include's so that gcc 4.3.x is happy, shouldn't complain about - undefined '::realloc' anymore. - Remove Mac OS X specific files. - -2009-01-25 [vEX] - - * 8.10-7 : - Moved libcdio, pmount, smbclient and unrar to optdepends. - Removed unneeded dependency on sdl_gfx. - Removed dependency on libpng as sdl_image depends on it. - -2008-12-14 [vEX] - - * 8.10-6 : - Added libpng to dependency list. - Added gawk to dependency list. - Removed '--disable-mms' and '--enable-halmount' configure flags as they - are not mentioned as supported in the configure script. - -2008-12-06 [vEX] - - * 8.10-5 : - Added libmad to the dependency list. - Streamripper 1.64.0+ does not include tre anymore, removed streamripper - and added tre instead. - Removed subversion from makedepends. - -2008-12-06 [vEX] - - * 8.10-4 : - Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not - fail any longer. - -2008-12-05 [vEX] - - * 8.10-3 : - Added lirc to the optdepends array. - -2008-11-26 [vEX] - - * 8.10-2 : - Added install file which informs users that a display depth of at - least 24-bit is required. - -2008-11-17 [vEX] - - * 8.10-1 : - Initial package, based on previous work by Zeqadious. diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD deleted file mode 100644 index 06bdca011..000000000 --- a/community/xbmc/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 92502 2013-06-07 09:29:03Z tomegun $ -# Maintainer: Sergej Pupykin -# Contributor: Brad Fanella -# Contributor: [vEX] -# Contributor: Zeqadious -# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > - -_prefix=/usr - -pkgname=xbmc -pkgver=12.2 -pkgrel=4 -pkgdesc="A software media player and entertainment hub for digital media" -arch=('i686' 'x86_64') -url="http://xbmc.org" -license=('GPL' 'custom') -depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' - 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' - 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' - 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' - 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' - 'tinyxml' 'taglib') -makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' - 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') -optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' - 'pulseaudio: pulseaudio support' - 'lirc: remote controller support' - 'udisks: automount external drives' - 'upower: used to trigger suspend functionality' - 'unrar: access compressed files without unpacking them' - 'xorg-xinit: autostart xbmc') -install="${pkgname}.install" -source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" - "xbmc.service") -md5sums=('489f3877decae4e265ece54f9eaef0ba' - '76fae229ebc3bcfaab7e7f27e4fb51f5') - -build() { - cd "${srcdir}/xbmc-$pkgver" - - # fix lsb_release dependency - sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp - sed -i -e 's:#include :#include :' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp - - # Bootstrapping XBMC - ./bootstrap - - # Configuring XBMC - export PYTHON_VERSION=2 # external python v2 - ./configure --prefix=$_prefix --exec-prefix=$_prefix \ - --disable-debug \ - --enable-optimizations \ - --enable-gl \ - --enable-sdl \ - --enable-vaapi \ - --enable-vdpau \ - --enable-xvba \ - --enable-joystick \ - --enable-xrandr \ - --enable-rsxs \ - --enable-projectm \ - --enable-x11 \ - --enable-pulse \ - --enable-rtmp \ - --enable-samba \ - --enable-nfs \ - --enable-afpclient \ - --enable-airplay \ - --enable-airtunes \ - --enable-ffmpeg-libvorbis \ - --enable-dvdcss \ - --disable-hal \ - --enable-avahi \ - --enable-webserver \ - --enable-optical-drive \ - --enable-libbluray \ - --enable-texturepacker \ - --enable-udev \ - --enable-libusb \ - --enable-libcec \ - --enable-external-libraries \ - --disable-external-ffmpeg - # Now (finally) build - make -} - -package() { - cd "${srcdir}/xbmc-$pkgver" - # Running make install - make DESTDIR="${pkgdir}" install - - # run feh with python2 - sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc - - # lsb_release fix - sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" - sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" - - # Tools - install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" - install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" - - # Licenses - install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}" - for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" - done - - # systemd stuff - install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service -} -# vim:set ts=2 sw=2 et: diff --git a/community/xbmc/xbmc.install b/community/xbmc/xbmc.install deleted file mode 100644 index b104b33e8..000000000 --- a/community/xbmc/xbmc.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - getent group xbmc > /dev/null || groupadd xbmc - getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc - usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 - echo "You may want to remove xbmc user and group" -} diff --git a/community/xbmc/xbmc.service b/community/xbmc/xbmc.service deleted file mode 100644 index 431582f1b..000000000 --- a/community/xbmc/xbmc.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description = Starts instance of XBMC using xinit -After = remote-fs.target - -[Service] -User = xbmc -Group = xbmc -Type = simple -ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp -Restart = always - -[Install] -WantedBy = multi-user.target diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index cda53a9cc..ed57b83dd 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182802 2013-04-15 12:46:55Z dreisner $ +# $Id: PKGBUILD 188993 2013-06-28 01:14:19Z dreisner $ # Maintainer: Dave Reisner # Contributor: Angel Velasquez # Contributor: Eric Belanger @@ -6,17 +6,18 @@ # Contributor: Daniel J Griffiths pkgname=curl -pkgver=7.30.0 +pkgver=7.31.0 pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +provides=('libcurl.so') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) -md5sums=('60bb6ff558415b73ba2f00163fd307c5' +md5sums=('6f26843f7e3a2fb06e02f68a55efe8c7' 'SKIP' '751bd433ede935c8fae727377625a8ae') diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD index 769bda9dc..a08083345 100644 --- a/extra/gtkmm/PKGBUILD +++ b/extra/gtkmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 185348 2013-05-13 15:46:57Z jgc $ +# $Id: PKGBUILD 189082 2013-06-28 13:55:25Z lcarlier $ # Contributor: Tom Newsom # Maintainer: Jan de Groot pkgbase=gtkmm pkgname=('gtkmm' 'gtkmm-docs') -pkgver=2.24.3 +pkgver=2.24.4 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs') license=('LGPL') options=('!libtool' '!emptydirs') -url="http://gtkmm.sourceforge.net/" +url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39') +sha256sums=('443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD index 8aa2059e4..04e6dcd55 100644 --- a/extra/libwebp/PKGBUILD +++ b/extra/libwebp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184409 2013-05-06 19:38:39Z foutrelis $ +# $Id: PKGBUILD 188992 2013-06-27 23:02:01Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Alexander Rødseth # Contributor: Jon Nordby pkgname=libwebp -pkgver=0.3.0 -pkgrel=3 +pkgver=0.3.1 +pkgrel=1 pkgdesc="WebP library and conversion tools" arch=(x86_64 i686) url="https://developers.google.com/speed/webp/" @@ -13,7 +13,7 @@ license=(BSD) depends=(libpng libjpeg libtiff giflib) options=('!libtool') source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb') +sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index fa1ef15e5..13b3c4a87 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186426 2013-05-26 09:26:05Z bluewind $ +# $Id: PKGBUILD 188995 2013-06-28 01:52:37Z eric $ # Maintainer: Eric Bélanger pkgname=rrdtool -pkgver=1.4.7 -pkgrel=7 +pkgver=1.4.8 +pkgrel=1 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" @@ -15,24 +15,28 @@ optdepends=('tcl: to use corresponding binding' \ 'ruby: to use corresponding binding' \ 'lua51: to use corresponding binding') options=('!libtool' '!emptydirs' '!makeflags') -source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b') +source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz + rrdtool-pangofont.patch) +sha1sums=('56d68857f39e70bfa32360947614d8220702ed02' + '8c600285bdab7776c1d5301df7cf486d69eae048') prepare() { cd ${pkgname}-${pkgver} # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in + patch -p1 -i ../rrdtool-pangofont.patch } build() { cd ${pkgname}-${pkgver} + autoconf PYTHON=python2 LUA=/usr/bin/lua5.1 \ LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap - make + make LIBS+="-lglib-2.0" } package() { diff --git a/extra/rrdtool/rrdtool-pangofont.patch b/extra/rrdtool/rrdtool-pangofont.patch new file mode 100644 index 000000000..60936d8b5 --- /dev/null +++ b/extra/rrdtool/rrdtool-pangofont.patch @@ -0,0 +1,39 @@ +From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker +Date: Wed, 24 Apr 2013 23:49:28 +0200 +Subject: [PATCH] move to non-deprecated pango_font_map_create_context + +--- + configure.ac | 2 +- + src/rrd_graph.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f9e395..d6b2722 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h, + EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, cairo-svg, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, cairo-pdf, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "") +-EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") ++EX_CHECK_ALL(pangocairo-1.0, pango_font_map_create_context, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") + + fi + EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") +diff --git a/src/rrd_graph.c b/src/rrd_graph.c +index 5547aa6..25ae485 100644 +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -4282,7 +4282,7 @@ void rrd_graph_init( + fontmap = pango_cairo_font_map_get_default(); + } + +- context = pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap); ++ context = pango_font_map_create_context(fontmap); + + pango_cairo_context_set_resolution(context, 100); + +-- +1.8.1.6 + diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 7be8ca825..f8e66c762 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=3 +pkgrel=4 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") @@ -25,7 +25,7 @@ build() { cd ${srcdir}/${_pkgname}-${pkgver} _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - + make KDIR=/usr/src/linux-${_kernver} } diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index f1c6481d5..518e25312 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92970 2013-06-21 08:06:15Z tpowa $ +# $Id: PKGBUILD 93210 2013-06-28 18:33:45Z foutrelis $ # Maintainer: Sergej Pupykin # Contributor: J. Santiago Hirschfeld # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install -pkgrel=47 +pkgrel=48 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/dkms-libre/01-broken-uninstall.patch b/libre/dkms-libre/01-broken-uninstall.patch new file mode 100644 index 000000000..a859efabe --- /dev/null +++ b/libre/dkms-libre/01-broken-uninstall.patch @@ -0,0 +1,22 @@ +diff --git a/dkms b/dkms +index abb01a4..265b69a 100644 +--- a/dkms ++++ b/dkms +@@ -162,11 +162,14 @@ set_kernel_source_dir() + + # A little test function for DKMS commands that only work on one kernel. + have_one_kernel() { +- (( ${#kernelver[@]} > 1 )) && \ +- die 4 $"The action $1 does not support multiple kernel version" \ +- $"parameters on the command line." +- [[ $all ]] && die 5 $"The action $1 does not support the --all" \ +- $"parameter." ++ if (( ${#kernelver[@]} != 1 )); then ++ die 4 $"The action $1 does not support multiple kernel version" \ ++ $"parameters on the command line." ++ fi ++ if [[ $all ]]; then ++ die 5 $"The action $1 does not support the --all" \ ++ $"parameter." ++ fi + } diff --git a/libre/dkms-libre/02-no-kernel-hook.patch b/libre/dkms-libre/02-no-kernel-hook.patch new file mode 100644 index 000000000..f01f22002 --- /dev/null +++ b/libre/dkms-libre/02-no-kernel-hook.patch @@ -0,0 +1,13 @@ +# Author: Sébastien Luttringer +--- a/Makefile 2011-12-07 19:23:51.000000000 +0100 ++++ b/Makefile 2013-05-13 00:48:19.620000000 +0200 +@@ -46,9 +46,6 @@ + gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz + chmod 0644 $(MAN)/dkms.8.gz + touch --reference=dkms.8 $(MAN)/dkms.8.gz +- mkdir -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d +- install -p -m 0755 kernel_prerm.d_dkms $(KCONF)/prerm.d/dkms +- install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms + + DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec + diff --git a/libre/dkms-libre/PKGBUILD b/libre/dkms-libre/PKGBUILD new file mode 100644 index 000000000..99caab5fa --- /dev/null +++ b/libre/dkms-libre/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 90494 2013-05-12 22:57:28Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com) +# Maintainer (Parabola): André Silva + +_pkgname=dkms +pkgname=dkms-libre +pkgver=2.2.0.3 +pkgrel=14 +pkgdesc='Dynamic Kernel Modules System, with linux-libre-headers and linux-libre-lts-headers recommendation' +arch=('any') +url='http://linux.dell.com/dkms/' +license=('GPL2') +depends=('bash' 'kmod' 'gcc' 'make' 'patch') +optdepends=('linux-libre-headers: build modules against linux-libre kernel' + 'linux-libre-lts-headers: build modules against linux-libre-lts kernel') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +backup=('etc/dkms/framework.conf' 'etc/default/dkms') +install=$_pkgname.install +source=("http://linux.dell.com/$_pkgname/permalink/$_pkgname-$pkgver.tar.gz" + "$_pkgname.default" + "$_pkgname.service" + "$_pkgname.systemd" + '01-broken-uninstall.patch' + '02-no-kernel-hook.patch') +md5sums=('11a8aaade2ebec2803653837c7593030' + '33be2fbf1bcc1b3fb2f38d9e7eaa809d' + '02e9744e3fdc3d2f68e46966fb32e260' + '267632312aa52a190ec0db0758920dd3' + '2dfd8656dc79afd229c1481a90fb645b' + '82d520c39c99c34977e48b313a189c6c') + +prepare() { + # patch + patches=("$srcdir"/*.patch) + cd $_pkgname-$pkgver + for p in "${patches[@]}"; do + msg2 "Apply patch: ${p##*/}" + patch -p1 -i "$p" + done + # /usr move + msg2 '/usr move patching' + for i in dkms{,_framework.conf,.bash-completion,.8,_common.postinst}; do + sed -ri 's,/lib/modules,/usr/lib/modules,g' "$i" + done + # fix hardcoded paths + sed -i "s|/sbin/depmod|depmod|" dkms +} + +package() { + # systemd + install -D -m 644 $_pkgname.service "$pkgdir/usr/lib/systemd/system/$_pkgname.service" + install -D -m 755 $_pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$_pkgname" + install -D -m 644 $_pkgname.default "$pkgdir/etc/default/$_pkgname" + # upstream installer + cd $_pkgname-$pkgver + make \ + DESTDIR="$pkgdir" \ + SBIN="$pkgdir/usr/bin" \ + BASHDIR="$pkgdir/usr/share/bash-completion/completions" \ + install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/dkms-libre/dkms.default b/libre/dkms-libre/dkms.default new file mode 100644 index 000000000..d430855bb --- /dev/null +++ b/libre/dkms-libre/dkms.default @@ -0,0 +1,9 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +# With LOAD set to yes, modules listed as installed will be loaded with +# systemctl start dkms.service. Default is yes. +LOAD=yes + +# With UNLOAD set to yes, modules listed as installed will be unloaded with +# systemctl stop dkms.service. Default is no. +UNLOAD=no diff --git a/libre/dkms-libre/dkms.hook b/libre/dkms-libre/dkms.hook new file mode 100644 index 000000000..3d656e32d --- /dev/null +++ b/libre/dkms-libre/dkms.hook @@ -0,0 +1,12 @@ +#!/bin/bash + +dkms_autoinstall() { + export TMPDIR=/dev/shm + status 'Starting DKMS autoinstall' dkms autoinstall + unset TMPDIR +} + +add_hook single_udevlaunched dkms_autoinstall +add_hook sysinit_udevlaunched dkms_autoinstall + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/dkms-libre/dkms.install b/libre/dkms-libre/dkms.install new file mode 100644 index 000000000..4dd18dd19 --- /dev/null +++ b/libre/dkms-libre/dkms.install @@ -0,0 +1,13 @@ +#!/bin/sh + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 2.2.0.3-12)" -le 0 ]; then + cat << EOF +===> dkms startup config file moved to /etc/default/dkms +EOF + fi +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/dkms-libre/dkms.service b/libre/dkms-libre/dkms.service new file mode 100644 index 000000000..0e679a949 --- /dev/null +++ b/libre/dkms-libre/dkms.service @@ -0,0 +1,11 @@ +[Unit] +Description=Dynamic Kernel Modules System + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/dkms start +ExecStop=/usr/lib/systemd/scripts/dkms stop + +[Install] +WantedBy=multi-user.target diff --git a/libre/dkms-libre/dkms.systemd b/libre/dkms-libre/dkms.systemd new file mode 100644 index 000000000..03e6bfe97 --- /dev/null +++ b/libre/dkms-libre/dkms.systemd @@ -0,0 +1,61 @@ +#!/bin/bash + +. /etc/default/dkms + +# list dkms modules for the current running kernel +list_dkms_modules() { + shopt -s nullglob + declare -a DKMS_MOULES + # dkms status needs uname -r to list correctly intalled version for current kernel + local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p')) + for p in "${modules_path[@]}"; do + for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do + m=${m##*/} + m=${m%.gz} + m=${m%.ko} + DKMS_MODULES+=("$m") + done + done +} + +# load installed kernel modules for the current kernel version +load_dkms_modules() { + local ret=0 + list_dkms_modules + for m in "${DKMS_MODULES[@]}"; do + modprobe "$m" + ret+=$? + done + return $ret +} + +# unload installed kernel modules for the current kernel version +unload_dkms_modules() { + list_dkms_modules + # ask for removal + for m in "${DKMS_MODULES[@]}"; do + modprobe --remove --quiet "$m" + done + # check modules are unloaded + # sometimes modprobe -r fail but modules are removed + for m in "${DKMS_MODULES[@]}"; do + [[ -e /sys/modules/$m ]] && return 1 + done + return 0 +} + +case "$1" in + start) + dkms autoinstall -k "$(uname -r)" + [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules + ;; + stop) + [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules + ;; + *) + echo "usage: $0 {start|stop}" >&2 + ;; +esac + +: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/ipsec-tools-libre/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD new file mode 100644 index 000000000..6de9bd7d5 --- /dev/null +++ b/libre/ipsec-tools-libre/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 91859 2013-05-28 17:36:54Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Allan Henriksen +# Maintainer (Parabola): André Silva + +_pkgname=ipsec-tools +pkgname=ipsec-tools-libre +pkgver=0.8.1 +pkgrel=4 +pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)" +arch=('i686' 'x86_64' 'mips64el') +url="http://ipsec-tools.sourceforge.net/" +depends=('readline' 'openssl' 'krb5') +makedepends=('linux-libre-headers') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +license=('GPL') +options=('!makeflags' '!libtool') +source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2 + racoon.service + ipsec.service + ipsec-tools-linux-3.7-compat.patch) +md5sums=('d38b39f291ba2962387c3232e7335dd8' + '3a64a9e3b498c6da90450ffb0b758aea' + '387a0b0c4f10e42b2bb62282885cdc9c' + 'ae1dd20c83dcfce3dedb46ee73e83613') + +build() { + cd $srcdir/$_pkgname-$pkgver + + patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch + sed -i 's#-Werror##' configure.ac + + ./bootstrap + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ + --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ + --enable-adminport --enable-gssapi \ + --with-kernel-headers=/lib/modules/`pacman -Q linux-libre-headers | cut -f2 -d\ `-LIBRE/build/include + make +} + +package() { + cd $srcdir/$_pkgname-$pkgver + make DESTDIR=$pkgdir install + install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service + install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service +} diff --git a/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch new file mode 100644 index 000000000..46b11ee51 --- /dev/null +++ b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch @@ -0,0 +1,50 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -74,9 +74,10 @@ case "$host_os" in + [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) + + AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , +- [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, +- KERNEL_INCLUDE=/usr/src/linux/include , +- [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ++ [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, , ++ [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, ++ KERNEL_INCLUDE=/usr/src/linux/include , ++ [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] ) + AC_SUBST(KERNEL_INCLUDE) + # We need the configure script to run with correct kernel headers. + # However we don't want to point to kernel source tree in compile time, +@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes, + #ifdef SADB_X_EXT_NAT_T_TYPE + yes + #endif +-], [kernel_natt="yes"]) ++], [kernel_natt="yes"], [ ++ AC_EGREP_CPP(yes, ++ [#include ++ #ifdef SADB_X_EXT_NAT_T_TYPE ++ yes ++ #endif ++ ], [kernel_natt="yes"]) ++]) + ;; + freebsd*|netbsd*) + # NetBSD case +--- a/src/include-glibc/Makefile.am ++++ b/src/include-glibc/Makefile.am +@@ -1,14 +1,7 @@ +- +-.includes: ${top_builddir}/config.status +- ln -snf $(KERNEL_INCLUDE)/linux +- touch .includes +- +-all: .includes +- + EXTRA_DIST = \ + glibc-bugs.h \ + net/pfkeyv2.h \ + netinet/ipsec.h \ + sys/queue.h + +-DISTCLEANFILES = .includes linux ++DISTCLEANFILES = linux diff --git a/libre/ipsec-tools-libre/ipsec.service b/libre/ipsec-tools-libre/ipsec.service new file mode 100644 index 000000000..483a5b58d --- /dev/null +++ b/libre/ipsec-tools-libre/ipsec.service @@ -0,0 +1,12 @@ +[Unit] +Description=Load IPSec Security Policy Database +After=syslog.target network.target + +[Service] +Type=oneshot +RemainAfterExit=true +ExecStart=/usr/bin/setkey -f /etc/ipsec.conf +ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F + +[Install] +WantedBy=multi-user.target diff --git a/libre/ipsec-tools-libre/racoon.service b/libre/ipsec-tools-libre/racoon.service new file mode 100644 index 000000000..95324bd5d --- /dev/null +++ b/libre/ipsec-tools-libre/racoon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Racoon IKEv1 key management daemon for IPSEC +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/bin/racoon + +[Install] +WantedBy=multi-user.target diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 8a224dfa3..56137aaf3 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.9.7 +_kernver=3.9.8 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=8 +pkgrel=9 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 7be04b12f..434a922af 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188793 2013-06-21 07:29:45Z tpowa $ +# $Id: PKGBUILD 189000 2013-06-28 06:57:30Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -8,10 +8,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=83 +_sublevel=84 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.82 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.83 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '43f2b35b0a8bbe8442627874b4179644' - 'fe0e9b4415b82f306fc1b63eb9a742a4' - '69a689019ea0b6ed46b387907f14bc8a' + 'a2ab5e3c758f35d0a2ffe33b23cfe04d' + '6ab0f1a509481d93117b7630105757cc' + '18dfa330a7da88d7c09c3e24a5cd608f' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'cc33faaec0f6c99ff03838a146d62250') + '1327df75d631529dcf29f46f474cf16d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 849fd016b..a1d065a1a 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1438,8 +1438,8 @@ CONFIG_OF_PCI=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index fe5875138..a5dc36205 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1381,8 +1381,8 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 0f4605cea..57539c3aa 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188791 2013-06-21 06:32:50Z tpowa $ +# $Id: PKGBUILD 188998 2013-06-28 05:50:01Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - '4f5c670da16dc80fe9482892b636f99d' - 'e6c4e42d67aaff6d057983c499ebcace' - 'e23ad17eb5051f5ccd332bbb474df4d9' + 'b628d7ff09667dc5546993bb83461d45' + '5bb868d38a27edafac1eb114cd2f3659' + 'c180de34b0450d7eef8e0c1a68433d7c' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '0375f682754ef52216fd522494875301') + '30092ce96affb12f89a9eddfad966741') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index f6951a2b6..e84812997 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1581,8 +1581,8 @@ CONFIG_OF_MTD=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre/config.i686.3.10 b/libre/linux-libre/config.i686.3.10 index 129ab764f..9eaa84b4f 100644 --- a/libre/linux-libre/config.i686.3.10 +++ b/libre/linux-libre/config.i686.3.10 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-rc6 Kernel Configuration +# Linux/x86 3.10.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1586,8 +1586,8 @@ CONFIG_OF_MTD=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m @@ -3924,7 +3924,6 @@ CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -3970,6 +3969,7 @@ CONFIG_SMS_SIANO_RC=y # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -4047,7 +4047,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4597,7 +4596,6 @@ CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # CONFIG_SND_SOC is not set -CONFIG_SND_SOC_SI476X=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 44a03558f..0937bed6f 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1530,8 +1530,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre/config.x86_64.3.10 b/libre/linux-libre/config.x86_64.3.10 index 4c4838cca..ed592fa43 100644 --- a/libre/linux-libre/config.x86_64.3.10 +++ b/libre/linux-libre/config.x86_64.3.10 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-rc6 Kernel Configuration +# Linux/x86 3.10.0-rc7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1536,8 +1536,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m @@ -3793,7 +3793,6 @@ CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -3838,6 +3837,7 @@ CONFIG_SMS_SIANO_RC=y # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -3915,7 +3915,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4415,7 +4414,6 @@ CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # CONFIG_SND_SOC is not set -CONFIG_SND_SOC_SI476X=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 91710f5eb..fc749260c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188799 2013-06-21 08:04:28Z tpowa $ +# $Id: PKGBUILD 189186 2013-06-28 18:41:29Z foutrelis $ # Maintainer: Paul Mattal # Maintainer (Parabola): André Silva @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=48 +pkgrel=49 epoch=1 _extramodules=extramodules-3.9-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre>=3.9' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch diff --git a/libre/newton-dynamics-libre/PKGBUILD b/libre/newton-dynamics-libre/PKGBUILD new file mode 100644 index 000000000..1702cca70 --- /dev/null +++ b/libre/newton-dynamics-libre/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 84449 2013-02-19 04:20:15Z svenstaro $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Josh Taylor (deficite) +# Contributor: Christophe Robin (bombstrike) +# Maintainer (Parabola): André Silva +_pkgname=newton-dynamics +pkgname=newton-dynamics-libre +pkgver=2.36 +pkgrel=1 +pkgdesc="A simple physics API" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.newtondynamics.com" +license=('custom') +depends=() +makedepends=('unar') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar") +noextract=("newton-dynamics-${pkgver}.rar") +md5sums=('0dffa112d0a6ea39ad9e904e555da69a') + +build() { + _srcdir="${srcdir}/newton-dynamics-${pkgver}" + [[ "$CARCH" = "i686" ]] && platform="linux32" + [[ "$CARCH" = "x86_64" ]] && platform="linux64" + builddir="${_srcdir}/coreLibrary_200/projets/${platform}" + + # clean build directory + [[ -d "${_srcdir}" ]] && rm -Rf "${_srcdir}" + + # decompress package + cd "${srcdir}" + unar "newton-dynamics-${pkgver}.rar" + + # needed for building + mkdir -p "${_srcdir}/packages/${platform}" + + ## build lib + cd "${builddir}" + sed -i 's/ -o libNewton.so/ -lpthread -lstdc++ -o libNewton.so/' makefile + sed -i 's/Debug\.cpp.*$/Debug \\/g' makefile + make +} + +package() { + install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a" + install -D -m755 "${builddir}/libNewton.so" "${pkgdir}/usr/lib/libNewton.so" + install -D -m644 "${_srcdir}/coreLibrary_200/source/newton/Newton.h" "${pkgdir}/usr/include/Newton.h" +} diff --git a/libre/newton-dynamics-libre/assert-fix.patch b/libre/newton-dynamics-libre/assert-fix.patch new file mode 100644 index 000000000..83dfdd790 --- /dev/null +++ b/libre/newton-dynamics-libre/assert-fix.patch @@ -0,0 +1,13 @@ +Index: source/core/dgTypes.cpp +=================================================================== +--- source/core/dgTypes.cpp (revision 506) ++++ source/core/dgTypes.cpp (working copy) +@@ -515,7 +515,7 @@ + return 0; + } + _ASSERTE (compareCount <= dgInt32 (strideInBytes / sizeof (dgFloat64))); +- _ASSERT (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64)))); ++ _ASSERTE (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64)))); + + dgInt32 stride = strideInBytes / dgInt32 (sizeof (dgFloat64)); + dgInt32 stride2 = stride + 2; diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD new file mode 100644 index 000000000..ab51da0cd --- /dev/null +++ b/libre/oss-libre/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 92058 2013-05-31 02:02:47Z seblu $ +# Maintainer: Kyle Keen +# Contributor: Florian Pritz +# Contributor: Paulo Matias +# Contributor: Daniel J Griffiths +# Maintainer (Parabola): André Silva + +pkgname=oss-libre +pkgver=4.2_2007 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://developer.opensound.com/" +license=('GPL2') +makedepends=('gtk2') +source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" + "rm-init-scripts.patch" + "soundon.patch" + "remove-hal.patch" + "linux-3.8.patch" + "oss.service" +) +md5sums=('f995118db1759fee3bcd38483940da6f' + 'b9a380a0ac8896390d71ac13676f27e1' + '65f07fe241bfbf912f76d8b6d8f276b5' + 'cd7f1dc6166bba8c94d96f3a28e948a5' + 'effecefb774f1d08ef9f0af0ad205c34' + '39c46b10a6bc56fc146d669a61bd3028') +_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl + +build() { + cd "${srcdir}/${_dir}" + + # Avoid these flags conflicting with OSS build system. + unset CFLAGS + unset LDFLAGS + unset OSFLAGS + unset LIBRARIES + export NO_WARNING_CHECKS=yes + + msg "Preparing the build environment." + cd "${srcdir}" + + # Create build directory and configure + rm -rf build + mkdir build && cd build + "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm + + # ossvermagic hardcodes /lib/modules *grumble* + sed -i 's|/lib/modules|/usr&|' \ + os_cmd/Linux/ossvermagic/ossvermagic.c + + pushd "$srcdir/$_dir" + patch -p0 -i "${srcdir}/linux-3.8.patch" + popd + + msg "Building OSS." + make build + + msg "Patching init scripts." + cd "${srcdir}/build/prototype" + rm usr/lib/oss/etc/S89oss + patch -p0 -i "${srcdir}/rm-init-scripts.patch" + patch -p0 -i "${srcdir}/soundon.patch" + # remove hal dependency + patch -p0 -i "${srcdir}/remove-hal.patch" + rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi + + # fix kernel module directories + sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon + sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh + sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh + sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh + sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \ + usr/lib/oss/build/install.sh \ + usr/lib/oss/scripts/restore_drv.sh \ + usr/lib/oss/scripts/setup-alsa.sh \ + usr/lib/oss/scripts/remove_drv.sh \ + usr/lib/oss/build/Makefile.tmpl \ + usr/lib/oss/build/Makefile.osscore \ + usr/lib/oss/cuckoo/Makefile +} + +package() { + pkgdesc="Open Sound System UNIX audio architecture, without nonfree libflashsupport-oss recommendation (built for the linux-libre-headers package)" + depends=('gcc' 'make' 'linux-libre-headers' 'libtool' 'sed') + optdepends=('gtk2: for graphical mixer (ossxmix)') + replaces=('oss') + conflicts=('oss' 'oss-linux' 'oss-linux-free' 'oss-testing') + provides=("oss=${pkgver}") + backup=('usr/lib/oss/soundon.user') + install=oss.install + + cd "${srcdir}/build/prototype" + cp -a * "${pkgdir}" + + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin + chmod -R a+r . # All files can have read permission (FS#13815) + find . -type d -exec chmod a+x '{}' \; # Make namcap happy + install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/oss-libre/linux-3.8.patch b/libre/oss-libre/linux-3.8.patch new file mode 100644 index 000000000..46200e01a --- /dev/null +++ b/libre/oss-libre/linux-3.8.patch @@ -0,0 +1,40 @@ +--- setup/Linux/oss/build/pci_wrapper.inc 2009-08-27 05:19:07.000000000 +0300 ++++ setup/Linux/oss/build/pci_wrapper.inc 2013-02-08 13:56:10.519794975 +0200 +@@ -17,7 +17,11 @@ + static dev_map_t dev_map[MAX_INSTANCE]; + static int n_devmap = 0; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) + static int __devinit ++#else ++static int ++#endif + osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid) + { + oss_device_t *osdev; +@@ -65,7 +69,11 @@ + return 0; + } + +-static void __devexit ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) ++static int __devexit ++#else ++static int ++#endif + osspci_remove (struct pci_dev *pcidev) + { + int i; +@@ -80,10 +88,11 @@ + pci_disable_device (dev_map[i].pcidev); + osdev_delete (osdev); + +- return; ++ return 0; + } + + printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n"); ++ return -EIO; + } + + void diff --git a/libre/oss-libre/oss.install b/libre/oss-libre/oss.install new file mode 100644 index 000000000..9bd4e1fbc --- /dev/null +++ b/libre/oss-libre/oss.install @@ -0,0 +1,25 @@ +post_install() { + echo "Running OSS install script..." + sh /usr/lib/oss/build/install.sh &>/dev/null + echo + echo " Note that OSS can't currently work together with kernel" + echo " ALSA modules, so they were moved out by the OSS install" + echo " scripts. If you want the ALSA kernel modules back, you can" + echo " just remove this package using pacman." +} + +post_upgrade() { + echo "Running OSS update script..." + sh /usr/lib/oss/build/install.sh &>/dev/null +} + +pre_remove() { + # Restore any replaced ALSA drivers. + sh /usr/lib/oss/scripts/restore_drv.sh +} + +post_remove() { + echo " Open Sound System was now removed, and the ALSA kernel" + echo " modules were restored." +} + diff --git a/libre/oss-libre/oss.service b/libre/oss-libre/oss.service new file mode 100644 index 000000000..0200d2477 --- /dev/null +++ b/libre/oss-libre/oss.service @@ -0,0 +1,12 @@ +[Unit] +Description=Open Sound System v4 +Before=sound.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/soundon +ExecStop=/usr/bin/soundoff + +[Install] +WantedBy=multi-user.target diff --git a/libre/oss-libre/remove-hal.patch b/libre/oss-libre/remove-hal.patch new file mode 100644 index 000000000..27e2ef2de --- /dev/null +++ b/libre/oss-libre/remove-hal.patch @@ -0,0 +1,20 @@ +Date: Tue Aug 2 16:37:31 CEST 2011 +Author: Florian Pritz +This removes all hal dependencies + +References: +http://www.archlinux.org/todo/92/ + +--- usr/lib/oss/build/install_2011-08-02_162647.sh 2011-08-02 16:26:47.000000000 +0200 ++++ usr/lib/oss/build/install.sh 2011-08-02 16:27:13.000000000 +0200 +@@ -336,10 +336,4 @@ + echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs + fi + +-# Hal 0.5.0+ hotplug +-mkdir -p /usr/lib/hal/scripts +-ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/ +-mkdir -p /usr/share/hal/fdi/policy/20thirdparty/ +-ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/ +- + exit 0 diff --git a/libre/oss-libre/rm-init-scripts.patch b/libre/oss-libre/rm-init-scripts.patch new file mode 100644 index 000000000..981ff605f --- /dev/null +++ b/libre/oss-libre/rm-init-scripts.patch @@ -0,0 +1,52 @@ +--- usr/lib/oss/build/install.sh.orig 2008-09-25 11:41:47.180167692 -0300 ++++ usr/lib/oss/build/install.sh 2008-09-25 11:41:47.180167692 -0300 +@@ -290,38 +290,6 @@ + echo + fi + +-if ! test -d /etc/init.d +-then +- mkdir /etc/init.d +-fi +- +-rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss +-cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss +- +-chmod 744 /etc/init.d/oss +- +-if test -x /sbin/chkconfig +-then +- /sbin/chkconfig oss on > /dev/null 2>&1 +-else +- if test -x /usr/sbin/update-rc.d +- then +- /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1 +- else +- if test -d etc/rc.d/rc3.d +- then +- rm -f /etc/rc.d/rc3.d/S89oss +- ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss +- else +- if test -d /etc/rc3.d +- then +- rm -f /etc/rc3.d/S89oss +- ln -s /etc/init.d/oss /etc/rc3.d/S89oss +- fi +- fi +- fi +-fi +- + # Install ALSA interface module (Cuckoo) + #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 + #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1 +--- usr/lib/oss/scripts/restore_drv.sh.orig 2008-09-25 11:41:47.210168487 -0300 ++++ usr/lib/oss/scripts/restore_drv.sh 2008-09-25 11:41:47.210168487 -0300 +@@ -18,8 +18,6 @@ + fi + fi + +-rm -f /etc/init.d/oss +- + if ! test -d /lib/modules/`uname -r`/kernel/sound + then + if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2 diff --git a/libre/oss-libre/soundon.patch b/libre/oss-libre/soundon.patch new file mode 100644 index 000000000..4702b8680 --- /dev/null +++ b/libre/oss-libre/soundon.patch @@ -0,0 +1,28 @@ +--- usr/sbin/soundon.old 2009-09-04 06:35:26.000000000 +0100 ++++ usr/sbin/soundon 2009-11-15 13:59:53.000000000 +0000 +@@ -255,7 +255,10 @@ + then + if test "`uname -m` " = "x86_64 " + then +- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 ++ # Fix for compatibility with Arch's directory structure ++ # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed ++ ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2 ++ #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 + #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 + else + if test -s /lib/libasound.so.2 +@@ -278,8 +281,11 @@ + then + if test "`uname -m` " = "x86_64 " + then +- ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 +- ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 ++ # Fix for compatibility with Arch's directory structure ++ ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib ++ ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib ++ #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 ++ #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 + else + if test -s /lib/libasound.so.2 + then diff --git a/libre/tomoyo-tools-libre/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD new file mode 100644 index 000000000..02a181b55 --- /dev/null +++ b/libre/tomoyo-tools-libre/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 92638 2013-06-10 09:53:54Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Jamie Nguyen +# Maintainer (Parabola): André Silva + +_pkgname=tomoyo-tools +pkgname=tomoyo-tools-libre +_basever=2.5.0 +_timestamp=20130406 +_file=53357 +pkgver=${_basever}.${_timestamp} +pkgrel=1 +pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2 (built for the linux-libre kernel package)' +arch=('i686' 'x86_64' 'mips64el') +url='http://tomoyo.sourceforge.jp' +#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' +license=('GPL') +depends=('ncurses' 'linux-libre>=3.2') +replaces=${_pkgname} +conflicts=${_pkgname} +provides=${_pkgname}=${pkgver} +install=tomoyo-tools.install +source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${_pkgname}-${_basever}-${_timestamp}.tar.gz") +md5sums=('8888f83fcb87823d714ff551e8680d0d') + +prepare() { + cd "${srcdir}/${_pkgname}" + sed -i \ + -e 's|usr/sbin|usr/bin|g' \ + -e 's|sbin|usr/bin|g' \ + usr_lib_tomoyo/init_policy.c +} + +build() { + cd "${srcdir}/${_pkgname}" + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin +} + +package() { + cd "${srcdir}/${_pkgname}" + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install +} diff --git a/libre/tomoyo-tools-libre/tomoyo-tools.install b/libre/tomoyo-tools-libre/tomoyo-tools.install new file mode 100644 index 000000000..c23df1212 --- /dev/null +++ b/libre/tomoyo-tools-libre/tomoyo-tools.install @@ -0,0 +1,11 @@ +post_install () { + echo + echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/usr/bin/init' to the kernel" + echo " boot options and initialize policy with this command:" + echo " /usr/lib/tomoyo/init_policy" + echo +} + +post_upgrade () { + post_install $1 +} diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index be76b876e..d1f32979d 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92980 2013-06-21 09:45:26Z tpowa $ +# $Id: PKGBUILD 93220 2013-06-28 18:55:23Z foutrelis $ # Maintainer: Lukas Fleischer # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=24 +pkgrel=25 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 780c957b8..caa3016d1 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92982 2013-06-21 09:46:01Z tpowa $ +# $Id: PKGBUILD 93222 2013-06-28 18:56:50Z foutrelis $ # Maintainer: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.9-LIBRE -pkgrel=3 +pkgrel=4 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index c6d47275d..5e11fd6df 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 93048 2013-06-23 10:27:06Z bpiotrowski $ +# $Id: PKGBUILD 93205 2013-06-28 17:53:08Z foutrelis $ # Maintainer: Ionut Biru -# Maintainer: Sébastien Luttringer +# Maintainer: Sébastien Luttringer # Maintainer (Parabola): Jorge López # Maintainer (Parabola): André Silva pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -19,6 +19,9 @@ makedepends=('linux-libre' 'sed' 'bc') +# remember to also adjust the .install files and the package deps below +_extramodules=extramodules-3.9-LIBRE + build() { _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version) diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index 87d775d4e..9c0c0729c 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=xarchiver pkgname=xarchiver-libre pkgver=0.5.2 -pkgrel=5 +pkgrel=5.1 pkgdesc="GTK+ frontend to various command line archivers" arch=('i686' 'x86_64') url="http://xarchiver.sourceforge.net" @@ -21,7 +21,7 @@ optdepends=('tar: TAR support' 'bzip2: BZIP2 support' 'zip: ZIP support' 'unzip: ZIP support' - 'ununrar: RAR support' + 'unar: RAR support' 'p7zip: 7z support' 'arj: ARJ support' 'lha: LHA support' diff --git a/libre/xbmc-libre/ChangeLog b/libre/xbmc-libre/ChangeLog new file mode 100644 index 000000000..66ae97e3b --- /dev/null +++ b/libre/xbmc-libre/ChangeLog @@ -0,0 +1,69 @@ +2010-04-10 BlackEagle + * 9.11-15 : + Made it back compliant with FHS ( thx pierre for pointing that out ) + namcap checked and modified to fit its needs as far as it was possible + +2009-03-07 [vEX] + + * 8.10-10 : + Try and fix some autoconf issues (thanks Gentoo ebuild). + +2009-02-08 [vEX] + + * 8.10-9 : + Replace some libtool 'ltmain.sh' scripts with the one from libtool + installed with Arch. + Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault + on systems using the nvidia driver. + +2009-01-30 [vEX] + + * 8.10-8 : + Fix some include's so that gcc 4.3.x is happy, shouldn't complain about + undefined '::realloc' anymore. + Remove Mac OS X specific files. + +2009-01-25 [vEX] + + * 8.10-7 : + Moved libcdio, pmount, smbclient and unrar to optdepends. + Removed unneeded dependency on sdl_gfx. + Removed dependency on libpng as sdl_image depends on it. + +2008-12-14 [vEX] + + * 8.10-6 : + Added libpng to dependency list. + Added gawk to dependency list. + Removed '--disable-mms' and '--enable-halmount' configure flags as they + are not mentioned as supported in the configure script. + +2008-12-06 [vEX] + + * 8.10-5 : + Added libmad to the dependency list. + Streamripper 1.64.0+ does not include tre anymore, removed streamripper + and added tre instead. + Removed subversion from makedepends. + +2008-12-06 [vEX] + + * 8.10-4 : + Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not + fail any longer. + +2008-12-05 [vEX] + + * 8.10-3 : + Added lirc to the optdepends array. + +2008-11-26 [vEX] + + * 8.10-2 : + Added install file which informs users that a display depth of at + least 24-bit is required. + +2008-11-17 [vEX] + + * 8.10-1 : + Initial package, based on previous work by Zeqadious. diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD new file mode 100644 index 000000000..3595b95cf --- /dev/null +++ b/libre/xbmc-libre/PKGBUILD @@ -0,0 +1,116 @@ +# $Id: PKGBUILD 92439 2013-06-05 11:42:01Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Brad Fanella +# Contributor: [vEX] +# Contributor: Zeqadious +# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > + +_prefix=/usr + +_pkgname=xbmc +pkgname=xbmc-libre +pkgver=12.2 +pkgrel=4 +pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation included" +arch=('i686' 'x86_64') +url="http://xbmc.org" +license=('GPL' 'custom') +depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' + 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' + 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' + 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' + 'tinyxml' 'taglib') +makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' + 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') +optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' + 'pulseaudio: pulseaudio support' + 'lirc: remote controller support' + 'udisks: automount external drives' + 'upower: used to trigger suspend functionality' + 'libarchive: access compressed files without unpacking them' + 'xorg-xinit: autostart xbmc') +install="${_pkgname}.install" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" + "xbmc.service") +md5sums=('489f3877decae4e265ece54f9eaef0ba' + '76fae229ebc3bcfaab7e7f27e4fb51f5') + +build() { + cd "${srcdir}/xbmc-$pkgver" + + # fix lsb_release dependency + sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp + sed -i -e 's:#include :#include :' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp + + # Bootstrapping XBMC + ./bootstrap + + # Configuring XBMC + export PYTHON_VERSION=2 # external python v2 + ./configure --prefix=$_prefix --exec-prefix=$_prefix \ + --disable-debug \ + --enable-optimizations \ + --enable-gl \ + --enable-sdl \ + --enable-vaapi \ + --enable-vdpau \ + --enable-xvba \ + --enable-joystick \ + --enable-xrandr \ + --enable-rsxs \ + --enable-projectm \ + --enable-x11 \ + --enable-pulse \ + --enable-rtmp \ + --enable-samba \ + --enable-nfs \ + --enable-afpclient \ + --enable-airplay \ + --enable-airtunes \ + --enable-ffmpeg-libvorbis \ + --enable-dvdcss \ + --disable-hal \ + --enable-avahi \ + --enable-webserver \ + --enable-optical-drive \ + --enable-libbluray \ + --enable-texturepacker \ + --enable-udev \ + --enable-libusb \ + --enable-libcec \ + --enable-external-libraries \ + --disable-external-ffmpeg + # Now (finally) build + make +} + +package() { + cd "${srcdir}/xbmc-$pkgver" + # Running make install + make DESTDIR="${pkgdir}" install + + # run feh with python2 + sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc + + # lsb_release fix + sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" + sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" + + # Tools + install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" + install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" + + # Licenses + install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}" + for licensef in LICENSE.GPL copying.txt; do + mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}" + done + + # systemd stuff + install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service +} +# vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install new file mode 100644 index 000000000..b104b33e8 --- /dev/null +++ b/libre/xbmc-libre/xbmc.install @@ -0,0 +1,16 @@ +post_install() { + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + getent group xbmc > /dev/null || groupadd xbmc + getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc + usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 + echo "You may want to remove xbmc user and group" +} diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service new file mode 100644 index 000000000..431582f1b --- /dev/null +++ b/libre/xbmc-libre/xbmc.service @@ -0,0 +1,13 @@ +[Unit] +Description = Starts instance of XBMC using xinit +After = remote-fs.target + +[Service] +User = xbmc +Group = xbmc +Type = simple +ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp +Restart = always + +[Install] +WantedBy = multi-user.target diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index 1a81e15d4..2c45a3b0c 100644 --- a/pcr/cluster-glue/PKGBUILD +++ b/pcr/cluster-glue/PKGBUILD @@ -5,7 +5,7 @@ _pkgname1=${pkgname::7} _pkgname2=${pkgname:8} _pkgname=${_pkgname1^}_${_pkgname2^} pkgver=1.0.11 -pkgrel=12 +pkgrel=14 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' arch=( i686 @@ -31,14 +31,13 @@ depends=( openhpi openipmi openssh - python + python2 util-linux - #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!! ) optdepends=net-tools makedepends=( help2man - #libxslt + libxslt lynx net-tools openssh @@ -50,8 +49,20 @@ provides=(ha-$_pkgname2) conflicts=ha-$_pkgname2 replaces=ha-$_pkgname2 install=$pkgname.install -source=http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 -sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 +source=( + http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 + ha-log.service + fixing-path.sed + replace-linux_os-to-gnulinux_os-term.sed + replace-opensource-to-free-term.sed +) +sha512sums=( + 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 + bb5bc5c5a9347302be583c43b100c0c3760ec4dcc3348a9f9708d5b2c58ec02dd5782c5ac9dcb86223258493ad3fba8ddd8dc5670390f0f602c34869b26bee6d + ce58a2af9f32265f12cc4984e9ae7f285fdb7737813ecccc0780015d048938d9dd79278635eb1cc6833f12f37a8c43211fec17411780220cf38fc44b91ecc076 + e59386aee4db5857fa131798327aa449a5efcd7d50c3ab45dadfa0becc31698a62367ce83b85ca739bdebaad4a9daf96d02c42673a4e26294ec0fa67323fdb5b + c82bd919d1cd02afccd10aea3e015f289ac97e387a1485097d681f9161a00c64859a5dce0ed36b98ad6a340264c2d854dcc83e3248e12828795b73c6ff67ef5b +) prepare() { export _CLUSTER_USER=hacluster @@ -85,131 +96,58 @@ prepare() { ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path - sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rlI bin/sh) - sed -i 's| /bin| /usr/bin|; - ' $(grep -rlI ' /bin') - sed -i 's| /sbin| /usr/bin|; - ' $(grep -rlI ' /sbin') - sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rlI usr/sbin) - #sed -i 's|/lib64|/lib|; - # ' $(grep -rlI /lib64) - #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rlI usr/libexec) - sed -i 's|var/lock|run/lock|; - ' $(grep -rlI var/lock) - sed -i 's|var/run|run|; - ' $(grep -rlI var/run) + sed -i -f $srcdir/fixing-path.sed\ + $(grep -rlI /bin)\ + $(grep -rlI /sbin)\ + $(grep -rlI /lib)\ + $(grep -rlI /var) - # remove Open Source term - sed -i 's|Open Source / ||; - s|open source / ||; - s|Open Source|Free|; - s|open source|free|; - s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -rilI 'open source') - sed -i 's|OpenSource / ||; - s|opensource / ||; - s|OpenSource|Free|; - s|opensource|free|; - s|freesoftware.org|opensource.org|; - s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; - s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; - s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; - ' $(grep -rilI opensource) + # fixing python2 path + sed -i 's|bin/env python|bin/env python2|g; + s|bin/python|bin/python2|g; + ' $(grep -rlI 'bin/env python')\ + $(grep -rlI bin/python) - # remove Linux term - sed -i 's|Linux,|GNU/Linux,|; - s|Linux and|GNU/Linux and|; - s|Linux distro|GNU/Linux distro|; - s|Linux distribution|GNU/Linux distribution|; - s|Linux machine|GNU/Linux machine|; - s|Linux Only|GNU/Linux Only|; - s|Linux only|GNU/Linux only|; - s|Linux operating|GNU/Linux operating|; - s|Linux OS|GNU/Linux OS|; - s|Linux platform|GNU/Linux platform|; - s|Linux software|GNU/Linux software|; - s|Linux specific|GNU/Linux specific|; - s|Linux system|GNU/Linux system|; - s|Linux will|GNU/Linux will|; - s|# Linux$|# GNU/Linux|; - s|# Linux.$|# GNU/Linux.|; - s|* Linux$|* GNU/Linux|; - s|* Linux.$|* GNU/Linux.|; - s|// Linux$|// GNU/Linux|; - s|// Linux.$|// GNU/Linux.|; - s|, Linux|, GNU/Linux|; - s|As Linux|As GNU/Linux|; - s|as Linux|as GNU/Linux|; - s|And Linux|And GNU/Linux|; - s|and Linux|and GNU/Linux|; - s|Be Linux|Be GNU/Linux|; - s|be Linux|be GNU/Linux|; - s|Because Linux|Because GNU/Linux|; - s|because Linux|because GNU/Linux|; - s|e.g. Linux|e.g. GNU/Linux|; - s|For Linux|For GNU/Linux|; - s|for Linux|for GNU/Linux|; - s|In Linux|In GNU/Linux|; - s|in Linux|in GNU/Linux|; - s|Like Linux|Like GNU/Linux|; - s|like Linux|like GNU/Linux|; - s|non-Linux|non GNU/Linux|; - s|Of Linux|Of GNU/Linux|; - s|of Linux|of GNU/Linux|; - s|On Linux|On GNU/Linux|; - s|on Linux|on GNU/Linux|; - s|OS type: Linux|OS type: GNU/Linux|; - s|Other Linux|Other GNU/Linux|; - s|other Linux|other GNU/Linux|; - s|The Linux|The GNU/Linux|; - s|the Linux|the GNU/Linux|; - s|Typically Linux|Typically GNU/Linux|; - s|typically Linux|typically GNU/Linux|; - s|To Linux|To GNU/Linux|; - s|to Linux|to GNU/Linux|; - s|Under Linux|Under GNU/Linux|; - s|under Linux|under GNU/Linux|; - s|ArchGNU/Linux|ArchLinux|; - s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; - s|GNU/GNU|GNU|; - s|GNU/Linux device|Linux device|; - s|GNU/Linux Director Daemon|Linux Director Daemon|; - s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; - s|GNU/Linux kernel|Linux kernel|; - s|GNU/Linux specific kernel|Linux specific kernel|; - s|GNU/Linux Standard Base|Linux Standard Base|; - s|GNU/Linux sysfs|Linux sysfs|; - s|GNU/Linux Virtual Server|Linux Virtual Server|; - s|GNU/Linux Watchdog|Linux Watchdog|; - s|GNU/Linux watchdog|Linux watchdog|; - s|GNU/LinuxHA|LinuxHA|; - s|GNU/Linux-HA|Linux-HA|; - s|GNU/LinuxSCSI|LinuxSCSI|; - s|HA GNU/Linux|HA Linux|; - s|High-Availability GNU/Linux|High-Availability Linux|; - s|MkGNU/Linux|MkLinux|; - s|SEGNU/Linux|SELinux|; - s|VA GNU/Linux Cluster|VA Linux Cluster|; - ' $(grep -rlI Linux) -} + # remove Linux (OS) term to GNU/Linux (OS) term + sed -i -f $srcdir/replace-linux_os-to-gnulinux_os-term.sed\ + $(grep -rlI Linux) + + # replace Open Source term to Free term + sed -i -f $srcdir/replace-opensource-to-free-term.sed\ + $(grep -rilI 'open.\{0,1\}source') +#} -build() { +#build() { # disabled, due that is needed internet for generating man pages with libxslt. cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver setarch $CARCH ./autogen.sh - setarch $CARCH ./configure --prefix=/usr\ + setarch $CARCH ./configure\ + --sysconfdir=/etc\ + --prefix=/usr\ + --exec-prefix=/usr\ + --bindir=/usr/bin\ + --sbindir=/usr/bin\ + --includedir=/usr/include\ + --oldincludedir=/usr/include\ + --libdir=/usr/lib\ + --libexecdir=/usr/lib\ + --datarootdir=/usr/share\ + --datadir=/usr/share\ + --docdir=/usr/share/doc/$pkgname\ + --dvidir=/usr/share/doc/$pkgname\ + --htmldir=/usr/share/doc/$pkgname\ + --pdfdir=/usr/share/doc/$pkgname\ + --psdir=/usr/share/doc/$pkgname\ + --infodir=/usr/share/info\ + --localedir=/usr/share/locale\ + --mandir=/usr/share/man\ + --localstatedir=/var\ --disable-ansi\ --disable-fatal-warnings\ --disable-static\ --enable-doc\ --enable-libnet\ + --enable-shared\ --enable-upstart\ - --libdir=/usr/lib\ - --localstatedir=/var\ - --sbindir=/usr/bin\ - --sysconfdir=/etc\ --with-daemon-group=haclient\ --with-daemon-user=hacluster\ --with-ocf-root=/usr/lib/ocf @@ -220,19 +158,8 @@ package() { cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - rm $pkgdir/etc/rc.d/logd && rmdir $pkgdir/etc{/rc.d,} - install -d $pkgdir/usr/lib/systemd/system - echo '[Unit]' > $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'Description=Startup script logd service' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo '' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo '[Service]' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'ExecStart=/usr/lib/heartbeat/ha_logd' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo '' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo '[Install]' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service + install -m644 $srcdir/ha-log.service $pkgdir/usr/lib/systemd/system msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:' echo -e "# userdel $_CLUSTER_USER" diff --git a/pcr/cluster-glue/fixing-path.sed b/pcr/cluster-glue/fixing-path.sed new file mode 100644 index 000000000..43ef66253 --- /dev/null +++ b/pcr/cluster-glue/fixing-path.sed @@ -0,0 +1,29 @@ +s|/bin/sh|/bin/bash|g; +s| /bin| /usr/bin|g; +s|=/bin|=/usr/bin|g; +s|!/bin|!/usr/bin|g; +s|:/bin|:/usr/bin|g; +s|#/bin|#/usr/bin|g; +s| /sbin| /usr/bin|g; +s|=/sbin|=/usr/bin|g; +s|!/sbin|!/usr/bin|g; +s|:/sbin|:/usr/bin|g; +s|#/sbin|#/usr/bin|g; +s| /usr/sbin| /usr/bin|g; +s|=/usr/sbin|=/usr/bin|g; +s|!/usr/sbin|!/usr/bin|g; +s|:/usr/sbin|:/usr/bin|g; +s|#/usr/sbin|#/usr/bin|g; +s|:/usr/bin:/usr/bin|:/usr/bin|g; +s|lib64|lib|g; +s| /lib| /usr/lib|g; +s|=/lib|=/usr/lib|g; +s|#/lib|#/usr/lib|g; +s| /usr/libexec| /usr/lib|g; +s|=/usr/libexec|=/usr/lib|g; +s|#/usr/libexec|#/usr/lib|g; +s| /usr/var| /var|g; +s|=/usr/var|=/var|g; +s|#/usr/var|#/var|g; +s|/var/lock|/run/lock|g; +s|/var/run|/run|g; diff --git a/pcr/cluster-glue/ha-log.service b/pcr/cluster-glue/ha-log.service new file mode 100644 index 000000000..5115298d7 --- /dev/null +++ b/pcr/cluster-glue/ha-log.service @@ -0,0 +1,12 @@ +[Unit] +Description=Non-blocking logging daemon. +Requires=network.target remote-fs.target +Before=heartbeat.service openais.service corosync.service + +[Service] +Type=forking +ExecStart=/usr/lib/heartbeat/ha_logd -d >/dev/null 2>&1 +ExecStop=/usr/lib/heartbeat/ha_logd -k >/dev/null 2>&1 + +[Install] +WantedBy=multi-user.target diff --git a/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed new file mode 100644 index 000000000..2c9801c11 --- /dev/null +++ b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed @@ -0,0 +1,73 @@ +s|Linux,|GNU/Linux,|g; +s|Linux and|GNU/Linux and|g; +s|Linux distro|GNU/Linux distro|g; +s|Linux distribution|GNU/Linux distribution|g; +s|Linux machine|GNU/Linux machine|g; +s|Linux Only|GNU/Linux Only|g; +s|Linux only|GNU/Linux only|g; +s|Linux operating|GNU/Linux operating|g; +s|Linux OS|GNU/Linux OS|g; +s|Linux platform|GNU/Linux platform|g; +s|Linux software|GNU/Linux software|g; +s|Linux specific|GNU/Linux specific|g; +s|Linux system|GNU/Linux system|g; +s|Linux will|GNU/Linux will|g; +s|# Linux$|# GNU/Linux|g; +s|# Linux[.]$|# GNU/Linux.|g; +s|* Linux$|* GNU/Linux|g; +s|* Linux[.]$|* GNU/Linux.|g; +s|// Linux$|// GNU/Linux|g; +s|// Linux[.]$|// GNU/Linux.|g; +s|, Linux|, GNU/Linux|g; +s|As Linux|As GNU/Linux|g; +s|as Linux|as GNU/Linux|g; +s|And Linux|And GNU/Linux|g; +s|and Linux|and GNU/Linux|g; +s|Be Linux|Be GNU/Linux|g; +s|be Linux|be GNU/Linux|g; +s|Because Linux|Because GNU/Linux|g; +s|because Linux|because GNU/Linux|g; +s|e[.]g[.] Linux|e.g. GNU/Linux|g; +s|For Linux|For GNU/Linux|g; +s|for Linux|for GNU/Linux|g; +s|In Linux|In GNU/Linux|g; +s|in Linux|in GNU/Linux|g; +s|Like Linux|Like GNU/Linux|g; +s|like Linux|like GNU/Linux|g; +s|non-Linux|non GNU/Linux|g; +s|Of Linux|Of GNU/Linux|g; +s|of Linux|of GNU/Linux|g; +s|On Linux|On GNU/Linux|g; +s|on Linux|on GNU/Linux|g; +s|OS type: Linux|OS type: GNU/Linux|g; +s|Other Linux|Other GNU/Linux|g; +s|other Linux|other GNU/Linux|g; +s|The Linux|The GNU/Linux|g; +s|the Linux|the GNU/Linux|g; +s|Typically Linux|Typically GNU/Linux|g; +s|typically Linux|typically GNU/Linux|g; +s|To Linux|To GNU/Linux|g; +s|to Linux|to GNU/Linux|g; +s|Under Linux|Under GNU/Linux|g; +s|under Linux|under GNU/Linux|g; +s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|g; +s|GNU/GNU|GNU|g; +s|ArchGNU/Linux|ArchLinux|g; +s|MkGNU/Linux|MkLinux|g; +s|GNU/Linux device|Linux device|g; +s|GNU/Linux Director Daemon|Linux Director Daemon|g; +s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|g; +s|GNU/Linux kernel|Linux kernel|g; +s|GNU/Linux specific kernel|Linux specific kernel|g; +s|GNU/Linux Standard Base|Linux Standard Base|g; +s|GNU/Linux sysfs|Linux sysfs|g; +s|GNU/Linux Virtual Server|Linux Virtual Server|g; +s|GNU/Linux Watchdog|Linux Watchdog|g; +s|GNU/Linux watchdog|Linux watchdog|g; +s|GNU/LinuxHA|LinuxHA|g; +s|GNU/Linux-HA|Linux-HA|g; +s|GNU/LinuxSCSI|LinuxSCSI|g; +s|HA GNU/Linux|HA Linux|g; +s|High-Availability GNU/Linux|High-Availability Linux|g; +s|SEGNU/Linux|SELinux|g; +s|VA GNU/Linux Cluster|VA Linux Cluster|g; diff --git a/pcr/cluster-glue/replace-opensource-to-free-term.sed b/pcr/cluster-glue/replace-opensource-to-free-term.sed new file mode 100644 index 000000000..c086bb91e --- /dev/null +++ b/pcr/cluster-glue/replace-opensource-to-free-term.sed @@ -0,0 +1,19 @@ +s|Open Source Definition (Version [0-9].[0-9])|Free Software Definition|g; +s|Open Source Definition|Free Software Definition|g; +s|Open Source Initiative|Free Software Foundation|g; +s|OSI Certifi|FSF Certif|g; +s|OSI certifi|FSF certif|g; +s|opensource[.]org/osd-annotated|gnu.org/philosophy/free-sw.html|g; +s|opensource[.]org/osd|gnu.org/philosophy/free-sw.html|g; +s|opensource[.]org/|gnu.org/philosophy/free-sw.html|g; +s|[ _-].\{1,3\}[ _-][oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE]||g; +s|[oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE][ _-].\{1,3\}[ _-]||g; +s|OPEN.\{0,1\}SOURCE|FREE|g; +s|Open.\{0,1\}[sS]ource|Free|g; +s|open.\{0,1\}[sS]ource|free|g; +s|Free Development Lab|Open Source Development Lab|g; +s|free[.]org|opensource.org|g; +s|gnu[.]org/philosophy/free-sw[.]htmllicenses|opensource.org/licenses|g; +s|oss[.]software[.]ibm[.]com/developerworks/free|oss.software.ibm.com/developerworks/opensource|g; +s|oberhumer[.]com/free|oberhumer.com/opensource|g; +s|free@google[.]com|opensource@google.com|g; diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD deleted file mode 100644 index a28b9842f..000000000 --- a/social/miniupnpc/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Contributor: Florian Loitsch -pkgname=miniupnpc -pkgver=1.7.20120830 -pkgrel=1 -pkgdesc='A small UPnP client library/tool to access Internet Gateway Devices' -arch=('i686' 'x86_64' 'mips64el') -url="http://miniupnp.free.fr" -license=('BSD') -depends=('sh') -source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz") -md5sums=('c74b24b906e11860005fc425b4979fe6') - -build() { - cd $srcdir/$pkgname-$pkgver - make -} - -package(){ - cd $srcdir/$pkgname-$pkgver - make INSTALLPREFIX=$pkgdir/usr install - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} -- cgit v1.2.3-54-g00ecf From 7a8005609048a38bb6b7538effb4236b49385cd5 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 30 Jun 2013 01:17:13 -0700 Subject: Sun Jun 30 01:15:30 PDT 2013 --- community/libgit2/PKGBUILD | 8 +- community/solfege/PKGBUILD | 6 +- community/virtualbox-modules/PKGBUILD | 34 ++--- .../virtualbox-guest-modules.install | 13 +- .../virtualbox-host-modules.install | 13 +- core/man-db/PKGBUILD | 8 +- extra/ardour/PKGBUILD | 8 +- extra/ardour/ardour.install | 21 ++- extra/audacious/PKGBUILD | 6 +- extra/git/PKGBUILD | 8 +- extra/refind-efi/PKGBUILD | 23 ++- extra/ruby/PKGBUILD | 4 +- extra/wireshark/PKGBUILD | 6 +- libre/abs-libre/PKGBUILD | 51 ------- libre/abs-libre/abs.install | 13 -- libre/abs/PKGBUILD | 42 ++++++ libre/audacious-plugins-libre/PKGBUILD | 16 +- libre/cups-filters-libre/PKGBUILD | 8 +- libre/hplip-libre/PKGBUILD | 22 +-- libre/xtensa-elf-binutils/PKGBUILD | 91 ++++++++++++ .../binutils-2.23.2-texinfo-5.0.patch | 162 +++++++++++++++++++++ libre/xtensa-elf-binutils/binutils.install | 17 +++ 22 files changed, 420 insertions(+), 160 deletions(-) delete mode 100644 libre/abs-libre/PKGBUILD delete mode 100644 libre/abs-libre/abs.install create mode 100644 libre/abs/PKGBUILD create mode 100644 libre/xtensa-elf-binutils/PKGBUILD create mode 100644 libre/xtensa-elf-binutils/binutils-2.23.2-texinfo-5.0.patch create mode 100644 libre/xtensa-elf-binutils/binutils.install (limited to 'core') diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD index f47445fe9..aedbb4fde 100644 --- a/community/libgit2/PKGBUILD +++ b/community/libgit2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 88415 2013-04-17 09:17:05Z thestinger $ +# $Id: PKGBUILD 93245 2013-06-29 19:05:07Z thestinger $ # Maintainer: Daniel Micay # Contributor: Hilton Medeiros # Contributor: Dave Reisner pkgname=libgit2 -pkgver=0.18.0 +pkgver=0.19.0 pkgrel=1 pkgdesc="A linkable library for Git" arch=('i686' 'x86_64') url="http://libgit2.github.com/" -depends=(zlib openssl) +depends=(zlib openssl libssh2) makedepends=(cmake python) license=('GPL2') source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver") -md5sums=('50409ddb0c34713677b33ef617e92c94') +md5sums=('df1c1e058b2d0f46b1b73dc78d551ea1') build() { cd $pkgname-* diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index 7fe94a67c..d26440d70 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82340 2013-01-15 15:31:26Z schiv $ +# $Id: PKGBUILD 93249 2013-06-29 19:58:40Z schiv $ # Maintainer: Ray Rashif # Contributor: Corrado Primier # Contributor: sickhate # TODO: bring in pyalsa, csound, mma pkgname=solfege -pkgver=3.20.8 +pkgver=3.22.0 pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' 'lilypond: for generating print-outs & score sheets' 'texlive-bin: use LaTeX to replace HTML reports with DVI') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('401f421bde27112d7fa01aaccc080a95') +md5sums=('8a5275d6db3ff181068441d7e32ad7f3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index e3862c973..cc9ce02bf 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 93064 2013-06-23 17:40:06Z seblu $ +# $Id: PKGBUILD 93232 2013-06-29 10:08:01Z foutrelis $ # Maintainer: Ionut Biru # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux' - 'linux-headers' +makedepends=('linux>=3.9' 'linux<3.10' + 'linux-headers>=3.9' 'linux-headers<3.10' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver" 'expac' 'sed' 'bc') +# remember to also adjust the .install files and the package deps below +_extramodules=extramodules-3.9-ARCH + build() { - _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') - _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) + _kernver="$(cat /usr/lib/modules/$_extramodules/version)" # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -32,36 +34,32 @@ build() { } package_virtualbox-host-modules(){ - _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') - _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) + _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)") + depends=('linux>=3.9' 'linux<3.10') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" - install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" + install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/" + install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules.install" } package_virtualbox-guest-modules(){ - _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') - _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) + _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)") + depends=('linux>=3.9' 'linux<3.10') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" - install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" + install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/" + install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules.install" } # vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 73eddf0fd..169dd9a35 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,18 +1,21 @@ -VERSION='3.9.7-1-ARCH' +_depmod() { + EXTRAMODULES='extramodules-3.9-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - depmod $VERSION + _depmod } post_upgrade() { - depmod $VERSION + _depmod } post_remove() { - depmod $VERSION + _depmod } # vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 4741f26bf..b1c7a68c6 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,20 +1,23 @@ -VERSION='3.9.7-1-ARCH' +_depmod() { + EXTRAMODULES='extramodules-3.9-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - depmod $VERSION + _depmod } post_upgrade() { - depmod $VERSION + _depmod echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - depmod $VERSION + _depmod } # vim:set ts=2 sw=2 et: diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index f673403bb..f390542ef 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186047 2013-05-20 18:28:50Z andyrtr $ +# $Id: PKGBUILD 189192 2013-06-29 06:03:40Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Sergej Pupykin pkgname=man-db -pkgver=2.6.3 -pkgrel=3 +pkgver=2.6.5 +pkgrel=1 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') url="http://www.nongnu.org/man-db/" @@ -21,7 +21,7 @@ install=${pkgname}.install source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig} convert-mans man-db.cron.daily) options=('!libtool') -md5sums=('a593a095599ae97bcacf8d038659a146' +md5sums=('36f59d9314b45a266ba350584b4d7cc1' 'SKIP' '2b7662a7d5b33fe91f9f3e034361a2f6' '934fd047fecb915038bf4bf844ea609c') diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 01a03ef63..d6d1a8004 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182614 2013-04-11 09:00:27Z schiv $ +# $Id: PKGBUILD 189213 2013-06-29 15:55:30Z schiv $ # Maintainer: Ray Rashif # Contributor: SpepS # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.1 +pkgver=3.2 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64') @@ -15,9 +15,9 @@ depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') install=$pkgname.install -source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2" +source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('6291ee6e6519a801a6c7255eb005895f' +md5sums=('17028a3106f870cd62f6a60930a28590' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install index 555d7377d..78d8f7734 100644 --- a/extra/ardour/ardour.install +++ b/extra/ardour/ardour.install @@ -3,6 +3,11 @@ post_install() { > Ardour 3 has support for native "Linux" VSTs. You may want to export > LXVST_PATH to include any custom directories of *.so VST plug-ins. + > Ardour 3 also supports video (timeline and monitoring), but aside from + > xjadeo (AUR) the required external programs need to be retrieved from: + + http://x42.github.io/harvid/ + > Please consider supporting Paul Davis, lead developer of Ardour, by > either subscribing or at least donating to the project's cause: @@ -15,7 +20,21 @@ MSG } post_upgrade() { - post_install + cat << MSG + > Ardour now supports video timeline. To use this feature, please get + > static builds of the required external runtime dependencies from: + + http://x42.github.io/harvid/ + + > You may then install the binaries in /usr/local/bin and import a video + > via Session > Open Video. + + > Due to uncertainties with regards to program stability, 'harvid' is + > currently not packaged in our repositories. + + > In addition to the timeline, video can be monitored with xjadeo, which + > is presently available in the AUR. It will be in our repositories soon. +MSG } # vim:set ts=2 sw=2 et: diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 836e9377c..b1affd2a0 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177006 2013-02-04 00:32:16Z bisson $ +# $Id: PKGBUILD 189207 2013-06-29 12:06:19Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Alexander Fehr # Contributor: Giovanni Scafora pkgname=audacious -pkgver=3.3.4 +pkgver=3.4 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d1050fb88a59b46c0c9bbb1af0e7efc2b02f2b4d') +sha1sums=('2a40e41a8689e90456ce1f7aeabb6a49c1b2f385') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index cfd48adcc..347c53a46 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188161 2013-06-10 22:30:55Z dan $ +# $Id: PKGBUILD 189217 2013-06-29 20:32:47Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.3.1 +pkgver=1.8.3.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('35401b410e7f248b13e35a1069aca2e2' - '3f801cc82a58c2c2ceeab95975114113' +md5sums=('83b792fd06066c77e1d4911ebba2d701' + 'f850829e1e7f32e388d2ffb61759fcc9' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 028af2afd..c201d7bf1 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188814 2013-06-21 19:48:54Z tpowa $ +# $Id: PKGBUILD 189205 2013-06-29 11:28:10Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -16,8 +16,8 @@ _COMPILER="GCC46" ####### pkgname="refind-efi" -pkgver="0.6.12" -pkgrel="2" +pkgver="0.7.0" +pkgrel="1" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') @@ -41,15 +41,6 @@ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModul source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}") done -sha1sums=('aabac34b2a30e16c5fd105777b9245c2ed0496e4' - '4d1992699f9b48dd2b7e6bd6c0b25fc065f75894' - '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') - [[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64" [[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32" @@ -209,3 +200,11 @@ package() { install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" } +sha1sums=('f71f00dbbe8c068c9ef80f468835c998832d364f' + '4d1992699f9b48dd2b7e6bd6c0b25fc065f75894' + '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index c74fd3391..2446d2a73 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley pkgname=('ruby' 'ruby-docs') -pkgver=2.0.0_p195 +pkgver=2.0.0_p247 pkgrel=1 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6' +md5sums=('60913f3eec0c4071f44df42600be2604' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 946bce8bd..27273c87c 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188206 2013-06-12 20:04:04Z guillaume $ +# $Id: PKGBUILD 189196 2013-06-29 09:29:34Z guillaume $ # Maintainer: Guillaume ALAUX # Contributor: Florian Pritz pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark pkgver=1.10.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL2') makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' @@ -59,7 +59,7 @@ package_wireshark-cli() { # Headers install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} - install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}" + install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}" for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} done diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD deleted file mode 100644 index 259cf007f..000000000 --- a/libre/abs-libre/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $ -# Maintainer: Allan McRae - -_pkgname=abs -pkgname=abs-libre -#CARCH=mips64el -pkgver=2.4.4 -pkgrel=1 -pkgdesc="Utilities to download and work with the Arch Build System (ABS)" -arch=('i686' 'x86_64' 'mips64el') -url="http://projects.archlinux.org/abs.git/" -license=('GPL') -depends=('bash' 'rsync') -backup=(etc/abs.conf) -source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' - 'a628f7d5b1cd1e838366b88709690c24') -provides=("${_pkgname}=${pkgver}") -replaces=("${_pkgname}") -conflicts=("${_pkgname}") - -build() { - cd "$_pkgname-$pkgver" - - make -} - -package() { - cd "$_pkgname-$pkgver" - - make DESTDIR="${pkgdir}" install - - # Add readme file, and make base /var/abs path - install -dm755 "${pkgdir}"/var/abs/local/ - install -Dm644 README "${pkgdir}"/var/abs/README - - sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' ${pkgdir}/etc/abs.conf - sed -i -e 's|(core|(libre !libre-testing core|' ${pkgdir}/etc/abs.conf - - # make adjustments to abs.conf - if [[ $CARCH = "i686" ]]; then - sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf - fi - if [[ $CARCH = "x86_64" ]]; then - sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf - fi - if [[ $CARCH = "mips64el" ]]; then - sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf - sed -i '/ARCH=/s|i686|mips64el|' ${pkgdir}/etc/abs.conf - fi -} diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install deleted file mode 100644 index ac814c2fc..000000000 --- a/libre/abs-libre/abs.install +++ /dev/null @@ -1,13 +0,0 @@ -pre_upgrade() { - if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then - echo "==> Fixing potential ABS tree permission issues (this may take a while...)" - - for dir in core extra community testing; do - if [ -d /var/abs/$dir ]; then - find /var/abs/$dir -type d -exec chown root:root {} \; - find /var/abs/$dir -type d -exec chmod 755 {} \; - fi - done - fi -} - diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD new file mode 100644 index 000000000..f7e85d0ef --- /dev/null +++ b/libre/abs/PKGBUILD @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Allan McRae + +replaces=('abs-libre') +conflicts=('abs-libre') + +pkgname=abs +pkgver=2.4.4 +pkgrel=1.1 +pkgdesc="Utilities to download and work with the Arch Build System (ABS)" +arch=('i686' 'x86_64' 'mips64el') +url="http://projects.archlinux.org/abs.git/" +license=('GPL') +depends=('bash' 'rsync') +backup=(etc/abs.conf) +source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' + 'a628f7d5b1cd1e838366b88709690c24') + +build() { + cd "$pkgname-$pkgver" + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="${pkgdir}" install + + # Add readme file, and make base /var/abs path + install -dm755 "${pkgdir}"/var/abs/local/ + install -Dm644 README "${pkgdir}"/var/abs/README + + # make adjustments to abs.conf + sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf + sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf + if [[ $CARCH != "x86_64" ]]; then + sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf + fi + sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf +} diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 90d5acdaa..4c47b6101 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177005 2013-02-04 00:31:50Z bisson $ +# $Id: PKGBUILD 189208 2013-06-29 12:06:26Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Alexander Fehr # Contributor: William Rea @@ -8,9 +8,9 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.3.4 -pkgrel=2 -pkgdesc='Plugins for Audacious without unfree plugins' +pkgver=3.4 +pkgrel=1 +pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') arch=('i686' 'x86_64') @@ -24,9 +24,9 @@ arch=('i686' 'x86_64') # # All the other custom licensed plugins I think are mostly modified BSD or ISC. -provides=("audacious-plugins=$pkgver") -replaces=("${pkgname%-libre}") -conflicts=("${pkgname%-libre}") +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver makedepends=("audacious>=${pkgver}" 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' @@ -61,7 +61,7 @@ optdepends=('oss: Open Sound System v4 output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6493f051417a201fc0e2de7ef36a709676f96607') +sha1sums=('2b2f1d30f0b790e6cc3e00483ed4774b0fa1fc42') build() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 517ff84ef..bb17e745b 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185774 2013-05-18 15:32:58Z andyrtr $ +# $Id: PKGBUILD 188974 2013-06-27 14:08:06Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.34 -pkgrel=4 +pkgver=1.0.35 +pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" @@ -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=('fea9cad6bbb14ab0635243ed5d1d5c77' +md5sums=('26f150f1e9ce1f7b0f38ae4ebb01e23d' '9ef68d7c2a84713fd421f4e87dec0a6e') replaces=("${_pkgname}") conflicts=("${_pkgname}") diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 2623328ac..d70fde92d 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185808 2013-05-19 10:16:28Z andyrtr $ +# $Id: PKGBUILD 188976 2013-06-27 14:29:36Z andyrtr $ # Maintainer: Tom Gundersen # Contributor : Rémy Oudompheng # Contributor: Morgan LEFIEUX @@ -6,8 +6,8 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.5 -pkgrel=2 +pkgver=3.13.6 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -30,26 +30,16 @@ provides=$_pkgname=$pkgver options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} - cups-1.6-buildfix.diff - hp-mkuri.patch - hplip_typo.patch) -md5sums=('f0c406f06f191a120f7d283b69ff10e8' + hp-mkuri.patch) +md5sums=('3dd5052864052b8cd4ce013bb71f4d6c' 'SKIP' - 'ef64578c6cb3ce252dbdcb0f1c2f4a47' - '0bd7779fdbc4d7a9386df04dce2cb8d4' - 'b3dd33a538ed8a3774f3c22f13e0a549') + '0bd7779fdbc4d7a9386df04dce2cb8d4') build() { cd "$srcdir/$_pkgname-$pkgver" - # fix build with cups 1.6 - FC hplip-ipp-accessors.patch - patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff" - # fix linking libnotify, FS#34283 patch -Np0 -i ${srcdir}/hp-mkuri.patch - - # fix typo preventing FW to load - patch -Np0 -i ${srcdir}/hplip_typo.patch export PYTHON=python2 diff --git a/libre/xtensa-elf-binutils/PKGBUILD b/libre/xtensa-elf-binutils/PKGBUILD new file mode 100644 index 000000000..73000b60d --- /dev/null +++ b/libre/xtensa-elf-binutils/PKGBUILD @@ -0,0 +1,91 @@ +# $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $ +# Maintainer: Allan McRae +# Maintainer (Parabola): André Silva +# Contributor (Parabola): Márcio Silva + +pkgname=xtensa-elf-binutils +pkgver=2.23.2 +pkgrel=2.3 +pkgdesc="A set of programs to assemble and manipulate binary and object files" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +depends=('glibc>=2.17' 'zlib') +checkdepends=('dejagnu' 'bc') +options=('!libtool' '!distcc' '!ccache') +install=binutils.install +source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} + binutils-2.23.2-texinfo-5.0.patch) +md5sums=('4f8fa651e35ef262edc01d60fb45702e' + 'dfde4428f08d91f309cdcfe92bf28d08' + '34e439ce23213a91e2af872dfbb5094c') + +prepare() { + cd ${srcdir}/binutils-${pkgver} + + # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935 + # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542 + patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch + + # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure + + mkdir ${srcdir}/binutils-build +} + +build() { + cd ${srcdir}/binutils-build + + ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ + --with-lib-path=/usr/lib/binutils/xtensa-elf \ + --with-bugurl=https://labs.parabola.nu/ \ + --enable-ld=default --enable-gold \ + --enable-plugins --enable-threads \ + --with-pic --enable-shared \ + --disable-werror --disable-multilib \ + --with-sysroot=/usr/$CHOST/xtensa-elf \ + --program-prefix=xtensa-elf- \ + --target=xtensa-elf + + make configure-host + + make tooldir=/usr +} + + +check() { + cd ${srcdir}/binutils-build + + # unset LDFLAGS as testsuite makes assumptions about which ones are active + # do not abort on errors - manually check log files + make LDFLAGS="" -k check || true +} + +package() { + cd ${srcdir}/binutils-build + make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install + + # Add some useful headers + install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include + install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include + + # Install PIC libiberty.a + install -m644 libiberty/pic/libiberty.a ${pkgdir}/usr/lib + + # Remove unwanted files + rm ${pkgdir}/usr/share/man/man1/xtensa-elf-{dlltool,nlmconv,windres,windmc}* + rm ${pkgdir}/usr/share/info/{configure,standards}.info + + # Remove unnecessary files and folders + rm -f $pkgdir/usr/bin/ar + rm -f $pkgdir/usr/bin/as + rm -f $pkgdir/usr/bin/ld + rm -f $pkgdir/usr/bin/nm + rm -f $pkgdir/usr/bin/objdump + rm -f $pkgdir/usr/bin/ranlib + rm -f $pkgdir/usr/bin/strip + rm -f $pkgdir/usr/bin/objcopy + rm -f $pkgdir/usr/include + rm -f $pkgdir/usr/lib/libiberty.a + rm -rf $pkgdir/usr/share +} diff --git a/libre/xtensa-elf-binutils/binutils-2.23.2-texinfo-5.0.patch b/libre/xtensa-elf-binutils/binutils-2.23.2-texinfo-5.0.patch new file mode 100644 index 000000000..38dc19fb0 --- /dev/null +++ b/libre/xtensa-elf-binutils/binutils-2.23.2-texinfo-5.0.patch @@ -0,0 +1,162 @@ +diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo +index 45ffa73..3aa3300 100644 +--- a/bfd/doc/bfd.texinfo ++++ b/bfd/doc/bfd.texinfo +@@ -322,7 +324,7 @@ All of BFD lives in one directory. + @printindex cp + + @tex +-% I think something like @colophon should be in texinfo. In the ++% I think something like @@colophon should be in texinfo. In the + % meantime: + \long\def\colophon{\hbox to0pt{}\vfill + \centerline{The body of this manual is set in} +@@ -333,7 +335,7 @@ All of BFD lives in one directory. + \centerline{{\sl\fontname\tensl\/}} + \centerline{are used for emphasis.}\vfill} + \page\colophon +-% Blame: doc@cygnus.com, 28mar91. ++% Blame: doc@@cygnus.com, 28mar91. + @end tex + + @bye +diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi +index 56a0510..fb1802b 100644 +--- a/binutils/doc/binutils.texi ++++ b/binutils/doc/binutils.texi +@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''. + * objcopy:: Copy and translate object files + * objdump:: Display information from object files + * ranlib:: Generate index to archive contents +-* readelf:: Display the contents of ELF format files + * size:: List section sizes and total size + * strings:: List printable strings from files + * strip:: Discard symbols +-* elfedit:: Update the ELF header of ELF files + * c++filt:: Filter to demangle encoded C++ symbols + * cxxfilt: c++filt. MS-DOS name for c++filt + * addr2line:: Convert addresses to file and line + * nlmconv:: Converts object code into an NLM +-* windres:: Manipulate Windows resources + * windmc:: Generator for Windows message resources ++* windres:: Manipulate Windows resources + * dlltool:: Create files needed to build and use DLLs ++* readelf:: Display the contents of ELF format files ++* elfedit:: Update the ELF header of ELF files + * Common Options:: Command-line options for all utilities + * Selecting the Target System:: How these utilities determine the target + * Reporting Bugs:: Reporting Bugs +@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}. + @c man end + @end ignore + +-@node c++filt, addr2line, elfedit, Top ++@node c++filt, addr2line, strip, Top + @chapter c++filt + + @kindex c++filt +@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach}, + + @table @env + +-@itemx --input-mach=@var{machine} ++@item --input-mach=@var{machine} + Set the matching input ELF machine type to @var{machine}. If + @option{--input-mach} isn't specified, it will match any ELF + machine types. +@@ -4392,21 +4392,21 @@ machine types. + The supported ELF machine types are, @var{L1OM}, @var{K1OM} and + @var{x86-64}. + +-@itemx --output-mach=@var{machine} ++@item --output-mach=@var{machine} + Change the ELF machine type in the ELF header to @var{machine}. The + supported ELF machine types are the same as @option{--input-mach}. + +-@itemx --input-type=@var{type} ++@item --input-type=@var{type} + Set the matching input ELF file type to @var{type}. If + @option{--input-type} isn't specified, it will match any ELF file types. + + The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}. + +-@itemx --output-type=@var{type} ++@item --output-type=@var{type} + Change the ELF file type in the ELF header to @var{type}. The + supported ELF types are the same as @option{--input-type}. + +-@itemx --input-osabi=@var{osabi} ++@item --input-osabi=@var{osabi} + Set the matching input ELF file OSABI to @var{osabi}. If + @option{--input-osabi} isn't specified, it will match any ELF OSABIs. + +@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD}, + @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS}, + @var{NSK}, @var{AROS} and @var{FenixOS}. + +-@itemx --output-osabi=@var{osabi} ++@item --output-osabi=@var{osabi} + Change the ELF OSABI in the ELF header to @var{osabi}. The + supported ELF OSABI are the same as @option{--input-osabi}. + +diff --git a/ld/ld.texinfo b/ld/ld.texinfo +index c7ae2a5..4777ad5 100644 +--- a/ld/ld.texinfo ++++ b/ld/ld.texinfo +@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''. + @ifset ARM + * ARM:: ld and the ARM family + @end ifset +-@ifset HPPA +-* HPPA ELF32:: ld and HPPA 32-bit ELF +-@end ifset + @ifset M68HC11 + * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families + @end ifset ++@ifset HPPA ++* HPPA ELF32:: ld and HPPA 32-bit ELF ++@end ifset + @ifset M68K + * M68K:: ld and Motorola 68K family + @end ifset +@@ -6012,6 +6014,9 @@ functionality are not listed. + @ifset I960 + * i960:: @command{ld} and the Intel 960 family + @end ifset ++@ifset M68HC11 ++* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families ++@end ifset + @ifset ARM + * ARM:: @command{ld} and the ARM family + @end ifset +@@ -6027,9 +6032,6 @@ functionality are not listed. + @ifset MSP430 + * MSP430:: @command{ld} and MSP430 + @end ifset +-@ifset M68HC11 +-* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families +-@end ifset + @ifset POWERPC + * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support + @end ifset +@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same + @printindex cp + + @tex +-% I think something like @colophon should be in texinfo. In the ++% I think something like @@colophon should be in texinfo. In the + % meantime: + \long\def\colophon{\hbox to0pt{}\vfill + \centerline{The body of this manual is set in} +@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same + \centerline{{\sl\fontname\tensl\/}} + \centerline{are used for emphasis.}\vfill} + \page\colophon +-% Blame: doc@cygnus.com, 28mar91. ++% Blame: doc@@cygnus.com, 28mar91. + @end tex + + @bye +-- +1.7.1 + diff --git a/libre/xtensa-elf-binutils/binutils.install b/libre/xtensa-elf-binutils/binutils.install new file mode 100644 index 000000000..9de0533ee --- /dev/null +++ b/libre/xtensa-elf-binutils/binutils.install @@ -0,0 +1,17 @@ +infodir=usr/share/info +filelist=(as.info bfd.info binutils.info gprof.info ld.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + -- cgit v1.2.3-54-g00ecf From 04b07250d0055e5cecd7c998660c5595699cfe1c Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Jul 2013 00:45:57 -0700 Subject: Thu Jul 4 00:45:57 PDT 2013 --- community/busybox/PKGBUILD | 10 +- community/busybox/busybox.install | 2 +- community/busybox/config | 34 +- community/calc/PKGBUILD | 10 +- community/celt0.5.1/PKGBUILD | 29 + community/dbmail/PKGBUILD | 8 +- community/fcitx-libpinyin/PKGBUILD | 13 +- community/filezilla/PKGBUILD | 6 +- community/gnome-screensaver/PKGBUILD | 5 +- community/gwget/PKGBUILD | 6 +- community/gwget/drop-libgnomeui.patch | 65 +- community/krecipes/PKGBUILD | 6 +- community/libvirt-glib/PKGBUILD | 28 + community/python2-fonttools/PKGBUILD | 6 +- community/smc/PKGBUILD | 50 - community/smc/boost_filesystem3.diff | 48 - community/smc/smc-for-cegui-v0-7.diff | 437 ------ community/smc/smc.desktop | 9 - community/smc/smc.png | Bin 2961 -> 0 bytes community/spice-gtk3/PKGBUILD | 36 + community/spice/PKGBUILD | 26 + community/usbredir/PKGBUILD | 28 + core/ed/PKGBUILD | 8 +- core/make/PKGBUILD | 9 +- core/make/make-3.82-bug30612.patch | 27 +- extra/elfutils/PKGBUILD | 15 +- extra/freenx/PKGBUILD | 99 -- extra/freenx/freenx-latest-svn.patch | 288 ---- extra/freenx/freenx-server-0.7.3-nxipp.patch | 17 - extra/freenx/freenx.install | 59 - extra/freenx/keymap.patch | 32 - extra/freenx/nxagent-startup.patch | 12 - extra/freenx/remove-dialog.patch | 32 - .../gnome-alsamixer/02_change_gconf-keys_path.diff | 207 +++ .../03_gnome-alsamixer.schemas.diff | 174 +++ extra/gnome-alsamixer/04_ignore-delimiters.diff | 15 + .../gnome-alsamixer/05-remove-G_CONST_RETURN.patch | 111 ++ .../gnome-alsamixer/06-use-libgnome-headers.patch | 26 + extra/gnome-alsamixer/PKGBUILD | 51 +- .../gnome-alsamixer-0.9.6-gtk24.patch | 15 - extra/gnome-alsamixer/gnome-alsamixer.install | 19 + extra/kactivities/PKGBUILD | 6 +- extra/kdeaccessibility-jovie/PKGBUILD | 6 +- extra/kdeaccessibility-kaccessible/PKGBUILD | 6 +- extra/kdeaccessibility-kmag/PKGBUILD | 6 +- extra/kdeaccessibility-kmousetool/PKGBUILD | 6 +- extra/kdeaccessibility-kmouth/PKGBUILD | 6 +- extra/kdeadmin/PKGBUILD | 12 +- extra/kdeartwork/PKGBUILD | 6 +- extra/kdebase-konsole/PKGBUILD | 6 +- extra/kdebase-workspace/PKGBUILD | 15 +- .../kdebase-workspace/fix-plasma-memory-leak.patch | 53 + extra/kdebase/PKGBUILD | 6 +- extra/kdebindings-kimono/PKGBUILD | 6 +- extra/kdebindings-korundum/PKGBUILD | 14 +- extra/kdebindings-korundum/ruby19.patch | 30 - extra/kdebindings-kross/PKGBUILD | 6 +- extra/kdebindings-perlkde/PKGBUILD | 6 +- extra/kdebindings-perlqt/PKGBUILD | 6 +- extra/kdebindings-python/PKGBUILD | 8 +- extra/kdebindings-qtruby/PKGBUILD | 6 +- extra/kdebindings-qyoto/PKGBUILD | 6 +- extra/kdebindings-smokegen/PKGBUILD | 6 +- extra/kdebindings-smokekde/PKGBUILD | 6 +- extra/kdebindings-smokeqt/PKGBUILD | 6 +- extra/kdeedu-analitza/PKGBUILD | 6 +- extra/kdeedu-blinken/PKGBUILD | 6 +- extra/kdeedu-cantor/PKGBUILD | 6 +- extra/kdeedu-kalgebra/PKGBUILD | 6 +- extra/kdeedu-kalzium/PKGBUILD | 6 +- extra/kdeedu-kanagram/PKGBUILD | 6 +- extra/kdeedu-kbruch/PKGBUILD | 6 +- extra/kdeedu-kgeography/PKGBUILD | 6 +- extra/kdeedu-khangman/PKGBUILD | 6 +- extra/kdeedu-kig/PKGBUILD | 6 +- extra/kdeedu-kiten/PKGBUILD | 6 +- extra/kdeedu-klettres/PKGBUILD | 6 +- extra/kdeedu-kmplot/PKGBUILD | 6 +- extra/kdeedu-kstars/PKGBUILD | 6 +- extra/kdeedu-ktouch/PKGBUILD | 6 +- extra/kdeedu-kturtle/PKGBUILD | 6 +- extra/kdeedu-kwordquiz/PKGBUILD | 6 +- extra/kdeedu-marble/PKGBUILD | 6 +- extra/kdeedu-pairs/PKGBUILD | 6 +- extra/kdeedu-parley/PKGBUILD | 6 +- extra/kdeedu-rocs/PKGBUILD | 6 +- extra/kdeedu-step/PKGBUILD | 6 +- extra/kdegames-bomber/PKGBUILD | 6 +- extra/kdegames-bovo/PKGBUILD | 6 +- extra/kdegames-granatier/PKGBUILD | 6 +- extra/kdegames-kapman/PKGBUILD | 6 +- extra/kdegames-katomic/PKGBUILD | 6 +- extra/kdegames-kblackbox/PKGBUILD | 6 +- extra/kdegames-kblocks/PKGBUILD | 6 +- extra/kdegames-kbounce/PKGBUILD | 6 +- extra/kdegames-kbreakout/PKGBUILD | 6 +- extra/kdegames-kdiamond/PKGBUILD | 6 +- extra/kdegames-kfourinline/PKGBUILD | 6 +- extra/kdegames-kgoldrunner/PKGBUILD | 6 +- extra/kdegames-kigo/PKGBUILD | 6 +- extra/kdegames-killbots/PKGBUILD | 6 +- extra/kdegames-kiriki/PKGBUILD | 6 +- extra/kdegames-kjumpingcube/PKGBUILD | 6 +- extra/kdegames-klickety/PKGBUILD | 6 +- extra/kdegames-klines/PKGBUILD | 6 +- extra/kdegames-kmahjongg/PKGBUILD | 6 +- extra/kdegames-kmines/PKGBUILD | 6 +- extra/kdegames-knavalbattle/PKGBUILD | 6 +- extra/kdegames-knetwalk/PKGBUILD | 6 +- extra/kdegames-kolf/PKGBUILD | 6 +- extra/kdegames-kollision/PKGBUILD | 6 +- extra/kdegames-konquest/PKGBUILD | 6 +- extra/kdegames-kpatience/PKGBUILD | 6 +- extra/kdegames-kreversi/PKGBUILD | 6 +- extra/kdegames-kshisen/PKGBUILD | 6 +- extra/kdegames-ksirk/PKGBUILD | 6 +- extra/kdegames-ksnakeduel/PKGBUILD | 6 +- extra/kdegames-kspaceduel/PKGBUILD | 6 +- extra/kdegames-ksquares/PKGBUILD | 6 +- extra/kdegames-ksudoku/PKGBUILD | 6 +- extra/kdegames-ktuberling/PKGBUILD | 6 +- extra/kdegames-kubrick/PKGBUILD | 6 +- extra/kdegames-lskat/PKGBUILD | 6 +- extra/kdegames-palapeli/PKGBUILD | 6 +- extra/kdegames-picmi/PKGBUILD | 6 +- extra/kdegraphics-gwenview/PKGBUILD | 6 +- extra/kdegraphics-kamera/PKGBUILD | 6 +- extra/kdegraphics-kcolorchooser/PKGBUILD | 6 +- extra/kdegraphics-kgamma/PKGBUILD | 6 +- extra/kdegraphics-kolourpaint/PKGBUILD | 6 +- extra/kdegraphics-kruler/PKGBUILD | 6 +- extra/kdegraphics-ksaneplugin/PKGBUILD | 6 +- extra/kdegraphics-ksnapshot/PKGBUILD | 6 +- extra/kdegraphics-mobipocket/PKGBUILD | 6 +- extra/kdegraphics-okular/PKGBUILD | 6 +- extra/kdegraphics-strigi-analyzer/PKGBUILD | 6 +- extra/kdegraphics-svgpart/PKGBUILD | 6 +- extra/kdegraphics-thumbnailers/PKGBUILD | 6 +- extra/kdemultimedia-audiocd-kio/PKGBUILD | 6 +- extra/kdemultimedia-dragonplayer/PKGBUILD | 6 +- extra/kdemultimedia-ffmpegthumbs/PKGBUILD | 6 +- extra/kdemultimedia-juk/PKGBUILD | 6 +- extra/kdemultimedia-kmix/PKGBUILD | 6 +- extra/kdemultimedia-kscd/PKGBUILD | 6 +- extra/kdemultimedia-mplayerthumbs/PKGBUILD | 6 +- extra/kdenetwork/PKGBUILD | 20 +- extra/kdepim-runtime/PKGBUILD | 6 +- extra/kdepim/PKGBUILD | 6 +- extra/kdepimlibs/PKGBUILD | 6 +- extra/kdeplasma-addons/PKGBUILD | 15 +- extra/kdesdk-kate/PKGBUILD | 8 +- extra/kdesdk/PKGBUILD | 6 +- extra/kdetoys/PKGBUILD | 6 +- extra/kdeutils-filelight/PKGBUILD | 6 +- extra/kdeutils-kcalc/PKGBUILD | 6 +- extra/kdeutils-kcharselect/PKGBUILD | 6 +- extra/kdeutils-kdf/PKGBUILD | 6 +- extra/kdeutils-kfloppy/PKGBUILD | 6 +- extra/kdeutils-kgpg/PKGBUILD | 6 +- extra/kdeutils-kremotecontrol/PKGBUILD | 4 +- extra/kdeutils-ktimer/PKGBUILD | 6 +- extra/kdeutils-kwallet/PKGBUILD | 6 +- extra/kdeutils-print-manager/PKGBUILD | 6 +- extra/kdeutils-superkaramba/PKGBUILD | 6 +- extra/kdeutils-sweeper/PKGBUILD | 6 +- extra/kdewebdev/PKGBUILD | 6 +- extra/libkcddb/PKGBUILD | 6 +- extra/libkcompactdisc/PKGBUILD | 6 +- extra/libkdcraw/PKGBUILD | 6 +- extra/libkdeedu/PKGBUILD | 6 +- extra/libkdegames/PKGBUILD | 6 +- extra/libkexiv2/PKGBUILD | 6 +- extra/libkipi/PKGBUILD | 4 +- extra/libkmahjongg/PKGBUILD | 6 +- extra/libksane/PKGBUILD | 6 +- extra/libmspack/PKGBUILD | 6 +- extra/libxi/PKGBUILD | 22 +- extra/libxi/git-fixes.diff | 1386 -------------------- extra/link-grammar/PKGBUILD | 6 +- extra/mercurial/PKGBUILD | 6 +- extra/nepomuk-core/PKGBUILD | 6 +- extra/nepomuk-widgets/PKGBUILD | 6 +- extra/nx-common/NXproto.h.64bit.diff | 66 - extra/nx-common/PKGBUILD | 51 - extra/nx-common/nx-3.5.0-libpng15.patch | 30 - extra/nx-common/nxcompsh-gcc43.patch | 19 - extra/opennx/PKGBUILD | 37 - extra/xmlsec/PKGBUILD | 11 +- java/not-working/closure-compiler/PKGBUILD | 73 -- java/not-working/closure-compiler/TODO | 2 - java/not-working/java-asm4/PKGBUILD | 17 - java/not-working/java-asm4/TODO | 1 - java/not-working/java-guava/PKGBUILD | 34 - java/not-working/java-guava/TODO | 2 - java/not-working/junit-truth/PKGBUILD | 45 - java/not-working/junit-truth/TODO | 1 - java/not-working/protobuf/PKGBUILD | 99 -- java/not-working/protobuf/TODO | 5 - libre/icecat-noscript/PKGBUILD | 8 +- libre/iceweasel-noscript/PKGBUILD | 8 +- libre/kdebase-konqueror-libre/PKGBUILD | 6 +- libre/kdebase-runtime-libre/PKGBUILD | 6 +- libre/kdelibs-libre/PKGBUILD | 6 +- libre/kdenetwork-kopete-libre/PKGBUILD | 10 +- libre/kdepim-libre/PKGBUILD | 6 +- libre/kdeutils-ark-libre/PKGBUILD | 6 +- libre/linux-libre-firmware/PKGBUILD | 38 +- libre/parabola-keyring/PKGBUILD | 5 +- libre/xtensa-unknown-elf-binutils/PKGBUILD | 67 +- libre/xtensa-unknown-elf-gcc/PKGBUILD | 58 +- pcr/hiredis/ChangeLog | 4 + pcr/hiredis/PKGBUILD | 33 + pcr/kamailio/PKGBUILD | 36 + pcr/par/PKGBUILD | 38 + pcr/pybonjour/PKGBUILD | 2 +- pcr/radiusclient-ng/PKGBUILD | 31 + pcr/ruby-haml/ruby-yard/PKGBUILD | 36 - pcr/transmission-remote-cli/PKGBUILD | 16 +- social/asterisk/PKGBUILD | 10 +- ~lukeshu/not-working/codeanalyst/PKGBUILD | 91 -- .../not-working/codeanalyst/codeanalyst.desktop | 9 - .../not-working/codeanalyst/codeanalyst.install | 29 - ~lukeshu/not-working/codeanalyst/codeanalyst.sudo | 1 - ~lukeshu/not-working/codeanalyst/codeanalyst.svg | 59 - ~lukeshu/not-working/codeanalyst/gcc47.patch | 72 - ~lukeshu/not-working/codeanalyst/kernel3.4.patch | 72 - ~lukeshu/not-working/codeanalyst/skipSetup.patch | 68 - ~lukeshu/openni-all/openni-git/PKGBUILD | 286 ---- ~lukeshu/openni-all/openni-git/openni.install | 11 - .../openni-module-primesensor-git/PKGBUILD | 65 - .../openni-module-sensorkinect-git/PKGBUILD | 77 -- .../sensorkinect.install | 15 - ~lukeshu/openni-all/openni-unstable-git/PKGBUILD | 286 ---- .../openni-all/openni-unstable-git/openni.install | 11 - ~lukeshu/openni-all/openni-unstable/PKGBUILD | 294 ----- .../openni-all/openni-unstable/openni-core.install | 11 - .../openni-all/openni-unstable/openni-mono.install | 7 - ~lukeshu/openni-all/openni/PKGBUILD | 288 ---- ~lukeshu/openni-all/openni/openni.install | 11 - 239 files changed, 1617 insertions(+), 5506 deletions(-) create mode 100644 community/celt0.5.1/PKGBUILD create mode 100644 community/libvirt-glib/PKGBUILD delete mode 100644 community/smc/PKGBUILD delete mode 100644 community/smc/boost_filesystem3.diff delete mode 100644 community/smc/smc-for-cegui-v0-7.diff delete mode 100644 community/smc/smc.desktop delete mode 100644 community/smc/smc.png create mode 100644 community/spice-gtk3/PKGBUILD create mode 100644 community/spice/PKGBUILD create mode 100644 community/usbredir/PKGBUILD delete mode 100644 extra/freenx/PKGBUILD delete mode 100644 extra/freenx/freenx-latest-svn.patch delete mode 100644 extra/freenx/freenx-server-0.7.3-nxipp.patch delete mode 100644 extra/freenx/freenx.install delete mode 100644 extra/freenx/keymap.patch delete mode 100644 extra/freenx/nxagent-startup.patch delete mode 100644 extra/freenx/remove-dialog.patch create mode 100644 extra/gnome-alsamixer/02_change_gconf-keys_path.diff create mode 100644 extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff create mode 100644 extra/gnome-alsamixer/04_ignore-delimiters.diff create mode 100644 extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch create mode 100644 extra/gnome-alsamixer/06-use-libgnome-headers.patch delete mode 100644 extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch create mode 100644 extra/gnome-alsamixer/gnome-alsamixer.install create mode 100644 extra/kdebase-workspace/fix-plasma-memory-leak.patch delete mode 100644 extra/kdebindings-korundum/ruby19.patch delete mode 100644 extra/libxi/git-fixes.diff delete mode 100644 extra/nx-common/NXproto.h.64bit.diff delete mode 100644 extra/nx-common/PKGBUILD delete mode 100644 extra/nx-common/nx-3.5.0-libpng15.patch delete mode 100644 extra/nx-common/nxcompsh-gcc43.patch delete mode 100644 extra/opennx/PKGBUILD delete mode 100644 java/not-working/closure-compiler/PKGBUILD delete mode 100644 java/not-working/closure-compiler/TODO delete mode 100644 java/not-working/java-asm4/PKGBUILD delete mode 100644 java/not-working/java-asm4/TODO delete mode 100644 java/not-working/java-guava/PKGBUILD delete mode 100644 java/not-working/java-guava/TODO delete mode 100644 java/not-working/junit-truth/PKGBUILD delete mode 100644 java/not-working/junit-truth/TODO delete mode 100644 java/not-working/protobuf/PKGBUILD delete mode 100644 java/not-working/protobuf/TODO create mode 100644 pcr/hiredis/ChangeLog create mode 100644 pcr/hiredis/PKGBUILD create mode 100644 pcr/kamailio/PKGBUILD create mode 100644 pcr/par/PKGBUILD create mode 100644 pcr/radiusclient-ng/PKGBUILD delete mode 100644 pcr/ruby-haml/ruby-yard/PKGBUILD delete mode 100755 ~lukeshu/not-working/codeanalyst/PKGBUILD delete mode 100755 ~lukeshu/not-working/codeanalyst/codeanalyst.desktop delete mode 100755 ~lukeshu/not-working/codeanalyst/codeanalyst.install delete mode 100755 ~lukeshu/not-working/codeanalyst/codeanalyst.sudo delete mode 100755 ~lukeshu/not-working/codeanalyst/codeanalyst.svg delete mode 100755 ~lukeshu/not-working/codeanalyst/gcc47.patch delete mode 100644 ~lukeshu/not-working/codeanalyst/kernel3.4.patch delete mode 100755 ~lukeshu/not-working/codeanalyst/skipSetup.patch delete mode 100644 ~lukeshu/openni-all/openni-git/PKGBUILD delete mode 100644 ~lukeshu/openni-all/openni-git/openni.install delete mode 100644 ~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD delete mode 100644 ~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD delete mode 100644 ~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install delete mode 100644 ~lukeshu/openni-all/openni-unstable-git/PKGBUILD delete mode 100644 ~lukeshu/openni-all/openni-unstable-git/openni.install delete mode 100644 ~lukeshu/openni-all/openni-unstable/PKGBUILD delete mode 100644 ~lukeshu/openni-all/openni-unstable/openni-core.install delete mode 100644 ~lukeshu/openni-all/openni-unstable/openni-mono.install delete mode 100644 ~lukeshu/openni-all/openni/PKGBUILD delete mode 100644 ~lukeshu/openni-all/openni/openni.install (limited to 'core') diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 1b1e71bbb..99a1f8681 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91555 2013-05-23 15:08:13Z spupykin $ +# $Id: PKGBUILD 93409 2013-07-03 10:50:24Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jens Pranaitis pkgname=busybox -pkgver=1.20.2 -pkgrel=5 +pkgver=1.21.1 +pkgrel=1 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") url="http://www.busybox.net" @@ -13,8 +13,8 @@ makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 config) install=busybox.install -md5sums=('e025414bc6cd79579cc7a32a45d3ae1c' - '09d4562ee4a9ab5415be44b945bfc7e2') +md5sums=('795394f83903b5eec6567d51eebb417e' + '3fbd88dc6327ff0455c17409efdbab79') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install index 7bf2a83ac..04beb0630 100644 --- a/community/busybox/busybox.install +++ b/community/busybox/busybox.install @@ -10,5 +10,5 @@ pre_upgrade() { post_upgrade() { [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` usr/bin/busybox busybox rm -f tmp/busybox.upgrade.script - echo "busybox is un /usr/bin now. Readjust its mode if you modified it." + echo "busybox is in /usr/bin now. Readjust its mode if you modified it." } diff --git a/community/busybox/config b/community/busybox/config index 197f11f8b..b89c59b12 100644 --- a/community/busybox/config +++ b/community/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.2 -# Sun Jul 8 21:35:17 2012 +# Busybox version: 1.21.1 +# Wed Jul 3 14:35:32 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/run" CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y @@ -49,7 +50,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_USE_TERMIOS=y @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -375,7 +378,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set CONFIG_CMP=y @@ -616,9 +618,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_HFS=y CONFIG_FEATURE_VOLUMEID_JFS=y CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_UDF=y @@ -626,6 +630,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y CONFIG_FEATURE_VOLUMEID_OCFS2=y CONFIG_FEATURE_VOLUMEID_LINUXRAID=y @@ -898,6 +903,13 @@ CONFIG_POWERTOP=y CONFIG_PSTREE=y CONFIG_PWDX=y CONFIG_SMEMCAP=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_FREE=y @@ -918,13 +930,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -CONFIG_FEATURE_TOPMEM=y # CONFIG_FEATURE_SHOW_THREADS is not set CONFIG_WATCH=y @@ -1019,6 +1024,11 @@ CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_FEATURE_KMSG_SYSLOG=y CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# CONFIG_FEATURE_KLOGD_KLOGCTL=y CONFIG_LOGGER=y diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD index 129fa3fc9..09198d579 100644 --- a/community/calc/PKGBUILD +++ b/community/calc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61256 2011-12-26 12:59:57Z spupykin $ +# $Id: PKGBUILD 93457 2013-07-03 13:50:16Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=calc -pkgver=2.12.4.4 +pkgver=2.12.4.8 pkgrel=1 pkgdesc="console calculator" arch=(i686 x86_64) @@ -12,7 +12,7 @@ license=('GPL') depends=(glibc) #source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2) -md5sums=('1ad16a9304df7137cd8626a1f50b6aae') +md5sums=('38694f375e172f0b830d4dbf9d6f2dcc') build() { cd $srcdir/calc-$pkgver @@ -53,6 +53,10 @@ build() { EOF make -j1 +} + +package() { + cd $srcdir/calc-$pkgver make T=$pkgdir install mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/ } diff --git a/community/celt0.5.1/PKGBUILD b/community/celt0.5.1/PKGBUILD new file mode 100644 index 000000000..f2a4fa2e5 --- /dev/null +++ b/community/celt0.5.1/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor: Lauri Niskanen +# Contributor: Ray Rashif +# Contributor: Jon Nordby + +pkgname=celt0.5.1 +_basename=celt +pkgver=0.5.1.3 +pkgrel=1 +pkgdesc="Low-latency audio communication codec - SPICE version" +arch=(i686 x86_64) +url="http://www.celt-codec.org" +license=('BSD') +depends=('libogg') +provides=('celt=0.5.1') +options=('!libtool') +source=(http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz) +md5sums=('67e7b5e45db57a6f1f0a6962f5ecb190') + +build() { + cd "$srcdir/celt-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/celt-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/BSD" +} diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index f193f2ea9..bfe8cfe44 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92241 2013-06-03 10:26:07Z spupykin $ +# $Id: PKGBUILD 93423 2013-07-03 11:48:53Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sebastian Faltoni pkgname=dbmail pkgver=3.0.3pre -pkgrel=1 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -12,7 +12,8 @@ makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8. 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git') optdepends=('libldap: for LDAP authentication' - 'libsieve: for dbmail-sieve') + 'libsieve: for dbmail-sieve' + 'python2-mysql2pgsql: migrate from MySQL to PostreSQL') url="http://www.dbmail.org" license=('GPL') options=('!libtool' 'zipman') @@ -58,6 +59,7 @@ package() { install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample mkdir $pkgdir/usr/share/dbmail cp -r sql/* $pkgdir/usr/share/dbmail/ + cp -a contrib $pkgdir/usr/share/dbmail/ cp dbmail.schema $pkgdir/usr/share/dbmail/ for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD index 7a5f4fddf..a255ab991 100644 --- a/community/fcitx-libpinyin/PKGBUILD +++ b/community/fcitx-libpinyin/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 93367 2013-07-02 09:47:24Z fyan $ +# $Id: PKGBUILD 93398 2013-07-03 05:13:18Z fyan $ # Maintainer: Felix Yan # Contributor: poplarch pkgname=fcitx-libpinyin pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin" arch=('i686' 'x86_64') url="https://github.com/fcitx/fcitx-libpinyin" license=('GPL') depends=('fcitx' 'libpinyin' 'fcitx-qt4' 'qtwebkit') makedepends=('cmake' 'intltool' 'wget') -source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz" + "https://github.com/fcitx/fcitx-libpinyin/commit/7a68b40e36bd3425dae847a3860057a951ec5e78.patch") install=$pkgname.install build() { cd "$srcdir/${pkgname}-${pkgver}" + # Fix importdict + patch -p1 -i ../7a68b40e36bd3425dae847a3860057a951ec5e78.patch + rm -rf build mkdir build cd build @@ -32,4 +36,5 @@ package() { make DESTDIR="${pkgdir}" install } -sha512sums=('e80e15a51f0d7de20abc4877d32796bbd93f30a2e4383bd64bccf1075696dddb2d0ea0180fff44ebee0e94988ab60e3d2526dd3f80bb99f4186e1bf4e3437762') +sha512sums=('e80e15a51f0d7de20abc4877d32796bbd93f30a2e4383bd64bccf1075696dddb2d0ea0180fff44ebee0e94988ab60e3d2526dd3f80bb99f4186e1bf4e3437762' + '0b4776d348db9616d9bd4485fe7950a5c88f349388a4dc97e0ec62beaf0d6729ba88c645b1f83d415af8c5808cde3aae4b8306fd65e21bd404e9a8105d5bcae0') diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 050c3bc2c..9ba45c2a7 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92950 2013-06-20 08:29:35Z bluewind $ +# $Id: PKGBUILD 93466 2013-07-03 21:46:52Z bluewind $ # Contributor: Alexander Fehr # Maintainer: Daniel J Griffiths pkgname=filezilla -pkgver=3.7.1 +pkgver=3.7.1.1 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('be19e8c157e81f94048ed3b1e3031b07') +md5sums=('52c6f764b2f4a94b1781da42b2bbb9b5') diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD index 0c64c1d6d..c046302a6 100644 --- a/community/gnome-screensaver/PKGBUILD +++ b/community/gnome-screensaver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88685 2013-04-21 22:16:59Z heftig $ +# $Id: PKGBUILD 93459 2013-07-03 14:24:20Z bgyorgy $ # Maintainer: Balló György # Contributor: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-screensaver pkgver=3.6.1 -pkgrel=3 +pkgrel=4 pkgdesc="Legacy GNOME screensaver" arch=('i686' 'x86_64') license=('GPL') @@ -13,6 +13,7 @@ url="http://live.gnome.org/GnomeScreensaver" backup=(etc/pam.d/gnome-screensaver) depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop') makedepends=('intltool' 'gnome-common') +optdepends=('gnome-themes-standard: default background') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam move-desktop-file.patch diff --git a/community/gwget/PKGBUILD b/community/gwget/PKGBUILD index ff888ec34..d51d4d328 100644 --- a/community/gwget/PKGBUILD +++ b/community/gwget/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70413 2012-05-05 16:24:44Z bgyorgy $ +# $Id: PKGBUILD 93450 2013-07-03 13:33:10Z bgyorgy $ # Maintainer: Balló György # Contributor: Allan McRae # Contributor: Aaron, phrakture, Griffin @@ -7,7 +7,7 @@ pkgname=gwget pkgver=1.0.4 -pkgrel=5 +pkgrel=6 pkgdesc="Download manager for GNOME" arch=('i686' 'x86_64') url="http://projects.gnome.org/gwget/" @@ -22,7 +22,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f' '84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76' '319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8' - '72506677886deb5fc2436c667e2f79ed868ce9384cad77b9a97ec68e41ae45c3') + '465216f441271fffdd4530bc07829e733e0d3476fdc34f1f028da82cfc05373d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gwget/drop-libgnomeui.patch b/community/gwget/drop-libgnomeui.patch index 30a121f25..7f1f551a6 100644 --- a/community/gwget/drop-libgnomeui.patch +++ b/community/gwget/drop-libgnomeui.patch @@ -1,6 +1,6 @@ diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac ---- gwget-1.0.4.orig/configure.ac 2009-10-17 22:26:09.000000000 +0200 -+++ gwget-1.0.4/configure.ac 2012-03-10 01:09:09.246869284 +0100 +--- gwget-1.0.4.orig/configure.ac 2013-07-03 14:43:02.845220000 +0200 ++++ gwget-1.0.4/configure.ac 2013-07-03 14:43:57.003180469 +0200 @@ -14,15 +14,13 @@ AM_GCONF_SOURCE_2 @@ -21,7 +21,7 @@ diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/src/custom-cell-renderer-progressbar.c --- gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c 2009-06-16 19:58:06.000000000 +0200 -+++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c 2012-03-10 01:09:09.260201828 +0100 ++++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c 2013-07-03 14:43:57.003180469 +0200 @@ -21,8 +21,8 @@ #include @@ -35,7 +35,7 @@ diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/s diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-application.c --- gwget-1.0.4.orig/src/gwget-application.c 2009-06-20 10:12:37.000000000 +0200 -+++ gwget-1.0.4/src/gwget-application.c 2012-03-10 01:09:09.263534966 +0100 ++++ gwget-1.0.4/src/gwget-application.c 2013-07-03 14:43:57.003180469 +0200 @@ -21,8 +21,6 @@ #include "gwget-application.h" @@ -95,7 +95,7 @@ diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-applic diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c --- gwget-1.0.4.orig/src/main.c 2009-06-20 10:12:37.000000000 +0200 -+++ gwget-1.0.4/src/main.c 2012-03-10 01:09:09.273534378 +0100 ++++ gwget-1.0.4/src/main.c 2013-07-03 14:43:57.003180469 +0200 @@ -17,11 +17,13 @@ #include @@ -146,7 +146,7 @@ diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c } diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c --- gwget-1.0.4.orig/src/main_window.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/main_window.c 2012-03-10 01:09:09.276867514 +0100 ++++ gwget-1.0.4/src/main_window.c 2013-07-03 14:46:01.992833090 +0200 @@ -15,7 +15,9 @@ */ @@ -158,9 +158,46 @@ diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c #include #include #include +@@ -118,20 +120,22 @@ + toolbar = GTK_WIDGET (gtk_builder_get_object(builder,"toolbar1")); + toolbar_setting = gconf_client_get_string(gconf_client,"/desktop/gnome/interface/toolbar_style",NULL); + +- if (!strcmp(toolbar_setting,"icons")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_ICONS); +- } +- +- if (!strcmp(toolbar_setting,"both")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH); +- } +- +- if (!strcmp(toolbar_setting,"both-horiz")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH_HORIZ); +- } +- +- if (!strcmp(toolbar_setting,"text")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_TEXT); ++ if (toolbar_setting!=NULL) { ++ if (!strcmp(toolbar_setting,"icons")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_ICONS); ++ } ++ ++ if (!strcmp(toolbar_setting,"both")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH); ++ } ++ ++ if (!strcmp(toolbar_setting,"both-horiz")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH_HORIZ); ++ } ++ ++ if (!strcmp(toolbar_setting,"text")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_TEXT); ++ } + } + + /* Listen to changes to the key. */ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.c --- gwget-1.0.4.orig/src/main_window_cb.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/main_window_cb.c 2012-03-10 01:07:57.131122811 +0100 ++++ gwget-1.0.4/src/main_window_cb.c 2013-07-03 14:43:57.003180469 +0200 @@ -15,7 +15,9 @@ */ @@ -172,7 +209,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. #include #include -@@ -217,7 +220,10 @@ +@@ -217,7 +219,10 @@ gchar *size; int width = 16, height = 16; gdouble perc; @@ -184,7 +221,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. gtk_list_store_append (GTK_LIST_STORE(model), &iter); size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024); gtk_list_store_set (GTK_LIST_STORE(model), &iter,URL_COLUMN,gwgetdata->url, -@@ -243,10 +249,15 @@ +@@ -243,10 +248,15 @@ theme = gtk_icon_theme_get_default (); if (!gwgetdata->recursive) { content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL); @@ -205,7 +242,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. width *= 2; diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c --- gwget-1.0.4.orig/src/new_window.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/new_window.c 2012-03-10 01:09:09.283533785 +0100 ++++ gwget-1.0.4/src/new_window.c 2013-07-03 14:43:57.003180469 +0200 @@ -24,7 +24,8 @@ */ @@ -217,8 +254,8 @@ diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c #include "new_window.h" #include "main_window.h" diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c ---- gwget-1.0.4.orig/src/systray.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/systray.c 2012-03-10 01:09:09.290200060 +0100 +--- gwget-1.0.4.orig/src/systray.c 2013-07-03 14:43:02.845220000 +0200 ++++ gwget-1.0.4/src/systray.c 2013-07-03 14:43:57.006513881 +0200 @@ -1,6 +1,7 @@ #include @@ -230,7 +267,7 @@ diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c #include "systray.h" diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c --- gwget-1.0.4.orig/src/utils.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/utils.c 2012-03-10 01:09:09.296866335 +0100 ++++ gwget-1.0.4/src/utils.c 2013-07-03 14:43:57.006513881 +0200 @@ -14,7 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -243,7 +280,7 @@ diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c #include "gwget_data.h" diff -Naur gwget-1.0.4.orig/src/wget-log.c gwget-1.0.4/src/wget-log.c --- gwget-1.0.4.orig/src/wget-log.c 2009-10-04 20:29:35.000000000 +0200 -+++ gwget-1.0.4/src/wget-log.c 2012-03-10 01:09:09.306865743 +0100 ++++ gwget-1.0.4/src/wget-log.c 2013-07-03 14:43:57.006513881 +0200 @@ -25,7 +25,9 @@ #define _FILE_OFFSET_BITS 64 diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD index 4eb8fb140..a60ccc44f 100644 --- a/community/krecipes/PKGBUILD +++ b/community/krecipes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87005 2013-03-25 19:16:45Z bpiotrowski $ +# $Id: PKGBUILD 93464 2013-07-03 19:08:14Z lcarlier $ # Maintainer: Andrea Scarpino # Contributor: shamrok # Contributor: G_Syme @@ -7,14 +7,14 @@ pkgname=krecipes pkgver=2.0beta2 _pkgver=2.0-beta2 -pkgrel=3 +pkgrel=4 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy" arch=('i686' 'x86_64') url="http://extragear.kde.org/apps/krecipes/" license=('GPL') depends=('kdebase-runtime' 'qimageblitz' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4' 'docbook-xsl') -optdepends=('matriadb' 'postgresql') +optdepends=('mariadb' 'postgresql') install=${pkgname}.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz) md5sums=('4c01ccad7ad1409cb35c824a61250fe2') diff --git a/community/libvirt-glib/PKGBUILD b/community/libvirt-glib/PKGBUILD new file mode 100644 index 000000000..f04454542 --- /dev/null +++ b/community/libvirt-glib/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 93427 2013-07-03 12:11:24Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Stefano Facchini + +pkgname=libvirt-glib +pkgver=0.1.6 +pkgrel=1 +pkgdesc="GLib bindings for libvirt" +arch=('i686' 'x86_64') +url="http://libvirt.org" +license=('LGPL2.1') +depends=('libvirt' 'glib2' 'gobject-introspection' 'python2') +options=('!libtool') +source=(ftp://libvirt.org/libvirt/glib/$pkgname-$pkgver.tar.gz) +sha256sums=('274b88584db94bb5d404e5398d6b5ef184afad49a2e4b3f4f6c47ba940bf55bf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python2-fonttools/PKGBUILD b/community/python2-fonttools/PKGBUILD index ea307d2f5..424946513 100644 --- a/community/python2-fonttools/PKGBUILD +++ b/community/python2-fonttools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76250 2012-09-15 08:59:17Z aginiewicz $ +# $Id: PKGBUILD 93407 2013-07-03 09:46:05Z aginiewicz $ # Maintainer: Andrzej Giniewicz # Contributor: Firmicus pkgname=python2-fonttools -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="Converts OpenType and TrueType fonts to and from XML" url="http://sourceforge.net/projects/fonttools/" @@ -14,7 +14,7 @@ makedepends=("python2-distribute") provides=('fonttools') # temporary compatibility because of rename replaces=('fonttools') source=(http://downloads.sourceforge.net/fonttools/fonttools-$pkgver.tar.gz) -md5sums=('502cdf6662e1d075f1902fbd995eaace') +md5sums=('41b2d2be48214d2af848e04fded54689') build() { cd "$srcdir"/fonttools-$pkgver diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD deleted file mode 100644 index 1ded32b4f..000000000 --- a/community/smc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 90091 2013-05-06 19:39:36Z foutrelis $ -# Maintainer: Sven-Hendrik Haase -# Contributor: Juergen Hoetzel -# Contributor: Kritoke - -pkgname=smc -pkgver=1.9 -pkgrel=21 -pkgdesc="Secret Maryo Chronicles" -arch=('i686' 'x86_64') -url="http://www.secretmaryo.org/" -license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') -makedepends=('autoconf' 'automake' 'boost') -source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 - smc-for-cegui-v0-7.diff - boost_filesystem3.diff - smc.desktop - smc.png) -md5sums=('75ab7826303c49aec25b052a8b90287f' - '51dfea21b741ad19df14e738df52f1cf' - '309a5a6d4b3c0b3dc5e1b7f4de84086f' - '80fe208132ff41dd7677a53ee429ecdb' - 'efca7580e28748625eb676c9d24ee122') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # to remove when smc will be compatible with cegui-0.7.x - patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff" - # fix compilation - export CXXFLAGS="${CXXFLAGS} -fpermissive" - # fix for boost >= 1.50 - patch -Np1 -i "${srcdir}/boost_filesystem3.diff" - - ./autogen.sh - LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make install DESTDIR="$pkgdir" - # install some freedesktop.org compatibility - install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - - rm -rf "$pkgdir/usr/share/smc/" -} diff --git a/community/smc/boost_filesystem3.diff b/community/smc/boost_filesystem3.diff deleted file mode 100644 index 6786b98f5..000000000 --- a/community/smc/boost_filesystem3.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -rup smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new/src/core/filesystem/filesystem.cpp ---- smc-1.9/src/core/filesystem/filesystem.cpp 2009-07-04 12:11:18.000000000 +0200 -+++ smc-1.9.new/src/core/filesystem/filesystem.cpp 2012-07-12 15:36:31.361941069 +0200 -@@ -142,27 +142,27 @@ vector Get_Directory_Files( - if( fs::is_directory( *dir_itr ) ) - { - // ignore hidden directories -- if( dir_itr->path().leaf().find( "." ) == 0 ) -+ if( dir_itr->path().filename().string().find( "." ) == 0 ) - { - continue; - } - - if( with_directories ) - { -- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); -+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); - } - - // load all items from the sub-directory - if( search_in_sub_directories ) - { -- vector new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories ); -+ vector new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories ); - valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() ); - } - } - // valid file -- else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos ) -+ else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos ) - { -- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); -+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); - } - } - catch( const std::exception &ex ) -diff -rup smc-1.9/src/overworld/world_manager.cpp smc-1.9.new/src/overworld/world_manager.cpp ---- smc-1.9/src/overworld/world_manager.cpp 2009-08-16 18:44:52.000000000 +0200 -+++ smc-1.9.new/src/overworld/world_manager.cpp 2012-07-12 15:37:13.564660591 +0200 -@@ -118,7 +118,7 @@ void cOverworld_Manager :: Load_Dir( con - { - try - { -- std::string current_dir = dir_itr->path().leaf(); -+ std::string current_dir = dir_itr->path().filename().string(); - - // only directories with an existing description - if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) ) diff --git a/community/smc/smc-for-cegui-v0-7.diff b/community/smc/smc-for-cegui-v0-7.diff deleted file mode 100644 index a99cbce6c..000000000 --- a/community/smc/smc-for-cegui-v0-7.diff +++ /dev/null @@ -1,437 +0,0 @@ -diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac ---- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 -+++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 -@@ -53,7 +53,7 @@ - AC_MSG_ERROR([SDL_ttf library not found])) - - # Check for the CEGUI library --PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) -+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) - CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" - LIBS="$LIBS $CEGUI_LIBS" - -diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp ---- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 -+++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 -@@ -118,16 +118,10 @@ - return tmp; - } - --void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const -+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const - { - // draw text -- list_text->draw( position, alpha, clipper ); --} -- --void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const --{ -- // draw text -- list_text->draw( cache, targetRect, zBase, alpha, clipper ); -+ list_text->draw( buffer, targetRect, alpha, clipper ); - } - - void cEditor_Item_Object :: Draw_Image( void ) -@@ -533,12 +527,12 @@ - if( editor_window->getXPosition().asRelative( 1 ) >= 0 ) - { - // Listbox dimension -- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley; -- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley; -+ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley; -+ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley; - // Vertical ScrollBar Position - float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley; - // font height -- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley; -+ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley; - - // draw items - for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ ) -diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h ---- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 -+++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 -@@ -62,8 +62,7 @@ - */ - virtual CEGUI::Size getPixelSize( void ) const; - // draw -- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const; -- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const; -+ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const; - // draw image - void Draw_Image( void ); - -diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp ---- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 -+++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 -@@ -265,7 +265,7 @@ - - - // align text -- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); -+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); - // fixme : Can't handle multiple lines of text - float text_width = font->getTextExtent( text ) * global_downscalex; - -@@ -1182,7 +1182,7 @@ - text_default->setText( gui_text ); - - // align text -- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); -+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); - float text_width = font->getTextExtent( gui_text ) * global_downscalex; - - text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) ); -@@ -1190,7 +1190,7 @@ - text_default->moveToFront(); - - // set window height -- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) ); -+ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) ); - - while( draw ) - { -diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp ---- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 -+++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 -@@ -444,13 +444,15 @@ - - if( pGuiSystem ) - { -- delete pGuiSystem; -+ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); -+ pGuiSystem->destroy(); - pGuiSystem = NULL; -+ delete rp; - } - - if( pGuiRenderer ) - { -- delete pGuiRenderer; -+ pGuiRenderer->destroy( *pGuiRenderer ); - pGuiRenderer = NULL; - } - -@@ -507,7 +509,7 @@ - } - case SDL_VIDEORESIZE: - { -- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast(ev->resize.w), static_cast(ev->resize.h) ) ); -+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast(ev->resize.w), static_cast(ev->resize.h) ) ); - break; - } - case SDL_KEYDOWN: -diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp ---- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 -+++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 -@@ -946,7 +946,7 @@ - m_text_debug_text->setVisible( 1 ); - - // update position -- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); -+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); - float text_width = font->getTextExtent( gui_text ) * global_downscalex; - - if( text_width > 800.0f ) -diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp ---- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 -+++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -432,17 +432,12 @@ - - void cMouseCursor :: Render( void ) const - { -- if( !m_active ) -- { -+ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr(); -+ -+ if ( m_active == mouse->isVisible() ) - return; -- } - -- // Render CEGUI Mouse -- pGuiRenderer->setQueueingEnabled( 0 ); -- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr(); -- mouse->setVisible( 1 ); -- mouse->draw(); -- mouse->setVisible( 0 ); -+ mouse->setVisible( m_active ); - } - - void cMouseCursor :: Update_Position( void ) -diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp ---- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 -+++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 -@@ -163,8 +163,8 @@ - editbox->setText( int_to_string( bg_color_2.blue ).c_str() ); - // preview window - CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" ); -- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 ); -- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 ); -+ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 ); -+ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 ); - - Update_BG_Colors( CEGUI::EventArgs() ); - -@@ -555,8 +555,8 @@ - - // set default rect - CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" ); -- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex; -- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley; -+ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex; -+ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley; - - if( !File_Exists( filename ) ) - { -diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp ---- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 -+++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -1663,7 +1663,7 @@ - window_name->setText( name ); - window_name->setTooltipText( tooltip ); - // get text width -- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); -+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); - float text_width = 12 + font->getTextExtent( name ) * global_downscalex; - // all names should have the same width - if( text_width > m_editor_window_name_width ) -diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp ---- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 -+++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 -@@ -103,15 +103,15 @@ - - /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */ - --cFake_Renderer :: cFake_Renderer( void ) --{ -- d_identifierString = "Fake Renderer"; --} -+//cFake_Renderer :: cFake_Renderer( void ) -+//{ -+// d_identifierString = "Fake Renderer"; -+//} - --cFake_Renderer :: ~cFake_Renderer( void ) --{ -+//cFake_Renderer :: ~cFake_Renderer( void ) -+//{ - --} -+//} - - /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */ - -@@ -158,7 +158,7 @@ - std::string log_dump_dir = "/dev/null"; - #endif - // create fake system and renderer -- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir ); -+ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir ); - } - - void cVideo :: Delete_CEGUI_Fake( void ) const -@@ -166,7 +166,7 @@ - CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider(); - CEGUI::Renderer *renderer = pGuiSystem->getRenderer(); - -- delete pGuiSystem; -+ pGuiSystem->destroy(); - pGuiSystem = NULL; - delete renderer; - delete rp; -@@ -177,7 +177,7 @@ - // create renderer - try - { -- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h ); -+ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) ); - } - // catch CEGUI Exceptions - catch( CEGUI::Exception &ex ) -@@ -186,10 +186,10 @@ - exit( EXIT_FAILURE ); - } - -- /* create Resource Provider -- * no need to destroy it later since it is handled by the CEGUI renderer -- */ -- CEGUI::DefaultResourceProvider *rp = static_cast(pGuiRenderer->createResourceProvider()); -+ pGuiRenderer->enableExtraStateSettings(true); -+ -+ // create Resource Provider -+ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider; - - // set Resource Provider directories - rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" ); -@@ -215,7 +215,7 @@ - // create system - try - { -- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" ); -+ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" ); - } - // catch CEGUI Exceptions - catch( CEGUI::Exception &ex ) -@@ -242,7 +242,7 @@ - // load the scheme file, which auto-loads the imageset - try - { -- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" ); -+ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" ); - } - // catch CEGUI Exceptions - catch( CEGUI::Exception &ex ) -@@ -254,9 +254,7 @@ - // default mouse cursor - pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" ); - // force new mouse image -- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) ); -- // hide CEGUI mouse always because we render it manually -- CEGUI::MouseCursor::getSingleton().hide(); -+ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) ); - // default tooltip - pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" ); - // create default root window -@@ -553,7 +551,7 @@ - pFont->Restore_Textures(); - - // send new size to CEGUI -- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast(screen_w), static_cast(screen_h) ) ); -+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast(screen_w), static_cast(screen_h) ) ); - - // check if CEGUI is initialized - bool cegui_initialized = pGuiSystem->getGUISheet() != NULL; -diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h ---- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 -+++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 -@@ -23,7 +23,7 @@ - #include "SDL_opengl.h" - // CEGUI - #include "CEGUI.h" --#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h" -+#include - - namespace SMC - { -@@ -129,31 +129,100 @@ - EFFECT_IN_AMOUNT - }; - --/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */ -+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */ -+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did... -+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer -+{ -+ void draw() const {} -+ void setTranslation(const CEGUI::Vector3&) {} -+ void setRotation(const CEGUI::Vector3&) {} -+ void setPivot(const CEGUI::Vector3&) {} -+ void setClippingRegion(const CEGUI::Rect&) {} -+ void appendVertex(const CEGUI::Vertex&) {} -+ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {} -+ void setActiveTexture(CEGUI::Texture*) {} -+ void reset() {} -+ CEGUI::Texture* getActiveTexture() const { return 0; } -+ CEGUI::uint getVertexCount() const { return 0; } -+ CEGUI::uint getBatchCount() const { return 0; } -+ void setRenderEffect(CEGUI::RenderEffect*) {} -+ CEGUI::RenderEffect* getRenderEffect() { return 0; } -+}; - --class cFake_Renderer : public CEGUI::Renderer -+class cFake_Texture : public CEGUI::Texture -+{ -+public: -+ cFake_Texture() : -+ m_size(1, 1), -+ m_scaling(1, 1) {} -+ -+ const CEGUI::Size& getSize() const { return m_size; } -+ const CEGUI::Size& getOriginalDataSize() const { return m_size; } -+ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; } -+ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {} -+ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {} -+ void saveToMemory(void*) {} -+ -+private: -+ CEGUI::Size m_size; -+ CEGUI::Vector2 m_scaling; -+}; -+ -+class cFake_RenderTarget : public CEGUI::RenderTarget - { - public: -- cFake_Renderer( void ); -- virtual ~cFake_Renderer( void ); -+ cFake_RenderTarget() : m_area(0, 0, 0, 0) {} -+ void draw(const CEGUI::GeometryBuffer&) {} -+ void draw(const CEGUI::RenderQueue&) {} -+ void setArea(const CEGUI::Rect&) {} -+ const CEGUI::Rect& getArea() const { return m_area; } -+ bool isImageryCache() const { return false; } -+ void activate() {} -+ void deactivate() {} -+ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {} -+ -+private: -+ CEGUI::Rect m_area; -+}; - -- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {}; -- virtual void doRender(void) {}; -- virtual void clearRenderList(void) {}; -- virtual void setQueueingEnabled(bool setting) {}; -- virtual CEGUI::Texture *createTexture(void) { return NULL; }; -- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; }; -- virtual CEGUI::Texture *createTexture(float size) { return NULL; }; -- virtual void destroyTexture(CEGUI::Texture* texture) {}; -- virtual void destroyAllTextures(void) {}; -- virtual bool isQueueingEnabled(void) const { return 0; }; -- virtual float getWidth(void) const { return 0; }; -- virtual float getHeight(void) const { return 0; }; -- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();}; -- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();}; -- virtual unsigned int getMaxTextureSize(void) const { return 0; }; -- virtual unsigned int getHorzScreenDPI(void) const { return 0; }; -- virtual unsigned int getVertScreenDPI(void) const { return 0; }; -+class cFake_Renderer : public CEGUI::Renderer -+{ -+public: -+ cFake_Renderer( void ) : -+ m_size(0, 0), -+ m_dpi(0, 0), -+ m_identifierString("Fake Renderer"), -+ m_root(m_target) {} -+ ~cFake_Renderer( void ) {} -+ -+ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; } -+ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; } -+ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {} -+ void destroyAllGeometryBuffers() {} -+ CEGUI::TextureTarget* createTextureTarget() { return 0; } -+ void destroyTextureTarget(CEGUI::TextureTarget*) {} -+ void destroyAllTextureTargets() {} -+ CEGUI::Texture& createTexture() { return m_texture; } -+ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; } -+ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; } -+ void destroyTexture(CEGUI::Texture&) {} -+ void destroyAllTextures() {} -+ void beginRendering() {} -+ void endRendering() {} -+ void setDisplaySize(const CEGUI::Size&) {} -+ const CEGUI::Size& getDisplaySize() const { return m_size; } -+ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; } -+ CEGUI::uint getMaxTextureSize() const { return 0; } -+ const CEGUI::String& getIdentifierString() const { return m_identifierString; } -+ -+private: -+ CEGUI::Size m_size; -+ CEGUI::Vector2 m_dpi; -+ CEGUI::String m_identifierString; -+ cFake_GeometryBuffer m_geometry; -+ cFake_Texture m_texture; -+ cFake_RenderTarget m_target; -+ CEGUI::RenderingRoot m_root; - }; - - /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */ diff --git a/community/smc/smc.desktop b/community/smc/smc.desktop deleted file mode 100644 index 6cfe5b018..000000000 --- a/community/smc/smc.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Secret Maryo Chronicles -GenericName=Arcade Game -Exec=smc -Icon=smc.png -Terminal=false -Type=Application -Categories=Game;ArcadeGame;KidsGame; -StartupNotify=false \ No newline at end of file diff --git a/community/smc/smc.png b/community/smc/smc.png deleted file mode 100644 index f02af1bfc..000000000 Binary files a/community/smc/smc.png and /dev/null differ diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD new file mode 100644 index 000000000..803951dfc --- /dev/null +++ b/community/spice-gtk3/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 93453 2013-07-03 13:44:50Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Stefano Facchini +# Contributor: Jonathan Lestrelin +# Derived from the spice-gtk PKGBUILD by +# Contributor: Lucio Zara + +pkgname=spice-gtk3 +pkgver=0.20 +pkgrel=2 +pkgdesc="A Gtk client and libraries for SPICE remote desktop servers (gtk3 version)." +arch=('x86_64' 'i686') +url="http://spice-space.org" +license=('GPL') +makedepends=('intltool' 'vala' 'python2-pyparsing' 'python2-gobject') +depends=('libpulse' 'gtk3' 'spice' 'libusb' 'usbredir') +conflicts=('spice-gtk') +options=('!libtool') +source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2") +sha256sums=('b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df') + +build() { + cd "$srcdir/spice-gtk-$pkgver" + sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py + ./configure --prefix=/usr \ + --with-gtk=3.0 \ + --with-python \ + --enable-vala \ + --enable-smartcard=no + make +} + +package() { + cd "$srcdir/spice-gtk-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/spice/PKGBUILD b/community/spice/PKGBUILD new file mode 100644 index 000000000..7f033c5a5 --- /dev/null +++ b/community/spice/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 93446 2013-07-03 13:23:11Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=spice +pkgver=0.12.3 +pkgrel=1 +pkgdesc="SPICE client and server" +arch=('i686' 'x86_64') +url="http://spice-space.org" +license=('GPL') +makedepends=(python2 python2-pyparsing qemu mesa) +depends=(pixman spice-protocol alsa-utils libxrandr libxinerama libsasl openssl celt0.5.1 libgl glu) +source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2) +md5sums=('f33a682892f6793169f20298b2296449') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=python2 ./configure --prefix=/usr --enable-opengl --enable-client + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/usbredir/PKGBUILD b/community/usbredir/PKGBUILD new file mode 100644 index 000000000..7668e5247 --- /dev/null +++ b/community/usbredir/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 93438 2013-07-03 12:56:12Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Stefano Facchini + +pkgname=usbredir +pkgver=0.6 +pkgrel=3 +pkgdesc="USB traffic redirection protocol" +arch=('i686' 'x86_64') +url="http://spice-space.org/page/UsbRedir" +license=('GPL2' 'LGPL2.1') +depends=('libusb') +options=(!libtool) +source=(http://spice-space.org/download/usbredir/$pkgname-$pkgver.tar.bz2) +sha256sums=('028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sbindir=/usr/bin + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index c5397f236..96ba7fe0e 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187025 2013-06-03 11:15:04Z allan $ +# $Id: PKGBUILD 189480 2013-07-03 11:36:49Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Andreas Radke pkgname=ed -pkgver=1.8 -pkgrel=2 +pkgver=1.9 +pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') @@ -13,7 +13,7 @@ depends=('glibc' 'sh') options=('!emptydirs') source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig}) install='ed.install' -md5sums=('2268d2344b3c52d23730acb2e3c942fe' +md5sums=('565b6d1d5a9a8816b9b304fc4ed9405d' 'SKIP') build() { diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index 8a3be4a9b..45a85307b 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166683 2012-09-15 15:22:53Z allan $ +# $Id: PKGBUILD 189479 2013-07-03 10:09:10Z allan $ # Maintainer: Allan McRae # Contributor: judd pkgname=make pkgver=3.82 -pkgrel=5 +pkgrel=6 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" @@ -20,15 +20,14 @@ source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} make-3.82-expensive_glob.patch make-3.82-dont-prune-intermediate.patch) md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'c78daf24f4ec5900c8f81e89a6e1cd5a' - 'c8f496b22191f9fb9420ab14c1a19a47' + 'SKIP' + '8714ba22911a58ab3eb42ac3f4c6c3bd' '662e6450e19a5acdaa5c9fcb8ad78dea' '7d01a99f389d8f08dec93ed479071ee4' 'bc12ad4d0c6e6c0e72d9fb61054f446b' 'e58d4211c5b29d7d927a304d082849e7' '45ac9e987f4bf16c0d7e1685db943917') - build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/make/make-3.82-bug30612.patch b/core/make/make-3.82-bug30612.patch index fb843bcd9..9867a15b2 100644 --- a/core/make/make-3.82-bug30612.patch +++ b/core/make/make-3.82-bug30612.patch @@ -1,4 +1,3 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c --- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 +++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 @@ -1,3 +1,4 @@ @@ -64,3 +63,29 @@ diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c /* Find and set the new end. Massage names if necessary. */ while (1) +diff --git make-3.82-orig/read.c make-3.82-fix30612/read.c +index c87d4a7..b012094 100644 +--- make-3.82-orig/read.c ++++ make-3.82-fix30612/read.c +@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, + nlen -= (n + 1) - tp; + tp = n + 1; + +- /* If we have just "lib(", part of something like +- "lib( a b)", go to the next item. */ +- if (! nlen) +- continue; +- + /* We can stop looking now. */ + break; + } + } + while (*e != '\0'); ++ ++ /* If we have just "lib(", part of something like "lib( a b)", ++ go to the next item. */ ++ if (! nlen) ++ continue; + } + } + diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 37075ff99..3c4cd5a6d 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166543 2012-09-10 09:44:48Z stephane $ +# $Id: PKGBUILD 189328 2013-07-03 01:24:05Z eric $ # Maintainer: Stéphane Gaudreault # Contributor: Andrej Gelenberg @@ -20,20 +20,25 @@ sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b' 'fcd0ebd029b305bf030983daf151a2a1ab5294af' '8a8be7c0686c6311c1ce969ba10494e704ead48c') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch + sed -i -e 's:-Werror::g' $(find -name Makefile.in) +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} CFLAGS+=" -g" # required for test-suite success - patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch ./configure --prefix=/usr --program-prefix="eu-" make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD deleted file mode 100644 index ad3660c99..000000000 --- a/extra/freenx/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# $Id: PKGBUILD 174925 2013-01-09 04:17:20Z andyrtr $ -# Maintainer: Tobias Powalowski -#Contributed: eliott , Andre Naumann - -pkgname=freenx -pkgver=0.7.3 -pkgrel=15 -pkgdesc="Free Software (GPL) Implementation of the NX Server" -arch=(i686 x86_64) -url="http://freenx.berlios.de" -license=('GPL') -depends=('nx-common' 'nx-x11>=3.5.0.17' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' - 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') -optdepends=('cups: adds printing support') -makedepends=('imake') -options=('!makeflags') -conflicts=('nxserver') -provides=('nxserver') -backup=(etc/nxserver/node.conf) -install=freenx.install -source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz - keymap.patch - nxagent-startup.patch - freenx-latest-svn.patch - remove-dialog.patch - freenx-server-0.7.3-nxipp.patch) -md5sums=('856f597e139018f7ed62713c9d6c9ed5' - 'f0867659c925f6363fb2b7661f349248' - '30dc16d8e2093ff71d5834a169ad9d00' - '788f30322783cf2c2dc833e2e4d5e8ad' - 'cae1773312506eeefe6a8de07c492bd8' - 'b3244c52a6bafc6d9b528eb4d4426e36') - -build() { - # patch and install nxserver - cd $srcdir/$pkgname-server-$pkgver - # add latest svn fixes - patch -Np3 -i ../freenx-latest-svn.patch - # patch from inside nx - patch < gentoo-nomachine.diff - # patch broken keymap remapping - patch -Np0 -i ${srcdir}/keymap.patch - # patch nxagent startup to avoid login issues - patch -Np0 -i ${srcdir}/nxagent-startup.patch - # check for cups existance and then symlinks the backend - patch -Np1 -i ${srcdir}/freenx-server-0.7.3-nxipp.patch - # remove broken dialog function - patch -Np0 -i ${srcdir}/remove-dialog.patch - sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig - sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample - sed -i -e "s:NX_DIR\/lib:NX_DIR\/X11:" nxloadconfig - sed -i -e 's,netcat,nc,g' nxloadconfig - sed -i -e 's/utmp/nx/g' nxsetup - sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig - sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig - sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig node.conf.sample - sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig - sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig - sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup - sed -i -e 's,libXcomp.so,libXcomp.so.3,g' nxloadconfig - sed -i -e 's,libXcompext.so,libXcompext.so.3,g' nxloadconfig - sed -i -e 's,libXrender.so.1.2,libXrender.so.1.2.2:$APPLICATION_LIBRARY_PATH/libXcompsh.so.3:$APPLICATION_LIBRARY_PATH/libXcompshad.so.3,g' nxloadconfig - sed -i -e 's:NX_ETC_DIR\=$NX_DIR\/etc:NX_ETC_DIR=\/etc\/nxserver:g' nxloadconfig - sed -i -e 's:NX_SESS_DIR=$NX_DIR\/var\/db:NX_SESS_DIR=\/var\/lib\/nxserver\/db:g' nxloadconfig - sed -i -e 's:NX_HOME_DIR=$NX_DIR:NX_HOME_DIR=\/var\/lib\/nxserver:g' nxloadconfig - sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample - sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog - - # python2 fix - sed -i -e 's:\/usr\/bin\/env\ python:\/usr\/bin\/env\ python2:' nx-session-launcher/nx-session-launcher - - # fix key generation - sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup - - make -} - -package() { - cd $srcdir/$pkgname-server-$pkgver - - make install DESTDIR="${pkgdir}" - - # create symlinks - install -dm755 ${pkgdir}/usr/bin - cd ${pkgdir}/usr/bin - for file in ${pkgdir}/usr/lib/nx/bin/*; do - ln -sv /usr/lib/nx/bin/`basename $file` . - done - - mv $pkgdir/etc/nxserver/node.conf.sample $pkgdir/etc/nxserver/node.conf - - # create some missing nxserver directories - mkdir -m700 -p $pkgdir/var/lib/nxserver/{home/nx,db} - mkdir -m700 -p $pkgdir/usr/lib/nx/share - - # remove files that are part of nxclient - rm -f ${pkgdir}/usr/lib/nx/bin/nxprint - rm -f ${pkgdir}/usr/bin/nxprint -} diff --git a/extra/freenx/freenx-latest-svn.patch b/extra/freenx/freenx-latest-svn.patch deleted file mode 100644 index bcc8ddd17..000000000 --- a/extra/freenx/freenx-latest-svn.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -ur freenx-server-0.7.3//ChangeLog ../trunk/freenx-server//ChangeLog ---- freenx-server-0.7.3//ChangeLog 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//ChangeLog 2011-01-26 23:23:36.850005855 +0100 -@@ -1,3 +1,20 @@ -+xx.11.2008 FreeNX 0.7.4 -+ * Opened the 0.7.4 development. -+ * Fixed missing export of NX_ETC_DIR in Makefile, -+ so node.conf.sample is installed correctly. -+ (fabianx@bat.berlios.de) -+ * Fixed broken round-robin load balance algorithm. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ load balancing case. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ usermode case. -+ (fabianx@bat.berlios.de) -+ * Fixed non-encrypted session mode. You might need to -+ set EXTERNAL_PROXY_IP in node.conf. -+ (fabianx@bat.berlios.de) -+ - 18.08.2008 FreeNX 0.7.3 "Priscilla One Year Edition" - * Opened the 0.7.3 development. - * Added logging of failed authentication attempts -diff -ur freenx-server-0.7.3//Makefile ../trunk/freenx-server//Makefile ---- freenx-server-0.7.3//Makefile 2008-08-18 04:16:25.000000000 +0200 -+++ ../trunk/freenx-server//Makefile 2011-01-26 23:23:36.856672521 +0100 -@@ -8,7 +8,7 @@ - all: - cd nxviewer-passwd && xmkmf && make Makefiles && make depend - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - for i in $(SUBDIRS) ; \ - do\ - echo "making" all "in $$i..."; \ -@@ -44,5 +44,5 @@ - - install: - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - $(MAKE) nxenv_install -diff -ur freenx-server-0.7.3//node.conf.sample ../trunk/freenx-server//node.conf.sample ---- freenx-server-0.7.3//node.conf.sample 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//node.conf.sample 2011-01-26 23:23:36.850005855 +0100 -@@ -37,7 +37,7 @@ - # - # https://mail.kde.org/mailman/listinfo/freenx-knx - # --# SVN: $Id: node.conf.sample 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: node.conf.sample 613 2008-09-01 20:42:31Z fabianx $ - - ######################################################################### - # General FreeNX directives -@@ -47,6 +47,11 @@ - # different than the default hostname (as returned by `hostname`) - #SERVER_NAME="$(hostname)" - -+# The node ip which is used by NX Node in unecnrypted session mode. -+# Set it if you want to use a specific external ip or the autodetection -+# is not working. -+#EXTERNAL_PROXY_IP="" -+ - # The port number where local 'sshd' is listening. - #SSHD_PORT=22 - -diff -ur freenx-server-0.7.3//nxloadconfig ../trunk/freenx-server//nxloadconfig ---- freenx-server-0.7.3//nxloadconfig 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxloadconfig 2011-01-26 23:23:36.856672521 +0100 -@@ -5,7 +5,7 @@ - # - # License: GPL, version 2 - # --# SVN: $Id: nxloadconfig 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxloadconfig 613 2008-09-01 20:42:31Z fabianx $ - # - # ======================================================================== - -@@ -52,7 +52,7 @@ - # DO NOT TOUCH unless you REALLY know what you are doing - ######################################################################### - --NX_VERSION=3.2.0-73 -+NX_VERSION=3.2.0-74-SVN - NX_LICENSE="OS (GPL, using backend: %BACKEND%)" - - # Where can different nx components be found -@@ -85,6 +85,7 @@ - # General FreeNX directives - - SERVER_NAME="$(hostname)" -+EXTERNAL_PROXY_IP="" - SSHD_PORT=22 - - # Authentication / Security directives -diff -ur freenx-server-0.7.3//nxnode ../trunk/freenx-server//nxnode ---- freenx-server-0.7.3//nxnode 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxnode 2011-01-26 23:23:36.853339188 +0100 -@@ -13,7 +13,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxnode 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxnode 613 2008-09-01 20:42:31Z fabianx $ - # - # 21.06.2004: - Full reconnection support - -@@ -1184,6 +1184,17 @@ - [ -z "$userip" -a "$host" = "127.0.0.1" ] && userip="127.0.0.1" - [ -z "$userip" ] && userip="*" - fi -+ -+ # We need our own external IP -+ proxyip="$EXTERNAL_PROXY_IP" -+ -+ if [ -z "$proxyip" -a -n "$host" ] -+ then -+ [ "$host" = "127.0.0.1" ] && host=$(hostname) -+ proxyip=$(ping -c1 "$host" | grep 'PING' | cut -d'(' -f2 | cut -d')' -f1) -+ fi -+ -+ [ -z "$proxyip" ] && proxyip="127.0.0.1" - - # ok, lets make the session dir first: - -@@ -1316,7 +1327,7 @@ - NX> 705 Session display: $display - NX> 703 Session type: $type - NX> 701 Proxy cookie: $proxy_cookie --NX> 702 Proxy IP: $userip -+NX> 702 Proxy IP: $proxyip - NX> 706 Agent cookie: $cookie - NX> 704 Session cache: $type - NX> 707 SSL tunneling: $ssl_tunnel -diff -ur freenx-server-0.7.3//nxserver ../trunk/freenx-server//nxserver ---- freenx-server-0.7.3//nxserver 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxserver 2011-01-26 23:23:36.856672521 +0100 -@@ -11,7 +11,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxserver 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxserver 612 2008-08-25 03:28:15Z fabianx $ - # - - # Read the config file -@@ -1192,7 +1192,7 @@ - # Lock held - - SERVER_LB_NR=$(cat $NX_SESS_DIR/round-robin 2>/dev/null) -- let SERVER_LB_NR=(SERVER_LB_NR+1) % SERVER_LB_NR_OF_HOSTS -+ let SERVER_LB_NR=(SERVER_LB_NR+1)%SERVER_LB_NR_OF_HOSTS - echo $SERVER_LB_NR >$NX_SESS_DIR/round-robin - - # Exit critical section -@@ -1961,71 +1961,71 @@ - session_history "$user" "$sessid" - } - --cmd_terminate() -+cmd_execute() - { -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- for i in $CMD_PARAMS; -+ cmd_host="$1" -+ cmd_user="$2" -+ cmd_cmd="$3" -+ -+ if [ "$ENABLE_USERMODE_AUTHENTICATION" = "1" ] -+ then -+ sh -c "$cmd_cmd" -+ elif [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ then -+ su - "$cmd_user" -c "$cmd_cmd" -+ else -+ ssh "$cmd_host" su - "$cmd_user" -c "'$cmd_cmd'" -+ fi -+} -+ -+cmd_terminate_or_send() -+{ -+ CMD="$1" -+ -+ if [ "$CMD" = "--broadcast" ] -+ then -+ CMD_PARAMS=$(session_find_all) -+ [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -+ else -+ CMD_PARAMS=$(cmd_parse_3_params "$2") -+ [ -z "$CMD_PARAMS" ] && exit 1 -+ shift -+ fi -+ shift -+ -+ for i in $CMD_PARAMS - do - CMDLINE=$(session_get_cmdline $i) - cmd_sessionid=$(getparam sessionId) -+ cmd_display=$(getparam display) - cmd_user=$(getparam userName) - cmd_type=$(getparam type) - cmd_status=$(getparam status) -+ cmd_host=$(getparam host) - - # is it a "good" session? -- case "$1" in -+ case "$CMD" in - --suspend) - if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --suspend" - fi - ;; - --terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - ;; - --force-terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - session_close $cmd_sessionid - ;; -- esac -- done -- --} -- --cmd_send() --{ -- if [ "$1" = "--broadcast" ] -- then -- CMD_PARAMS=$(session_find_all) -- [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -- else -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- shift -- fi -- shift -- for i in $CMD_PARAMS; -- do -- CMDLINE=$(session_get_cmdline $i) -- cmd_display=$(getparam display) -- cmd_user=$(getparam userName) -- cmd_type=$(getparam type) -- cmd_status=$(getparam status) -- cmd_host=$(getparam host) -- -- # is it a "good" session? -- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" -- then -- if [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ --send|--broadcast) -+ # is it a "good" session? -+ if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- su - "$cmd_user" -c "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" -- else -- ssh $cmd_host su - "$cmd_user" -c "'$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &'" -+ cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" - fi -- fi -+ esac - done -- #nxnode_start --send "$CMD_PARAMS" - } - - # -@@ -2099,13 +2099,13 @@ - cmd_history "$@" - ;; - --terminate|--suspend|--force-terminate) -- cmd_terminate "$@" -+ cmd_terminate_or_send "$@" - ;; - --cleanup) -- cmd_terminate "--force-terminate" "*" -+ cmd_terminate_or_send "--force-terminate" "*" - ;; - --send|--broadcast) -- cmd_send "$@" -+ cmd_terminate_or_send "$@" - ;; - *) - cmd_abort "Error: Function $CMD not implemented yet." diff --git a/extra/freenx/freenx-server-0.7.3-nxipp.patch b/extra/freenx/freenx-server-0.7.3-nxipp.patch deleted file mode 100644 index 81b286593..000000000 --- a/extra/freenx/freenx-server-0.7.3-nxipp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up freenx-server-0.7.3/nxsetup~ freenx-server-0.7.3/nxsetup ---- freenx-server-0.7.3/nxsetup~ 2011-12-30 23:04:53.515194711 +0200 -+++ freenx-server-0.7.3/nxsetup 2011-12-30 23:05:55.499954085 +0200 -@@ -366,11 +366,10 @@ EOF - - echo "done" - -- if [ -d "$CUPS_BACKEND" ] -+ if [ -d "$CUPS_BACKEND" ] && [ ! -f "$CUPS_IPP_BACKEND" ] - then - echo -n "Setting up cups nxipp backend ..." -- cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" -- chmod 755 "$CUPS_IPP_BACKEND" -+ ln -sf "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" - echo "done" - fi - } diff --git a/extra/freenx/freenx.install b/extra/freenx/freenx.install deleted file mode 100644 index 0f3260166..000000000 --- a/extra/freenx/freenx.install +++ /dev/null @@ -1,59 +0,0 @@ -post_install() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo 'Generating keys ...' - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - echo "ATTENTION FREENX:" - echo "For correct setup please take a look at the wiki:" - echo "http://wiki.archlinux.org/index.php/FreeNX" -} - -post_upgrade() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo "Rerunning nxsetup ..." - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - if [ "`vercmp $2 0.7.3-10.1`" -lt 0 ]; then - # important upgrade notice - echo "*** config file location has been moved ***" - echo "Please apply your local settings from /opt/NX/etc/node.conf.pacsave" - echo "into /etc/nxserver/node.conf. A new key set is required." - echo "Please copy to your clients the new client key:" - echo "\"/var/lib/nxserver/home/nx/.ssh/client.id_dsa.key\"" - echo "When you have FreeNX server running clean up with \"rm -rf /opt/NX\"." - fi -} - -# arg 1: the old package version -pre_remove() { - /usr/lib/nx/bin/nxsetup --uninstall --purge 2>&1 >/dev/null -# usr/sbin/groupdel nx &>/dev/null - userdel nx &> /dev/null - groupdel nx &> /dev/null || /bin/true -} diff --git a/extra/freenx/keymap.patch b/extra/freenx/keymap.patch deleted file mode 100644 index a0bb678e4..000000000 --- a/extra/freenx/keymap.patch +++ /dev/null @@ -1,32 +0,0 @@ -=== modified file 'nxnode' ---- nxnode 2009-01-14 04:22:40 +0000 -+++ nxnode 2009-01-14 04:24:02 +0000 -@@ -555,7 +555,8 @@ - - # Start the agent - -- PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ #PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & - fi - - # -@@ -1094,6 +1095,8 @@ - # Rootless fix from 2x nxserver 1.5.0 - realtype=$type - [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop" -+ [ "$type" = "unix-gnome" ] && realtype="gnome" -+ [ "$type" = "unix-kde" ] && realtype="kde" - - # NX 2.1.0 file-sharing port options - client=$(getparam client) -@@ -1272,7 +1275,7 @@ - umask 0077 - - cat << EOF > "$USER_FAKE_HOME/.nx/C-$sess_id/options" --${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${clipboard:+,clipboard=$clipboard}${menu:+,menu=$menu}:$display -+nx/nx,${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${geometry:+geometry=$geometry,}${client:+client=$client,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype${clipboard:+,clipboard=$clipboard}${composite:+composite=$composite},cleanup=0,product=LFE/None/LFEN/None,shmem=1,${backingstore:+backingstore=$backingstore,}shpix=1,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${menu:+,menu=$menu}:$display - EOF - umask $OLD_UMASK - #samba=$samba, - diff --git a/extra/freenx/nxagent-startup.patch b/extra/freenx/nxagent-startup.patch deleted file mode 100644 index e3c5497c1..000000000 --- a/extra/freenx/nxagent-startup.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nxnode~ 2010-04-30 15:42:46.000000000 +0200 -+++ nxnode 2010-04-30 15:42:46.000000000 +0200 -@@ -328,6 +328,9 @@ - NODE_WM_PID=$! - fi - -+ # Patch - delay to allow nxagent to complete launching -+ sleep 4 -+ - echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - [ -d /etc/X11/Xresources ] && xrdb -display :$display -merge /etc/X11/Xresources/* >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - diff --git a/extra/freenx/remove-dialog.patch b/extra/freenx/remove-dialog.patch deleted file mode 100644 index 054f1f6c4..000000000 --- a/extra/freenx/remove-dialog.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- nxdialog~ 2011-02-01 09:05:28.993333438 +0100 -+++ nxdialog 2011-02-01 09:05:29.010000106 +0100 -@@ -85,29 +85,6 @@ - then - dialog_interface="xdialog" - DIALOG=/usr/bin/Xdialog # just in case that we have no good path --elif [ -x /usr/bin/dialog ] --then -- #JJK: Added 'dialog_interface=dialog' option because Xdialog not standard -- #JJK: on some distros such as Fedora and xmessage won't handle long -- #JJK: lists of ppd files while the combination of 'dialog' and 'xterm' -- #JJK: should be present on most setups. -- -- dialog_interface="dialog" -- DIALOG=/usr/bin/dialog -- if [ -z "$NXCLIENT_FIRST_TIME" ] -- then -- # Run only once in case of subdialogs. Capture result in tempfile -- TMPFILE=$(mktemp /tmp/nxclient.XXXXX) -- export NXCLIENT_FIRST_TIME=1 -- -- xterm -geometry 120x24+100+100 +sb -title "NXclient" -e \ -- /bin/bash -c "$DIALOG --infobox 'Please wait...' 3 25; $0 $INPUTS | tee $TMPFILE" || exit 1 -- -- #Need to recover the last line output (and not remove non-printing chars, because --stdout is used) -- tail -1 $TMPFILE -- rm -f $TMPFILE -- exit 0 -- fi - else - dialog_interface="xmessage" - xmessage=$(which xmessage 2>/dev/null) diff --git a/extra/gnome-alsamixer/02_change_gconf-keys_path.diff b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff new file mode 100644 index 000000000..6df8bc903 --- /dev/null +++ b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff @@ -0,0 +1,207 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_change_gconf-keys_path.dpatch.dpatch by Mohammed Adnène Trojette +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace path to gnome-alsamixer's gconf keys + +@DPATCH@ + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider.c +@@ -481,7 +481,7 @@ + + disp_name = g_strndup (gam_slider_get_name (gam_slider), 8); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -508,7 +508,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -533,7 +533,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -557,7 +557,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-toggle.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-toggle.c +@@ -410,7 +410,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -433,7 +433,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -458,7 +458,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -482,7 +482,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-app.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-app.c +@@ -331,7 +331,7 @@ + gam_app_load_prefs (gam_app); + + /*gconf_client_notify_add (priv->gconf_client, +- "/apps/PAW/gnomealsamixer/preferences/tab_position", ++ "/apps/gnomealsamixer/preferences/tab_position", + (GConfClientNotifyFunc) pawed_app_gconf_notify_func, + pawed_app, + NULL, +@@ -351,10 +351,10 @@ + priv = GAM_APP_GET_PRIVATE (gam_app); + + width = gconf_client_get_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_width", ++ "/apps/gnome-alsamixer/geometry/main_window_width", + NULL); + height = gconf_client_get_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_height", ++ "/apps/gnome-alsamixer/geometry/main_window_height", + NULL); + + if ((height != 0) && (width != 0)) +@@ -376,11 +376,11 @@ + gdk_window_get_geometry (GDK_WINDOW (GTK_WIDGET (gam_app)->window), NULL, NULL, &width, &height, NULL); + + gconf_client_set_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_height", ++ "/apps/gnome-alsamixer/geometry/main_window_height", + height, + NULL); + gconf_client_set_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_width", ++ "/apps/gnome-alsamixer/geometry/main_window_width", + width, + NULL); + +@@ -630,7 +630,7 @@ + gint + gam_app_get_mixer_slider_style (GamApp *gam_app) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style"; + gint style = 0; + + g_return_if_fail (GAM_IS_APP (gam_app)); +@@ -646,7 +646,7 @@ + void + gam_app_set_mixer_slider_style (GamApp *gam_app, gint style) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style"; + + g_return_if_fail (GAM_IS_APP (gam_app)); + +@@ -661,7 +661,7 @@ + gint + gam_app_get_slider_toggle_style (GamApp *gam_app) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style"; + gint style = 1; + + g_return_if_fail (GAM_IS_APP (gam_app)); +@@ -677,7 +677,7 @@ + void + gam_app_set_slider_toggle_style (GamApp *gam_app, gint style) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style"; + + g_return_if_fail (GAM_IS_APP (gam_app)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider-dual.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider-dual.c +@@ -446,7 +446,7 @@ + + priv = GAM_SLIDER_DUAL_GET_PRIVATE (gam_slider_dual); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_locked/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_locked/%s-%s", + gam_mixer_get_config_name (gam_slider_get_mixer (GAM_SLIDER (gam_slider_dual))), + gam_slider_get_config_name (GAM_SLIDER (gam_slider_dual))); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-mixer.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-mixer.c +@@ -478,7 +478,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s", + gam_mixer_get_config_name (gam_mixer)); + + name = gconf_client_get_string (gam_app_get_gconf_client (GAM_APP (priv->app)), +@@ -500,7 +500,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s", + gam_mixer_get_config_name (gam_mixer)); + + gconf_client_set_string (gam_app_get_gconf_client (GAM_APP (priv->app)), +@@ -526,7 +526,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s", + gam_mixer_get_config_name (gam_mixer)); + + if (gconf_client_dir_exists (gam_app_get_gconf_client (GAM_APP (priv->app)), key, NULL)) +@@ -549,7 +549,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s", + gam_mixer_get_config_name (gam_mixer)); + + gconf_client_set_bool (gam_app_get_gconf_client (GAM_APP (priv->app)), diff --git a/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff new file mode 100644 index 000000000..91630a6d3 --- /dev/null +++ b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff @@ -0,0 +1,174 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_gnome-alsamixer.schemas.dpatch.dpatch by Mohammed Adnène Trojette +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Intent to guess gnome-alsamixer.schemas + +@DPATCH@ + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/gnome-alsamixer.schemas ++++ gnome-alsamixer-0.9.7.cvs20050822/gnome-alsamixer.schemas +@@ -0,0 +1,163 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ /schemas/apps/gnome-alsamixer/geometry/main_window_width ++ /apps/gnome-alsamixer/geometry/main_window_width ++ gnome-alsamixer ++ int ++ 600 ++ ++ ++ ++ ++ ++ ++ ++ /schemas/apps/gnome-alsamixer/geometry/main_window_height ++ /apps/gnome-alsamixer/geometry/main_window_height ++ gnome-alsamixer ++ int ++ 380 ++ ++ ++ ++ ++ ++ ++ ++ /schemas/apps/gnome-alsamixer/geometry/mixer_slider_style ++ /apps/gnome-alsamixer/geometry/mixer_slider_style ++ gnome-alsamixer ++ bool ++ false ++ ++ ++ ++ ++ ++ ++ ++ /schemas/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style ++ /apps/gnome-alsamixer/geometry/mixer_slider_toggle_style ++ gnome-alsamixer ++ bool ++ true ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/extra/gnome-alsamixer/04_ignore-delimiters.diff b/extra/gnome-alsamixer/04_ignore-delimiters.diff new file mode 100644 index 000000000..3e00e9205 --- /dev/null +++ b/extra/gnome-alsamixer/04_ignore-delimiters.diff @@ -0,0 +1,15 @@ +# Fixes: #400667 + +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.h 2008-01-04 00:43:39.000000000 +0100 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h 2008-01-04 00:44:18.000000000 +0100 +@@ -26,7 +26,7 @@ + + G_BEGIN_DECLS + +-#define GAM_CONFIG_DELIMITERS " &()+/" ++#define GAM_CONFIG_DELIMITERS " &()+/," + + #define GAM_TYPE_APP (gam_app_get_type ()) + #define GAM_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAM_TYPE_APP, GamApp)) diff --git a/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch new file mode 100644 index 000000000..0a352867b --- /dev/null +++ b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch @@ -0,0 +1,111 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.c 2011-09-12 21:01:20.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c 2011-09-12 21:02:41.000000000 +0200 +@@ -439,7 +439,7 @@ + NULL); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_mixer_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +@@ -451,7 +451,7 @@ + return priv->mixer_name; + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_config_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.h 2011-09-12 21:01:43.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h 2011-09-12 21:03:36.000000000 +0200 +@@ -57,8 +57,8 @@ + GType gam_mixer_get_type (void) G_GNUC_CONST; + GtkWidget *gam_mixer_new (GamApp *gam_app, + const gchar *card_id); +-G_CONST_RETURN gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); +-G_CONST_RETURN gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); + gchar *gam_mixer_get_display_name (GamMixer *gam_mixer); + void gam_mixer_set_display_name (GamMixer *gam_mixer, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.c 2011-09-12 21:01:49.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c 2011-09-12 21:03:47.000000000 +0200 +@@ -440,7 +440,7 @@ + g_signal_emit (gam_slider, signals[REFRESH], 0); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +@@ -452,7 +452,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_config_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.h 2011-09-12 21:01:28.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h 2011-09-12 21:03:13.000000000 +0200 +@@ -58,8 +58,8 @@ + #include "gam-mixer.h" + + GType gam_slider_get_type (void) G_GNUC_CONST; +-G_CONST_RETURN gchar *gam_slider_get_name (GamSlider *gam_slider); +-G_CONST_RETURN gchar *gam_slider_get_config_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_config_name (GamSlider *gam_slider); + gchar *gam_slider_get_display_name (GamSlider *gam_slider); + void gam_slider_set_display_name (GamSlider *gam_slider, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.c 2011-09-12 21:01:36.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c 2011-09-12 21:03:26.000000000 +0200 +@@ -371,7 +371,7 @@ + internal_state); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +@@ -383,7 +383,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_config_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.h 2011-09-12 21:01:55.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h 2011-09-12 21:04:00.000000000 +0200 +@@ -55,8 +55,8 @@ + gboolean gam_toggle_get_state (GamToggle *gam_toggle); + void gam_toggle_set_state (GamToggle *gam_toggle, + gboolean state); +-G_CONST_RETURN gchar *gam_toggle_get_name (GamToggle *gam_toggle); +-G_CONST_RETURN gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); + gchar *gam_toggle_get_display_name (GamToggle *gam_toggle); + void gam_toggle_set_display_name (GamToggle *gam_toggle, + const gchar *name); diff --git a/extra/gnome-alsamixer/06-use-libgnome-headers.patch b/extra/gnome-alsamixer/06-use-libgnome-headers.patch new file mode 100644 index 000000000..5c431f02b --- /dev/null +++ b/extra/gnome-alsamixer/06-use-libgnome-headers.patch @@ -0,0 +1,26 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-main.c 2005-07-06 17:14:57.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c 2011-10-26 02:47:47.000000000 +0200 +@@ -22,7 +22,7 @@ + #include + #endif + +-#include ++#include + #include + + #include "gam-app.h" +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++/*#include */ + #include + + #include "gam-app.h" diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD index 84698b9c1..677260758 100644 --- a/extra/gnome-alsamixer/PKGBUILD +++ b/extra/gnome-alsamixer/PKGBUILD @@ -1,33 +1,50 @@ -# $Id: PKGBUILD 136003 2011-08-21 09:18:58Z eric $ +# $Id: PKGBUILD 189332 2013-07-03 05:25:03Z eric $ # Maintainer: Eric Bélanger pkgname=gnome-alsamixer -pkgver=0.9.6 -pkgrel=4 +pkgver=0.9.7 +pkgrel=1 pkgdesc="Gnome ALSA mixer" arch=('i686' 'x86_64') url="https://launchpad.net/gnome-alsamixer" license=('GPL') depends=('libgnomeui') -source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz - gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop) -md5sums=('387623cfeb079d78325eed2d6bc94251' - '82b95a0df43429da5098b4da883f6bd0' - 'c7dbc44207bede96e4fafc24a7c7beb3') -sha1sums=('faece601a4329d2b01b9efe65200021538fc066d' - 'b4e3b871676025600170ba54f59db4977b853c08' +options=('!emptydirs') +install=gnome-alsamixer.install +source=(https://launchpad.net/ubuntu/+archive/primary/+files/gnome-alsamixer_0.9.7~cvs.20060916.ds.1.orig.tar.gz + 02_change_gconf-keys_path.diff 03_gnome-alsamixer.schemas.diff 04_ignore-delimiters.diff + 05-remove-G_CONST_RETURN.patch 06-use-libgnome-headers.patch gnome-alsamixer.desktop) +sha1sums=('98e716cd14fe46cb9c77034de7558ef113da26f5' + 'ee7743abfc8d6005be6fcb0fb47b45e636db5fdc' + '6b3148bab4ed53bc9a0a123b33585cd81b138225' + 'd4a7f9a5868c5af52f9b3c7a146ae34ddc45adf7' + '6b19224d0346cf53b864333b191fa99fc8e7ebdc' + '2731a7ef249aac51eeab1717c645c995780f36a7' '31639f7932d088ca76a18c79839682be811f23d0') +prepare() { + cd ${pkgname}-${pkgver}~cvs.20060916 + patch -Np1 -i ../02_change_gconf-keys_path.diff + patch -Np1 -i ../03_gnome-alsamixer.schemas.diff + patch -Np1 -i ../04_ignore-delimiters.diff + patch -Np1 -i ../05-remove-G_CONST_RETURN.patch + patch -Np1 -i ../06-use-libgnome-headers.patch + + ln -sf /usr/share/automake-*/mkinstalldirs mkinstalldirs +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" + cd ${pkgname}-${pkgver}~cvs.20060916 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make + make MSGFMT_OPTS="-c" LIBS+="-lm" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \ - "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + cd ${pkgname}-${pkgver}~cvs.20060916 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/gnome-alsamixer.desktop" "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch b/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch deleted file mode 100644 index 9e5f4eeb1..000000000 --- a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur gnome-alsamixer-0.9.6/src/Makefile.in gnome-alsamixer-0.9.6.new/src/Makefile.in ---- gnome-alsamixer-0.9.6/src/Makefile.in 2003-09-09 12:44:25.000000000 +0100 -+++ gnome-alsamixer-0.9.6.new/src/Makefile.in 2004-04-04 18:51:36.000000000 +0100 -@@ -86,10 +86,6 @@ - -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\" \ - -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DG_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - @PACKAGE_CFLAGS@ - - -Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~ diff --git a/extra/gnome-alsamixer/gnome-alsamixer.install b/extra/gnome-alsamixer/gnome-alsamixer.install new file mode 100644 index 000000000..2787d5675 --- /dev/null +++ b/extra/gnome-alsamixer/gnome-alsamixer.install @@ -0,0 +1,19 @@ +pkgname=gnome-alsamixer + +post_install() { + gconfpkg --install ${pkgname} +} + +pre_upgrade() { + if [[ "$(vercmp $2 0.9.7)" -gt 0 ]]; then + pre_remove $1 + fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall ${pkgname} +} diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 905c9e53e..26aa0c968 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187927 2013-06-08 07:59:05Z andrea $ +# $Id: PKGBUILD 189490 2013-07-03 17:00:35Z andrea $ # Maintainer: Andrea Scarpino pkgname=kactivities -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a339ad9eeff20ba384a03d2dff5b4d3622f9e17d') +sha1sums=('6f0a7593ac5f7a4daf231bc403a78a658aae2db2') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index 1425eacb3..49aa0448c 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187954 2013-06-08 07:59:34Z andrea $ +# $Id: PKGBUILD 189517 2013-07-03 17:01:12Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-jovie -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('3a4d718251fb8f5e66c127028dbca99607eb4b66') +sha1sums=('59d2e627b71e6ffe5c3f1f54a680522a114b74bc') build() { mkdir build diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 5408a877c..7bfd34a96 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187955 2013-06-08 07:59:35Z andrea $ +# $Id: PKGBUILD 189518 2013-07-03 17:01:13Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-kaccessible -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('c7e6946120b34e6a5963f103430da1d3ca812ca8') +sha1sums=('b56172555573162636937587436ee30091a16f6f') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index e7d71637b..a4b1f9bcb 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187956 2013-06-08 07:59:36Z andrea $ +# $Id: PKGBUILD 189519 2013-07-03 17:01:14Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-kmag -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('68e9ec4b646db7b7711a08ecf62e1011be60024e') +sha1sums=('0054927193647296448329bbdce1438e62fc57da') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index a66eb8d5b..a3f9b7352 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187957 2013-06-08 07:59:37Z andrea $ +# $Id: PKGBUILD 189520 2013-07-03 17:01:15Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-kmousetool -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('e3e635780254a2ac9ce94c5c1f21bfabc4b59121') +sha1sums=('ec4aac22da5499a484bd3b45a78c4a10b8ae4632') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index 9c1792e76..f4738da8a 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187958 2013-06-08 07:59:38Z andrea $ +# $Id: PKGBUILD 189521 2013-07-03 17:01:16Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeaccessibility-kmouth -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('3236b2fcb79f95a1eb44928a2cd286243f0b128c') +sha1sums=('267079c968a59fd878eaff3e2986cfe82426513b') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 6f1c44b0f..ccb74805f 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187959 2013-06-08 07:59:40Z andrea $ +# $Id: PKGBUILD 189522 2013-07-03 17:01:18Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -6,7 +6,7 @@ pkgbase=kdeadmin pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdepimlibs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('422b9cd97d40191080ee4a121fda24fb19759216' +sha1sums=('0b809772effe249d1ec581902fcecb73e7761134' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') prepare() { @@ -39,7 +39,7 @@ package_kdeadmin-kcron() { depends=('kdelibs') cd $srcdir/build/kcron make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcron + cd $srcdir/build/kcron/doc make DESTDIR=$pkgdir install } @@ -49,7 +49,7 @@ package_kdeadmin-ksystemlog() { url="http://kde.org/applications/system/ksystemlog/" cd $srcdir/build/ksystemlog make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksystemlog + cd $srcdir/build/ksystemlog/doc make DESTDIR=$pkgdir install } @@ -60,6 +60,6 @@ package_kdeadmin-kuser() { install='kdeadmin.install' cd $srcdir/build/kuser make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kuser + cd $srcdir/build/kuser/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 2cf27cd5c..1cdc1c70a 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187960 2013-06-08 07:59:41Z andrea $ +# $Id: PKGBUILD 189523 2013-07-03 17:01:19Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('b41e00708a595f4ee310a69c7326a6f956e8c6e2') +sha1sums=('a6f9244b473ec01174ba85f9375438050be76daf') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 4eaee9ad0..34f0863cc 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187961 2013-06-08 07:59:42Z andrea $ +# $Id: PKGBUILD 189524 2013-07-03 17:01:21Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebase-konsole -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('8fdc5965837f104ddc9923e97bb1499f6293c833') +sha1sums=('f6c08b19e2154dab6a7e86255ec254d79e305993') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 555202d13..8be7c6841 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187940 2013-06-08 07:59:19Z andrea $ +# $Id: PKGBUILD 189503 2013-07-03 17:00:52Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') @@ -26,8 +26,9 @@ install="${pkgname}.install" backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' - 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' + 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'fix-plasma-memory-leak.patch') +sha1sums=('d4986c1b4e3232f74a6348116908a13aee073a93' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' @@ -35,7 +36,8 @@ sha1sums=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'e453545568d20165f80b97dd270b5adc731d5f21') prepare() { cd ${_pkgname}-${pkgver} @@ -47,6 +49,9 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch + + # KDEBUG#314919 + patch -p1 -i "${srcdir}"/fix-plasma-memory-leak.patch } build() { diff --git a/extra/kdebase-workspace/fix-plasma-memory-leak.patch b/extra/kdebase-workspace/fix-plasma-memory-leak.patch new file mode 100644 index 000000000..78ced11b7 --- /dev/null +++ b/extra/kdebase-workspace/fix-plasma-memory-leak.patch @@ -0,0 +1,53 @@ +commit ec8e405ca447ba5bc5a9f6a2a12e2fa90412a0d4 +Author: Andreas Hartmetz +Date: Tue Jul 2 18:35:35 2013 +0200 + + Fix pixmap leak when the tray icon changes (e.g. when it's animated). + + This could easily leak 4KB/second of X pixmap memory. + All the actual difference comes from the QPixmap::ExplicitlyShared + argument, the rest is making some wonky-looking but working code look + less wonky. + + BUG: 314919 + +diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +index 1826512..a5bc826 100644 +--- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp ++++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +@@ -194,8 +194,7 @@ void X11EmbedContainer::paintEvent(QPaintEvent *event) + + // Taking a detour via a QPixmap is unfortunately the only way we can get + // the window contents into Qt's backing store. +- QPixmap pixmap(size()); +- pixmap = toX11Pixmap(pixmap); ++ QPixmap pixmap = toX11Pixmap(QPixmap(size())); + pixmap.fill(Qt::transparent); + XRenderComposite(x11Info().display(), PictOpSrc, d->picture, None, pixmap.x11PictureHandle(), + 0, 0, 0, 0, 0, 0, width(), height()); +@@ -232,16 +231,18 @@ void X11EmbedContainer::setBackgroundPixmap(QPixmap background) + // NOTE: The alpha-channel is not preserved if it exists, but for X pixmaps it generally should not be needed anyway. + QPixmap X11EmbedContainer::toX11Pixmap(const QPixmap& pix) + { +- if(pix.handle() != 0) // X11 pixmap ++ if (pix.handle() != 0) // X11 pixmap + return pix; ++ QPixmap ret; + Pixmap xpix = XCreatePixmap(pix.x11Info().display(), RootWindow(pix.x11Info().display(), pix.x11Info().screen()), + pix.width(), pix.height(), QX11Info::appDepth()); +- QPixmap wrk = QPixmap::fromX11Pixmap(xpix); +- QPainter paint(&wrk); +- paint.drawPixmap(0, 0, pix); +- paint.end(); +- QPixmap ret = wrk.copy(); +- wrk = QPixmap(); // reset, so that xpix can be freed (QPixmap does not own it) ++ { ++ QPixmap wrk = QPixmap::fromX11Pixmap(xpix, QPixmap::ExplicitlyShared); ++ QPainter paint(&wrk); ++ paint.drawPixmap(0, 0, pix); ++ paint.end(); ++ ret = wrk.copy(); ++ } // free resources so that xpix can be freed (QPixmap does not own it) + XFreePixmap(pix.x11Info().display(), xpix); + return ret; + } diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 582376bed..fa8d8bbd8 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187942 2013-06-08 07:59:21Z andrea $ +# $Id: PKGBUILD 189505 2013-07-03 17:00:55Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d') +sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 1ae1a8126..1343f4cc0 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187962 2013-06-08 07:59:43Z andrea $ +# $Id: PKGBUILD 189525 2013-07-03 17:01:22Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-kimono -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') optdepends=('kdepimlibs: akonadi bindings') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('87fb44759e2f4ffa1fbcbebb0f15b359f02875b8') +sha1sums=('b4ecd3d9a95966c7d290b45031da4550a1c71c09') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index f9022b24c..bc2ea2e07 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187963 2013-06-08 07:59:44Z andrea $ +# $Id: PKGBUILD 189526 2013-07-03 17:01:24Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-korundum -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,18 +15,14 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' optdepends=('kdegraphics-okular: okular bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-ruby') -source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" - 'ruby19.patch') -sha1sums=('d4b2920db047a10addbd1a8818878b2f93c75648' - 'c074f027bac3b9bffe70a2c2304a6a7be12be034') +source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz") +sha1sums=('fa3e3c8dfdd4a81e49f91aa264d64f700ec4241f') prepare() { - cd korundum-${pkgver} - patch -p1 -i "${srcdir}/ruby19.patch" + mkdir build } build() { - mkdir build cd build cmake ../korundum-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebindings-korundum/ruby19.patch b/extra/kdebindings-korundum/ruby19.patch deleted file mode 100644 index c2468d9ce..000000000 --- a/extra/kdebindings-korundum/ruby19.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- korundum-4.9.0/src/krubypluginfactory.cpp~ 2012-07-27 10:44:19.544464612 +0000 -+++ korundum-4.9.0/src/krubypluginfactory.cpp 2012-07-27 10:53:15.247374749 +0000 -@@ -39,7 +39,6 @@ - extern "C" { - extern VALUE rb_load_path; - extern VALUE qt_internal_module; --void Init_prelude(void); - } - - // -@@ -165,7 +164,8 @@ - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+ char *opts[] = { "ruby", "-e;" }; -+ ruby_options(2, opts); - #endif - - ruby_incpush(QFile::encodeName(program.path())); -@@ -342,7 +342,8 @@ - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+ char *opts[] = { "ruby", "-e;" }; -+ ruby_options(2, opts); - #endif - - ruby_incpush(QFile::encodeName(program.path())); diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 966cf4efc..e0aaef8f9 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187964 2013-06-08 07:59:45Z andrea $ +# $Id: PKGBUILD 189527 2013-07-03 17:01:25Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('04ab37ee0c6fcf0a3d7824b49f73529d4f480a0d') +sha1sums=('58bb1c9fb45d20768c59e1147aa954d14d6dd18e') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 47240500a..79f7510ec 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187965 2013-06-08 07:59:45Z andrea $ +# $Id: PKGBUILD 189528 2013-07-03 17:01:26Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlkde -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('034a5f0b98cb361cad8bb684a4834f47d16efb9c') +sha1sums=('a0eb27db883b8fd8411041373140f3d6a5bcdbfc') build() { mkdir build diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index c7ac5998f..018614a9e 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187936 2013-06-08 07:59:15Z andrea $ +# $Id: PKGBUILD 189499 2013-07-03 17:00:44Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlqt -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('8b72c8c53d74b2bc8f38baca6c599067a6cfaac6') +sha1sums=('e4349b27791962188e8e56bd717a2ae7aec263c3') build() { mkdir build diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 244a8e47a..10ae3fbcc 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 188702 2013-06-18 10:31:18Z andrea $ +# $Id: PKGBUILD 189496 2013-07-03 17:00:41Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4' 'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('4243f60d549b75ad734141ad2bfef884d12d014e') +sha1sums=('1e474e5d15756a6846902c11d6a7c95c5ca688da') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index c40a194c8..ced10bc23 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187938 2013-06-08 07:59:16Z andrea $ +# $Id: PKGBUILD 189501 2013-07-03 17:00:47Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-qtruby -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('70fa8ea5ee961ece5d29cb84cb37c57923f18d85') +sha1sums=('6fc117f8d046ae4f026015475792c43f80346d29') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 59acd2122..d58fef949 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187937 2013-06-08 07:59:15Z andrea $ +# $Id: PKGBUILD 189500 2013-07-03 17:00:47Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-qyoto -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('1a0503ef0117aa19cdffdddc9501fee83411d576') +sha1sums=('d79d5d67fe95aecb326edba4cf1200b6a22f394c') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 58c1ee800..2834dc637 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187930 2013-06-08 07:59:08Z andrea $ +# $Id: PKGBUILD 189493 2013-07-03 17:00:38Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokegen -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('57c92b313bae5274b571c09f94cf599d1afd4846') +sha1sums=('d9d803c9d66d59ffc8d5a7372ee2176d355d3bb3') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 0d254ede2..415f8068c 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187935 2013-06-08 07:59:14Z andrea $ +# $Id: PKGBUILD 189498 2013-07-03 17:00:43Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokekde -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('557f3a888759cb3dd397466bd16246a1ef5858f2') +sha1sums=('22b2b717a8a81e3b4d52a65afd985044b5e77e3b') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index f417e63de..fe9714dc2 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187931 2013-06-08 07:59:09Z andrea $ +# $Id: PKGBUILD 189494 2013-07-03 17:00:39Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokeqt -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'mesa') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('292285272998b096eef62812e65b5027cf2800ec') +sha1sums=('af5c3b4cf9bf82de15ddb26a5ab188e800fe7942') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index d1ae5e46f..b487f75d7 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187949 2013-06-08 07:59:29Z andrea $ +# $Id: PKGBUILD 189512 2013-07-03 17:01:07Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-analitza -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('46de1f60e149f6b5a526fa62e6dcf52ade9d4eff') +sha1sums=('e8f6810516838d94bb66db01c6ef19ebc8680ca7') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index ad7e9e866..722fe0d1b 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187966 2013-06-08 07:59:47Z andrea $ +# $Id: PKGBUILD 189529 2013-07-03 17:01:27Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-blinken -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('ea4d9363c6bf08683a5c9733d11ec7928a358f73') +sha1sums=('45c720a6b1566d941cfae8d8354d603331c1e258') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 614b9d4cd..0acbaf3f3 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187967 2013-06-08 07:59:48Z andrea $ +# $Id: PKGBUILD 189530 2013-07-03 17:01:29Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-cantor -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -17,7 +17,7 @@ optdepends=('maxima: Maxima backend' install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz" 'sage58.patch') -sha1sums=('3ecd559d6563945ed7730a524c2da5d637a340ba' +sha1sums=('b815ec8ceef27436bca46ee80d933912deb7c771' 'c02051c30ece57800d693da60280b0bdb5f45697') prepare() { diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index b15f5c544..0dbc91539 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187968 2013-06-08 07:59:49Z andrea $ +# $Id: PKGBUILD 189531 2013-07-03 17:01:30Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kalgebra -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('86032621d84ef5d8ea68cf9b0e7b696b96154ece') +sha1sums=('a762efe6ab7bedb5e5a1f97e7227fc48729c8b62') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index f87d0c60c..e02150548 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187969 2013-06-08 07:59:50Z andrea $ +# $Id: PKGBUILD 189532 2013-07-03 17:01:32Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kalzium -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('b8225cae39c1b27d1defabd08cd2e64e5c893602') +sha1sums=('b4429f34b85c507474cd33e2a1571de9acd70b5c') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index dc1924798..fdfec9145 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187970 2013-06-08 07:59:51Z andrea $ +# $Id: PKGBUILD 189533 2013-07-03 17:01:33Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kanagram -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('fa1635720602ba02cb0064d3c01c752d208f5e09') +sha1sums=('1db931a1796a090ffefc1d922b9bf689e045581a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index b296bb812..028b79f4d 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187971 2013-06-08 07:59:53Z andrea $ +# $Id: PKGBUILD 189534 2013-07-03 17:01:36Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kbruch -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('be9dd5ce3a0b8b7162faf1f78c22a7aeb5a8449c') +sha1sums=('f01c2b9f2bf1db8d5c2836fdff04862b311e3eac') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 31da779e6..6bb37955e 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187972 2013-06-08 07:59:56Z andrea $ +# $Id: PKGBUILD 189535 2013-07-03 17:01:38Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kgeography -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('a283d3521e853d040e7938e004fcbef6cf41aa82') +sha1sums=('22beaaada1a55aa5a5b107fa0eef9f3850aff2a1') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 075a6a57b..e8b9ed897 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187973 2013-06-08 07:59:58Z andrea $ +# $Id: PKGBUILD 189536 2013-07-03 17:01:39Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-khangman -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('1d1a8d7dc99e59bcb006302d1bb7d9a8366041d9') +sha1sums=('b8347034cefa309850ac3099321179cd64ce4d2f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 9adf36765..621e202a9 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187974 2013-06-08 07:59:59Z andrea $ +# $Id: PKGBUILD 189537 2013-07-03 17:01:41Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kig -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('91c0880d48ed16e05481c3ce424075d30f695bf4') +sha1sums=('8eb3dae04ce6599f911fa29e5109089dd0a5ca56') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 43b832afc..eff5e2f5b 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187975 2013-06-08 08:00:01Z andrea $ +# $Id: PKGBUILD 189538 2013-07-03 17:01:42Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kiten -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('970620fc621dd31c99c71bd3b446da4d1d3015c4') +sha1sums=('af9040043e03ef516e582c5a8d1219e358339aac') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 60d4b29e3..6552b69ad 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187976 2013-06-08 08:00:03Z andrea $ +# $Id: PKGBUILD 189539 2013-07-03 17:01:44Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-klettres -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('5141988a04d1a9e428c41cc751cd217a53fef13a') +sha1sums=('285ed3b40f7502fe90d319c434946a344b54246d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 87954f1a2..d361be042 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187977 2013-06-08 08:00:04Z andrea $ +# $Id: PKGBUILD 189540 2013-07-03 17:01:46Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kmplot -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('e212aee5cdee0d767efd9d004a17238f043485a2') +sha1sums=('da01e941e4439223cacc03de29780c27d41455b0') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 05d62a9fe..133a02230 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187978 2013-06-08 08:00:07Z andrea $ +# $Id: PKGBUILD 189541 2013-07-03 17:01:48Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kstars -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('9a434b7e2c9b67cce4611ad443cfd1ef9a190436') +sha1sums=('724acde654d7d66ec8bf6c088c2f892eaf9d103d') build() { mkdir build diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index a2da999b8..fd2fc0fde 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187979 2013-06-08 08:00:08Z andrea $ +# $Id: PKGBUILD 189542 2013-07-03 17:01:49Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-ktouch -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('dfda5d6f0af6bfc2853595a5af86c7a96cd66c33') +sha1sums=('87c772a43e164a557e8fed01a5c5064823eb29c9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index e26ec8ae2..219c2cc81 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187980 2013-06-08 08:00:10Z andrea $ +# $Id: PKGBUILD 189543 2013-07-03 17:01:51Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kturtle -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('82cc5e6abb7ab10bf1da247f67293d45b3d38195') +sha1sums=('ca8b46766ea8135978b7e6f3b1f7f21e5a1b6639') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index ed4f53b1a..497890afa 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187981 2013-06-08 08:00:11Z andrea $ +# $Id: PKGBUILD 189544 2013-07-03 17:01:52Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kwordquiz -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('3c321e7f4a9a136cc29227c98d10bd3f4551f32b') +sha1sums=('3d92e066adecd77ef4de5b3ab4ecb6e06251dd55') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 5b606ed4c..57a71f1f5 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187944 2013-06-08 07:59:24Z andrea $ +# $Id: PKGBUILD 189507 2013-07-03 17:00:57Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-marble -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('664ff3564e2136566808d2ea801b42ede04d6a8d') +sha1sums=('15563a5f31bf1c655fe6afc6477bd3f8042e8a6f') build() { mkdir build diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index adb1f6434..de0a82da0 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187982 2013-06-08 08:00:13Z andrea $ +# $Id: PKGBUILD 189545 2013-07-03 17:01:53Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-pairs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('20b4e8e98487bc05602a15969bac63ea64a6ac74') +sha1sums=('c42d6a0dab25e28173ab47f1e18dda40204aaf15') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 76b11b77e..70845d2b9 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187983 2013-06-08 08:00:14Z andrea $ +# $Id: PKGBUILD 189546 2013-07-03 17:01:55Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-parley -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebindings-kross-python: scripting support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('d13d686b77a36ca488ab6f545e0871ad37f9b490') +sha1sums=('ff4361c225fe4e9530200ca169b1a0fc0f5b5852') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 69220ae37..a4037fddf 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187984 2013-06-08 08:00:15Z andrea $ +# $Id: PKGBUILD 189547 2013-07-03 17:01:57Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-rocs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('c09ba436f60bf856733e50bd331e84a8b1f975fb') +sha1sums=('0f9e33b679f528918b682153447a5813d88c57ef') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 708a90078..ac53f89d9 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187985 2013-06-08 08:00:17Z andrea $ +# $Id: PKGBUILD 189548 2013-07-03 17:01:58Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-step -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('3dcbd853ede5fbc6517d52faa8722395ecf0eb0b') +sha1sums=('e218cd5af527a815e222838b32bcffaaaa78e495') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index 582e1dd3e..2cfc44f51 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187986 2013-06-08 08:00:18Z andrea $ +# $Id: PKGBUILD 189549 2013-07-03 17:02:00Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-bomber -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single player arcade game" url="http://kde.org/applications/games/bomber/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz") -sha1sums=('88f98c0179516cfd08952112fb6dc6ba6bb85231') +sha1sums=('9ccd0e60f5ada51aae2fd35b214a2350e7950351') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 8f2e6a1c7..831b6ceff 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187987 2013-06-08 08:00:20Z andrea $ +# $Id: PKGBUILD 189550 2013-07-03 17:02:01Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-bovo -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A Gomoku like game for two players" url="http://kde.org/applications/games/bovo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz") -sha1sums=('102ceee58b4851b24cb23bd4907449cdd63aa3d7') +sha1sums=('cf6de267949be1900b9a74eb77118ed33f8fe389') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index fb7cde1ad..6302a932c 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187988 2013-06-08 08:00:21Z andrea $ +# $Id: PKGBUILD 189551 2013-07-03 17:02:02Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-granatier -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A clone of the classic Bomberman game" url="http://kde.org/applications/games/granatier/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz") -sha1sums=('b49be2c81a8b8670bfe8f53ae09e9aab9de5134a') +sha1sums=('5ba19a929dd4812ece1c3c1658e5d0457d737cb1') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index f8894c6b5..b6cc0b376 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187990 2013-06-08 08:00:24Z andrea $ +# $Id: PKGBUILD 189553 2013-07-03 17:02:05Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kapman -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A clone of the well known game Pac-Man" url="http://kde.org/applications/games/kapman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz") -sha1sums=('6dbb6b7f4a87aa2cd21d13330913d7a999b888e8') +sha1sums=('4da9e17243a87108bb55006a8d486d68d57f5e86') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index 22ad52563..074b23f6b 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187991 2013-06-08 08:00:26Z andrea $ +# $Id: PKGBUILD 189554 2013-07-03 17:02:06Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-katomic -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A fun and educational game built around molecular geometry" url="http://kde.org/applications/games/katomic/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz") -sha1sums=('6c4893910a11f2c1bc20492a93d6475fa397f9df') +sha1sums=('79f8e11671cd67fac0aff8ed5ebf8a845ed0e2b8') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index fe6669c21..42326cd35 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187992 2013-06-08 08:00:28Z andrea $ +# $Id: PKGBUILD 189555 2013-07-03 17:02:09Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kblackbox -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A game of hide and seek played on a grid of boxes" url="http://kde.org/applications/games/kblackbox/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz") -sha1sums=('dd19f0c54740e5e0add1271ebd6595f237a670d5') +sha1sums=('3cfb90ce5810df96ab8893fd0c2da984825a3ed0') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index 3244d981a..9c0f8c7c8 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187993 2013-06-08 08:00:29Z andrea $ +# $Id: PKGBUILD 189556 2013-07-03 17:02:11Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kblocks -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="The classic falling blocks game" url="http://kde.org/applications/games/kblocks/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz") -sha1sums=('e6c9e5d3dc368d87afe82375d3537aeb03247edb') +sha1sums=('98965d0f09d072722d8a35a9aee982cb66b0b61e') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index ca415ed54..cbd8ea671 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187994 2013-06-08 08:00:30Z andrea $ +# $Id: PKGBUILD 189557 2013-07-03 17:02:12Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kbounce -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single player arcade game with the elements of puzzle" url="http://kde.org/applications/games/kbounce/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz") -sha1sums=('481fb1b98597ae0cceadcfb7d7b5d4b1171e1267') +sha1sums=('45ab0f6440933719d70d6f10ad091a7753100832') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index 9aa68c742..f6fa4d9ac 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187995 2013-06-08 08:00:32Z andrea $ +# $Id: PKGBUILD 189558 2013-07-03 17:02:14Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kbreakout -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A Breakout-like game" url="http://kde.org/applications/games/kbreakout/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz") -sha1sums=('c8c5acdf8ca4915b37c6fa8e5cf6725e21ab97fa') +sha1sums=('38c1fb790541c01427e9cb7314e05929a25dc5d5') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index a6bcfb2b4..3af8fdbbf 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187996 2013-06-08 08:00:33Z andrea $ +# $Id: PKGBUILD 189559 2013-07-03 17:02:15Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kdiamond -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single player puzzle game" url="http://kde.org/applications/games/kdiamond/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz") -sha1sums=('acb1b7cdfdc30025a4686321ab0ef226c8adb1e0') +sha1sums=('eba0692af37410bd1005d0cbb8759420169d2e7b') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index 9f24ed219..baf9fa949 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187997 2013-06-08 08:00:35Z andrea $ +# $Id: PKGBUILD 189560 2013-07-03 17:02:17Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kfourinline -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A four-in-a-row game" url="http://kde.org/applications/games/kfourinline/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz") -sha1sums=('263a7a641c3f48f078aebbc179ec2475558605e8') +sha1sums=('d923b3477cd7ac2e693a69cf5dcc4f0667b72670') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index 733edc66a..d89d60c58 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187998 2013-06-08 08:00:36Z andrea $ +# $Id: PKGBUILD 189561 2013-07-03 17:02:18Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kgoldrunner -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A game of action and puzzle solving" url="http://kde.org/applications/games/kgoldrunner/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz") -sha1sums=('95fc29d606d5b491920c612e1887b1699aad4481') +sha1sums=('ade056258864f670d0e9932c07b4bec6c96589cb') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index e32191358..226d946da 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187999 2013-06-08 08:00:39Z andrea $ +# $Id: PKGBUILD 189562 2013-07-03 17:02:20Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kigo -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An open-source implementation of the popular Go game" url="http://kde.org/applications/games/kigo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz") -sha1sums=('caad098497bdd71184983cc22cfd23fe71bb243a') +sha1sums=('458ceb98d8704d7810539e24be708de089814b28') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index 746a0b456..0b62ca062 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188000 2013-06-08 08:00:40Z andrea $ +# $Id: PKGBUILD 189563 2013-07-03 17:02:24Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-killbots -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple game of evading killer robots" url="http://kde.org/applications/games/killbots/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz") -sha1sums=('5fef75ba6d3c849ce271164a532eaddde1c41cd4') +sha1sums=('fedcdb56a0daa244ded949433b591f783f9fe03b') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index c73f8d07f..f97dfc8ff 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188001 2013-06-08 08:00:41Z andrea $ +# $Id: PKGBUILD 189564 2013-07-03 17:02:25Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kiriki -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An addictive and fun dice game" url="http://kde.org/applications/games/kiriki/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz") -sha1sums=('a724586705a9bb66d4a9af684a0b56239d395e5e') +sha1sums=('459ad2ae8ed5d23f0fa49a512afe5c9100457e0c') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 10c91981c..f51df2860 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188002 2013-06-08 08:00:43Z andrea $ +# $Id: PKGBUILD 189565 2013-07-03 17:02:27Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kjumpingcube -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple tactical game" url="http://kde.org/applications/games/kjumpingcube/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz") -sha1sums=('012a89130cb95f8ae223f1dfb8380e1316ac91be') +sha1sums=('82c175cef97149ba079c8b1520d48c60f1785903') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index 1bb16b012..77136bbbc 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188003 2013-06-08 08:00:44Z andrea $ +# $Id: PKGBUILD 189566 2013-07-03 17:02:28Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-klickety -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An adaptation of the Clickomania game" url="http://kde.org/applications/games/klickety/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz") -sha1sums=('e7540d663a36a580e68d8ac69ba229c42db724f6') +sha1sums=('4630f3f31d9ab439475420ccd54707f097630371') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index e438e284e..196f97da9 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188004 2013-06-08 08:00:46Z andrea $ +# $Id: PKGBUILD 189567 2013-07-03 17:02:32Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-klines -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple but highly addictive, one player game" url="http://kde.org/applications/games/klines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz") -sha1sums=('6cbd46188030e3f495812a5d50e34be9936cdb08') +sha1sums=('adb8c1c1709b4dbdb733602ef29bcab6a177d494') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index cfd152ff8..d9bb79e82 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188005 2013-06-08 08:00:47Z andrea $ +# $Id: PKGBUILD 189568 2013-07-03 17:02:33Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kmahjongg -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A tile matching game for one or two players" url="http://kde.org/applications/games/kmahjongg/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz") -sha1sums=('ebecd24f0da87165d0b8859444d035019a7bcd5a') +sha1sums=('e020846d2252402cf51ae8bd63539774aeb775e9') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index 10371b5ae..45f7de054 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188006 2013-06-08 08:00:48Z andrea $ +# $Id: PKGBUILD 189569 2013-07-03 17:02:35Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kmines -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="The classic Minesweeper game" url="http://kde.org/applications/games/kmines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz") -sha1sums=('950f28e722db36daee4ee187f696eaa51415b752') +sha1sums=('c896f86b96f4fb380c695c0491db6d5fff0836fe') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index b2042b2ec..b1d1a2471 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188007 2013-06-08 08:00:50Z andrea $ +# $Id: PKGBUILD 189570 2013-07-03 17:02:37Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-knavalbattle -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A ship sinking game" url="http://kde.org/applications/games/knavalbattle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz") -sha1sums=('cf55f549029647b59b082bc2ab9383a5375a416c') +sha1sums=('e939a5b5d409bf89da3ffa8cd6e4af0d0e7798a0') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index a0c49e250..59f0d21e5 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188008 2013-06-08 08:00:51Z andrea $ +# $Id: PKGBUILD 189571 2013-07-03 17:02:39Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-knetwalk -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Connect all the terminals to the server, in as few turns as possible" url="http://kde.org/applications/games/knetwalk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz") -sha1sums=('482d4ba187a55ba32841e141ce3717ad94306377') +sha1sums=('61fb05ab580785362b1204c8b64badc160284d02') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index f6fbea517..c50aa9073 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188009 2013-06-08 08:00:52Z andrea $ +# $Id: PKGBUILD 189572 2013-07-03 17:02:41Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kolf -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A miniature golf game with 2d top-down view" url="http://kde.org/applications/games/kolf/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz") -sha1sums=('ec61e9d436c59cc738f340b7ca27e8ccef017b2f') +sha1sums=('ae1af46f6144adf912b3b9bf99666a178a6f78ac') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index 64801f3c5..2b849b9ae 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188010 2013-06-08 08:00:56Z andrea $ +# $Id: PKGBUILD 189573 2013-07-03 17:02:42Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kollision -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple ball dodging game" url="http://kde.org/applications/games/kollision/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz") -sha1sums=('bd7839e85789894010a2df0171e417a008afd753') +sha1sums=('d7850701d8817dac21457ebeef78c18d0f37001f') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index 489832547..37cc38e57 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188011 2013-06-08 08:00:57Z andrea $ +# $Id: PKGBUILD 189574 2013-07-03 17:02:44Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-konquest -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="The KDE version of Gnu-Lactic" url="http://kde.org/applications/games/konquest/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz") -sha1sums=('a238dee4a52ad6a051d53843112f85a7a912355f') +sha1sums=('5e5c61bc3823be1dd45c87a77f404f51f5ed9b6e') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index 4cad12def..26dec1fd2 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188012 2013-06-08 08:01:00Z andrea $ +# $Id: PKGBUILD 189575 2013-07-03 17:02:45Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kpatience -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Offers a selection of solitaire card games" url="http://kde.org/applications/games/kpat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz") -sha1sums=('c5ab4a1a27c4fe2f88e456af08aca3a4d2d1340e') +sha1sums=('65be653b7fa41054e3f446441365fbad65b841b0') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index 7b742fb01..78279dff8 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188013 2013-06-08 08:01:01Z andrea $ +# $Id: PKGBUILD 189576 2013-07-03 17:02:47Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kreversi -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple one player strategy game played against the computer" url="http://kde.org/applications/games/kreversi/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz") -sha1sums=('b30a93287348fd2394b9abf4e60b07f29bdccbfb') +sha1sums=('f3ea6c3c37367ca112146c4b85cb521064f1187c') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index 1fc77ef7b..495c7af70 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188014 2013-06-08 08:01:02Z andrea $ +# $Id: PKGBUILD 189577 2013-07-03 17:02:50Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kshisen -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles" url="http://kde.org/applications/games/kshisen/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz") -sha1sums=('c09157433df05f409046606d890b0935c167b877') +sha1sums=('28cfe402f4a39d0902a85e8e316f40d26af17e1b') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index 20c9f7367..08b8152f4 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188015 2013-06-08 08:01:04Z andrea $ +# $Id: PKGBUILD 189578 2013-07-03 17:02:51Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-ksirk -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A computerized version of a well known strategy game" url="http://kde.org/applications/games/ksirk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz") -sha1sums=('f0145f13d8ead33d37855298f8732ac82ea7dbe1') +sha1sums=('dc43176fc71a7ca45976f79eb383aa1922a8adf8') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index eb5bb0eb3..93cde5e71 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188016 2013-06-08 08:01:05Z andrea $ +# $Id: PKGBUILD 189579 2013-07-03 17:02:53Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-ksnakeduel -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple snake duel game" url="http://kde.org/applications/games/ksnakeduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz") -sha1sums=('21fec5a9e979065958ccb670a7198ecd82a334fb') +sha1sums=('a7c5416dadf66a4148e4e30c12a6dc1528793524') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index 9abb5852e..61f6750d6 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188017 2013-06-08 08:01:06Z andrea $ +# $Id: PKGBUILD 189580 2013-07-03 17:02:55Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kspaceduel -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun" url="http://kde.org/applications/games/kspaceduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz") -sha1sums=('e4e8667c2961bae7a96143ccc7dc342d3c959799') +sha1sums=('1b4146c55498e1223d0cf9209c1cec45d5cb5720') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index dfa1ea7b2..1ad5c5e12 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188018 2013-06-08 08:01:08Z andrea $ +# $Id: PKGBUILD 189581 2013-07-03 17:02:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-ksquares -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes" url="http://kde.org/applications/games/ksquares/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz") -sha1sums=('6553d30c4f983fd3346ad85e551afbbdb590442c') +sha1sums=('ca68405a5344481c1ed81bda0a7e37d78d0300f4') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index d1083b01a..dcfdb72a5 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188019 2013-06-08 08:01:09Z andrea $ +# $Id: PKGBUILD 189582 2013-07-03 17:02:57Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-ksudoku -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A logic-based symbol placement puzzle" url="http://kde.org/applications/games/ksudoku/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz") -sha1sums=('563d086f2b8fe844c7ae5b3fcecef496cb851d20') +sha1sums=('65da23cf971d77c563803f8f35794f4ff1ad4d15') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 83d7c3be3..814719a77 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188020 2013-06-08 08:01:11Z andrea $ +# $Id: PKGBUILD 189583 2013-07-03 17:02:59Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-ktuberling -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple constructor game suitable for children and adults alike" url="http://kde.org/applications/games/ktuberling/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz") -sha1sums=('209f64812e1aa9a6bd4f5ae87a83e6cb096d42f7') +sha1sums=('59128492d7f7ecb1dcde1b88f40ddc186590914d') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index e04709a55..94dc99c62 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188021 2013-06-08 08:01:13Z andrea $ +# $Id: PKGBUILD 189584 2013-07-03 17:03:00Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-kubrick -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Based on the famous Rubik's Cube" url="http://kde.org/applications/games/kubrick/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz") -sha1sums=('4b40f130930594908b0764744947c9a2deb1954e') +sha1sums=('e1bc6911e549ca39725b2b093b0d33868c6cea52') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index 8faed1d36..853b1f5b2 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188022 2013-06-08 08:01:15Z andrea $ +# $Id: PKGBUILD 189585 2013-07-03 17:03:02Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-lskat -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players" url="http://kde.org/applications/games/lskat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz") -sha1sums=('060cdb3f02655a82442b8eff9ef3d3b2be12fd9c') +sha1sums=('48465c69208786a1e642968e5097b4acedb4aba1') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index 14f39923a..8b802d470 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188023 2013-06-08 08:01:17Z andrea $ +# $Id: PKGBUILD 189586 2013-07-03 17:03:03Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-palapeli -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single-player jigsaw puzzle game" url="http://kde.org/applications/games/palapeli/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz") -sha1sums=('595572e46a0dbd31fe3bb8cb623602dadf3d8753') +sha1sums=('08dfbb9619197597094d1e543825217a9c79c4fd') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index 4ef9bf95b..65bb507fa 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188024 2013-06-08 08:01:18Z andrea $ +# $Id: PKGBUILD 189587 2013-07-03 17:03:05Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegames-picmi -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A nonogram logic game for KDE" url="http://kde.org/applications/games/picmi/" @@ -15,7 +15,7 @@ replaces=('picmi') conflicts=('picmi') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz") -sha1sums=('ef1a3c217432e44f4f3f146a54513b9ea56b4c96') +sha1sums=('fd2f95d39f4aeeea694a3b74949a3472783a3719') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index e81706acd..eee4c48e8 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188025 2013-06-08 08:01:19Z andrea $ +# $Id: PKGBUILD 189588 2013-07-03 17:03:06Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-gwenview -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('0cd301a65f800a201a57295984374612db7d6377') +sha1sums=('14e8b214ad2aa17a3ce586ca481502a120061912') build() { mkdir build diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index a88f11222..8d3787188 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188026 2013-06-08 08:01:21Z andrea $ +# $Id: PKGBUILD 189589 2013-07-03 17:03:08Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kamera -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libgphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('022c0ab35f4a57e6bbf200caff0a8f2688f47b2a') +sha1sums=('1ff61bd5f4bc78b947451306aec899c845d0e178') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index f2065e5e9..ef6f0a912 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188027 2013-06-08 08:01:22Z andrea $ +# $Id: PKGBUILD 189590 2013-07-03 17:03:10Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kcolorchooser -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('baa625095edbee3b943a0e09287a7c2bff7c20af') +sha1sums=('0e601ca75d6d237c23a83b10b2597b1ff905ea97') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 348776031..5d4102f55 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188028 2013-06-08 08:01:24Z andrea $ +# $Id: PKGBUILD 189591 2013-07-03 17:03:11Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kgamma -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('e9441c3358e2be76912a5879decedfa911809247') +sha1sums=('31d4f0e2da3475f423a8c9aa77db569d7ea698d6') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index eb0981514..667606117 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188029 2013-06-08 08:01:25Z andrea $ +# $Id: PKGBUILD 189592 2013-07-03 17:03:13Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kolourpaint -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('8578d6e50f60955392ac7c9e6aff93696126247f') +sha1sums=('976a2093dda115b16f13603c35959b163cc4169e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 56927f8e7..8c7ba8d1c 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188030 2013-06-08 08:01:27Z andrea $ +# $Id: PKGBUILD 189593 2013-07-03 17:03:14Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-kruler -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('f762162c9fcb276c6c52508c70eea95ba135e4be') +sha1sums=('c76fcd0f5fedcfd0017b3f27349e5fab8dd7bb74') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 0d2695532..d4f022a25 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188031 2013-06-08 08:01:28Z andrea $ +# $Id: PKGBUILD 189594 2013-07-03 17:03:16Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-ksaneplugin -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('34a8f6c379aa2defca2441c7f2583f1d75f99441') +sha1sums=('4bae1e43e55f0aad7626c9a2fe10bca46cba1bd8') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 4b04d2ce5..2d90d48b9 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188032 2013-06-08 08:01:30Z andrea $ +# $Id: PKGBUILD 189595 2013-07-03 17:03:17Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-ksnapshot -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('6550523e0270447a00b7c498fbe03f67b425626b') +sha1sums=('2a5dcb4cc7ed0f290a857d4b7a1418f31c39a25f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index c1d246c0d..0bd360bb0 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188033 2013-06-08 08:01:31Z andrea $ +# $Id: PKGBUILD 189596 2013-07-03 17:03:18Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-mobipocket -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('f4b58972ce05a4bdfcb94c972b023f168d3172e9') +sha1sums=('80a5878f2c9f4fa490f22a22fde03003c883c8cb') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 271f96fb1..60d30bebb 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187932 2013-06-08 07:59:10Z andrea $ +# $Id: PKGBUILD 189495 2013-07-03 17:00:40Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-okular -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('7659ac1e1d9832f541f605abbfc47da9d3ab2356') +sha1sums=('8009cd23f844691c18001dbfe98a8e2f5a9f30b9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index d10304aba..ecd1adb71 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188034 2013-06-08 08:01:33Z andrea $ +# $Id: PKGBUILD 189597 2013-07-03 17:03:20Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-strigi-analyzer -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('70feca363d1a5d5aa9d784d62819a34eb701054f') +sha1sums=('b7db0edf8113faa4796cd585e41e514a7218a720') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 28bc7a4a2..379e553fb 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188035 2013-06-08 08:01:34Z andrea $ +# $Id: PKGBUILD 189598 2013-07-03 17:03:22Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-svgpart -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A KPart for viewing SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('356f0bb93514b240a67b0a02edad15ac5e107fdb') +sha1sums=('fcd7759b4a92217c93188ed82e4cff7817013bb5') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 9899dfda2..86b7e82cf 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188036 2013-06-08 08:01:37Z andrea $ +# $Id: PKGBUILD 189599 2013-07-03 17:03:23Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-thumbnailers -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e9c939d22a4dd6c17cdda9da964434e014d6b771') +sha1sums=('88631de08af153d1c745ba2cd0468e8cb7474217') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 07668c7ca..ec7cd1264 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188037 2013-06-08 08:01:38Z andrea $ +# $Id: PKGBUILD 189600 2013-07-03 17:03:25Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-audiocd-kio -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('7dbd0c6b08fe0b4223012f7332e661c9cd046697') +sha1sums=('d215fe1ec68cee0b833ed82ad34c4850400cc081') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 8dbb1014e..4063f5ce2 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188038 2013-06-08 08:01:40Z andrea $ +# $Id: PKGBUILD 189601 2013-07-03 17:03:26Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-dragonplayer -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" @@ -14,7 +14,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('c7ff43b01890318ed0c629eed64fe36cc2e15db6') +sha1sums=('58cf5d6fa420257665032c70cf8a70485af45a97') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index e13727f75..06a5ea7ea 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188039 2013-06-08 08:01:41Z andrea $ +# $Id: PKGBUILD 189602 2013-07-03 17:03:29Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('6c1e4fcb3fe8ecabca3a49718b815eda0f20c5cc') +sha1sums=('68fb56a2cb51672f250566baeb36e489cc15909c') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index 21b5969d1..74e764944 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188040 2013-06-08 08:01:42Z andrea $ +# $Id: PKGBUILD 189603 2013-07-03 17:03:31Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-juk -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('92af1645405b88aef85505649e68e3fcab4a7841') +sha1sums=('9f3aec6a41e3089c0a97feb48d94cd5d206c252a') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index c80bd5971..c4461646d 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188041 2013-06-08 08:01:44Z andrea $ +# $Id: PKGBUILD 189604 2013-07-03 17:03:33Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-kmix -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('d392101358196e0b99bc15846b895dff9c88cafc') +sha1sums=('80b29d1c360dbebf1516c92de144f823012491ee') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index 68535f731..9100df02d 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188042 2013-06-08 08:01:45Z andrea $ +# $Id: PKGBUILD 189605 2013-07-03 17:03:37Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-kscd -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('e3e3c0b60897559ce3f5ff8a0f5dfe7bcd10ae98') +sha1sums=('8573e185d1e3ca05eda2f7a37ff7500859e3d0e3') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 50d42c92c..09cf52e1d 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188043 2013-06-08 08:01:46Z andrea $ +# $Id: PKGBUILD 189606 2013-07-03 17:03:38Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-mplayerthumbs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('3b82041ae4a297c448971bb3faeb9e5492654310') +sha1sums=('dc72e06f6298647635b7490e8acff75a14aa0682') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index d0084d9fe..839aec6f8 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188553 2013-06-15 11:11:29Z andrea $ +# $Id: PKGBUILD 189607 2013-07-03 17:03:42Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -10,8 +10,8 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -22,7 +22,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' +sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') prepare() { @@ -49,7 +49,7 @@ package_kdenetwork-filesharing() { pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' depends=('kdelibs' 'smbclient') install='kdenetwork.install' - cd $srcdir/build/filesharing + cd $srcdir/build/kdenetwork-filesharing make DESTDIR=$pkgdir install } @@ -67,8 +67,6 @@ package_kdenetwork-kget() { install='kdenetwork-kget.install' cd $srcdir/build/kget make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kget - make DESTDIR=$pkgdir install } package_kdenetwork-kopete() { @@ -79,7 +77,7 @@ package_kdenetwork-kopete() { install='kdenetwork-kopete.install' cd $srcdir/build/kopete make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kopete + cd $srcdir/build/kopete/doc make DESTDIR=$pkgdir install } @@ -90,7 +88,7 @@ package_kdenetwork-kppp() { install='kdenetwork-kppp.install' cd $srcdir/build/kppp make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kppp + cd $srcdir/build/kppp/doc make DESTDIR=$pkgdir install } @@ -103,7 +101,7 @@ package_kdenetwork-krdc() { url="http://kde.org/applications/internet/krdc/" cd $srcdir/build/krdc make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krdc + cd $srcdir/build/krdc/doc make DESTDIR=$pkgdir install } @@ -115,6 +113,6 @@ package_kdenetwork-krfb() { depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt') cd $srcdir/build/krfb make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krfb + cd $srcdir/build/krfb/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 53b441d4c..ee0bdc6b3 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187929 2013-06-08 07:59:07Z andrea $ +# $Id: PKGBUILD 189492 2013-07-03 17:00:37Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdepim-runtime -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1ef9a4b6224363db2c3b50199dd302cea57c3a27') +sha1sums=('f0b18cd320973c02d9b52cce9f4f424cb868d7fb') build() { mkdir build diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 5925dfdb3..5cfd48c93 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188045 2013-06-08 08:01:51Z andrea $ +# $Id: PKGBUILD 189608 2013-07-03 17:03:45Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3') +sha1sums=('a7c791e748558a194d020104dc62604ee9f632ae') build() { mkdir build diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 711a15a1c..cb3c45865 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187925 2013-06-08 07:59:03Z andrea $ +# $Id: PKGBUILD 189488 2013-07-03 17:00:33Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdepimlibs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('58f785dbc07932aad01bd7beeeceacc8fefac0bd') +sha1sums=('3e5ab28312cf1f194d8b3c1999102a4de8029146') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 36ffb50b8..af65796b5 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188046 2013-06-08 08:01:54Z andrea $ +# $Id: PKGBUILD 189609 2013-07-03 17:03:48Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -20,7 +20,6 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-applets-fuzzy-clock' 'kdeplasma-addons-applets-icontasks' 'kdeplasma-addons-applets-incomingmsg' - 'kdeplasma-addons-applets-kdeobservatory' 'kdeplasma-addons-applets-kimpanel' 'kdeplasma-addons-applets-knowledgebase' 'kdeplasma-addons-applets-kolourpicker' @@ -77,7 +76,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -86,7 +85,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('bdc8f5db0253132f8007d52fc79d8aa2ea2f9e0a') +sha1sums=('d2198e25bdde0f9b4ce6ce0024c4662dc97e5fa4') build() { mkdir build @@ -224,14 +223,6 @@ package_kdeplasma-addons-applets-incomingmsg() { make DESTDIR=$pkgdir install } -package_kdeplasma-addons-applets-kdeobservatory() { - pkgdesc='Visualize the KDE ecosystem' - depends=('kdeplasma-addons-libs' 'qwt') - install='kdeplasma-addons.install' - cd $srcdir/build/applets/kdeobservatory - make DESTDIR=$pkgdir install -} - package_kdeplasma-addons-applets-kimpanel() { pkgdesc='A generic input method panel for Oriental languages' depends=('kdeplasma-addons-libs') diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 5f01e6cf9..02038f6f7 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188716 2013-06-18 14:20:59Z andrea $ +# $Id: PKGBUILD 189497 2013-07-03 17:00:42Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('167c7bc7f9f83f4017f006e2b4c2a3ec24eb6c9d' +sha1sums=('39cca1dad490ba9ec36b43967afc0159d7343185' 'dc70306c507083cf9b4bb1c536858742292fa1bf') prepare() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index fe9ccc28e..9438c55f0 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188047 2013-06-08 08:01:57Z andrea $ +# $Id: PKGBUILD 189610 2013-07-03 17:03:51Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -16,7 +16,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-poxml' 'kdesdk-strigi-analyzers' 'kdesdk-umbrello') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -26,7 +26,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('da886df4ddebb12e760db7469de1350feed2b338' +sha1sums=('e14780cfd63f14cc4b5ec2f769af6a5e9b416940' '07db42bbcae402c292eebf002e549b04162621c5') prepare() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 82b8283fd..983557a0b 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188048 2013-06-08 08:01:58Z andrea $ +# $Id: PKGBUILD 189611 2013-07-03 17:03:53Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('ad148c0b8acdcc8062d832ca21bb84284bcab841') +sha1sums=('acecc68284addf327b70a72c787befd2cc0f28d2') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 640a23dd4..595bf319f 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188050 2013-06-08 08:02:01Z andrea $ +# $Id: PKGBUILD 189613 2013-07-03 17:03:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-filelight -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('acc3004826ae3afd3f87463b6c36661c566a8c7b') +sha1sums=('0028141091901b08b133d338e6c4ce44448b680c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index a353e8007..3a48dfe1f 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188051 2013-06-08 08:02:03Z andrea $ +# $Id: PKGBUILD 189614 2013-07-03 17:03:57Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kcalc -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('8c8aa571a6e3541e276128503358c6de6bf8e20a') +sha1sums=('9c9f3219482d5a90e8c90d5fc0a3fa53c947d150') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index b9a6050b5..3c0f6a6da 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188052 2013-06-08 08:02:07Z andrea $ +# $Id: PKGBUILD 189615 2013-07-03 17:03:58Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kcharselect -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('bd3525ffc4fbd2e0f8fbbdd377b00ac21ae9241d') +sha1sums=('0d3ff509cd38ba290160575d7456ec17bfe00628') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index ea0a98205..e66710594 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188053 2013-06-08 08:02:10Z andrea $ +# $Id: PKGBUILD 189616 2013-07-03 17:03:59Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kdf -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('9d0c6f9a476610670cc7775b6bb5cc5f014f8536') +sha1sums=('23c17847fa52849c90920f4a4717d578aedc0cdc') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 4c2132cb3..35a0a901f 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188054 2013-06-08 08:02:11Z andrea $ +# $Id: PKGBUILD 189617 2013-07-03 17:04:01Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kfloppy -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('12160f2b5e7bb94cd72d090627f39b4eaa2ae03e') +sha1sums=('9758ded1ad5a664d4f22f4de16e3809549495ee5') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index e65e73ee2..cabb44d86 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188055 2013-06-08 08:02:12Z andrea $ +# $Id: PKGBUILD 189618 2013-07-03 17:04:02Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kgpg -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('b4d9773326dfe16f3b50b6f16b52c906b7c3180e') +sha1sums=('4875e0940e4e18d4be9c428c66aaaf204950ae3c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 0055dd061..370f8f557 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino pkgname=kdeutils-kremotecontrol -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('9e8ee623f83a7d909b1e4385430c9716807bfa2e') +sha1sums=('c87ff44502352ae63120991866c239544d28d3ca') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 941ce4024..bbed13ed3 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188057 2013-06-08 08:02:15Z andrea $ +# $Id: PKGBUILD 189620 2013-07-03 17:04:05Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-ktimer -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('f98109823013dd6ee7cff81e55f338dbd8695eab') +sha1sums=('f34c6b40a9cc581ab03bd79839276fdd9885b356') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index fe6775d69..e652cb72a 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188058 2013-06-08 08:02:17Z andrea $ +# $Id: PKGBUILD 189621 2013-07-03 17:04:10Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-kwallet -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('47198c116fab656279090e9461daf334381554b2') +sha1sums=('ff945ff2cee1a0e9bcccd3d526dd077028c21308') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index d1413f616..482fed6e2 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188059 2013-06-08 08:02:19Z andrea $ +# $Id: PKGBUILD 189622 2013-07-03 17:04:11Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-print-manager -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A tool for managing print jobs and printers" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin conflicts=('print-manager') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz") -sha1sums=('a2adfbb31a78f1f7978997844c1d758fac53098a') +sha1sums=('fb8df7bf5f9bd6da2099e9dadf3cdf20f20a9083') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 076733688..8f45ecc82 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188060 2013-06-08 08:02:21Z andrea $ +# $Id: PKGBUILD 189623 2013-07-03 17:04:13Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-superkaramba -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('0c5addd5093d676ba2733c7132d4a231f0e6955e') +sha1sums=('7e41f314431432b1d5b7b51432f6c80b910b3e55') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index 0dca0e0e0..2483df6f8 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188061 2013-06-08 08:02:22Z andrea $ +# $Id: PKGBUILD 189624 2013-07-03 17:04:14Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeutils-sweeper -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('646e60691f68bfbff9b5ecc57cf0e198a6229a53') +sha1sums=('e88a8782c33ba5ca8893c8df4826dc699de1cccb') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 0b6e21741..012021044 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188062 2013-06-08 08:02:24Z andrea $ +# $Id: PKGBUILD 189625 2013-07-03 17:04:16Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('d54b8a154350795613080a5f28f56bbf80c10ed2') +sha1sums=('6d81be773a08fe41cbd34ac178107e3ba3a96181') build() { cd $srcdir diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index 5b170e1f8..400704ad0 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187950 2013-06-08 07:59:30Z andrea $ +# $Id: PKGBUILD 189513 2013-07-03 17:01:08Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkcddb -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a9017c1922ee56f51c16c617e9046ccb6149ccd5') +sha1sums=('125568df9a1f8e1f78f29d6e85ac7681100ed9ff') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index 54076552f..1587cfe25 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187951 2013-06-08 07:59:31Z andrea $ +# $Id: PKGBUILD 189514 2013-07-03 17:01:09Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkcompactdisc -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d442e7d4257b68f182815f3a4330982a026b7dc3') +sha1sums=('69c63adeaa2d449a36f7cb7b9735321e7f8e3fc2') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index d002cce09..f7035e9c4 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187945 2013-06-08 07:59:25Z andrea $ +# $Id: PKGBUILD 189508 2013-07-03 17:00:59Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdcraw -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3390eb344d62f7e44fe5db65eb171d397142fa96') +sha1sums=('fc124bb21db24dea02233e26f852628e10dd11d4') build() { mkdir build diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index f649ce39f..060b9df15 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187943 2013-06-08 07:59:23Z andrea $ +# $Id: PKGBUILD 189506 2013-07-03 17:00:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdeedu -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('78b56f1388be8fcbfc0d9f4f9e395a6ae5f25d7f') +sha1sums=('40c7aa6d23f31389bb72ae9f2c25bbdfe54d34f5') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index d476fe562..dbc2b5b92 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187952 2013-06-08 07:59:32Z andrea $ +# $Id: PKGBUILD 189515 2013-07-03 17:01:10Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdegames -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Common code and data for many KDE games" url="https://projects.kde.org/projects/kde/kdegames/libkdegames" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkdegames') conflicts=('kdegames-libkdegames') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5c3ff5f9ac6c7f4c80044e67cad1863631c0a7e6') +sha1sums=('d4f343d27fbc83e8b31b6bf2cb626e893b9ac515') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 481469389..cd287d589 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187946 2013-06-08 07:59:26Z andrea $ +# $Id: PKGBUILD 189509 2013-07-03 17:01:01Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkexiv2 -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('88db6d3eae13ac1dd0113e456cb1f6ad8f31c7b3') +sha1sums=('9521acdb66893006143bffdba81d2dbf140ce27f') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 8c33e2ffc..102ec9816 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino pkgname=libkipi -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('f4d96eddaad6e160c3ca579420117ed2deec74f6') +sha1sums=('a9ead1c184938ea17b3bc0162dabb4df7ae4673b') build() { cd "${srcdir}" diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index 3e34fc790..870d7ac09 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187953 2013-06-08 07:59:33Z andrea $ +# $Id: PKGBUILD 189516 2013-07-03 17:01:11Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkmahjongg -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles" url="https://projects.kde.org/projects/kde/kdegames/libmahjongg" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkmahjongg') conflicts=('kdegames-libkmahjongg') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5bb8fbcc696702489fb12dde5f8a098aecdd9a3a') +sha1sums=('5dbed099eea3338088b61173c512dda4c92747a4') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 547d50985..825cdb9b0 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187948 2013-06-08 07:59:28Z andrea $ +# $Id: PKGBUILD 189511 2013-07-03 17:01:05Z andrea $ # Maintainer: Andrea Scarpino pkgname=libksane -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6bb65bd85a9e65dfc20448a359df77c11e6aca55') +sha1sums=('5142d582390b031751dc410bdef80253dd596dfb') build() { cd "${srcdir}" diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD index faa38a667..8a8a70bd8 100644 --- a/extra/libmspack/PKGBUILD +++ b/extra/libmspack/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136796 2011-09-01 15:19:12Z andyrtr $ +# $Id: PKGBUILD 189640 2013-07-03 19:24:42Z andyrtr $ # Maintainer: AndyRTR pkgname=libmspack -pkgver=0.3alpha +pkgver=0.4alpha pkgrel=1 pkgdesc="A library for Microsoft compression formats" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glibc') makedepends=() options=('!libtool') source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz) -md5sums=('08d08455b6d58ea649b35febd23f6386') +md5sums=('1ab10b507259993c74b4c41a88103b59') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 9b2d22f58..8b8274c63 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188904 2013-06-24 21:48:21Z lcarlier $ +# $Id: PKGBUILD 189335 2013-07-03 08:11:31Z lcarlier $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=libxi -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org" @@ -12,20 +12,8 @@ depends=('libxext' 'inputproto') makedepends=('pkgconfig' 'xorg-util-macros' 'libxfixes' 'automake') options=(!libtool) license=('custom') -source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2 - git-fixes.diff) -sha256sums=('e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5' - 'faa2f76f68e65f537062829ad45977561079ac8747bd8e24a82055e70a5bf0cc') - -prepare() { - cd "${srcdir}/libXi-${pkgver}" - - # fix CVE-2013-1998 CVE-2013-1984 CVE-2013-1995 merged upstream - patch -Np1 -i ${srcdir}/git-fixes.diff - - # a patch change configure.ac - autoreconf -fiv -} +source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) +sha256sums=('df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/libxi/git-fixes.diff b/extra/libxi/git-fixes.diff deleted file mode 100644 index b1b4f40d9..000000000 --- a/extra/libxi/git-fixes.diff +++ /dev/null @@ -1,1386 +0,0 @@ -From bb82c72a1d69eaf60b7586570faf797df967f661 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Mon, 29 Apr 2013 18:39:34 -0700 -Subject: [PATCH 01/16] Expand comment on the memory vs. reply ordering in - XIGetSelectedEvents() - -Unpacking from the wire involves un-interleaving the structs & masks, -which wasn't obvious to me the first time I read it, so make notes -before I forget again. - -Signed-off-by: Alan Coopersmith -Signed-off-by: Peter Hutterer ---- - src/XISelEv.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/XISelEv.c b/src/XISelEv.c -index fa7eb54..f871222 100644 ---- a/src/XISelEv.c -+++ b/src/XISelEv.c -@@ -135,8 +135,14 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - - _XRead(dpy, (char*)mask_in, reply.length * 4); - -- /* Memory layout of the XIEventMask for a 3 mask reply: -- * [struct a][struct b][struct c][masks a][masks b][masks c] -+ /* -+ * This function takes interleaved xXIEventMask structs & masks off -+ * the wire, such as this 3 mask reply: -+ * [struct a][masks a][struct b][masks b][struct c][masks c] -+ * And generates a memory buffer to be returned to callers in which -+ * they are not interleaved, so that callers can treat the returned -+ * pointer as a simple array of XIEventMask structs, such as: -+ * [struct a][struct b][struct c][masks a][masks b][masks c] - */ - len = reply.num_masks * sizeof(XIEventMask); - --- -1.8.3.1 - - -From 5d43d4914dcabb6de69859567061e99300e56ef4 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 17 May 2013 09:07:44 +1000 -Subject: [PATCH 02/16] Copy the sequence number into the target event too - (#64687) - -X.Org Bug 64687 - -Signed-off-by: Peter Hutterer -Reviewed-by: Jasper St. Pierre ---- - src/XExtInt.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 507573b..8e19b97 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -915,6 +915,7 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -+ cookie->serial = ev->sequenceNumber; - } - - static Bool -@@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) - out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1793,6 +1795,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) - cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len); - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1825,6 +1828,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie) - out->info = (XIHierarchyInfo*)&out[1]; - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1865,6 +1869,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook - - out = next_block(&ptr, sizeof(XIRawEvent)); - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1915,6 +1920,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie) - out->buttons.mask = (unsigned char*)&out[1]; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1957,6 +1963,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie) - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1977,6 +1984,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -2004,6 +2012,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie) - - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); --- -1.8.3.1 - - -From 59b8e1388a687f871831ac5a9e0ac11de75e2516 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Wed, 1 May 2013 23:58:39 -0700 -Subject: [PATCH 03/16] Use _XEatDataWords to avoid overflow of rep.length bit - shifting - -rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds - -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - configure.ac | 6 ++++++ - src/XGMotion.c | 2 +- - src/XGetDCtl.c | 2 +- - src/XGetDProp.c | 5 ++--- - src/XGetFCtl.c | 2 +- - src/XGetKMap.c | 2 +- - src/XGetMMap.c | 2 +- - src/XGetProp.c | 4 +--- - src/XGtSelect.c | 2 +- - src/XIProperties.c | 7 +++---- - src/XIint.h | 14 ++++++++++++++ - src/XListDProp.c | 2 +- - src/XListDev.c | 2 +- - src/XOpenDev.c | 2 +- - src/XQueryDv.c | 2 +- - 15 files changed, 36 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8dbca38..f5ef1e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,6 +31,12 @@ PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] - # CFLAGS only for PointerBarrier typedef - PKG_CHECK_MODULES(XFIXES, [xfixes >= 5]) - -+# Check for _XEatDataWords function that may be patched into older Xlib releases -+SAVE_LIBS="$LIBS" -+LIBS="$XI_LIBS" -+AC_CHECK_FUNCS([_XEatDataWords]) -+LIBS="$SAVE_LIBS" -+ - # Check for xmlto and asciidoc for man page conversion - # (only needed by people building tarballs) - if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then -diff --git a/src/XGMotion.c b/src/XGMotion.c -index 99b1c44..5feac85 100644 ---- a/src/XGMotion.c -+++ b/src/XGMotion.c -@@ -112,7 +112,7 @@ XGetDeviceMotionEvents( - Xfree(bufp); - Xfree(savp); - *nEvents = 0; -- _XEatData(dpy, (unsigned long)size); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (NULL); -diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c -index c66212d..f73a4e8 100644 ---- a/src/XGetDCtl.c -+++ b/src/XGetDCtl.c -@@ -95,7 +95,7 @@ XGetDeviceControl( - nbytes = (long)rep.length << 2; - d = (xDeviceState *) Xmalloc((unsigned)nbytes); - if (!d) { -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - sav = d; -diff --git a/src/XGetDProp.c b/src/XGetDProp.c -index 5d44f91..f9e8f0c 100644 ---- a/src/XGetDProp.c -+++ b/src/XGetDProp.c -@@ -112,14 +112,13 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- nbytes = rep.length << 2; -- _XEatData(dpy, (unsigned long) nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadImplementation); - } - if (! *prop) { -- _XEatData(dpy, (unsigned long) nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadAlloc); -diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c -index 43afa00..28fab4d 100644 ---- a/src/XGetFCtl.c -+++ b/src/XGetFCtl.c -@@ -95,7 +95,7 @@ XGetFeedbackControl( - nbytes = (long)rep.length << 2; - f = (xFeedbackState *) Xmalloc((unsigned)nbytes); - if (!f) { -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - sav = f; -diff --git a/src/XGetKMap.c b/src/XGetKMap.c -index 9431fbb..00dde06 100644 ---- a/src/XGetKMap.c -+++ b/src/XGetKMap.c -@@ -99,7 +99,7 @@ XGetDeviceKeyMapping(register Display * dpy, XDevice * dev, - if (mapping) - _XRead(dpy, (char *)mapping, nbytes); - else -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - } - - UnlockDisplay(dpy); -diff --git a/src/XGetMMap.c b/src/XGetMMap.c -index 8a1cdb2..ce10c2d 100644 ---- a/src/XGetMMap.c -+++ b/src/XGetMMap.c -@@ -92,7 +92,7 @@ XGetDeviceModifierMapping( - if (res->modifiermap) - _XReadPad(dpy, (char *)res->modifiermap, nbytes); - else -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - res->max_keypermod = rep.numKeyPerModifier; - } - -diff --git a/src/XGetProp.c b/src/XGetProp.c -index c5d088b..34bc581 100644 ---- a/src/XGetProp.c -+++ b/src/XGetProp.c -@@ -68,7 +68,6 @@ XGetDeviceDontPropagateList( - int *count) - { - XEventClass *list = NULL; -- int rlen; - xGetDeviceDontPropagateListReq *req; - xGetDeviceDontPropagateListReply rep; - XExtDisplayInfo *info = XInput_find_display(dpy); -@@ -90,7 +89,6 @@ XGetDeviceDontPropagateList( - *count = rep.count; - - if (*count) { -- rlen = rep.length << 2; - list = (XEventClass *) Xmalloc(rep.length * sizeof(XEventClass)); - if (list) { - int i; -@@ -105,7 +103,7 @@ XGetDeviceDontPropagateList( - list[i] = (XEventClass) ec; - } - } else -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - } - - UnlockDisplay(dpy); -diff --git a/src/XGtSelect.c b/src/XGtSelect.c -index f890db7..5c0f812 100644 ---- a/src/XGtSelect.c -+++ b/src/XGtSelect.c -@@ -104,7 +104,7 @@ XGetSelectedExtensionEvents( - (XEventClass *) Xmalloc(*this_client_count * - sizeof(XEventClass)); - if (!*this_client_list) { -- _XEatData(dpy, (unsigned long)tlen + alen); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (Success); -diff --git a/src/XIProperties.c b/src/XIProperties.c -index 83a7a68..5e58fb6 100644 ---- a/src/XIProperties.c -+++ b/src/XIProperties.c -@@ -64,7 +64,7 @@ XIListProperties(Display* dpy, int deviceid, int *num_props_return) - props = (Atom*)Xmalloc(rep.num_properties * sizeof(Atom)); - if (!props) - { -- _XEatData(dpy, rep.num_properties << 2); -+ _XEatDataWords(dpy, rep.length); - goto cleanup; - } - -@@ -203,8 +203,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- nbytes = rep.length << 2; -- _XEatData(dpy, nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadImplementation); -@@ -222,7 +221,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - *data = Xmalloc(rbytes); - - if (!(*data)) { -- _XEatData(dpy, nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadAlloc); -diff --git a/src/XIint.h b/src/XIint.h -index 571bb23..3ddc3c5 100644 ---- a/src/XIint.h -+++ b/src/XIint.h -@@ -83,4 +83,18 @@ next_block(void **ptr, int size) { - return ret; - } - -+#ifndef HAVE__XEATDATAWORDS -+#include /* for LONG64 on 64-bit platforms */ -+#include -+ -+static inline void _XEatDataWords(Display *dpy, unsigned long n) -+{ -+# ifndef LONG64 -+ if (n >= (ULONG_MAX >> 2)) -+ _XIOError(dpy); -+# endif -+ _XEatData (dpy, n << 2); -+} -+#endif -+ - #endif -diff --git a/src/XListDProp.c b/src/XListDProp.c -index 8667350..bde6cb5 100644 ---- a/src/XListDProp.c -+++ b/src/XListDProp.c -@@ -65,7 +65,7 @@ XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return) - props = (Atom*)Xmalloc(rep.nAtoms * sizeof(Atom)); - if (!props) - { -- _XEatData(dpy, rep.nAtoms << 2); -+ _XEatDataWords(dpy, rep.length); - goto cleanup; - } - -diff --git a/src/XListDev.c b/src/XListDev.c -index bd6e70a..1fa4747 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -202,7 +202,7 @@ XListInputDevices( - list = (xDeviceInfo *) Xmalloc(rlen); - slist = list; - if (!slist) { -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (XDeviceInfo *) NULL; -diff --git a/src/XOpenDev.c b/src/XOpenDev.c -index 74f18ac..e784f8b 100644 ---- a/src/XOpenDev.c -+++ b/src/XOpenDev.c -@@ -101,7 +101,7 @@ XOpenDevice( - if (rlen - dlen > 0) - _XEatData(dpy, (unsigned long)rlen - dlen); - } else -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - - UnlockDisplay(dpy); - SyncHandle(); -diff --git a/src/XQueryDv.c b/src/XQueryDv.c -index 24d4e4e..69c285b 100644 ---- a/src/XQueryDv.c -+++ b/src/XQueryDv.c -@@ -91,7 +91,7 @@ XQueryDeviceState( - if (rlen > 0) { - data = Xmalloc(rlen); - if (!data) { -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - _XRead(dpy, data, rlen); --- -1.8.3.1 - - -From f3e08e4fbe40016484ba795feecf1a742170ffc1 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 9 Mar 2013 22:26:52 -0800 -Subject: [PATCH 04/16] Stack buffer overflow in XGetDeviceButtonMapping() - [CVE-2013-1998 1/3] - -We copy the entire reply sent by the server into the fixed size -mapping[] array on the stack, even if the server says it's a larger -size than the mapping array can hold. HULK SMASH STACK! - -Reported-by: Ilja Van Sprundel -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XGetBMap.c | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -diff --git a/src/XGetBMap.c b/src/XGetBMap.c -index 211c9ca..002daba 100644 ---- a/src/XGetBMap.c -+++ b/src/XGetBMap.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include - #include - #include "XIint.h" -+#include - - #ifdef MIN /* some systems define this in */ - #undef MIN -@@ -75,7 +76,6 @@ XGetDeviceButtonMapping( - { - int status = 0; - unsigned char mapping[256]; /* known fixed size */ -- long nbytes; - XExtDisplayInfo *info = XInput_find_display(dpy); - - register xGetDeviceButtonMappingReq *req; -@@ -92,13 +92,18 @@ XGetDeviceButtonMapping( - - status = _XReply(dpy, (xReply *) & rep, 0, xFalse); - if (status == 1) { -- nbytes = (long)rep.length << 2; -- _XRead(dpy, (char *)mapping, nbytes); -- -- /* don't return more data than the user asked for. */ -- if (rep.nElts) -- memcpy((char *)map, (char *)mapping, MIN((int)rep.nElts, nmap)); -- status = rep.nElts; -+ if (rep.length <= (sizeof(mapping) >> 2)) { -+ unsigned long nbytes = rep.length << 2; -+ _XRead(dpy, (char *)mapping, nbytes); -+ -+ /* don't return more data than the user asked for. */ -+ if (rep.nElts) -+ memcpy(map, mapping, MIN((int)rep.nElts, nmap)); -+ status = rep.nElts; -+ } else { -+ _XEatDataWords(dpy, rep.length); -+ status = 0; -+ } - } else - status = 0; - UnlockDisplay(dpy); --- -1.8.3.1 - - -From 91434737f592e8f5cc1762383882a582b55fc03a Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 9 Mar 2013 23:37:23 -0800 -Subject: [PATCH 05/16] memory corruption in _XIPassiveGrabDevice() - [CVE-2013-1998 2/3] - -If the server returned more modifiers than the caller asked for, -we'd just keep copying past the end of the array provided by the -caller, writing over who-knows-what happened to be there. - -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XIPassiveGrab.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c -index ac17c01..53b4084 100644 ---- a/src/XIPassiveGrab.c -+++ b/src/XIPassiveGrab.c -@@ -88,7 +88,7 @@ _XIPassiveGrabDevice(Display* dpy, int deviceid, int grabtype, int detail, - return -1; - _XRead(dpy, (char*)failed_mods, reply.num_modifiers * sizeof(xXIGrabModifierInfo)); - -- for (i = 0; i < reply.num_modifiers; i++) -+ for (i = 0; i < reply.num_modifiers && i < num_modifiers; i++) - { - modifiers_inout[i].status = failed_mods[i].status; - modifiers_inout[i].modifiers = failed_mods[i].modifiers; --- -1.8.3.1 - - -From 5398ac0797f7516f2c9b8f2869a6c6d071437352 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Fri, 26 Apr 2013 22:48:36 -0700 -Subject: [PATCH 06/16] unvalidated lengths in XQueryDeviceState() - [CVE-2013-1998 3/3] - -If the lengths given for each class state in the reply add up to more -than the rep.length, we could read past the end of the buffer allocated -to hold the data read from the server. - -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XQueryDv.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/XQueryDv.c b/src/XQueryDv.c -index 69c285b..3836777 100644 ---- a/src/XQueryDv.c -+++ b/src/XQueryDv.c -@@ -59,6 +59,7 @@ SOFTWARE. - #include - #include - #include "XIint.h" -+#include - - XDeviceState * - XQueryDeviceState( -@@ -66,8 +67,8 @@ XQueryDeviceState( - XDevice *dev) - { - int i, j; -- int rlen; -- int size = 0; -+ unsigned long rlen; -+ size_t size = 0; - xQueryDeviceStateReq *req; - xQueryDeviceStateReply rep; - XDeviceState *state = NULL; -@@ -87,9 +88,11 @@ XQueryDeviceState( - if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) - goto out; - -- rlen = rep.length << 2; -- if (rlen > 0) { -- data = Xmalloc(rlen); -+ if (rep.length > 0) { -+ if (rep.length < (INT_MAX >> 2)) { -+ rlen = (unsigned long) rep.length << 2; -+ data = Xmalloc(rlen); -+ } - if (!data) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -97,6 +100,10 @@ XQueryDeviceState( - _XRead(dpy, data, rlen); - - for (i = 0, any = (XInputClass *) data; i < (int)rep.num_classes; i++) { -+ if (any->length > rlen) -+ goto out; -+ rlen -= any->length; -+ - switch (any->class) { - case KeyClass: - size += sizeof(XKeyState); --- -1.8.3.1 - - -From b0b13c12a8079a5a0e7f43b2b8983699057b2cec Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 07/16] integer overflow in XGetDeviceControl() [CVE-2013-1984 - 1/8] - -If the number of valuators reported by the server is large enough that -it overflows when multiplied by the size of the appropriate struct, then -memory corruption can occur when more bytes are copied from the X server -reply than the size of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, so -we don't read out of bounds either - -Reported-by: Ilja Van Sprundel -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XGetDCtl.c | 31 ++++++++++++++++++++++++------- - 1 file changed, 24 insertions(+), 7 deletions(-) - -diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c -index f73a4e8..51ed0ae 100644 ---- a/src/XGetDCtl.c -+++ b/src/XGetDCtl.c -@@ -61,6 +61,7 @@ SOFTWARE. - #include - #include - #include "XIint.h" -+#include - - XDeviceControl * - XGetDeviceControl( -@@ -68,8 +69,6 @@ XGetDeviceControl( - XDevice *dev, - int control) - { -- int size = 0; -- int nbytes, i; - XDeviceControl *Device = NULL; - XDeviceControl *Sav = NULL; - xDeviceState *d = NULL; -@@ -92,8 +91,12 @@ XGetDeviceControl( - goto out; - - if (rep.length > 0) { -- nbytes = (long)rep.length << 2; -- d = (xDeviceState *) Xmalloc((unsigned)nbytes); -+ unsigned long nbytes; -+ size_t size = 0; -+ if (rep.length < (INT_MAX >> 2)) { -+ nbytes = (unsigned long) rep.length << 2; -+ d = Xmalloc(nbytes); -+ } - if (!d) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -111,33 +114,46 @@ XGetDeviceControl( - case DEVICE_RESOLUTION: - { - xDeviceResolutionState *r; -+ size_t val_size; - - r = (xDeviceResolutionState *) d; -- size += sizeof(XDeviceResolutionState) + -- (3 * sizeof(int) * r->num_valuators); -+ if (r->num_valuators >= (INT_MAX / (3 * sizeof(int)))) -+ goto out; -+ val_size = 3 * sizeof(int) * r->num_valuators; -+ if ((sizeof(xDeviceResolutionState) + val_size) > nbytes) -+ goto out; -+ size += sizeof(XDeviceResolutionState) + val_size; - break; - } - case DEVICE_ABS_CALIB: - { -+ if (sizeof(xDeviceAbsCalibState) > nbytes) -+ goto out; - size += sizeof(XDeviceAbsCalibState); - break; - } - case DEVICE_ABS_AREA: - { -+ if (sizeof(xDeviceAbsAreaState) > nbytes) -+ goto out; - size += sizeof(XDeviceAbsAreaState); - break; - } - case DEVICE_CORE: - { -+ if (sizeof(xDeviceCoreState) > nbytes) -+ goto out; - size += sizeof(XDeviceCoreState); - break; - } - default: -+ if (d->length > nbytes) -+ goto out; - size += d->length; - break; - } - -- Device = (XDeviceControl *) Xmalloc((unsigned)size); -+ Device = Xmalloc(size); - if (!Device) - goto out; - -@@ -150,6 +166,7 @@ XGetDeviceControl( - int *iptr, *iptr2; - xDeviceResolutionState *r; - XDeviceResolutionState *R; -+ unsigned int i; - - r = (xDeviceResolutionState *) d; - R = (XDeviceResolutionState *) Device; --- -1.8.3.1 - - -From 322ee3576789380222d4403366e4fd12fb24cb6a Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 08/16] integer overflow in XGetFeedbackControl() - [CVE-2013-1984 2/8] - -If the number of feedbacks reported by the server is large enough that -it overflows when multiplied by the size of the appropriate struct, or -if the total size of all the feedback structures overflows when added -together, then memory corruption can occur when more bytes are copied from -the X server reply than the size of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, so - we don't read out of bounds either - -Reported-by: Ilja Van Sprundel -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XGetFCtl.c | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c -index 28fab4d..bb50bf3 100644 ---- a/src/XGetFCtl.c -+++ b/src/XGetFCtl.c -@@ -61,6 +61,7 @@ SOFTWARE. - #include - #include - #include "XIint.h" -+#include - - XFeedbackState * - XGetFeedbackControl( -@@ -68,8 +69,6 @@ XGetFeedbackControl( - XDevice *dev, - int *num_feedbacks) - { -- int size = 0; -- int nbytes, i; - XFeedbackState *Feedback = NULL; - XFeedbackState *Sav = NULL; - xFeedbackState *f = NULL; -@@ -91,9 +90,16 @@ XGetFeedbackControl( - goto out; - - if (rep.length > 0) { -+ unsigned long nbytes; -+ size_t size = 0; -+ int i; -+ - *num_feedbacks = rep.num_feedbacks; -- nbytes = (long)rep.length << 2; -- f = (xFeedbackState *) Xmalloc((unsigned)nbytes); -+ -+ if (rep.length < (INT_MAX >> 2)) { -+ nbytes = rep.length << 2; -+ f = Xmalloc(nbytes); -+ } - if (!f) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -102,6 +108,10 @@ XGetFeedbackControl( - _XRead(dpy, (char *)f, nbytes); - - for (i = 0; i < *num_feedbacks; i++) { -+ if (f->length > nbytes) -+ goto out; -+ nbytes -= f->length; -+ - switch (f->class) { - case KbdFeedbackClass: - size += sizeof(XKbdFeedbackState); -@@ -116,6 +126,8 @@ XGetFeedbackControl( - { - xStringFeedbackState *strf = (xStringFeedbackState *) f; - -+ if (strf->num_syms_supported >= (INT_MAX / sizeof(KeySym))) -+ goto out; - size += sizeof(XStringFeedbackState) + - (strf->num_syms_supported * sizeof(KeySym)); - } -@@ -130,10 +142,12 @@ XGetFeedbackControl( - size += f->length; - break; - } -+ if (size > INT_MAX) -+ goto out; - f = (xFeedbackState *) ((char *)f + f->length); - } - -- Feedback = (XFeedbackState *) Xmalloc((unsigned)size); -+ Feedback = Xmalloc(size); - if (!Feedback) - goto out; - --- -1.8.3.1 - - -From 6dd6dc51a2935c72774be81e5cc2ba2c30e9feff Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 09/16] integer overflow in XGetDeviceDontPropagateList() - [CVE-2013-1984 3/8] - -If the number of event classes reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -V2: EatData if count is 0 but length is > 0 to avoid XIOErrors - -Reported-by: Ilja Van Sprundel -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XGetProp.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/XGetProp.c b/src/XGetProp.c -index 34bc581..b49328c 100644 ---- a/src/XGetProp.c -+++ b/src/XGetProp.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include - #include - #include "XIint.h" -+#include - - XEventClass * - XGetDeviceDontPropagateList( -@@ -88,10 +89,11 @@ XGetDeviceDontPropagateList( - } - *count = rep.count; - -- if (*count) { -- list = (XEventClass *) Xmalloc(rep.length * sizeof(XEventClass)); -+ if (rep.length != 0) { -+ if ((rep.count != 0) && (rep.length < (INT_MAX / sizeof(XEventClass)))) -+ list = Xmalloc(rep.length * sizeof(XEventClass)); - if (list) { -- int i; -+ unsigned int i; - CARD32 ec; - - /* read and assign each XEventClass separately because --- -1.8.3.1 - - -From bb922ed4253b35590f0369f32a917ff89ade0830 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 10/16] integer overflow in XGetDeviceMotionEvents() - [CVE-2013-1984 4/8] - -If the number of events or axes reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -Reported-by: Ilja Van Sprundel -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XGMotion.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/XGMotion.c b/src/XGMotion.c -index 5feac85..a4c75b6 100644 ---- a/src/XGMotion.c -+++ b/src/XGMotion.c -@@ -59,6 +59,7 @@ SOFTWARE. - #include - #include - #include "XIint.h" -+#include - - XDeviceTimeCoord * - XGetDeviceMotionEvents( -@@ -74,7 +75,7 @@ XGetDeviceMotionEvents( - xGetDeviceMotionEventsReply rep; - XDeviceTimeCoord *tc; - int *data, *bufp, *readp, *savp; -- long size, size2; -+ unsigned long size; - int i, j; - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -104,10 +105,21 @@ XGetDeviceMotionEvents( - SyncHandle(); - return (NULL); - } -- size = rep.length << 2; -- size2 = rep.nEvents * (sizeof(XDeviceTimeCoord) + (rep.axes * sizeof(int))); -- savp = readp = (int *)Xmalloc(size); -- bufp = (int *)Xmalloc(size2); -+ if (rep.length < (INT_MAX >> 2)) { -+ size = rep.length << 2; -+ savp = readp = Xmalloc(size); -+ } else { -+ size = 0; -+ savp = readp = NULL; -+ } -+ /* rep.axes is a CARD8, so assume max number of axes for bounds check */ -+ if (rep.nEvents < -+ (INT_MAX / (sizeof(XDeviceTimeCoord) + (UCHAR_MAX * sizeof(int))))) { -+ size_t bsize = rep.nEvents * -+ (sizeof(XDeviceTimeCoord) + (rep.axes * sizeof(int))); -+ bufp = Xmalloc(bsize); -+ } else -+ bufp = NULL; - if (!bufp || !savp) { - Xfree(bufp); - Xfree(savp); --- -1.8.3.1 - - -From 242f92b490a695fbab244af5bad11b71f897c732 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 11/16] integer overflow in XIGetProperty() [CVE-2013-1984 5/8] - -If the number of items reported by the server is large enough that -it overflows when multiplied by the size of the appropriate item type, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -Reported-by: Ilja Van Sprundel -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XIProperties.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/XIProperties.c b/src/XIProperties.c -index 5e58fb6..32436d1 100644 ---- a/src/XIProperties.c -+++ b/src/XIProperties.c -@@ -38,6 +38,7 @@ - #include - #include - #include "XIint.h" -+#include - - Atom* - XIListProperties(Display* dpy, int deviceid, int *num_props_return) -@@ -170,7 +171,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - { - xXIGetPropertyReq *req; - xXIGetPropertyReply rep; -- long nbytes, rbytes; -+ unsigned long nbytes, rbytes; - - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -216,9 +217,11 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - * recopy the string to make it null terminated. - */ - -- nbytes = rep.num_items * rep.format/8; -- rbytes = nbytes + 1; -- *data = Xmalloc(rbytes); -+ if (rep.num_items < (INT_MAX / (rep.format/8))) { -+ nbytes = rep.num_items * rep.format/8; -+ rbytes = nbytes + 1; -+ *data = Xmalloc(rbytes); -+ } - - if (!(*data)) { - _XEatDataWords(dpy, rep.length); --- -1.8.3.1 - - -From 528419b9ef437e7eeafb41bf45e8ff7d818bd845 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 12/16] integer overflow in XIGetSelectedEvents() - [CVE-2013-1984 6/8] - -If the number of events or masks reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -or the sizes overflow as they are totaled up, then memory corruption can -occur when more bytes are copied from the X server reply than the size -of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, - so that we don't read out of bounds either - -Reported-by: Ilja Van Sprundel -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XISelEv.c | 25 +++++++++++++++++++------ - 1 file changed, 19 insertions(+), 6 deletions(-) - -diff --git a/src/XISelEv.c b/src/XISelEv.c -index f871222..0471bef 100644 ---- a/src/XISelEv.c -+++ b/src/XISelEv.c -@@ -42,6 +42,7 @@ in this Software without prior written authorization from the author. - #include - #include - #include "XIint.h" -+#include - - int - XISelectEvents(Display* dpy, Window win, XIEventMask* masks, int num_masks) -@@ -101,13 +102,14 @@ out: - XIEventMask* - XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - { -- int i, len = 0; -+ unsigned int i, len = 0; - unsigned char *mask; - XIEventMask *mask_out = NULL; - xXIEventMask *mask_in = NULL, *mi; - xXIGetSelectedEventsReq *req; - xXIGetSelectedEventsReply reply; - XExtDisplayInfo *info = XInput_find_display(dpy); -+ size_t rbytes; - - *num_masks_return = -1; - LockDisplay(dpy); -@@ -129,11 +131,16 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - goto out; - } - -- mask_in = Xmalloc(reply.length * 4); -- if (!mask_in) -+ if (reply.length < (INT_MAX >> 2)) { -+ rbytes = (unsigned long) reply.length << 2; -+ mask_in = Xmalloc(rbytes); -+ } -+ if (!mask_in) { -+ _XEatDataWords(dpy, reply.length); - goto out; -+ } - -- _XRead(dpy, (char*)mask_in, reply.length * 4); -+ _XRead(dpy, (char*)mask_in, rbytes); - - /* - * This function takes interleaved xXIEventMask structs & masks off -@@ -148,8 +155,14 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - - for (i = 0, mi = mask_in; i < reply.num_masks; i++) - { -- len += mi->mask_len * 4; -- mi = (xXIEventMask*)((char*)mi + mi->mask_len * 4); -+ unsigned int mask_bytes = mi->mask_len * 4; -+ len += mask_bytes; -+ if (len > INT_MAX) -+ goto out; -+ if ((sizeof(xXIEventMask) + mask_bytes) > rbytes) -+ goto out; -+ rbytes -= (sizeof(xXIEventMask) + mask_bytes); -+ mi = (xXIEventMask*)((char*)mi + mask_bytes); - mi++; - } - --- -1.8.3.1 - - -From 17071c1c608247800b2ca03a35b1fcc9c4cabe6c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sun, 10 Mar 2013 13:30:55 -0700 -Subject: [PATCH 13/16] Avoid integer overflow in XGetDeviceProperties() - [CVE-2013-1984 7/8] - -If the number of items as reported by the Xserver is too large, it -could overflow the calculation for the size of the buffer to copy the -reply into, causing memory corruption. - -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XGetDProp.c | 61 ++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 37 insertions(+), 24 deletions(-) - -diff --git a/src/XGetDProp.c b/src/XGetDProp.c -index f9e8f0c..3691122 100644 ---- a/src/XGetDProp.c -+++ b/src/XGetDProp.c -@@ -38,6 +38,7 @@ in this Software without prior written authorization from the author. - #include - #include - #include "XIint.h" -+#include - - int - XGetDeviceProperty(Display* dpy, XDevice* dev, -@@ -48,7 +49,8 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - { - xGetDevicePropertyReq *req; - xGetDevicePropertyReply rep; -- long nbytes, rbytes; -+ unsigned long nbytes, rbytes; -+ int ret = Success; - - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -81,30 +83,43 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * data, but this last byte is null terminated and convenient for - * returning string properties, so the client doesn't then have to - * recopy the string to make it null terminated. -+ * -+ * Maximum item limits are set to both prevent integer overflow when -+ * calculating the amount of memory to malloc, and to limit how much -+ * memory will be used if a server provides an insanely high count. - */ - switch (rep.format) { - case 8: -- nbytes = rep.nItems; -- rbytes = rep.nItems + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XReadPad (dpy, (char *) *prop, nbytes); -+ if (rep.nItems < INT_MAX) { -+ nbytes = rep.nItems; -+ rbytes = rep.nItems + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XReadPad (dpy, (char *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - case 16: -- nbytes = rep.nItems << 1; -- rbytes = rep.nItems * sizeof (short) + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XRead16Pad (dpy, (short *) *prop, nbytes); -+ if (rep.nItems < (INT_MAX / sizeof (short))) { -+ nbytes = rep.nItems << 1; -+ rbytes = rep.nItems * sizeof (short) + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XRead16Pad (dpy, (short *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - case 32: -- nbytes = rep.nItems << 2; -- rbytes = rep.nItems * sizeof (long) + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XRead32 (dpy, (long *) *prop, nbytes); -+ if (rep.nItems < (INT_MAX / sizeof (long))) { -+ nbytes = rep.nItems << 2; -+ rbytes = rep.nItems * sizeof (long) + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XRead32 (dpy, (long *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - default: -@@ -112,16 +127,13 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- _XEatDataWords(dpy, rep.length); -- UnlockDisplay(dpy); -- SyncHandle(); -- return(BadImplementation); -+ ret = BadImplementation; - } - if (! *prop) { - _XEatDataWords(dpy, rep.length); -- UnlockDisplay(dpy); -- SyncHandle(); -- return(BadAlloc); -+ if (ret == Success) -+ ret = BadAlloc; -+ goto out; - } - (*prop)[rbytes - 1] = '\0'; - } -@@ -130,9 +142,10 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - *actual_format = rep.format; - *nitems = rep.nItems; - *bytes_after = rep.bytesAfter; -+ out: - UnlockDisplay (dpy); - SyncHandle (); - -- return Success; -+ return ret; - } - --- -1.8.3.1 - - -From ef82512288d8ca36ac0beeb289f158195b0a8cae Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sun, 10 Mar 2013 00:22:14 -0800 -Subject: [PATCH 14/16] Avoid integer overflow in XListInputDevices() - [CVE-2013-1984 8/8] - -If the length of the reply as reported by the Xserver is too long, it -could overflow the calculation for the size of the buffer to copy the -reply into, causing memory corruption. - -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XListDev.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index 1fa4747..1c14b96 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include - #include - #include "XIint.h" -+#include - - /* Calculate length field to a multiples of sizeof(XID). XIDs are typedefs - * to ulong and thus may be 8 bytes on some platforms. This can trigger a -@@ -179,7 +180,7 @@ XListInputDevices( - XAnyClassPtr Any; - char *nptr, *Nptr; - int i; -- long rlen; -+ unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); - - LockDisplay(dpy); -@@ -198,9 +199,10 @@ XListInputDevices( - - if ((*ndevices = rep.ndevices)) { /* at least 1 input device */ - size = *ndevices * sizeof(XDeviceInfo); -- rlen = rep.length << 2; /* multiply length by 4 */ -- list = (xDeviceInfo *) Xmalloc(rlen); -- slist = list; -+ if (rep.length < (INT_MAX >> 2)) { -+ rlen = rep.length << 2; /* multiply length by 4 */ -+ slist = list = Xmalloc(rlen); -+ } - if (!slist) { - _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); --- -1.8.3.1 - - -From 81b4df8ac6aa1520c41c3526961014a6f115cc46 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sun, 10 Mar 2013 00:16:22 -0800 -Subject: [PATCH 15/16] sign extension issue in XListInputDevices() - [CVE-2013-1995] - -nptr is (signed) char, which can be negative, and will sign extend -when added to the int size, which means size can be subtracted from, -leading to allocating too small a buffer to hold the data being copied -from the X server's reply. - -v2: check that string size fits inside the data read from the server, - so that we don't read out of bounds either - -Reported-by: Ilja Van Sprundel -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- - src/XListDev.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index 1c14b96..b85ff3c 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -73,7 +73,7 @@ static int pad_to_xid(int base_size) - return ((base_size + padsize - 1)/padsize) * padsize; - } - --static int -+static size_t - SizeClassInfo(xAnyClassPtr *any, int num_classes) - { - int size = 0; -@@ -170,7 +170,7 @@ XListInputDevices( - register Display *dpy, - int *ndevices) - { -- int size; -+ size_t size; - xListInputDevicesReq *req; - xListInputDevicesReply rep; - xDeviceInfo *list, *slist = NULL; -@@ -178,7 +178,7 @@ XListInputDevices( - XDeviceInfo *clist = NULL; - xAnyClassPtr any, sav_any; - XAnyClassPtr Any; -- char *nptr, *Nptr; -+ unsigned char *nptr, *Nptr; - int i; - unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); -@@ -217,9 +217,12 @@ XListInputDevices( - size += SizeClassInfo(&any, (int)list->num_classes); - } - -- for (i = 0, nptr = (char *)any; i < *ndevices; i++) { -+ Nptr = ((unsigned char *)list) + rlen + 1; -+ for (i = 0, nptr = (unsigned char *)any; i < *ndevices; i++) { - size += *nptr + 1; - nptr += (*nptr + 1); -+ if (nptr > Nptr) -+ goto out; - } - - clist = (XDeviceInfoPtr) Xmalloc(size); -@@ -245,8 +248,8 @@ XListInputDevices( - } - - clist = sclist; -- nptr = (char *)any; -- Nptr = (char *)Any; -+ nptr = (unsigned char *)any; -+ Nptr = (unsigned char *)Any; - for (i = 0; i < *ndevices; i++, clist++) { - clist->name = (char *)Nptr; - memcpy(Nptr, nptr + 1, *nptr); -@@ -256,6 +259,7 @@ XListInputDevices( - } - } - -+ out: - XFree((char *)slist); - UnlockDisplay(dpy); - SyncHandle(); --- -1.8.3.1 - - -From 661c45ca17c434dbd342a46fd3fb813852ae0ca9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 21 May 2013 12:23:05 +1000 -Subject: [PATCH 16/16] Don't overwrite the cookies serial number - -serial != sequenceNumber, see _XSetLastRequestRead() - -cookie->serial is already set at this point, setting it again directly from -the sequenceNumber of the event causes a bunch of weird issues such as -scrollbars and text drag-n-drop breaking. - -https://bugzilla.redhat.com/show_bug.cgi?id=965347 - -Signed-off-by: Peter Hutterer ---- - src/XExtInt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 8e19b97..d3c6b7c 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -915,7 +915,6 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -- cookie->serial = ev->sequenceNumber; - } - - static Bool --- -1.8.3.1 - diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index a6cc5b6af..84a3f01e3 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188255 2013-06-13 15:52:39Z giovanni $ +# $Id: PKGBUILD 189484 2013-07-03 16:37:06Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Jan de Groot pkgname=link-grammar -pkgver=4.7.12 +pkgver=4.7.14 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('f4f0b731dc0bbd1c7adfe9a8ef7ab116') +md5sums=('2d7771d8063aec6efb27a35663d67e9f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 37bfa9dff..0acf19815 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187158 2013-06-04 16:22:02Z giovanni $ +# $Id: PKGBUILD 189482 2013-07-03 16:31:41Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.6.2 +pkgver=2.6.3 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('55f6ea5982cf87836113376174826e8c' +md5sums=('99e311b2202057a259899f67b425e087' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 6fbd898c2..4c2241182 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187924 2013-06-08 07:59:02Z andrea $ +# $Id: PKGBUILD 189487 2013-07-03 17:00:32Z andrea $ # Maintainer: Andrea Scarpino pkgname=nepomuk-core -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('28d9641ffc1b877f0cd0d27343b56563ed2bc74d') +sha1sums=('416dbcc9e20d463ed8dc009a4cd7d26be6ffa6cc') build() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index dc3b46b3e..be62d7eb4 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187941 2013-06-08 07:59:20Z andrea $ +# $Id: PKGBUILD 189504 2013-07-03 17:00:54Z andrea $ # Maintainer: Andrea Scarpino pkgname=nepomuk-widgets -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="The Library containing the Nepomuk Widgets" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('fb7379a3b324b2660f220094c8273860722fe3f1') +sha1sums=('f796178217f69e211786f08ed7c40c39b96d25c9') build() { mkdir build diff --git a/extra/nx-common/NXproto.h.64bit.diff b/extra/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/extra/nx-common/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include - #include - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD deleted file mode 100644 index f5864f238..000000000 --- a/extra/nx-common/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 157435 2012-04-28 09:58:39Z andyrtr $ -# Maintainer: Tobias Powalowski -# Contributed: eliott , Andre Naumann - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=5 -pkgdesc="NoMachine NX common package for client and server" -arch=('i686' 'x86_64') -license=('GPL') -url="http://nomachine.com/" -depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' -makedepends=('xorg-server-devel' 'nx-headers') -source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch) -options=('!libtool') -md5sums=('84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c') - -build() { - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - ./configure --prefix=/usr/lib/nx - make - - # nxssh - cd ${srcdir}/nxssh - sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib - make -} - -package() { - install -dm755 ${pkgdir}/usr/{bin,lib/nx} - - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} . - # ^ really needed? - - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh - cd ${pkgdir}/usr/bin - ln -sv /usr/lib/nx/bin/nxssh . -} diff --git a/extra/nx-common/nx-3.5.0-libpng15.patch b/extra/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/extra/nx-common/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/extra/nx-common/nxcompsh-gcc43.patch b/extra/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/extra/nx-common/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include -+#include - --#include --#include -+#include -+#include -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD deleted file mode 100644 index 466077c1d..000000000 --- a/extra/opennx/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 175949 2013-01-25 09:52:43Z andyrtr $ -# Maintainer: AndyRTR -# Contributor: Armin Luntzer -# Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk - -pkgname=opennx -pkgver=0.16.0.725 -pkgrel=1 -pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser" -url="http://opennx.sf.net/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl' 'nx-common') -makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat') -#optdepends=('cups: for full local printing support') -source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz) -md5sums=('6bfe389638ac9c14fa89ca56b0c671b6') - -build() { - cd $srcdir/opennx* - ./configure --prefix=/usr \ - --enable-usbip - make -} - -package() { - cd $srcdir/opennx* - make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} install-man - - # fix some file locations - install -dm755 ${pkgdir}/usr/share/applications - cp -aR ${pkgdir}/usr/share/applnk/xdg/* ${pkgdir}/usr/share/applications - rm -rf ${pkgdir}/usr/share/applnk - - sed -i -e "s:Exec=/usr/NX/bin/opennx:Exec=/usr/bin/opennx:" ${pkgdir}/usr/share/applications/*.desktop -} diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD index 283a541e8..5a9028ff4 100644 --- a/extra/xmlsec/PKGBUILD +++ b/extra/xmlsec/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 135818 2011-08-18 15:05:00Z andyrtr $ +# $Id: PKGBUILD 189642 2013-07-03 19:47:13Z andyrtr $ # Maintainer: AndyRTR # Contributor: Jan de Groot # Contributor: Hussam Al-Tayeb pkgname=xmlsec -pkgver=1.2.18 -pkgrel=2 +pkgver=1.2.19 +pkgrel=1 pkgdesc="XML Security Library is a C library based on LibXML2" license=('custom') arch=(i686 x86_64) url="http://www.aleksey.com/xmlsec/index.html" -depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool') -makedepends=('pkgconfig') +depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl') options=('!libtool') source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) -md5sums=('8694b4609aab647186607f79e1da7f1a') +md5sums=('fe664ba5f01ebfaeb0ab5deeb0b2249e') build() { cd ${srcdir}/${pkgname}1-${pkgver} diff --git a/java/not-working/closure-compiler/PKGBUILD b/java/not-working/closure-compiler/PKGBUILD deleted file mode 100644 index 8318379a2..000000000 --- a/java/not-working/closure-compiler/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# Maintainer: Luke Shumaker - -pkgname=closure-compiler -pkgver=20120917 -_pkgrev=2180 -pkgdesc="A JavaScript optimizing compiler." -url="https://code.google.com/closure/compiler/" -license=('Apache') - -pkgrel=1 -arch=('any') -depends=('java-runtime') -makedepends=( - 'apache-ant' - 'java-args4j' # does not exist - 'google-caja' # does not exist - 'java-guava' # does not build - 'java-jarjar' - 'java-json' # does not exist - 'java-jsr305' # does not exist - 'junit' - 'java-protobuf' # does not build - # maven-ant-tasks - 'jh') -source=("compiler-$pkgver::svn+http://closure-compiler.googlecode.com/svn/trunk/#revision=$_pkgrev") - -# For some reason, `file` detects this as a Fortran binary -_funny_js=( - lib/rhino/testsrc/benchmarks/sunspider-0.9.1/bitops-3bit-bits-in-byte.js -) - -mksource() { - cd "$srcdir/compiler-$pkgver" - rm lib/ant.jar - rm lib/ant-launcher.jar - rm lib/args4j.jar - rm lib/caja-r4314.jar - rm lib/guava.jar - rm lib/jarjar.jar - rm lib/json.jar - rm lib/jsr305.jar - rm lib/junit.jar - rm lib/protobuf-java.jar - rm lib/rhino/testsrc/org/mozilla/javascript/tests/commonjs/module/modules.jar - rm tools/maven-ant-tasks-2.1.3.jar -} - -build() { - cd "$srcdir/compiler-$pkgver" - eval `jh mksource ${_funny_js[@]}` - - ln -s /opt/apache-ant/lib/ant.jar lib/ant.jar - ln -s /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar - ln -s /usr/share/java/... lib/args4j.jar - ln -s /usr/share/java/... lib/caja-r4314.jar - ln -s /usr/share/java/... lib/guava.jar - ln -s /usr/share/java/jarjar.jar lib/jarjar.jar - ln -s /usr/share/java/... lib/json.jar - ln -s /usr/share/java/... lib/jsr305.jar - ln -s /usr/share/java/junit.jar lib/junit.jar - ln -s /usr/share/java/protobuf.jar lib/protobuf-java.jar - # I think lib/rhino/.../module.jar autogenerates - ln -s /... tools/maven-ant-tasks-2.1.3.jar - - ant jar -} - -package() { - cd "$srcdir/$pkgname" - : -} - -md5sums=('SKIP') diff --git a/java/not-working/closure-compiler/TODO b/java/not-working/closure-compiler/TODO deleted file mode 100644 index 8527a4898..000000000 --- a/java/not-working/closure-compiler/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* Has plenty of missing dependencies (most of the 'not-working' folder) -* package() has not been written diff --git a/java/not-working/java-asm4/PKGBUILD b/java/not-working/java-asm4/PKGBUILD deleted file mode 100644 index 3db06dddc..000000000 --- a/java/not-working/java-asm4/PKGBUILD +++ /dev/null @@ -1,17 +0,0 @@ -# Maintainer: Luke Shumaker - -pkgver=4.1 -. ../java-asm2/common.sh -depends+=('java-bnd') - -#### - -pkgrel=5 -_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz) - -mksource() { - cd "$srcdir/$_pkgname-$pkgver" - rm examples/jasmin/test/jasmin.jar -} - -md5sums=('cbfd7445edc517e0867ad410e48cb106') diff --git a/java/not-working/java-asm4/TODO b/java/not-working/java-asm4/TODO deleted file mode 100644 index 563c88bc9..000000000 --- a/java/not-working/java-asm4/TODO +++ /dev/null @@ -1 +0,0 @@ -Depends on java-bnd, which is not packaged \ No newline at end of file diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD deleted file mode 100644 index 0250e7183..000000000 --- a/java/not-working/java-guava/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Luke Shumaker - -_pkgname=guava -pkgname=java-guava -pkgver=13.0.1 -pkgdesc="Google Core Libraries for Java." -url="https://code.google.com/p/guava-libraries/" -license=('Apache2') - -pkgrel=1 -arch=('any') -depends=('java-runtime>=5') -makedepends=('java-runtime>=6' 'maven' 'junit-truth' 'jh') -conflicts=('openjdk6') # OpenJDK bug 100167 conflicts -source=("$pkgname::git+https://code.google.com/p/guava-libraries/#tag=v$pkgver") - -mksource() { - cd "$srcdir/$pkgname" - rm guava/lib/*.jar - rm guava-test/lib/*.jar -} - -build() { - cd "$srcdir/$pkgname" - eval `jh mksource` - - ln -s /usr/share/java/junit-truth.jar guava-tests/lib/libtruth.java - - mvn package -} - -package() { - : -} diff --git a/java/not-working/java-guava/TODO b/java/not-working/java-guava/TODO deleted file mode 100644 index ee0a18042..000000000 --- a/java/not-working/java-guava/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* depends on junit-truth, which does not build yet -* package() hasn't been written diff --git a/java/not-working/junit-truth/PKGBUILD b/java/not-working/junit-truth/PKGBUILD deleted file mode 100644 index 61a0ee469..000000000 --- a/java/not-working/junit-truth/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: Luke Shumaker - -pkgname=junit-truth -pkgdesc="Assertion/Proposition framework for Java unit tests." -url="https://github.com/truth0/truth" -license=('Apache2') - -#_pkgver=0.5.0-beta1 -#pkgver=${_pkgver//-/.} -#_tag=v${_pkgver} - -#pkgver=0.7.0 -#_tag=truth-rel-${pkgver//./-} - -#pkgver=0.8 -#_tag=truth-${pkgver} - -#pkgver=0.9 -#_tag=release_${pkgver//./_} - -pkgver=0.10 -_tag=release_${pkgver//./_} - -pkgrel=1 -arch=('any') -depends=('junit') -makedepends=('maven' 'jh') -conflicts=('openjdk6') # OpenJDK bug 100167 conflicts -source=("$pkgname::git://github.com/truth0/truth.git#tag=$tag") - -build() { - cd "${srcdir}/${pkgname}" - jh checksource - mvn package -} - -package() { - cd "${srcdir}/${pkgname}" - install -d "${pkgdir}"/usr/share/java/${pkgname} - JAR=${pkgname}-${pkgver}.jar - install -Dm 644 target/${JAR} "${pkgdir}"/usr/share/java/${pkgname} - ln -s ${pkgname}/${JAR} "${pkgdir}"/usr/share/java/${pkgname}.jar -} - -md5sums=('SKIP') diff --git a/java/not-working/junit-truth/TODO b/java/not-working/junit-truth/TODO deleted file mode 100644 index d21b3e472..000000000 --- a/java/not-working/junit-truth/TODO +++ /dev/null @@ -1 +0,0 @@ -has unpackaged dependencies diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD deleted file mode 100644 index 699bde0cf..000000000 --- a/java/not-working/protobuf/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# Maintainer: Thomas S Hatch -# Contributor: Geoffroy Carrier -# Contributor: Daniel J Griffiths - -pkgbase=protobuf -pkgname=('protobuf' 'python2-protobuf' 'java-protobuf') -pkgver=2.4.1 -pkgrel=2.1 -pkgdesc="A way of encoding structured data in an efficient yet extensible format" -arch=('i686' 'x86_64') -url="http://code.google.com/p/protobuf/" -license=('APACHE') -depends=('gcc-libs' 'zlib') -makedepends=('python2' 'python2-distribute' 'java-environment') -options=(!libtool) -source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -md5sums=('ed436802019c9e1f40cc750eaf78f318') - -#### - -build() { - build_protobuf - build_python2-protobuf - build_java-protobuf -} - -check() { - check_protobuf - check_python2-protobuf - check_java-protobuf -} - -package() { - package_protobuf - package_python2-protobuf - package_java-protobuf -} - -#### - -build_protobuf() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-static - make -} - -check_protobuf() { - cd $srcdir/$pkgname-$pkgver - make check -} - -package_protobuf() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} - -#### - -build_python2-protobuf() { - cd $srcdir/$pkgname-$pkgver/python - python2 setup.py build -} - -check_python2-protobuf() { - cd $srcdir/$pkgname-$pkgver/python - python2 setup.py test -} - -package_python2-protobuf() { - pkgdesc="protobuf python2 API" - replaces=('protobuf-python') - provides=("protobuf-python=${pkgver}") - depends=("python2" "protobuf=${pkgver}") - - cd $srcdir/protobuf-$pkgver/python - python2 setup.py install --prefix=/usr --root $pkgdir -} - -#### - -build_java-protobuf() { - cd $srcdir/$pkgname-$pkgver/java - mvn compile -} - -check_java-protobuf() { - cd $srcdir/$pkgname-$pkgver/java - mvn test -} - -package_java-protobuf() { - pkgdesc="protobuf Java API" - replaces=('protobuf-java') - provides=("protobuf-java=${pkgver}") - depends=("java-runtime" "protobuf=${pkgver}") - - cd $srcdir/$pkgname-$pkgver/java - : -} diff --git a/java/not-working/protobuf/TODO b/java/not-working/protobuf/TODO deleted file mode 100644 index 6a126b757..000000000 --- a/java/not-working/protobuf/TODO +++ /dev/null @@ -1,5 +0,0 @@ -* Missing dependencies: - * junit:junit:4.4 (4.10 is packaged, patch to use 4.10?) - * org.easymock:easymock:2.2 - * org.easymock:easymockclassextension:2.2.1 -* package_java-protobuf() has not been written diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 1a0e3ddd0..3f83618e0 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ +# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.6 -pkgrel=2 +pkgver=2.6.6.7 +pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('a018efb1fe0f722ff307382791bf3c98') +md5sums=('10b6704f34568d226fb5fe69b7d6043d') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 7db206be9..2d5f48040 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ +# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.6 -pkgrel=2 +pkgver=2.6.6.7 +pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('a018efb1fe0f722ff307382791bf3c98') +md5sums=('10b6704f34568d226fb5fe69b7d6043d') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index d5a72e95c..f1264b0c7 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): Michał Masłowski @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d' +sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 4b6f40af9..224d304e1 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('f406c8c9e42c2508a7acf88b9719f5fa5b4683a1' +sha1sums=('1d472ceff3a38ff778803817b9c0eeb5b1880db6' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index ea698dfd7..8cdf5228e 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') -sha1sums=('b5db1b91bd96b44ebd1b5e71019bb95b59775237' +sha1sums=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 89ed6edf3..890c2ef66 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 188552 2013-06-15 11:11:13Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' +sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') prepare() { @@ -56,6 +56,6 @@ package_kdenetwork-kopete-libre() { install='kdenetwork-kopete.install' cd $srcdir/build/kopete make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kopete + cd $srcdir/build/kopete/doc make DESTDIR=$pkgdir install } diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 007ed7f74..3f9b3ce28 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva @@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3') +sha1sums=('a7c791e748558a194d020104dc62604ee9f632ae') build() { mkdir build diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 6b7a264ae..5efee348d 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('3b98f04817a31b14b8899ddf024b03ff14420ea7' +sha1sums=('8c50a864af0dbf62e3df46414c7bf9cd1d8c8620' 'a0a836950f185d9b2245204579f969203036fdec') build() { diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 4b46592d0..4983604a4 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,14 +2,15 @@ # Contributor: Márcio Silva pkgname=linux-libre-firmware -pkgver=3.9 -pkgrel=2 +_pkgver=3.9 +pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgrel=1 pkgdesc='Free firmware files for Linux-libre' arch=('any') url=('http://linux-libre.fsfla.org/' 'http://wireless.kernel.org/en/users/Drivers/ath9k_htc') license=('GPL2' 'BSD') -makedepends=('git' 'wget') +makedepends=('git' 'xtensa-unknown-elf-gcc') provides=('linux-firmware' 'kernel26-firmware=2.6.34.99') conflicts=('linux-firmware' @@ -37,41 +38,29 @@ replaces=('linux-firmware' 'rt2870usb-fw' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/linux-libre-$_pkgver-gnu.tar.xz" "git://github.com/qca/open-ath9k-htc-firmware") md5sums=('120df29f88622dabf7015a22c7cc8e25' 'SKIP') -prepare() { - - cd $srcdir/open-ath9k-htc-firmware - - # disable build error - sed -i 's|GMP,|GMP,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|MPFR,|MPFR,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|MPC,|MPC,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|BINUTILS,|BINUTILS,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|GCC,|GCC,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - ' Makefile - - # prepare toolchain to compile ath9k-htc firmware - make toolchain - -} - build() { cd $srcdir/open-ath9k-htc-firmware # create firmware folder to put the free firmware files there - mkdir -p $pkgdir/usr/lib/firmware + install -d -m755 $pkgdir/usr/lib/firmware + + # fix path on configure file + sed -i 's|$PWD/../toolchain/inst|/usr|; + 's|xtensa-elf|xtensa-unknown-elf|; + ' target_firmware/configure # compile ath9k-htc-firmware make -C target_firmware mv htc_{7010,9271}.fw $pkgdir/usr/lib/firmware - cd $srcdir/linux-$pkgver + cd $srcdir/linux-$_pkgver # compile free firmware files of linux-libre source code make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install @@ -80,6 +69,7 @@ build() { package() { + # create licenses folder to put the licenses files there install -d -m755 $pkgdir/usr/share/licenses/$pkgname # move LICENSE.TXT from ath9k-htc firmware to linux-firmware license folder @@ -87,7 +77,7 @@ package() { mv LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENCE.atheros_firmware # move WHENCE file to linux-firmware license folder - cd $srcdir/linux-$pkgver + cd $srcdir/linux-$_pkgver mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname } diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index d2c38b7d6..af130b5c0 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -8,11 +8,10 @@ arch=('any') url='https://projects.parabolagnulinux.org/hackers.git/' license=('GPL') install="${pkgname}.install" -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" - "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig") +source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig}) package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-"* make PREFIX=/usr DESTDIR=${pkgdir} install } md5sums=('007c35459478f86484f66323bf90b1e0' diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD index 2e29d1ff4..be9284c45 100644 --- a/libre/xtensa-unknown-elf-binutils/PKGBUILD +++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD @@ -1,23 +1,21 @@ # $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $ # Maintainer: Allan McRae # Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva _pkgname=binutils _target="xtensa-unknown-elf" -_sysroot="/usr/$CHOST/${_target}" pkgname=${_target}-binutils pkgver=2.23.2 -pkgrel=2.3 +pkgrel=2.4 pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=("${_target}-base-devel") depends=('glibc>=2.17' 'zlib') -checkdepends=('dejagnu' 'bc') -options=('!libtool' '!distcc' '!ccache') +options=('!libtool') install=${_target}-binutils.install source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} binutils-2.23.2-texinfo-5.0.patch) @@ -30,10 +28,7 @@ prepare() { # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935 # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542 - patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch - - # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure + patch -Np1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch mkdir ${srcdir}/binutils-build } @@ -41,56 +36,34 @@ prepare() { build() { cd ${srcdir}/binutils-build - CFLAGS=" -pipe " \ - CXXFLAGS=" -pipe " \ ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ - --with-lib-path=/usr/lib:/usr/local/lib \ - --with-bugurl=https://labs.parabola.nu/ \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --with-pic --enable-shared \ - --disable-werror --disable-multilib \ - --target=${_target} + --target=${_target} \ + --bindir=/usr/bin --sbindir=/usr/bin \ + --disable-nls \ + --enable-shared \ + --disable-multilib \ + --with-bugurl=https://labs.parabola.nu/ +# --libdir=/usr/lib --libexecdir=/usr/lib --with-lib-path=/usr/lib \ +# --enable-ld=default --enable-gold \ +# --enable-plugins --enable-threads \ +# --with-pic \ +# --disable-werror \ # check the host environment and makes sure all the necessary tools are available make configure-host - make tooldir=/usr -} - -check() { - cd ${srcdir}/binutils-build - - # unset LDFLAGS as testsuite makes assumptions about which ones are active - # do not abort on errors - manually check log files - make LDFLAGS="" -k check || true + make } package() { cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include - - # Install PIC libiberty.a - install -m644 libiberty/pic/libiberty.a ${pkgdir}/usr/lib + make prefix=${pkgdir}/usr install # Remove unwanted files rm ${pkgdir}/usr/share/man/man1/${_target}-{dlltool,nlmconv,windres,windmc}* - rm ${pkgdir}/usr/share/info/{configure,standards}.info # Remove unnecessary files and folders - rm -f $pkgdir/usr/bin/ar - rm -f $pkgdir/usr/bin/as - rm -f $pkgdir/usr/bin/ld - rm -f $pkgdir/usr/bin/nm - rm -f $pkgdir/usr/bin/objdump - rm -f $pkgdir/usr/bin/ranlib - rm -f $pkgdir/usr/bin/strip - rm -f $pkgdir/usr/bin/objcopy - rm -f $pkgdir/usr/include - rm -f $pkgdir/usr/lib/libiberty.a - rm -rf $pkgdir/usr/share + rm $pkgdir/usr/${_target}/bin/* && rmdir $pkgdir/usr/${_target}/bin + rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include + rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info } diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD index 6081151b7..797f67f9e 100644 --- a/libre/xtensa-unknown-elf-gcc/PKGBUILD +++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD @@ -10,7 +10,6 @@ _sysroot="/usr/$CHOST/${_target}" pkgname=${_target}-gcc pkgver=4.8.1 pkgrel=1 -#_snapshot=4.8-20130502 pkgdesc="The GNU Compiler Collection for Xtensa processors" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,15 +18,9 @@ makedepends=("binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 md5sums=('3b2386c114cd74185aa3754b58a79304') - -if [ -n "${_snapshot}" ]; then - _basedir=gcc-${_snapshot} -else - _basedir=gcc-${pkgver} -fi +_basedir=gcc-${pkgver} prepare() { cd ${srcdir}/${_basedir} @@ -40,28 +33,23 @@ prepare() { echo ${pkgver} > gcc/BASE-VER - # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure - mkdir ${srcdir}/gcc-build } build() { cd ${srcdir}/gcc-build - # using -pipe causes spurious test-suite failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 - CFLAGS=${CFLAGS/-pipe/} - CXXFLAGS=${CXXFLAGS/-pipe/} - - LD_LIBRARY_PATH=/usr/lib ${srcdir}/${_basedir}/configure --prefix=/usr \ - --disable-shared --disable-threads --disable-multilib \ - --enable-languages=c \ - --disable-nls \ - --target=$_target -# --build=x86_64-unknown-linux-gnu \ -# --without-headers \ -# --disable-multilib --disable-libssp --disable-werror \ + ${srcdir}/${_basedir}/configure --prefix=/home/marcio/src/xtensa-elf/tools \ + --target=${_target} \ + --disable-multilib \ + --disable-nls \ + --disable-shared \ + --disable-threads \ + --enable-languages=c \ + --disable-libquadmath \ + --disable-libssp \ + --with-newlib +# --disable-werror \ # --libdir=/usr/lib --libexecdir=/usr/lib \ # --mandir=/usr/share/man --infodir=/usr/share/info \ # --with-bugurl=https://labs.parabola.nu/ \ @@ -74,30 +62,14 @@ build() { # --enable-lto --enable-gold --enable-ld=default \ # --enable-plugin --with-plugin-ld=ld.gold \ # --with-linker-hash-style=gnu --disable-install-libiberty \ -# --with-as=/usr/bin/${_target}-as --with-ld=/usr/bin/${_target}-ld \ -# --disable-multilib --disable-libssp --disable-werror \ # --enable-checking=release \ -# --target=${_target} \ -# --with-newlib - make - + make all-gcc + # make documentation cd ${_target}/libstdc++-v3 make doc-man-doxygen } -check() { - cd ${srcdir}/gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${srcdir}/${_basedir}/contrib/test_summary -} - package() { pkgdesc="The GNU Compiler Collection" @@ -107,7 +79,7 @@ package() cd ${srcdir}/gcc-build - make -j1 DESTDIR=${pkgdir} install + make -j1 DESTDIR=${pkgdir} install-gcc install -d $pkgdir/usr/share/gdb/auto-load/usr/lib mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog new file mode 100644 index 000000000..fbe55643a --- /dev/null +++ b/pcr/hiredis/ChangeLog @@ -0,0 +1,4 @@ +2013-06-07 Vladimir Tsanev + + * 0.11.0-1 : + Initial PKGBUILD. diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD new file mode 100644 index 000000000..29762e87e --- /dev/null +++ b/pcr/hiredis/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Vladimir Tsanev + +pkgname=hiredis +pkgver=0.11.0 +pkgrel=1 +pkgdesc='minimalistic C client library for Redis' +arch=('x86_64' 'i686') +url="https://github.com/redis/hiredis/" +license=('BSD') +depends=('glibc') +changelog='ChangeLog' +source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver}) +md5sums=('e2ac29509823ccc96990b6fe765b5d46') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +# +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make test check c +#} + +package() { + + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX="$pkgdir/usr" clean dep install + + install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING" + +} diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD new file mode 100644 index 000000000..3e040a495 --- /dev/null +++ b/pcr/kamailio/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Xavier Devlamynck + +pkgname=kamailio +pkgver=4.0.1 +pkgrel=1 +pkgdesc="Rock solid SIP server" +url="http://www.kamailio.org/" +license=('GPL2') +arch=('i686' 'x86_64') +makedepends=('flex' 'bison' 'docbook2x' 'mariadb' 'postgresql' 'libxml2' + 'radiusclient-ng' 'lua51' 'mono' 'hiredis' 'libpurple' 'net-snmp' + 'libunistring' 'python2') +optdepends=('mariadb: mysql support' + 'expat: xmpp/jabber support' + 'libxml2: cpl and presence modules support' + 'radiusclient-ng: radius support' + 'postgresql: postgresql backend') +source=(http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz) +sha256sums=('dd8652f47a572c0b0e1e45bdd0f6f838a14e50f2dbbeed77726ec0c7076e1769') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make cfg prefix=/usr cfg_prefix=/ bin_dir=/usr/bin + make PYTHON="python2" all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=${pkgdir}/usr \ + PYTHON="python2" \ + cfg_prefix=${pkgdir} \ + bind_dir=${pkgdir}/usr/bin \ + bingroup_include="standard standard-dep stable experimental" \ + skip_modules="iptrtpproxy osp dbtext oracle" \ + install +} diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD new file mode 100644 index 000000000..2a6c0fac3 --- /dev/null +++ b/pcr/par/PKGBUILD @@ -0,0 +1,38 @@ +# Contributor: Federico Quagliata (quaqo) +# Contributor: quantax -- contact via Arch Linux forum or AUR + +pkgname=par +pkgver=1.52 +pkgrel=3 +pkgdesc="Paragraph reformatter" +url="http://www.nicemice.net/par/" +depends=('glibc') +arch=(i686 x86_64) +license=('Custom') +source=(http://www.nicemice.net/par/Par152-autoconf.tar.gz + http://www.nicemice.net/par/par_1.52-i18n.3.diff.gz + http://www.nicemice.net/par/Par152.tar.gz ) +md5sums=('83e4d23a943ab07c44dd995b73195c70' + 'e79b448cb14323a39d817afce4847cdf' + '4ccacd824171ba2c2f14fb8aba78b9bf') + +prepare() { + cd $srcdir/Par152 + + patch -p1 -i $srcdir/par_1.52-i18n.3.diff +} + +build() { + cd $srcdir/Par152 + + ./configure --prefix=/usr + + make +} + +package() { + cd $srcdir/Par152 + install --mode=755 -D par "${pkgdir}/usr/bin/par" + install --mode=644 -D par.1 "${pkgdir}/usr/share/man/man1/par.1" + install --mode=644 -D par.doc "${pkgdir}/usr/share/licenses/${pkgname}/par.doc" +} diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD index 9f77354b2..cb7d6bd45 100644 --- a/pcr/pybonjour/PKGBUILD +++ b/pcr/pybonjour/PKGBUILD @@ -16,4 +16,4 @@ md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2') package() { cd $srcdir/$pkgname-$pkgver python2 setup.py install --root=$pkgdir - } +} diff --git a/pcr/radiusclient-ng/PKGBUILD b/pcr/radiusclient-ng/PKGBUILD new file mode 100644 index 000000000..437030401 --- /dev/null +++ b/pcr/radiusclient-ng/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: Jonathan Liu +pkgname=radiusclient-ng +pkgver=0.5.6 +pkgrel=1 +pkgdesc="Client library and basic utilities for RADIUS AAA" +arch=(i686 x86_64) +url="http://wiki.freeradius.org/Radiusclient" +license=('custom:NetBSD') +depends=('bash') +conflicts=('freeradius-client') +source=(http://download.berlios.de/radiusclient-ng/$pkgname-$pkgver.tar.gz) +md5sums=('6fb7d4d0aefafaee7385831ac46a8e9c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc + make + +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + install -D -m644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" \ + "$pkgdir/usr/share/licenses/${pkgver}/COPYRIGHT" + +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ruby-haml/ruby-yard/PKGBUILD b/pcr/ruby-haml/ruby-yard/PKGBUILD deleted file mode 100644 index a686f937d..000000000 --- a/pcr/ruby-haml/ruby-yard/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Matt Harrison -# Contributor: Renzo Carbonara - -pkgname=ruby-yard -_gemname=${pkgname#ruby-} -pkgver=0.8.2.1 -pkgrel=2 -pkgdesc="Documentation tool for consistent and usable documentation in Ruby." -arch=('any') -url="http://yardoc.org" -license=('MIT') -groups=() -depends=() -makedepends=('rubygems') -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=("http://gems.rubyforge.org/gems/yard-${pkgver}.gem") -noextract=("yard-${pkgver}.gem") - -build() { - cd $srcdir - local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \ - -n "$pkgdir/usr/bin" ${_gemname}-$pkgver.gem - install -D "$pkgdir$_gemdir/gems/${_gemname}-$pkgver/LICENSE" \ - "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" -} - -md5sums=('08a48d23f8729b68945011cae7d121fe') - -# vim:set ts=2 sw=2 et: diff --git a/pcr/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD index 5e3699bce..dcabaa642 100644 --- a/pcr/transmission-remote-cli/PKGBUILD +++ b/pcr/transmission-remote-cli/PKGBUILD @@ -1,29 +1,25 @@ # Maintainer: fauno pkgname=transmission-remote-cli -pkgver=0.10.4 +pkgver=1.5.0 pkgrel=1 pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission" arch=('any') url="https://github.com/fagga/transmission-remote-cli" license=('GPL3') depends=('python2') -optdepends=('transmission-daemon>=2.40: for local transmission management' +optdepends=('transmission-daemon: for local transmission management' 'adns-python: Resolve IPs to host names' - 'python-geoip: Guess which country peers come from') + 'python2-geoip: Guess which country peers come from') conflicts=('transmission-remote-cli-git' "transmission-remote-cli<=20111013") replaces=('transmission-remote-cli-git') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz - python2.patch) +source=(https://github.com/fagga/${pkgname}/archive/v${pkgver}.tar.gz) -build() { +package() { cd "${srcdir}/${pkgname}" msg "Starting make..." - patch -Np1 -i ${srcdir}/python2.patch - install -d ${pkgdir}/usr/bin/ install -Dm755 transmission-remote-cli.py ${pkgdir}/usr/bin/transmission-remote-cli } -md5sums=('b85382bc2e24c5733f9c3833098da668' - '6273609fb3a7294328aeaa526b76411c') +md5sums=('4c13aa8596d35ce5793ea65affa8a6e5') diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD index 896d5bacf..fe8204d0a 100644 --- a/social/asterisk/PKGBUILD +++ b/social/asterisk/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Alessio Biancalana pkgname=asterisk -pkgver=10.9.0 +pkgver=11.0.1 pkgrel=1 pkgdesc="A complete PBX solution" arch=('i686' 'x86_64') @@ -15,20 +15,20 @@ source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$ asterisk \ asterisk.logrotated) install=$pkgname.install -md5sums=('2fb85dc753584ac13692c27f9749c6cb' +md5sums=('3e80a5cef7b0f8808578efcc84c39fd7' '59146273738605f1e011d8e7bed3561a' '486e07a0a1405ea25ec5b1736034653e') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make + make || return 1 } package(){ cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} samples + make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} samples || return 1 (cd ${pkgdir}/etc/asterisk # for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD deleted file mode 100755 index 885e06f0e..000000000 --- a/~lukeshu/not-working/codeanalyst/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# Maintainer (Parabola): Luke Shumaker -# Maintainer (AUR): Felipe Bugno - -# A note about the oprofile fork: -# The docs claim that the fork is just for adding support for -# processors that aren't upstream yet (at the time, they are now that -# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well: -# * AMD also added a bunch of CodeAnalyst-specific code. -# * Several external variables/types have different names; the API is -# incompatible. -# * [extra]/oprofile-0.9.7-3 only includes about half of the headers. - -pkgbase=CodeAnalyst -pkgname=(codeanalyst codeanalyst-cakm) -pkgver=3.3.18.0361 -_pkgver="${pkgver//./_}" -pkgrel=4.1 -pkgdesc="AMD performance profiler. Includes a fork of oprofile." -url="http://developer.amd.com/tools/${pkgbase}/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gcc' 'qt>=4.1' 'libdwarf') -makedepends=('linux-headers' 'elfutils' 'findutils' 'file') -options=('!strip') -install=codeanalyst.install -source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz" - 'gcc47.patch' - 'skipSetup.patch' - 'kernel3.4.patch' - 'codeanalyst.sudo' - 'codeanalyst.desktop' - 'codeanalyst.svg') - -build() { - build_codeanalyst - build_codeanalyst-cakm -} - -build_codeanalyst() { - cd "${srcdir}/${pkgbase}-${_pkgver}-Public" - patch -Np1 -i "${srcdir}/gcc47.patch" - patch -Np1 -i "${srcdir}/skipSetup.patch" - rm -rf src/dwarf-* # easiest way to ensure using the system install - - ./autogen.sh - ./configure --prefix=/usr \ - --with-libdwarf-includes=/usr/include/libdwarf \ - --with-libdwarf-libraries=/usr/lib - make -} - -build_codeanalyst-cakm() { - cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm - cp -r kernel2.6.38 kernel3.4 - cd kernel3.4 - patch -Np1 -i "${srcdir}/kernel3.4.patch" - make -} - -package_codeanalyst() { - provides=('oprofile=0.9.6cvs') - conflicts=('oprofile') - - cd "${srcdir}/${pkgbase}-${_pkgver}-Public" - make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial - - find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip - - cd "${srcdir}" - install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst" - install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg" - install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop" -} - -package_codeanalyst-cakm() { - pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko" - depends=(codeanalyst) - provides=() - - cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4 - install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko" -} - -md5sums=('f1e29bc7c7da259df228ce59281ee1d7' - '063d0fc9680641a92ce5e310ffe1c9c0' - 'ce549e59c4a5916fd19e8d085e863627' - '3a5d820a43a0360d561bb0c4d67d9735' - '3cc8f64fe84c5a886d0172ee8d99f690' - '3a18d3f7fb01f199a8ed5ae2908c18e4' - '1822a4157b82904b82e72fc1e9bcbd42') diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop deleted file mode 100755 index 56d54f884..000000000 --- a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=AMD CodeAnalyst -Comment=AMD profiler and performance analyzer -Exec=/usr/bin/CodeAnalyst -Icon=codeanalyst -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Development; diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install deleted file mode 100755 index 6ed1ac841..000000000 --- a/~lukeshu/not-working/codeanalyst/codeanalyst.install +++ /dev/null @@ -1,29 +0,0 @@ -post_install() { - getent group amdca &>/dev/null || groupadd amdca &>/dev/null - echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group" - echo " ie: gpasswd -a USERNAME amdca" - - chown root:amdca /usr/bin/calog_report - chown root:amdca /usr/bin/capackage.sh - chown root:amdca /usr/bin/careport.sh - chown root:amdca /usr/bin/cgreport - chown root:amdca /usr/bin/CodeAnalyst - chown root:amdca /usr/bin/opannotate - chown root:amdca /usr/bin/oparchive - chown root:amdca /usr/bin/opcontrol - chown root:amdca /usr/bin/opgprof - chown root:amdca /usr/bin/ophelp - chown root:amdca /usr/bin/opimport - chown root:amdca /usr/bin/opjitconv - chown root:amdca /usr/bin/opreport - chown root:amdca /usr/bin/oprofiled - chown root:amdca /usr/sbin/ca_oprofile_controller - #chown root:amdca /usr/sbin/ca_user_manager - - update-desktop-database -q -} - -post_remove() { - getent group amdca &>/dev/null && groupdel amdca &>/dev/null - update-desktop-database -q -} diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo deleted file mode 100755 index 1c3173bdb..000000000 --- a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo +++ /dev/null @@ -1 +0,0 @@ -%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg deleted file mode 100755 index 8febf725b..000000000 --- a/~lukeshu/not-working/codeanalyst/codeanalyst.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - -image/svg+xml - - - - - - \ No newline at end of file diff --git a/~lukeshu/not-working/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch deleted file mode 100755 index dfec4a0c4..000000000 --- a/~lukeshu/not-working/codeanalyst/gcc47.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am 2012-04-22 17:55:01.227439003 -0300 -*************** -*** 25,31 **** - cgcvt.cpp - - -! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@ - - AM_CPPFLAGS= $(INCLUDES) $(more_flags) \ - $(FLAG64) -Wno-unused -Wno-parentheses \ ---- 25,31 ---- - cgcvt.cpp - - -! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@ - - AM_CPPFLAGS= $(INCLUDES) $(more_flags) \ - $(FLAG64) -Wno-unused -Wno-parentheses \ -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp 2012-04-22 17:38:14.884058192 -0300 -*************** -*** 17,22 **** ---- 17,23 ---- - */ - - #include -+ #include - - #include "MonitorDockView.h" - -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp 2012-04-22 17:34:45.670714989 -0300 -*************** -*** 21,26 **** ---- 21,27 ---- - #include - #include - #include -+ #include - - #include "dwarfengine.h" - #define DWARF_DEBUG 0 -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp 2012-04-22 17:32:30.780708624 -0300 -*************** -*** 29,34 **** ---- 29,35 ---- - #include - #include - #include -+ #include - - // CodeAnalyst headers - #include "CaProfileWriter.h" -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp 2012-04-22 17:26:58.424026278 -0300 -*************** -*** 13,18 **** ---- 13,19 ---- - #include - #include - #include -+ #include - - #include "slock.h" - #include "smm.h" diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch deleted file mode 100644 index 589abc800..000000000 --- a/~lukeshu/not-working/codeanalyst/kernel3.4.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -ru kernel2.6.38/Makefile kernel3.4/Makefile ---- kernel2.6.38/Makefile 2012-04-13 01:41:43.000000000 -0400 -+++ kernel3.4/Makefile 2012-07-11 11:32:27.000000000 -0400 -@@ -1,6 +1,6 @@ - TARGET = oprofile.ko - --MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile) -+MDIR = arch/x86/oprofile - - DRIVER_OBJS = oprof.o cpu_buffer.o buffer_sync.o \ - event_buffer.o oprofile_files.o \ -@@ -16,7 +16,8 @@ - CURRENT = $(shell uname -r) - ARCH = $(if $(shell uname -m | grep x86_64),64,32) - KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386) --KDIR = /lib/modules/$(CURRENT)/build -+SYS_KDIR = /lib/modules/$(CURRENT)/build -+KDIR = $(PWD)/../build - PWD = $(shell pwd) - DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR) - USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0) -@@ -39,6 +40,8 @@ - all: default - - default: -+ rm -rf $(KDIR) -+ cp -r $(SYS_KDIR)/ $(KDIR) - make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH) - - install: -@@ -52,13 +55,12 @@ - - uninstall: - @echo "... Restore original oprofile.ko." -- @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) -+ @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) - - clean: - rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c - - prebuild: - cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko -- - ---include $(KDIR)/Rules.make -+-include $(SYS_KDIR)/Rules.make -Only in kernel3.4/: modules.order -Only in kernel3.4/: Module.symvers -diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c ---- kernel2.6.38/nmi_int.c 2012-04-13 01:41:43.000000000 -0400 -+++ kernel3.4/nmi_int.c 2012-07-11 11:32:27.000000000 -0400 -@@ -16,7 +16,6 @@ - #include - #include - #include "oprofile.h" --#include - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) - #include - #endif -diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c ---- kernel2.6.38/oprofilefs.c 2012-04-13 01:41:43.000000000 -0400 -+++ kernel3.4/oprofilefs.c 2012-07-11 11:32:27.000000000 -0400 -@@ -244,7 +244,7 @@ - return -ENOMEM; - root_inode->i_op = &simple_dir_inode_operations; - root_inode->i_fop = &simple_dir_operations; -- root_dentry = d_alloc_root(root_inode); -+ root_dentry = d_make_root(root_inode); - if (!root_dentry) { - iput(root_inode); - return -ENOMEM; -Only in kernel3.4/: .tmp_versions diff --git a/~lukeshu/not-working/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch deleted file mode 100755 index fdc9bf42f..000000000 --- a/~lukeshu/not-working/codeanalyst/skipSetup.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am 2012-04-22 20:44:07.437917684 -0300 -*************** -*** 8,19 **** - # FIXME [3.0] diffgui \ - # $(CA_RELEASE_TYPE) - -! install-exec-hook: -! @if test -e "scripts/Setup.sh"; then \ -! scripts/Setup.sh $(DESTDIR)$(prefix); \ -! fi - -! uninstall-hook: -! @if test -e "scripts/Uninstall.sh"; then \ -! scripts/Uninstall.sh $(DESTDIR)$(prefix);\ -! fi ---- 8,19 ---- - # FIXME [3.0] diffgui \ - # $(CA_RELEASE_TYPE) - -! #install-exec-hook: -! # @if test -e "scripts/Setup.sh"; then \ -! # scripts/Setup.sh $(DESTDIR)$(prefix); \ -! # fi - -! #uninstall-hook: -! # @if test -e "scripts/Uninstall.sh"; then \ -! # scripts/Uninstall.sh $(DESTDIR)$(prefix);\ -! # fi -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am 2012-04-22 20:47:21.604593511 -0300 -*************** -*** 15,20 **** - libCAJVMPIA_so_SOURCES = \ - jpa.cpp - -! install-exec-hook: -! @/sbin/ldconfig - ---- 15,20 ---- - libCAJVMPIA_so_SOURCES = \ - jpa.cpp - -! #install-exec-hook: -! # @/sbin/ldconfig - -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am -*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am 2012-04-22 20:44:57.674586720 -0300 -*************** -*** 8,21 **** - install-exec-hook: - @if test -e "${LIBDWARF_DIR}libdwarf.so"; then \ - install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \ -- /sbin/ldconfig ;\ - fi - - uninstall-hook: - @if test -e "${LIBDWARF_DIR}libdwarf.so"; then \ - if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \ - rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \ -- /sbin/ldconfig ; \ - fi ; \ - fi - ---- 8,19 ---- diff --git a/~lukeshu/openni-all/openni-git/PKGBUILD b/~lukeshu/openni-all/openni-git/PKGBUILD deleted file mode 100644 index 7ac6abb87..000000000 --- a/~lukeshu/openni-all/openni-git/PKGBUILD +++ /dev/null @@ -1,286 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Sven Schneider -# Contributor: bugix -# Contributor: Lubosz Sarnecki - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-git' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=20111121 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -_gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -#_gitbranch="unstable" -_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker" - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_platform}/Build/Makefile" - - - # BUILD - cd "Platform/${_platform}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-git() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-git-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-git-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-git-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-git-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_platform}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-git-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-git-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-git-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-git-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-git-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-git-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-git/openni.install b/~lukeshu/openni-all/openni-git/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-git/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD deleted file mode 100644 index 0ebfac2e5..000000000 --- a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: pallegro from the AUR - -_pkgname=openni-module-primesensor -pkgname=${_pkgname}-git -pkgver=20111115 -pkgrel=1 -pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device" -arch=('i686') -url="http://www.primesense.com/" -license=('GPL') -depends=('openni') -makedepends=('git') -provides=($_pkgname) -conflicts=($_pkgname) -install="sensorkinect.install" -source=() -md5sums=() - -_gitroot="https://github.com/PrimeSense/Sensor.git" -_gitname="primesensor" -_gitbranch="unstable" -#_gitbranch="master" - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone -b $_gitbranch $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd $srcdir/$_gitname-build - - # BUILD - cd Platform/Linux-x86/Build - make NI_CONF_DIR=/etc || return 1 -} - -package() { - install -d -m755 ${pkgdir}/usr/{lib,bin} - - cd $srcdir/$_gitname-build/Platform/Linux-x86/Bin/Release - install XnSensorServer ${pkgdir}/usr/bin - install libXnCore.so libXnDDK.so libXnDeviceFile.so libXnDeviceSensorV2KM.so libXnFormats.so ${pkgdir}/usr/lib - chmod +s ${pkgdir}/usr/bin/XnSensorServer - - cd $srcdir/$_gitname-build/Platform/Linux-x86/Install - install -d -m755 ${pkgdir}/etc/udev/rules.d - install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d - - cd $srcdir/$_gitname-build/Data - install -d -m755 ${pkgdir}/etc/primesense - install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense - - install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer -} diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD deleted file mode 100644 index 2a2abbdc5..000000000 --- a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: pallegro from the AUR - -pkgname=openni-module-sensorkinect-git -pkgver=20111211 -pkgrel=2 -pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device" -arch=('i686' 'x86_64') -url="https://github.com/avin2/SensorKinect" -license=('GPL') -depends=('openni-unstable' 'kinect-udev') -makedepends=('git') -provides=('openni-module-sensorkinect') -conflicts=('openni-module-sensorkinect' 'openni-module-primesensor') -install="sensorkinect.install" -source=() -md5sums=() - -_gitroot="https://github.com/avin2/SensorKinect.git" -_gitname="sensorkinect" -_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd $srcdir/$_gitname-build - - # BUILD - cd Platform/${_platform}/Build - make - make redist -} - -package() { - cd $srcdir/$_gitname-build - cd Platform/${_platform}/Redist - - # This is all cloned from ./install.sh, which can't be used for a number - # of reasons. - install -d $pkgdir/usr/{lib,bin} - install -m755 Lib/* $pkgdir/usr/lib - install -m755 Bin/* $pkgdir/usr/bin - - install -d $pkgdir/etc/primesense - install -m644 Config/GlobalDefaultsKinect.ini $pkgdir/etc/primesense - - chmod +s $pkgdir/usr/bin/XnSensorServer - - install -m777 -d $pkgdir/var/log/primesense/XnSensorServer -} diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install deleted file mode 100644 index d62d263d1..000000000 --- a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -export MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so" - -post_install() { - for module in $MODULES; do - /usr/bin/niReg -r /usr/lib/$module /etc/primesense - done -} - -pre_remove() { - for module in $MODULES; do - /usr/bin/niReg -u /usr/lib/$module - done -} diff --git a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD deleted file mode 100644 index 07f276b02..000000000 --- a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD +++ /dev/null @@ -1,286 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Sven Schneider -# Contributor: bugix -# Contributor: Lubosz Sarnecki - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-unstable-git' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=20111121 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -_gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -_gitbranch="unstable" -#_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker" - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_os}/Build/Makefile" - - - # BUILD - cd "Platform/${_os}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-unstable-git() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni' 'openni-unstable') - conflicts=('openni' 'openni-unstable') -} - -package_openni-unstable-git-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs' 'openni-unstable-docs') - conflicts=('openni-docs' 'openni-unstable-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-unstable-git-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core' 'openni-unstable-core') - conflicts=('openni-core' 'openni-unstable-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-unstable-git-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java' 'openni-unstable-java') - conflicts=('openni-java' 'openni-unstable-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-unstable-git-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono' 'openni-unstable-mono') - conflicts=('openni-mono' 'openni-unstable-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_os}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-unstable-git-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples' 'openni-unstable-core-samples') - conflicts=('openni-core-samples' 'openni-unstable-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-unstable-git-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source' 'openni-unstable-core-samples-source') - conflicts=('openni-core-samples-source' 'openni-unstable-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-unstable-git-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples' 'openni-unstable-java-samples') - conflicts=('openni-java-samples' 'openni-unstable-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-unstable-git-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source' 'openni-unstable-java-samples-source') - conflicts=('openni-java-samples-source' 'openni-unstable-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-unstable-git-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples' 'openni-unstable-mono-samples') - conflicts=('openni-mono-samples' 'openni-unstable-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-unstable-git-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source' 'openni-unstable-mono-samples-source') - conflicts=('openni-mono-samples-source' 'openni-unstable-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-unstable-git/openni.install b/~lukeshu/openni-all/openni-unstable-git/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-unstable-git/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-unstable/PKGBUILD b/~lukeshu/openni-all/openni-unstable/PKGBUILD deleted file mode 100644 index 19d1575a1..000000000 --- a/~lukeshu/openni-all/openni-unstable/PKGBUILD +++ /dev/null @@ -1,294 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Sven Schneider -# Contributor: bugix -# Contributor: Lubosz Sarnecki - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-unstable' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=1.4.0.2 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -options+=('!strip') -source=() -md5sums=() - -__gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -_gitbranch="Unstable-$pkgver" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x64;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - #if [ -d ${_gitname} ] ; then - cd ${_gitname} - # git checkout master - # git pull origin - # msg "The local files are updated." - #else - # git clone ${__gitroot} ${_gitname} - # cd ${_gitname} - #fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - #rm -rf "${srcdir}/${_gitname}-build" - #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker" - - for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do - echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile" - done - - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_os}/Build/Makefile" - - - # BUILD - cd "Platform/${_os}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples - cd "../Bin/${_arch}-Release" - ln NiViewer Sample-NiViewer - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-unstable() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-unstable-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-unstable-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni-core.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" - - install -d "${pkgdir}/var/lib/ni" -} - -package_openni-unstable-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-unstable-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - install="openni-mono.install" - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_os}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - HandTracker - RecordSynthetic - SimpleCreate - UserSelection - Viewer - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-unstable-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - for sample in $CORE_SAMPLES; do - install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-unstable-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-unstable-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-unstable-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-unstable-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-unstable-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-unstable/openni-core.install b/~lukeshu/openni-all/openni-unstable/openni-core.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-unstable/openni-core.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-unstable/openni-mono.install b/~lukeshu/openni-all/openni-unstable/openni-mono.install deleted file mode 100644 index 72a6fb23d..000000000 --- a/~lukeshu/openni-all/openni-unstable/openni-mono.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr -} - -post_remove() { - gacutil -u OpenNI.net -gacdir /usr -} diff --git a/~lukeshu/openni-all/openni/PKGBUILD b/~lukeshu/openni-all/openni/PKGBUILD deleted file mode 100644 index 2cdc2fd7d..000000000 --- a/~lukeshu/openni-all/openni/PKGBUILD +++ /dev/null @@ -1,288 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Sven Schneider -# Contributor: bugix -# Contributor: Lubosz Sarnecki - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=1.3.3.6 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -__gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -#_gitbranch="unstable" -#_gitbranch="master" -_gitbranch="Stable-$pkgver" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${__gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker" - mv Wrappers/OpenNI.java/src/org/OpenNI/AlternativeView{p,P}ointCapability.java - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_platform}/Build/Makefile" - - - # BUILD - cd "Platform/${_platform}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_platform}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni/openni.install b/~lukeshu/openni-all/openni/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} -- cgit v1.2.3-54-g00ecf