diff options
810 files changed, 10616 insertions, 6621 deletions
diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD index 232db2511..54a1595d5 100644 --- a/community/activity-log-manager/PKGBUILD +++ b/community/activity-log-manager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88673 2013-04-21 22:16:39Z heftig $ +# $Id: PKGBUILD 92682 2013-06-12 04:38:43Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Ner0 pkgname=activity-log-manager -pkgver=0.9.4 -pkgrel=4 +pkgver=0.9.5 +pkgrel=1 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/activity-log-manager" @@ -12,33 +12,19 @@ license=('GPL2') depends=('gtk3' 'libgee06' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') install=$pkgname.install -source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz - fix-crash.patch - config.vapi) -md5sums=('cf85aecdaa6c0188a53d659709e1f8cd' - '6167df74ce44659aa94a89f31ff4d351' - '1052dec3691826f01fa3d4fd84284ccc' - 'fecc5ac50dfcd79c4c8d54599760d225') +source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz + http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz) +md5sums=('460b4439798badbf4ba4b76b31cc1d03' + '6167df74ce44659aa94a89f31ff4d351') build() { cd "$srcdir/$pkgname-$pkgver" - # Fix docdir location - sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in} - - # Install updated language files + # Install language files rename $pkgname- '' ../po/$pkgname-*.po mv -f -t po ../po/* printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS - # Fix crash with GTK+ 3.6 - # https://bugs.launchpad.net/activity-log-manager/+bug/1058037 - patch -Np1 -i "$srcdir/fix-crash.patch" - - # We need this file for build - mv "$srcdir/config.vapi" "$srcdir/$pkgname-$pkgver/src" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } @@ -47,7 +33,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - - # We don't have Whoopsie on Arch Linux - rm -r "$pkgdir/etc" "$pkgdir"/usr/share/{applications/activity-log-manager-ccpanel.desktop,dbus-1,gnome-control-center,polkit-1} } diff --git a/community/activity-log-manager/config.vapi b/community/activity-log-manager/config.vapi deleted file mode 100644 index ee9823051..000000000 --- a/community/activity-log-manager/config.vapi +++ /dev/null @@ -1,11 +0,0 @@ -[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")] -namespace Config { - public const string GETTEXT_PACKAGE; - public const string SPRITE_DIR; - public const string BACKGROUND_DIR; - public const string PACKAGE_DATA_DIR; - public const string PACKAGE_LOCALE_DIR; - public const string PACKAGE_NAME; - public const string PACKAGE_VERSION; - public const string VERSION; -} diff --git a/community/activity-log-manager/fix-crash.patch b/community/activity-log-manager/fix-crash.patch deleted file mode 100644 index 92bb5683c..000000000 --- a/community/activity-log-manager/fix-crash.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur activity-log-manager-0.9.4.orig/src/alm.vala activity-log-manager-0.9.4/src/alm.vala ---- activity-log-manager-0.9.4.orig/src/alm.vala 2012-02-22 20:24:08.000000000 +0100 -+++ activity-log-manager-0.9.4/src/alm.vala 2012-11-01 09:33:15.466534392 +0100 -@@ -41,10 +41,7 @@ - static int main (string[] args) - { - Gtk.init (ref args); -- var alm = new Gtk.Application ("org.zeitgeist.Alm", -- ApplicationFlags.FLAGS_NONE); -- var window = new Main (); -- alm.add_window (window); -+ new Main (); - - Gtk.main (); - return 0; diff --git a/community/aiccu/01-fix-makefile.patch b/community/aiccu/01-fix-makefile.patch deleted file mode 100644 index 211df7a6a..000000000 --- a/community/aiccu/01-fix-makefile.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/Makefile 2007-01-11 01:29:33.000000000 +0100 -+++ b/Makefile 2013-05-12 23:38:17.171000000 +0200 -@@ -17,9 +17,9 @@ - PROJECT_VERSION=$(shell grep "AICCU_VER" common/aiccu.h | head -n 1 | awk '{print $$3}' | tr -d \") - - # Misc bins --RM=@rm -f --MAKE:=@${MAKE} --CP=@echo [Copy]; cp -+RM=rm -f -+MAKE:=${MAKE} -+CP=cp - RPMBUILD=@echo [RPMBUILD]; rpmbuild - RPMBUILD_SILENCE=>/dev/null 2>/dev/null - -@@ -78,21 +78,11 @@ - @mkdir -p ${DESTDIR}${dirdoc} - @echo "Configuration..." - @mkdir -p ${DESTDIR}${diretc} --ifeq ($(shell echo "A${RPM_BUILD_ROOT}"),A) -- $(shell [ -f ${DESTDIR}${diretc}${PROJECT}.conf ] || cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf) -+ @cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf - @echo "Documentation..." - @cp doc/README ${DESTDIR}${dirdoc} -- @cp doc/LICENSE ${DESTDIR}${dirdoc} -+ @cp doc/changelog ${DESTDIR}${dirdoc} - @cp doc/HOWTO ${DESTDIR}${dirdoc} -- @echo "Installing Debian-style init.d" -- @mkdir -p ${DESTDIR}${diretc}init.d -- @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} --else -- @echo "Installing Redhat-style init.d" -- @mkdir -p ${DESTDIR}${diretc}init.d -- @cp doc/${PROJECT}.init.rpm ${DESTDIR}${diretc}init.d/${PROJECT} -- @cp doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf --endif - @echo "Installation into ${DESTDIR}/ completed" - - help: diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD index 5b374e1a1..f77804e81 100644 --- a/community/aiccu/PKGBUILD +++ b/community/aiccu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90477 2013-05-12 21:46:51Z seblu $ +# $Id: PKGBUILD 92564 2013-06-08 18:07:25Z seblu $ # Maintainer: Sébastien Luttringer pkgname=aiccu pkgver=20070115 -pkgrel=3 +pkgrel=4 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility' arch=('i686' 'x86_64' 'mips64el') url='http://www.sixxs.net/tools/aiccu/' @@ -12,7 +12,6 @@ depends=('gnutls' 'iproute2') backup=('etc/aiccu.conf') source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz" 'aiccu.service' - '01-fix-makefile.patch' '02-allow-tunnels.patch' '03-no-quiet-gcc.patch' '04-skip-strip.patch' @@ -20,7 +19,6 @@ source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar. '06-setup-script.patch') md5sums=('c9bcc83644ed788e22a7c3f3d4021350' '891b0fa527c1b847ce803dac047cf80d' - '7c7c563ecc6d3fa64a7766de28ba1927' 'b9b2c0e7186f3f96366caaa39252dccc' 'b38db1d95760cd9687330b7db5f4ea1d' '6dfa2df27bb4859c7511bfea91337925' @@ -41,14 +39,14 @@ build() { } package() { + install -Dm644 aiccu.service "$pkgdir/usr/lib/systemd/system/aiccu.service" cd $pkgname - make DESTDIR="$pkgdir" dirsbin="/usr/bin/" install - # license + install -Dm755 unix-console/aiccu "$pkgdir/usr/bin/aiccu" + install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf" + install -Dm644 doc/aiccu.1 "$pkgdir/usr/share/man/man1/aiccu.1" install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - # man - install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" - # systemd - install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service" + install -dm755 "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname" } # vim:set ts=2 sw=2 et: diff --git a/community/astyle/ChangeLog b/community/astyle/ChangeLog deleted file mode 100644 index 8873d5f0e..000000000 --- a/community/astyle/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -2009-02-26 Mateusz Herych <heniekk@gmail.com> - - * Updated to 1.22 - -2008-04-06 Mateusz Herych <heniekk@gmail.com> - - * Changed license to LGPL - * Updated to 1.22 - -2007-09-18 Vinay S Shastry <vinayshastry@gmail.com> - - * PKGBUILD: depend on gcc-libs - diff --git a/community/astyle/PKGBUILD b/community/astyle/PKGBUILD index fb1c573cc..440117efc 100644 --- a/community/astyle/PKGBUILD +++ b/community/astyle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68495 2012-03-26 08:43:21Z lfleischer $ +# $Id: PKGBUILD 92315 2013-06-03 21:55:18Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Thomas Mader <thezema@gmail.com> @@ -6,7 +6,7 @@ # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=astyle -pkgver=2.02.1 +pkgver=2.03 pkgrel=1 pkgdesc='A free, fast and small automatic formatter for C, C++, C#, and Java source code.' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url='http://sourceforge.net/projects/astyle/' license=('LGPL') depends=('gcc-libs') source=("http://downloads.sourceforge.net/sourceforge/astyle/${pkgname}_${pkgver}_linux.tar.gz") -md5sums=('3e3ef8024c175ef4e1720b7aa4c75202') +md5sums=('ba84eaa8564155babd4ba1458d4eaa11') build() { cd "$srcdir/$pkgname/build/gcc" diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD index 627051703..b2d1cd8be 100644 --- a/community/atop/PKGBUILD +++ b/community/atop/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 90647 2013-05-13 14:18:25Z spupykin $ +# $Id: PKGBUILD 92271 2013-06-03 13:35:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: John Gerritse <john.gerritse@gmail.com> pkgname=atop -pkgver=2.0_1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 pkgdesc="A system and process level monitor." arch=(i686 x86_64 'mips64el') url="http://www.atoptool.nl/" license=('GPL') depends=('ncurses' 'sh' 'zlib') -source=(http://www.atoptool.nl/download/atop-${pkgver/_/-}.tar.gz) -md5sums=('6867ea2211edaf8140b94130470d646b') +source=(http://www.atoptool.nl/download/atop-${pkgver}.tar.gz) +md5sums=('f1dd1984584f9635712cb7196e25620c') build() { cd $srcdir/$pkgname-${pkgver/_/-} diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 38ee8c5ec..d0c3377a0 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90472 2013-05-12 21:18:29Z mtorromeo $ +# $Id: PKGBUILD 92644 2013-06-10 11:55:07Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit pkgver=2.2.3 -pkgrel=2 +pkgrel=3 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname arch=(i686 x86_64 mips64el) @@ -27,7 +27,6 @@ backup=( ) source=( $url/$pkgname-$pkgver.tar.gz - auditd.service python2.patch ) @@ -41,6 +40,7 @@ build() { --libexecdir=/usr/lib/audit \ --with-python=yes \ --enable-gssapi-krb5=yes \ + --enable-systemd=yes \ --with-libcap-ng=yes #--with-apparmor=yes make } @@ -49,15 +49,15 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/auditd.service" "$pkgdir/usr/lib/systemd/system/auditd.service" - cd "$pkgdir" install -d var/log/audit - rm -rf etc/rc.d/init.d etc/sysconfig + rm -rf etc/rc.d etc/sysconfig - sed -ri 's| /sbin| /usr/bin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf + sed -ri 's|/sbin|/usr/bin|' \ + etc/audit/*.conf \ + etc/audisp/plugins.d/*.conf \ + usr/lib/systemd/system/auditd.service } sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02' - '83ebda69bbc2d4058d7baddbf91ab8a2aafd70e64ceb2137d9c9335f8d8d4b83' '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4') diff --git a/community/audit/auditd.service b/community/audit/auditd.service deleted file mode 100644 index 959dcc112..000000000 --- a/community/audit/auditd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Security Auditing Service -After=syslog.target - -[Service] -ExecStart=/usr/bin/auditd -n -ExecStartPost=/usr/bin/auditctl -R /etc/audit/audit.rules - -[Install] -WantedBy=multi-user.target
\ No newline at end of file diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 2b07c46b2..9404d5f3a 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90885 2013-05-15 08:03:41Z bpiotrowski $ +# $Id: PKGBUILD 92244 2013-06-03 11:15:10Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=autofs pkgver=5.0.7 -pkgrel=2 +pkgrel=3 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://freshmeat.net/projects/autofs' @@ -14,19 +14,15 @@ license=('GPL2') depends=('libxml2') makedepends=('libldap' 'krb5' 'kmod') optdepends=('krb5: for LDAP support') -backup=('etc/autofs/auto.master' - 'etc/autofs/auto.misc' - 'etc/conf.d/autofs') +backup=('etc/default/autofs' + 'etc/autofs/auto.master' + 'etc/autofs/auto.misc') options=(!makeflags) install='autofs.install' source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" - 'autofs' - 'autofs.conf.d' 'auto.master' 'auto.misc') md5sums=('bc46838dece83c02d800ff144ed9f431' - 'e307bf6d2638e46eeb916cf42fe029b2' - '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' 'd8a15ec9186c5c0b36e5cea1e2739e8a') @@ -36,7 +32,8 @@ build() { sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ Makefile.rules - ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ + ./configure --prefix=/usr --sysconfdir=/etc/autofs --sbindir=/usr/bin \ + --with-mapdir=/etc/autofs --without-hesiod \ --enable-ignore-busy --with-systemd make } @@ -48,8 +45,8 @@ package() { install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master" install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc" - install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs" - install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs" install -Dm0644 "samples/autofs.service" "${pkgdir}/usr/lib/systemd/system/autofs.service" } + +# vim:set ts=2 sw=2 et: diff --git a/community/autofs/autofs b/community/autofs/autofs deleted file mode 100644 index 08bd3e133..000000000 --- a/community/autofs/autofs +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -daemon_name=autofs - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs - -if [ ! -z "$TIMEOUT" ]; then - daemonoptions="--timeout=$TIMEOUT $daemonoptions" -fi - -PID=`cat /var/run/autofs-running 2> /dev/null` -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon_name - stat_done - fi - ;; - stop) - stat_busy "Stopping $daemon_name daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon_name - stat_done - fi - ;; - restart) - stat_busy "Restarting $daemon_name daemon" - $0 stop - sleep 1 - $0 start - ;; - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 diff --git a/community/autofs/autofs.conf.d b/community/autofs/autofs.conf.d deleted file mode 100644 index bc82491e7..000000000 --- a/community/autofs/autofs.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -#localoptions='rsize=8192,wsize=8192' - -# e.g. --timeout=60 -daemonoptions='' diff --git a/community/bcg729/PKGBUILD b/community/bcg729/PKGBUILD index 2e5613459..5714fc15e 100644 --- a/community/bcg729/PKGBUILD +++ b/community/bcg729/PKGBUILD @@ -1,25 +1,25 @@ -# $Id$ +# $Id: PKGBUILD 92852 2013-06-17 06:58:41Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=bcg729 pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="g729 codec" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/eng/documentation/dev/bcg729.html" license=('GPL') depends=('mediastreamer') options=('!libtool') -source=(http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/bcg729-$pkgver.tar.gz) +source=(http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/$pkgname-$pkgver.tar.gz) md5sums=('45e127a9a309aff94d3262d97b5aeab0') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir/" install } diff --git a/community/bibutils/PKGBUILD b/community/bibutils/PKGBUILD new file mode 100644 index 000000000..1d73c0d68 --- /dev/null +++ b/community/bibutils/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) us> + +pkgname=bibutils +_basename=bibutils +pkgver=5.0 +pkgrel=1 +pkgdesc="Bibliography conversion tools" +arch=("i686" "x86_64") +url="http://sourceforge.net/p/bibutils/home/Bibutils/" +license=('GPL2') +makedepends=('tcsh') +depends=(glibc) +source=("http://downloads.sourceforge.net/project/${_basename}/${_basename}_${pkgver}_src.tgz") +md5sums=('c4838bf0d8ae48e4df49ae395bf643d0') + +build() { + cd ${_basename}_$pkgver + ./configure --dynamic --install-dir "$pkgdir/usr/bin" --install-lib "$pkgdir/usr/lib" + make +} + +package() { + cd ${_basename}_$pkgver + mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/lib" + make install +} diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD index 1d4b89dc4..f276cb230 100644 --- a/community/bind/PKGBUILD +++ b/community/bind/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91985 2013-05-30 17:41:01Z seblu $ +# $Id: PKGBUILD 92426 2013-06-05 07:49:55Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind -_pkgver=9.9.3 +_pkgver=9.9.3-P1 pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc='The ISC BIND nameserver' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('0d770a68ccdb98db7930951cf380d5c7ed9b5b67' +sha1sums=('9e1a9e5e45685befce6b93d4fcfd63e50eaeb2cf' '029f89c49550c40ec7a95116b6a33f0e5a041094' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index bfbf734f7..329f4077c 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 87403 2013-03-31 19:18:05Z stephane $ +# $Id: PKGBUILD 92237 2013-06-03 06:54:08Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.8.1 -pkgrel=2 +pkgver=0.8.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('6d7f023a9df1a436c51de83f7cd751f162be9b4fb1c06da05545f9fba7cb2a98') +sha256sums=('e15d3134f4efd8d60e243c7177edba06ac471619674ca07a42a1dced5f498728') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" @@ -34,8 +34,8 @@ package_bitcoin-qt() { install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt install -Dm644 contrib/debian/bitcoin-qt.desktop \ "$pkgdir"/usr/share/applications/bitcoin.desktop - install -Dm644 share/pixmaps/bitcoin80.xpm \ - "$pkgdir"/usr/share/pixmaps/bitcoin80.xpm + install -Dm644 share/pixmaps/bitcoin128.png \ + "$pkgdir"/usr/share/pixmaps/bitcoin128.png install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index 8d339de81..368eca1ab 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 87809 2013-04-06 22:04:55Z bgyorgy $ -# Maintainer : Ionut Biru <ibiru@archlinux.org +# $Id: PKGBUILD 92494 2013-06-07 09:28:53Z tomegun $ +# Contributor: Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman pkgver=1.23 -pkgrel=6 +pkgrel=10 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="https://launchpad.net/blueman" -depends=('bluez' 'gnome-icon-theme' 'libpulse' 'obex-data-server' 'python2-dbus' - 'python2-notify' 'startup-notification' 'xdg-utils') +depends=('bluez4' 'bluez-libs' 'gnome-icon-theme' 'libpulse' 'obex-data-server' + 'python2-dbus' 'python2-notify' 'startup-notification' 'xdg-utils') makedepends=('pyrex' 'intltool') optdepends=('dnsmasq: For creating PAN network' 'modemmanager: For modem management service' diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index a63cfee27..55da00752 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88546 2013-04-19 14:27:07Z giovanni $ +# $Id: PKGBUILD 92397 2013-06-04 16:29:40Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.16 +pkgver=2.0.17 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool' '!docs' '!emptydirs') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('5502683a5ca2c725fb9dd205fe81ca5b') +md5sums=('2ce17c4d9f2cc669f67f0087479e278a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index ac0471939..03554f011 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87405 2013-03-31 19:18:08Z stephane $ +# $Id: PKGBUILD 92313 2013-06-03 21:39:22Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.12 -pkgrel=2 +pkgver=0.7.13 +pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' @@ -13,7 +13,7 @@ license=('GPL3') depends=('boost-libs' 'pcre' 'curl' 'libquvi') makedepends=('boost') source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz") -md5sums=('f35a6fb3a9a08d59da7170c1330a24ce') +md5sums=('654892be303c2738dd078dbe6c78595d') build() { cd $pkgname-$pkgver diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD index 7f06d473d..c0374dbaf 100644 --- a/community/cdemu-daemon/PKGBUILD +++ b/community/cdemu-daemon/PKGBUILD @@ -1,73 +1,54 @@ -# $Id: PKGBUILD 81966 2013-01-05 03:16:00Z heftig $ +# $Id: PKGBUILD 92546 2013-06-08 00:40:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=cdemu-daemon -pkgver=2.0.0 +pkgver=2.1.0 pkgrel=1 pkgdesc="CD/DVD-ROM device emulator daemon" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=(GPL) -depends=(dbus "vhba-module>=20110915-5" libao "libmirage>=2.0.0") +depends=(dbus "vhba-module>=20130607" libao "libmirage>=2.1.0") makedepends=(cmake) optdepends=('alsa-lib: to enable the ALSA audio driver' 'pulseaudio: to enable the PA audio driver') -backup=('etc/conf.d/cdemu-daemon' - 'etc/dbus-1/system.d/cdemu-daemon-dbus.conf') -install=$pkgname.install +backup=(etc/conf.d/cdemu-daemon + etc/dbus-1/system.d/cdemu-daemon-dbus.conf) +install=cdemu-daemon.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - 'cdemu-daemon.conf' 'system.patch' 'cdemu-daemon.service' - 'cdemu-daemon-dbus.conf') -md5sums=('8f6ad3a9f758938e1572046bccc30417' - '6f31ad7a64d320cf4d6820432184070b' - '60c41731d4dce7b67e1a30dc42d2f274' - '99f35b4640529d30ea40224386dd6f4f' - '55619a492de4ef06b0759b5e4358bcbb') + system-arch.patch) +sha256sums=('8224a5d8d16cbd9a2294e9c7ab544d61059d9870023e48705699af7366846580' + '29507da7367983bdc5f541e9f9252f189412041076842b8d08a5c4dac29f23cd') -build() { +prepare() { + mkdir build cd $pkgname-$pkgver - mkdir build; cd build - cmake .. \ + # Patch system daemon for Arch-friendlyness + # It's disabled by default. Should we even ship it? + patch -Np1 -i ../system-arch.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname \ - -DSYSTEM_BUS_SERVICE=on # This is disabled by default. Should we even ship it? + -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname make } package() { - cd $pkgname-$pkgver/build + cd build make DESTDIR="$pkgdir" install install -d "$pkgdir/usr/lib/modules-load.d" echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" - - # - # All the following stuff concerns the system bus service - # - - cd ../.. - - # make things Arch-friendly - patch "$pkgdir/usr/lib/cdemu-daemon/cdemu-daemon-system.sh" system.patch - - # Custom dbus policy, tightening security to console and 'cdemu' group - install -m644 cdemu-daemon-dbus.conf \ - "$pkgdir/etc/dbus-1/system.d/cdemu-daemon-dbus.conf" - - # the system daemon configuration - install -Dm644 cdemu-daemon.conf "$pkgdir/etc/conf.d/cdemu-daemon" - - # for systemd - install -Dm644 cdemu-daemon.service \ - "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service" - echo SystemdService=cdemu-daemon.service >> \ - "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEmuDaemon.service" } # vim:set ts=2 sw=2 et: diff --git a/community/cdemu-daemon/cdemu-daemon-dbus.conf b/community/cdemu-daemon/cdemu-daemon-dbus.conf deleted file mode 100644 index ed14c6e39..000000000 --- a/community/cdemu-daemon/cdemu-daemon-dbus.conf +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - -<busconfig> - <!-- Only root can own the CDEmuDaemon service on bus --> - <policy user="root"> - <allow own="net.sf.cdemu.CDEmuDaemon"/> - </policy> - <policy group="root"> - <allow own="net.sf.cdemu.CDEmuDaemon"/> - </policy> - - <!-- Allow users at the console to invoke methods on the interface --> - <policy at_console="true"> - <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> - </policy> - - <!-- Allow users in the 'cdemu' group to invoke methods on the interface --> - <policy group="cdemu"> - <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> - </policy> -</busconfig> - diff --git a/community/cdemu-daemon/cdemu-daemon.conf b/community/cdemu-daemon/cdemu-daemon.conf deleted file mode 100644 index 1d8c55fe6..000000000 --- a/community/cdemu-daemon/cdemu-daemon.conf +++ /dev/null @@ -1,8 +0,0 @@ -# how many optical drives to emulate -NUM_DEVICES=2 - -# audio backend (null, alsa or pulse) -AUDIO_DRIVER=null - -# log file -LOG_FILE=/var/log/cdemud.log diff --git a/community/cdemu-daemon/cdemu-daemon.install b/community/cdemu-daemon/cdemu-daemon.install index 7a2384b47..169ba6ec8 100644 --- a/community/cdemu-daemon/cdemu-daemon.install +++ b/community/cdemu-daemon/cdemu-daemon.install @@ -16,6 +16,8 @@ MSG post_upgrade $1 $1 + modprobe vhba + return 0 } diff --git a/community/cdemu-daemon/cdemu-daemon.service b/community/cdemu-daemon/cdemu-daemon.service deleted file mode 100644 index ab4834f60..000000000 --- a/community/cdemu-daemon/cdemu-daemon.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=CDEmu Daemon - -[Service] -Type=dbus -BusName=net.sf.cdemu.CDEmuDaemon -ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh - -[Install] -WantedBy=multi-user.target diff --git a/community/cdemu-daemon/system-arch.patch b/community/cdemu-daemon/system-arch.patch new file mode 100644 index 000000000..54a08bd16 --- /dev/null +++ b/community/cdemu-daemon/system-arch.patch @@ -0,0 +1,121 @@ +diff -u -rN cdemu-daemon-2.1.0/CMakeLists.txt cdemu-daemon-2.1.0-arch/CMakeLists.txt +--- cdemu-daemon-2.1.0/CMakeLists.txt 2013-06-07 21:33:53.000000000 +0200 ++++ cdemu-daemon-2.1.0-arch/CMakeLists.txt 2013-06-08 02:20:15.948655947 +0200 +@@ -18,7 +18,7 @@ + include (FileList) + + # Options +-option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" off) ++option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" on) + option (SESSION_BUS_SERVICE "Install CDEmu daemon as D-Bus session bus service" on) + + # If install prefix is /usr, override the sysconf dir to be /etc instead of /usr/etc +@@ -46,6 +46,10 @@ + ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in + ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service + ) ++configure_file ( ++ ${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in ++ ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service ++) + + # Global definitions + add_definitions (-std=gnu99) #NOTE: Compilation bugs out on using signals and -std=c99 +@@ -104,6 +108,10 @@ + DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} + ) + install ( ++ FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/ ++ ) ++ install ( + FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service + DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/ + ) +@@ -111,5 +119,10 @@ + FILES system/cdemu-daemon-dbus.conf + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d + ) ++ install ( ++ FILES system/cdemu-daemon.conf ++ RENAME cdemu-daemon ++ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d ++ ) + endif () + +diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf +--- cdemu-daemon-2.1.0/system/cdemu-daemon.conf 1970-01-01 01:00:00.000000000 +0100 ++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf 2013-06-08 02:12:19.032035389 +0200 +@@ -0,0 +1,8 @@ ++# how many optical drives to emulate ++#NUM_DEVICES=1 ++ ++# audio backend (null, default, alsa, or pulse) ++#AUDIO_DRIVER=null ++ ++# log file ++#LOG_FILE=/var/log/cdemu-daemon.log +diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf +--- cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf 2013-06-07 21:33:53.000000000 +0200 ++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf 2013-06-08 02:11:52.922220389 +0200 +@@ -11,8 +11,13 @@ + <allow own="net.sf.cdemu.CDEmuDaemon"/> + </policy> + +- <!-- Allow anyone to invoke methods on the interface --> +- <policy context="default"> ++ <!-- Allow users at the console to invoke methods on the interface --> ++ <policy at_console="true"> ++ <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> ++ </policy> ++ ++ <!-- Allow users in the 'cdemu' group to invoke methods on the interface --> ++ <policy group="cdemu"> + <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> + </policy> + </busconfig> +diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.service.in cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in +--- cdemu-daemon-2.1.0/system/cdemu-daemon.service.in 1970-01-01 01:00:00.000000000 +0100 ++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in 2013-06-08 02:13:08.331686074 +0200 +@@ -0,0 +1,10 @@ ++[Unit] ++Description=CDEmu Daemon ++ ++[Service] ++Type=dbus ++BusName=net.sf.cdemu.CDEmuDaemon ++ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh ++ ++[Install] ++WantedBy=multi-user.target +diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh +--- cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh 2013-06-07 21:33:53.000000000 +0200 ++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh 2013-06-08 02:11:53.152218760 +0200 +@@ -1,15 +1,15 @@ + #!/bin/sh + # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional + # configuration (number of devices, audio driver, log file) are read +-# from /etc/sysconfig/cdemu-daemon ++# from /etc/conf.d/cdemu-daemon + + # Default settings + NUM_DEVICES=1 + AUDIO_DRIVER=null +-LOG_FILE=/tmp/cdemu-daemon.log ++LOG_FILE=/var/log/cdemu-daemon.log + + # Read the settings +-CONFIG_FILE=/etc/sysconfig/cdemu-daemon ++CONFIG_FILE=/etc/conf.d/cdemu-daemon + + if [ -f ${CONFIG_FILE} ]; then + . ${CONFIG_FILE}; +diff -u -rN cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in +--- cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in 2013-06-07 21:33:53.000000000 +0200 ++++ cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in 2013-06-08 02:14:26.824463231 +0200 +@@ -2,4 +2,4 @@ + Name=net.sf.cdemu.CdemuDaemon + Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh + User=root +- ++SystemdService=cdemu-daemon.service diff --git a/community/cdemu-daemon/system.patch b/community/cdemu-daemon/system.patch deleted file mode 100644 index 42812f6cf..000000000 --- a/community/cdemu-daemon/system.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh ---- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh 2012-03-25 16:35:40.581171312 +0800 -+++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh 2012-03-25 16:36:48.810801678 +0800 -@@ -1,15 +1,15 @@ - #!/bin/sh - # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional - # configuration (number of devices, audio driver, log file) are read --# from /etc/sysconfig/cdemu-daemon -+# from /etc/conf.d/cdemu-daemon - - # Default settings - NUM_DEVICES=2 - AUDIO_DRIVER=null --LOG_FILE=/tmp/cdemu-daemon.log -+LOG_FILE=/var/log/cdemu-daemon.log - - # Read the settings --CONFIG_FILE=/etc/sysconfig/cdemu-daemon -+CONFIG_FILE=/etc/conf.d/cdemu-daemon - - if [ -f ${CONFIG_FILE} ]; then - . ${CONFIG_FILE}; diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index 3a4d80446..4d04747e3 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90367 2013-05-12 04:56:34Z thestinger $ +# $Id: PKGBUILD 92287 2013-06-03 14:08:59Z thestinger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> @@ -9,11 +9,11 @@ pkgname=chrony pkgver=1.27 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64' 'mips64el') url="http://chrony.tuxfamily.org/" -options=('strip') +options=(strip !emptydirs) license=('GPL') depends=('readline' 'libcap') backup=('etc/chrony.conf') diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index d9d53862d..5d3655031 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 90387 2013-05-12 06:30:53Z dwallace $ +#$Id: PKGBUILD 92495 2013-06-07 09:28:54Z tomegun $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.14 -pkgrel=2 +pkgver=1.15 +pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') options=('!libtool') source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('d8c98071ca244d2e66ae49becfcd0634' +md5sums=('d68ec364b4b3fba3131defe074c768dc' 'a8d22ee089fb0ed725130d16ad393047') prepare(){ diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index e32af2610..93881e261 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87448 2013-03-31 20:30:15Z stephane $ +# $Id: PKGBUILD 92619 2013-06-10 06:38:48Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.59 +pkgver=1.60.1 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,12 @@ license=('GPL') depends=('pcre' 'qt4') makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('686effdfa6f2ca3369d7d52e54c6fd2db2d06d97') +sha1sums=('282e74459747d6c940fa65376049cb642cd32e6a') build() { cd "${srcdir}/${pkgname}-${pkgver}" make - make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.0/manpages/docbook.xsl man + make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl man cd gui export HAVE_RULES=yes diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD index c7fb65484..096e78afd 100644 --- a/community/cwiid/PKGBUILD +++ b/community/cwiid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72056 2012-06-07 14:10:17Z speps $ +# $Id: PKGBUILD 92496 2013-06-07 09:28:55Z tomegun $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Wieland Hoffmann <the_mineo@web.de> @@ -8,11 +8,12 @@ pkgname=cwiid pkgver=0.6.00 -pkgrel=12 +pkgrel=13 pkgdesc="Linux Nintendo Wiimote interface" arch=('i686' 'x86_64' 'mips64el') url="http://abstrakraft.org/cwiid" -depends=('bluez' 'gtk2') +depends=('bluez-libs' 'gtk2' 'python2') +makedepends=('python2') license=('GPL') install="$pkgname.install" source=("$url/downloads/$pkgname-$pkgver.tgz" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 207228bfa..79e78e67a 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91822 2013-05-28 13:42:16Z spupykin $ +# $Id: PKGBUILD 92273 2013-06-03 13:36:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,13 +6,13 @@ pkgname=darktable pkgver=1.2.1 _pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' - 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt' + 'curl' 'libgnome-keyring' 'libgphoto2' 'openexr' 'sqlite' 'libxslt' 'libsoup' 'gtk-engines') makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index ab4fadc71..bde55dc70 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 91488 2013-05-23 10:12:27Z spupykin $ +# $Id: PKGBUILD 92241 2013-06-03 10:26:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.0.2 -pkgrel=11 +pkgver=3.0.3pre +pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime24' 'libzdb' 'mhash' 'libevent') makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' - 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') + 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' + 'git') optdepends=('libldap: for LDAP authentication' 'libsieve: for dbmail-sieve') url="http://www.dbmail.org" @@ -19,7 +20,8 @@ backup=(etc/xinetd.d/dbmail-imapd etc/xinetd.d/dbmail-pop3d etc/xinetd.d/dbmail-lmtpd etc/xinetd.d/dbmail-timsieved) -source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz +#source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz +source=("$pkgname-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_0" dbmail.tmpfiles dbmail-imapd.service dbmail-lmtpd.service @@ -29,7 +31,7 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail-lmtpd.xinetd dbmail-pop3d.xinetd dbmail-timsieved.xinetd) -md5sums=('eb32235abffdf967253ee9d004e0e4a9' +md5sums=('SKIP' 'c4b5793c5422b62a675d4c66ff7e9300' '5a6297cb03c8d0b424f978ea1d7402de' '070db88538af9833f003f4cb516d337b' diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD index 71693e130..5fdafa42d 100644 --- a/community/denemo/PKGBUILD +++ b/community/denemo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88689 2013-04-21 22:17:06Z heftig $ +# $Id: PKGBUILD 92551 2013-06-08 11:18:47Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> @@ -6,7 +6,7 @@ pkgname=denemo pkgver=1.0.0 -pkgrel=3 +pkgrel=5 pkgdesc="A music score editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.denemo.org" diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD index 739782ba7..1040480dd 100644 --- a/community/dietlibc/PKGBUILD +++ b/community/dietlibc/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 65120 2012-02-20 04:53:08Z spupykin $ +# $Id: PKGBUILD 92521 2013-06-07 16:21:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de> pkgname=dietlibc -pkgver=0.32 -pkgrel=3 +pkgver=0.33 +pkgrel=1 pkgdesc="a libc optimized for small size" arch=('i686' 'x86_64' 'mips64el') url="http://www.fefe.de/dietlibc/" license=("GPL") #source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2) -source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.bz2) -md5sums=('0098761c17924c15e21d25acdda4a8b5') +source=("http://www.fefe.de/dietlibc/dietlibc-$pkgver.tar.bz2") +md5sums=('9d541b9a6623b04ec12e5248b82db7c0') build() { cd $srcdir/$pkgname-$pkgver - make -j1 all dyn - mkdir -p $pkgdir/etc + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index 5da4b04ab..ab5be235b 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,90 +1,106 @@ -# $Id: PKGBUILD 84430 2013-02-18 23:24:23Z svenstaro $ +# $Id: PKGBUILD 92844 2013-06-17 00:23:34Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Anders Bergh <anders1@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> -pkgname=('dmd' 'libphobos') +pkgname=('dmd' 'libphobos' 'dtools') pkgbase=dmd -pkgver=2.062 +pkgver=2.063.2 pkgrel=1 arch=('i686' 'x86_64') -url="http://www.digitalmars.com/d/2.0/" -#source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip -source=(http://downloads.dlang.org.s3-website-us-east-1.amazonaws.com/releases/2013/dmd.${pkgver}.zip - tools-${pkgver}.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver}) -license=('custom') -md5sums=('fd2211206532ab41a8aef764a9225d3c' - '2e301d06071fb24c7c2d504c8ddbbc39') +url="http://www.dlang.org" +makedepends=('git') +source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver" + "git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver" + "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver" + "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver") +sha1sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP') [[ $CARCH == "x86_64" ]] && _archbits="64" [[ $CARCH == "i686" ]] && _archbits="32" build() { - cd $srcdir/dmd2/src/ + cd $srcdir/dmd/src + make -f posix.mak MODEL=$_archbits RELEASE=1 - echo "$pkgver" > VERSION # Fix specific release bug of 2.062 - cd dmd - make -f posix.mak MODEL=$_archbits + cd $srcdir/druntime + make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 - cd ../druntime - make -f posix.mak MODEL=$_archbits DMD=../dmd/dmd + cd $srcdir/phobos + make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 - cd ../phobos - make -f posix.mak MODEL=$_archbits DMD=../dmd/dmd - - # Building rdmd ourselves breaks in dmd 2.059 - #cd $srcdir/D-Programming-Language-tools-* - #$srcdir/dmd2/src/dmd/dmd -I$srcdir/dmd2/src/druntime/import/ -I$srcdir/dmd2/src/phobos -L-L$srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/ rdmd.d + cd $srcdir/tools + for tool in rdmd.d ddemangle.d catdoc.d detab.d tolf.d dget.d; do + $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ $tool + done } package_dmd() { - pkgdesc="The Digital Mars D compiler" - backup=('etc/dmd.conf') - depends=('libphobos' 'gcc') + pkgdesc="The D programming language reference compiler" + backup=('etc/dmd.conf') + depends=('gcc') + provides=("d-compiler=$pkgver") + license=('custom') - install -Dm755 $srcdir/dmd2/src/dmd/dmd $pkgdir/usr/bin/dmd + install -Dm755 $srcdir/dmd/src/dmd $pkgdir/usr/bin/dmd - mkdir -p $pkgdir/etc - echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf + mkdir -p $pkgdir/etc + echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf + install -Dm644 $srcdir/dmd/docs/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1 + install -Dm644 $srcdir/dmd/docs/man/man1/dmd.conf.5 $pkgdir/usr/share/man/man5/dmd.conf.5 - install -Dm644 $srcdir/dmd2/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1 - install -Dm644 $srcdir/dmd2/man/man1/rdmd.1 $pkgdir/usr/share/man/man1/rdmd.1 - install -Dm644 $srcdir/dmd2/man/man1/dmd.conf.5 $pkgdir/usr/share/man/man5/dmd.conf.5 + install -Dm644 $srcdir/dmd/src/backendlicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-backend + install -Dm644 $srcdir/dmd/src/gpl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.1 + install -Dm644 $srcdir/dmd/src/artistic.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.2 - install -Dm644 $srcdir/dmd2/license.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE + mkdir -p $pkgdir/usr/share/d/samples/ + cp -r $srcdir/dmd/samples/* $pkgdir/usr/share/d/samples/ - mkdir -p $pkgdir/usr/share/d/samples/ - cp -r $srcdir/dmd2/samples/d/* $pkgdir/usr/share/d/samples/ + find $pkgdir/usr -type f | xargs chmod 0644 + chmod 755 $pkgdir/usr/bin/* - find $pkgdir/usr -type f | xargs chmod 0644 - chmod 755 $pkgdir/usr/bin/* + # No longer available, because not source code is provided and those are not mandatory. + # Please get those from http://dlang.org if absolutely needed. - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/ddemangle $pkgdir/usr/bin/ddemangle - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/dman $pkgdir/usr/bin/dman - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/dumpobj $pkgdir/usr/bin/dumpobj - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/obj2asm $pkgdir/usr/bin/obj2asm - install -Dm755 $srcdir/dmd2/linux/bin${_archbits}/rdmd $pkgdir/usr/bin/rdmd - #install -Dm755 $srcdir/D-Programming-Language-tools-*/rdmd $pkgdir/usr/bin/rdmd + # install -Dm755 $srcdir/dmd/linux/bin${_archbits}/dumpobj $pkgdir/usr/bin/dumpobj + # install -Dm755 $srcdir/dmd/linux/bin${_archbits}/obj2asm $pkgdir/usr/bin/obj2asm } +# Will be packaged separately once GDC/LDC will be able to compile phobos and pass test suite. +# For now only dependency is relaxed package_libphobos() { - pkgdesc="The phobos D standard library for DMD" - install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime-linux${_archbits}.a $pkgdir/usr/lib/libdruntime.a - install -Dm644 $srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a + depends=("d-compiler>=$pkgver" "curl") + pkgdesc="The Phobos standard library for D programming language" + license=("boost") + install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a + install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so + + mkdir -p $pkgdir/usr/include/d + cp -r $srcdir/phobos/{*.d,etc,std} $pkgdir/usr/include/d - mkdir -p $pkgdir/usr/include/d - cp -r $srcdir/dmd2/src/phobos/{*.d,etc,std} $pkgdir/usr/include/d + mkdir -p $pkgdir/usr/include/d/druntime + cp -r $srcdir/druntime/import $pkgdir/usr/include/d/druntime - mkdir -p $pkgdir/usr/include/d/druntime - cp -r $srcdir/dmd2/src/druntime/import $pkgdir/usr/include/d/druntime + mkdir -p $pkgdir/usr/share/doc/d/ - mkdir -p $pkgdir/usr/share/doc/d/ - cp -r $srcdir/dmd2/html $pkgdir/usr/share/doc/d/ + find $pkgdir/usr -type f | xargs chmod 0644 + + install -Dm644 $srcdir/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos +} - find $pkgdir/usr -type f | xargs chmod 0644 +package_dtools() { + pkgdesc="Ancilliary tools for the D programming language compiler" + license=("boost") + depends=("curl") - install -Dm644 $srcdir/dmd2/src/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + cd $srcdir/tools + mkdir -p $pkgdir/usr/bin + install -m755 -t $pkgdir/usr/bin rdmd ddemangle catdoc detab tolf dget } diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 40d5c18d8..5b1d86b48 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87789 2013-04-06 16:50:31Z bgyorgy $ +# $Id: PKGBUILD 92894 2013-06-18 09:01:17Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.21 -pkgrel=2 +pkgrel=3 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' @@ -18,9 +18,18 @@ optdepends=('lftp: FTPS backend' 'python2-httplib2: Ubuntu One backend' 'python2-oauthlib: Ubuntu One backend' 'rsync: rsync backend') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + "u1backend.patch") md5sums=('4ade1de475e0af64211bb6933b593057' - '3521d679ba7dff46653313aa3b3e6855') + '3521d679ba7dff46653313aa3b3e6855' + 'b7aede10a3f5503ae4428a506b57486c') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix Ubuntu One backup (FS#35487, upstream revisions 912 and 913, will be fixed in 0.6.22). + patch -p0 duplicity/backends/u1backend.py ../u1backend.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/duplicity/u1backend.patch b/community/duplicity/u1backend.patch new file mode 100644 index 000000000..7aba89fbb --- /dev/null +++ b/community/duplicity/u1backend.patch @@ -0,0 +1,16 @@ +86a87,90 +> +> if isinstance(body, file): +> body.seek(0) # Go to the beginning of the file for the retry +> +108a113,115 +> if isinstance(body, file): +> body.seek(0) # Go to the beginning of the file for the retry +> +209a217 +> size = os.path.getsize(source_path.name) +213c221,222 +< headers = {"Content-Type": content_type} +--- +> headers = {"Content-Length": str(size), +> "Content-Type": content_type} diff --git a/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch b/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch new file mode 100644 index 000000000..9ce462240 --- /dev/null +++ b/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch @@ -0,0 +1,25 @@ +From 4ab5ed57a3b53e0271cf50f256cd7904c50cac55 Mon Sep 17 00:00:00 2001 +From: Douglas Jerome <douglas@ttylinux.org> +Date: Wed, 15 May 2013 14:33:31 +0200 +Subject: [PATCH] Makefile: respect ${DESTDIR} in tic invocation + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ff85deb..eb849f4 100644 +--- a/Makefile ++++ b/Makefile +@@ -55,7 +55,7 @@ install: dvtm + @sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1 + @echo installing terminfo description +- @tic -s dvtm.info ++ @tic -o ${DESTDIR}/usr/share/terminfo -s dvtm.info + + uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin +-- +1.8.3.450.gf3f2a46 + diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD index 435cbe191..8ed499f09 100644 --- a/community/dvtm/PKGBUILD +++ b/community/dvtm/PKGBUILD @@ -1,26 +1,34 @@ -# $Id: PKGBUILD 88575 2013-04-20 13:06:56Z lfleischer $ +# $Id: PKGBUILD 92416 2013-06-04 19:05:34Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Giorgio Lando <patroclo7@gmail.com> # Contributor: bender02 at gmx dot com pkgname=dvtm pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64' 'mips64el') url='http://www.brain-dump.org/projects/dvtm/' license=('MIT') depends=('ncurses') source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'config.h') + 'config.h' + '0001-Makefile-respect-DESTDIR-in-tic-invocation.patch') md5sums=('7de1103abb0ca410f7250cf89f019a38' - '41107e5e84a8572f70d6cb111b4e07f8') + '41107e5e84a8572f70d6cb111b4e07f8' + 'c85d8265ced45d014a7d3f05134bf6a1') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../0001-Makefile-respect-DESTDIR-in-tic-invocation.patch + cp "${srcdir}/config.h" . sed -i 's/CFLAGS =/CFLAGS +=/' config.mk +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" make clean make diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index 2f6a8d7be..574f2e6bc 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85885 2013-03-08 11:10:34Z tredaelli $ +# $Id: PKGBUILD 92248 2013-06-03 11:15:14Z allan $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Richard Murri <admin@richardmurri.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ecryptfs-utils pkgver=103 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" url="https://launchpad.net/ecryptfs" @@ -27,6 +27,6 @@ build() { package() { cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir/" install - chmod +s "$pkgdir"/sbin/mount.ecryptfs_private + make DESTDIR="$pkgdir/" rootsbindir='/usr/bin' install + chmod +s "$pkgdir/usr/bin/mount.ecryptfs_private" } diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD index b55158cfd..28cc80b15 100644 --- a/community/efax-gtk/PKGBUILD +++ b/community/efax-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81976 2013-01-05 08:19:44Z giovanni $ +# $Id: PKGBUILD 92399 2013-06-04 16:39:33Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=efax-gtk -pkgver=3.2.11 +pkgver=3.2.12 pkgrel=1 pkgdesc="A GUI front end for the 'efax' fax program" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('heirloom-mailx: to use the mail_fax script') backup=('etc/efax-gtkrc') install=efax-gtk.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") -md5sums=('237dddbc6d208565f2860319314f4392') +md5sums=('5d38ca4d4c90e0805f2cf8f191177fb6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD index f77145cca..c7ef0a29d 100644 --- a/community/enet/PKGBUILD +++ b/community/enet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88352 2013-04-16 15:17:10Z svenstaro $ +# $Id: PKGBUILD 92446 2013-06-05 15:30:42Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Bj?indeijer <bjorn@lindeijer.nl> pkgname=enet -pkgver=1.3.7 +pkgver=1.3.8 pkgrel=1 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('5611926d47ce0699c8176898496603192d5744e4') +sha1sums=('72284b0699ace09c1723fd532742077ca775b724') build() { cd "${pkgname}-${pkgver}" diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD index 899e1e02f..77f98da86 100644 --- a/community/erlang-nox/PKGBUILD +++ b/community/erlang-nox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85253 2013-02-28 10:04:50Z arodseth $ +# $Id: PKGBUILD 92931 2013-06-19 14:22:24Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux@cryptocrack.de> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -7,7 +7,7 @@ # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> pkgname=erlang-nox -pkgver=R16B +pkgver=R16B01 pkgrel=1 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' arch=('x86_64' 'i686') @@ -22,8 +22,8 @@ optdepends=('erlang-unixodbc: database support' 'lksctp-tools: for SCTP support') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' - 'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9') +sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0' + '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2') build() { cd "$srcdir/otp_src_${pkgver/_1/}" diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 5888021de..9e277b54e 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87122 2013-03-27 15:53:26Z arodseth $ +# $Id: PKGBUILD 92929 2013-06-19 13:52:02Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -8,16 +8,16 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') -pkgver=R16B -pkgrel=3 +pkgver=R16B01 +pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://www.erlang.org/' license=('custom') makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' - 'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9') +sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0' + '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2') build() { cd "$srcdir/otp_src_${pkgver/_1/}" @@ -32,6 +32,8 @@ package_erlang() { optdepends=('erlang-unixodbc: database support' 'java-environment: for Java support' 'lksctp-tools: for SCTP support') + provides=('erlang-nox') + conflicts=('erlang-nox') cd "$srcdir/otp_src_${pkgver/_1/}" @@ -59,7 +61,7 @@ package_erlang() { package_erlang-unixodbc() { pkgdesc='Unixodbc support for Erlang' - depends=('unixodbc' 'erlang') + depends=('unixodbc' 'erlang-nox') # Get the files that should be packaged as erlang-unixodbc mkdir -p "$pkgdir/usr/lib/erlang/"{lib,man/man3} diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD index 45078ab9c..8c7c59029 100644 --- a/community/esmtp/PKGBUILD +++ b/community/esmtp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=esmtp pkgver=1.2 -pkgrel=4.2 +pkgrel=5 pkgdesc="An easy SMTP forwarder." arch=('i686' 'x86_64' 'mips64el') url='http://esmtp.sourceforge.net' @@ -20,7 +20,7 @@ md5sums=('79a9c1f9023d53f35bb82bf446150a72') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index cf7f2798d..2e166a5ba 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90949 2013-05-16 06:57:01Z bpiotrowski $ +# $Id: PKGBUILD 92250 2013-06-03 11:15:19Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=exim pkgver=4.80.1 -pkgrel=3 +pkgrel=5 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686' 'mips64el') url='http://www.exim.org/' @@ -65,11 +65,9 @@ package() { cp "$srcdir/aliases" "$pkgdir/etc/mail" - install -d "$pkgdir/usr/sbin" cd "$pkgdir/usr/bin" - for i in mailq rmail rsmtp runq sendmail; do + for i in mailq newaliases rmail rsmtp runq sendmail; do ln -s exim "$i" - ln -s ../bin/exim ../sbin/"$i" done # fhs compliancy diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index d029315a7..5cd15184b 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 90024 2013-05-06 19:36:54Z foutrelis $ +# $Id: PKGBUILD 92437 2013-06-05 11:05:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear pkgver=2.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') -makedepends=('boost' 'cmake' 'mesa') +makedepends=('boost' 'cmake' 'mesa' 'sharutils') license=("GPL") url="http://www.flightgear.org" options=('!makeflags') @@ -24,6 +24,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" . + uudecode -o package/flightgear.png package/flightgear.png.uue make sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/flightgear.desktop } @@ -36,5 +37,6 @@ package() { install -Dm0644 package/flightgear.desktop $pkgdir/usr/share/applications/flightgear.desktop install -Dm0644 package/flightgear.ico $pkgdir/usr/share/icons/flightgear.ico + install -Dm0644 package/flightgear.png $pkgdir/usr/share/icons/flightgear.png ln -sf flightgear $pkgdir/usr/share/FlightGear } diff --git a/community/freetalk/PKGBUILD b/community/freetalk/PKGBUILD index 26540364e..824785677 100644 --- a/community/freetalk/PKGBUILD +++ b/community/freetalk/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 65202 2012-02-20 10:13:19Z spupykin $ +# $Id: PKGBUILD 92552 2013-06-08 11:18:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=freetalk pkgver=3.2 -pkgrel=5 +pkgrel=6 pkgdesc="A console based Jabber client" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/freetalk" license=('GPL') -depends=('loudmouth' 'guile') +depends=('loudmouth' 'guile1.8') install=freetalk.install -source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz) -md5sums=('ab09bd07dde158551f151d281b14642c') +source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz + freetalk-3.2-glibc210.patch) +md5sums=('ab09bd07dde158551f151d281b14642c' + '0da1d0a0f606d2b279fe676a80a3eb32') -build() { - cd $srcdir/freetalk-$pkgver - - ./configure --prefix=/usr - - patch -p0 src/callbacks.cc <<EOF -156c156,159 -< *strchr (from, '/') = '\0'; ---- -> { -> char *_tmp = (char*)strchr (from, '/'); -> *_tmp = '\0'; -> } -EOF +prepare(){ + cd $pkgname-$pkgver + patch -Np1 -i ../freetalk-3.2-glibc210.patch +} +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-rpath \ + GUILE=/usr/bin/guile1.8 \ + GUILE_CONFIG=/usr/bin/guile-config1.8 make - make DESTDIR=$pkgdir install - rm $pkgdir/usr/share/info/dir +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/share/info/dir" } diff --git a/community/freetalk/freetalk-3.2-glibc210.patch b/community/freetalk/freetalk-3.2-glibc210.patch new file mode 100644 index 000000000..3bdd0dc69 --- /dev/null +++ b/community/freetalk/freetalk-3.2-glibc210.patch @@ -0,0 +1,68 @@ +diff -urNp freetalk-3.2.orig/src/callbacks.cc freetalk-3.2/src/callbacks.cc +--- freetalk-3.2.orig/src/callbacks.cc 2009-02-25 01:31:29.826691032 +0530 ++++ freetalk-3.2/src/callbacks.cc 2009-02-25 02:56:04.323962193 +0530 +@@ -1,7 +1,7 @@ + /* + callbacks.c: Callback functions + +- Copyright (c) 2005, 2006, 2007 Freetalk Core Team ++ Copyright (c) 2005, 2006, 2007, 2009 Freetalk Core Team + This file is part of GNU Freetalk. + + Freetalk is free software; you can redistribute it and/or modify +@@ -20,6 +20,7 @@ + */ + + #include <stdio.h> ++#include <string> + #include <string.h> + #include <stdlib.h> + #include <glib.h> +@@ -116,8 +117,9 @@ ft_msg_msg_handler (LmMessageHandler *ha + LmMessage *msg, gpointer user_data) + { + LmMessageNode *root, *body, *x; +- const char *from, *msg_str, *type; ++ const char *msg_str, *type; + char *ts = NULL; ++ std::string from; + + root = lm_message_get_node (msg); + body = lm_message_node_get_child (root, "body"); +@@ -152,11 +154,12 @@ ft_msg_msg_handler (LmMessageHandler *ha + set_hook_return (0); + /* TBD : make the below stripping of /Resource configurable */ + if (1) { +- if (strchr (from, '/')) +- *strchr (from, '/') = '\0'; ++ const size_t pos = from.find("/"); ++ if (pos != std::string::npos) ++ from.replace(pos, from.size() - pos, ""); + } + { +- FtRosterItem *item = ft_roster_lookup (from); ++ FtRosterItem *item = ft_roster_lookup (from.c_str()); + char *nickname; + + if (!item) +@@ -166,17 +169,17 @@ ft_msg_msg_handler (LmMessageHandler *ha + + scm_run_hook (ex_message_receive_hook, + scm_list_n (ts ? scm_from_locale_string (ts) : scm_from_locale_string (""), +- scm_from_locale_string (from), ++ scm_from_locale_string (from.c_str()), + nickname ? scm_from_locale_string (nickname) : scm_from_locale_string (""), + scm_from_locale_string (msg_str), + SCM_UNDEFINED)); + } + if (ts) g_free (ts); + +- if (get_hook_return () == 1) ++ if (get_hook_return () == 1) + return LM_HANDLER_RESULT_REMOVE_MESSAGE; + +- PRINTF ("%s: %s", from, msg_str); ++ PRINTF ("%s: %s", from.c_str(), msg_str); + } else { + /* This logic should be looked into : FIXME */ + ft_send_file_message_data (msg); diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD index 26be1d2ff..3cba40d6c 100644 --- a/community/galculator/PKGBUILD +++ b/community/galculator/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84391 2013-02-17 21:32:04Z bpiotrowski $ +# $Id: PKGBUILD 92890 2013-06-18 08:47:35Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=galculator -pkgver=2.1 +pkgver=2.1.2 pkgrel=1 pkgdesc='GTK+ based scientific calculator' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils makedepends=('intltool') install=$pkgname.install source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2) -sha256sums=('f3ae03601a123287cddf6f79e79cf37bbe5ce87a98997e0fd623f1cd08e6f6be') +sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index b216c0877..69cc32f62 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91592 2013-05-25 02:56:17Z foutrelis $ +# $Id: PKGBUILD 92837 2013-06-16 17:21:06Z foutrelis $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -16,7 +16,7 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') pkgver=3.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -30,18 +30,28 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' 'gmime') options=(!emptydirs) -source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('eef35861d1e95808180ac7ed5a436569') +source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" + gambas3-3.4.1-llvm-3.3.patch) +md5sums=('eef35861d1e95808180ac7ed5a436569' + '04bf972f5d5546118ecbcc1f24271216') create_dirs() { install -dm755 ${pkgdir}/usr/lib/gambas3 install -dm755 ${pkgdir}/usr/share/gambas3/info/control } -build() { +prepare() { cd ${srcdir}/${pkgbase}-${pkgver} + # Fix build with LLVM 3.3 (patch from Fedora) + patch -Np1 -i../gambas3-3.4.1-llvm-3.3.patch + ./reconf-all +} + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + ./configure --prefix=/usr -C make bindir=${pkgdir}/usr/bin @@ -414,7 +424,7 @@ package_gambas3-gb-image() { } package_gambas3-gb-jit() { - depends=('gambas3-runtime' 'llvm') + depends=('gambas3-runtime' 'llvm-libs') pkgdesc="Just-in-time compiler component" cd ${srcdir}/fakeinstall diff --git a/community/gambas3/gambas3-3.4.1-llvm-3.3.patch b/community/gambas3/gambas3-3.4.1-llvm-3.3.patch new file mode 100644 index 000000000..a5f75fe78 --- /dev/null +++ b/community/gambas3/gambas3-3.4.1-llvm-3.3.patch @@ -0,0 +1,86 @@ +diff -up gambas3-3.4.1/gb.jit/configure.ac.jx gambas3-3.4.1/gb.jit/configure.ac +--- gambas3-3.4.1/gb.jit/configure.ac.jx 2013-03-24 13:34:31.000000000 -0400 ++++ gambas3-3.4.1/gb.jit/configure.ac 2013-05-02 13:42:02.911687100 -0400 +@@ -32,7 +32,7 @@ fi + + GB_COMPONENT( + jit, JIT, gb.jit, [src], +- [GB_FIND(llvm/LLVMContext.h, /usr/lib/llvm* /usr/local/lib /usr/local /usr/lib /usr `$LLVM_CONFIG --prefix`, include)], ++ [GB_FIND(llvm/IR/LLVMContext.h, /usr/lib/llvm* /usr/local/lib /usr/local /usr/lib /usr `$LLVM_CONFIG --prefix`, include)], + [GB_FIND(libLLVM-$LLVM_VERSION.$SHLIBEXT, /usr/lib/llvm* /usr/local /usr `$LLVM_CONFIG --prefix`, lib)], + [$C_LIB `$LLVM_CONFIG --ldflags` -lLLVM-$LLVM_VERSION], + [-I../../main/gbx -I../../main/share -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS]) +diff -up gambas3-3.4.1/gb.jit/src/jit_codegen.cpp.jx gambas3-3.4.1/gb.jit/src/jit_codegen.cpp +--- gambas3-3.4.1/gb.jit/src/jit_codegen.cpp.jx 2013-03-24 13:34:31.000000000 -0400 ++++ gambas3-3.4.1/gb.jit/src/jit_codegen.cpp 2013-05-02 13:54:30.344186594 -0400 +@@ -3614,11 +3614,7 @@ void TryExpression::codegen(){ + create_gep(temp_errcontext1, TARGET_BITS, 0, TARGET_BITS, 0)); + + llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p")); +-#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2) +- f->addFnAttr(llvm::Attributes::ReturnsTwice); +-#else + f->addFnAttr(llvm::Attribute::ReturnsTwice); +-#endif + + llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); + +@@ -3669,11 +3665,7 @@ void LargeTryExpression::codegen(){ + create_gep(temp_errcontext2, TARGET_BITS, 0, TARGET_BITS, 0)); + + llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p")); +-#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2) +- f->addFnAttr(llvm::Attributes::ReturnsTwice); +-#else + f->addFnAttr(llvm::Attribute::ReturnsTwice); +-#endif + + llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); + +diff -up gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp.jx gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp +--- gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp.jx 2013-03-24 13:34:31.000000000 -0400 ++++ gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp 2013-05-02 13:42:02.912687103 -0400 +@@ -24,9 +24,9 @@ + ***************************************************************************/ + + #include "llvm/Pass.h" +-#include "llvm/Function.h" ++#include "llvm/IR/Function.h" + #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2) +-#include "llvm/IRBuilder.h" ++#include "llvm/IR/IRBuilder.h" + #else + #include "llvm/Support/IRBuilder.h" + #endif +diff -up gambas3-3.4.1/gb.jit/src/jit.h.jx gambas3-3.4.1/gb.jit/src/jit.h +--- gambas3-3.4.1/gb.jit/src/jit.h.jx 2013-03-24 13:34:31.000000000 -0400 ++++ gambas3-3.4.1/gb.jit/src/jit.h 2013-05-02 13:42:02.912687103 -0400 +@@ -26,13 +26,13 @@ + #ifndef __JIT_H + #define __JIT_H + +-#include "llvm/LLVMContext.h" +-#include "llvm/Module.h" ++#include "llvm/IR/LLVMContext.h" ++#include "llvm/IR/Module.h" + #include "llvm/Analysis/Verifier.h" +-#include "llvm/Constants.h" +-#include "llvm/DerivedTypes.h" +-#include "llvm/Intrinsics.h" +-#include "llvm/Instructions.h" ++#include "llvm/IR/Constants.h" ++#include "llvm/IR/DerivedTypes.h" ++#include "llvm/IR/Intrinsics.h" ++#include "llvm/IR/Instructions.h" + #include "llvm/ExecutionEngine/JIT.h" + #include "llvm/ExecutionEngine/Interpreter.h" + #include "llvm/ExecutionEngine/GenericValue.h" +@@ -40,7 +40,7 @@ + #include "llvm/Support/ManagedStatic.h" + #include "llvm/Support/raw_ostream.h" + #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2) +-#include "llvm/IRBuilder.h" ++#include "llvm/IR/IRBuilder.h" + #else + #include "llvm/Support/IRBuilder.h" + #endif diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD index 3548d92f3..f78d8fa95 100644 --- a/community/gammu/PKGBUILD +++ b/community/gammu/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 87059 2013-03-26 14:42:55Z schiv $ +# $Id: PKGBUILD 92498 2013-06-07 09:28:57Z tomegun $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=gammu pkgver=1.32.0 -pkgrel=3 +pkgrel=4 pkgdesc="GNU All Mobile Management Utilities" arch=('i686' 'x86_64' 'mips64el') url="http://wammu.eu/" license=('GPL') -depends=('bluez' 'curl' 'libmariadbclient' - 'postgresql-libs' 'libusb') -makedepends=('cmake' 'doxygen' 'mariadb') +depends=('glib2' 'bluez-libs' 'curl' 'libmariadbclient' 'postgresql-libs' 'libusb') +makedepends=('cmake' 'doxygen' 'mariadb' 'python2') optdepends=('dialog: support for the gammu-config script') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('8ea16c6b3cc48097a8e62311fe0e25b9') diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD index 4a9a1caae..ebe9d1365 100644 --- a/community/geda-gaf/PKGBUILD +++ b/community/geda-gaf/PKGBUILD @@ -4,7 +4,7 @@ pkgname=geda-gaf pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project" arch=('i686' 'x86_64' 'mips64el') url="http://www.gpleda.org" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 65595c3d0..0041e3414 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91737 2013-05-26 21:49:55Z heftig $ +# $Id: PKGBUILD 92909 2013-06-18 13:47:52Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,20 +6,21 @@ # Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Plugins for gedit" arch=('x86_64' 'i686' 'mips64el') license=(GPL) url="http://live.gnome.org/GeditPlugins" depends=(gedit python-dbus) -makedepends=(intltool gnome-doc-utils vte3) +makedepends=(intltool gnome-doc-utils vte3 libgit2-glib) optdepends=('gucharmap: for charmap plugin' - 'vte3: for embedded terminal') + 'vte3: for embedded terminal' + 'libgit2-glib: for git plugin') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('ee6efad1222b0f74208b5280dbad84d16400f3fc39c227b12c8695999aa2b502') +sha256sums=('2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80') build() { cd $pkgname-$pkgver diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 1990e63b0..847ef3031 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87832 2013-04-07 21:39:10Z svenstaro $ +# $Id: PKGBUILD 92771 2013-06-15 00:51:49Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,37 +7,35 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=2.7.8 +pkgver=3.0 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64' 'mips64el') url="http://www.glfw.org/" license=('custom:ZLIB') -depends=('libgl' 'libxrandr' 'glu') -makedepends=('mesa') -source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('a2e1b13e46a7c637a7760c94b72896cd') +depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput') +makedepends=('mesa' 'cmake' 'doxygen') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('415aef32d70af0cc829148c1cc7b1357') build() { cd "$srcdir/$pkgname-$pkgver" - export LFLAGS+="-lrt" - make x11 + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON + make } package() { cd "$srcdir/$pkgname-$pkgver" - make PREFIX="$pkgdir/usr" x11-dist-install - - # license - install -Dm644 COPYING.txt \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - # docs - install -d "$pkgdir/usr/share/doc/$pkgname" - install -Dm644 docs/*.pdf "$pkgdir/usr/share/doc/$pkgname" + cd build + make DESTDIR=$pkgdir install - # fix pc file prefix path - sed -i "s|$pkgdir||g" "$pkgdir/usr/lib/pkgconfig/lib$pkgname.pc" + cd .. + install -Dm644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index e20d459d2..a0bae749c 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92113 2013-05-31 16:29:44Z spupykin $ +# $Id: PKGBUILD 92260 2013-06-03 11:49:45Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be @@ -7,7 +7,7 @@ pkgname=glusterfs pkgver=3.3.1 _basever=`echo $pkgver | cut -f1-2 -d.` -pkgrel=4 +pkgrel=5 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64 mips64el) url='http://www.gluster.org/' @@ -28,6 +28,7 @@ build() { ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ + --with-mountutildir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/share/man \ @@ -45,10 +46,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - mkdir -p $pkgdir/usr/sbin make DESTDIR=$pkgdir install - mv $pkgdir/sbin/* $pkgdir/usr/sbin - rmdir $pkgdir/sbin install -D -m 644 \ $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 3ec328616..efb7a2307 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90039 2013-05-06 19:37:31Z foutrelis $ +# $Id: PKGBUILD 92433 2013-06-05 10:32:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,8 +6,8 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.5.2 -pkgrel=2 +pkgver=1.5.6.0 +pkgrel=1 arch=("i686" "x86_64" "mips64el") url="http://gmic.sourceforge.net" license=("custom:CeCILL") @@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2') #options=('!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" "opencv-buildfix.patch") -md5sums=('ec68076448166ea18d15c0a69489dd25' +md5sums=('3aea4c983bc5e8a834f147dad88ebdac' '120319b0d6c81c5af186abe2281b79ca') prepare() { @@ -25,8 +25,6 @@ prepare() { find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile } -md5sums=('7d3a8e5cf9e866dd8979dc7c759a21a6' - '120319b0d6c81c5af186abe2281b79ca') build() { cd "${srcdir}/gmic-${pkgver}" diff --git a/community/gnokii/PKGBUILD b/community/gnokii/PKGBUILD index 83d8d9f4e..50d2c186d 100644 --- a/community/gnokii/PKGBUILD +++ b/community/gnokii/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90848 2013-05-14 21:40:33Z andrea $ +# $Id: PKGBUILD 92499 2013-06-07 09:28:58Z tomegun $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,12 +6,12 @@ pkgname=gnokii pkgver=0.6.31 -pkgrel=4 +pkgrel=5 pkgdesc="Tools and user space driver for use with mobile phones" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnokii.org/" license=('GPL') -depends=('libusb-compat' 'libxpm' 'bluez' 'libical') +depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite') makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb') optdepends=('gtk2: xgnokii GUI' 'libmariadbclient: smsd mysql backend' diff --git a/community/gnome-hearts/PKGBUILD b/community/gnome-hearts/PKGBUILD new file mode 100644 index 000000000..07984fbb4 --- /dev/null +++ b/community/gnome-hearts/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 92595 2013-06-09 15:59:15Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Neil Darlow <neil@darlow.co.uk> + +pkgname=gnome-hearts +pkgver=0.3.1 +pkgrel=1 +pkgdesc="A card game for GNOME" +arch=('i686' 'x86_64') +url="http://www.jejik.com/gnome-hearts/" +license=('GPL') +depends=('python2' 'libgnomeui' 'libglade' 'desktop-file-utils') +makedepends=('intltool' 'rarian') +install=gnome-hearts.install +source=(http://www.jejik.com/files/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('4b9477e8bb2d48a86021ae512a713fd405a96d52cf711ff549cfe0d119bf56b3') + + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gnome-hearts/gnome-hearts.install b/community/gnome-hearts/gnome-hearts.install new file mode 100644 index 000000000..686b22022 --- /dev/null +++ b/community/gnome-hearts/gnome-hearts.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 7f0ade8e5..555b74b03 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92197 2013-06-02 17:23:53Z arodseth $ +# $Id: PKGBUILD 92767 2013-06-14 21:32:00Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -11,8 +11,8 @@ # TODO: Create split packages for the crosscompilation versions? (maybe) pkgname=go -pkgver=1.1 -pkgrel=4 +pkgver=1.1.1 +pkgrel=1 epoch=2 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') @@ -27,12 +27,12 @@ backup=('usr/lib/go/bin') if [ "$CARCH" == 'x86_64' ]; then source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" "$pkgname.sh") - sha256sums=('2ed0548bc9f9071c24d253f945dd8354bdaa8a9925e48ad5eef586afbf6cfe8a' - 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') + sha256sums=('71ff6e7bfd8f59a12f2fc7b7abf5d006fad24664e11e39bec61c2ac84d2e573f' + 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') else source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" "$pkgname.sh") - sha256sums=('fd6c951cbd5329f192430fe579dbe594d380c80651bf660c1b3d4e9a86370383' + sha256sums=('fabb01f1b6a048280f4235c6d9be1cd7ed27a653ca0e011c393af23e40b54450' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') fi diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index 56eef566e..762b88ef9 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87417 2013-03-31 19:18:21Z stephane $ +# $Id: PKGBUILD 92874 2013-06-17 12:07:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gpsdrive pkgver=2.11 _pkgver=20120928 -pkgrel=17 +pkgrel=18 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" @@ -20,21 +20,23 @@ install="gpsdrive.install" source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz") md5sums=('bc53792529788b81c291a32d628a4850') -build() { +prepare() { cd "$srcdir" - # python2 fix for file in $(find . -name '*.py' -print); do sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done - - rm -rf build - mkdir build - cd build - sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp + sed -i 's|datasource_cache::instance()->|datasource_cache::instance().|' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp +} + +build() { + cd "$srcdir" + + mkdir -p build + cd build export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD index bb8f162ed..9f9206da1 100644 --- a/community/gtkspell3/PKGBUILD +++ b/community/gtkspell3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87235 2013-03-28 21:25:14Z bgyorgy $ +# $Id: PKGBUILD 92677 2013-06-12 04:09:55Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gtkspell3 -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 url="http://gtkspell.sourceforge.net/" pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget" @@ -14,7 +14,7 @@ depends=('gtk3' 'enchant') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=(http://gtkspell.sourceforge.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('5db501ead123ffbe8aad7d5f76c44c71') +md5sums=('58f68a0fe9007d9a3d6092b222689320') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index 5054d37be..80354ec1e 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89164 2013-04-27 12:32:34Z kkeen $ +# $Id: PKGBUILD 92578 2013-06-08 21:06:37Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.45 +pkgver=3.3.47 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('d746e1ce0584155e3af1d7ba5b0e56f0') +md5sums=('fdb257ed42220a9a7526b70d1746054a') build() { cd "${srcdir}/gtkwave-${pkgver}" @@ -36,3 +36,4 @@ package() { install -D -m644 "${srcdir}/gtkwave-${pkgver}/MIT.TXT" \ "${pkgdir}/usr/share/licenses/gtkwave/MIT.TXT" } + diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD index b5fe36364..d8fd5057f 100644 --- a/community/gtypist/PKGBUILD +++ b/community/gtypist/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81342 2012-12-18 09:40:11Z spupykin $ +# $Id: PKGBUILD 92635 2013-06-10 09:42:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ben Mazer <blm@groknil.org> # Contributor: Mike Douglas <code_monkey@gooeylinux.org> pkgname=gtypist -pkgver=2.9.2 +pkgver=2.9.3 pkgrel=1 pkgdesc="universal typing tutor" arch=('i686' 'x86_64' 'mips64el') @@ -15,14 +15,19 @@ makedepends=('emacs') install=gtypist.install source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz ncurses.patch) -md5sums=('e6f5ce16d3bdb335f7c698957bc54526' - 'ba5e990d948ba5019391094dac890aa6') +md5sums=('e26c29be0adf345604a802be81712bee' + 'e37a2e8fe90c6c0c684c1a12d016ee03') build() { cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/ncurses.patch + autoreconf ./configure --prefix=/usr make +} + +package() { + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install rm -f $pkgdir/usr/share/info/dir } diff --git a/community/gtypist/ncurses.patch b/community/gtypist/ncurses.patch index c06424623..9fa484ffd 100644 --- a/community/gtypist/ncurses.patch +++ b/community/gtypist/ncurses.patch @@ -1,63 +1,29 @@ -diff -wbBur gtypist-2.9.1/configure gtypist-2.9.1.my/configure ---- gtypist-2.9.1/configure 2011-11-29 00:14:11.000000000 +0400 -+++ gtypist-2.9.1.my/configure 2011-11-29 13:03:51.000000000 +0400 -@@ -4011,13 +4011,13 @@ - ALL_LINGUAS="cs de es eu fi fr nl pl ru tr zh_CN zh_TW" - - # Checks for libraries. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncursesw" >&5 --$as_echo_n "checking for add_wch in -lncursesw... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_wch in -lncurses" >&5 -+$as_echo_n "checking for add_wch in -lncurses... " >&6; } - if ${ac_cv_lib_ncursesw_add_wch+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lncursesw $LIBS" -+LIBS="-lncurses $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -4464,7 +4464,7 @@ - done +diff -wbBur gtypist-2.9.3/configure.ac gtypist-2.9.3.q/configure.ac +--- gtypist-2.9.3/configure.ac 2013-06-05 22:50:00.000000000 +0400 ++++ gtypist-2.9.3.q/configure.ac 2013-06-10 13:32:54.284038071 +0400 +@@ -44,14 +44,14 @@ + AC_FUNC_STRTOD + AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify dcgettext getcwd getwd mempcpy memset munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul]) +-# check for libncursesw ++# check for libncurses --ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default" -+ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default" - if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then : - HAVE_NCURSESW_H=1 - fi -@@ -4473,7 +4473,7 @@ - - # sanity check for libncursesw: +-AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1) +-AC_CHECK_LIB(ncursesw, add_wch, HAVE_LIBNCURSESW=1) ++AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1) ++AC_CHECK_LIB(ncurses, add_wch, HAVE_LIBNCURSESW=1) if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then - LIBS="-lncursesw $LIBS" + LIBS="-lncurses $LIBS" else - echo -e "Error: both library and header files for the ncursesw library\n"\ +- echo -e "Error: both library and header files for the ncursesw library\n"\ ++ echo -e "Error: both library and header files for the ncurses library\n"\ "are required to build this package. See INSTALL file for"\ -diff -wbBur gtypist-2.9.1/configure.ac gtypist-2.9.1.my/configure.ac ---- gtypist-2.9.1/configure.ac 2011-11-21 03:27:02.000000000 +0400 -+++ gtypist-2.9.1.my/configure.ac 2011-11-29 13:02:53.000000000 +0400 -@@ -21,13 +21,13 @@ - ALL_LINGUAS="cs de es eu fi fr nl pl ru tr zh_CN zh_TW" - - # Checks for libraries. --AC_CHECK_LIB(ncursesw, add_wch, HAVE_LIBNCURSESW=1) -+AC_CHECK_LIB(ncurses, add_wch, HAVE_LIBNCURSESW=1) - - # Checks for header files. - AC_HEADER_STDC - AC_CHECK_HEADERS([unistd.h alloca.h argz.h errno.h fcntl.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h]) - --AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1) -+AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1) - - # sanity check for libncursesw: - if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then -diff -wbBur gtypist-2.9.1/src/cursmenu.c gtypist-2.9.1.my/src/cursmenu.c ---- gtypist-2.9.1/src/cursmenu.c 2011-11-01 04:13:02.000000000 +0400 -+++ gtypist-2.9.1.my/src/cursmenu.c 2011-11-29 13:04:15.000000000 +0400 + "further information. On Debian/Ubuntu you need to install libncursesw5-dev." + exit 1; +diff -wbBur gtypist-2.9.3/src/cursmenu.c gtypist-2.9.3.q/src/cursmenu.c +--- gtypist-2.9.3/src/cursmenu.c 2013-06-05 22:50:00.000000000 +0400 ++++ gtypist-2.9.3.q/src/cursmenu.c 2013-06-10 13:33:16.610704480 +0400 @@ -24,7 +24,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -67,9 +33,9 @@ diff -wbBur gtypist-2.9.1/src/cursmenu.c gtypist-2.9.1.my/src/cursmenu.c #endif #include "error.h" -diff -wbBur gtypist-2.9.1/src/error.c gtypist-2.9.1.my/src/error.c ---- gtypist-2.9.1/src/error.c 2011-11-01 04:13:02.000000000 +0400 -+++ gtypist-2.9.1.my/src/error.c 2011-11-29 13:04:15.000000000 +0400 +diff -wbBur gtypist-2.9.3/src/error.c gtypist-2.9.3.q/src/error.c +--- gtypist-2.9.3/src/error.c 2013-06-05 22:50:00.000000000 +0400 ++++ gtypist-2.9.3.q/src/error.c 2013-06-10 13:33:26.124037704 +0400 @@ -25,7 +25,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -79,9 +45,9 @@ diff -wbBur gtypist-2.9.1/src/error.c gtypist-2.9.1.my/src/error.c #endif #include <stdlib.h> -diff -wbBur gtypist-2.9.1/src/gtypist.c gtypist-2.9.1.my/src/gtypist.c ---- gtypist-2.9.1/src/gtypist.c 2011-11-22 17:31:25.000000000 +0400 -+++ gtypist-2.9.1.my/src/gtypist.c 2011-11-29 13:04:15.000000000 +0400 +diff -wbBur gtypist-2.9.3/src/gtypist.c gtypist-2.9.3.q/src/gtypist.c +--- gtypist-2.9.3/src/gtypist.c 2013-06-05 22:50:00.000000000 +0400 ++++ gtypist-2.9.3.q/src/gtypist.c 2013-06-10 13:33:18.844037788 +0400 @@ -31,7 +31,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -91,9 +57,9 @@ diff -wbBur gtypist-2.9.1/src/gtypist.c gtypist-2.9.1.my/src/gtypist.c #endif #include <time.h> -diff -wbBur gtypist-2.9.1/src/script.c gtypist-2.9.1.my/src/script.c ---- gtypist-2.9.1/src/script.c 2011-11-28 19:39:48.000000000 +0400 -+++ gtypist-2.9.1.my/src/script.c 2011-11-29 13:04:15.000000000 +0400 +diff -wbBur gtypist-2.9.3/src/script.c gtypist-2.9.3.q/src/script.c +--- gtypist-2.9.3/src/script.c 2013-06-05 22:50:00.000000000 +0400 ++++ gtypist-2.9.3.q/src/script.c 2013-06-10 13:33:21.067371095 +0400 @@ -24,7 +24,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -103,9 +69,9 @@ diff -wbBur gtypist-2.9.1/src/script.c gtypist-2.9.1.my/src/script.c #endif #include "error.h" -diff -wbBur gtypist-2.9.1/src/utf8.c gtypist-2.9.1.my/src/utf8.c ---- gtypist-2.9.1/src/utf8.c 2011-11-28 19:39:19.000000000 +0400 -+++ gtypist-2.9.1.my/src/utf8.c 2011-11-29 13:04:15.000000000 +0400 +diff -wbBur gtypist-2.9.3/src/utf8.c gtypist-2.9.3.q/src/utf8.c +--- gtypist-2.9.3/src/utf8.c 2013-06-05 22:50:00.000000000 +0400 ++++ gtypist-2.9.3.q/src/utf8.c 2013-06-10 13:33:23.604037733 +0400 @@ -23,7 +23,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index eb6a48ed4..751d2ee54 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89294 2013-04-28 16:52:15Z td123 $ +# $Id: PKGBUILD 92370 2013-06-04 12:29:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo pkgver=0.12.4 -pkgrel=4 +pkgrel=5 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') @@ -34,7 +34,7 @@ build() { package() { _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hglibver}") + depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hmtlver}") cd ${srcdir}/cairo-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh diff --git a/community/haskell-citeproc-hs/PKGBUILD b/community/haskell-citeproc-hs/PKGBUILD index 9e3bfdcf3..f66d18870 100644 --- a/community/haskell-citeproc-hs/PKGBUILD +++ b/community/haskell-citeproc-hs/PKGBUILD @@ -5,14 +5,14 @@ _hkgname=citeproc-hs pkgname=haskell-citeproc-hs pkgver=0.3.8 -pkgrel=2 +pkgrel=3 pkgdesc="A Citation Style Language implementation in Haskell" url="http://gorgias.mine.nu/repos/citeproc-hs/" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=('ghc') depends=(haskell-http haskell-bytestring haskell-containers haskell-directory - haskell-filepath haskell-json haskell-mtl haskell-old-locale + haskell-filepath haskell-json haskell-mtl haskell-old-locale haskell-hs-bibutils haskell-pandoc-types haskell-parsec haskell-syb haskell-time haskell-utf8-string haskell-xml) source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/${_hkgname}-${pkgver}.tar.gz") install=$pkgname.install @@ -22,7 +22,7 @@ build() { cd "$srcdir/$_hkgname-$pkgver" runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/$pkgname \ - --libsubdir=\$compiler/site-local/\$pkgid -f generic + --libsubdir=\$compiler/site-local/\$pkgid -f bibutils runhaskell Setup build runhaskell Setup haddock runhaskell Setup register --gen-script diff --git a/community/haskell-hs-bibutils/PKGBUILD b/community/haskell-hs-bibutils/PKGBUILD new file mode 100644 index 000000000..85a7a74c7 --- /dev/null +++ b/community/haskell-hs-bibutils/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) # us> +# Contributor: Alexander Dunlap <alexander.dunlap at gmail # dot com> + +_hkgname=hs-bibutils +pkgname=haskell-hs-bibutils +pkgver=5.0 +pkgrel=2 +pkgdesc="Haskell bindings to bibutils, the bibliography conversion utilities." +url="http://hackage.haskell.org/package/$_hkgname" +license=('GPL') +arch=('i686' 'x86_64') +depends=('ghc' 'haskell-syb>=0.3' 'bibutils') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz) +install=$pkgname.install +md5sums=('611e02005ad8bbb69218ebf15f3587c6') + +build() { + cd "$_hkgname-$pkgver" + runhaskell Setup configure -O \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/$pkgname \ + --libsubdir=\$compiler/site-local/\$pkgid \ + --enable-library-profiling + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r \ + -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" \ + unregister.sh +} + +package() { + cd "$_hkgname-$pkgver" + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s /usr/share/doc/${pkgname}/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" +} diff --git a/community/haskell-hs-bibutils/haskell-hs-bibutils.install b/community/haskell-hs-bibutils/haskell-hs-bibutils.install new file mode 100644 index 000000000..7b5f4d635 --- /dev/null +++ b/community/haskell-hs-bibutils/haskell-hs-bibutils.install @@ -0,0 +1,23 @@ +HS_DIR=usr/share/haskell/haskell-hs-bibutils + +post_install() { + $HS_DIR/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + $HS_DIR/unregister.sh +} + +post_upgrade() { + $HS_DIR/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + $HS_DIR/unregister.sh +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD index a31f95cb8..fe85263af 100644 --- a/community/haskell-pandoc/PKGBUILD +++ b/community/haskell-pandoc/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=pandoc pkgname=haskell-pandoc pkgver=1.11.1 -pkgrel=6 +pkgrel=7 pkgdesc="Conversion between markup formats" url="http://hackage.haskell.org/package/${_hkgname}" license=('GPL') diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD index 8992e61ee..cef51e118 100644 --- a/community/haveged/PKGBUILD +++ b/community/haveged/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90384 2013-05-12 06:27:41Z bpiotrowski $ +# $Id: PKGBUILD 92888 2013-06-18 08:41:07Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> # Contributor: kfgz <kfgz at interia dot pl> # Contributor: pootzko <pootzko at gmail dot com> pkgname=haveged -pkgver=1.7.a -_pkgver=${pkgver/.a/a} -pkgrel=2 +pkgver=1.7.c +_pkgver=${pkgver/.c/c} +pkgrel=1 pkgdesc='Entropy harvesting daemon using CPU timings' arch=('i686' 'x86_64' 'mips64el') url='http://www.issihosts.com/haveged' @@ -15,7 +15,7 @@ depends=('glibc') options=('!libtool') source=($url/$pkgname-$_pkgver.tar.gz service) -sha256sums=('8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051' +sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121' 'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12') build() { @@ -28,6 +28,7 @@ package() { cd $pkgname-$_pkgver make DESTDIR="$pkgdir" install - rm -rf $pkgdir/etc/init.d - install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service + rm -rf "$pkgdir"/etc/init.d + install -D -m644 "$srcdir"/service \ + "$pkgdir"/usr/lib/systemd/system/haveged.service } diff --git a/community/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD index 5fcb53a3d..a652ec90d 100644 --- a/community/hdapsd/PKGBUILD +++ b/community/hdapsd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=hdapsd pkgver=20090401 -pkgrel=7 +pkgrel=8 pkgdesc='HDAPS userspace hard drive protection daemon' arch=('i686' 'x86_64' 'mips64el') url='http://sourceforge.net/projects/hdaps/' @@ -13,7 +13,7 @@ depends=('glibc' 'bash') source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz" 'hdapsd.systemd') md5sums=('897cee8b0192febd127470f3e9506aeb' - '61ac40d4d77e57863da68d9fd94c58e7') + 'f514cca78059477c4f33faf97d4aaa06') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/hdapsd/hdapsd.systemd b/community/hdapsd/hdapsd.systemd index d3927d61e..0f35250a7 100644 --- a/community/hdapsd/hdapsd.systemd +++ b/community/hdapsd/hdapsd.systemd @@ -5,7 +5,7 @@ After=syslog.target [Service] Type=forking PIDFile=/var/run/hdapsd.pid -ExecStart=/usr/bin/hdapsd-wrapper +ExecStart=/usr/bin/hdapsd -bp ExecReload=/bin/kill -HUP ${MAINPID} [Install] diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 0b3d9b433..3a2edb39e 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,40 +1,46 @@ -# $Id: PKGBUILD 90047 2013-05-06 19:37:52Z foutrelis $ +# $Id: PKGBUILD 92299 2013-06-03 16:15:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.18 -pkgrel=8 +pkgver=0.9.19 +pkgrel=1 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" license=('GPL' 'custom') -depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51') +depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut') makedepends=('fpc' 'cmake' # haskell specific - 'ghc=7.6.3-1' - 'haskell-network=2.4.1.2-1' - 'haskell-bytestring-show=0.3.5.4-4' - 'haskell-utf8-string=0.3.7-5' - 'haskell-dataenc=0.14.0.5-2' - 'haskell-hslogger=1.2.1-4' - 'haskell-vector=0.10.0.1-4') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-3.tar.bz2 + 'ghc' + 'haskell-network' + 'haskell-bytestring-show' + 'haskell-utf8-string' + 'haskell-dataenc' + 'haskell-hslogger' + 'haskell-vector' + 'haskell-random') +source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop - hedgewars.png) -md5sums=('02465736fdcf48feea1cacaa0aa5960e' + hedgewars.png + build-fix.patch) +md5sums=('51d84ad6ea00e9894e6119b118b4a523' '48c66a3204d4fa0a69e9aa46f7c31e0c' - 'eeb14d50df39063549ac5eca9dbc65d1') + 'eeb14d50df39063549ac5eca9dbc65d1' + 'a9d7b0ba72cbeb7fc74fce459db9dd90') + +prepare() { + cd $pkgname-src-$pkgver + patch -Rp1 <$srcdir/build-fix.patch +} build() { cd $pkgname-src-$pkgver - sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs -# sed -i 's|lua51 lua5.1 lua-5.1|lua lua51 lua5.1 lua-5.1|g' cmake_modules/FindLua.cmake cmake \ + -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATA_INSTALL_DIR=/usr/share \ - -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake \ - -DQT_MOC_EXECUTABLE=/usr/lib/qt4/bin/moc \ - -DWITH_SERVER=1 . + -DDATA_INSTALL_DIR=/usr/share/hedgewars \ + -DWITH_SERVER=1 \ + -DSYSTEM_PHYSFS=OFF . make } diff --git a/community/hedgewars/build-fix.patch b/community/hedgewars/build-fix.patch new file mode 100644 index 000000000..90a4365f2 --- /dev/null +++ b/community/hedgewars/build-fix.patch @@ -0,0 +1,11 @@ +diff -wbBur /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas +--- /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-06-03 20:01:14.212121255 +0400 ++++ hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-05-31 00:07:33.000000000 +0400 +@@ -9,7 +9,6 @@ + {$IFNDEF WIN32} + {$linklib physfs} + {$linklib physlayer} +- {$linklib gcc_s} + + {statically linking physfs brings IOKit dependency on OSX} + {divdi3 is found in stdc++ on linux x86 and in gcc_s.1 on osx ppc32} diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index e7dc92f58..a908dd4cb 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 85360 2013-03-01 10:33:34Z andrea $ +# $Id: PKGBUILD 92418 2013-06-04 19:14:33Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.13 -pkgrel=2 +pkgver=3.14 +pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') makedepends=(qt4 lua51 boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('2b5e217c80c441853360926dbb7777e9' - 'c68f6dd20af61ca1061d910879d910a8') +md5sums=('a0bf796e952f5e1ccf061704cd774047' + 'SKIP') build() { cd "$srcdir/$pkgbase-$pkgver" - make - make gui + make QMAKE=qmake-qt4 + make QMAKE=qmake-qt4 gui } package_highlight() { @@ -25,7 +25,7 @@ package_highlight() { depends=('lua51') cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" QMAKE=qmake-qt4 install } package_highlight-gui() { @@ -34,7 +34,7 @@ package_highlight-gui() { cd "$srcdir/$pkgbase-$pkgver" install -dm755 "$pkgdir/usr/bin" - make DESTDIR="$pkgdir" install-gui + make DESTDIR="$pkgdir" QMAKE=qmake-qt4 install-gui } # vim:set ts=2 sw=2 et: diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD index 477a9431a..e1052f168 100644 --- a/community/i3lock/PKGBUILD +++ b/community/i3lock/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 83283 2013-01-28 17:56:05Z ttoepper $ +# $Id: PKGBUILD 92605 2013-06-09 19:07:52Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3lock -pkgver=2.4.1 -pkgrel=2 +pkgver=2.5 +pkgrel=1 pkgdesc="An improved screenlocker based upon XCB and PAM" arch=('i686' 'x86_64' 'mips64el') url="http://i3wm.org/i3lock/" license=('MIT') groups=("i3") -depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'cairo') +depends=('xcb-util-image' 'libev' 'cairo' 'libxkbcommon') options=('docs') backup=("etc/pam.d/i3lock") -source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2") -md5sums=('fbc954133a6335be89e394d9ec85fcfd') +source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2" + "http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2.asc") +md5sums=('a7d4f2519deb5a62acbc755b09b4faea' 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ibus-sunpinyin/PKGBUILD b/community/ibus-sunpinyin/PKGBUILD index b2943696f..1f40688fe 100644 --- a/community/ibus-sunpinyin/PKGBUILD +++ b/community/ibus-sunpinyin/PKGBUILD @@ -1,41 +1,23 @@ -# $Id: PKGBUILD 81918 2013-01-03 13:12:28Z fyan $ +# $Id: PKGBUILD 92623 2013-06-10 07:28:20Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-sunpinyin -pkgver=2.0.3.20130103 -_commit=baf4da89ac04c3eb6ea3b8fb1a10f13bf23f3d87 +_pkgname=sunpinyin +pkgver=2.0.3.20130307 +_commit=64e26d9ed1f617e59ff37c2efc0be97727c799a1 pkgrel=1 -pkgdesc="IBus Wrapper for sunpinyin." +pkgdesc="IBus Wrapper for sunpinyin" arch=('i686' 'x86_64' 'mips64el') url="http://sunpinyin.googlecode.com" license=('LGPL') depends=('sunpinyin>2.0.3' 'sunpinyin-data' 'ibus') makedepends=('git' 'scons') - -__gitroot=git://github.com/sunpinyin/sunpinyin.git -__gitname=sunpinyin +source=("git://github.com/sunpinyin/sunpinyin.git#commit=$_commit") +md5sums=("SKIP") 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 $__gitroot - 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" - git checkout "$_commit" - - cd "$srcdir/$__gitname-build/wrapper/ibus" + cd "$srcdir/$_pkgname/wrapper/ibus" sed -i -e "s|python|python2|" setup/ibus-setup-sunpinyin.in scons \ @@ -43,7 +25,7 @@ build() { } package() { - cd "$srcdir/$__gitname-build/wrapper/ibus" + cd "$srcdir/$_pkgname/wrapper/ibus" scons \ --prefix=/usr \ diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 7ce438422..9db8d0df3 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91652 2013-05-26 09:24:36Z bluewind $ +# $Id: PKGBUILD 92442 2013-06-05 11:48:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Edward Tjörnhammar <xhemi@cube2.se> # Contributor: Edward Tjörnhammar <xhemi@cube2.se> pkgname=inn pkgver=2.5.3 -pkgrel=6 +pkgrel=7 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64' 'mips64el') @@ -55,10 +55,16 @@ md5sums=('353fe95232828ddbc80debff86c240bc' '050b7bffff3361c673a118739e42349e' '960c800026ed6e03901cf0bafdfd53d8') -build() { +prepare() { cd $srcdir/inn-$pkgver +# sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global + [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch + sed -i 's|#define L_NOTICE.*|#define L_NOTICE LOG_NOTICE|' include/inn/options.h +} - [ $NOEXTRACT -eq 1 ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ +build() { + cd $srcdir/inn-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --includedir=/usr/include/inn \ --sbindir=/usr/sbin \ --with-libtool \ @@ -78,7 +84,6 @@ build() { --with-news-user=9 \ --with-news-group=13 # See https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database - test -f include/config.h cat >>include/config.h <<EOF #undef RUNASUSER @@ -86,9 +91,6 @@ build() { #undef RUNASGROUP #define RUNASGROUP "news" EOF - sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global - [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch - make } diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 9a9e81baa..9efdcecde 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 90936 2013-05-15 15:48:29Z stativ $ +# $Id: PKGBUILD 92669 2013-06-11 16:29:42Z andrea $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=12.1.3 -_pkgver=129.451 +pkgver=12.1.4 +_pkgver=129.713 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -11,11 +11,9 @@ license=('apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('03aea501b9e1dc87a63a8c30399c4304') +md5sums=('573815dd7dbb6a66c19f7f77a1bb048f') package() { - cd "$srcdir" - install -d -m755 "$pkgdir/usr/share/intellijidea-ce/bin" install -d -m755 "$pkgdir/usr/lib" diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD index e5ccd4fea..1cdca27a1 100644 --- a/community/jemalloc/PKGBUILD +++ b/community/jemalloc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88096 2013-04-11 13:54:05Z mtorromeo $ +# $Id: PKGBUILD 92707 2013-06-13 08:34:56Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Kovivchak Evgen <oneonfire@gmail.com> pkgname=jemalloc -pkgver=3.3.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="General-purpose scalable concurrent malloc implementation" arch=('i686' 'x86_64') @@ -27,4 +27,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha256sums=('35c433cc1df5cdf9eb58b7980338552fc1d7aa64f89fe5643a972ccedb7cf20a') +sha256sums=('f60802c4c2c60bc24598fd052494aea96f4426f3d4decd832eadeed520ff81c0') diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 002cba8ab..bafc532c1 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87846 2013-04-08 09:22:44Z spupykin $ +# $Id: PKGBUILD 92336 2013-06-04 05:10:18Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive pkgver=0.9.6 -pkgrel=1 +pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') # http://download.kde.org/stable/kdenlive/ diff --git a/community/kdenlive/kdenlive.install b/community/kdenlive/kdenlive.install index a3489ee9d..53a1827fd 100644 --- a/community/kdenlive/kdenlive.install +++ b/community/kdenlive/kdenlive.install @@ -1,5 +1,6 @@ post_install() { update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q xdg-icon-resource forceupdate --theme hicolor &> /dev/null } diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index 57ae032a4..6818b5de5 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89177 2013-04-27 13:49:24Z kkeen $ +# $Id: PKGBUILD 92569 2013-06-08 18:17:35Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Marq Schneider <queueRAM@gmail.com> pkgname=kicad -pkgver=20130331 +pkgver=20130518 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} -_pkgbzr=4008 +_pkgbzr=4017 pkgrel=1 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64' 'mips64el') @@ -16,9 +16,9 @@ makedepends=('cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install -source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources_stable_${_pkgver}_BZR${_pkgbzr}.zip +source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources-stable_${_pkgver}_BZR${_pkgbzr}.zip kicad-boost-polygon-declare-gtlsort-earlier.patch) -md5sums=('9c88273a5b323b6622d1704a90ffa399' +md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79' 'a2c39704238946e74a5ed0c38326345f') build() { diff --git a/community/kshutdown/PKGBUILD b/community/kshutdown/PKGBUILD index 0af0d8a40..291d661b0 100644 --- a/community/kshutdown/PKGBUILD +++ b/community/kshutdown/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88132 2013-04-12 11:15:41Z arodseth $ +# $Id: PKGBUILD 92861 2013-06-17 10:22:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kshutdown -pkgver=3.0beta7 +pkgver=3.0beta8 pkgrel=1 pkgdesc='Shutdown Utility for KDE' arch=('x86_64' 'i686' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') install="$pkgname.install" source=("http://downloads.sourceforge.net/$pkgname/$pkgname-source-$pkgver.zip") -sha256sums=('5de50c532a9fd2e65706376232b7e641b05bbc5f54677f06d27bce0e0f9825ac') +sha256sums=('5b4242777943574e0607687af6e6270ff655f16612c8b35400a872de35c2a4bd') build() { mkdir "$srcdir/build" diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index 20d2ea51f..f03dc1e49 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88778 2013-04-22 10:14:34Z spupykin $ +# $Id: PKGBUILD 92372 2013-06-04 12:30:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> pkgname=ktoblzcheck -pkgver=1.41 +pkgver=1.42 pkgrel=1 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz ktoblzcheck-python3.patch) -md5sums=('48f6d0086d780d1c101b17b5b63706f3' +md5sums=('86f25d5c6a07313638bb74d6b11eb57c' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index bfdee003e..9859b3077 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86718 2013-03-21 12:30:37Z spupykin $ +# $Id: PKGBUILD 92718 2013-06-13 12:56:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=1.0.8 +pkgver=1.0.10 _pkgsubver=0 pkgrel=1 url='http://www.lazarus.freepascal.org/' @@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('ef5085859be265a189db4aa20c648c2d' +md5sums=('60d3b297079ca4151f690245295a8708' '288bca6ad5ade79deec34c3602daaaa9') build() { diff --git a/community/lcdproc/PKGBUILD b/community/lcdproc/PKGBUILD new file mode 100644 index 000000000..ced069659 --- /dev/null +++ b/community/lcdproc/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 92663 2013-06-11 09:24:01Z idevolder $ +# Maintainer: BlackEagle <ike DOT devolder AT gmail DOT com> +# Contributor: Bernhard Walle <bernhard.walle@gmx.de> + +pkgname=lcdproc +pkgver=0.5.6 +pkgrel=3 +pkgdesc="Utility to drive one or more LCD (and LCD-like) devices" +url="http://lcdproc.omnipotent.net/" +license="GPL" +depends=('libusb-compat') +optdepends=( + 'perl: needed for some lcdproc tools' +) +backup=( + 'etc/LCDd.conf' + 'etc/lcdexec.conf' + 'etc/lcdproc.conf' + 'etc/lcdvc.conf' +) +arch=('i686' 'x86_64') +source=( + "http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + 'lcdd.service' +) + +build() { + cd "$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --enable-libusb \ + --enable-lcdproc-menus \ + --enable-stat-smbfs \ + --enable-drivers=all + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" -i "$pkgdir/etc/LCDd.conf" + install -Dm644 "$srcdir/lcdd.service" "$pkgdir/usr/lib/systemd/system/lcdd.service" +} + +sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a' + '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638') diff --git a/community/lcdproc/lcdd.service b/community/lcdproc/lcdd.service new file mode 100644 index 000000000..6b0072d0d --- /dev/null +++ b/community/lcdproc/lcdd.service @@ -0,0 +1,11 @@ +[Unit] +Description=LCD display driver +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/bin/LCDd -c /etc/LCDd.conf +ControlGroup=cpu:/ + +[Install] +WantedBy=multi-user.target diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 653997fd2..e03404d17 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 84438 2013-02-19 02:32:24Z svenstaro $ +# $Id: PKGBUILD 92773 2013-06-15 01:02:41Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20130219 +pkgver=0.11.0 +epoch=1 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') @@ -10,33 +11,15 @@ license=('BSD') depends=('llvm' 'libconfig') makedepends=('git' 'cmake') backup=('etc/ldc2.conf') -source=() -md5sums=() - -_gitroot=git://github.com/ldc-developers/ldc.git -_gitname=ldc -_gitbranch=master +source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}") +sha1sums=('SKIP') [[ $CARCH == "x86_64" ]] && _multilib="ON" [[ $CARCH == "i686" ]] && _multilib="OFF" 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 --branch "$_gitbranch" "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" + cd "$srcdir"/ldc + git submodule update --init --recursive mkdir build && cd build cmake \ @@ -48,7 +31,7 @@ build() { } package() { - cd "$srcdir/$_gitname-build" + cd "$srcdir"/ldc cd build make DESTDIR=$pkgdir install diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD index 3ed87c459..339560038 100644 --- a/community/libaccounts-glib/PKGBUILD +++ b/community/libaccounts-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85006 2013-02-26 17:28:47Z bgyorgy $ +# $Id: PKGBUILD 92686 2013-06-12 04:53:53Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libaccounts-glib -pkgver=1.8 +pkgver=1.11 pkgrel=1 pkgdesc="Glib-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('dbus-glib' 'libxml2' 'sqlite3') makedepends=('python2-gobject') options=('!libtool') source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('5d827392f6da2ff74e342a6b3a50fbe3486b49b0') +sha1sums=('467480fc800c6d22d8d53373f67d49f8a1e4d970') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD index a65adf1f7..7b577b88e 100644 --- a/community/libev/PKGBUILD +++ b/community/libev/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67524 2012-03-13 10:32:39Z lcarlier $ +# $Id: PKGBUILD 92911 2013-06-18 17:53:17Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Thomas Haider <t.haider@vcnc.org> pkgname=libev -pkgver=4.11 -pkgrel=1.1 +pkgver=4.15 +pkgrel=1 pkgdesc="A full-featured and high-performance event loop" arch=('i686' 'x86_64' 'mips64el') url="http://software.schmorp.de/pkg/libev.html" @@ -13,7 +13,7 @@ license=('BSD') depends=('glibc') options=('!libtool') source=(http://dist.schmorp.de/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('e7752a518742c0f8086a8005aa7efcc4dcf02ed9') +sha1sums=('88655b1e2c0b328c9f90a6df7e72361a97fa8dc3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD new file mode 100644 index 000000000..8e9fadcb6 --- /dev/null +++ b/community/libgit2-glib/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 92908 2013-06-18 13:46:11Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=libgit2-glib +pkgver=0.0.2 +pkgrel=1 +pkgdesc="GLib wrapper for libgit2" +url="http://live.gnome.org/Libgit2-glib" +license=(LGPL2.1) +arch=(i686 x86_64) +depends=(glib2 libgit2 gobject-introspection) +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e1e0c6e0cb6897c09e06edc06ee70befca2a3e1b3eb629c449b8ca0f49db75e5') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD index bb8819802..47312a7ae 100644 --- a/community/libmirage/PKGBUILD +++ b/community/libmirage/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 81967 2013-01-05 03:16:01Z heftig $ +# $Id: PKGBUILD 92550 2013-06-08 08:15:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=libmirage -pkgver=2.0.0 -pkgrel=1 -pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library" +pkgver=2.1.0 +pkgrel=2 +pkgdesc="CD-ROM image (B6T/C2D/CCD/CDI/CIF/CUE/ISO/MDS/MDX/NRG/TOC) access library" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=(GPL) -depends=(glib2 libsndfile zlib bzip2 shared-mime-info) -makedepends=(bison flex gtk-doc cmake gobject-introspection) +depends=(glib2 libsndfile libsamplerate zlib bzip2 xz shared-mime-info) +makedepends=(gtk-doc gobject-introspection cmake) options=(!libtool) install=libmirage.install -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2 - soname.diff) -md5sums=('72007f3364cbf3aea782aaa1fdade238' - '72b5af3d5baf8e9b1ec6afa629373799') +source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2) +sha256sums=('fb30eea15b8c1fc55e194e1af55127fa3b3860a79fec0b6c60588cf9ae8d1ca9') + +prepare() { + mkdir build +} build() { - cd $pkgname-$pkgver - patch -Np2 -i ../soname.diff # Produce correct symlinks - mkdir build; cd build - cmake .. \ + cd build + cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib @@ -31,6 +31,6 @@ build() { } package() { - cd $pkgname-$pkgver/build + cd build make DESTDIR="$pkgdir" install } diff --git a/community/libmirage/soname.diff b/community/libmirage/soname.diff deleted file mode 100644 index 213f788ef..000000000 --- a/community/libmirage/soname.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libmirage/CMakeLists.txt -+++ b/libmirage/CMakeLists.txt -@@ -112,7 +112,8 @@ - COMPILE_DEFINITIONS "${mirage_DEFS}" - LINK_FLAGS ${mirage_LDFLAGS_STR} - LIBRARY_OUTPUT_NAME mirage -- SOVERSION ${MIRAGE_SOVERSION} -+ VERSION ${MIRAGE_SOVERSION} -+ SOVERSION ${MIRAGE_LT_CURRENT} - ) diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD index 1065c9616..528f3a06c 100644 --- a/community/libnfs/PKGBUILD +++ b/community/libnfs/PKGBUILD @@ -1,23 +1,20 @@ -# $Id: PKGBUILD 87823 2013-04-07 09:29:35Z idevolder $ +# $Id: PKGBUILD 92631 2013-06-10 08:52:37Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libnfs -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="client library for accessing NFS shares" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/sahlberg/libnfs" license=('GPL') depends=('glibc') -source=("https://github.com/downloads/sahlberg/$pkgname/$pkgname-$pkgver.tar.gz") -#_srcfolder=sahlberg-libnfs-47e5a2c -sha256sums=('5663355dc18e75c893e09b133ca3ef70cf00754acfea863257f509922b5e5faa') +source=("https://github.com/sahlberg/$pkgname/archive/$pkgname-$pkgver.tar.gz") +sha256sums=('19a497044f086d2bed973d0e89392bd41d1a8e9f524d5787f3090f966e20ccc3') options=(!libtool) build() { - #mv "$_srcfolder" "$pkgname-$pkgver" - - cd "$pkgname-$pkgver" + cd "$pkgname-$pkgname-$pkgver" autoreconf -vif ./configure --prefix=/usr @@ -25,6 +22,6 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd "$pkgname-$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 7c697afde..57d75a4e3 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89874 2013-05-04 04:07:02Z fyan $ +# $Id: PKGBUILD 92622 2013-06-10 07:23:18Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yangtse <yangtsesu@gmail.com> # Contributor: WU Jun <quark at lihdd dot net> pkgname=libpinyin -pkgver=0.9.91 +pkgver=0.9.92 pkgrel=1 pkgdesc="Library to deal with pinyin" arch=('i686' 'x86_64' 'mips64el') @@ -30,5 +30,5 @@ package() { cd "${srcdir}/libpinyin-$pkgver" make DESTDIR="${pkgdir}" install } -sha512sums=('40263ff3b0e4ac6f68ed51d90b07c9431beec70d2b93ab3c0fec36a35b662380a022478bf15d81305a5e84c0eb95d662fed70c7213ff5c0d11a964b232bf1be2' +sha512sums=('6e88143d0032a7da61d141b23df2265540ea7667dfe641e9f1945cf8bc7b2c9df72d96bfa4df4333d550ca9f6d64545076b1aceda1d2b855fa95a2bd793943f4' '8719d99b2efb22438ec067c046f8d45addb3e0d336e8d6ec4b8ed22370fe81366d19a34934bb059230f86e74c379acb62822ee3458850437880d531de8ff3e0e') diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index 00d6905c4..eeb37361f 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76466 2012-09-18 18:52:24Z jlichtblau $ +# $Id: PKGBUILD 92940 2013-06-19 21:09:45Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw -pkgver=0.14.7 -pkgrel=1.1 +pkgver=0.15.2 +pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64' 'mips64el') url="http://www.libraw.org/" @@ -15,7 +15,7 @@ depends=('lcms') options=('!makeflags') changelog=$pkgname.changelog source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz) -sha256sums=('7307a607249043bb544f3ab3b3a999e1923d72fbed12e4e2239d172e522143da') +sha256sums=('828eac93910f26f813f91d35f92f33a9e719c2ec8522d575b248063194b068c6') build() { cd ${srcdir}/LibRaw-${pkgver} diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog index 858be0c3f..ae434aae0 100644 --- a/community/libraw/libraw.changelog +++ b/community/libraw/libraw.changelog @@ -1,3 +1,9 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libraw 0.15.2-1 + +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libraw 0.14.8-1 + 2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * libraw 0.14.7-1 diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD index d09fba005..9b4e65ca6 100644 --- a/community/libsignon-glib/PKGBUILD +++ b/community/libsignon-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 84337 2013-02-16 20:27:53Z bgyorgy $ +# $Id: PKGBUILD 92688 2013-06-12 04:57:26Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libsignon-glib -pkgver=1.9 +pkgver=1.10 pkgrel=1 pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('signon') makedepends=('python2-gobject') options=('!libtool') source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('09e0b8da14f4ea9450e33eb5f6808afeefdbbe03') +sha1sums=('224f66c9662843705da4b35d781a50d6aeb8ca5f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index b44eabbc9..05b2a3984 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92095 2013-05-31 13:59:18Z spupykin $ +# $Id: PKGBUILD 92374 2013-06-04 12:30:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.0.5 -pkgrel=7 +pkgver=1.0.6 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -13,7 +13,7 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' 'iproute2' 'libnl' 'libx11' 'audit') -makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' 'kvm' @@ -34,7 +34,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d libvirt.tmpfiles.d) -md5sums=('91c4145f49bcf92e89470fa3fb28fff6' +md5sums=('a4a09a981f902c4d6aa5138c753d64fd' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') @@ -55,9 +55,7 @@ build() { --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ --with-init-script=systemd --with-audit \ --with-qemu-user=nobody --with-qemu-group=nobody \ - --without-netcf --with-interface \ - --with-dnsmasq-path=/usr/bin/dnsmasq \ - --with-iptables-path=/usr/bin/iptables + --without-netcf --with-interface make sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD index e678e2998..dd4bad4f1 100755 --- a/community/lightdm-gtk2-greeter/PKGBUILD +++ b/community/lightdm-gtk2-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91482 2013-05-23 08:41:25Z alucryd $ +# $Id: PKGBUILD 92267 2013-06-03 13:05:16Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk2-greeter -pkgver=1.5.2 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ provides=("${pkgname/2/}") conflicts=("${pkgname/2/3}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz") -sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc') +sha256sums=('69df6199a7e62b07a1865b0319a7c031abc2b06dc3eb193b8b7b453f536283ac') build() { cd "${srcdir}"/${pkgname/2/}-${pkgver} diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index deab1db66..a18d94aae 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91480 2013-05-23 08:39:59Z alucryd $ +# $Id: PKGBUILD 92265 2013-06-03 12:53:06Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter -pkgver=1.5.2 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ provides=("${pkgname/3/}") conflicts=("${pkgname/3/2}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") -sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc') +sha256sums=('69df6199a7e62b07a1865b0319a7c031abc2b06dc3eb193b8b7b453f536283ac') build() { cd "${srcdir}"/${pkgname/3/}-${pkgver} diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index d84b86994..1496dd78d 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90481 2013-05-12 21:56:51Z alucryd $ +# $Id: PKGBUILD 92709 2013-06-13 08:52:31Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') pkgver=1.6.0 -pkgrel=3 +pkgrel=5 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64' 'mips64el') @@ -22,6 +22,7 @@ source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgv 'lightdm.rules' 'lightdm-default-config.patch' 'lightdm-lock-screen-before-switch.patch' + 'lightdm-use-login1.patch' 'xsession') sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f' @@ -31,6 +32,7 @@ sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c' '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822' + '3247aa1e5e7c2c2f8653cfbb22e1f74252c556b6159ff4ec47c1c7d5ea6883ac' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') prepare() { @@ -38,6 +40,7 @@ prepare() { patch -Np1 -i ../lightdm-default-config.patch patch -Np1 -i ../lightdm-lock-screen-before-switch.patch + patch -Np0 -i ../lightdm-use-login1.patch sed -i 's/MOC5 --qt=qt5/MOC5/' configure } diff --git a/community/lightdm/lightdm-use-login1.patch b/community/lightdm/lightdm-use-login1.patch new file mode 100755 index 000000000..89adbdbb7 --- /dev/null +++ b/community/lightdm/lightdm-use-login1.patch @@ -0,0 +1,514 @@ +=== modified file 'liblightdm-gobject/power.c' +--- liblightdm-gobject/power.c 2013-01-31 20:56:09 +0000 ++++ liblightdm-gobject/power.c 2013-04-15 02:21:06 +0000 +@@ -17,6 +17,7 @@ + + static GDBusProxy *upower_proxy = NULL; + static GDBusProxy *ck_proxy = NULL; ++static GDBusProxy *login1_proxy = NULL; + + static gboolean + upower_call_function (const gchar *function, gboolean default_result, GError **error) +@@ -109,11 +110,10 @@ + return upower_call_function ("Hibernate", TRUE, error); + } + +-static gboolean +-ck_call_function (const gchar *function, gboolean default_result, GError **error) ++static GVariant * ++ck_call_function (const gchar *function, GError **error) + { +- GVariant *result; +- gboolean function_result = FALSE; ++ GVariant *r; + + if (!ck_proxy) + { +@@ -129,22 +129,46 @@ + return FALSE; + } + +- result = g_dbus_proxy_call_sync (ck_proxy, +- function, +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, +- NULL, +- error); +- +- if (!result) +- return default_result; +- +- if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)"))) +- g_variant_get (result, "(b)", &function_result); +- +- g_variant_unref (result); +- return function_result; ++ r = g_dbus_proxy_call_sync (ck_proxy, ++ function, ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ error); ++ ++ return r; ++} ++ ++static GVariant * ++login1_call_function (const gchar *function, GVariant *parameters, GError **error) ++{ ++ GVariant *r; ++ gchar *str_result; ++ ++ if (!login1_proxy) ++ { ++ login1_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_NONE, ++ NULL, ++ "org.freedesktop.login1", ++ "/org/freedesktop/login1", ++ "org.freedesktop.login1.Manager", ++ NULL, ++ error); ++ if (!login1_proxy) ++ return NULL; ++ } ++ ++ r = g_dbus_proxy_call_sync (login1_proxy, ++ function, ++ parameters, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ error); ++ ++ return r; + } + + /** +@@ -157,7 +181,29 @@ + gboolean + lightdm_get_can_restart (void) + { +- return ck_call_function ("CanRestart", FALSE, NULL); ++ gboolean can_restart = FALSE; ++ GVariant *r; ++ ++ r = login1_call_function ("CanReboot", NULL, NULL); ++ if (r) ++ { ++ gchar *result; ++ if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)"))) ++ { ++ g_variant_get (r, "(&s)", &result); ++ can_restart = g_strcmp0 (result, "yes") == 0; ++ } ++ } ++ else ++ { ++ r = ck_call_function ("CanRestart", NULL); ++ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)"))) ++ g_variant_get (r, "(b)", &can_restart); ++ } ++ if (r) ++ g_variant_unref (r); ++ ++ return can_restart; + } + + /** +@@ -171,7 +217,20 @@ + gboolean + lightdm_restart (GError **error) + { +- return ck_call_function ("Restart", TRUE, error); ++ GVariant *r; ++ gboolean restarted; ++ ++ r = login1_call_function ("Reboot", g_variant_new("(b)", FALSE), error); ++ if (!r) ++ { ++ g_clear_error (error); ++ r = ck_call_function ("Restart", error); ++ } ++ restarted = r != NULL; ++ if (r) ++ g_variant_unref (r); ++ ++ return restarted; + } + + /** +@@ -184,7 +243,29 @@ + gboolean + lightdm_get_can_shutdown (void) + { +- return ck_call_function ("CanStop", FALSE, NULL); ++ gboolean can_shutdown = FALSE; ++ GVariant *r; ++ ++ r = login1_call_function ("CanPowerOff", NULL, NULL); ++ if (r) ++ { ++ gchar *result; ++ if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)"))) ++ { ++ g_variant_get (r, "(&s)", &result); ++ can_shutdown = g_strcmp0 (result, "yes") == 0; ++ } ++ } ++ else ++ { ++ r = ck_call_function ("CanStop", NULL); ++ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)"))) ++ g_variant_get (r, "(b)", &can_shutdown); ++ } ++ if (r) ++ g_variant_unref (r); ++ ++ return can_shutdown; + } + + /** +@@ -198,5 +279,18 @@ + gboolean + lightdm_shutdown (GError **error) + { +- return ck_call_function ("Stop", TRUE, error); ++ GVariant *r; ++ gboolean shutdown; ++ ++ r = login1_call_function ("PowerOff", g_variant_new("(b)", FALSE), error); ++ if (!r) ++ { ++ g_clear_error (error); ++ r = ck_call_function ("Stop", error); ++ } ++ shutdown = r != NULL; ++ if (r) ++ g_variant_unref (r); ++ ++ return shutdown; + } + +=== modified file 'liblightdm-qt/power.cpp' +--- liblightdm-qt/power.cpp 2013-02-06 14:08:25 +0000 ++++ liblightdm-qt/power.cpp 2013-04-14 23:00:34 +0000 +@@ -15,6 +15,7 @@ + #include <QtCore/QVariant> + #include <QtDBus/QDBusInterface> + #include <QtDBus/QDBusReply> ++#include <QDebug> + + #include "config.h" + +@@ -26,11 +27,13 @@ + PowerInterfacePrivate(); + QScopedPointer<QDBusInterface> powerManagementInterface; + QScopedPointer<QDBusInterface> consoleKitInterface; ++ QScopedPointer<QDBusInterface> login1Interface; + }; + + PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() : + powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())), +- consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())) ++ consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())), ++ login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus())) + { + } + +@@ -80,34 +83,54 @@ + + bool PowerInterface::canShutdown() + { ++ if (d->login1Interface->isValid()) { ++ QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff"); ++ if (reply1.isValid()) { ++ return reply1.value() == "yes"; ++ } ++ } ++ qWarning() << d->login1Interface->lastError(); ++ + QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop"); + if (reply.isValid()) { + return reply.value(); + } +- else { +- return false; +- } ++ ++ return false; + } + + void PowerInterface::shutdown() + { +- d->consoleKitInterface->call("Stop"); ++ if (d->login1Interface->isValid()) ++ d->login1Interface->call("PowerOff", false); ++ else ++ d->consoleKitInterface->call("Stop"); + } + + bool PowerInterface::canRestart() + { ++ if (d->login1Interface->isValid()) { ++ QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot"); ++ if (reply1.isValid()) { ++ return reply1.value() == "yes"; ++ } ++ } ++ qWarning() << d->login1Interface->lastError(); ++ + QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart"); + if (reply.isValid()) { + return reply.value(); + } +- else { +- return false; +- } ++ ++ return false; + } + + void PowerInterface::restart() + { +- d->consoleKitInterface->call("Restart"); ++ if (d->login1Interface->isValid()) ++ d->login1Interface->call("Reboot", false); ++ else ++ d->consoleKitInterface->call("Restart"); + } + + #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + +=== modified file 'tests/Makefile.am' +--- tests/Makefile.am 2013-04-12 03:46:06 +0000 ++++ tests/Makefile.am 2013-04-14 22:54:54 +0000 +@@ -135,6 +135,8 @@ + test-no-accounts-service \ + test-console-kit \ + test-no-console-kit \ ++ test-no-login1 \ ++ test-no-console-kit-or-login1 \ + test-open-file-descriptors \ + test-xdmcp-open-file-descriptors + +@@ -284,8 +286,10 @@ + scripts/no-accounts-service.conf \ + scripts/no-config.conf \ + scripts/no-console-kit.conf \ ++ scripts/no-console-kit-or-login1.conf \ + scripts/no-keyboard-layout.conf \ + scripts/no-language.conf \ ++ scripts/no-login1.conf \ + scripts/open-file-descriptors.conf \ + scripts/pam.conf \ + scripts/plymouth-active-vt.conf \ + +=== added file 'tests/scripts/no-console-kit-or-login1.conf' +--- tests/scripts/no-console-kit-or-login1.conf 1970-01-01 00:00:00 +0000 ++++ tests/scripts/no-console-kit-or-login1.conf 2013-04-14 22:54:54 +0000 +@@ -0,0 +1,34 @@ ++# ++# Check still works when neither ConsoleKit or login1 is available ++# ++ ++[test-runner-config] ++disable-console-kit=true ++disable-login1=true ++ ++[LightDM] ++minimum-display-number=50 ++ ++[SeatDefaults] ++autologin-user=have-password1 ++ ++#?RUNNER DAEMON-START ++ ++# X server starts ++#?XSERVER :50 START ++#?XSERVER :50 INDICATE-READY ++ ++# LightDM connects to X server ++#?XSERVER :50 ACCEPT-CONNECT ++ ++# Session starts ++#?SESSION :50 START USER=have-password1 ++#?XSERVER :50 ACCEPT-CONNECT ++#?SESSION :50 CONNECT-XSERVER ++ ++# Cleanup ++#?*STOP-DAEMON ++# Don't know what order they will terminate ++#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) ++#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) ++#?RUNNER DAEMON-EXIT STATUS=0 + +=== added file 'tests/scripts/no-login1.conf' +--- tests/scripts/no-login1.conf 1970-01-01 00:00:00 +0000 ++++ tests/scripts/no-login1.conf 2013-04-14 22:54:54 +0000 +@@ -0,0 +1,33 @@ ++# ++# Check still works when login1 is not available ++# ++ ++[test-runner-config] ++disable-login1=true ++ ++[LightDM] ++minimum-display-number=50 ++ ++[SeatDefaults] ++autologin-user=have-password1 ++ ++#?RUNNER DAEMON-START ++ ++# X server starts ++#?XSERVER :50 START ++#?XSERVER :50 INDICATE-READY ++ ++# LightDM connects to X server ++#?XSERVER :50 ACCEPT-CONNECT ++ ++# Session starts ++#?SESSION :50 START USER=have-password1 ++#?XSERVER :50 ACCEPT-CONNECT ++#?SESSION :50 CONNECT-XSERVER ++ ++# Cleanup ++#?*STOP-DAEMON ++# Don't know what order they will terminate ++#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) ++#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) ++#?RUNNER DAEMON-EXIT STATUS=0 + +=== modified file 'tests/src/test-runner.c' +--- tests/src/test-runner.c 2013-03-27 00:48:48 +0000 ++++ tests/src/test-runner.c 2013-04-14 22:54:54 +0000 +@@ -838,6 +838,101 @@ + } + + static void ++handle_login1_call (GDBusConnection *connection, ++ const gchar *sender, ++ const gchar *object_path, ++ const gchar *interface_name, ++ const gchar *method_name, ++ GVariant *parameters, ++ GDBusMethodInvocation *invocation, ++ gpointer user_data) ++{ ++ if (strcmp (method_name, "CanReboot") == 0) ++ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", "yes")); ++ else if (strcmp (method_name, "Reboot") == 0) ++ { ++ gboolean interactive; ++ g_variant_get (parameters, "(b)", &interactive); ++ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()")); ++ } ++ if (strcmp (method_name, "CanPowerOff") == 0) ++ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", "yes")); ++ else if (strcmp (method_name, "PowerOff") == 0) ++ { ++ gboolean interactive; ++ g_variant_get (parameters, "(b)", &interactive); ++ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()")); ++ } ++ else ++ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name); ++} ++ ++static void ++login1_name_acquired_cb (GDBusConnection *connection, ++ const gchar *name, ++ gpointer user_data) ++{ ++ const gchar *login1_interface = ++ "<node>" ++ " <interface name='org.freedesktop.login1.Manager'>" ++ " <method name='CanReboot'>" ++ " <arg name='result' direction='out' type='s'/>" ++ " </method>" ++ " <method name='Reboot'>" ++ " <arg name='interactive' direction='in' type='b'/>" ++ " </method>" ++ " <method name='CanPowerOff'>" ++ " <arg name='result' direction='out' type='s'/>" ++ " </method>" ++ " <method name='PowerOff'>" ++ " <arg name='interactive' direction='in' type='b'/>" ++ " </method>" ++ " </interface>" ++ "</node>"; ++ static const GDBusInterfaceVTable login1_vtable = ++ { ++ handle_login1_call, ++ }; ++ GDBusNodeInfo *login1_info; ++ GError *error = NULL; ++ ++ login1_info = g_dbus_node_info_new_for_xml (login1_interface, &error); ++ if (error) ++ g_warning ("Failed to parse D-Bus interface: %s", error->message); ++ g_clear_error (&error); ++ if (!login1_info) ++ return; ++ g_dbus_connection_register_object (connection, ++ "/org/freedesktop/login1", ++ login1_info->interfaces[0], ++ &login1_vtable, ++ NULL, NULL, ++ &error); ++ if (error) ++ g_warning ("Failed to register login1 service: %s", error->message); ++ g_clear_error (&error); ++ g_dbus_node_info_unref (login1_info); ++ ++ service_count--; ++ if (service_count == 0) ++ run_lightdm (); ++} ++ ++static void ++start_login1_daemon () ++{ ++ service_count++; ++ g_bus_own_name (G_BUS_TYPE_SYSTEM, ++ "org.freedesktop.login1", ++ G_BUS_NAME_OWNER_FLAGS_NONE, ++ login1_name_acquired_cb, ++ NULL, ++ NULL, ++ NULL, ++ NULL); ++} ++ ++static void + load_passwd_file () + { + gchar *path, *data, **lines; +@@ -1474,6 +1569,8 @@ + /* Start D-Bus services */ + if (!g_key_file_get_boolean (config, "test-runner-config", "disable-console-kit", NULL)) + start_console_kit_daemon (); ++ if (!g_key_file_get_boolean (config, "test-runner-config", "disable-login1", NULL)) ++ start_login1_daemon (); + if (!g_key_file_get_boolean (config, "test-runner-config", "disable-accounts-service", NULL)) + start_accounts_service_daemon (); + + +=== added file 'tests/test-no-console-kit-or-login1' +--- tests/test-no-console-kit-or-login1 1970-01-01 00:00:00 +0000 ++++ tests/test-no-console-kit-or-login1 2013-04-14 22:54:54 +0000 +@@ -0,0 +1,2 @@ ++#!/bin/sh ++./src/dbus-env ./src/test-runner no-console-kit-or-login1 test-gobject-greeter + +=== added file 'tests/test-no-login1' +--- tests/test-no-login1 1970-01-01 00:00:00 +0000 ++++ tests/test-no-login1 2013-04-14 22:54:54 +0000 +@@ -0,0 +1,2 @@ ++#!/bin/sh ++./src/dbus-env ./src/test-runner no-login1 test-gobject-greeter + diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index c9bf8ebcf..8290c3659 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82279 2013-01-14 09:20:59Z spupykin $ +# $Id: PKGBUILD 92554 2013-06-08 11:18:50Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,12 +6,12 @@ pkgname=lilypond pkgver=2.16.2 -pkgrel=1 +pkgrel=3 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64' 'mips64el') url="http://lilypond.org" license=('GPL') -depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') +depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts' 'texi2html') options=('emptydirs') @@ -19,7 +19,7 @@ install=lilypond.install source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz) md5sums=('6db27f17d47e4f66a3b0716c65db3041') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # python2 fix @@ -28,9 +28,18 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure + sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure + rm -rf python/out/ +} - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-documentation +build() { + cd "$srcdir/$pkgname-$pkgver" + export PYTHON=/usr/bin/python2 + export GUILE=/usr/bin/guile1.8 + export GUILE_CONFIG=/usr/bin/guile-config1.8 + ./configure --prefix=/usr --disable-documentation make } diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index 08e4187de..070f2ce94 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 70981 2012-05-21 11:17:27Z spupykin $ +# $Id: PKGBUILD 92850 2013-06-17 06:54:08Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone -pkgver=3.5.2 -pkgrel=4 +pkgver=3.6.0 +pkgrel=1 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng" license=('GPL') depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils' - 'libpulse' 'libxv' 'mediastreamer' 'ortp' 'libzrtpcpp' 'bcg729') + 'libpulse' 'libxv' 'mediastreamer' 'ortp' 'libzrtpcpp' 'bcg729' 'libsoup') makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite') optdepends=('pulseaudio') options=('!libtool' '!emptydirs') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/linphone-$pkgver.tar.gz") -md5sums=('4be6e940372dba1f6793aef849c1ff0d') +source=("http://download-mirror.savannah.gnu.org/releases/${pkgname}/3.6.x/sources/${pkgname}-$pkgver.tar.gz") +md5sums=('9a101854bb16034b39096e18c80ceb78') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver export PKG_CONFIG=/usr/bin/pkg-config unset SGML_CATALOG_FILES ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \ @@ -31,6 +31,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index 5712c0027..41063a57b 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89669 2013-05-02 08:58:00Z lfleischer $ +# $Id: PKGBUILD 92797 2013-06-15 10:20:30Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Storyteller <spiralsorrow@hotmail.com> pkgname=lmms -pkgver=0.4.14 +pkgver=0.4.15 pkgrel=1 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ options=('!libtool' '!makeflags') install=lmms.install source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2" zynaddsubfx_unlink.patch) -md5sums=('a30e4fcc24c117a1fb4fd7bef891f7e8' +md5sums=('0c754480ded76b7c081a99d7a884549c' 'd2ea78ac0cf2979505f140c6845617cf') build() { diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD index 8e277dd62..a7878b14a 100644 --- a/community/lua-zlib/PKGBUILD +++ b/community/lua-zlib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86219 2013-03-13 13:38:07Z spupykin $ +# $Id: PKGBUILD 92720 2013-06-13 12:58:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=(lua-zlib lua51-zlib) pkgbase=lua-zlib pkgver=0.2 -pkgrel=4 +pkgrel=5 _gitver=8d07669 url="http://github.com/brimworks/lua-zlib" pkgdesc='Simple streaming interface to zlib for Lua.' @@ -22,11 +22,13 @@ build() { sed -i "s#share/lua/cmod#lib/lua/5.2#" CMakeLists.txt cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr . + make cd $srcdir/brimworks-lua51-zlib-${_gitver} - sed -i "s#share/lua/cmod#lib/lua/5.1#" CMakeLists.txt - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr . +# sed -i "s#share/lua/cmod#lib/lua/5.1#" CMakeLists.txt +# cmake -DCMAKE_BUILD_TYPE=Release \ +# -DCMAKE_INSTALL_PREFIX=/usr . + make linux } package_lua-zlib() { @@ -41,6 +43,7 @@ package_lua51-zlib() { depends=('zlib' 'lua51') cd $srcdir/brimworks-lua51-zlib-${_gitver} - make DESTDIR="$pkgdir" install + mkdir -p $pkgdir/usr/lib/lua/5.1 + make DESTDIR="$pkgdir" LUACPATH=$pkgdir/usr/lib/lua/5.1 install install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README" } diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index 708c4736e..4751c7273 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,29 +1,26 @@ -# $Id: PKGBUILD 85940 2013-03-09 14:50:34Z bpiotrowski $ +# $Id: PKGBUILD 92307 2013-06-03 20:18:47Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> pkgname=luajit -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1' arch=('i686' 'x86_64' 'mips64el') url='http://luajit.org/' license=('MIT') depends=('gcc-libs') -source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz - http://luajit.org/download/v2.0.1_hotfix1.patch) -sha256sums=('2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0' - '143898de3fe84455684fddb92947d36c1a51c6a6e3884813fe5e025bd4652368') +source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz) +sha256sums=('c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38') build() { cd $srcdir/LuaJIT-$pkgver [ "$CARCH" = "mips64el" ] && extra="XCFLAGS=-DLUAJIT_DISABLE_JIT" - patch -Np1 -i $srcdir//v2.0.1_hotfix1.patch - make amalg PREFIX=/usr $extra + make amalg PREFIX=/usr } package() { diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index cf2303228..b60dffd51 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90056 2013-05-06 19:38:11Z foutrelis $ +# $Id: PKGBUILD 92941 2013-06-19 21:09:46Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64' 'mips64el') url='http://qtpfsgui.sourceforge.net/' diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index 908eb4476..ab6898db8 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.3.1-3 libraw rebuild + 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * luminancehdr 2.3.1-1 diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index 4dc3c6229..c70fc0343 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91966 2013-05-30 13:14:21Z spupykin $ +# $Id: PKGBUILD 92863 2013-06-17 10:56:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> @@ -8,7 +8,7 @@ pkgname=lxc pkgver=0.9.0 epoch=1 -pkgrel=3 +pkgrel=4 pkgdesc="Linux Containers" arch=('i686' 'x86_64' 'mips64el') url="http://lxc.sourceforge.net/" @@ -30,7 +30,7 @@ build() { ./configure \ --prefix=/usr \ --localstatedir=/var \ - --libexecdir=/usr/bin \ + --libexecdir=/usr/lib \ --sysconfdir=/etc \ --disable-apparmor \ --enable-seccomp diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index ef87348b4..cef601ece 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 91917 2013-05-29 10:59:29Z spupykin $ +# $Id: PKGBUILD 92555 2013-06-08 11:18:51Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=mailutils pkgver=2.2 -pkgrel=5 +pkgrel=7 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/mailutils/" license=('GPL') -depends=('libldap' 'pam' 'gnutls' 'guile') +depends=('libldap' 'pam' 'gnutls') makedepends=('emacs') conflicts=('libsieve') install=mailutils.install @@ -26,9 +26,10 @@ prepare() { build() { cd "$srcdir/mailutils-$pkgver" - [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ + ./configure --prefix=/usr --with-gdbm --with-gnutls \ --libexecdir=/usr/lib/$pkgname --without-fribidi \ - --without-tcp-wrappers --sbindir=/usr/bin + --without-tcp-wrappers --sbindir=/usr/bin \ + --without-python --without-guile make -j1 } diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 8c34a222f..099fbc4f0 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90058 2013-05-06 19:38:17Z foutrelis $ +# $Id: PKGBUILD 92865 2013-06-17 10:56:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik -pkgver=2.1.0 -pkgrel=10 +pkgver=2.2.0 +pkgrel=1 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" @@ -23,16 +23,11 @@ optdepends=('libxslt: Web Map Service' 'mod_wsgi2: Web Map Service') makedepends=('scons' 'boost') install="mapnik.install" -source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2" - "mapnik-2.1.0-compile-fix-for-boost-1.53.patch") -md5sums=('d580c558a957444873bec9e24526b0a0' - 'fb456216b052742319428f65f1c979d6') +source=("https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz") +md5sums=('b837931c7f1a4dc630d8550d3e635036') build() { - cd "$srcdir/$pkgname-v$pkgver" - - # https://github.com/mapnik/mapnik/issues/1658 - patch -Np1 -i "$srcdir/mapnik-2.1.0-compile-fix-for-boost-1.53.patch" + cd "$srcdir/$pkgname-$pkgver" sed -i 's|lib64|lib|g' SConstruct sed -i 's|python|python2|' \ @@ -46,6 +41,6 @@ build() { } package(){ - cd "$srcdir/$pkgname-v$pkgver" + cd "$srcdir/$pkgname-$pkgver" scons install } diff --git a/community/matchbox-window-manager/PKGBUILD b/community/matchbox-window-manager/PKGBUILD index 7c7717e1e..94e30982f 100644 --- a/community/matchbox-window-manager/PKGBUILD +++ b/community/matchbox-window-manager/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 66232 2012-02-23 05:07:09Z spupykin $ +# $Id: PKGBUILD 92576 2013-06-08 20:30:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=matchbox-window-manager pkgver=1.2 -pkgrel=3.1 +pkgrel=4 pkgdesc="A pretty much unique X window manager with a classic PDA management policy" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libmatchbox' 'startup-notification' 'libpng' 'libsm') url="http://matchbox-project.org/" -source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +source=(http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$pkgver/$pkgname-$pkgver.tar.bz2) md5sums=('3e158dcf57823b55c926d95b245500fb') build() { @@ -19,5 +19,9 @@ build() { --enable-startup-notification --enable-session \ --enable-alt-input-wins --enable-expat make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD index 2fb9f0c74..a4673ea18 100644 --- a/community/minetest/PKGBUILD +++ b/community/minetest/PKGBUILD @@ -1,23 +1,21 @@ -# $Id: PKGBUILD 92174 2013-06-02 12:00:30Z lcarlier $ +# $Id: PKGBUILD 92558 2013-06-08 12:13:58Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Konsta Kokkinen <kray@tsundere.fi> pkgname=minetest -pkgver=0.4.6 +pkgver=0.4.7 pkgrel=1 pkgdesc='An Infiniminer/Minecraft inspired game' arch=('i686' 'x86_64') url='http://minetest.net/' license=('GPL') depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'hicolor-icon-theme') -makedepends=('cmake' 'irrlicht' 'mesa' 'libpng' 'zlib') +makedepends=('cmake' 'irrlicht' 'mesa') install=minetest.install source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver} - ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver} - ${pkgname}_common-${pkgver}.tar.gz::https://github.com/minetest/common/tarball/${pkgver}) -md5sums=('a8cacba57659c397fb8098881eb0c5f9' - '1023ac25a83d1431c861d7947e962675' - '54a805066c509478f6983b359f2e91fc') + ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}) +md5sums=('232b87ef5c4300ddad7bc883f8f1a1c5' + '30a9965667470ebc785979de665d4df4') build() { cd "$srcdir"/minetest-minetest-* @@ -32,8 +30,7 @@ package() { make DESTDIR="$pkgdir" install mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest - mv -v "$srcdir"/minetest-common-* "$pkgdir"/usr/share/minetest/games/common # small cleanup - rm "$pkgdir"/usr/share/minetest/games/{minetest,common}/.gitignore + rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore } diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD index 6d7c2ce1c..4a13ff512 100644 --- a/community/miniupnpc/PKGBUILD +++ b/community/miniupnpc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 60858 2011-12-19 15:16:56Z tredaelli $ +# $Id: PKGBUILD 92933 2013-06-19 14:29:17Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Florian Loitsch <archlinux@florian.loitsch.com> pkgname=miniupnpc -pkgver=1.6 -pkgrel=2.1 +pkgver=1.8 +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=('88055f2d4a061cfd4cfe25a9eae22f67') +md5sums=('065bf20a20ebe605c675b7a5aaef340a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/minizip/LICENSE b/community/minizip/LICENSE new file mode 100644 index 000000000..7fb61585d --- /dev/null +++ b/community/minizip/LICENSE @@ -0,0 +1,54 @@ + Condition of use and distribution are the same than zlib : + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) + + Modifications of Unzip for Zip64 + Copyright (C) 2007-2008 Even Rouault + + Modifications for Zip64 support on both zip and unzip + Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) + +mztools.h + Code: Xavier Roche '2004 + +-------------------------------------------------------------------------------- + +crypt.h + + Version 1.01e, February 12th, 2005 + + Copyright (C) 1998-2005 Gilles Vollant + + This code is a modified version of crypting code in Infozip distribution + + The encryption/decryption parts of this source code (as opposed to the + non-echoing password parts) were originally written in Europe. The + whole source package can be freely distributed, including from the USA. + (Prior to January 2000, re-export from the US was a violation of US law.) + + This encryption code is a direct transcription of the algorithm from + Roger Schlafly, described by Phil Katz in the file appnote.txt. This + file (appnote.txt) is distributed with the PKZIP program (even in the + version without encryption capabilities). + +-------------------------------------------------------------------------------- + +unzip.c + +for the license see: see: ftp://ftp.info-zip.org/pub/infozip/license.html diff --git a/community/minizip/PKGBUILD b/community/minizip/PKGBUILD new file mode 100644 index 000000000..f367b98fb --- /dev/null +++ b/community/minizip/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Babets <fbabetz@yahoo.it> +# Contributor: Leslie P. Polzer <polzer at stardawn dot org> + +pkgname=minizip +pkgver=1.2.8 +pkgrel=1 +pkgdesc='ZIP file extraction library' +url='http://www.winimage.com/zLibDll/minizip.html' +license=('ZLIB' 'custom') +arch=('x86_64' 'i686') +depends=('zlib') +options=('!libtool') +source=("http://zlib.net/current/zlib-${pkgver}.tar.gz" + 'LICENSE') +sha256sums=('36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d' + '3b66c863472c2107984f383f34412578b479e7f8fa111ded78190ff0cb3f2eb7') + +prepare() { + cd "$srcdir/zlib-$pkgver/contrib/$pkgname" + + rm -f Makefile + autoreconf -i + autoconf + automake --add-missing + automake +} + +build() { + cd "$srcdir/zlib-$pkgver/contrib/$pkgname" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/zlib-$pkgver/contrib/$pkgname" + + make install DESTDIR="$pkgdir" + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index cb1607a7e..397cb6834 100644 --- a/community/mixxx/PKGBUILD +++ b/community/mixxx/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 86767 2013-03-22 00:23:48Z eric $ +# $Id: PKGBUILD 92429 2013-06-05 10:08:34Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> # Contributor: Ryan Coyner <rcoyner@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mixxx -pkgver=1.10.1 -pkgrel=2 +pkgver=1.11.0 +pkgrel=1 pkgdesc="Free, open source software for digital DJ'ing." arch=('i686' 'x86_64' 'mips64el') url='http://www.mixxx.org' license=('GPL') depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi' - 'taglib' 'qtwebkit') + 'taglib' 'qtwebkit' 'vamp-plugin-sdk' 'libusbx' 'protobuf') makedepends=('mesa' 'scons' 'libshout' 'glu') source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('765bc5216ec8102c2186dd3ea80187a9') +md5sums=('89ee8ba60824919d8dd1194287bda259') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 7ff1623f2..7006cd73e 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89988 2013-05-06 18:29:21Z ttoepper $ +# $Id: PKGBUILD 92251 2013-06-03 11:15:23Z allan $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh pkgver=R46 -pkgrel=2 +pkgrel=3 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' license=('custom') @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname" - install -D -m 755 mksh "$pkgdir/bin/mksh" + install -D -m 755 mksh "$pkgdir/usr/bin/mksh" install -D -m 644 mksh.1 "$pkgdir/usr/share/man/man1/mksh.1" install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc" install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt" diff --git a/community/mksh/mksh.install b/community/mksh/mksh.install index 3e5f2a924..f096a2b66 100644 --- a/community/mksh/mksh.install +++ b/community/mksh/mksh.install @@ -2,10 +2,6 @@ post_install() { grep -x /bin/mksh /etc/shells >/dev/null || echo /bin/mksh >>/etc/shells } -post_upgrade() { - post_install $1 -} - post_remove() { sed -i "/^\/bin\/mksh$/d" /etc/shells } diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index fcfce8731..5a391e8cb 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86716 2013-03-21 12:08:21Z spupykin $ +# $Id: PKGBUILD 92918 2013-06-19 09:58:46Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -7,8 +7,8 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.8.8 -pkgrel=4 +pkgver=0.9.0 +pkgrel=2 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" @@ -16,24 +16,19 @@ license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch) -md5sums=('06de4052cffd6760c468d7da9557edae' + fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch) +md5sums=('1cd2d73f3ffe77a43980e99aaa4ea06c' '8227e7a1b059b1b16901166d2a508317') build() { # mlt cd "$srcdir/mlt-$pkgver" - patch -p1 <$srcdir/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch - - [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= -# SSE2=--disable-sse2 - msg "SSE2=$SSE2" - ./configure --prefix=/usr --enable-gpl --enable-gpl3 \ - --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \ + ./configure --prefix=/usr --disable-gtk2 \ --avformat-vdpau \ - --avformat-swscale $SSE2 + --avformat-swscale \ + --enable-gpl --enable-gpl3 make # mlt python bindings diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index cd8b21b41..c2314fb7a 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88850 2013-04-24 10:16:56Z fyan $ +# $Id: PKGBUILD 92438 2013-06-05 11:16:09Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,7 +6,7 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.4.3 +pkgver=2.4.4 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64' 'mips64el') @@ -64,8 +64,9 @@ package() { mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true rm -r ${pkgdir}/usr/lib64 || true } -md5sums=('ff6a9c90bdaca66a7e997ba8490fc222' - '4839fe1d638187ca3226e8267b947318' - '96ab4517b48974ce0e566d9746a75a4f' - 'a9529e2a6e392ffecef7a9178394c814' - 'c97f3fd59bbbdd9f0f6916322d95feb4') + +sha512sums=('f72aee0a9c979756741902eb87775d154de45660596ec4507274a7719d376869510f192cf7777840821cb491cfe009beced8891e3f243c761ee758ab023a457d' + '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c' + '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9' + '2f7d0e9e35a043d9006fd429f36cd6b45ed4edd98ce653b35b237e0313d2d7ef39ae85dcd31713bae7ab68e40a38534bba5f7746653e9380f2106865a8b3b9a5' + 'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84') diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 156dacde6..047f8a063 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90062 2013-05-06 19:38:27Z foutrelis $ +# $Id: PKGBUILD 92601 2013-06-09 16:56:19Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 -pkgver=20130309 -pkgrel=2 +pkgver=20130428 +pkgrel=1 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,7 +17,7 @@ depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmp 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') -makedepends=('unzip' 'python' 'python-docutils') +makedepends=('unzip' 'python' 'python-docutils' 'git') if [ "$CARCH" != "mips64el" ]; then depends+=('libgl' 'libvdpau' 'lirc-utils') makedepends+=('mesa' 'mesa-libgl' 'yasm') @@ -26,18 +26,17 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -sha256sums=('03aeccbd82b3598e0656b54ae6ab60c79afdb78eabe1b2915e7912db7efbd343' - 'SKIP') +source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa) +sha256sums=('SKIP') prepare() { - cd $pkgname-$pkgver + cd $pkgname sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop find -type f -exec sed -e 's/python3/python/' -i {} \; } build() { - cd $pkgname-$pkgver + cd $pkgname [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection" @@ -53,7 +52,7 @@ build() { } package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR=$pkgdir install install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/ diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD index 2ffe5b53d..03166c896 100644 --- a/community/mumble/PKGBUILD +++ b/community/mumble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92166 2013-06-02 06:17:34Z svenstaro $ +# $Id: PKGBUILD 92323 2013-06-04 02:33:32Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lauri Niskanen <ape@ape3000.com> # Contributor: Sebastian.Salich@gmx.de @@ -9,11 +9,11 @@ pkgname=mumble pkgver=1.2.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A voice chat application similar to TeamSpeak" license=('BSD') -depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse') +depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse' 'opus') makedepends=('boost' 'mesa' 'avahi') #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support') options=('!libtool') @@ -27,7 +27,7 @@ build() { # Building mumble qmake-qt4 main.pro \ - CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \ + CONFIG+="bundled-celt no-bundled-opus no-bundled-speex no-speechd no-g15 no-xevie no-server \ no-embed-qt-translations no-update packaged" \ DEFINES+="PLUGIN_PATH=/usr/lib/mumble" make release diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index b04d9c8b9..60817c1a4 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87740 2013-04-05 21:06:47Z bpiotrowski $ +# $Id: PKGBUILD 92586 2013-06-09 13:32:10Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -7,34 +7,40 @@ pkgname=mupdf pkgver=1.2 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64' 'mips64el') url='http://mupdf.com' license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils') install=mupdf.install -source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip) -sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b') +source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip + mupdf-1.2-fix-dirty-flag-handling.patch) +sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b' + 'd5c9ab3c5e9975909562230569a149a569f44fcd2b24c0b57e889b541a017f10') + +prepare() { + cd $pkgname-$pkgver-source + patch -Np1 -i "$srcdir"/mupdf-1.2-fix-dirty-flag-handling.patch +} build() { - CFLAGS+=' -fPIC' - CXXFLAGS+=' -fPIC' + CFLAGS+=' -fPIC' + CXXFLAGS+=' -fPIC' - cd "$srcdir"/$pkgname-$pkgver-source - rm -rf thirdparty - make build=release prefix=/usr + cd $pkgname-$pkgver-source + rm -rf thirdparty + make build=release prefix=/usr } package() { - cd "$srcdir"/$pkgname-$pkgver-source - make build=release prefix="$pkgdir"/usr install - - sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop - sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop + cd $pkgname-$pkgver-source + make build=release prefix="$pkgdir"/usr install - install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop - install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm + sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop + sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop + install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop + install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm - chmod 644 "$pkgdir"/usr/lib/libfitz.a + chmod 644 "$pkgdir"/usr/lib/libfitz.a } diff --git a/community/mupdf/mupdf-1.2-fix-dirty-flag-handling.patch b/community/mupdf/mupdf-1.2-fix-dirty-flag-handling.patch new file mode 100644 index 000000000..ec22ac328 --- /dev/null +++ b/community/mupdf/mupdf-1.2-fix-dirty-flag-handling.patch @@ -0,0 +1,88 @@ +From a20d6a58ebc6c60ff44f0f385cf399ee6fca55bf Mon Sep 17 00:00:00 2001 +From: Robin Watts <Robin.Watts@artifex.com> +Date: Fri, 26 Apr 2013 12:21:17 +0100 +Subject: [PATCH] Fix dirty flag handling bug in X11 event loop. + +When I added transition handling to mupdf, I broke the X11 +behaviour of coalescing all events and only blitting when +idle. + +This commit restores that behaviour, except when transitions +are actually in progress (when it still blits instantly). +--- + apps/pdfapp.c | 6 +++++- + apps/x11_main.c | 8 ++++++-- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/apps/pdfapp.c b/apps/pdfapp.c +index c3b7d54..ff23c4b 100644 +--- a/apps/pdfapp.c ++++ b/apps/pdfapp.c +@@ -1677,7 +1677,6 @@ void pdfapp_postblit(pdfapp_t *app) + if (llama >= 256) + { + /* Completed. */ +- app->in_transit = 0; + fz_drop_pixmap(app->ctx, app->image); + app->image = app->new_image; + app->new_image = NULL; +@@ -1689,4 +1688,9 @@ void pdfapp_postblit(pdfapp_t *app) + else + fz_generate_transition(app->image, app->old_image, app->new_image, llama, &app->transition); + winrepaint(app); ++ if (llama >= 256) ++ { ++ /* Completed. */ ++ app->in_transit = 0; ++ } + } +diff --git a/apps/x11_main.c b/apps/x11_main.c +index 364013c..987e359 100644 +--- a/apps/x11_main.c ++++ b/apps/x11_main.c +@@ -79,6 +79,7 @@ static int mapped = 0; + static Cursor xcarrow, xchand, xcwait, xccaret; + static int justcopied = 0; + static int dirty = 0; ++static int transition_dirty = 0; + static int dirtysearch = 0; + static char *password = ""; + static XColor xbgcolor; +@@ -504,6 +505,8 @@ static void winblit(pdfapp_t *app) + void winrepaint(pdfapp_t *app) + { + dirty = 1; ++ if (app->in_transit) ++ transition_dirty = 1; + } + + void winrepaintsearch(pdfapp_t *app) +@@ -779,7 +782,7 @@ int main(int argc, char **argv) + + while (!closing) + { +- while (!closing && XPending(xdpy) && !dirty) ++ while (!closing && XPending(xdpy) && !transition_dirty) + { + XNextEvent(xdpy, &xevt); + +@@ -886,6 +889,7 @@ int main(int argc, char **argv) + else if (dirtysearch) + winblitsearch(&gapp); + dirty = 0; ++ transition_dirty = 0; + dirtysearch = 0; + pdfapp_postblit(&gapp); + } +@@ -899,7 +903,7 @@ int main(int argc, char **argv) + timeradd(&now, &tmo, &tmo_at); + } + +- if (XPending(xdpy) || dirty) ++ if (XPending(xdpy) || transition_dirty) + continue; + + timeout = NULL; +-- +1.8.3 + diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 230ec8f05..90b7621df 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92185 2013-06-02 15:29:37Z bpiotrowski $ +# $Id: PKGBUILD 92939 2013-06-19 19:43:24Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,8 +8,8 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.9 -pkgrel=2 +pkgver=0.10.12 +pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') url='http://nodejs.org/' @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('25fb276ac6765ebb19f44d3e3775ed1c0275f874c896755d0d619226caee9c30') +sha256sums=('7339a7c333454a567a41c900b6ef2f6c89e8c778062c173beb029611b29496b6') prepare() { cd node-v$pkgver diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD index a16cf7bbf..066a53470 100644 --- a/community/opensmtpd/PKGBUILD +++ b/community/opensmtpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91076 2013-05-18 18:46:51Z bpiotrowski $ +# $Id: PKGBUILD 92253 2013-06-03 11:15:25Z allan $ # Maintainer: Sébastien Luttringer pkgname=opensmtpd pkgver=5.3.2p1 -pkgrel=1 +pkgrel=2 pkgdesc='Free implementation of the server-side SMTP protocol' arch=('i686' 'x86_64' 'mips64el') url='http://www.opensmtpd.org/' @@ -57,13 +57,7 @@ package() { install -Dm640 /dev/null "$pkgdir/etc/secrets" # fake sendmail binary (used to be smtp-forwarder) # use hardlink as upstream does... - cd "$pkgdir/usr/bin" - ln smtpctl "$pkgdir/usr/bin/sendmail" - # symlink binary from usr/bin to usr/sbin (waiting /usr merge) - install -dm755 "$pkgdir/usr/sbin" - for _p in *; do - ln -s "../bin/$_p" "$pkgdir/usr/sbin/$_p" - done + ln "$pkgdir/usr/bin/smtpctl" "$pkgdir/usr/bin/sendmail" } # vim:set ts=2 sw=2 et: diff --git a/community/os-prober/PKGBUILD b/community/os-prober/PKGBUILD index d2651a30c..5491a6166 100644 --- a/community/os-prober/PKGBUILD +++ b/community/os-prober/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 83235 2013-01-28 14:43:38Z tredaelli $ +# $Id: PKGBUILD 92922 2013-06-19 10:19:18Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: darkcoder <mario_vazq@hotmail.com> pkgname=os-prober -pkgver=1.57 -pkgrel=3 +pkgver=1.58 +pkgrel=1 pkgdesc="Utility to detect other OSes on a set of drives" url="http://joey.kitenet.net/code/os-prober/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('sh') source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.gz) -md5sums=('67548b17d55cc32c1168bb5a4061170d') -sha256sums=('d63c6cbb825a7e411aac5e4805edc6db2fbf77a59282b71c10bd29723b8d860c') +md5sums=('11406f47d9536bccb655456d6d92d111') +sha256sums=('db1d936c0356e7a7c2dab5e9aebdf4132e745fd2972ba5016ed6690a0445ea93') build() { cd "$srcdir/$pkgname-$pkgver" @@ -35,7 +35,7 @@ package() { for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do install -dm755 "$pkgdir/usr/lib/$dir" install -m755 -t "$pkgdir/usr/lib/$dir" "$dir"/common/* - [[ -d "$dir"/x86 ]] && install -m755 -t "$pkgdir/usr/lib/$dir" "$dir"/x86/* + [[ -d "$dir"/x86 ]] && cp -r "$dir"/x86/* "$pkgdir/usr/lib/$dir" done install -Dm755 os-probes/mounted/powerpc/20macosx "$pkgdir"/usr/lib/os-probes/mounted/20macosx diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index a6a55f677..f1a0c40c0 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86302 2013-03-14 21:30:53Z kkeen $ +# $Id: PKGBUILD 92254 2013-06-03 11:15:27Z allan $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> @@ -8,113 +8,114 @@ pkgbase=oss pkgname=oss true && pkgname=(oss libflashsupport-oss) pkgver=4.2_2007 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') 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" - "rc-script" - "soundon.patch" - "remove-hal.patch" - "linux-3.8.patch" - "oss.service" - ) + "rm-init-scripts.patch" + "soundon.patch" + "remove-hal.patch" + "linux-3.8.patch" + "oss.service" +) md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' 'b9a380a0ac8896390d71ac13676f27e1' - 'cbcbce5c03b127df5eafa8faa091492c' '65f07fe241bfbf912f76d8b6d8f276b5' 'cd7f1dc6166bba8c94d96f3a28e948a5' 'effecefb774f1d08ef9f0af0ad205c34' - '8db0255b380dc6672993e627d1cd8ca6') + '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 + 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}" - - chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815) - find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy - install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss" - install -Dm644 "$srcdir/oss.service" "$pkgdir/usr/lib/systemd/system/oss.service" + 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') + pkgdesc="Adobe flash plugin support lib (OSSv4)" + conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') + depends=('oss') - cd "${srcdir}/${_dir}" + cd "${srcdir}/${_dir}" - install -dm755 "$pkgdir/usr/lib" - ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" + 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/oss.service b/community/oss/oss.service index 107c9bf3f..0200d2477 100644 --- a/community/oss/oss.service +++ b/community/oss/oss.service @@ -5,8 +5,8 @@ Before=sound.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/soundon -ExecStop=/usr/sbin/soundoff +ExecStart=/usr/bin/soundon +ExecStop=/usr/bin/soundoff [Install] WantedBy=multi-user.target diff --git a/community/oss/rc-script b/community/oss/rc-script deleted file mode 100644 index 5c930107c..000000000 --- a/community/oss/rc-script +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy 'Starting Open Sound System' - if /usr/sbin/soundon; then - add_daemon oss - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy 'Stopping Open Sound System' - if /usr/sbin/soundoff; then - rm_daemon oss - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" -esac diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index f25e04076..7956f81b3 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87041 2013-03-26 11:08:17Z spupykin $ +# $Id: PKGBUILD 92376 2013-06-04 12:32:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole -pkgver=0.5.0 -pkgrel=3 +pkgver=0.5.1 +pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/applications/parole/" @@ -22,7 +22,7 @@ conflicts=('parole-media-player-git') options=('!libtool') install=parole.install source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) -md5sums=('03eb2df373adaae56959a548553ef72e') +md5sums=('0236073ad67916092a75fcaa59583780') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 1fc3d2ad7..910bd0868 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 90992 2013-05-17 06:49:35Z bpiotrowski $ +# $Id: PKGBUILD 92658 2013-06-10 17:17:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=4.0.2 +pkgver=4.0.5 pkgrel=1 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') @@ -14,12 +14,12 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('0b261a5a9a23858c3fe2999aecdbc552') +md5sums=('c1818eb097edc3f13715f884d938b690') build(){ cd $srcdir/passenger-release-$pkgver - sed -i 's/env python/env python2/' lib/phusion_passenger/wsgi/request_handler.py +# sed -i 's/env python/env python2/' lib/phusion_passenger/wsgi/request_handler.py ./bin/passenger-install-apache2-module -a rake nginx diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD index f73b84a4b..9967b42cb 100644 --- a/community/pd/PKGBUILD +++ b/community/pd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92207 2013-06-02 18:54:01Z bpiotrowski $ +# $Id: PKGBUILD 92233 2013-06-03 06:13:55Z bpiotrowski $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: TDY <tdy@gmx.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> @@ -6,7 +6,7 @@ pkgname=pd pkgver=0.44.3 _ver=${pkgver%.*}-${pkgver##*.} -pkgrel=1 +pkgrel=2 pkgdesc="The Pure Data real-time music and multimedia environment" arch=('i686' 'x86_64' 'mips64el') url="http://crca.ucsd.edu/~msp/software.html" @@ -22,7 +22,8 @@ build() { ./configure --prefix=/usr \ --enable-alsa \ --enable-jack \ - --enable-fftw + --enable-fftw \ + --disable-portaudio make } diff --git a/community/pdflib-lite/PKGBUILD b/community/pdflib-lite/PKGBUILD new file mode 100644 index 000000000..f99c4f350 --- /dev/null +++ b/community/pdflib-lite/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> +# Contributor: Olivier Mehani <shtrom-arch@ssji.net> + +pkgname=pdflib-lite +_pkgnamecaps=PDFlib-Lite +pkgver=7.0.5p3 +_basepkgver=${pkgver/p*/} +pkgrel=2 +pkgdesc="PDF manipulation library." +url="http://www.pdflib.com" +arch=(i686 x86_64) +depends=('glibc') +provides=('pdflib') +source=(http://www.pdflib.com/binaries/PDFlib/${_basepkgver//./}/${_pkgnamecaps}-${pkgver}.tar.gz http://www.pdflib.com/fileadmin/pdflib/pdf/license/PDFlib-Lite-license.pdf) +license=(custom:pdflib-lite) + +build() { + cd "$srcdir"/$_pkgnamecaps-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir"/$_pkgnamecaps-$pkgver + make prefix="$pkgdir"/usr install + + ## Copy files required by the license + # Documentation + mkdir -p "$pkgdir"/usr/share/pdflib-lite/doc + cp ./doc/pdflib/* "$pkgdir"/usr/share/pdflib-lite/doc + + # License + mkdir -p "$pkgdir"/usr/share/licenses/pdflib-lite + cp -H ../PDFlib-Lite-license.pdf "$pkgdir"/usr/share/licenses/pdflib-lite/LICENSE.pdf + + # Examples + make -C ./bind/pdflib clean + cp -R ./bind/pdflib/{c,cpp,java} "$pkgdir"/usr/share/pdflib-lite + find "$pkgdir"/usr/share/pdflib-lite \( \ + -name Makefile \ + -o -name *.dsp \ + -o -name *.dsw \ + -o -name *.sln \ + -o -name *.vcproj \ + \) -exec rm {} \; +} + +md5sums=('371d332d610a8b21a542bb7a2bdaf954' + '2f3f9cc20199aad91b33dc26cdcbbab4') diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index 66b930adb..941337a8b 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91683 2013-05-26 09:25:38Z bluewind $ +# $Id: PKGBUILD 92759 2013-06-14 17:40:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> pkgname=perl-json-xs -pkgver=2.33 -pkgrel=2 +pkgver=2.34 +pkgrel=1 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" license=("GPL") @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('perl' 'perl-common-sense') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz) -md5sums=('6a1eafeadc1680a806ec2eb1798f6084') +md5sums=('dda3c03335665cdeff91c37a269b833b') build() { cd $srcdir/JSON-XS-$pkgver diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index 90b2218d4..a86cc84ef 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81020 2012-12-10 10:17:38Z spupykin $ +# $Id: PKGBUILD 92722 2013-06-13 12:58:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> @@ -6,13 +6,14 @@ pkgname=pgadmin3 pkgver=1.16.1 -pkgrel=1 +pkgrel=2 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://www.pgadmin.org" license=('custom') depends=('wxgtk' 'postgresql-libs' 'libxslt') makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick') +_categories="Development;Application" source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) md5sums=('f3bc59630f0dc9600d4ad125097ce2fa') @@ -20,7 +21,7 @@ build() { cd "$srcdir" convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png cp pgadmin3-3.png pgadmin3.png - gendesk + gendesk $startdir/PKGBUILD cd "pgadmin3-${pkgver}" [ -f Makefile ] || ./configure --prefix=/usr diff --git a/community/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD new file mode 100644 index 000000000..46ba64245 --- /dev/null +++ b/community/phantomjs/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 92506 2013-06-07 11:18:15Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: grimsock <lord.grimsock at gmail dot com> +# Contributor: Dieter Plaetinck <dieter@plaetinck.be> +# Contributor: Vladimir Chizhov <jagoterr@gmail.com> +# Contributor: Henry Tang <henryykt@gmail.com> + +pkgname=phantomjs +pkgver=1.9.1 +pkgrel=2 +pkgdesc="Headless WebKit with JavaScript API" +url="http://www.phantomjs.org/" +license=('BSD' 'LGPL' 'MIT') +arch=('i686' 'x86_64') +depends=('gstreamer0.10-base' 'fontconfig' 'freetype2') +makedepends=('unzip') +source=("http://phantomjs.googlecode.com/files/${pkgname}-${pkgver}-source.zip") +noextract=("${pkgname}-${pkgver}-source.zip") +md5sums=('93a0043d4ff8cd83e23e9d261c93830d') + +build() { + # workaround for https://code.google.com/p/libarchive/issues/detail?id=271 + # cd $srcdir/$pkgname-$pkgver + unzip ${pkgname}-${pkgver}-source.zip + + cd $pkgname-$pkgver + # workaround for http://code.google.com/p/phantomjs/issues/detail?id=635 + sed -i 's/QMAKE_LFLAGS+=-fuse-ld=gold/#QMAKE_LFLAGS+=-fuse-ld=gold/' src/qt/src/3rdparty/webkit/Source/common.pri + + ./build.sh --confirm --qt-config "-no-rpath" +} + +package() { + install -Dm755 "$srcdir/$pkgname-$pkgver/bin/phantomjs" "$pkgdir/usr/bin/phantomjs" + + mkdir -p "$pkgdir/usr/share/$pkgname" + cp -r "$srcdir/$pkgname-$pkgver/examples" "$pkgdir/usr/share/$pkgname"/ + + install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD" + install -Dm644 "$srcdir/$pkgname-$pkgver/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt" +} + diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD new file mode 100644 index 000000000..33213a413 --- /dev/null +++ b/community/php-mongo/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 92665 2013-06-11 09:54:52Z idevolder $ +# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > +# Contributor: Jarek Sedlacek <jareksedlacek@gmail.com> + +pkgname=php-mongo +pkgver=1.4.1 +pkgrel=2 +pkgdesc="Officially supported PHP driver for MongoDB" +arch=("i686" "x86_64") +url="http://www.mongodb.org/display/DOCS/PHP+Language+Center" +license=("APACHE") +depends=("php") +backup=("etc/php/conf.d/mongo.ini") +source=( + "http://pecl.php.net/get/mongo-$pkgver.tgz" + "mongo.ini" +) + +build() { + cd mongo-$pkgver + phpize + ./configure --prefix=/usr --enable-mongo +} + +package() { + cd mongo-$pkgver + make INSTALL_ROOT="$pkgdir" install + install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini" +} +sha256sums=('230e7d26eaa826c7aacfc90fd1128f8c390216abe7f588d3bbcd130bd1fb84b6' + 'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b') diff --git a/community/php-mongo/mongo.ini b/community/php-mongo/mongo.ini new file mode 100644 index 000000000..e9e8dbac1 --- /dev/null +++ b/community/php-mongo/mongo.ini @@ -0,0 +1,28 @@ +; Tell PHP to load the Mongo Extension on startup +extension=mongo.so + +[mongo] +; If the driver should reconnect to mongo +mongo.auto_reconnect = False + +; Whether to allow persistent connections +mongo.allow_persistent = On + +; Maximum number of persistent connections (-1 means unlimited) +mongo.max_persistent = -1 + +; Maximum number of links (persistent and non-persistent, -1 means unlimited) +mongo.max_connections = -1 + +; Default host for mongo connection +mongo.default_host = localhost + +; Default port for mongo database +mongo.default_port = 27017 + +; When saving files to the database, size of chunks to split them into +mongo.chunk_size = 262400 + +; Specify an alternate character to $ to use for special db functions ($set, $push, $exists, etc.) +mongo.cmd = "$" + diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index df79b2ffc..9b7681a75 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90931 2013-05-15 14:52:30Z fyan $ +# $Id: PKGBUILD 92611 2013-06-10 02:46:36Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.1e -_pkgver=0.1e -pkgrel=2 +pkgver=0.1e.20130608 +_commit=66b7498a7530a1c47dabbe05c0726a9188353217 +pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/xiehuc/pidgin-lwqq" @@ -14,11 +14,12 @@ optdepends=('pidgin: Multi-protocol instant messaging client' 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') install=$pkgname.install -source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz") +source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit") +md5sums=('SKIP') build() { - cd "${srcdir}/$pkgname-${_pkgver}" + cd "${srcdir}/$pkgname" cmake -DCMAKE_INSTALL_PREFIX=/usr . make @@ -26,8 +27,6 @@ build() package() { - cd "$srcdir/$pkgname-${_pkgver}" + cd "$srcdir/$pkgname" make DESTDIR="${pkgdir}" install } - -sha512sums=('5a04c716cabaf09b863ab9eedae4d851741fc6d3977d81ff371d41b109b09e8fb020c8910fcaa0b2df82058ffaf82caff596acef9c8b4b216b0215a1212a7f29') diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 236448537..17214559a 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 82020 2013-01-05 17:33:22Z jlichtblau $ +# $Id: PKGBUILD 92821 2013-06-15 13:40:37Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64' 'mips64el') -url="http://postgis.org/" +url="http://postgis.net/" license=('GPL') depends=('postgresql>=9.2' 'postgresql<9.3' 'proj' 'geos' 'gdal' 'json-c' 'libxml2') changelog=$pkgname.changelog options=('!libtool') -source=("http://postgis.org/download/${pkgname}-${pkgver}.tar.gz") -sha256sums=('57746d040080e624f3e81633a180d8a5fc16b0c035d94fe2c16306023ab1c391') +source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz) +sha256sums=('7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0') build() { cd ${srcdir}/${pkgname}-${pkgver} - + ./configure --prefix=/usr make diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 23a3034f8..1e53db33a 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * postgis-2.0.3-1 + 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * postgis-2.0.2-1 diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index 63ef3cdaa..59bff2498 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 91372 2013-05-21 10:01:44Z arodseth $ +# $Id: PKGBUILD 92422 2013-06-04 20:05:04Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.0b9 +pkgver=2.0 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming language and environment for creating images, animations and interactions' @@ -15,12 +15,12 @@ options=(!strip) if [ "$CARCH" == "x86_64" ]; then source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('df6ab1042a09e72dec6eee8ae3bf21ed2fb47fc1eb63668960bea31a6cd62108' + sha256sums=('91b218d69bfe681c671d029346c671612f443f429ea68b63e0e08ae3aa2ffcf6' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('9a1cc4b41c3eee3835347bc198252a2b30fea1c811abda18a42e295b5544048b' + sha256sums=('5f09d79b13ec24384d64385c625b559cc24f2682d5ca3d6a8944ce95873e8e26' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi diff --git a/community/pypanel/PKGBUILD b/community/pypanel/PKGBUILD index 9ede2ca27..713b99f7b 100644 --- a/community/pypanel/PKGBUILD +++ b/community/pypanel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86770 2013-03-22 00:26:29Z eric $ +# $Id: PKGBUILD 92799 2013-06-15 10:31:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jeff Mickey <j@codemac.net> # Contributor: Mr Green @@ -6,12 +6,12 @@ pkgname=pypanel pkgver=2.4 -pkgrel=7 +pkgrel=8 pkgdesc='A lightweight panel/taskbar for X11 window managers written in python.' arch=('i686' 'x86_64' 'mips64el') url='http://pypanel.sourceforge.net/' license=('GPL') -depends=('python2' 'x-server' 'python-xlib' 'imlib2' 'libxft') +depends=('python2' 'x-server' 'python2-xlib' 'imlib2' 'libxft') source=("http://downloads.sourceforge.net/sourceforge/pypanel/PyPanel-${pkgver}.tar.gz") md5sums=('f1f9a2ed80be72ab36e748833618daba') diff --git a/community/python-pybox2d/PKGBUILD b/community/python-pybox2d/PKGBUILD new file mode 100644 index 000000000..6ef9679f8 --- /dev/null +++ b/community/python-pybox2d/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=python-pybox2d +pkgver=370 +pkgrel=1 +pkgdesc="Python wrapper for Box2D" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pybox2d" +license=('GPL') +depends=('python' 'swig') +makedepends=('subversion') +source=("svn+http://pybox2d.googlecode.com/svn/trunk/") +md5sums=('SKIP') + +build() { + cd ${srcdir}/trunk + + python setup.py build +} + +package() { + cd ${srcdir}/trunk + + python setup.py install --root=${pkgdir} +} +# vim: sw=2 ts=2 et: diff --git a/community/python-pytables/PKGBUILD b/community/python-pytables/PKGBUILD new file mode 100644 index 000000000..86f60b82f --- /dev/null +++ b/community/python-pytables/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 92633 2013-06-10 09:13:55Z aginiewicz $ +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> +# Contributor: Sebastien Binet <binet@cern.ch> + +pkgbase=python-pytables +pkgname=('python2-pytables' 'python-pytables') +pkgver=3.0.0 +pkgrel=1 +arch=("i686" "x86_64") +pkgdesc="A package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" +url="http://www.pytables.org" +license=("BSD") +makedepends=('lzo2' 'hdf5' 'python2-numexpr' 'cython2' 'python-numexpr' 'cython') +source=("http://pypi.python.org/packages/source/t/tables/tables-$pkgver.tar.gz") +md5sums=('9c8a18d51be5e94a2ae50ea31d26f8c2') + +build() { + cd "$srcdir" + cp -a tables-$pkgver tables-py2-$pkgver + + msg "Building Python2" + cd "$srcdir"/tables-py2-$pkgver + python2 setup.py build + + msg "Building Python3" + cd "$srcdir"/tables-$pkgver + python setup.py build +} + +package_python2-pytables() { + depends=('lzo2' 'hdf5' 'python2-numexpr' 'cython2') + + cd "$srcdir"/tables-py2-${pkgver} + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python-pytables() { + depends=('lzo2' 'hdf5' 'python-numexpr' 'cython') + + cd "$srcdir"/tables-${pkgver} + python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index aab80797f..dfd1f9181 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 89207 2013-04-28 02:59:53Z kkeen $ +# $Id: PKGBUILD 92654 2013-06-10 15:28:34Z bpiotrowski $ # Maintainer: Kyle Keen <keenerd at gmail dot com> pkgbase=python-pyzmq pkgname=(python2-pyzmq python-pyzmq) -pkgver=13.0.2 +pkgver=13.1.0 pkgrel=1 pkgdesc="Python bindings for zeromq, written in Cython" arch=(i686 x86_64 mips64el) @@ -12,7 +12,7 @@ depends=(zeromq python) makedepends=(python python2 zeromq) #source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) source=(https://pypi.python.org/packages/source/p/pyzmq/pyzmq-$pkgver.tar.gz) -md5sums=('49b1a8b858693522730225e3dc2a0910') +md5sums=('b54a2209a4efed93ed00282d949db8d9') build() { cd "$srcdir" diff --git a/community/python-sfml/PKGBUILD b/community/python-sfml/PKGBUILD new file mode 100644 index 000000000..d38c21200 --- /dev/null +++ b/community/python-sfml/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=python-sfml +pkgver=1.3 +pkgrel=1 +pkgdesc="The unofficial Python binding for SFML" +arch=('i686' 'x86_64') +url="http://python-sfml.org" +license=('LGPL') +depends=('sfml' 'python') +makedepends=('cython' 'git') +source=("git://github.com/Sonkun/python-sfml.git#tag=v${pkgver}") +md5sums=("SKIP") + +build() { + cd "$srcdir"/python-sfml + + python setup.py build_ext +} + +package() { + cd "$srcdir"/python-sfml + + python setup.py install --root="${pkgdir}" --prefix=/usr + + # Copying the License file + install -D -m644 "$srcdir/python-sfml/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python2-pybluez/PKGBUILD b/community/python2-pybluez/PKGBUILD index 26ec8b3df..f211ede1f 100644 --- a/community/python2-pybluez/PKGBUILD +++ b/community/python2-pybluez/PKGBUILD @@ -4,7 +4,7 @@ pkgname=python2-pybluez pkgver=0.18 -pkgrel=4 +pkgrel=6 pkgdesc="Python wrapper for the BlueZ Bluetooth stack" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/pybluez/" @@ -12,11 +12,11 @@ license=('GPL') provides=('pybluez') conflicts=('pybluez') replaces=('pybluez') -depends=('python2' 'bluez') +depends=('python2' 'bluez-libs') source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) md5sums=('be8c8ce615c3189fda1aaf3d568314b2') -build() { +package() { cd $srcdir/PyBluez-$pkgver python2 setup.py install --root=$pkgdir ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so diff --git a/community/python2-pytables/PKGBUILD b/community/python2-pytables/PKGBUILD deleted file mode 100644 index b876cc266..000000000 --- a/community/python2-pytables/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 82342 2013-01-15 16:56:55Z aginiewicz $ -# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> -# Contributor: Sebastien Binet <binet@cern.ch> - -pkgname=python2-pytables -pkgver=2.4.0 -pkgrel=3 -arch=("i686" "x86_64" "mips64el") -pkgdesc="PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" -url="http://www.pytables.org" -license=("BSD") -depends=('lzo2' 'hdf5' 'python2-numexpr' 'cython2') -provides=('python-pytables') # temporary due to package rename -replaces=('python-pytables') # (there is no python 3 version yet) -source=("http://pypi.python.org/packages/source/t/tables/tables-$pkgver.tar.gz") -md5sums=('527ad046f92c9197ca96626b725f71f8') - -build() { - cd "$srcdir"/tables-${pkgver} - python2 setup.py build -} - -package() { - cd "$srcdir"/tables-${pkgver} - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 - - install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 2bee7ef10..b595d186f 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91963 2013-05-30 10:15:36Z spupykin $ +# $Id: PKGBUILD 92285 2013-06-03 13:57:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> @@ -6,11 +6,11 @@ pkgname=qcad pkgver=3.0.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.ribbonsoft.com/qcad.html" -license=('GPL2') +license=('GPL3') depends=('qtwebkit') makedepends=('glu') options=(libtool) diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD deleted file mode 100644 index aa04833f1..000000000 --- a/community/qmc2/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 82281 2013-01-14 09:21:45Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> - -pkgname=qmc2 -pkgver=0.38 -pkgrel=1 -pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" -url="http://qmc2.arcadehits.net" -license=("GPL") -arch=('i686' 'x86_64' 'mips64el') -depends=('qtwebkit' 'phonon' 'sdl') -makedepends=('rsync' 'mesa') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('075cd54c3f4eb306c4f8304dd08900c6') - -build() { - cd "$srcdir/$pkgname" - export CTIME=0 - make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr -} - -package() { - cd "$srcdir/$pkgname" - make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install - install -d $pkgdir/usr/share/{applications,pixmaps} - install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps" -} diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 5ef8b84af..45a165304 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 88593 2013-04-20 16:06:40Z jlichtblau $ +#$Id: PKGBUILD 92815 2013-06-15 12:48:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.7.0 +pkgver=0.7.1 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support' install=$pkgname.install changelog=$pkgname.changelog source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('2f9a67821a711f925e27d7254eb3039d31019fe1a2aaa7a901be0d2f9066183d') +sha256sums=('5e86c3c783bffa384d4c5c8731ebaff7a1589f56b6e0ad69ec6f82a8da160671') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 57758c02f..cec0d2b97 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.7.1-1 + 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.7.0-1 diff --git a/community/qt-recordmydesktop/PKGBUILD b/community/qt-recordmydesktop/PKGBUILD index afdd5dce9..e674f7b6e 100644 --- a/community/qt-recordmydesktop/PKGBUILD +++ b/community/qt-recordmydesktop/PKGBUILD @@ -1,18 +1,26 @@ +# $Id: PKGBUILD 92883 2013-06-17 19:06:55Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> +# Contributor: Daniel J Griffiths <griffithsdj@archlinux.us> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Marc poiroud <marci1 AT archlinux.fr> pkgname=qt-recordmydesktop pkgver=0.3.8 -pkgrel=5 +pkgrel=6 pkgdesc="Qt4 frontend for recordMyDesktop" arch=('i686' 'x86_64' 'mips64el') url="http://recordmydesktop.sourceforge.net" license=('GPL') -depends=('recordmydesktop>=0.3.8.1' 'python2-qt') -source=(http://downloads.sourceforge.net/sourceforge/recordmydesktop/${pkgname}-${pkgver}.tar.gz) -md5sums=('bf1525740755615ae172ae27fef68fb5') +depends=('recordmydesktop>=0.3.8.1' 'python2-pyqt') +source=(http://downloads.sourceforge.net/sourceforge/recordmydesktop/${pkgname}-${pkgver}.tar.gz + 'pyqt4.patch') +md5sums=('bf1525740755615ae172ae27fef68fb5' + 'ce1dc05b512df883d0e204eac2b1eaaf') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/pyqt4.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/community/qt-recordmydesktop/pyqt4.patch b/community/qt-recordmydesktop/pyqt4.patch new file mode 100644 index 000000000..5c082e446 --- /dev/null +++ b/community/qt-recordmydesktop/pyqt4.patch @@ -0,0 +1,11 @@ +--- qt-recordmydesktop-0.3.8/configure.ac~ 2013-06-17 18:22:27.747345090 +0000 ++++ qt-recordmydesktop-0.3.8/configure.ac 2013-06-17 18:22:46.937225955 +0000 +@@ -43,7 +43,7 @@ + + export PYTHONPATH=$PYTHONPATH + +-export PYQT4_VERSION=`python -c 'import PyQt4; from PyQt4 import QtCore; print QtCore.PYQT_VERSION_STR' 2>>/dev/null ` ++export PYQT4_VERSION=`python2 -c 'import PyQt4; from PyQt4 import QtCore; print QtCore.PYQT_VERSION_STR' 2>>/dev/null ` + if test x$PYQT4_VERSION == x; then + AC_MSG_ERROR(You need PyQt4>=4.1 installed to procceed); + fi diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD index 009fa737d..75c0e3368 100644 --- a/community/qtfm/PKGBUILD +++ b/community/qtfm/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 85404 2013-03-01 10:39:23Z andrea $ +# $Id: PKGBUILD 92818 2013-06-15 13:03:11Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Wittfella <wittfella@wittfella.com> pkgname=qtfm -pkgver=5.5 -pkgrel=2 +pkgver=5.9 +pkgrel=1 pkgdesc="A lightweight file manager" arch=('i686' 'x86_64' 'mips64el') -url="http://www.qtfm.org/" +url="http://qt-apps.org/content/show.php/QtFM?content=158787" license=('GPL') -depends=('file' 'qt4') +depends=('file' 'qt5-base' 'desktop-file-utils') install=$pkgname.install changelog=$pkgname.changelog -source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz) -sha256sums=('845fc43800d12483fa1993c56a8c965ff8dc917b97f03d9ce2e24318806fb211') +source=(http://qt-apps.org/CONTENT/content-files/158787-qtfm.zip) +sha256sums=('07ffd61dd5d4aa7c16f1c544804517b621e3ef1a30eeda97c087219a3cb35128') build() { - cd "${srcdir}/$pkgname-$pkgver" + cd "${srcdir}/$pkgname" qmake make } package() { - cd "${srcdir}/$pkgname-$pkgver" + cd "${srcdir}/$pkgname" make INSTALL_ROOT="${pkgdir}" install } diff --git a/community/qtfm/qtfm.changelog b/community/qtfm/qtfm.changelog index 043ff07ec..2212da656 100644 --- a/community/qtfm/qtfm.changelog +++ b/community/qtfm/qtfm.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qtfm 5.9-1 + 2012-06-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qtfm 5.5-1 diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index 33e9a1539..1e99f350f 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87090 2013-03-26 23:07:30Z schiv $ +# $Id: PKGBUILD 92566 2013-06-08 18:10:04Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Ãœberbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.5.8 +pkgver=0.5.9 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') install=qtractor.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('22abf4de4d5736f794e174ef06fe3a3c') +md5sums=('92e18a45e8a378761119440eb677a908') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,7 +25,7 @@ build() { } package () { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD index d6b4d0285..e1539851b 100644 --- a/community/qucs/PKGBUILD +++ b/community/qucs/PKGBUILD @@ -1,34 +1,28 @@ -# $Id: PKGBUILD 88012 2013-04-09 21:50:26Z eric $ +# $Id: PKGBUILD 92667 2013-06-11 16:18:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: VÃctor MartÃnez Romanos <vmromanos@gmail.com> pkgname=qucs -pkgver=0.0.16 -pkgrel=2 +pkgver=0.0.17s130610 +pkgrel=1 pkgdesc="An integrated circuit simulator with a graphical user interface" arch=('i686' 'x86_64' 'mips64el') url="http://qucs.sourceforge.net" license=('GPL') -depends=('qt3') +depends=('gcc-libs' 'qt4') optdepends=('freehdl: to permit digital circuit simulation' 'asco: to enable circuit optimization' 'perl') -source=(http://downloads.sourceforge.net/sourceforge/qucs/$pkgname-$pkgver.tar.gz - qucs-gcc-4.5.1.patch) -md5sums=('c916502171d422ab168fe5fc681b29d8' - '6fd31dc632cdef53f8c2566ad782901a') +source=("http://downloads.sourceforge.net/project/qucs/qucs/$(echo $pkgver | cut -f1 -ds)-snapshots/qucs-${pkgver/s/.}.tar.gz") +md5sums=('47dead7df86419bf121d9c1c45f3cdfa') build() { - cd $srcdir/$pkgname-$pkgver - - export PATH=$QTDIR/bin:$PATH - - [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/qucs-gcc-4.5.1.patch - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr + cd $srcdir/$pkgname-${pkgver/s/.} + ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${pkgver/s/.} make DESTDIR=$pkgdir install } diff --git a/community/qucs/qucs-gcc-4.5.1.patch b/community/qucs/qucs-gcc-4.5.1.patch deleted file mode 100644 index e29c11d39..000000000 --- a/community/qucs/qucs-gcc-4.5.1.patch +++ /dev/null @@ -1,410 +0,0 @@ -diff -wbBur qucs-0.0.16/qucs-core/src/components/spfile.cpp qucs-0.0.16.my/qucs-core/src/components/spfile.cpp ---- qucs-0.0.16/qucs-core/src/components/spfile.cpp 2011-03-17 17:02:08.000000000 +0000 -+++ qucs-0.0.16.my/qucs-core/src/components/spfile.cpp 2011-03-29 15:28:06.000000000 +0000 -@@ -409,8 +411,8 @@ - Kx * norm (1.0 - s.get (0, 0) * Sopt)); - c.set (1, 1, norm (s.get (1, 0)) * ((Fmin - 1) + Kx * norm (Sopt))); - c.set (0, 1, s.get (0, 0) / s.get (1, 0) * c.get (1, 1) - -- conj (s.get (1, 0)) * conj (Sopt) * Kx); -- c.set (1, 0, conj (c.get (0, 1))); -+ tr1::conj (s.get (1, 0)) * tr1::conj (Sopt) * Kx); -+ c.set (1, 0, tr1::conj (c.get (0, 1))); - return c; - } - -@@ -422,7 +424,7 @@ - s.getCols () == 2 && c.getCols () == 2); - nr_complex_t n1, n2; - n1 = c.get (0, 0) * norm (s.get (1, 0)) - -- 2 * real (c.get (0, 1) * s.get (1, 0) * conj (s.get (0, 0))) + -+ 2 * real (c.get (0, 1) * s.get (1, 0) * tr1::conj (s.get (0, 0))) + - c.get (1, 1) * norm (s.get (0, 0)); - n2 = 2.0 * (c.get (1, 1) * s.get (0, 0) - - c.get (0, 1) * s.get (1, 0)) / (c.get (1, 1) + n1); -@@ -440,7 +442,7 @@ - - // equivalent noise resistance - Rn = real ((c (0, 0) - 2.0 * -- real (c (0, 1) * conj ((1.0 + s (0, 0)) / s (1, 0))) + -+ real (c (0, 1) * tr1::conj ((1.0 + s (0, 0)) / s (1, 0))) + - c (1, 1) * norm ((1.0 + s (0, 0)) / s (1, 0))) / 4.0); - Rn = Rn * z0; - -diff -wbBur qucs-0.0.16/qucs-core/src/evaluate.cpp qucs-0.0.16.my/qucs-core/src/evaluate.cpp ---- qucs-0.0.16/qucs-core/src/evaluate.cpp 2011-03-11 20:42:20.000000000 +0000 -+++ qucs-0.0.16.my/qucs-core/src/evaluate.cpp 2011-03-29 15:36:29.000000000 +0000 -@@ -1143,7 +1143,7 @@ - constant * evaluate::conj_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (conj (*c1)); -+ _RETC (tr1::conj (*c1)); - } - - constant * evaluate::conj_v (constant * args) { -@@ -1443,7 +1443,7 @@ - constant * evaluate::arcsin_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (asin (*c1)); -+ _RETC (tr1::asin (*c1)); - } - - constant * evaluate::arcsin_v (constant * args) { -@@ -1462,7 +1462,7 @@ - constant * evaluate::arccos_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (acos (*c1)); -+ _RETC (tr1::acos (*c1)); - } - - constant * evaluate::arccos_v (constant * args) { -@@ -1481,7 +1481,7 @@ - constant * evaluate::arctan_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (atan (*c1)); -+ _RETC (tr1::atan (*c1)); - } - - constant * evaluate::arctan_v (constant * args) { -@@ -1557,7 +1557,7 @@ - constant * evaluate::arcsec_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (acos (1.0 / *c1)); -+ _RETC (tr1::acos (1.0 / *c1)); - } - - constant * evaluate::arcsec_v (constant * args) { -@@ -1595,7 +1595,7 @@ - constant * evaluate::arccosec_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (asin (1.0 / *c1)); -+ _RETC (tr1::asin (1.0 / *c1)); - } - - constant * evaluate::arccosec_v (constant * args) { -@@ -1614,7 +1614,7 @@ - constant * evaluate::arsinh_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (asinh (*c1)); -+ _RETC (tr1::asinh (*c1)); - } - - constant * evaluate::arsinh_v (constant * args) { -@@ -1634,7 +1634,7 @@ - constant * evaluate::arcosech_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (asinh (1.0 / *c1)); -+ _RETC (tr1::asinh (1.0 / *c1)); - } - - constant * evaluate::arcosech_v (constant * args) { -@@ -1647,13 +1647,13 @@ - constant * evaluate::arcosh_d (constant * args) { - _ARD0 (d1); - _DEFC (); -- _RETC (acosh (nr_complex_t (d1))); -+ _RETC (tr1::acosh (nr_complex_t (d1))); - } - - constant * evaluate::arcosh_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (acosh (*c1)); -+ _RETC (tr1::acosh (*c1)); - } - - constant * evaluate::arcosh_v (constant * args) { -@@ -1691,7 +1691,7 @@ - constant * evaluate::artanh_c (constant * args) { - _ARC0 (c1); - _DEFC (); -- _RETC (atanh (*c1)); -+ _RETC (tr1::atanh (*c1)); - } - - constant * evaluate::artanh_v (constant * args) { -@@ -2649,7 +2649,7 @@ - _DEFD (); - nr_double_t k; - k = (1 - norm (m->get (0, 0))) / -- (abs (m->get (1, 1) - conj (m->get (0, 0)) * det (*m)) + -+ (abs (m->get (1, 1) - tr1::conj (m->get (0, 0)) * det (*m)) + - abs (m->get (0, 1) * m->get (1, 0))); - _RETD (k); - } -@@ -2669,7 +2669,7 @@ - _DEFD (); - nr_double_t k; - k = (1 - norm (m->get (1, 1))) / -- (abs (m->get (0, 0) - conj (m->get (1, 1)) * det (*m)) + -+ (abs (m->get (0, 0) - tr1::conj (m->get (1, 1)) * det (*m)) + - abs (m->get (0, 1) * m->get (1, 0))); - _RETD (k); - } -@@ -3662,14 +3662,14 @@ - _ARD0 (d1); - _ARC1 (z); - _DEFC (); -- _RETC (10.0 * log10 (norm (d1) / conj (*z) / 0.001)); -+ _RETC (10.0 * log10 (norm (d1) / tr1::conj (*z) / 0.001)); - } - - constant * evaluate::dbm_c_c (constant * args) { - _ARC0 (c1); - _ARC1 (z); - _DEFC (); -- _RETC (10.0 * log10 (norm (*c1) / conj (*z) / 0.001)); -+ _RETC (10.0 * log10 (norm (*c1) / tr1::conj (*z) / 0.001)); - } - - constant * evaluate::dbm_v_c (constant * args) { -diff -wbBur qucs-0.0.16/qucs-core/src/math/complex.cpp qucs-0.0.16.my/qucs-core/src/math/complex.cpp ---- qucs-0.0.16/qucs-core/src/math/complex.cpp 2011-03-11 20:42:21.000000000 +0000 -+++ qucs-0.0.16.my/qucs-core/src/math/complex.cpp 2011-03-29 15:21:58.000000000 +0000 -@@ -366,7 +367,7 @@ - \return arc tangent of z - */ - nr_complex_t atan2 (const nr_complex_t y, const nr_complex_t x) { -- nr_complex_t a = atan (y / x); -+ nr_complex_t a = tr1::atan (y / x); - return real (x) > 0.0 ? a : -a; - } - #endif -diff -wbBur qucs-0.0.16/qucs-core/src/math/complex.h qucs-0.0.16.my/qucs-core/src/math/complex.h ---- qucs-0.0.16/qucs-core/src/math/complex.h 2011-03-17 17:01:42.000000000 +0000 -+++ qucs-0.0.16.my/qucs-core/src/math/complex.h 2011-03-29 15:29:01.000000000 +0000 -@@ -33,7 +33,6 @@ - #elif defined HAVE_TR1_COMPLEX - #include <tr1/complex> - using namespace std; --using namespace std::tr1; - typedef std::complex<nr_double_t> nr_complex_t; - #else - #include <complex> -diff -wbBur qucs-0.0.16/qucs-core/src/matrix.cpp qucs-0.0.16.my/qucs-core/src/matrix.cpp ---- qucs-0.0.16/qucs-core/src/matrix.cpp 2011-03-11 20:42:20.000000000 +0000 -+++ qucs-0.0.16.my/qucs-core/src/matrix.cpp 2011-03-29 14:52:17.000000000 +0000 -@@ -504,7 +504,7 @@ - matrix res (a.getRows (), a.getCols ()); - for (int r = 0; r < a.getRows (); r++) - for (int c = 0; c < a.getCols (); c++) -- res.set (r, c, conj (a.get (r, c))); -+ res.set (r, c, tr1::conj (a.get (r, c))); - return res; - } - -@@ -1176,12 +1176,12 @@ - - assert (s.getRows () >= 2 && s.getCols () >= 2); - -- a.set (0, 0, (conj (z1) + z1 * s (0, 0) - -- conj (z1) * s (1, 1) - z1 * d) / n); -- a.set (0, 1, (conj (z1) * conj (z2) + z1 * conj (z2) * s (0, 0) + -- conj (z1) * z2 * s (1, 1) + z1 * z2 * d) / n); -+ a.set (0, 0, (tr1::conj (z1) + z1 * s (0, 0) - -+ tr1::conj (z1) * s (1, 1) - z1 * d) / n); -+ a.set (0, 1, (tr1::conj (z1) * tr1::conj (z2) + z1 * tr1::conj (z2) * s (0, 0) + -+ tr1::conj (z1) * z2 * s (1, 1) + z1 * z2 * d) / n); - a.set (1, 0, (1.0 - s (0, 0) - s (1, 1) + d) / n); -- a.set (1, 1, (conj (z2) - conj (z2) * s (0, 0) + -+ a.set (1, 1, (tr1::conj (z2) - tr1::conj (z2) * s (0, 0) + - z2 * s (1, 1) - z2 * d) / n); - return a; - } -@@ -1219,12 +1219,12 @@ - assert (a.getRows () >= 2 && a.getCols () >= 2); - - s.set (0, 0, (a (0, 0) * z2 + a (0, 1) -- - a (1, 0) * conj (z1) * z2 - a (1, 1) * conj (z1)) / n); -+ - a (1, 0) * tr1::conj (z1) * z2 - a (1, 1) * tr1::conj (z1)) / n); - s.set (0, 1, (a (0, 0) * a (1, 1) - - a (0, 1) * a (1, 0)) * d / n); - s.set (1, 0, d / n); -- s.set (1, 1, (a (1, 1) * z1 - a (0, 0) * conj (z2) + -- a (0, 1) - a (1, 0) * z1 * conj (z2)) / n); -+ s.set (1, 1, (a (1, 1) * z1 - a (0, 0) * tr1::conj (z2) + -+ a (0, 1) - a (1, 0) * z1 * tr1::conj (z2)) / n); - return s; - } - -diff -wbBur qucs-0.0.16/qucs-core/src/spsolver.cpp qucs-0.0.16.my/qucs-core/src/spsolver.cpp ---- qucs-0.0.16/qucs-core/src/spsolver.cpp 2011-03-11 20:42:20.000000000 +0000 -+++ qucs-0.0.16.my/qucs-core/src/spsolver.cpp 2011-03-29 14:54:27.000000000 +0000 -@@ -319,14 +319,14 @@ - - p = - c->getN (i1, j1) + c->getN (k, j1) * k1 + c->getN (l, j1) * k2 + -- conj (k3) * (c->getN (i1, k) + c->getN (k, k) * k1 + -+ tr1::conj (k3) * (c->getN (i1, k) + c->getN (k, k) * k1 + - c->getN (l, k) * k2) + -- conj (k4) * (c->getN (i1, l) + c->getN (k, l) * k1 + -+ tr1::conj (k4) * (c->getN (i1, l) + c->getN (k, l) * k1 + - c->getN (l, l) * k2); - result->setN (i2, j2, p); - - if (i2 >= j2) break; // the other half need not be computed -- result->setN (j2, i2, conj (p)); -+ result->setN (j2, i2, tr1::conj (p)); - i2++; - } - -@@ -378,13 +378,13 @@ - // compute C'ij - p = c->getN (i1, j1) + - c->getN (k, j1) * d->getS (l, l) * c->getS (i1, k) * tiny2 / t + -- c->getN (i1, k) * conj (d->getS (l, l) * c->getS (j1, k) * tiny2 / t) + -+ c->getN (i1, k) * tr1::conj (d->getS (l, l) * c->getS (j1, k) * tiny2 / t) + - (c->getN (k, k) * norm (d->getS (l, l)) + d->getN (l, l)) * -- c->getS (i1, k) * conj (c->getS (j1, k)) * tiny4 / norm (t); -+ c->getS (i1, k) * tr1::conj (c->getS (j1, k)) * tiny4 / norm (t); - - result->setN (i2, j2, p); - if (i2 >= j2) break; // the other half need not be computed -- result->setN (j2, i2, conj (p)); -+ result->setN (j2, i2, tr1::conj (p)); - i2++; - } - -@@ -410,12 +410,12 @@ - - // compute C'ij - p = (c->getN (k, k) * d->getS (l, l) + -- d->getN (l, l) * conj (c->getS (k, k))) * -- c->getS (i1, k) * conj (d->getS (j1, l)) * tiny3 / norm (t) + -+ d->getN (l, l) * tr1::conj (c->getS (k, k))) * -+ c->getS (i1, k) * tr1::conj (d->getS (j1, l)) * tiny3 / norm (t) + - d->getN (l, j1) * c->getS (i1, k) * tiny1 / t + -- c->getN (i1, k) * conj (d->getS (j1, l) * tiny1 / t); -+ c->getN (i1, k) * tr1::conj (d->getS (j1, l) * tiny1 / t); - result->setN (i2, j2, p); -- result->setN (j2, i2, conj (p)); -+ result->setN (j2, i2, tr1::conj (p)); - i2++; - } - -@@ -428,12 +428,12 @@ - // compute C'ij - p = d->getN (i1, j1) + - (d->getN (l, l) * norm (c->getS (k, k)) + c->getN (k, k)) * -- d->getS (i1, l) * conj (d->getS (j1, l)) * tiny4 / norm (t) + -- d->getN (i1, l) * conj (c->getS (k, k) * d->getS (j1, l) * tiny2 / t) + -+ d->getS (i1, l) * tr1::conj (d->getS (j1, l)) * tiny4 / norm (t) + -+ d->getN (i1, l) * tr1::conj (c->getS (k, k) * d->getS (j1, l) * tiny2 / t) + - d->getN (l, j1) * c->getS (k, k) * d->getS (i1, l) * tiny2 / t; - result->setN (i2, j2, p); - if (i2 >= j2) break; // the other half need not be computed -- result->setN (j2, i2, conj (p)); -+ result->setN (j2, i2, tr1::conj (p)); - i2++; - } - -@@ -1042,7 +1042,7 @@ - // linear noise figure - F = real (1.0 + c22 / norm (s21)); - n1 = -- c11 * norm (s21) - 2.0 * real (c12 * s21 * conj (s11)) + -+ c11 * norm (s21) - 2.0 * real (c12 * s21 * tr1::conj (s11)) + - c22 * norm (s11); - n2 = 2.0 * (c22 * s11 - c12 * s21) / (c22 + n1); - -@@ -1058,7 +1058,7 @@ - norm (s21) / (1.0 + norm (Sopt))); - - // equivalent noise resistance -- Rn = real ((c11 - 2.0 * real (c12 * conj ((1.0 + s11) / s21)) + -+ Rn = real ((c11 - 2.0 * real (c12 * tr1::conj ((1.0 + s11) / s21)) + - c22 * norm ((1.0 + s11) / s21)) / 4.0); - Rn = Rn * z0; - -diff -wbBur qucs-0.0.16/qucs-core/src/tvector.cpp qucs-0.0.16.my/qucs-core/src/tvector.cpp ---- qucs-0.0.16/qucs-core/src/tvector.cpp 2011-03-11 20:42:20.000000000 +0000 -+++ qucs-0.0.16.my/qucs-core/src/tvector.cpp 2011-03-29 15:10:09.000000000 +0000 -@@ -390,7 +390,7 @@ - tvector<nr_type_t> conj (tvector<nr_type_t> a) { - int n = a.getSize (); - tvector<nr_type_t> res (n); -- for (int i = 0; i < n; i++) res.set (i, conj (a.get (i))); -+ for (int i = 0; i < n; i++) res.set (i, tr1::conj (a.get (i))); - return res; - } - -diff -wbBur qucs-0.0.16/qucs-core/src/vector.cpp qucs-0.0.16.my/qucs-core/src/vector.cpp ---- qucs-0.0.16/qucs-core/src/vector.cpp 2011-03-17 17:01:25.000000000 +0000 -+++ qucs-0.0.16.my/qucs-core/src/vector.cpp 2011-03-29 15:33:57.000000000 +0000 -@@ -354,7 +354,7 @@ - - vector conj (vector v) { - vector result (v); -- for (int i = 0; i < v.getSize (); i++) result.set (conj (v.get (i)), i); -+ for (int i = 0; i < v.getSize (); i++) result.set (tr1::conj (v.get (i)), i); - return result; - } - -@@ -450,13 +450,13 @@ - - vector asin (vector v) { - vector result (v); -- for (int i = 0; i < v.getSize (); i++) result.set (asin (v.get (i)), i); -+ for (int i = 0; i < v.getSize (); i++) result.set (tr1::asin (v.get (i)), i); - return result; - } - - vector acos (vector v) { - vector result (v); -- for (int i = 0; i < v.getSize (); i++) result.set (acos (v.get (i)), i); -+ for (int i = 0; i < v.getSize (); i++) result.set (tr1::acos (v.get (i)), i); - return result; - } - -@@ -474,7 +474,7 @@ - - vector atan (vector v) { - vector result (v); -- for (int i = 0; i < v.getSize (); i++) result.set (atan (v.get (i)), i); -+ for (int i = 0; i < v.getSize (); i++) result.set (tr1::atan (v.get (i)), i); - return result; - } - -@@ -498,7 +498,7 @@ - - vector asinh (vector v) { - vector result (v); -- for (int i = 0; i < v.getSize (); i++) result.set (asinh (v.get (i)), i); -+ for (int i = 0; i < v.getSize (); i++) result.set (tr1::asinh (v.get (i)), i); - return result; - } - -@@ -510,7 +510,7 @@ - - vector acosh (vector v) { - vector result (v); -- for (int i = 0; i < v.getSize (); i++) result.set (acosh (v.get (i)), i); -+ for (int i = 0; i < v.getSize (); i++) result.set (tr1::acosh (v.get (i)), i); - return result; - } - -@@ -528,7 +528,7 @@ - - vector atanh (vector v) { - vector result (v); -- for (int i = 0; i < v.getSize (); i++) result.set (atanh (v.get (i)), i); -+ for (int i = 0; i < v.getSize (); i++) result.set (tr1::atanh (v.get (i)), i); - return result; - } - -@@ -1200,7 +1200,7 @@ - vector dbm (vector v, const nr_complex_t z) { - vector result (v); - for (int i = 0; i < v.getSize (); i++) -- result.set (10.0 * log10 (norm (v.get (i)) / conj (z) / 0.001), i); -+ result.set (10.0 * log10 (norm (v.get (i)) / tr1::conj (z) / 0.001), i); - return result; - } - diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index dca712682..54e0a876c 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90085 2013-05-06 19:39:21Z foutrelis $ +# $Id: PKGBUILD 92590 2013-06-09 15:08:48Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=4.0.10 -pkgrel=4 +pkgver=4.0.11 +pkgrel=1 epoch=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('fftw' 'gtkmm' 'libcanberra' 'libiptcdata' 'lcms2' 'desktop-file-utils' makedepends=('cmake') install=rawtherapee.install source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz") -md5sums=('cf18a503a978a29af6275e17f7aa67ba') +md5sums=('d30a54e6446326d8299c06ec76c281d8') build() { mkdir "$srcdir/$pkgname-build" diff --git a/community/redshift/165_164.diff b/community/redshift/165_164.diff new file mode 100644 index 000000000..663b5663b --- /dev/null +++ b/community/redshift/165_164.diff @@ -0,0 +1,55 @@ +=== modified file 'src/location-geoclue.c' +--- src/location-geoclue.c 2011-03-27 22:14:58 +0000 ++++ src/location-geoclue.c 2011-07-12 20:30:30 +0000 +@@ -50,14 +50,20 @@ + int + location_geoclue_start(location_geoclue_state_t *state) + { +- GeoclueMaster *master = NULL; +- GeoclueMasterClient *client = NULL; +- GError *error = NULL; +- gchar *name = NULL; ++ if (state->provider && state->provider_path) { ++ state->position = geoclue_position_new(state->provider, ++ state->provider_path); ++ } else { ++ GeoclueMaster *master = geoclue_master_get_default(); ++ GeoclueMasterClient *client = geoclue_master_create_client(master, ++ NULL, NULL); ++ GError *error = NULL; + +- if (!(state->provider && state->provider_path)) { +- master = geoclue_master_get_default(); +- client = geoclue_master_create_client(master, NULL, NULL); ++ if (client == NULL) { ++ g_printerr(_("Unable to obtain master client.\n")); ++ g_object_unref(master); ++ return -1; ++ } + + if (!geoclue_master_client_set_requirements(client, + GEOCLUE_ACCURACY_LEVEL_REGION, +@@ -68,15 +74,18 @@ + error->message); + g_error_free(error); + g_object_unref(client); ++ g_object_unref(master); + + return -1; + } + + state->position = geoclue_master_client_create_position(client, NULL); +- } else { +- state->position = geoclue_position_new(state->provider, +- state->provider_path); +- } ++ ++ g_object_unref(client); ++ g_object_unref(master); ++ } ++ ++ gchar *name = NULL; + + if (geoclue_provider_get_provider_info(GEOCLUE_PROVIDER(state->position), + &name, NULL, NULL)) { + diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD index b06e34226..5f708c2b3 100644 --- a/community/redshift/PKGBUILD +++ b/community/redshift/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80160 2012-11-17 01:18:35Z lfleischer $ +# $Id: PKGBUILD 92311 2013-06-03 21:26:54Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Geoffrey Teale <tealeg@stop-squark> # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com> @@ -6,7 +6,7 @@ pkgname=redshift pkgver=1.7 -pkgrel=5 +pkgrel=6 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.' arch=('i686' 'x86_64' 'mips64el') url='http://jonls.dk/redshift/' @@ -17,14 +17,23 @@ optdepends=('pygtk: for gtk-redshift' 'librsvg: for gtk-redshift') makedepends=('python2') install='redshift.install' -source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c56512afa292b5a94b715ed4a1841d4c') +source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" + '165_164.diff') +md5sums=('c56512afa292b5a94b715ed4a1841d4c' + 'eaafcdc62a47d725c256cd5473f4efa1') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's/python/python2/' src/gtk-redshift/gtk-redshift + # fix GTK UI segmentation fault (fixes FS#33412) + patch -p0 -i ../165_164.diff +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 90f24a027..ff163af5d 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 91908 2013-05-29 10:07:02Z spupykin $ +# $Id: PKGBUILD 92920 2013-06-19 10:05:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=7.2.7 -pkgrel=3 +pkgver=7.4.1 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -depends=('zlib' 'libestr' 'libee' 'json-c') -makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls') +depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd') +makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' + 'python-docutils') optdepends=('postgresql-libs: PostgreSQL Database Support' 'libmariadbclient: MySQL Database Support' 'net-snmp' @@ -21,8 +22,8 @@ options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('4a61d182acb5b5487e7b99dea8974857' - '304bc9ea26aa1ff910870899a30512f1' +md5sums=('8e0e868a425bfa5c2c13bdc28338e1af' + '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') build() { @@ -36,10 +37,13 @@ build() { --enable-snmp \ --enable-gnutls \ --enable-inet \ + --enable-imjournal \ + --enable-omjournal \ --with-systemdsystemunitdir=/usr/lib/systemd/system echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile make } + package() { cd ${srcdir}/${pkgname}-${pkgver} make install DESTDIR=${pkgdir} diff --git a/community/rsyslog/rsyslog.logrotate b/community/rsyslog/rsyslog.logrotate index 354581767..889c9891e 100644 --- a/community/rsyslog/rsyslog.logrotate +++ b/community/rsyslog/rsyslog.logrotate @@ -1,4 +1,4 @@ -/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log { +/var/log/auth.log /var/log/cron.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news /var/log/syslog /var/log/user.log { missingok sharedscripts postrotate diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index ad961fe99..0ab0c44d3 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90322 2013-05-11 14:56:12Z arodseth $ +# $Id: PKGBUILD 92390 2013-06-04 13:59:53Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,14 +8,14 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=2.0.0 +pkgver=2.0.2 pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('6a36d2d4212e65f23d1c174b03006ea7fecaad1f3b82151dbfbe7ddf4268579f') +sha256sums=('3a009bde5f4c684214d7860cce5763db4d862cfdeafaa84578117dc723b7e1e5') prepare() { cd "$srcdir/ruby-gtk2-$pkgver" diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index 792563d0a..22205ea02 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90334 2013-05-11 15:51:15Z arodseth $ +# $Id: PKGBUILD 92836 2013-06-16 15:30:03Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -6,16 +6,16 @@ # Contributor: kritoke <kritoke@nospam.gmail.com> pkgbase=ruby-gtk3 -pkgver=2.0.0 +pkgver=2.0.2 +pkgrel=1 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver") -pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") -sha256sums=('f5e4cd605ece402ba9b8670058bb06c80ea9e21e4a1ff724d97394439091ff50') +sha256sums=('cc55542b207899af2bc0489c004c394b2332656cbf25ef3ff0daceff39535047') prepare() { cd "$srcdir/ruby-gtk3-$pkgver" @@ -35,7 +35,7 @@ package_ruby-gtk3() { cd "$srcdir/ruby-gtk3-$pkgver/gtk3" mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install -j1 } package_ruby-gdk3() { @@ -44,7 +44,7 @@ package_ruby-gdk3() { cd "$srcdir/ruby-gtk3-$pkgver/gdk3" mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install -j1 } # vim:set ts=2 sw=2 et: diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD index 3888c251c..ba37a6dc5 100644 --- a/community/ruby-ncurses/PKGBUILD +++ b/community/ruby-ncurses/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86883 2013-03-23 23:10:46Z td123 $ +# $Id: PKGBUILD 92582 2013-06-09 08:55:46Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Jeff Mickey <j@codemac.net> @@ -6,14 +6,24 @@ pkgname=ruby-ncurses pkgver=1.3.1 -pkgrel=4 +pkgrel=5 pkgdesc='Module for interactive text console applications (ncurses)' arch=('x86_64' 'i686' 'mips64el') url='http://ncurses-ruby.berlios.de/' license=('GPL') depends=('ruby' 'ncurses') -source=("http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2") -sha256sums=('dca8ce452e989ce1399cb683184919850f2baf79e6af9d16a7eed6a9ab776ec5') +makedepends=('addinclude') +source=("http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2" + 'str2cstr.patch::http://pkgs.fedoraproject.org/cgit/ruby-ncurses.git/plain/0001-STR2CSTR-deprecated.patch') +sha256sums=('dca8ce452e989ce1399cb683184919850f2baf79e6af9d16a7eed6a9ab776ec5' + '3a9fea87a0fa3eac58022e9e86e901601953939c15ebccede0ba64f4a011039d') + +prepare() { + cd "$srcdir/ncurses-ruby-$pkgver" + + patch -i ../str2cstr.patch + addinclude ncurses_wrap.c sys/time.h +} build() { cd "$srcdir/ncurses-ruby-$pkgver" diff --git a/community/shfs-utils/PKGBUILD b/community/shfs-utils/PKGBUILD index 1443ae019..cfdeded85 100644 --- a/community/shfs-utils/PKGBUILD +++ b/community/shfs-utils/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 68044 2012-03-17 11:53:37Z giovanni $ +# $Id: PKGBUILD 92255 2013-06-03 11:15:28Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Sébastien Luttringer # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> pkgname=shfs-utils pkgver=0.35 -pkgrel=4 -pkgdesc="SHell FileSystem Linux utils" -url="http://shfs.sourceforge.net/" +pkgrel=5 +pkgdesc='SHell FileSystem Linux utils' +url='http://shfs.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('glibc' 'openssh') @@ -16,15 +17,18 @@ source=("http://downloads.sourceforge.net/sourceforge/shfs/shfs-$pkgver.tar.gz" md5sums=('016f49d71bc32eee2b5d11fc1600cfbe' '49fb94b139bc69927815127f0bf85159') -build() { - cd "${srcdir}/shfs-${pkgver}" +prepare() { + patch -Np0 -d shfs-$pkgver < $pkgname-make.patch +} - patch -Np0 -i "${srcdir}/$pkgname-make.patch" +build() { + cd shfs-$pkgver make -j1 utils } package() { - cd "${srcdir}/shfs-${pkgver}" - - make -j1 ROOT="${pkgdir}" utils-install + cd shfs-$pkgver + make -j1 ROOT="$pkgdir" utils-install + # remove sbin symlinks + rm -r "$pkgdir/sbin" } diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index cd11f3b12..44dac8510 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 88680 2013-04-21 22:16:49Z heftig $ +# $Id: PKGBUILD 92942 2013-06-19 21:09:47Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell pkgver=0.14.1 -pkgrel=3 +pkgrel=4 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('libgee06' 'libwebkit3' 'libgexiv2' 'libraw' 'rest' +depends=('libgee06' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' 'gst-plugins-base' 'libgphoto2') makedepends=('intltool' 'vala>=0.17.2' 'libunique3') install=shotwell.install source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz" - "no-libexec.patch") + "no-libexec.patch" + "libraw-0.15.2.patch") md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1' - 'b4124e022c98b4382530e6fbcef965e2') + 'b4124e022c98b4382530e6fbcef965e2' + '3ad21364f82229122f48452f5c74dfde') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/no-libexec.patch + patch -Rp1 <$srcdir/libraw-0.15.2.patch +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --disable-schemas-compile \ --disable-desktop-update \ diff --git a/community/shotwell/libraw-0.15.2.patch b/community/shotwell/libraw-0.15.2.patch new file mode 100644 index 000000000..248c5f236 --- /dev/null +++ b/community/shotwell/libraw-0.15.2.patch @@ -0,0 +1,33 @@ +diff -wbBur shotwell-0.14.1/src/photos/GRaw.vala shotwell-0.14.1/src/photos/GRaw.vala +--- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/src/photos/GRaw.vala 2013-06-17 16:26:12.247179310 +0400 ++++ shotwell-0.14.1/src/photos/GRaw.vala 2013-04-03 04:54:23.000000000 +0400 +@@ -168,7 +168,7 @@ + } + + public void document_mode_processing() throws Exception { +- throw_exception("document_mode_processing", 0); ++ throw_exception("document_mode_processing", proc.document_mode_processing()); + } + + public unowned LibRaw.ImageOther get_image_other() { +@@ -244,7 +244,7 @@ + // threshold + output_params->half_size = half_size; + // four_color_rgb +-// output_params->document_mode = GRaw.DocMode.STANDARD; ++ output_params->document_mode = GRaw.DocMode.STANDARD; + output_params->highlight = GRaw.HighlightMode.CLIP; + output_params->use_auto_wb = true; + output_params->use_camera_wb = true; +diff -wbBur shotwell-0.14.1/vapi/libraw.vapi shotwell-0.14.1/vapi/libraw.vapi +--- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/vapi/libraw.vapi 2013-06-17 16:25:23.623846536 +0400 ++++ shotwell-0.14.1/vapi/libraw.vapi 2013-04-03 04:54:23.000000000 +0400 +@@ -184,6 +184,8 @@ + public Processor(Options flags = Options.NONE); + + public Result adjust_sizes_info_only(); ++ [CCode (cname="libraw_dcraw_document_mode_processing")] ++ public Result document_mode_processing(); + public unowned ImageOther get_image_other() { return other; } + public unowned ImageParams get_image_params() { return idata; } + public Progress get_progress_flags() { return progress_flags; } diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD index 0434d84a8..7be5dfc66 100644 --- a/community/signon-ui/PKGBUILD +++ b/community/signon-ui/PKGBUILD @@ -1,19 +1,16 @@ -# $Id: PKGBUILD 87395 2013-03-30 17:58:57Z bgyorgy $ +# $Id: PKGBUILD 92692 2013-06-12 05:09:15Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=signon-ui -pkgver=0.14 -_pkgver=0.14+bzr85 +pkgver=0.15 pkgrel=1 pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/online-accounts-signon-ui" license=('GPL') depends=('libaccounts-qt' 'qtwebkit' 'signon' 'libnotify') -source=(https://launchpad.net/online-accounts-signon-ui/13.04/$_pkgver/+download/$pkgname-$_pkgver.tar.bz2 - Makefile) -md5sums=('5857a1b9ed957a5de72863c3868049da' - 'c73ecd27c76a9060862512b7678ae4f1') +source=(https://launchpad.net/online-accounts-signon-ui/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2) +md5sums=('67ac8ce4cc85b69ec6ff67ae892fda90') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,9 +19,6 @@ build() { echo 'INSTALLS =' >>tests/unit/tst_inactivity_timer.pro echo 'INSTALLS =' >>tests/unit/tst_signon_ui.pro - # Fix build - cp "$srcdir/Makefile" po/Makefile - qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index 05f6d3c93..b230d6f62 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90876 2013-05-15 06:33:09Z bgyorgy $ +# $Id: PKGBUILD 92690 2013-06-12 05:04:06Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=signon pkgname=('signon' 'signon-doc') -pkgver=8.51 +pkgver=8.52 pkgrel=1 pkgdesc="Framework to provide credential storage and authentication service" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=(etc/signond.conf) install=$pkgname.install source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 use_keyring.patch) -sha1sums=('5d62d9f2923381baf5cffbd112adf3ae935e6c65' +sha1sums=('cebedffb219ee1d28d9dde0cafb8f978acf34d95' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') build() { diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index a889fa914..4b7bdf2ca 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 92065 2013-05-31 02:33:12Z seblu $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# $Id: PKGBUILD 92897 2013-06-18 09:22:57Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel pkgver=4.56 -pkgrel=2 +pkgrel=3 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') url="http://www.stunnel.org" @@ -32,7 +33,8 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --enable-ipv6 \ - --disable-libwrap + --disable-libwrap \ + --disable-fips make } diff --git a/community/sunpinyin/PKGBUILD b/community/sunpinyin/PKGBUILD index a6adc1a1f..3f20cbf21 100644 --- a/community/sunpinyin/PKGBUILD +++ b/community/sunpinyin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81888 2013-01-03 05:18:11Z fyan $ +# $Id: PKGBUILD 92609 2013-06-10 02:29:07Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > pkgname=sunpinyin -pkgver=2.0.3.20130103 -_commit=baf4da89ac04c3eb6ea3b8fb1a10f13bf23f3d87 +pkgver=2.0.3.20130307 +_commit=64e26d9ed1f617e59ff37c2efc0be97727c799a1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Statistical Language Model based pinyin IME by Sun" @@ -13,29 +13,11 @@ url="http://sunpinyin.googlecode.com" depends=('sqlite' 'make' 'gcc-libs') optdepends=('sunpinyin-data: Statistical language model data from open-gram project for sunpinyin') makedepends=('git' 'scons' 'intltool') - -__gitroot=git://github.com/sunpinyin/sunpinyin.git -__gitname=$pkgname +source=("git://github.com/sunpinyin/sunpinyin.git#commit=$_commit") +md5sums=("SKIP") 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 $__gitroot - 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" - git checkout "$_commit" - + cd "$srcdir/$pkgname" sed -i -e "1s|python|python2|" python/*.py python/importer/*.py scons \ @@ -43,7 +25,7 @@ build() { } package() { - cd "$srcdir/$__gitname-build" + cd "$srcdir/$pkgname" scons \ --prefix=/usr \ diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD index 4607ece1c..1bc84789e 100644 --- a/community/surf/PKGBUILD +++ b/community/surf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84289 2013-02-15 14:50:43Z lfleischer $ +# $Id: PKGBUILD 92388 2013-06-04 13:14:40Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Pierre Chapuis <catwell at archlinux dot us> # Contributor: Ray Kohler <ataraxia937 at gmail dot com> @@ -7,7 +7,7 @@ pkgname=surf pkgver=0.6 -pkgrel=1 +pkgrel=2 pkgdesc='A simple web browser based on WebKit/GTK+.' arch=('i686' 'x86_64' 'mips64el') url='http://surf.suckless.org/' @@ -16,13 +16,13 @@ depends=('libwebkit' 'xorg-xprop') optdepends=('dmenu: URL-bar' 'ca-certificates: SSL verification' 'xterm: default download handler' - 'wget: default download handler') + 'curl: default download handler') makedepends=('pkgconfig') install='surf.install' source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'config.h') md5sums=('aeeed723b562a30cc6a2b3ea18f6d99a' - '15c2c911658e2e6085e4c4fa7a7b01c1') + '1447600ca79c56577af3438d5f3d3d56') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/surf/config.h b/community/surf/config.h index a221c86e3..43506bd90 100644 --- a/community/surf/config.h +++ b/community/surf/config.h @@ -35,7 +35,7 @@ static Bool hidebackground = FALSE; /* DOWNLOAD(URI, referer) */ #define DOWNLOAD(d, r) { \ .v = (char *[]){ "/bin/sh", "-c", \ - "st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \ + "xterm -e /bin/sh -c \"curl -J -O --user-agent '$1'" \ " --referer '$2'" \ " -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \ " sleep 5;\"", \ diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 411267419..484a6d042 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90606 2013-05-13 10:37:47Z spupykin $ +# $Id: PKGBUILD 92523 2013-06-07 16:54:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.64.0 -pkgrel=1 +pkgrel=2 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" @@ -18,10 +18,12 @@ replaces=('synfig-core') options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz build-fix.patch - ffmpeg-0.8.patch) + ffmpeg-0.8.patch + ffmpeg-loop.patch) md5sums=('124cb4059b9f48dc5c37204660053d6f' 'b5568b06fae1a7ee465b5380b1139b83' - 'ebf41046097cfd778dee9a9854561dae') + 'ebf41046097cfd778dee9a9854561dae' + 'c6684c876c093f5e53d2c46592994e9b') build() { cd $srcdir/$pkgname-$pkgver @@ -33,6 +35,7 @@ build() { [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv patch -p1 -i $srcdir/build-fix.patch patch -Np1 -i $srcdir/ffmpeg-0.8.patch + patch -Np1 -i $srcdir/ffmpeg-loop.patch sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp make } diff --git a/community/synfig/ffmpeg-loop.patch b/community/synfig/ffmpeg-loop.patch new file mode 100644 index 000000000..ce271363b --- /dev/null +++ b/community/synfig/ffmpeg-loop.patch @@ -0,0 +1,56 @@ +--- synfig-0.63.05/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp 2013-02-27 13:51:18.638547204 -0300 ++++ synfig-0.63.05.new/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp 2013-02-27 13:51:09.905261183 -0300 +@@ -172,7 +172,7 @@ + + if( filename.c_str()[0] == '-' ) + command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an" +- " -r %f -i pipe: -loop_input" ++ " -r %f -i pipe: -loop 1" + " -metadata title=\"%s\" " + " -vcodec %s -b %ik" + " -y -- \"%s\"\n", +@@ -182,7 +182,7 @@ + filename.c_str()); + else + command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an" +- " -r %f -i pipe: -loop_input" ++ " -r %f -i pipe: -loop 1" + " -metadata title=\"%s\" " + "-vcodec %s -b %ik" + " -y -- \"%s\"\n", +@@ -227,7 +227,7 @@ + execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", + "ppm", "-an", "-r", + strprintf("%f", desc.get_frame_rate()).c_str(), +- "-i", "pipe:", "-loop_input", "-metadata", ++ "-i", "pipe:", "-loop", "1", "-metadata", + strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(), + "-vcodec", video_codec.c_str(), + "-b", strprintf("%ik", bitrate).c_str(), +@@ -237,7 +237,7 @@ + execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", + "ppm", "-an", "-r", + strprintf("%f", desc.get_frame_rate()).c_str(), +- "-i", "pipe:", "-loop_input", "-metadata", ++ "-i", "pipe:", "-loop", "1", "-metadata", + strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(), + "-vcodec", video_codec.c_str(), + "-b", strprintf("%ik", bitrate).c_str(), +@@ -249,7 +249,7 @@ + execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", + "ppm", "-an", "-r", + strprintf("%f", desc.get_frame_rate()).c_str(), +- "-i", "pipe:", "-loop_input", ++ "-i", "pipe:", "-loop", "1", + "-metadata", + strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(), + "-vcodec", video_codec.c_str(), +@@ -260,7 +260,7 @@ + execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", + "ppm", "-an", "-r", + strprintf("%f", desc.get_frame_rate()).c_str(), +- "-i", "pipe:", "-loop_input", ++ "-i", "pipe:", "-loop", "1", + "-metadata", + strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(), + "-vcodec", video_codec.c_str(), diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 85dfb62ac..f93b63f4a 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91152 2013-05-20 09:56:57Z spupykin $ +# $Id: PKGBUILD 92869 2013-06-17 10:57:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.1.5 -pkgrel=3 +pkgver=10.1.6 +pkgrel=2 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -16,9 +16,17 @@ options=(zipman) backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz - sysstat.service) -md5sums=('cdf66d6acd5c8cab709e07980b77ea6b' - '12ba479c606620193e8b7c6e982d5088') + sysstat.service + lib64-fix.patch) +md5sums=('909135c84e36d780d501274e7450f924' + '12ba479c606620193e8b7c6e982d5088' + '7ffa6bf990609d85367070f71b40a34b') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/lib64-fix.patch + autoreconf +} build() { cd $srcdir/$pkgname-$pkgver @@ -27,7 +35,7 @@ build() { --mandir=/usr/share/man \ --enable-install-isag \ --disable-man-group - make + make -j1 } package() { diff --git a/community/sysstat/lib64-fix.patch b/community/sysstat/lib64-fix.patch new file mode 100644 index 000000000..6e4ca7c12 --- /dev/null +++ b/community/sysstat/lib64-fix.patch @@ -0,0 +1,17 @@ +diff -wbBur sysstat-10.1.6.q/configure.in sysstat-10.1.6/configure.in +--- sysstat-10.1.6.q/configure.in 2013-04-21 18:20:32.000000000 +0400 ++++ sysstat-10.1.6/configure.in 2013-06-17 14:45:41.733915298 +0400 +@@ -207,13 +207,6 @@ + fi + + SADC_DIR=$AuxPrefix/lib +-if test -d $AuxPrefix/lib64; then +- # Look for lm (long mode) flag to know if CPU is 64 bit +- grep " lm " /proc/cpuinfo >/dev/null 2>&1 +- if test $? = 0; then +- SADC_DIR=$AuxPrefix/lib64 +- fi +-fi + + AC_MSG_CHECKING(sadc directory) + AC_ARG_VAR([sa_lib_dir],[sadc directory]) diff --git a/community/tcsh/PKGBUILD b/community/tcsh/PKGBUILD index 94379970c..74754de30 100644 --- a/community/tcsh/PKGBUILD +++ b/community/tcsh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66330 2012-02-23 15:37:07Z lfleischer $ +# $Id: PKGBUILD 92256 2013-06-03 11:15:29Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tcsh pkgver=6.18.01 -pkgrel=1 +pkgrel=2 pkgdesc='Enhanced version of the Berkeley C shell.' arch=('i686' 'x86_64' 'mips64el') url='http://www.tcsh.org/Welcome' @@ -24,19 +24,20 @@ md5sums=('6eed09dbd4223ab5b6955378450d228a' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --bindir=/bin + ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -dm0755 "${pkgdir}/bin/" - make DESTDIR="${pkgdir}" mandir=/usr/share/man install install.man install -Dm0644 "${srcdir}/csh.cshrc" "${pkgdir}/etc/csh.cshrc" install -Dm0644 "${srcdir}/csh.login" "${pkgdir}/etc/csh.login" install -Dm0644 Copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - ln -s tcsh "${pkgdir}/bin/csh" + ln -s tcsh "${pkgdir}/usr/bin/csh" + ln -s tcsh.1 "${pkgdir}/usr/share/man/man1/csh.1" } + +# vim:set ts=2 sw=2 et: diff --git a/community/tcsh/tcsh.install b/community/tcsh/tcsh.install index 023ddd115..00911470f 100644 --- a/community/tcsh/tcsh.install +++ b/community/tcsh/tcsh.install @@ -1,25 +1,23 @@ post_install() { - if [ ! "`grep /bin/tcsh etc/shells`" ]; then - echo "updating /etc/shells... done." - sed -i "s|/bin/bash|/bin/bash\n/bin/tcsh\n/bin/csh|" etc/shells - else - sed -i "s|/usr/bin/tcsh|/bin/tcsh|" etc/shells - sed -i "s|/usr/bin/csh|/bin/csh|" etc/shells - - echo "" - echo ">> WARNING: /usr/bin/tcsh has moved to /bin/tcsh," - echo ">> WARNING: /usr/bin/csh has moved to /bin/csh," - echo ">> please update your user accounts as needed" - echo "" + if ! grep -q /bin/tcsh etc/shells; then + echo /bin/tcsh >> etc/shells + echo /bin/csh >> etc/shells + echo 'Added to /etc/shells.' fi } post_upgrade() { - post_install $1 + if grep -q /usr/bin/tcsh etc/shells; then + sed -i 's|/usr/bin/tcsh|/bin/tcsh|' etc/shells + sed -i 's|/usr/bin/csh|/bin/csh|' etc/shells + echo 'Fixed path in /etc/shells.' + fi } pre_remove() { - echo "updating /etc/shells... done." - sed -i "\|/bin/tcsh|d" etc/shells - sed -i "\|/bin/csh|d" etc/shells + sed -i '\|/bin/tcsh|d' etc/shells + sed -i '\|/bin/csh|d' etc/shells + echo 'Removed from /etc/shells.' } + +# vim:set ts=2 sw=2 et: diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index f96428d06..6d88c59c0 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87037 2013-03-26 11:01:18Z spupykin $ +# $Id: PKGBUILD 92472 2013-06-06 09:43:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,17 +6,17 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=35.0.0 +pkgver=36.0.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') -url="http://tea-editor.sourceforge.net/" +url="http://semiletov.org/tea/" license=('GPL') depends=('qt4' 'aspell' 'hunspell') install=tea.install -source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 +source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('aabbbac2b5251e7c3eeb36d8f188d08a' +md5sums=('50a6eeae9cf940afdb4cf8e815453886' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index 40a71d07f..bb2f20f64 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 91910 2013-05-29 10:07:22Z spupykin $ +# $Id: PKGBUILD 92639 2013-06-10 09:54:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> pkgname=tomoyo-tools _basever=2.5.0 -_timestamp=20130214 +_timestamp=20130406 _file=53357 pkgver=${_basever}.${_timestamp} -pkgrel=3 +pkgrel=1 pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' 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>=3.2') -conflicts=('ccs-tools') install=tomoyo-tools.install source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('ffff6b531ed9ac32b01722a9cd749a2f') +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}" diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index 53b161791..95cad22cb 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 90563 2013-05-13 08:20:47Z lfleischer $ +# $Id: PKGBUILD 92386 2013-06-04 12:52:29Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> +# Contributor: Sid Karunaratne pkgname=tor pkgver=0.2.3.25 -pkgrel=2 +pkgrel=3 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') url='http://www.torproject.org/' license=('BSD') -depends=('openssl' 'libevent' 'tsocks' 'bash') +depends=('openssl' 'libevent' 'torsocks' 'bash') makedepends=('ca-certificates') backup=('etc/tor/torrc' 'etc/tor/torrc-dist' @@ -19,9 +20,9 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'torrc' 'tor.service') md5sums=('a1c364189a9a66ed9daa8e6436489daf' - 'a4c12795ffb8f68550a5dab4a9eb0654' - '56c75d4e8a66f34167d31e38c43793dd' - 'b8989a7b3ab39d697624b243f7fc255d') + 'SKIP' + 'c1dd4004c63edaeaa829e01be5413cfc' + 'a396657e6f6df21d319ad586500c04b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/tor/tor.install b/community/tor/tor.install index 2c448d28e..beceb6070 100644 --- a/community/tor/tor.install +++ b/community/tor/tor.install @@ -1,9 +1,4 @@ post_install() { - echo "-> Tor has been preconfigured to run as a client only." - echo "-> Tor is experimental software. Do not rely on it for strong anonymity." - echo '-> ' - echo '-> You can set custom file descriptor ulimits for Tor in' - echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.' groupadd -g 43 tor &>/dev/null useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null chown tor:tor var/lib/tor &> /dev/null @@ -11,8 +6,6 @@ post_install() { } post_upgrade() { - echo '-> You can now set custom file descriptor ulimits for Tor in' - echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.' getent group tor &>/dev/null || groupadd -g 43 tor &>/dev/null getent passwd tor &>/dev/null || useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null chown tor:tor var/lib/tor &> /dev/null diff --git a/community/tor/tor.service b/community/tor/tor.service index 33bbc0776..264a95624 100644 --- a/community/tor/tor.service +++ b/community/tor/tor.service @@ -3,10 +3,9 @@ Description=Anonymizing Overlay Network After=network.target [Service] -Type=forking -GuessMainPID=yes -ExecStart=/usr/bin/tor -f /etc/tor/torrc --quiet -ExecReload=/bin/kill -HUP $MAINPID +User=tor +Type=simple +ExecStart=/usr/bin/tor -f /etc/tor/torrc KillSignal=SIGINT LimitNOFILE=8192 diff --git a/community/tor/torrc b/community/tor/torrc index 3505653ab..19e05970a 100644 --- a/community/tor/torrc +++ b/community/tor/torrc @@ -1,82 +1,72 @@ -## CONFIGURED FOR ARCHLINUX - -## Last updated 22 July 2005 for Tor 0.1.0.13. -## (May or may not work for older or newer versions of Tor.) -# -## See the man page, or http://tor.eff.org/tor-manual.html, for more -## options you can use in this file. -# -# On Unix, Tor will look for this file in someplace like "~/.tor/torrc" or -# "/etc/torrc" -# -# On Windows, Tor will look for the configuration file in someplace like -# "Application Data\tor\torrc" or "Application Data\<username>\tor\torrc" -# -# With the default Mac OS X installer, Tor will look in ~/.tor/torrc or -# /Library/Tor/torrc - +## Configuration file for a typical Tor user +## Last updated 22 April 2012 for Tor 0.2.3.14-alpha. +## (may or may not work for much older or much newer versions of Tor.) +## +## Lines that begin with "## " try to explain what's going on. Lines +## that begin with just "#" are disabled commands: you can enable them +## by removing the "#" symbol. +## +## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, +## for more options you can use in this file. +## +## Tor will look for this file in various places based on your platform: +## https://www.torproject.org/docs/faq#torrc -## Replace this with "SocksPort 0" if you plan to run Tor only as a -## server, and not make any local application connections yourself. -SocksPort 9050 # what port to open for local application connections -SocksBindAddress 127.0.0.1 # accept connections only from localhost -#SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port too +## Tor opens a socks proxy on port 9050 by default -- even if you don't +## configure one below. Set "SocksPort 0" if you plan to run Tor only +## as a relay, and not make any local application connections yourself. +#SocksPort 9050 # Default: Bind to localhost:9050 for local connections. +#SocksPort 192.168.0.1:9100 # Bind to this adddress:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. ## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests from SocksBindAddress. -#SocksPolicy accept 192.168.0.1/16 +## all (and only) requests that reach a SocksPort. Untrusted users who +## can access your SocksPort may be able to learn about the connections +## you make. +#SocksPolicy accept 192.168.0.0/16 #SocksPolicy reject * -## Allow no-name routers (ones that the dirserver operators don't -## know anything about) in only these positions in your circuits. -## Other choices (not advised) are entry,exit,introduction. -AllowUnverifiedNodes middle,rendezvous - ## Logs go to stdout at level "notice" unless redirected by something -## else, like one of the below lines. You can have as many log lines as +## else, like one of the below lines. You can have as many Log lines as ## you want. ## +## We advise using "notice" in most cases, since anything more verbose +## may provide sensitive information to an attacker who obtains the logs. +## ## Send all messages of level 'notice' or higher to /var/log/tor/notices.log #Log notice file /var/log/tor/notices.log -## Send only debug and info messages to /var/log/tor/debug.log -#Log debug-info file /var/log/tor/debug.log -## Send ONLY debug messages to /var/log/tor/debug.log -#Log debug-debug file /var/log/tor/debug.log -## To use the system log instead of Tor's logfiles, uncomment these lines: +## Send every possible message to /var/log/tor/debug.log +#Log debug file /var/log/tor/debug.log +## Use the system log instead of Tor's logfiles Log notice syslog ## To send all messages to stderr: #Log debug stderr ## Uncomment this to start the process in the background... or use -## --runasdaemon 1 on the command line. -RunAsDaemon 1 -User tor -Group tor - -## Tor only trusts directories signed with one of these keys, and -## uses the given addresses to connect to the trusted directory -## servers. If no DirServer lines are specified, Tor uses the built-in -## defaults (moria1, moria2, tor26), so you can leave this alone unless -## you need to change it. -#DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441 -#DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF -#DirServer 86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D +## --runasdaemon 1 on the command line. This is ignored on Windows; +## see the FAQ entry if you want Tor to run as an NT service. +#RunAsDaemon 1 ## The directory for keeping all the keys/etc. By default, we store ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. DataDirectory /var/lib/tor -## The port on which Tor will listen for local connections from Tor controller -## applications, as documented in control-spec.txt. NB: this feature is -## currently experimental. +## The port on which Tor will listen for local connections from Tor +## controller applications, as documented in control-spec.txt. #ControlPort 9051 +## If you enable the controlport, be sure to enable one of these +## authentication methods, to prevent attackers from accessing it. +#HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C +#CookieAuthentication 1 ############### This section is just for location-hidden services ### -## Look in .../hidden_service/hostname for the address to tell people. -## HiddenServicePort x y:z says to redirect a port x request from the -## client to y:z. +## Once you have configured a hidden service, you can look at the +## contents of the file ".../hidden_service/hostname" for the address +## to tell people. +## +## HiddenServicePort x y:z says to redirect requests on port x to the +## address y:z. #HiddenServiceDir /var/lib/tor/hidden_service/ #HiddenServicePort 80 127.0.0.1:80 @@ -84,60 +74,116 @@ DataDirectory /var/lib/tor #HiddenServiceDir /var/lib/tor/other_hidden_service/ #HiddenServicePort 80 127.0.0.1:80 #HiddenServicePort 22 127.0.0.1:22 -#HiddenServiceNodes moria1,moria2 -#HiddenServiceExcludeNodes bad,otherbad - -################ This section is just for servers ##################### -## NOTE: If you enable these, you should consider mailing your identity -## key fingerprint to the tor-ops, so we can add you to the list of -## servers that clients will trust. See -## http://tor.eff.org/doc/tor-doc.html#server for details. +################ This section is just for relays ##################### +# +## See https://www.torproject.org/docs/tor-doc-relay for details. -## Required: A unique handle for this server -#Nickname ididnteditheconfig +## Required: what port to advertise for incoming Tor connections. +#ORPort 9001 +## If you want to listen on a port other than the one advertised in +## ORPort (e.g. to advertise 443 but bind to 9090), you can do it as +## follows. You'll need to do ipchains or other port forwarding +## yourself to make this work. +#ORPort 443 NoListen +#ORPort 127.0.0.1:9090 NoAdvertise -## The IP or fqdn for this server. Leave commented out and Tor will guess. +## The IP address or full DNS name for incoming connections to your +## relay. Leave commented out and Tor will guess. #Address noname.example.com -## Contact info that will be published in the directory, so we can -## contact you if you need to upgrade or if something goes wrong. -## This is optional but recommended. +## If you have multiple network interfaces, you can specify one for +## outgoing traffic to use. +# OutboundBindAddress 10.0.0.5 + +## A handle for your relay, so people don't have to refer to it by key. +#Nickname ididnteditheconfig + +## Define these to limit how much relayed traffic you will allow. Your +## own traffic is still unthrottled. Note that RelayBandwidthRate must +## be at least 20 KB. +## Note that units for these config options are bytes per second, not bits +## per second, and that prefixes are binary prefixes, i.e. 2^10, 2^20, etc. +#RelayBandwidthRate 100 KB # Throttle traffic to 100KB/s (800Kbps) +#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps) + +## Use these to restrict the maximum traffic per day, week, or month. +## Note that this threshold applies separately to sent and received bytes, +## not to their sum: setting "4 GB" may allow up to 8 GB total before +## hibernating. +## +## Set a maximum of 4 gigabytes each way per period. +#AccountingMax 4 GB +## Each period starts daily at midnight (AccountingMax is per day) +#AccountingStart day 00:00 +## Each period starts on the 3rd of the month at 15:00 (AccountingMax +## is per month) +#AccountingStart month 3 15:00 + +## Contact info to be published in the directory, so we can contact you +## if your relay is misconfigured or something else goes wrong. Google +## indexes this, so spammers might also collect it. #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: -#ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com> - -## Required: what port to advertise for tor connections -#ORPort 9001 -## If you want to listen on a port other than the one advertised -## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment -## the line below. You'll need to do ipchains or other port forwarding -## yourself to make this work. -#ORBindAddress 0.0.0.0:9090 +#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> -## Uncomment this to mirror the directory for others (please do) +## Uncomment this to mirror directory information for others. Please do +## if you have enough bandwidth. #DirPort 9030 # what port to advertise for directory connections -## If you want to listen on a port other than the one advertised -## in DirPort (e.g. to advertise 80 but bind 9091), uncomment the line -## below. You'll need to do ipchains or other port forwarding yourself -## to make this work. -#DirBindAddress 0.0.0.0:9091 +## If you want to listen on a port other than the one advertised in +## DirPort (e.g. to advertise 80 but bind to 9091), you can do it as +## follows. below too. You'll need to do ipchains or other port +## forwarding yourself to make this work. +#DirPort 80 NoListen +#DirPort 127.0.0.1:9091 NoAdvertise +## Uncomment to return an arbitrary blob of html on your DirPort. Now you +## can explain what Tor is if anybody wonders why your IP address is +## contacting them. See contrib/tor-exit-notice.html in Tor's source +## distribution for a sample. +#DirPortFrontPage /etc/tor/tor-exit-notice.html + +## Uncomment this if you run more than one Tor relay, and add the identity +## key fingerprint of each Tor relay you control, even if they're on +## different networks. You declare it here so Tor clients can avoid +## using more than one of your relays in a single circuit. See +## https://www.torproject.org/docs/faq#MultipleRelays +## However, you should never include a bridge's fingerprint here, as it would +## break its concealability and potentionally reveal its IP/TCP address. +#MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first -## to last, and the first match wins. If you want to *replace* +## to last, and the first match wins. If you want to _replace_ ## the default exit policy, end this with either a reject *:* or an -## accept *:*. Otherwise, you're *augmenting* (prepending to) the +## accept *:*. Otherwise, you're _augmenting_ (prepending to) the ## default exit policy. Leave commented to just use the default, which is -## available in the man page or at http://tor.eff.org/documentation.html +## described in the man page or at +## https://www.torproject.org/documentation.html ## -## Look at http://tor.eff.org/faq-abuse.html#TypicalAbuses +## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses ## for issues you might encounter if you use the default exit policy. ## ## If certain IPs and ports are blocked externally, e.g. by your firewall, ## you should update your exit policy to reflect this -- otherwise Tor ## users will be told that those destinations are down. ## +## For security, by default Tor rejects connections to private (local) +## networks, including to your public IP address. See the man page entry +## for ExitPolicyRejectPrivate if you want to allow "exit enclaving". +## #ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more #ExitPolicy accept *:119 # accept nntp as well as default exit policy -#ExitPolicy reject *:* # middleman only -- no exits allowed +#ExitPolicy reject *:* # no exits allowed + +## Bridge relays (or "bridges") are Tor relays that aren't listed in the +## main directory. Since there is no complete public list of them, even an +## ISP that filters connections to all the known Tor relays probably +## won't be able to block all the bridges. Also, websites won't treat you +## differently because they won't know you're running Tor. If you can +## be a real relay, please do; but if not, be a bridge! +#BridgeRelay 1 +## By default, Tor will advertise your bridge to users through various +## mechanisms like https://bridges.torproject.org/. If you want to run +## a private bridge, for example because you'll give out your bridge +## address manually to your friends, uncomment this line: +#PublishServerDescriptor 0 diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 8ed04aa6b..129d5bbb1 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91865 2013-05-28 17:38:11Z spupykin $ +# $Id: PKGBUILD 92284 2013-06-03 13:56:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.10 -pkgrel=4 +pkgrel=5 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" @@ -26,7 +26,7 @@ build() { patch -p1 <$srcdir/arch-fixes.patch - ./configure --with-showlistmodes \ + ac_cv_ip6=yes ./configure --with-showlistmodes \ --enable-hub --enable-prefixaq --with-listen=5 \ --with-dpath=/etc/unrealircd \ --with-spath=/usr/bin \ @@ -36,7 +36,7 @@ build() { --enable-dynamic-linking \ --enable-ziplinks \ --enable-ssl \ - --enable-ipv6 \ + --enable-inet6 \ --enable-libcurl=/usr \ --with-system-cares diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index b03e92a2d..475d01451 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91789 2013-05-27 20:00:36Z tpowa $ +# $Id: PKGBUILD 92785 2013-06-15 06:20:46Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.12 -pkgrel=6 +pkgrel=8 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 8706a7205..6308e2fa5 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,4 +1,4 @@ -VERSION='3.9.4-1-ARCH' +VERSION='3.9.6-1-ARCH' post_install() { cat << EOF diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index c75dd089c..70f6b8004 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,4 +1,4 @@ -VERSION='3.9.4-1-ARCH' +VERSION='3.9.6-1-ARCH' post_install() { cat << EOF diff --git a/community/vlan/PKGBUILD b/community/vlan/PKGBUILD index 9c8e97647..beca1440c 100644 --- a/community/vlan/PKGBUILD +++ b/community/vlan/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90479 2013-05-12 21:50:43Z seblu $ +# $Id: PKGBUILD 92650 2013-06-10 15:16:14Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=vlan pkgver=1.9 -pkgrel=2 +pkgrel=3 pkgdesc='Virtual LAN configuration utility' arch=('i686' 'x86_64' 'mips64el') url='http://www.candelatech.com/~greear/vlan.html' @@ -14,7 +14,12 @@ md5sums=('5f0c6060b33956fb16e11a15467dd394') build() { cd $pkgname - make clean all + # don't call clean and all on the same line with -jn (with n > 0) + # there is a race condition, both target are launched at the same time + # and as upstream provide target nothing is built. + # don't use !makeflags in PKGBUILD options to not penalize building + make clean + make all } package() { diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index 7bfd83c35..4dbda497b 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90107 2013-05-06 19:40:06Z foutrelis $ +# $Id: PKGBUILD 92508 2013-06-07 12:43:24Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston -pkgver=1.1.0 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64' 'mips64el') url='http://wayland.freedesktop.org' @@ -12,7 +12,7 @@ license=('MIT') options=(!libtool) depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('0929afa86d795e0e970936623d86bdd950d48e8d') +sha1sums=('5239afe177dadbded3c0018b55dd1045be5f84b2') build() { cd $pkgname-$pkgver diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD index 0f7797cd2..e81d55fad 100644 --- a/community/wvstreams/PKGBUILD +++ b/community/wvstreams/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75083 2012-08-13 16:55:40Z bluewind $ +# $Id: PKGBUILD 92257 2013-06-03 11:15:30Z allan $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=wvstreams pkgver=4.6.1 -pkgrel=5 +pkgrel=6 pkgdesc="A network programming library written in C++" arch=('i686' 'x86_64' 'mips64el') url="http://alumnit.ca/wiki/?page=WvStreams" @@ -19,14 +19,19 @@ md5sums=('2760dac31a43d452a19a3147bfde571c' 'df423c68134a09439b3961c34635e0b4') options=('!makeflags') -build() { - cd ${srcdir}/${pkgname}-${pkgver} +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" patch -p1 -i "$srcdir/openssl-buildfix.patch" +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbin=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --without-dbus \ @@ -38,12 +43,12 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install # FS#15974 # --without-dbus still installs the pkg-config file - rm ${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc + rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc" # --without-qt still installs the pkg-config file - rm ${pkgdir}/usr/lib/pkgconfig/libwvqt.pc + rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc" } diff --git a/community/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD index 70a0796f4..2d71c8a37 100644 --- a/community/xbindkeys/PKGBUILD +++ b/community/xbindkeys/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82045 2013-01-06 10:49:31Z bluewind $ +# $Id: PKGBUILD 92556 2013-06-08 11:18:52Z bpiotrowski $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Thayer Williams <thayer@archlinux.org> pkgname=xbindkeys pkgver=1.8.5 -pkgrel=3 +pkgrel=4 pkgdesc="Launch shell commands with your keyboard or your mouse under X" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/xbindkeys/xbindkeys.html" diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 6616f3643..06bdca011 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90148 2013-05-07 12:45:12Z spupykin $ +# $Id: PKGBUILD 92502 2013-06-07 09:29:03Z tomegun $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=12.2 -pkgrel=1 +pkgrel=4 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -18,13 +18,11 @@ depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' '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' 'glu' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' 'tinyxml' 'taglib') makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' - 'udisks' 'upower' 'bluez' 'mesa' 'doxygen' 'swig' 'java-environment') + 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' - 'vdpau-video: accelerated video playback for nvidia cards' - 'xvba-video: accelerated video playback for amd cards' 'pulseaudio: pulseaudio support' 'lirc: remote controller support' 'udisks: automount external drives' diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD index 45e32d541..71bd4588f 100644 --- a/community/xdebug/PKGBUILD +++ b/community/xdebug/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 88795 2013-04-22 10:32:02Z spupykin $ +# $Id: PKGBUILD 92281 2013-06-03 13:37:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: sracker <smb.sac@gmail.com> pkgname=xdebug -pkgver=2.2.2 -pkgrel=2 +pkgver=2.2.3 +pkgrel=1 pkgdesc="PHP debugging extension" arch=('i686' 'x86_64' 'mips64el') url="http://www.xdebug.org" @@ -17,7 +17,7 @@ backup=('etc/php/conf.d/xdebug.ini') source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz xdebug-5.2.ini xdebug.ini) -md5sums=('5687bca6270b9668721090d780c7c966' +md5sums=('e49cec9861b45dc0b36eae33bf8a14fa' '6b7fdbbe0bf381bda40e77e29981f439' '68de800943369d4c76bdf7eb35c8463b') diff --git a/community/xdotool/PKGBUILD b/community/xdotool/PKGBUILD index be88a817a..62ee633e5 100644 --- a/community/xdotool/PKGBUILD +++ b/community/xdotool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83490 2013-02-02 09:44:29Z foutrelis $ +# $Id: PKGBUILD 92913 2013-06-18 18:33:07Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Rttommy <rttommy@gmail.com> pkgname=xdotool pkgver=2.20110530.1 -pkgrel=2 +pkgrel=3 pkgdesc="Command-line X11 automation tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.semicomplete.com/projects/xdotool/" @@ -24,6 +24,9 @@ package() { make PREFIX="$pkgdir/usr" INSTALLMAN="$pkgdir/usr/share/man" install + # Remove execute bit from header file + chmod -x "$pkgdir/usr/include/xdo.h" + # License install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/xdotool/COPYRIGHT" } diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 7a67d6d18..de363c2ac 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90741 2013-05-13 14:42:50Z spupykin $ +# $Id: PKGBUILD 92871 2013-06-17 10:57:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=13 +pkgrel=18 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index fc660793d..35164bee3 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89949 2013-05-06 07:32:36Z jelle $ +# $Id: PKGBUILD 92482 2013-06-06 20:06:10Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar -pkgver=0.17 +pkgver=0.18 pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" @@ -11,7 +11,7 @@ license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' - 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3') + 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-compat') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) @@ -28,4 +28,4 @@ package() { install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } -md5sums=('d50287cd9f2284737c89e36de0eca107') +md5sums=('4d0502fa75cd51ff23e41e1711f25adb') diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD index 1aa1927d9..46232f58b 100644 --- a/community/xonotic/PKGBUILD +++ b/community/xonotic/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Alexander Suhoverhov <cy at ngs dot ru> pkgname=xonotic -pkgver=0.6.0 -pkgrel=2 +pkgver=0.7.0 +pkgrel=1 pkgdesc="A free, fast-paced crossplatform first-person shooter" arch=('i686' 'x86_64') url="http://xonotic.org" @@ -12,7 +12,7 @@ makedepends=('unzip' 'mesa') source=("http://dl.xonotic.org/xonotic-${pkgver}-source.zip" "xonotic-glx.desktop" "xonotic-sdl.desktop") -md5sums=('47e8468054bf1346c57f3f8fdc97575e' +md5sums=('1cc50a79ac6abf27da916bfb5e066043' '914c7b9163e92b35f0ab57fdb1653ac5' 'da7d812ff231c9332cd694b39757adda') @@ -31,6 +31,7 @@ build() { make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sv-release cd $srcdir/Xonotic/source/d0_blind_id + sh autogen.sh ./configure --prefix=/usr --disable-rijndael make } diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD index 202946c61..7de1ebc5c 100644 --- a/community/xwax/PKGBUILD +++ b/community/xwax/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80901 2012-12-06 09:48:40Z lfleischer $ +# $Id: PKGBUILD 92791 2013-06-15 08:44:39Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: sputnick <gilles DOT quenot AT gmail DOT com> pkgname=xwax -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc='Open-source vinyl emulation software for Linux.' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('cdparanoia: for CD import' 'mpg123: for MP3 import' 'ffmpeg: for video fallback import') source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('10c3b923eab17377705b1dea89edf6fb') +md5sums=('01afde1f1222fca38eab736e0b3df116') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/yacpi/ChangeLog b/community/yacpi/ChangeLog deleted file mode 100644 index 811f87d4f..000000000 --- a/community/yacpi/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/yacpi/PKGBUILD b/community/yacpi/PKGBUILD deleted file mode 100644 index bec79ec8e..000000000 --- a/community/yacpi/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 65275 2012-02-20 12:45:31Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sebastian A. Liem <sebastian@liem.se> - -pkgname=yacpi -pkgver=3.0.1 -pkgrel=3.1 -pkgdesc="ncurses-based acpi monitor." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.ngolde.de/yacpi.html" -license=('GPL') -depends=(ncurses libacpi) -source=(http://www.ngolde.de/download/$pkgname-$pkgver.tar.gz) -md5sums=('1b03394ee3b916f686cdc3e2c05ddb7a') - -build() { - cd $srcdir/$pkgname-$pkgver - make - install -d $pkgdir/usr/bin - install -D -m 755 $pkgname $pkgdir/usr/bin/ -} diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index c2aaa3fff..3da8ea28b 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81045 2012-12-11 02:47:01Z kkeen $ +# $Id: PKGBUILD 92652 2013-06-10 15:20:40Z bpiotrowski $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=zeromq -pkgver=3.2.2 -pkgrel=2 +pkgver=3.2.3 +pkgrel=1 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64' 'mips64el') url="http://www.zeromq.org" @@ -11,8 +11,8 @@ depends=('gcc-libs' 'util-linux') makedepends=('python2') source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz https://raw.github.com/zeromq/cppzmq/master/zmq.hpp) -md5sums=('df68431d9300da84a1a5f9a2784e33de' - '80b674e98fcc4b4f23ef8b08ce4b051d') +md5sums=('1abf8246363249baf5931a065ee38203' + '37805e6859ce1900041c9a2613936ec7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index ba6f40720..0b68f0d2a 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176120 2013-01-27 15:38:26Z dreisner $ +# $Id: PKGBUILD 188195 2013-06-12 15:53:07Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl -pkgver=2.2.51 -pkgrel=3 +pkgver=2.2.52 +pkgrel=1 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/acl" @@ -14,8 +14,8 @@ provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' - '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') +sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23' + 'SKIP') build() { cd "$pkgname-$pkgver" diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD index 65b5d7545..7d0615c97 100644 --- a/core/attr/PKGBUILD +++ b/core/attr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158576 2012-05-05 00:02:37Z allan $ +# $Id: PKGBUILD 188196 2013-06-12 15:53:08Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr -pkgver=2.4.46 -pkgrel=2 +pkgver=2.4.47 +pkgrel=1 pkgdesc="Extended attribute support library for ACL support" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/attr" @@ -15,8 +15,8 @@ provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' - 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') +sha256sums=('25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859' + 'SKIP') build() { cd "$pkgname-$pkgver" @@ -30,7 +30,7 @@ package() { make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev # tidy up - rm -f "$pkgdir"/usrlib/libattr.a + rm -f "$pkgdir"/usr/lib/libattr.a chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* # remove conflicting manpages diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index f8a33ad7c..5c6e0be11 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180066 2013-03-15 22:55:31Z allan $ +# $Id: PKGBUILD 187018 2013-06-03 11:14:54Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bash _basever=4.2 _patchlevel=045 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=4 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -28,15 +28,20 @@ if [ $_patchlevel -gt 000 ]; then done fi -build() { +prepare() { cd ${srcdir}/${pkgname}-$_basever + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) done +} + +build() { + cd ${srcdir}/${pkgname}-$_basever - _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\' - -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\' + _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\' + -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\' -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') export CFLAGS="${CFLAGS} ${_bashconfig[@]}" @@ -55,10 +60,7 @@ package() { cd ${srcdir}/${pkgname}-$_basever make DESTDIR=${pkgdir} install - # put needed symlinks in /bin - install -dm755 ${pkgdir}/bin - ln -s ../usr/bin/bash ${pkgdir}/bin/bash - ln -s ../usr/bin/bash ${pkgdir}/bin/sh + ln -s bash ${pkgdir}/usr/bin/sh install -dm755 ${pkgdir}/etc/skel/ @@ -73,99 +75,99 @@ package() { } md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' - '8d37a3f97a48c1e56e1a4ded877ed944' + 'SKIP' '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' '3546099a1b2f667adc9794f52e78e35b' '472f536d7c9e8250dc4568ec4cfaf294' '1100bc1dda2cdc06ac44d7e5d17864a3' - 'a7184b76eb4a079f10174a0a8f574819' + 'SKIP' '30e7948079921d3261efcc6a40722135' - 'c4d45307f7e69fe508ce347c4cec1955' + 'SKIP' '9ea06decec43a198f3d7cf29acc602f8' - '74bddae6eeb9227a04a467d42597a34d' + 'SKIP' 'fb48f6134d7b013135929476aa0c250c' - '3e6a18226b16c773229246abd07a1f5e' + 'SKIP' 'e70e45de33426b38153b390be0dbbcd4' - 'e667dc9348ebc3e0e14bfdd87f4b6ff2' + 'SKIP' 'ce4e5c484993705b27daa151eca242c2' - '41cbd8e57589bc081a546a014ddb12f8' + 'SKIP' '88d1f96db29461767602e2546803bda7' - 'b8b781520f4c7493a2a1ac3010a44a44' + 'SKIP' '24c574bf6d6a581e300823d9c1276af6' - '354a0899a7c4b446454c52546562b55b' + 'SKIP' '4c5835f2fbab36c4292bb334977e5b6d' - 'ff4547ca7b508d52101729d61f5b77b6' + 'SKIP' '0a51602b535ef661ee707be6c8bdb373' - 'cec7c92a4d8052ea4b29216365d16566' + 'SKIP' '58deacf3d57cbd75575444ff6a3b0806' - '9ed2a08e549c3c17745f19e8413cfb31' + 'SKIP' '72d5059820015231483bb7415d09e9db' - '45b04b41a4230f469d3e47ab9952c2df' + 'SKIP' '608336ebe215984ef126e3c29d2d3409' - '623f63025d155a84977b62531e260ee2' + 'SKIP' 'ed19da878e3f630834c62b9d9dcc6fce' - 'eef2dd4a0e4505dc8f8e664b40c6cd66' + 'SKIP' '2d07daba0b8ca8f876d2aa052ff594b4' - '0cb823a44e6dc1cde7ac97ae5c8163c9' + 'SKIP' '53d246537e1fffd1aaa02ba5c056211c' - '60f983a1dded5f0b28040ff4b3f1e9b5' + 'SKIP' '304fd129a58fee2d8a34f8b4704db0aa' - '9df4bf4f46aaadc436f430187741f815' + 'SKIP' '6921a0b4228fe89b6537a5c29f027c89' - '4ef0e2a2cbfbdd53346f927000b7e112' + 'SKIP' '1195d85447f3d048d2c9bcd075fa765c' - 'b0f3a651ce29a1feee687d93177870f1' + 'SKIP' 'b09000bba08da6ac753124593850cdf7' - '204bb5054d1f8bafe2b446d4e5d0d99a' + 'SKIP' '09d3f96a16b881334cfaee0cf320b47e' - 'aab415350bcc2bb0c29943b413499d96' + 'SKIP' '597bf71a2aac6feb510b7505cdd3d4f7' - 'b0db384bdedecafbdd70c8d22c56af5f' + 'SKIP' '3fab459b4e09daea529cacad025b13b3' - 'bab99835ad6198cb1109fac89a085262' + 'SKIP' '4ad8d11e72afc6090e701073ff034cf4' - '5658ef10c9d0d804126ec1ce700e4e2c' + 'SKIP' 'c7d2493e44490f01dd20bdc8feb0a6a7' - 'e4855dbc4b743618b54d408bd5878637' + 'SKIP' '9f19c199dd8d1fa9254eebe738759272' - '600c8e90c2fb13cdbc7aa3f18566df03' + 'SKIP' 'a6ed82daf034587aee2f2581ba5fe829' - '821620a0389df723644911c56796ca8c' + 'SKIP' 'da9265aa2527fd4a7481baa3e0550287' - '0043f8b75f46f43608a67b863e300fe8' + 'SKIP' 'ec444d229e8899fbaaf6fc7de2d82ae6' - 'b632fca3a4943825bfaf3bd29df6b27d' + 'SKIP' 'b4bc1c4dc1b508ff9cdfc44f1a5039b5' - '2ffa9a802bbd57540021715f84cc76f4' + 'SKIP' '89390ff6a3c2ef7e09dd4b8b097a8e56' - '3e9b529ef3726b75d125d678de76977f' + 'SKIP' 'eee08003395c417f677d1a4bf8c548ee' - 'f670f7672b11d0df8c31885dbf15f390' + 'SKIP' '2fe070dd6d75d8ff16f269184a16e9c4' - '5018b6b7737808141043b57cf4eb842d' + 'SKIP' '4e610506c1711bf3483b965800ac3d5d' - 'cb65e541f9b60a8cb1fe58404f264b73' + 'SKIP' '7cd9bfdf7cbfd45274d07620ee94c8d9' - 'a7d2eace0da5fd236c93dbfd93458838' + 'SKIP' '9c3142956064d175a880bcb186e51ef9' - 'a1a87649853f20fe99572ddc02b0c67f' + 'SKIP' 'c10692f447d4966c879f8fb8d7c8ebc9' - '1bf5e34ad46566bc2d0eb7560ff8968e' + 'SKIP' '9ef3c308cde413e95866c1266cfb4e98' - 'afbb94e04dab29bd4ce92199892f2b5e' + 'SKIP' 'cd48f57a404498d4e5c73a3501c4b1a5' - 'd2693a2728b5a0448947d23ce47cb4b3' + 'SKIP' '00a2371b6c05acbfce6bc850c6d982f8' - '72744ac844a1dfd15dddbba7f73ec45c' + 'SKIP' '7bc4942a66ca4024ee964db7ede07896' - '7e97f02d9dd1436eed278f2732542ecf' + 'SKIP' '1cf7701017ebfc8e129de92c8f8b798c' - '4ef8b5af440bf7b939b7955ce68b4dc7' + 'SKIP' '9e61168fca692d8d1a733c389a63712e' - '665861582049ba270cc726b7a6e0324d' + 'SKIP' 'b4b11d64b45ea9ec50dcc74c6c3861f6' - '233031ccf9cbb1265be30753e0fa41f4' + 'SKIP' '1661bcc83c4715f54368877452ff2247' - '302c5516e469171b5187118024fca2a7') + 'SKIP') diff --git a/core/bridge-utils/PKGBUILD b/core/bridge-utils/PKGBUILD index f6006a8a6..b6f98d122 100644 --- a/core/bridge-utils/PKGBUILD +++ b/core/bridge-utils/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 140510 2011-10-16 05:39:52Z eric $ +# $Id: PKGBUILD 187019 2013-06-03 11:14:55Z allan $ # Maintainer: # Contributor: Judd Vinet <judd@archlinux.org> pkgname=bridge-utils pkgver=1.5 -pkgrel=1.2 +pkgrel=2 pkgdesc="Utilities for configuring the Linux ethernet bridge" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" license=('GPL') depends=('glibc') -backup=('etc/conf.d/bridges') source=(http://downloads.sourceforge.net/bridge/bridge-utils-$pkgver.tar.gz - bridges.conf.d) -md5sums=('ec7b381160b340648dede58c31bb2238' - 'f5d691282653580dd5fd4a1092ef365b') + bridge-utils-1.5-linux_3.8.x.patch) + +prepare () { + # fix compiling with newer kernel headers + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../bridge-utils-1.5-linux_3.8.x.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" aclocal autoconf - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - # install config file - install -Dm644 ../bridges.conf.d "${pkgdir}/etc/conf.d/bridges" } +md5sums=('ec7b381160b340648dede58c31bb2238' + 'fba700dcb2a3225d72b3bae64c7f49ca') diff --git a/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch b/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch new file mode 100644 index 000000000..0455a9085 --- /dev/null +++ b/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch @@ -0,0 +1,30 @@ +commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d +Author: Russell Senior <russell@personaltelco.net> +Date: Wed Mar 6 12:49:42 2013 -0800 + + bridge-utils: Fix compile against linux-3.8.x + + Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a + struct in6_addr but doesn't define it. The trivial seeming fix of + including the header that does define it causes more problems. The + problem was discussed on mailing lists in January 2013. The final + suggestion I found was here: + + http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html + + This is intended to implement that suggestion. + + Signed-off-by: Russell Senior <russell@personaltelco.net> + +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index 39964f2..dd14bae 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -20,6 +20,7 @@ + #define _LIBBRIDGE_H + + #include <sys/socket.h> ++#include <netinet/in.h> + #include <linux/if.h> + #include <linux/if_bridge.h> + diff --git a/core/bridge-utils/bridges.conf.d b/core/bridge-utils/bridges.conf.d deleted file mode 100644 index 2609cf51f..000000000 --- a/core/bridge-utils/bridges.conf.d +++ /dev/null @@ -1,27 +0,0 @@ -# -# Settings for layer-2 bridges -# -# For each bridge interface declared in INTERFACES (in rc.conf), declare -# a bridge_${IF} variable that contains the real ethernet interfaces that -# should be bridged togeether. -# -# Then list the bridge interface name in the BRIDGE_INTERFACES array. -# - -# example: -# -# in /etc/rc.conf: -# eth0="eth0 up" -# eth1="eth1 up" -# br0="br0 192.168.0.2 netmask 255.255.255.0 up" -# INTERFACES=(lo eth0 eth1 br0) -# -# in /etc/conf.d/bridges -# bridge_br0="eth0 eth1" -# BRIDGE_INTERFACES=(br0) -# - - -#bridge_br0="eth0 eth1" -#BRIDGE_INTERFACES=(br0) - diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 743cd1f07..63732bf4e 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178157 2013-02-17 10:37:53Z allan $ +# $Id: PKGBUILD 187020 2013-06-03 11:14:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils pkgver=8.21 -pkgrel=1 +pkgrel=2 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -14,11 +14,10 @@ depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) md5sums=('065ba41828644eca5dd8163446de5d64' - '5d68aee0cfb701c13ec624ad8df142a9') + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-no-install-program=groups,hostname,kill,uptime make @@ -32,15 +31,4 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/bin - - # binaries required by FHS - _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' - 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync' - 'true' 'uname') - for i in ${_fhs[@]}; do - ln -s ../usr/bin/$i ${pkgdir}/bin/$i - done } diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 3b920e97e..c362abafa 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184226 2013-05-04 14:17:39Z thomas $ +# $Id: PKGBUILD 187021 2013-06-03 11:14:58Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -31,4 +31,8 @@ package() { # install hook install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt + + # usrmove + cd "$pkgdir"/usr + mv sbin bin } diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD index 3a4f830a8..b7ac42bd7 100644 --- a/core/dash/PKGBUILD +++ b/core/dash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175814 2013-01-22 03:43:27Z dan $ +# $Id: PKGBUILD 187022 2013-06-03 11:14:59Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=dash pkgver=0.5.7 -pkgrel=3 +pkgrel=4 pkgdesc="A POSIX compliant shell that aims to be as small as possible" arch=('i686' 'x86_64' 'mips64el') url="http://gondor.apana.org.au/~herbert/dash/" @@ -15,7 +15,7 @@ sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --exec-prefix="" + ./configure --prefix=/usr --bindir=/usr/bin --mandir=/usr/share/man --exec-prefix="" make } diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD index 2415f2c43..4c49dc4f1 100644 --- a/core/dbus/PKGBUILD +++ b/core/dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184216 2013-05-03 22:55:42Z tomegun $ +# $Id: PKGBUILD 188480 2013-06-14 20:26:05Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus -pkgver=1.6.10 +pkgver=1.6.12 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -48,6 +48,6 @@ package(){ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } -md5sums=('de4970c20629aeb958a12132415b3630' +md5sums=('a70edc50524f258eaf5c9a9994ed8748' '3314d727fa57fc443fce25b5cbeebbcc' 'd8a1bd529b3ddca671ee1a695a143db9') diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index ed7198fe3..ce258579f 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184223 2013-05-04 10:58:11Z foutrelis $ +# $Id: PKGBUILD 187023 2013-06-03 11:15:01Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd pkgver=5.6.8 -pkgrel=1 +pkgrel=3 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,11 @@ license=('BSD') groups=('base') depends=('glibc' 'sh') provides=('dhcp-client') -backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') +backup=('etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service') + 'dhcpcd_.service' 'dhcpcd.service') sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0' '6245b8db7e6f39a0305571726bb693a53901c400' 'e49e01041f831281a1cd0c97ca21204e0aa07fda') @@ -37,13 +36,6 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # Create Binary Symlink - install -d ${pkgdir}/usr/sbin - ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd - - # Install Configuration File used in /etc/rc.d/network - install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname - # Install License install -d $pkgdir/usr/share/licenses/$pkgname awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \ @@ -55,4 +47,8 @@ package() { # install systemd files install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 + + # usrmove + cd "$pkgdir" + mv sbin usr/bin } diff --git a/core/dhcpcd/dhcpcd.conf.d b/core/dhcpcd/dhcpcd.conf.d deleted file mode 100644 index 83c6f14ad..000000000 --- a/core/dhcpcd/dhcpcd.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP client daemon -# - -DHCPCD_ARGS="-q" - diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index 34752d162..d27f184be 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 186478 2013-05-27 12:00:13Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 187873 2013-06-07 13:39:39Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog pkgver=1.2_20130523 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64' 'mips64el') url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') -source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -sha1sums=('54768b8443af3de2e6cd16073ec666f19d4ded7a') +source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz) +sha256sums=('c8d114b7698022bcbd6c88f3c0b2296b0e846c60c5ed6bd28f86dd72b94fd36d') build() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ncursesw --enable-nls + cd "$srcdir/$pkgname-${pkgver/_/-}" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --with-ncursesw \ + --enable-nls make } package() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - make DESTDIR="${pkgdir}" install install-lib - - rm "${pkgdir}"/usr/lib/libdialog.a + cd "$srcdir/$pkgname-${pkgver/_/-}" + make DESTDIR="$pkgdir" install-full } + +# vim:set ts=2 sw=2 et: diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index a51005dbe..e142a6476 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186902 2013-05-31 16:49:40Z tpowa $ +# $Id: PKGBUILD 188586 2013-06-16 16:11:16Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.17 +pkgver=3.0.20 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64 'mips64el') @@ -10,6 +10,8 @@ depends=('glibc') source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') +md5sums=('b34dcf1d22bc1074ebdba68799fa3cad' + 'SKIP') build() { cd $srcdir/$pkgname-$pkgver @@ -18,7 +20,5 @@ build() { package () { cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install + make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DOCDIR=/usr/share/doc install } -md5sums=('468b953ddc8baf66e9881d1a5eae03e2' - 'SKIP') diff --git a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch deleted file mode 100644 index 44e6e86b5..000000000 --- a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 -+++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 -@@ -174,7 +174,10 @@ - offset = fs->root_start + next_free * sizeof(DIR_ENT); - memset(de, 0, sizeof(DIR_ENT)); - while (1) { -- sprintf((char *)de->name, pattern, curr_num); -+ char expanded[12]; -+ sprintf(expanded, pattern, curr_num); -+ memcpy(de->name, expanded, 8); -+ memcpy(de->ext, expanded + 8, 3); - for (scan = 0; scan < fs->root_entries; scan++) - if (scan != next_free && - !strncmp((const char *)root[scan].name, ---- dosfstools-3.0.12/src/fat.c -+++ dosfstools-3.0.12/src/fat.c -@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) - DIR_ENT de; - loff_t offset; - files++; -- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); -+ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = CT_LE_W(i & 0xffff); - if (fs->fat_bits == 32) - de.starthi = CT_LE_W(i >> 16); diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index dec0ee61e..55280c720 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178092 2013-02-16 07:50:44Z ronald $ +# $Id: PKGBUILD 187024 2013-06-03 11:15:03Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs pkgver=1.42.7 -pkgrel=1 +pkgrel=2 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'MIT') @@ -46,4 +46,11 @@ package() { # install MIT license install -Dm644 "${srcdir}/MIT-LICENSE" \ "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" + + # usrmove + cd "$pkgdir" + mv sbin/* usr/bin/ + rmdir sbin + mv usr/sbin/* usr/bin/ + rmdir usr/sbin } diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index 1644130dc..b96a06cfb 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184200 2013-05-03 13:44:53Z dreisner $ +# $Id: PKGBUILD 187025 2013-06-03 11:15:04Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed pkgver=1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -20,6 +20,7 @@ build() { cd "$pkgname-$pkgver" ./configure --prefix=/ \ + --bindir=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ "CFLAGS=$CFLAGS" \ diff --git a/extra/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD index c538a4a96..2a42dea3a 100755 --- a/extra/efibootmgr/PKGBUILD +++ b/core/efibootmgr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185838 2013-05-19 14:37:47Z tpowa $ +# $Id: PKGBUILD 188652 2013-06-17 10:52:28Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor : Murtuza Akhtari <inxsible at gmail dot com> # Contributor: Keshav P R <skodabenz at rocketmail dot com> pkgname=efibootmgr pkgver=0.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." arch=('i686' 'x86_64') url="http://linux.dell.com/efibootmgr/" @@ -15,7 +15,9 @@ makedepends=() provides=() options=(strip purge docs zipman !emptydirs) -source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz") +source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz" + "efibootmgr-tilt_slashes-func.patch" +) build () { rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true @@ -23,7 +25,7 @@ build () { cp -r ${srcdir}/efibootmgr-${pkgver} ${srcdir}/efibootmgr-${pkgver}_build cd ${srcdir}/efibootmgr-${pkgver}_build/ - + patch -Np1 -i ${srcdir}/efibootmgr-tilt_slashes-func.patch echo CFLAGS= make @@ -43,4 +45,5 @@ package() { install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8 } -md5sums=('9e9a31d79e579644de83a14139b66d10') +md5sums=('9e9a31d79e579644de83a14139b66d10' + '3622c0e978cf859cae60803a6b6a0c5e') diff --git a/core/efibootmgr/efibootmgr-tilt_slashes-func.patch b/core/efibootmgr/efibootmgr-tilt_slashes-func.patch new file mode 100644 index 000000000..ce857bb3c --- /dev/null +++ b/core/efibootmgr/efibootmgr-tilt_slashes-func.patch @@ -0,0 +1,61 @@ +diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c +index 236365a..9883961 100644 +--- a/src/efibootmgr/efibootmgr.c ++++ b/src/efibootmgr/efibootmgr.c +@@ -803,6 +803,7 @@ usage() + printf("\t-V | --version return version and exit\n"); + printf("\t-w | --write-signature write unique sig to MBR if needed\n"); + printf("\t-@ | --append-binary-args file append extra args from file (use \"-\" for stdin)\n"); ++ printf("\t | --help show help/usage\n"); + } + + static void +@@ -863,6 +864,7 @@ parse_opts(int argc, char **argv) + {"version", no_argument, 0, 'V'}, + {"write-signature", no_argument, 0, 'w'}, + {"append-binary-args", required_argument, 0, '@'}, ++ {"help", no_argument, 0, 2}, + {0, 0, 0, 0} + }; + +@@ -1014,6 +1016,10 @@ parse_opts(int argc, char **argv) + opts.write_signature = 1; + break; + ++ case 2: ++ usage(); ++ exit(1); ++ + default: + usage(); + exit(1); +diff --git a/src/lib/efi.c b/src/lib/efi.c +index a4ce5cf..8ef8be8 100644 +--- a/src/lib/efi.c ++++ b/src/lib/efi.c +@@ -70,6 +70,16 @@ efi_guid_unparse(efi_guid_t *guid, char *out) + return out; + } + ++char * ++tilt_slashes(char *s) ++{ ++ char *p; ++ for (p = s; *p; p++) ++ if (*p == '/') ++ *p = '\\'; ++ return s; ++} ++ + void + set_fs_kernel_calls() + { +@@ -535,7 +545,7 @@ char *make_disk_load_option(char *p, char *disk) + signature, + mbr_type, signature_type); + +- efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path)); ++ efichar_from_char(os_loader_path, tilt_slashes(opts.loader), sizeof(os_loader_path)); + p += make_file_path_device_path (p, os_loader_path); + p += make_end_device_path (p); + diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 28b61a605..c0e52bb76 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184258 2013-05-05 07:09:51Z allan $ +# $Id: PKGBUILD 186997 2013-06-03 02:50:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -9,9 +9,9 @@ if [ "${CARCH}" != "mips64el" ]; then else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi -pkgver=4.8.0 -pkgrel=4 -_snapshot=4.8-20130502 +pkgver=4.8.1 +pkgrel=1 +#_snapshot=4.8-20130502 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -20,9 +20,9 @@ makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen') [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada') checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2) - #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 -md5sums=('672a1ad73f8391c5a6b3c4429eb0d798') +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} diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 70d8f6d24..be1301a9f 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 185564 2013-05-15 07:54:44Z heftig $ +# $Id: PKGBUILD 188618 2013-06-17 01:21:11Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.36.2 -pkgrel=1 +pkgver=2.36.3 +pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64 mips64el) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch) -sha256sums=('5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80' +sha256sums=('5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver - # workaround FS#34630 https://bugzilla.gnome.org/show_bug.cgi?id=698716 - export CFLAGS+=" -Wall" - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 357f0ce46..63b7ca609 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182400 2013-04-10 06:04:12Z allan $ +# $Id: PKGBUILD 187027 2013-06-03 11:15:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.17 -pkgrel=5 +pkgrel=6 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -64,6 +64,8 @@ build() { fi echo "slibdir=/usr/lib" >> configparms + echo "sbindir=/usr/bin" >> configparms + echo "rootsbindir=/usr/bin" >> configparms # remove hardening options for building libraries CFLAGS=${CFLAGS/-fstack-protector/} @@ -91,7 +93,7 @@ build() { make # remove harding in preparation to run test-suite - sed -i '2,4d' configparms + sed -i '4,6d' configparms } check() { @@ -125,9 +127,6 @@ package() { install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin - # temporary symlink - ln -s ../../sbin/ldconfig ${pkgdir}/usr/bin/ldconfig - # create /etc/locale.gen install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ @@ -141,11 +140,10 @@ package() { # libthread_db-1.0.so cd $pkgdir - strip $STRIP_BINARIES sbin/{ldconfig,sln} \ - usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \ - usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \ - usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd} + strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ + usr/bin/{ldconfig,locale,localedef,nscd,makedb} \ + usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \ + usr/lib/getconf/* [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 strip $STRIP_STATIC usr/lib/*.a diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index affca856a..b8dc47e3e 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185637 2013-05-16 17:56:59Z eric $ +# $Id: PKGBUILD 187028 2013-06-03 11:15:10Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=inetutils pkgver=1.9.1 -pkgrel=5 +pkgrel=6 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/inetutils/" @@ -60,9 +60,6 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/bin" - ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname" - ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname" install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname" echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index cf06151aa..47e721da8 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184614 2013-05-07 16:15:47Z foutrelis $ +# $Id: PKGBUILD 187029 2013-06-03 11:15:12Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -46,12 +46,11 @@ package() { make DESTDIR="$pkgdir" install - # allow loopback to be started before /usr is mounted, this may not be supported in the future - mkdir -p "$pkgdir/sbin" - mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip" - ln -s /sbin/ip "$pkgdir/usr/sbin/ip" - # libnetlink isn't installed, install it FS#19385 install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h" install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a" + + # usrmove + cd "$pkgdir" + mv usr/sbin usr/bin } diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 0bc1cb89e..3fba35fe2 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 186735 2013-05-30 21:29:53Z andrea $ +# $Id: PKGBUILD 187030 2013-06-03 11:15:14Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.18 -pkgrel=2 +pkgver=1.4.19.1 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url='http://www.netfilter.org/projects/iptables/index.html' depends=('glibc' 'bash') -makedepends=('linux-api-headers' 'chrpath') +makedepends=('linux-api-headers') +backup=('etc/xtables/connlabel.conf') options=('!libtool') -source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" +source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig} empty.rules simple_firewall.rules empty-filter.rules @@ -24,7 +25,8 @@ source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.t iptables.service ip6tables.service iptables-flush) -sha1sums=('34bf627c8755a61caf3635a998d2a5279f664f9e' +sha1sums=('566ba23b73403b0e4b4511d35c40124717bba97b' + 'SKIP' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec' 'd9f9f06b46b4187648e860afa0552335aafe3ce4' @@ -58,10 +60,6 @@ package() { make DESTDIR="${pkgdir}" install - # Remove RPATH from iptables libraries - # http://www.spinics.net/lists/netfilter-devel/msg24969.html - chrpath --delete "${pkgdir}"/usr/lib/iptables/*.so - cd "${srcdir}" install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules @@ -73,6 +71,6 @@ package() { # install systemd files install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service - install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush + install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush } diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 4037121b5..fc4285ffe 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185217 2013-05-12 09:08:11Z thomas $ +# $Id: PKGBUILD 187031 2013-06-03 11:15:15Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iw pkgver=3.10 -pkgrel=1 +pkgrel=2 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64" 'mips64el') url="http://wireless.kernel.org/en/users/Documentation/iw" @@ -20,5 +20,5 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" SBINDIR="/usr/bin" install } diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 94ac5ec54..c61218817 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182754 2013-04-14 16:44:17Z dreisner $ +# $Id: PKGBUILD 187032 2013-06-03 11:15:16Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod pkgver=13 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64' 'mips64el') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -11,7 +11,7 @@ license=('GPL2') depends=('glibc' 'zlib') makedepends=('gtk-doc') options=('!libtool') -provides=('module-init-tools=3.16') +provides=('module-init-tools=3.16' 'libkmod.so') conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" @@ -39,13 +39,9 @@ package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install # extra directories - install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" + install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d - # add symlinks to kmod - ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" - ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" - - for tool in {ins,ls,rm}mod modinfo; do + for tool in {ins,ls,rm,dep}mod mod{probe,info}; do ln -s kmod "$pkgdir/usr/bin/$tool" done diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index d1cc0c166..6866d9b3b 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186200 2013-05-22 00:37:41Z stephane $ +# $Id: PKGBUILD 188525 2013-06-15 07:57:25Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 -pkgver=1.11.2 -pkgrel=4 +pkgver=1.11.3 +pkgrel=1 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -19,7 +19,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) -sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250' +sha1sums=('df708a530a22ed09c7825742c108180319b10463' '78ec307c2b5e32481a6da401013c428e0b867f36' '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' @@ -37,7 +37,7 @@ build() { patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch # Fix kpasswd UDP ping-pong (CVE-2002-2443) - patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch + #patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch rm lib/krb5/krb/deltat.c diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD index 1c6bf8162..3e51cfdb5 100644 --- a/core/libedit/PKGBUILD +++ b/core/libedit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165851 2012-09-01 14:29:46Z bisson $ +# $Id: PKGBUILD 187329 2013-06-05 12:52:10Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Roman Cheplyaka <roma@ro-che.info> pkgname=libedit -pkgver=20120601_3.0 +pkgver=20130601_3.1 pkgrel=1 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' url='http://www.thrysoee.dk/editline/' @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses') options=('!libtool') source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") -sha1sums=('18ec27120f6abb222754e9f283d000fec0dcfc08') +sha1sums=('9c3fe7af5ba3d86c608872de3d6e8179add8cc88') build() { cd "${srcdir}/${pkgname}-${pkgver/_/-}" diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index 58f04dbf3..c26a9d129 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180905 2013-03-27 21:58:17Z stephane $ +# $Id: PKGBUILD 187810 2013-06-06 08:25:26Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libffi pkgver=3.0.13 -pkgrel=1 +pkgrel=3 pkgdesc="A portable, high level programming interface to various calling conventions" arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/libffi/" diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD index 54583c02b..1116f7fea 100644 --- a/core/libpipeline/PKGBUILD +++ b/core/libpipeline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184997 2013-05-09 19:48:45Z andyrtr $ +# $Id: PKGBUILD 188248 2013-06-13 13:32:04Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libpipeline -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('f4866aa3a84f2852c78f87ff619dfc60' +md5sums=('a98b07f6f487fa268d1ebd99806b85ff' 'SKIP') build() { diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index fc1aaba80..3e1cff6ad 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186318 2013-05-24 17:00:55Z jgc $ +# $Id: PKGBUILD 187033 2013-06-03 11:15:22Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,7 +8,7 @@ #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.26 -pkgrel=3 +pkgrel=4 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" @@ -25,7 +25,6 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d - saslauthd tmpfiles.conf) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' @@ -37,7 +36,6 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20' '45bb0192d2f188066240b9a66ee6365f') build() { @@ -76,6 +74,7 @@ build() { ./configure --prefix=/usr \ --host=$CHOST \ --build=$CHOST \ + --sbin=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ @@ -133,7 +132,6 @@ package_cyrus-sasl() { cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" diff --git a/core/libsasl/saslauthd b/core/libsasl/saslauthd deleted file mode 100644 index 6afafae0b..000000000 --- a/core/libsasl/saslauthd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="saslauthd" -SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_RUN=/var/run/saslauthd -SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd - if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then - add_daemon $DAEMON_NAME - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon $DAEMON_NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index 8fd4c182c..cbd07a628 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181169 2013-04-02 06:48:59Z allan $ +# $Id: PKGBUILD 186998 2013-06-03 02:50:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=8 +pkgrel=9 pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" @@ -34,7 +34,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.0') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.1') groups=('base-devel') install=libtool.install diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index ac90e89a7..705e815c1 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 177953 2013-02-12 12:13:50Z thomas $ +# $Id: PKGBUILD 187034 2013-06-03 11:15:24Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.98 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') +makedepends=('systemd') groups=('base') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_install @@ -21,24 +22,24 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvmetad.service lvmetad.socket) sha1sums=('077425115b164c335a9930df745943e9ea666a8a' - '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8' - '8008547b133af89f79461a6df5412539ed3f26b7' + 'SKIP' + '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f' 'ff0fdf0a3005a41acd4b36865056109effc3474b' 'f6a554eea9557c3c236df2943bb6e7e723945c41' 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4' - 'cbc64f377fbb1c1a9ff53bc6ca85c324075499b7' + '01782ce8e10718c1513e3906b126f30f682f5cab' '1d56f47a81350ae37ffbf61ee036fe31f4c5d504' - 'ae945cae2d71b286439a9945876acb78dc9eeaf7' - '460b094e8689298ed59842d1abcee5d4e706e1d7' + 'adf26f5e5636de9c055b2ac3b179641a543a8937' + 'f857a4a63fcc604a981e56875edda91767d4f1bf' 'fcfc265e3b10294cc4b10949a342e9db4310b186') build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-udev-prefix=/usr \ - --with-systemdsystemunitdir=/usr/lib/systemd/system --with-default-pid-dir=/run \ - --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ + --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \ --enable-lvmetad @@ -48,7 +49,7 @@ build() { package_device-mapper() { pkgdesc="Device mapper userspace library and tools" url="http://sourceware.org/dm/" - depends=('glibc' 'udev') + depends=('glibc' 'systemd') cd "${srcdir}/LVM2.${pkgver}" make DESTDIR="${pkgdir}" install_device-mapper @@ -63,7 +64,7 @@ package_device-mapper() { package_lvm2() { pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + depends=('bash' "device-mapper>=${pkgver}" 'systemd' 'readline') conflicts=('lvm' 'mkinitcpio<0.7') backup=('etc/lvm/lvm.conf') options=('!makeflags') diff --git a/core/lvm2/dmeventd.service b/core/lvm2/dmeventd.service index 15ca21c0b..e0b1b33d0 100644 --- a/core/lvm2/dmeventd.service +++ b/core/lvm2/dmeventd.service @@ -7,8 +7,8 @@ DefaultDependencies=no [Service] Type=forking -ExecStart=/usr/sbin/dmeventd -ExecReload=/usr/sbin/dmeventd -R +ExecStart=/usr/bin/dmeventd +ExecReload=/usr/bin/dmeventd -R Environment=SD_ACTIVATION=1 PIDFile=/run/dmeventd.pid OOMScoreAdjust=-1000 diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service index 8f5247b00..138e91a08 100644 --- a/core/lvm2/lvm-monitoring.service +++ b/core/lvm2/lvm-monitoring.service @@ -10,8 +10,8 @@ Conflicts=shutdown.target [Service] Type=oneshot Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 -ExecStart=/usr/sbin/lvm vgchange --monitor y -ExecStop=/usr/sbin/lvm vgchange --monitor n +ExecStart=/usr/bin/lvm vgchange --monitor y +ExecStop=/usr/bin/lvm vgchange --monitor n RemainAfterExit=yes [Install] diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install index be27614bd..6f3c1cb41 100644 --- a/core/lvm2/lvm2_install +++ b/core/lvm2/lvm2_install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash build() { local mod @@ -6,9 +6,9 @@ build() { add_module "$mod" done - add_binary "/usr/sbin/lvm" - add_binary "/usr/sbin/lvmetad" - add_binary "/usr/sbin/dmsetup" + add_binary "/usr/bin/lvm" + add_binary "/usr/bin/lvmetad" + add_binary "/usr/bin/dmsetup" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" diff --git a/core/lvm2/lvmetad.service b/core/lvm2/lvmetad.service index 64168f465..4be520a3b 100644 --- a/core/lvm2/lvmetad.service +++ b/core/lvm2/lvmetad.service @@ -9,8 +9,8 @@ Conflicts=shutdown.target [Service] Type=forking NonBlocking=true -ExecStart=/usr/sbin/lvmetad -ExecReload=/usr/sbin/lvmetad -R +ExecStart=/usr/bin/lvmetad +ExecReload=/usr/bin/lvmetad -R Environment=SD_ACTIVATION=1 Restart=on-abort PIDFile=/run/lvmetad.pid diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index f9203aac7..819fc88ea 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,39 +1,40 @@ -# $Id: PKGBUILD 165285 2012-08-14 20:44:40Z ronald $ +# $Id: PKGBUILD 187035 2013-06-03 11:15:26Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=net-tools -pkgver=1.60.20120804git -pkgrel=2 +pkgver=1.60.20130531git +pkgrel=1 pkgdesc="Configuration tools for Linux networking" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://net-tools.sourceforge.net/" depends=('glibc') - -# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 -# use git checkout instead -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz - Makefile.patch) +makedepends=('git') +# use git snapshot currently prefered over release +source=("net-tools::git://git.code.sf.net/p/net-tools/code#commit=6a14c03f") options=(!makeflags) -install=net-tools.install -sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82' - '4191ca56dc01d6aebe26c36c7cc060c638d5ebca') +sha1sums=('SKIP') + +prepare() { + sed -i "s#/sbin#/bin#" ${srcdir}/${pkgname}/Makefile + sed -i "s#/usr##" ${srcdir}/${pkgname}/man/Makefile +} + build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/Makefile.patch + cd ${srcdir}/${pkgname} yes "" | make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make BASEDIR=${pkgdir} update + cd ${srcdir}/${pkgname} + make DESTDIR=${pkgdir}/usr update # the following is provided by yp-tools - rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/bin/{nis,yp}domainname rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 # hostname is provided by inetutils - rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname} + rm "${pkgdir}"/usr/bin/{hostname,dnsdomainname,domainname} rm -rf "${pkgdir}"/usr/share/man/man1 } diff --git a/core/net-tools/net-tools.install b/core/net-tools/net-tools.install deleted file mode 100644 index 9eee9e51b..000000000 --- a/core/net-tools/net-tools.install +++ /dev/null @@ -1,12 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then - echo "hostname and {,yp,nis}domainname has moved:" - echo "----------" - echo "hostname is now in coreutils" - echo "domainname is now in yp-tools" - echo "their functionality might have changed slightly" - echo "" - echo "dnsdomainname remains in net-tools" - echo "----------" - fi -} diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index 4f9ca816a..6e2204bb5 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185727 2013-05-17 18:43:30Z dan $ +# $Id: PKGBUILD 187036 2013-06-03 11:15:27Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=nilfs-utils pkgver=2.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64' 'mips64el') url="http://www.nilfs.org/" @@ -17,11 +17,11 @@ md5sums=('f072cc53c288492061b3199d63e32177') build() { cd $pkgname-$pkgver - ./configure --enable-libmount + ./configure --sbindir=/usr/bin --enable-libmount make } package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install LDCONFIG=/bin/true + make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true } diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD index 081276a69..929a98c7f 100644 --- a/core/openvpn/PKGBUILD +++ b/core/openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184228 2013-05-04 14:17:41Z thomas $ +# $Id: PKGBUILD 188197 2013-06-12 15:53:27Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=openvpn -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" arch=(i686 x86_64 'mips64el') @@ -18,11 +18,11 @@ source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz.asc openvpn@.service openvpn-2.3.0-fix-systemd-ask-password-path.patch) -md5sums=('57a3b64597fc37b7842a3fde354d8bbe' +md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1' 'SKIP' 'fbf818b6e1f212e77b9ce0e6d92584a1' 'SKIP' - '0846aa59d0b123d61030890f9a4135ae' + '57ef7353ba2c28c04dfc387c3ca77a4f' 'e1bd1523e38745e948c710db1a330bb1') options=(!libtool) @@ -32,6 +32,7 @@ build() { # Build openvpn CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --enable-password-save \ --mandir=/usr/share/man \ --enable-iproute2 \ diff --git a/core/openvpn/openvpn-tapdev.conf b/core/openvpn/openvpn-tapdev.conf deleted file mode 100644 index afa5586dd..000000000 --- a/core/openvpn/openvpn-tapdev.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# /etc/conf.d/openvpn-tapdev -# -# Place openvpn-tapdev before network into your DAEMONS array -# This will create permanent tap devices which you can use for bridging -# -# Example: -# TAPDEVS="work home" -# Will create two tap devices "work" and "home" -# - -TAPDEVS="" diff --git a/core/openvpn/openvpn-tapdev.rc b/core/openvpn/openvpn-tapdev.rc deleted file mode 100755 index 2c51f8248..000000000 --- a/core/openvpn/openvpn-tapdev.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -. /etc/conf.d/openvpn-tapdev - -case "$1" in - start) - stat_busy "Creating tap devices for OpenVPN ... " - success=0 - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn-tapdev - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Destroying tap devices for OpenVPN ..." - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - rm_daemon openvpn-tapdev - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/openvpn/openvpn.rc b/core/openvpn/openvpn.rc deleted file mode 100755 index 96c28b641..000000000 --- a/core/openvpn/openvpn.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -CFGDIR="/etc/openvpn" -STATEDIR="/var/run/openvpn" - -case "$1" in - start) - stat_busy "Starting OpenVPN ... " - success=0 - mkdir -p "${STATEDIR}" - for cfg in "${CFGDIR}"/*.conf; do - stat_append "$(basename "${cfg}" .conf) " - /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping OpenVPN ..." - for pidfile in "${STATEDIR}"/*.pid; do - stat_append "$(basename "${pidfile}" .pid) " - kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null - rm -f "${pidfile}" - done - rm_daemon openvpn - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/openvpn/openvpn@.service b/core/openvpn/openvpn@.service index 0b7232899..63fdf0e36 100644 --- a/core/openvpn/openvpn@.service +++ b/core/openvpn/openvpn@.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i +ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i [Install] WantedBy=multi-user.target diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD index bf1bb10d2..0d96d3182 100644 --- a/core/pcre/PKGBUILD +++ b/core/pcre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172477 2012-12-03 21:23:28Z allan $ +# $Id: PKGBUILD 187186 2013-06-05 04:57:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre -pkgver=8.32 +pkgver=8.33 pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('BSD') depends=('gcc-libs') options=('!libtool') source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('62f02a76bb57a40bc66681760ed511d5' - '275ffe85e62565118756f8f3d08bb70f') +md5sums=('21514018448ac10062ece7a668fca949' + 'SKIP') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -26,7 +26,7 @@ build() { check() { cd "${srcdir}"/${pkgname}-${pkgver} - make check + make -j1 check } package() { diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 088366c7d..dcd2e72b8 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,22 +1,16 @@ -# $Id: PKGBUILD 169337 2012-10-19 21:33:57Z thomas $ +# $Id: PKGBUILD 188198 2013-06-12 15:53:29Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=5.1 +pkgrel=7 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64 'mips64el') url="http://www.samba.org/ppp/" license=('custom:GPL/BSD') -groups=('base') depends=('glibc' 'libpcap>=1.0.0') -backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down}) +backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh}) source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz options - pon - poff - ppp - plog - pon.1 ip-up ip-down ip-up.d.dns.sh @@ -27,19 +21,14 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz ppp.systemd) md5sums=('4621bc56167b6953ec4071043fe0ec57' '7a9259a8f038073eeea7e4552ff1849f' - '48c024f73a80c8b69c4def22f86902cc' - '2d811f8470ccdea3b8c4505a438483e9' - '7561c73b557292d5ba1a9c5dbd270fde' - '86cdaf133f7a79fb464f02d83afc7734' - '44cc662ba9aa61dd9add3ddd4c5ded57' 'e4beb16ed600b61336d50b2bd2df7cd5' '529b924f644f80cf30d72a966abc7419' - '4a074d74c29625b254a1db720cb87b99' - '8d1be5af8e46393ba6eb273377831e38' + '0a79f6427e28426d42b76f7207c531e1' + '3a5d56ac23e36cdbf48187813c8ec981' '4cbd0a9af01c27067450ec7d3f5fa673' 'b75c2fbc4afa9f2d8108b680c88c7036' '9dde53aa5a931ebe1c7e3469199777c5' - 'fafead5c9d66d0574e6f0a2e5f4d4631') + '37401eb0c3dcccb87f5ac4716d0f9f2c') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -81,14 +70,18 @@ package() { install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d" install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d" install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh" - install -D -m755 ../pon "${pkgdir}/usr/bin/pon" - install -D -m755 ../poff "${pkgdir}/usr/bin/poff" - install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" + install -D -m755 scripts/pon "${pkgdir}/usr/bin/pon" + install -D -m755 scripts/poff "${pkgdir}/usr/bin/poff" + install -D -m755 scripts/plog "${pkgdir}/usr/sbin/plog" + install -D -m644 scripts/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets" install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets" - install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp" - install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" install -d -m755 "${pkgdir}/etc/ppp/peers" chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service + + # usrmove + cd "$pkgdir"/usr + mv sbin/* bin/ + rmdir sbin } diff --git a/core/ppp/ip-down.d.dns.sh b/core/ppp/ip-down.d.dns.sh index 9e19f7d1b..c9da47a63 100644 --- a/core/ppp/ip-down.d.dns.sh +++ b/core/ppp/ip-down.d.dns.sh @@ -1,3 +1,7 @@ #!/bin/sh -[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf +if [ -x /usr/bin/resolvconf ]; then + /usr/bin/resolvconf -fd ${IFNAME} +else + [ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf +fi diff --git a/core/ppp/ip-up.d.dns.sh b/core/ppp/ip-up.d.dns.sh index f9df543a4..47e4ca41f 100644 --- a/core/ppp/ip-up.d.dns.sh +++ b/core/ppp/ip-up.d.dns.sh @@ -1,7 +1,11 @@ #!/bin/sh if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then - [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} - mv /etc/ppp/resolv.conf /etc/resolv.conf - chmod 644 /etc/resolv.conf + if [ -x /usr/bin/resolvconf ]; then + /usr/bin/resolvconf -a ${IFNAME} </etc/ppp/resolv.conf + elif + [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} + mv /etc/ppp/resolv.conf /etc/resolv.conf + chmod 644 /etc/resolv.conf + fi fi diff --git a/core/ppp/plog b/core/ppp/plog deleted file mode 100644 index 84d2c7340..000000000 --- a/core/ppp/plog +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -s /var/log/ppp.log ]; then - exec tail "$@" /var/log/ppp.log -else - exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\[' -fi diff --git a/core/ppp/poff b/core/ppp/poff deleted file mode 100644 index 8b4dffc59..000000000 --- a/core/ppp/poff +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Written by John Hasler <john@dhh.gt.org> and based on work -# by Phil Hands <phil@hands.com>. Distributed under the GNU GPL - -if [ -x /usr/bin/kill ]; then - KILL="/usr/bin/kill" -else - KILL="/bin/kill" -fi -SIG=TERM -DONE="stopped" -MODE="" - -usage () -{ - cat <<!EOF! -usage: $0 [option] [provider] -options: - -r Cause pppd to drop the line and redial. - -d Toggle the state of pppd's debug option. - -c Cause pppd to renegotiate compression. - -a Stop all pppd's. 'provider' will be ignored. - -h Print this help summary and exit. - -v Print version and exit. - none Stop pppd. - -Options may not be combined. - -If 'provider' is omitted pppd will be stopped or signalled if and only if -there is exactly one running unless the '-a' option was given. If -'provider' is supplied the pppd controlling the connection to that -provider will be stopped or signalled. -!EOF! -} - -# Get option. If there are none replace the "?" that getopts puts in -# FLAG on error with "null". -getopts rdcavh FLAG -if [ "$?" -ne 0 ]; then - FLAG="null" -fi - -# Check for additional options. Should be none. -getopts :rdcavh DUMMY -if [ "$?" -eq 0 ]; then - echo "$0: Illegal option -- ${OPTARG}." - exit 1 -fi - -case $FLAG in - "r") SIG=HUP; DONE=signalled; shift ;; - "d") SIG=USR1; DONE=signalled; shift ;; - "c") SIG=USR2; DONE=signalled; shift ;; - "a") MODE="all"; shift ;; - "v") echo "$0$Revision: 1.1 $_TrickToPrint_RCS_Revision"; exit 0 ;; - "h") usage; exit 0 ;; - "?") exit 1; -esac - -# Get the PIDs of all the pppds running. Could also get these from -# /var/run, but pppd doesn't create .pid files until ppp is up. -PIDS=`pidof pppd` - -# poff is pointless if pppd isn't running. -if test -z "$PIDS"; then - echo "$0: No pppd is running. None ${DONE}." - exit 1 -fi - -# Find out how many pppd's are running. -N=`echo "$PIDS" | wc -w` - -# If there are no arguments we can't do anything if there is more than one -# pppd running. -if test "$#" -eq 0 -a "$N" -gt 1 -a $FLAG != "a" ; then - echo "$0: More than one pppd running and no "-a" option and -no arguments supplied. Nothing ${DONE}." - exit 1 -fi - -# If either there are no arguments or '-a' was specified kill all the -# pppd's. -if test "$#" -eq 0 -o "$MODE" = "all" ; then - $KILL -$SIG $PIDS || { - echo "$0: $KILL failed. None ${DONE}." - exit 1 - } - exit 0 -fi - -# There is an argument, so kill the pppd started on that provider. -PID=`ps axw | grep "[ /]pppd call $1 *\$" | awk '{print $1}'` -if test -n "$PID" ; then - $KILL -$SIG $PID || { - echo "$0: $KILL failed. None ${DONE}." - exit 1 - } -else - echo "$0: I could not find a pppd process for provider '$1'. None ${DONE}." - exit 1 -fi -exit 0 diff --git a/core/ppp/pon b/core/ppp/pon deleted file mode 100644 index 36885050b..000000000 --- a/core/ppp/pon +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -case "$1" in - -*) echo " -Usage: pon [provider] [arguments] - -If you specify one argument, a PPP connection will be started using -settings from the appropriate file in the /etc/ppp/peers/ directory, and -any additional arguments supplied will be passed as extra arguments to -pppd. -" - exit 0 - ;; -esac - -if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then - echo " -Please configure /etc/ppp/peers/provider or use a command line argument to -use another file in /etc/ppp/peers/ directory. -" - exit 1 -fi - -if [ "$1" -a ! -f "/etc/ppp/peers/$1" ]; then - echo " -The file /etc/ppp/peers/$1 does not exist. -" - exit 1 -fi - -exec /usr/sbin/pppd call ${@:-provider} - diff --git a/core/ppp/pon.1 b/core/ppp/pon.1 deleted file mode 100644 index bb3220564..000000000 --- a/core/ppp/pon.1 +++ /dev/null @@ -1,121 +0,0 @@ -.\" This manual is published under the GPL. -.\" All guidelines specified in the GPL apply here. -.\" To get an ascii file: -.\" groff -man -Tascii pon.1 > pon.txt -.\" -.TH PON 1 "July 2000" "Debian Project" "Debian PPPD" -.SH NAME -pon, poff, plog \- starts up, shuts down or lists the log of PPP connections -.SH SYNOPSIS -.B pon -[ isp-name [ options ] ] -.br -.B poff -[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ] -.br -.B plog -[ arguments ] -.SH DESCRIPTION -This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP -scripts, which allow users to control PPP connections. -.. -.SS pon -\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP -file, if it exists and is executable. Otherwise, a PPP connection will be -started using configuration from \fI/etc/ppp/peers/provider\fP. -This is the default behaviour unless an \fBisp-name\fP argument is given. -.PP -For instance, to use ISP configuration "myisp" run: -.IP -pon myisp -.PP -\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP. -You can pass additional \fBoptions\fP after the ISP name, too. -\fBpon\fP can be used to run multiple, simultaneous PPP connections. -.. -.SS poff -\fBpoff\fP closes a PPP connection. If more than one PPP connection exists, -the one named in the argument to \fBpoff\fP will be killed, e.g. -.IP -poff myprovider2 -.PP -will terminate the connection to myprovider2, and leave the PPP connections -to e.g. "myprovider1" or "myprovider3" up and running. -.PP -\fBpoff\fP takes the following command line options: -.RS -.TP -.B "\-r" -causes the connection to be redialed after it is dropped. -.TP -.B "\-d" -toggles the state of pppd's debug option. -.TP -.B "\-c" -causes -.BR pppd (8) -to renegotiate compression. -.TP -.B "\-a" -stops all running ppp connections. If the argument \fBisp-name\fP -is given it will be ignored. -.TP -.B "\-h" -displays help information. -.TP -.B "\-v" -prints the version and exits. -.PP -If no argument is given, \fBpoff\fP will stop or signal pppd if and only -if there is exactly one running. If more than one connection is active, -it will exit with an error code of 1. -.. -.SS plog -\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that -file doesn't exist, it shows you the last few lines of your -\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd. -This script makes use of the -.BR tail (1) -command, so arguments that can be passed to -.BR tail (1) -can also be passed to \fBplog\fP. -.PP -Note: the \fBplog\fP script can only be used by root or another system -administrator in group "adm", due to security reasons. Also, to have all -pppd-generated information in one logfile, that plog can show, you need the -following line in your \fI/etc/syslog.conf\fP file: -.PP -local2.* -/var/log/ppp.log -.RE -.SH FILES -.TP -.I /etc/ppp/options -PPPd system options file. -.TP -.I /etc/ppp/pap-secrets -System PAP passwords file. -.TP -.I /etc/ppp/chap-secrets -System CHAP passwords file. -.TP -.I /etc/ppp/peers/ -Directory holding the peer options files. The default file is called -\fIprovider\fP. -.TP -.I /etc/chatscripts/provider -The chat script invoked from the default \fI/etc/ppp/peers/provider\fP. -.TP -.I /var/log/ppp.log -The default PPP log file. -.SH AUTHORS -The p-commands were written by Christoph Lameter <clameter@debian.org>. -Updated and revised by Philip Hands <phil@hands.com>. -.br -This manual was written by Othmar Pasteka <othmar@tron.at>. Modified -by Rob Levin <lilo@openprojects.net>, with some extensions taken from -the old p-commands manual written by John Hasler <jhasler@debian.org>. -.SH "SEE ALSO" -.BR pppd (8), -.BR chat (8), -.BR tail (1). - diff --git a/core/ppp/ppp b/core/ppp/ppp deleted file mode 100644 index 16e01bad7..000000000 --- a/core/ppp/ppp +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/pppd` -case "$1" in - start) - stat_busy "Starting PPP daemon" - [ -z "$PID" ] && /usr/bin/pon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ppp - stat_done - fi - ;; - stop) - stat_busy "Stopping PPP daemon" - [ ! -z "$PID" ] && poff -a &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ppp - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/ppp/ppp.systemd b/core/ppp/ppp.systemd index a5c490a73..8a963af74 100644 --- a/core/ppp/ppp.systemd +++ b/core/ppp/ppp.systemd @@ -3,7 +3,7 @@ Description=PPP link to %I Before=network.target [Service] -ExecStart=/usr/sbin/pppd call %I nodetach +ExecStart=/usr/sbin/pppd call %I nodetach nolog [Install] WantedBy=multi-user.target diff --git a/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD index b20279bf3..c1b0441ea 100644 --- a/core/pptpclient/PKGBUILD +++ b/core/pptpclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142906 2011-11-18 07:42:07Z pierre $ +# $Id: PKGBUILD 187040 2013-06-03 11:15:32Z allan $ # Maintainer: Daniel Isenmann <daniel @ archlinux.org> # Contributor: Mark Nikkel <mnikkel@gmail.com> pkgname=pptpclient pkgver=1.7.2 -pkgrel=4.1 +pkgrel=5 pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP." arch=('i686' 'x86_64' 'mips64el') url="http://pptpclient.sourceforge.net/" @@ -14,7 +14,7 @@ backup=('etc/ppp/options.pptp') source=("http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz") md5sums=('4c3d19286a37459a632c7128c92a9857') -build() { +prepare() { cd $srcdir/pptp-$pkgver # use our CFLAGS and LDFLAGS @@ -22,8 +22,14 @@ build() { sed -i -e "/LDFLAGS =/ c\LDFLAGS = ${LDFLAGS}" Makefile # adjust ip path - sed -i 's#/bin/ip#/usr/sbin/ip#' routing.c + sed -i 's#/bin/ip#/usr/bin/ip#' routing.c + + # put binaries in /usr/bin + sed -i "/BINDIR/s#/sbin#/bin#" Makefile +} +build() { + cd $srcdir/pptp-$pkgver make } diff --git a/core/sdparm/PKGBUILD b/core/sdparm/PKGBUILD index b72eb2c23..8e9cb469c 100644 --- a/core/sdparm/PKGBUILD +++ b/core/sdparm/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 148461 2012-02-01 12:06:03Z stephane $ +# $Id: PKGBUILD 188486 2013-06-14 23:27:22Z eric $ # Maintainer: # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: grimi@poczta.fm pkgname=sdparm -pkgver=1.07 -pkgrel=1.1 +pkgver=1.08 +pkgrel=1 pkgdesc="An utility similar to hdparm but for SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://sg.danny.cz/sg/sdparm.html" license=('BSD') -depends=('glibc') -source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz") -md5sums=('c807f9db3dd7af175214be0d7fece494') +depends=('glibc' 'bash') +source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz") +md5sums=('d290e6b45d690bfa2cc05700ec119073') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING \ diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD index 4dcccd0e8..39288c7a0 100644 --- a/core/sed/PKGBUILD +++ b/core/sed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176248 2013-01-28 00:29:26Z allan $ +# $Id: PKGBUILD 187041 2013-06-03 11:15:34Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sed pkgver=4.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="GNU stream editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/sed" @@ -31,8 +31,4 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - mkdir $pkgdir/bin - ln -s ../usr/bin/sed $pkgdir/bin - } diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 4c057478f..8500e395a 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180325 2013-03-20 12:45:26Z dreisner $ +# $Id: PKGBUILD 187042 2013-06-03 11:15:35Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.5.1 -pkgrel=5 +pkgrel=6 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64' 'mips64el') url='http://pkg-shadow.alioth.debian.org/' @@ -32,15 +32,15 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{ shadow-strncpy-usage.patch lastlog.tmpfiles) sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' - '126570e2939bf3b57f28df5197ab9309747a6b5c' + 'SKIP' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' '12427b1ca92a9b85ca8202239f0d9f50198b818f' '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - '6fac49a4826e2b821c8d41ed5911bc8d04735986' + 'e92045fb75e0c21a3f294a00de0bd2cd252e9463' '12427b1ca92a9b85ca8202239f0d9f50198b818f' '611be25d91c3f8f307c7fe2485d5f781e5dee75f' - '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' + '98f4919014b1a9eb9f01ca7731e04b1d973cedd5' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' '6010fffeed1fc6673ad9875492e1193b1a847b53' '21e12966a6befb25ec123b403cd9b5c492fe5b16' @@ -64,6 +64,8 @@ build() { ./configure \ --prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ --libdir=/lib \ --mandir=/usr/share/man \ --sysconfdir=/etc \ @@ -112,8 +114,7 @@ package() { # Remove utilities provided by util-linux rm \ - "$pkgdir"/usr/bin/{chsh,chfn,sg} \ - "$pkgdir"/bin/{login,su} \ + "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg} \ "$pkgdir"/usr/sbin/{vipw,vigr} # but we keep newgrp, as sg is really an alias to it @@ -133,4 +134,8 @@ package() { rmdir \ "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \ "$pkgdir"/usr/share/man/{fi,ko/man8} + + # move everything else to /usr/bin, because this isn't handled by ./configure + mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin + rmdir "$pkgdir/usr/sbin" } diff --git a/core/shadow/login.defs b/core/shadow/login.defs index 5dabf78df..591367100 100644 --- a/core/shadow/login.defs +++ b/core/shadow/login.defs @@ -81,8 +81,8 @@ HUSHLOGIN_FILE .hushlogin # *REQUIRED* The default PATH settings, for superuser and normal users. # # (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin +ENV_SUPATH PATH=/usr/bin +ENV_PATH PATH=/usr/bin # # Terminal permissions diff --git a/core/shadow/shadow.cron.daily b/core/shadow/shadow.cron.daily index 1931a793e..1373ecde9 100755 --- a/core/shadow/shadow.cron.daily +++ b/core/shadow/shadow.cron.daily @@ -1,6 +1,6 @@ #!/bin/sh # Verify integrity of password and group files -/usr/sbin/pwck -r -/usr/sbin/grpck -r +/usr/bin/pwck -r +/usr/bin/grpck -r diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index e822537e6..6e4193324 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185547 2013-05-14 21:53:57Z foutrelis $ +# $Id: PKGBUILD 188591 2013-06-16 17:14:27Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.6p8 +_sudover=1.8.7 pkgver=${_sudover/p/.p} -pkgrel=2 +pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64' 'mips64el') url="http://www.sudo.ws/sudo/" @@ -17,7 +17,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) -sha256sums=('c0baaa87f59153967b650a0dde2f7d4147d358fa15f3fdabb47e84d0282fe625' +sha256sums=('39626cf3d48c4fd5a9139a2627d42bfefac7ce47f470bdba3aeb4e3d7c49566a' 'SKIP' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') diff --git a/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch b/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch new file mode 100644 index 000000000..372ecebff --- /dev/null +++ b/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch @@ -0,0 +1,87 @@ +From 23ad4dd8844c582929115a11ed2830a1371568d6 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 28 May 2013 20:45:34 +0200 +Subject: [PATCH] journald: DO recalculate the ACL mask, but only if it doesn't + exist + +Since 11ec7ce, journald isn't setting the ACLs properly anymore if +the files had no ACLs to begin with: acl_set_fd fails with EINVAL. + +An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is +invalid, so make sure a mask exists before trying to set the ACL. +--- + src/journal/journald-server.c | 6 ++++-- + src/shared/acl-util.c | 28 ++++++++++++++++++++++++++++ + src/shared/acl-util.h | 1 + + 3 files changed, 33 insertions(+), 2 deletions(-) + +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index b717b92..da5b725 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -227,9 +227,11 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) { + } + } + +- /* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */ ++ /* We do not recalculate the mask unconditionally here, ++ * so that the fchmod() mask above stays intact. */ + if (acl_get_permset(entry, &permset) < 0 || +- acl_add_perm(permset, ACL_READ) < 0) { ++ acl_add_perm(permset, ACL_READ) < 0 || ++ calc_acl_mask_if_needed(&acl) < 0) { + log_warning("Failed to patch ACL on %s, ignoring: %m", f->path); + goto finish; + } +diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c +index 48bb12f..fb04e49 100644 +--- a/src/shared/acl-util.c ++++ b/src/shared/acl-util.c +@@ -69,6 +69,34 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) { + return 0; + } + ++int calc_acl_mask_if_needed(acl_t *acl_p) { ++ acl_entry_t i; ++ int found; ++ ++ assert(acl_p); ++ ++ for (found = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i); ++ found > 0; ++ found = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) { ++ ++ acl_tag_t tag; ++ ++ if (acl_get_tag_type(i, &tag) < 0) ++ return -errno; ++ ++ if (tag == ACL_MASK) ++ return 0; ++ } ++ ++ if (found < 0) ++ return -errno; ++ ++ if (acl_calc_mask(acl_p) < 0) ++ return -errno; ++ ++ return 0; ++} ++ + int search_acl_groups(char*** dst, const char* path, bool* belong) { + acl_t acl; + +diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h +index 23090d9..36ef490 100644 +--- a/src/shared/acl-util.h ++++ b/src/shared/acl-util.h +@@ -24,4 +24,5 @@ + #include <stdbool.h> + + int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry); ++int calc_acl_mask_if_needed(acl_t *acl_p); + int search_acl_groups(char*** dst, const char* path, bool* belong); +-- +1.8.3 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index d26c533fb..ad695a979 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=204 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -14,24 +14,24 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection options=('!libtool' '!distcc') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch + 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 'initcpio-hook-udev' 'initcpio-install-udev' - 'initcpio-install-timestamp' - 'use-split-usr-path.patch') + 'initcpio-install-timestamp') md5sums=('a07619bb19f48164fbf0761d12fd39a8' '7f39f9fde1ff7b48293ed1e3d0a6c213' + '66e3162856ded8eb7dc7383405c6e0d6' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' - 'df69615503ad293c9ddf9d8b7755282d' - '76bf83fe34c5b40533abc5dc940576a6') + 'df69615503ad293c9ddf9d8b7755282d') prepare() { cd "$pkgname-$pkgver" - # hang onto this until we do the /{,s}bin merge - patch -Np1 <"$srcdir/use-split-usr-path.patch" - patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch" + + patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch" + autoreconf } @@ -103,10 +103,6 @@ package_systemd() { # get rid of RPM macros rm -r "$pkgdir/etc/rpm" - # the path to udevadm is hardcoded in some places - install -d "$pkgdir/sbin" - ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" - # add back tmpfiles.d/legacy.conf install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" @@ -135,12 +131,12 @@ package_systemd-sysvcompat() { mv "$srcdir/_sysvcompat"/* "$pkgdir" - install -dm755 "$pkgdir/sbin" + install -dm755 "$pkgdir/usr/bin" for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + ln -s 'systemctl' "$pkgdir/usr/bin/$tool" done - ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" + ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init" } # vim: ft=sh syn=sh et diff --git a/core/systemd/use-split-usr-path.patch b/core/systemd/use-split-usr-path.patch deleted file mode 100644 index 40dd62f90..000000000 --- a/core/systemd/use-split-usr-path.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 -+++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 -@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) { - - /* Set up PATH unless it is already set */ - setenv("PATH", --#ifdef HAVE_SPLIT_USR - "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", --#else -- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", --#endif - arg_running_as == SYSTEMD_SYSTEM); - - if (arg_running_as == SYSTEMD_SYSTEM) { diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD index e51f5baab..a576e6a05 100644 --- a/core/sysvinit-tools/PKGBUILD +++ b/core/sysvinit-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185338 2013-05-13 13:18:59Z tomegun $ +# $Id: PKGBUILD 187044 2013-06-03 11:15:38Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=sysvinit-tools pkgver=2.88 -pkgrel=10 +pkgrel=11 arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') @@ -32,8 +32,8 @@ package() { cd "${srcdir}/sysvinit-${pkgver}dsf" make ROOT="${pkgdir}" install - ### drop the stuff provided by systemd-sysvcompat and util-linux cd "${pkgdir}" + ### drop the stuff provided by systemd-sysvcompat and util-linux rm -r usr/share/man/man5 rm -r usr/include rm bin/mountpoint @@ -41,4 +41,9 @@ package() { rm usr/bin/{mesg,utmpdump,wall} rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1 rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8 + ### usrmerge + mv sbin/* usr/bin/ + rm -r sbin + mv bin/* usr/bin/ + rm -r bin } diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD index 240c5e292..4febb901d 100644 --- a/core/tar/PKGBUILD +++ b/core/tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183049 2013-04-17 02:02:04Z allan $ +# $Id: PKGBUILD 187045 2013-06-03 11:15:39Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=tar pkgver=1.26 -pkgrel=3 +pkgrel=4 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/tar/tar.html" @@ -43,9 +43,5 @@ package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install - # probably needed for compatibility - install -dm755 ${pkgdir}/bin - ln -s ../usr/bin/tar ${pkgdir}/bin/tar - install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1 } diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD index a28d19be6..c5cd7eb57 100644 --- a/core/usbutils/PKGBUILD +++ b/core/usbutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163502 2012-07-13 16:29:26Z tpowa $ +# $Id: PKGBUILD 188585 2013-06-16 16:11:16Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils -pkgver=006 +pkgver=007 pkgrel=1 pkgdesc="USB Device Utilities" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ optdepends=('python2: for lsusb.py usage' url="http://linux-usb.sourceforge.net/" source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz" fix-python2.patch) -md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8' +md5sums=('c9df5107ae9d26b10a1736a261250139' '45766196895b4cc50b53cd56e1bbf3d1') build() { diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 4f7e2c06e..0d33104f1 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186677 2013-05-30 12:45:22Z tomegun $ +# $Id: PKGBUILD 187046 2013-06-03 11:15:40Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') @@ -39,7 +39,7 @@ build() { ./configure --prefix=/usr \ --libdir=/usr/lib \ --localstatedir=/run \ - --enable-fs-paths-extra=/usr/bin:/usr/sbin \ + --enable-fs-paths-extra=/usr/bin \ --enable-raw \ --enable-vipw \ --enable-newgrp \ @@ -78,4 +78,10 @@ package() { # include tmpfiles fragment for uuidd # TODO(dreisner): offer this upstream? install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" + + # usrmove + cd "$pkgdir" + mv {,usr/}sbin/* usr/bin + mv bin/* usr/bin + rmdir bin sbin usr/sbin } diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD index 34d3c2311..e7141a7a4 100644 --- a/core/wpa_actiond/PKGBUILD +++ b/core/wpa_actiond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184227 2013-05-04 14:17:40Z thomas $ +# $Id: PKGBUILD 187047 2013-06-03 11:15:41Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_actiond pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/wpa_actiond.git/" @@ -22,6 +22,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond" + install -D -m755 wpa_actiond "${pkgdir}/usr/bin/wpa_actiond" } # vim:set ts=2 sw=2 et: diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index c9cc76b72..cc71f99c5 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179639 2013-03-08 23:40:42Z foutrelis $ +# $Id: PKGBUILD 187048 2013-06-03 11:15:42Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=2.0 -pkgrel=3 +pkgrel=4 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') @@ -47,4 +47,8 @@ package() { install -d -m755 "${pkgdir}/usr/lib/systemd/system" install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/" + + # usrmove + cd "$pkgdir"/usr + mv sbin bin } diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index da5b43bb8..4d28f1031 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,36 +1,44 @@ -# $Id: PKGBUILD 170150 2012-11-03 17:53:42Z heftig $ +# $Id: PKGBUILD 188075 2013-06-08 11:18:20Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.2.3.2 +pkgver=3.8.0 pkgrel=1 -pkgdesc="GNOME Solitaire card games" +pkgdesc="A collection of patience games written in guile scheme" arch=(i686 x86_64 mips64el) license=(GPL) url="http://www.gnome.org" groups=('gnome-extra') -depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf) -makedepends=(intltool itstool docbook-xsl) +depends=(guile gtk3 librsvg libcanberra gconf hicolor-icon-theme dconf) +makedepends=(intltool itstool docbook-xsl yelp-tools desktop-file-utils) +optdepends=('libkdegames: KDE card sets' + 'pysolfc: PySol card sets' + 'pysolfc-cardsets: PySol card sets') options=('!emptydirs' '!libtool') install=aisleriot.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('06eeeef49e7a0f8a98142085a64bc7830d0dd02e480fbfa1309545fccc977a36') +sha256sums=('14954fe77fa953b20f5385292743857f79efd45e8b75fb06807e7cf17f9db004') build() { cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --disable-static \ + --with-card-theme-formats=all \ + --with-kde-card-theme-path=/usr/share/apps/carddecks \ + --with-pysol-card-theme-path=/usr/share/PySolFC + + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } package() { cd $pkgname-$pkgver - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + make DESTDIR="$pkgdir" install GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \ + --domain aisleriot "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 53f6fdfb5..7b822ce93 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,29 +1,39 @@ -# $Id: PKGBUILD 184322 2013-05-06 06:46:28Z andrea $ +# $Id: PKGBUILD 188070 2013-06-08 08:31:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://community.kde.org/KDE_PIM/Akonadi' license=('LGPL') depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') +makedepends=('cmake' 'automoc4' 'boost' 'postgresql') +optdepends=('postgresql: PostgreSQL backend') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bdce288f4b91055d69f35c26dab276d0') +source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2" + 'boost153.patch') +md5sums=('bdce288f4b91055d69f35c26dab276d0' + 'd797b338914c677fb6b93c0c23f46197') + +prepare() { + mkdir -p build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/boost153.patch +} build() { - mkdir build cd build CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \ - -DQT_QMAKE_EXECUTABLE=qmake-qt4 + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DAKONADI_BUILD_TESTS=OFF make } diff --git a/extra/akonadi/boost153.patch b/extra/akonadi/boost153.patch new file mode 100644 index 000000000..53ab4d91e --- /dev/null +++ b/extra/akonadi/boost153.patch @@ -0,0 +1,27 @@ +From: Sergio Martins <iamsergio@gmail.com> +Date: Tue, 28 May 2013 20:22:11 +0000 +Subject: Compile with boost-1.53 +X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=fe3f49cbd21a634c3257903a229b7d5357ee194a +--- +Compile with boost-1.53 + +The bug isn't going to be fixed in Qt4, so we need the ifdef. + +CCMAIL: vkrause@kde.org +--- + + +--- a/shared/akapplication.h ++++ b/shared/akapplication.h +@@ -23,7 +23,9 @@ + #include <QtCore/QObject> + + #ifndef _WIN32_WCE +-#include <boost/program_options.hpp> ++# ifndef Q_MOC_RUN ++# include <boost/program_options.hpp> ++# endif + #endif + + class QCoreApplication; + diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 0c302fd47..b0685b62c 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185605 2013-05-15 22:40:19Z andrea $ +# $Id: PKGBUILD 188524 2013-06-15 07:43:53Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org/" @@ -22,11 +22,19 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d') - -build() { +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde411.patch') +sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d' + 'c2fd0153ec622fccac47ebd31a1b0548c6222541') + +prepare() { mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kde411.patch +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/amarok/kde411.patch b/extra/amarok/kde411.patch new file mode 100644 index 000000000..8099a4432 --- /dev/null +++ b/extra/amarok/kde411.patch @@ -0,0 +1,35 @@ +commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448 +Author: Hrvoje Senjan <hrvoje.senjan@gmail.com> +Date: Mon Jun 10 09:26:37 2013 +0200 + + Remove usage of (fake) Amarok-Mockup theme + + This is due to https://bugs.kde.org/show_bug.cgi?id=320855 + Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11 + If it is still needed, or there is a better solution, i'll discard the review... + + From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001 + From: Hrvoje Senjan <hrvoje.senjan@gmail.com> + Date: Sun, 9 Jun 2013 19:55:58 +0200 + Subject: [PATCH 1/1] Kill Amarok-Mockup + + BUG: 320855 + FIXED-IN: 2.8 + REVIEW: 110917 + +diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp +index f61518f..152f8da 100644 +--- a/src/context/ContextView.cpp ++++ b/src/context/ContextView.cpp +@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, Plasma::Corona *corona, QWi + p.setColor( QPalette::Base, c ); + setPalette( p ); + +- PERF_LOG( "Accessing Plasma::Theme" ); +- // here we initialize all the Plasma paths to Amarok paths +- Plasma::Theme::defaultTheme()->setUseGlobalSettings( false ); +- Theme::defaultTheme()->setThemeName( "Amarok-Mockup" ); +- PERF_LOG( "Access to Plasma::Theme complete" ) + contextScene()->setAppletMimeType( "text/x-amarokappletservicename" ); + + cont->setPos( 0, 0 ); diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 53e3e6a6d..454f3bd4d 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184360 2013-05-06 19:36:35Z foutrelis $ +# $Id: PKGBUILD 188084 2013-06-08 17:28:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10802 +pkgver=10803 pkgrel=2 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('46bbfbfba0af431b6baa0c30bd35600c') +md5sums=('febf14f5b1185f25acde64f61b78ed38') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index ade163a66..85cee7edc 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $ +# $Id: PKGBUILD 188637 2013-06-17 09:36:56Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v url="http://www.anjuta.org/" options=('!libtool' '!emptydirs') source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95') +sha256sums=('eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17') build() { cd "$pkgbase-$pkgver" diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index a119da557..6602b518b 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 180169 2013-03-18 14:04:21Z jgc $ +# $Id: PKGBUILD 187049 2013-06-03 11:16:09Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache pkgver=2.2.24 -pkgrel=1 +pkgrel=3 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') options=('!libtool') url='http://www.apache.org/dist/httpd' license=('APACHE') -backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf +backup=(etc/httpd/conf/httpd.conf etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf @@ -36,11 +36,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 apache.conf.d apache.tmpfiles.conf httpd.logrotate - httpd httpd.service arch.layout) md5sums=('91bd1484aca13a7095d6432be37fc7ae' - 'f8f0d879b5fda028aad7ac9f329e057b' + 'SKIP' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' '0930d2d0612eb0a53a0d00aea7e8687f' @@ -54,10 +53,9 @@ md5sums=('91bd1484aca13a7095d6432be37fc7ae' '4ac64df6e019edbe137017cba1ff2f51' '08b3c875f6260644f2f52b4056d656b0' '82068753dab92fe86312b1010a2904d7' - '6382331e9700ed9e8cc78ea51887b537' - 'c7e300a287ef7e2e066ac7639536f87e' - 'ed219c8228d4d5ae9b7a55107cf79706' - '3d659d41276ba3bfcb20c231eb254e0c') + '13dbaaf949c5bc36cfcf5718b95cb020' + 'a823bb355c136fd0e2b3fb820e2d903c' + '6b7122245a67597230a3b3f317eaf34e') build() { cd "${srcdir}/httpd-${pkgver}" @@ -71,31 +69,41 @@ build() { cat "${srcdir}/arch.layout" >> config.layout + cd .. + cp -r httpd-${pkgver} httpd-itk-${pkgver} + + cd httpd-itk-${pkgver} + + # Fix patch to apply with latest Apache version + sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" + + mkdir -p server/mpm/experimental/itk + cp -r server/mpm/prefork/* server/mpm/experimental/itk/ + mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c + + patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" + patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" + patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" + patch -Np1 -i "${srcdir}/05-add-copyright.patch" + patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" + patch -Np1 -i "${srcdir}/07-base-functionality.patch" + patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" + patch -Np1 -i "${srcdir}/09-capabilities.patch" + patch -Np1 -i "${srcdir}/10-nice.patch" + patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" + + autoconf + cd .. for mpm in prefork worker itk; do if [ "${mpm}" = "itk" ]; then - # Fix patch to apply with latest Apache version - sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" - - mkdir -p server/mpm/experimental/itk - cp -r server/mpm/prefork/* server/mpm/experimental/itk/ - mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c - - patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" - patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" - patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" - patch -Np1 -i "${srcdir}/05-add-copyright.patch" - patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" - patch -Np1 -i "${srcdir}/07-base-functionality.patch" - patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" - patch -Np1 -i "${srcdir}/09-capabilities.patch" - patch -Np1 -i "${srcdir}/10-nice.patch" - patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" - - autoconf + CONFIGURE=../httpd-itk-${pkgver}/configure + else + CONFIGURE=../httpd-${pkgver}/configure fi + mkdir build-${mpm} pushd build-${mpm} - ../configure --enable-layout=Arch \ + $CONFIGURE --enable-layout=Arch \ --enable-modules=all \ --enable-mods-shared=all \ --enable-so \ @@ -103,7 +111,7 @@ build() { --with-suexec-caller=http \ --with-suexec-docroot=/srv/http \ --with-suexec-logfile=/var/log/httpd/suexec.log \ - --with-suexec-bin=/usr/sbin/suexec \ + --with-suexec-bin=/usr/bin/suexec \ --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ --enable-ldap --enable-authnz-ldap \ --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ @@ -117,15 +125,19 @@ build() { --with-pcre=/usr \ --with-mpm=${mpm} make - if [ "${mpm}" = "prefork" ]; then - make DESTDIR="${pkgdir}" install - else - install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}" - fi popd done +} + +package() { + cd "${srcdir}" + cd build-prefork + make DESTDIR="${pkgdir}" install + cd .. + + install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker" + install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk" - install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd" install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache" install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" @@ -149,9 +161,7 @@ build() { rm -rf "${pkgdir}/usr/share/httpd/manual" rm -rf "${pkgdir}/etc/httpd/conf/original" rm -rf "${pkgdir}/srv/" - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/var/run" - + rm -rf "${pkgdir}/run" install -m755 -d "${pkgdir}/usr/lib/systemd/system" install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/" diff --git a/extra/apache/arch.layout b/extra/apache/arch.layout index ab59db84b..d5d2e8a08 100644 --- a/extra/apache/arch.layout +++ b/extra/apache/arch.layout @@ -2,7 +2,7 @@ prefix: /etc/httpd exec_prefix: /usr bindir: /usr/bin - sbindir: /usr/sbin + sbindir: /usr/bin libdir: /usr/lib/httpd libexecdir: /usr/lib/httpd/modules mandir: /usr/share/man @@ -16,7 +16,7 @@ cgidir: /srv/http/cgi-bin includedir: /usr/include/httpd localstatedir: /var - runtimedir: /var/run/httpd + runtimedir: /run/httpd logfiledir: /var/log/httpd proxycachedir: /var/cache/httpd </Layout>
\ No newline at end of file diff --git a/extra/apache/httpd b/extra/apache/httpd deleted file mode 100755 index 6fa9c3cc7..000000000 --- a/extra/apache/httpd +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -daemon_name=httpd - -. /etc/rc.conf -. /etc/rc.d/functions - -APACHECTL=/usr/sbin/apachectl - -case "$1" in - start) - stat_busy "Starting Apache Web Server" - [ ! -d /var/run/httpd ] && install -d /var/run/httpd - if $APACHECTL start >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Apache Web Server" - if $APACHECTL stop >/dev/null ; then - rm_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - reload) - stat_busy "Reloading Apache Web Server" - if $APACHECTL graceful >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - restart) - stat_busy "Restarting Apache Web Server" - if $APACHECTL restart >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - status) - stat_busy "Checking Apache Web Server status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|reload|restart|status}" -esac - -exit 0 diff --git a/extra/apache/httpd.logrotate b/extra/apache/httpd.logrotate index a723d20d2..c9755de14 100644 --- a/extra/apache/httpd.logrotate +++ b/extra/apache/httpd.logrotate @@ -1,6 +1,6 @@ /var/log/httpd/*log { missingok postrotate - /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true endscript } diff --git a/extra/apache/httpd.service b/extra/apache/httpd.service index bb02b5992..247e28fba 100644 --- a/extra/apache/httpd.service +++ b/extra/apache/httpd.service @@ -5,9 +5,9 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking PIDFile=/run/httpd/httpd.pid -ExecStart=/usr/sbin/apachectl start -ExecStop=/usr/sbin/apachectl graceful-stop -ExecReload=/usr/sbin/apachectl graceful +ExecStart=/usr/bin/apachectl start +ExecStop=/usr/bin/apachectl graceful-stop +ExecReload=/usr/bin/apachectl graceful PrivateTmp=true LimitNOFILE=infinity diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD index ce7012596..c84d829b7 100644 --- a/extra/arora/PKGBUILD +++ b/extra/arora/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 145325 2011-12-21 20:47:00Z andrea $ +# $Id: PKGBUILD 188497 2013-06-15 04:38:48Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=arora pkgver=0.11.0 -pkgrel=3.1 +pkgrel=4 pkgdesc='Lightweight cross-platform Web browser' -url='http://www.arora-browser.org/' +url='http://code.google.com/p/arora/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('qtwebkit' 'desktop-file-utils') @@ -18,7 +18,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - qmake PREFIX='/usr' 'CONFIG-=debug' -r + qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r make } diff --git a/extra/arora/install b/extra/arora/install index 6c87527e2..b0409600c 100644 --- a/extra/arora/install +++ b/extra/arora/install @@ -1,6 +1,6 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true + update-desktop-database -q || true } post_upgrade() { diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD index 45b4196a8..8d4d68058 100644 --- a/extra/aspell-pt/PKGBUILD +++ b/extra/aspell-pt/PKGBUILD @@ -1,13 +1,11 @@ -# $Id: PKGBUILD 171362 2012-11-17 09:56:22Z eric $ +# $Id: PKGBUILD 188442 2013-06-14 04:11:14Z eric $ # Maintainer: -# Contributor: Simo Leone <simo@archlinux.org> -# Contributor: jlvsimoes <jlvsimoes@oninet.pt> pkgname=aspell-pt -_pkgverPT=20070510 +_pkgverPT=20130331 _pkgverBR=20090702 -pkgver=$_pkgverBR -pkgrel=4 +pkgver=$_pkgverPT +pkgrel=1 pkgdesc="Portuguese and Brazilian Portuguese dictionary for aspell" arch=('i686' 'x86_64' 'mips64el') url="http://aspell.net/" @@ -16,25 +14,34 @@ depends=('aspell') conflicts=('aspell-pt_br') replaces=('aspell-pt_br') source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.bz2 - ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-$_pkgverPT-0.tar.bz2) + http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-$_pkgverPT.tar.bz2 + http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-preao-$_pkgverPT.tar.bz2) sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26' - 'e136c2f411b582897437b06b9068c98ee333be41') + '694b35b1a6fcb90ff808b730a4513ff283e1ceee' + 'fa164ac44adc4544c7fdbb3dc5c146c28f30525a') build() { - cd "$srcdir/aspell6-pt_BR-$_pkgverBR-0" + cd aspell6-pt_BR-$_pkgverBR-0 ./configure make - cd "$srcdir/aspell6-pt_PT-$_pkgverPT-0" + cd ../aspell6-pt_PT-$_pkgverPT-0 + ./configure + make + + cd ../aspell6-pt_PT-preao-$_pkgverPT-0 ./configure make } package() { - cd "$srcdir/aspell6-pt_BR-$_pkgverBR-0" + cd aspell6-pt_BR-$_pkgverBR-0 + make DESTDIR="$pkgdir" install + + cd ../aspell6-pt_PT-$_pkgverPT-0 make DESTDIR="$pkgdir" install - cd "$srcdir/aspell6-pt_PT-$_pkgverPT-0" + cd ../aspell6-pt_PT-preao-$_pkgverPT-0 make DESTDIR="$pkgdir" install echo "add pt_BR.multi" > "$pkgdir"/usr/lib/aspell-0.60/brasileiro.alias diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index 66c49f488..ee4b8ed79 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169579 2012-10-23 20:01:18Z remy $ +# $Id: PKGBUILD 187088 2013-06-03 15:58:10Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Firmicus <francois.archlinux.org> # Contributor: bender02 at gmx dot com pkgname=asymptote -pkgver=2.21 +pkgver=2.23 pkgrel=1 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ optdepends=('python2: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install -sha1sums=('946269c63b7aa3a7d2875f5faa8a0b8d3d36628c') +sha1sums=('c24de9766ae7195c1cda947f9d2ae07497a0af8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,7 +27,8 @@ build() { ./configure --enable-gc=/usr \ --prefix=/usr \ --with-latex=/usr/share/texmf/tex/latex \ - --with-context=/usr/share/texmf/tex/context + --with-context=/usr/share/texmf/tex/context \ + --enable-offscreen make all } diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index fdf102f79..792a1ecfe 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178948 2013-03-01 10:19:16Z andrea $ +# $Id: PKGBUILD 188216 2013-06-13 06:07:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=attica -pkgver=0.4.1 -pkgrel=2 +pkgver=0.4.2 +pkgrel=1 pkgdesc='A Qt library that implements the Open Collaboration Services API' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kdesupport/attica' @@ -11,11 +11,9 @@ license=('LGPL') depends=('qt4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b90983ec5d79e5ddcbc9146fa23cab72') +md5sums=('d62c5c9489a68432e8d990dde7680c24') build() { - . /etc/profile.d/qt4.sh - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD index e1ce414c6..2d145eddb 100644 --- a/extra/autogen/PKGBUILD +++ b/extra/autogen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179949 2013-03-13 11:07:49Z jgc $ +# $Id: PKGBUILD 188076 2013-06-08 11:18:21Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soufly.nl> # Contributor: Tor Krill pkgname=autogen -pkgver=5.17.2 +pkgver=5.17.4 pkgrel=1 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ depends=('guile' 'libxml2') options=('!libtool') install=autogen.install source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('567dd065d24294c5c31517e399c2fcf5' - 'af72d4d6f27486366e7712c41f61b8fa') +md5sums=('09b031866b7d89f0532b6c3168d67c59' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index d1dfe3337..b5489bdad 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165789 2012-08-29 23:52:16Z thomas $ +# $Id: PKGBUILD 187832 2013-06-06 18:31:08Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.8 -pkgrel=2 +pkgver=4.0 +pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64 'mips64el') url="http://bftpd.sourceforge.net/" @@ -15,15 +15,13 @@ backup=(etc/bftpd.conf etc/pam.d/bftpd etc/xinetd.d/bftpd) source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz - bftpd.rc bftpd.logrotate bftpd.pam bftpd.xinetd bftpd.service bftpd.socket bftpd_AT.service) -md5sums=('880c1274e623ddd1e3e37f9f0cf09d70' - '2419d7293000813f9d01bd357181445c' +md5sums=('34bac87bb196ae823fa2b4731dfa9383' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' '23feb84e8ecbae5df320b49e01821d9a' @@ -35,6 +33,7 @@ build() { cd "${srcdir}"/$pkgname # The bftpd author keeps screwing up the release tarballs rm -f config.{cache,status} + autoreconf sed 's|$(prefix)/sbin|$(prefix)/bin|g' -i Makefile.in ./configure --prefix=/usr \ --enable-pam \ @@ -47,7 +46,6 @@ package() { cd "${srcdir}"/$pkgname install -d -m755 "${pkgdir}"/usr/{bin,share/man/man8} install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd - install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd make DESTDIR="${pkgdir}" install # Remove log file and /var/run from the package # This guy keeps messing up his Makefile, /usr/var, wtf? diff --git a/extra/bftpd/bftpd.rc b/extra/bftpd/bftpd.rc deleted file mode 100755 index 4784ae28a..000000000 --- a/extra/bftpd/bftpd.rc +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE="/var/run/bftpd.pid" - -case "$1" in - start) - stat_busy "Starting bftpd Server" - PID="$(pidof -o %PPID /usr/bin/bftpd)" - if [ -z "$PID" ]; then - /usr/bin/bftpd -d - if [ $? -gt 0 ]; then - stat_fail - else - # wait until it forks - sleep 2 - echo $(pidof -o %PPID /usr/bin/bftpd) > $PIDFILE - add_daemon bftpd - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping bftpd Server" - if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then - kill -15 $(cat $PIDFILE) - rm $PIDFILE - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD deleted file mode 100644 index 12dec55a7..000000000 --- a/extra/bluez-hcidump/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 157961 2012-04-30 07:30:22Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy carrier <geoffroy@archlinux.org> - -pkgname=bluez-hcidump -pkgver=2.4 -pkgrel=1.1 -pkgdesc="Bluetooth HCI package analyzer" -url="http://www.bluez.org/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -depends=('bluez') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz") -md5sums=('d39833de0ed26bddf784e9580b6f33c4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index fc4d04b4e..bd2a60214 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,83 +1,75 @@ -# $Id: PKGBUILD 162308 2012-06-24 20:46:50Z tomegun $ +# $Id: PKGBUILD 188424 2013-06-13 21:55:40Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -pkgname=bluez -pkgver=4.101 -pkgrel=1.1 -pkgdesc="Libraries and tools for the Bluetooth protocol stack" +pkgbase=bluez +pkgname=('bluez' 'bluez-utils' 'bluez-libs') +pkgver=5.5 +pkgrel=3 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('dbus-core' 'python2' 'systemd-tools') -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') -optdepends=("gstreamer0.10-base: bluetooth GStreamer support" - "alsa-lib: Audio bluetooth devices support" - "dbus-python: to run bluez-simple-agent" - "pygobject: to run bluez-simple-agent" - "libusb-compat: USB adapters support" - "cups: CUPS backend") -conflicts=('bluez-libs' 'bluez-utils') -provides=('bluez-libs' 'bluez-utils') -replaces=('bluez-libs' 'bluez-utils') -options=('!libtool') -backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf - 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - 'bluetooth.conf.d' - 'rc.bluetooth') +makedepends=('libusb-compat' 'dbus' 'libical' 'systemd') +options=(!libtool) +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2") build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/lib \ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-dfutool \ - --enable-hid2hci \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --enable-cups \ - --enable-wiimote \ - --disable-test \ - --with-systemdunitdir=/usr/lib/systemd/system + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --enable-library # this is deprecated make } -package() { +package_bluez() { + pkgdesc="Daemons for the bluetooth protocol stack" + depends=('libical' 'dbus' 'glib2') + optdepends=("cups: CUPS backend") + backup=('etc/dbus-1/system.d/bluetooth.conf') + conflicts=('obexd-client' 'obexd-server') + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth - - install -d ${pkgdir}/etc/bluetooth - install -m644 network/network.conf \ - input/input.conf \ - audio/audio.conf \ - serial/serial.conf \ - ${pkgdir}/etc/bluetooth/ - - install -Dm644 ${srcdir}/bluetooth.conf.d \ - ${pkgdir}/etc/conf.d/bluetooth + ### split out bluez-utils + rm -rf "$srcdir/_utils" + install -dm755 "$srcdir"/_utils/usr/share/man + mv "$pkgdir"/usr/share/man/man1 "$srcdir"/_utils/usr/share/man/ + install -dm755 "$srcdir"/_utils/usr/bin + mv "$pkgdir"/usr/bin/{bccmd,ciptool,hciattach,hciconfig,hcidump,hcitool,l2ping,l2test,rctest,rfcomm,sdptool}\ + "$srcdir"/_utils/usr/bin/ + install -dm755 "$srcdir"/_utils/usr/lib + mv "$pkgdir"/usr/lib/udev "$srcdir"/_utils/usr/lib/ + + ### split out bluez-libs + rm -rf "$srcdir/_libs" + install -dm755 "$srcdir"/_libs/usr/lib/ + mv "$pkgdir"/usr/lib/{pkgconfig,libbluetooth*} \ + "$srcdir"/_libs/usr/lib/ + mv "$pkgdir"/usr/include \ + "$srcdir"/_libs/usr/ +} + +package_bluez-libs() { + pkgdesc="Deprecated libraries for the bluetooth protocol stack" + depends=('glibc') + + mv "$srcdir/_libs"/* "$pkgdir" +} +package_bluez-utils() { + pkgdesc="Development and debugging utilities for the bluetooth protocol stack" + depends=('systemd' 'libusb-compat') + conflicts=('bluez-hcidump') + provides=('bluez-hcidump') + replaces=('bluez-hcidump' 'bluez<=4.101') - # FS#27630 - install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent - install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device - install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input - sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - "${pkgdir}"/usr/bin/bluez-simple-agent \ - "${pkgdir}"/usr/bin/bluez-test-device \ - "${pkgdir}"/usr/bin/bluez-test-input + mv "$srcdir/_utils"/* "$pkgdir" } -md5sums=('902b390af95c6c5d6d1a17d94c8344ab' - '7412982b440f29fa7f76a41a87fef985' - '864cbd24e6efc3592e9284b0b5fb2cfd') +md5sums=('cfe6bd2f7f3f45f689b3a21a6ba59edd') diff --git a/extra/bluez/bluetooth.conf.d b/extra/bluez/bluetooth.conf.d deleted file mode 100644 index 1c1e02589..000000000 --- a/extra/bluez/bluetooth.conf.d +++ /dev/null @@ -1,30 +0,0 @@ -# Bluetooth configuraton file - -# Bluetooth services (allowed values are "true" and "false") - -# Run the bluetoothd daemon (default: true) -#DAEMON_ENABLE="false" - -# Run the sdp daemon (default: false) -# If this is disabled, hcid's internal sdp daemon will be used -#SDPD_ENABLE="true" - -# Run the bluetooth HID daemon (default: false) -#HIDD_ENABLE="true" - -# Activate rfcomm ports (default: false) -#RFCOMM_ENABLE="true" - -# Run bluetooth dial-up networking daemon (default: false) -#DUND_ENABLE="true" - -# Run bluetooth PAN daemon (default: false) -#PAND_ENABLE="true" - -# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) -#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -# Options for hidd, dund and pand (default: none) -HIDD_OPTIONS="--server" -#DUND_OPTIONS="" -#PAND_OPTIONS="" diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth deleted file mode 100644 index 0feeaeab6..000000000 --- a/extra/bluez/rc.bluetooth +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# -# Start/stop the Bluetooth daemons -# - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="bluetoothd" -HIDD_NAME="hidd" -RFCOMM_NAME="rfcomm" -PAND_NAME="pand" -DUND_NAME="dund" - -DAEMON_EXEC="/usr/sbin/bluetoothd" -HIDD_EXEC="/usr/bin/hidd" -RFCOMM_EXEC="/usr/bin/rfcomm" -PAND_EXEC="/usr/bin/pand" -DUND_EXEC="/usr/bin/dund" - -DAEMON_ENABLE="true" -HIDD_ENABLE="false" -RFCOMM_ENABLE="false" -PAND_ENABLE="false" -DUND_ENABLE="false" - -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -HIDD_OPTIONS="" -PAND_OPTIONS="" -DUND_OPTIONS="" - -[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - -case "$1" in - start) - stat_busy "Starting bluetooth subsystem:" - if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then - stat_append " $DAEMON_NAME" - $DAEMON_EXEC - sleep 1 - fi - if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then - stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS - fi - if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all - fi - if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then - stat_append " $PAND_NAME" - $PAND_EXEC $PAND_OPTIONS - fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi - add_daemon bluetooth - stat_done - ;; - stop) - stat_busy "Stopping bluetooth subsystem:" - - stat_append " $DUND_NAME" - killall $DUND_NAME >/dev/null 2>&1 - - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - - if [ -x "$RFCOMM_EXEC" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC release all >/dev/null 2>&1 - fi - - stat_append " $HIDD_NAME" - killall $HIDD_NAME >/dev/null 2>&1 - - stat_append " $DAEMON_NAME" - killall $DAEMON_NAME >/dev/null 2>&1 - - rm_daemon bluetooth - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/bluez4/PKGBUILD b/extra/bluez4/PKGBUILD new file mode 100644 index 000000000..4d95290c3 --- /dev/null +++ b/extra/bluez4/PKGBUILD @@ -0,0 +1,88 @@ +# $Id: PKGBUILD 188425 2013-06-13 21:55:41Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> + +pkgname=bluez4 +pkgver=4.101 +pkgrel=3 +pkgdesc="Deprecated daemon and tools for the Bluetooth protocol stack" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('dbus' 'bluez-utils') +conflicts=('bluez') +replaces=("bluez<=$pkgver") +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') +optdepends=("gstreamer0.10-base: bluetooth GStreamer support" + "alsa-lib: Audio bluetooth devices support" + "python2: to run bluez-simple-agent" + "dbus-python: to run bluez-simple-agent" + "pygobject: to run bluez-simple-agent" + "libusb-compat: USB adapters support" + "cups: CUPS backend") +options=('!libtool') +backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf + etc/dbus-1/system.d/bluetooth.conf) +source=("http://www.kernel.org/pub/linux/bluetooth/bluez-${pkgver}.tar.bz2") + +build() { + cd bluez-"${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --sbindir=/usr/lib/bluetooth \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-dfutool \ + --enable-dund \ + --enable-hidd \ + --enable-pand \ + --enable-gatt \ + --enable-cups \ + --enable-wiimote \ + --disable-test \ + --with-systemdunitdir=/usr/lib/systemd/system + + make +} + +package() { + cd bluez-"${pkgver}" + make DESTDIR=${pkgdir} install + + # adjust systemd service file + sed -i 's#/usr/sbin/#/usr/lib/bluetooth/#' \ + "${pkgdir}"/usr/lib/systemd/system/bluetooth.service + + install -d ${pkgdir}/etc/bluetooth + install -m644 network/network.conf \ + input/input.conf \ + audio/audio.conf \ + serial/serial.conf \ + ${pkgdir}/etc/bluetooth/ + + # FS#27630 + install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent + install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device + install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input + sed -i 's#/usr/bin/python#/usr/bin/python2#' \ + "${pkgdir}"/usr/bin/bluez-simple-agent \ + "${pkgdir}"/usr/bin/bluez-test-device \ + "${pkgdir}"/usr/bin/bluez-test-input + + # drop files that are in bluez-libs + rm -rf "${pkgdir}"/usr/{include,lib/pkgconfig} + rm "${pkgdir}"/usr/lib/libbluetooth* + + # drop files that are in bluez-utils + rm -rf "${pkgdir}"/lib + rm "${pkgdir}"/usr/bin/{ciptool,hcitool,l2ping,rfcomm,sdptool} + rm "${pkgdir}"/usr/share/man/man1/{ciptool,hcitool,rfcomm,sdptool}.1 + rm "${pkgdir}"/usr/lib/bluetooth/{hciattach,hciconfig} + rm "${pkgdir}"/usr/share/man/man8/{hciattach,hciconfig}.8 +} +md5sums=('902b390af95c6c5d6d1a17d94c8344ab') diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index e1aca1de3..29c1c5e1c 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 183561 2013-04-23 13:10:19Z tomegun $ +# $Id: PKGBUILD 187859 2013-06-07 09:24:55Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.5 -pkgrel=3 +pkgrel=4 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://mielke.cc/brltty" license=(GPL LGPL) depends=(libxaw gpm icu tcl cython) -makedepends=(bluez at-spi2-core) -optdepends=('bluez: bluetooth support' +makedepends=(bluez-libs at-spi2-core) +optdepends=('bluez-libs: bluetooth support' 'at-spi2-core: X11/GNOME Apps accessibility' 'atk: ATK bridge for X11/GNOME accessibility') backup=(etc/brltty.conf) diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index 8deae238c..ec409f8b9 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183337 2013-04-21 22:08:38Z heftig $ +# $Id: PKGBUILD 187111 2013-06-04 04:29:06Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.10 +pkgver=0.4.11 pkgrel=1 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(intltool docbook-xsl gtk2) install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('6480ce3a87cf4f01dd1fb52edbb31a2aa9f5573a0860b67115c86bbcd7b17865') +sha256sums=('e4e81387a1a6875652b8ec9dede8573844fac274c8de9ad0416cf586a318f4f9') build() { cd $pkgname-$pkgver @@ -25,6 +25,10 @@ build() { --disable-gtk2-module \ --disable-static \ --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 35d1b4d71..e0a9df0fd 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186227 2013-05-22 10:21:47Z andrea $ +# $Id: PKGBUILD 187917 2013-06-08 07:00:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.11 +pkgver=2.8.11.1 pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,15 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('be6008f2299613d23fe82ab53ef7472e') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'imagemagick.patch') +md5sums=('df5324a3b203373a9e0a04b924281a43' + '19c4cf0e6e9c9a890f3698c9df8062f1') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/imagemagick.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/cmake/imagemagick.patch b/extra/cmake/imagemagick.patch new file mode 100644 index 000000000..8e5279030 --- /dev/null +++ b/extra/cmake/imagemagick.patch @@ -0,0 +1,27 @@ +From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 +From: Funda Wang <fundawang@gmail.com> +Date: Tue, 28 May 2013 06:17:49 +0000 +Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174) + +The header files of ImageMagick are now located at +<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. +--- + Modules/FindImageMagick.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake +index cd97b38..02a5777 100644 +--- a/Modules/FindImageMagick.cmake ++++ b/Modules/FindImageMagick.cmake +@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES +- ImageMagick ++ ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." + ) + find_library(ImageMagick_${component}_LIBRARY +-- +1.7.0 + diff --git a/extra/cmake/qt4.patch b/extra/cmake/qt4.patch deleted file mode 100644 index 0518681f0..000000000 --- a/extra/cmake/qt4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-03-07 16:50:35.388399689 +0000 -+++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-03-07 16:51:35.017991029 +0000 -@@ -497,7 +497,7 @@ - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac --find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac -+find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac - PATHS - ENV QTDIR - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD index b07530b05..a59561d22 100644 --- a/extra/cups-pk-helper/PKGBUILD +++ b/extra/cups-pk-helper/PKGBUILD @@ -1,7 +1,7 @@ -#$Id: PKGBUILD 169617 2012-10-24 17:03:25Z ibiru $ +#$Id: PKGBUILD 188583 2013-06-16 10:29:51Z tomegun $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cups-pk-helper -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="A helper that makes system-config-printer use PolicyKit" arch=(i686 x86_64 'mips64el') @@ -10,7 +10,7 @@ license=('GPL') depends=(polkit libcups) makedepends=(intltool) source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz) -sha256sums=('d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3') +sha256sums=('19221eed65a1e1498d396f3f99a783a95b21b4385e63b57a1f16e8728b8ca118') build() { cd $pkgname-$pkgver diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index b598ce0f3..9c7fb3531 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,29 +1,56 @@ -# $Id: PKGBUILD 185777 2013-05-18 15:46:13Z andyrtr $ +# $Id: PKGBUILD 188723 2013-06-18 15:31:30Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 +source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 + http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz + cups.logrotate cups.pam + # improve build and linking cups-no-export-ssllibs.patch cups-no-gcrypt.patch cups-no-gzip-man.patch + # FC cups-systemd-socket.patch - cups.logrotate cups.pam) + cups-dbus-utf8.patch + cups-res_init.patch + cups-avahi-address.patch + cups-enum-all.patch + # Gentoo + cups-1.6.0-fix-install-perms.patch + cups-1.6.2-statedir.patch + # Debian + usb-backend-more-quirk-rules.patch + cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch + get-ppd-file-for-statically-configured-ipp-shared-queues.patch + ppd-poll-with-client-conf.patch + usb-backend-do-not-crash-if-usb-disabled-in-bios.patch) #options=('!emptydirs') -md5sums=('13c8b2b2336d42001abe4899766b62dc' +md5sums=('8b8e40560b67e28607b1f04dafd9a94d' + 'f861b18f4446c43918c8643dcbbd7f6d' + '96f82c38f3f540b53f3e5144900acf17' '3ba9e3410df1dc3015463d615ef91b3b' 'cc4101beccb5ed6deb1c92707a575925' '90c30380d4c8cd48a908cfdadae1ea24' 'b4868b83f7f2d6ec24a1be76509379f0' - 'f861b18f4446c43918c8643dcbbd7f6d' - '96f82c38f3f540b53f3e5144900acf17') + 'a2a88b3a3257c3b5fd3edcc169e6aca4' + '8fe27d4248cacbc02824e7937cab4088' + 'df0c367c0022e3c7d8e01827e8a6c5e7' + 'f30c2a161caaf27854581507cde8cac6' + '5117f65342fcc69c6a506529e4daca9e' + '9247e218eea94ebda0aebc8ee0e77db8' + '52675e2d7a7f77005f1fc0212b86dbe3' + 'cb58bf4e0b80eaee383712e5c84a1ab4' + 'b578bcd17949a7203237ba1e31f78ef9' + '0becd6ab8782b97f19a02c1dc174c75e' + 'f1f0ee65296d438a8c83467ff03f652d') build() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -40,6 +67,36 @@ build() { # don't zip man pages in make install, let makepkg do that / Fedora patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch + + + # various bugfixes (upstream reports/SVN or Fedora/Debian + + # Ensure attributes are valid UTF-8 in dbus notifier + patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch + + # More USB quirks for the libusb-based backend (STR #4311) + # Fixed in 1.6.3 + patch -Np1 -i ${srcdir}/usb-backend-more-quirk-rules.patch + # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll. + patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch + # Applications could not get the PPD file for statically-configured IPP-shared print queues + patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch + # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs + # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763 + patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch + # Add more error handling to the libusb-based USB backend, especially to avoid a crash when USB is disabled in the BIOS. Also + # discard that error when counting warning messages. + patch -Np1 -i ${srcdir}/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch + # fix permissions on some files - alternative: cups-0755.patch by FC + patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch + # move /var/run -> /run for pid file + patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch + # Re-initialise the resolver on failure in httpAddrGetList() + patch -Np1 -i ${srcdir}/cups-res_init.patch + # Use IP address when resolving DNSSD URIs + patch -Np1 -i ${srcdir}/cups-avahi-address.patch + # Return from cupsEnumDests() once all records have been returned. + patch -Np1 -i ${srcdir}/cups-enum-all.patch # Rebuild configure script for not zipping man-pages. aclocal -I config-scripts diff --git a/extra/cups/cups-1.6.0-fix-install-perms.patch b/extra/cups/cups-1.6.0-fix-install-perms.patch new file mode 100644 index 000000000..2d7a77c44 --- /dev/null +++ b/extra/cups/cups-1.6.0-fix-install-perms.patch @@ -0,0 +1,25 @@ +Index: Makedefs.in +=================================================================== +--- Makedefs.in (Revision 10520) ++++ Makedefs.in (Arbeitskopie) +@@ -40,14 +40,14 @@ + # Installation programs... + # + +-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ +-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ ++INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ ++INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@ + INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ +-INSTALL_DATA = $(INSTALL) -c -m 444 ++INSTALL_DATA = $(INSTALL) -c -m 644 + INSTALL_DIR = $(INSTALL) -d +-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ +-INSTALL_MAN = $(INSTALL) -c -m 444 +-INSTALL_SCRIPT = $(INSTALL) -c -m 555 ++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ ++INSTALL_MAN = $(INSTALL) -c -m 644 ++INSTALL_SCRIPT = $(INSTALL) -c -m 755 + + # + # Default user, group, and system groups for the scheduler... diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch new file mode 100644 index 000000000..3e836657d --- /dev/null +++ b/extra/cups/cups-1.6.2-statedir.patch @@ -0,0 +1,12 @@ +diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4 +--- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200 ++++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200 +@@ -429,7 +429,7 @@ + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac + AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/extra/cups/cups-avahi-address.patch b/extra/cups/cups-avahi-address.patch new file mode 100644 index 000000000..a03d1adbb --- /dev/null +++ b/extra/cups/cups-avahi-address.patch @@ -0,0 +1,75 @@ +diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c +--- cups-1.6.2/cups/http-support.c.avahi-address 2013-03-11 18:44:36.000000000 +0000 ++++ cups-1.6.2/cups/http-support.c 2013-04-04 15:39:06.651847041 +0100 +@@ -2121,7 +2121,7 @@ http_resolve_cb( + const char *type, /* I - Registration type */ + const char *domain, /* I - Domain (unused) */ + const char *hostTarget, /* I - Hostname */ +- const AvahiAddress *address, /* I - Address (unused) */ ++ const AvahiAddress *address, /* I - Address */ + uint16_t port, /* I - Port number */ + AvahiStringList *txt, /* I - TXT record */ + AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */ +@@ -2253,36 +2253,37 @@ http_resolve_cb( + + DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget)); + +- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); +- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) ++ int error = getnameinfo(&(address->data), ++ address->proto == AVAHI_PROTO_INET ? ++ sizeof (AvahiIPv4Address) : ++ (address->proto == AVAHI_PROTO_INET6 ? ++ sizeof (AvahiIPv6Address) : ++ sizeof (address->data)), ++ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); ++ ++ if (!error) + { +- for (addr = addrlist; addr; addr = addr->next) ++ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); ++ ++ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || ++ _cups_strcasecmp(hostptr, ".local")) + { +- int error = getnameinfo(&(addr->addr.addr), +- httpAddrLength(&(addr->addr)), +- fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); +- +- if (!error) +- { +- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); +- +- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || +- _cups_strcasecmp(hostptr, ".local")) +- { +- hostTarget = fqdn; +- break; +- } +- } ++ hostTarget = fqdn; ++ } ++ } + #ifdef DEBUG +- else +- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", +- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), +- error)); ++ else ++ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", ++ httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), ++ error)); + #endif /* DEBUG */ +- } ++ } else { ++ /* ++ * Use the IP address that responded... ++ */ + +- httpAddrFreeList(addrlist); +- } ++ avahi_address_snprint (fqdn, sizeof (fqdn), address); ++ hostTarget = fqdn; + } + + /* diff --git a/extra/cups/cups-dbus-utf8.patch b/extra/cups/cups-dbus-utf8.patch new file mode 100644 index 000000000..0bcd4a163 --- /dev/null +++ b/extra/cups/cups-dbus-utf8.patch @@ -0,0 +1,106 @@ +diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c +--- cups-1.6.1/notifier/dbus.c.dbus-utf8 2012-01-20 19:00:32.000000000 +0000 ++++ cups-1.6.1/notifier/dbus.c 2012-10-31 11:04:47.686973616 +0000 +@@ -31,6 +31,9 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <assert.h> ++#include <locale.h> ++#include <wchar.h> + + #ifdef HAVE_DBUS + # include <dbus/dbus.h> +@@ -157,10 +160,82 @@ enum + * Local functions... + */ + +-static int acquire_lock(int *fd, char *lockfile, size_t locksize); ++static int acquire_lock(int *fd, char *lockfile, size_t locksize); ++static const char *validate_utf8(const char *str); + + + /* ++ * 'validate_utf8()' - Convert to valid UTF-8 ++ */ ++ ++static const char * ++validate_utf8 (const char *str) ++{ ++ static char *buffer = NULL; ++ static size_t buflen = 0; ++ char *p; ++ size_t str_len; ++ unsigned int i; ++ mbstate_t instate, outstate; ++ ++ if (str == NULL) ++ { ++ free (buffer); ++ return (NULL); ++ } ++ ++ /* Is it already valid? */ ++ if (mbstowcs (NULL, str, 0) != (size_t) -1) ++ return str; ++ ++ /* Make sure our buffer is at least as large as the input string */ ++ str_len = strlen (str); ++ if (str_len > buflen) ++ { ++ if (buffer == NULL) ++ /* Set encoding type to UTF-8 the first time we need to */ ++ setlocale (LC_CTYPE, "en_US.UTF-8"); ++ ++ buflen = str_len + 1; ++ buffer = realloc (buffer, buflen); ++ } ++ ++ memset (&instate, '\0', sizeof (mbstate_t)); ++ memset (&outstate, '\0', sizeof (mbstate_t)); ++ p = buffer; ++ i = 0; ++ while (i < str_len) ++ { ++ wchar_t wc; ++ size_t used, written; ++ mbstate_t orig_instate = instate; ++ used = mbrtowc (&wc, str + i, str_len - i, &instate); ++ switch (used) ++ { ++ case (size_t) -2: ++ case (size_t) -1: ++ wc = L'?'; /* so replacement is never longer than original char */ ++ instate = orig_instate; ++ /* fallthru */ ++ case 0: ++ used = 1; ++ } ++ ++ written = wcrtomb (p, wc, &outstate); ++ if (written != -1) ++ { ++ p += written; ++ assert (p - buffer < buflen); ++ } ++ ++ i += used; ++ } ++ ++ *p = '\0'; ++ return buffer; ++} ++ ++/* + * 'main()' - Read events and send DBUS notifications. + */ + +@@ -366,7 +441,7 @@ main(int argc, /* I - Number of comm + attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT); + if (attr) + { +- const char *val = ippGetString(attr, 0, NULL); ++ const char *val = validate_utf8 (ippGetString(attr, 0, NULL)); + if (!dbus_message_iter_append_string(&iter, &val)) + goto bail; + } diff --git a/extra/cups/cups-enum-all.patch b/extra/cups/cups-enum-all.patch new file mode 100644 index 000000000..0ac39835e --- /dev/null +++ b/extra/cups/cups-enum-all.patch @@ -0,0 +1,17 @@ +diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c +--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100 ++++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100 +@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb( + break; + + case AVAHI_BROWSER_REMOVE: +- case AVAHI_BROWSER_ALL_FOR_NOW: + case AVAHI_BROWSER_CACHE_EXHAUSTED: + break; ++ ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ avahi_simple_poll_quit(data->simple_poll); ++ break; + } + } + diff --git a/extra/cups/cups-res_init.patch b/extra/cups/cups-res_init.patch new file mode 100644 index 000000000..94a81a457 --- /dev/null +++ b/extra/cups/cups-res_init.patch @@ -0,0 +1,26 @@ +diff -up cups-1.6b1/cups/http-addr.c.res_init cups-1.6b1/cups/http-addr.c +--- cups-1.6b1/cups/http-addr.c.res_init 2012-05-17 00:57:03.000000000 +0200 ++++ cups-1.6b1/cups/http-addr.c 2012-05-25 15:51:51.323916352 +0200 +@@ -254,7 +254,8 @@ httpAddrLookup( + + if (error) + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + return (httpAddrString(addr, name, namelen)); +diff -up cups-1.6b1/cups/http-addrlist.c.res_init cups-1.6b1/cups/http-addrlist.c +--- cups-1.6b1/cups/http-addrlist.c.res_init 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/cups/http-addrlist.c 2012-05-25 16:05:05.930377452 +0200 +@@ -540,7 +540,8 @@ httpAddrGetList(const char *hostname, /* + } + else + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0); diff --git a/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch b/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch new file mode 100644 index 000000000..ee36936f8 --- /dev/null +++ b/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch @@ -0,0 +1,19 @@ +Description: Fixed crash which sometimes happens on shutdown of the CUPS + daemon, caused by a wrong shutdown sequence for shutting down the Avahi + threaded poll. +Author: Till Kamppeter <till.kamppeter@gmail.com> +Bug-Upstream: http://cups.org/str.php?L4180 +Bug-Upstream: http://cups.org/str.php?L4213 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1034045 +Last-Updated: 2012-10-16 + +--- a/scheduler/dirsvc.c ++++ b/scheduler/dirsvc.c +@@ -1333,6 +1333,7 @@ + DNSSDMaster = NULL; + + # else /* HAVE_AVAHI */ ++ avahi_threaded_poll_stop(DNSSDMaster); + avahi_client_free(DNSSDClient); + DNSSDClient = NULL; + diff --git a/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch b/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch new file mode 100644 index 000000000..ed132d750 --- /dev/null +++ b/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch @@ -0,0 +1,31 @@ +Description: Applications could not get the PPD file for + statically-configured IPP-shared print queues +Author: Till Kamppeter <till.kamppeter@gmail.com> +Bug-Upstream: http://cups.org/str.php?L4178 +Last-Updated: 2012-09-19 + +--- a/cups/util.c ++++ b/cups/util.c +@@ -1731,6 +1731,22 @@ + + return (1); + } ++ else if (device_uri && ++ (!strncmp(device_uri, "ipp:", 4) != NULL || ++ !strncmp(device_uri, "ipps:", 5) != NULL)) ++ { ++ /* ++ * Statically-configured IPP shared printer. ++ */ ++ ++ httpSeparateURI(HTTP_URI_CODING_ALL, ++ device_uri, ++ scheme, sizeof(scheme), username, sizeof(username), ++ host, hostsize, port, resource, resourcesize); ++ ippDelete(response); ++ ++ return (1); ++ } + else if ((attr = ippFindAttribute(response, "member-uris", + IPP_TAG_URI)) != NULL) + { diff --git a/extra/cups/ppd-poll-with-client-conf.patch b/extra/cups/ppd-poll-with-client-conf.patch new file mode 100644 index 000000000..8985fa3be --- /dev/null +++ b/extra/cups/ppd-poll-with-client-conf.patch @@ -0,0 +1,23 @@ +Description: If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server +Bug: http://www.cups.org/str.php?L2763 + +--- a/cups/util.c ++++ b/cups/util.c +@@ -1085,11 +1085,13 @@ + http2 = http; + else if ((http2 = httpConnectEncrypt(hostname, port, + cupsEncryption())) == NULL) +- { +- DEBUG_puts("1cupsGetPPD3: Unable to connect to server"); ++ if ((http2 = httpConnectEncrypt(http_hostname, http_port, ++ cupsEncryption())) == NULL) ++ { ++ DEBUG_puts("1cupsGetPPD3: Unable to connect to server"); + +- return (HTTP_SERVICE_UNAVAILABLE); +- } ++ return (HTTP_SERVICE_UNAVAILABLE); ++ } + + /* + * Get a temp file... diff --git a/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch new file mode 100644 index 000000000..711dab8ce --- /dev/null +++ b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch @@ -0,0 +1,54 @@ +Description: Add more error handling to the libusb-based USB backend, + especially to avoid a crash when USB is disabled in the BIOS. Also + discard that error when counting warning messages. +Author: Till Kamppeter <till.kamppeter@gmail.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1108719 +Last-Update: 2013-05-03 +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -898,7 +898,8 @@ + /* Pointer to current alternate setting */ + const struct libusb_endpoint_descriptor *endpptr = NULL; + /* Pointer to current endpoint */ +- ssize_t numdevs, /* number of connected devices */ ++ ssize_t err = 0, ++ numdevs, /* number of connected devices */ + i = 0; + uint8_t conf, /* Current configuration */ + iface, /* Current interface */ +@@ -917,7 +918,13 @@ + * Initialize libusb... + */ + +- libusb_init(NULL); ++ err = libusb_init(NULL); ++ if (err) ++ { ++ fprintf(stderr, "WARNING: Unable to initialize USB access via libusb, libusb error %i\n", err); ++ return (NULL); ++ } ++ + numdevs = libusb_get_device_list(NULL, &list); + fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs); + +@@ -1087,7 +1094,8 @@ + * Clean up .... + */ + +- libusb_free_device_list(list, 1); ++ if (numdevs >= 0) ++ libusb_free_device_list(list, 1); + libusb_exit(NULL); + + return (NULL); +--- a/test/run-stp-tests.sh ++++ b/test/run-stp-tests.sh +@@ -838,7 +838,7 @@ + fi + + # Warning log messages +-count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'` ++count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | wc -l | awk '{print $1}'` + if test $count != 9; then + echo "FAIL: $count warning messages, expected 9." + $GREP '^W ' /tmp/cups-$user/log/error_log diff --git a/extra/cups/usb-backend-more-quirk-rules.patch b/extra/cups/usb-backend-more-quirk-rules.patch new file mode 100644 index 000000000..3b72011d6 --- /dev/null +++ b/extra/cups/usb-backend-more-quirk-rules.patch @@ -0,0 +1,66 @@ +Description: USB backend quirk rule for Epson Stylus Photo 750 (and maybe others) +Author: Didier Raboud <odyx@debian.org> +Bugs-Debian: http://bugs.debian.org/697970 +Last-Update: 2013-03-11 + +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -142,8 +142,12 @@ + { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */ + { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */ + { 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */ ++ { 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International, ++ Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */ + { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, + by zut <kernel@zut.de> */ ++ { 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D ++ Printer, https://bugs.launchpad.net/bugs/1160638 */ + { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200 + Printer, http://www.cups.org/str.php?L4155 */ + { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300 +@@ -158,6 +162,8 @@ + Printer, http://www.cups.org/str.php?L4155 */ + { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560 + Printer, http://www.cups.org/str.php?L4155 */ ++ { 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150 ++ Printer, https://bugs.launchpad.net/bugs/1160638 */ + { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd + HL-1430 Laser Printer, + https://bugs.launchpad.net/bugs/1038695 */ +@@ -165,24 +171,33 @@ + USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd + HL-1440 Laser Printer, + https://bugs.launchpad.net/bugs/1000253 */ ++ { 0x04f9, 0x000e, USBLP_QUIRK_BIDIR | ++ USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd ++ HL-1450 Laser Printer, ++ https://bugs.launchpad.net/bugs/1000253 */ + { 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. + Okipage 14ex Printer, + https://bugs.launchpad.net/bugs/872483 */ + { 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d, + https://bugs.launchpad.net/bugs/872483 */ +- { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, ++ { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR | ++ USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, + http://bugs.debian.org/697970 */ ++ { 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670, ++ https://bugs.launchpad.net/bugs/872483 */ + { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt + Printer M129C */ + { 0x067b, 0x2305, USBLP_QUIRK_BIDIR | + USBLP_QUIRK_NO_REATTACH | + USBLP_QUIRK_RESET }, ++ /* Prolific Technology, Inc. PL2305 Parallel Port ++ (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ + { 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124 + https://bugzilla.redhat.com/show_bug.cgi?id=867392 */ + { 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210 + https://bugs.launchpad.net/bugs/1102470 */ +- /* Prolific Technology, Inc. PL2305 Parallel Port +- (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ ++ { 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics ++ CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */ + { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices, + https://bugs.launchpad.net/bugs/1032456 */ + { 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices, diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 7915d580f..07cf8e0cb 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186312 2013-05-24 16:21:18Z jgc $ +# $Id: PKGBUILD 187053 2013-06-03 11:16:18Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.26 -pkgrel=3 +pkgrel=4 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" @@ -25,7 +25,6 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d - saslauthd tmpfiles.conf) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' @@ -37,7 +36,6 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20' '45bb0192d2f188066240b9a66ee6365f') build() { @@ -76,6 +74,7 @@ build() { ./configure --prefix=/usr \ --host=$CHOST \ --build=$CHOST \ + --sbin=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ @@ -133,7 +132,6 @@ package_cyrus-sasl() { cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" diff --git a/extra/cyrus-sasl/saslauthd b/extra/cyrus-sasl/saslauthd deleted file mode 100644 index 6afafae0b..000000000 --- a/extra/cyrus-sasl/saslauthd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="saslauthd" -SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_RUN=/var/run/saslauthd -SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd - if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then - add_daemon $DAEMON_NAME - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon $DAEMON_NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD index 0293473a7..dca4adc8d 100644 --- a/extra/davfs2/PKGBUILD +++ b/extra/davfs2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165783 2012-08-29 23:04:18Z thomas $ +# $Id: PKGBUILD 187054 2013-06-03 11:16:20Z allan $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=davfs2 pkgver=1.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="File system driver that allows you to mount a WebDAV folder" arch=(i686 x86_64 'mips64el') url="http://savannah.nongnu.org/projects/davfs2" @@ -14,19 +14,14 @@ sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044') build() { cd "${srcdir}/${pkgname}-${pkgver}" - dav_user=nobody dav_group=network ./configure --prefix=/usr --sysconfdir=/etc --disable-debug + dav_user=nobody dav_group=network ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-debug make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - # Create some dirs - install -d -m755 "${pkgdir}/sbin" make DESTDIR="${pkgdir}" install - rm -f ${pkgdir}/sbin/{u,}mount.davfs - ln -sf /usr/sbin/mount.davfs "${pkgdir}/sbin/mount.davfs" - ln -sf /usr/sbin/umount.davfs "${pkgdir}/sbin/umount.davfs" - + rm -rf ${pkgdir}/sbin rm -f ${pkgdir}/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS} } diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD index ed1cb8240..58fdb28b5 100644 --- a/extra/dbus-python/PKGBUILD +++ b/extra/dbus-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168991 2012-10-17 10:19:14Z allan $ +# $Id: PKGBUILD 188645 2013-06-17 09:56:29Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=dbus-python pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') @@ -12,7 +12,7 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings" makedepends=('docutils' 'dbus-glib' 'python' 'python2') options=('!libtool') source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) -md5sums=('742c7432ad0f7c3f98291d58fa2e35dc') +md5sums=('b09cd2d1a057cc432ce944de3fc06bf7') build() { cd "${srcdir}" diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index ae77018af..e50a4fc32 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 177853 2013-02-10 10:42:13Z bisson $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 188700 2013-06-18 09:44:02Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.17 +pkgver=9.19 pkgrel=1 pkgdesc='Decodes any raw image from any digital camera' url='http://www.cybercom.net/~dcoffin/dcraw/' @@ -11,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('lcms' 'jasper') source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz") -sha1sums=('11a0b20b8f46950dd94e6c1ada313807049a6b27') +sha1sums=('83a85200b0f105a40d23e885f5108bc3b53bdbe4') build() { cd "${srcdir}/${pkgname}" diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 13140a531..5ae6a42c6 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 180410 2013-03-21 12:04:16Z jgc $ +# $Id: PKGBUILD 187056 2013-06-03 11:16:27Z allan $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.2.5 -_pkgver=4.2.5 -pkgrel=1 +pkgver=4.2.5.p1 +_pkgver=4.2.5-P1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" makedepends=('bash' 'iproute2') source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc} - dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service + dhcpd4.service + dhcpd6.service dhcp-4.2.5-client_script-1.patch dhcp-4.2.5-missing_ipv6-1.patch) -md5sums=('6489e919ac093d17249270ee9be1020e' - '022bc7038b3061cfb31da4736e7ab8a8' - 'c49b1497837ba56c54e401a66e1bab9b' - '12c2f3ae47ed23eb698eb7f1bfd80f20' - '8f357e46e1efcbb746f38737a3f977a2' +md5sums=('f68e3c1f00a9af5742bc5e71d567cf93' + 'SKIP' '439ee2f145a1e86dd644cb94a854f8e7' '588aa85b6fe228c45623185a58d11992' '9e4dcf90beec15bfcb6631809cdcc780' 'da655f02f1cf4d95b4708e84e69edbc8') -build() { + +prepare() { cd "${srcdir}/${pkgbase}-${_pkgver}" # Define _GNU_SOURCE to fix IPV6. @@ -36,8 +35,11 @@ build() { patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch # Make dhcp client script suck less. patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch +} - ./configure --prefix=/usr --sysconfdir=/etc \ +build() { + cd "${srcdir}/${pkgbase}-${_pkgver}" + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \ @@ -48,15 +50,12 @@ build() { package_dhcp(){ pkgdesc="A DHCP server, client, and relay agent" - backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp') + backup=('etc/dhcpd.conf') install=dhcp.install - + cd "${srcdir}/${pkgbase}-${_pkgver}" make DESTDIR="${pkgdir}" install - install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4" - install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6" - install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}" install -d "${pkgdir}/var/lib/dhcp" install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service" @@ -67,7 +66,7 @@ package_dhcp(){ # Remove dhclient make -C client DESTDIR="${pkgdir}" uninstall - + # install license install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE" } @@ -82,11 +81,11 @@ package_dhclient(){ install -m755 -d "${pkgdir}/usr/share/dhclient" mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/" - + install -d "${pkgdir}/var/lib/dhclient" # install dhclient linux script - install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script" + install -m755 client/scripts/linux "${pkgdir}/usr/bin/dhclient-script" # install license install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE" diff --git a/extra/dhcp/dhcp b/extra/dhcp/dhcp deleted file mode 100644 index d4f228d9c..000000000 --- a/extra/dhcp/dhcp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Arguments to be passed to the DHCP server daemon -# - -# ipv4 runtime parameters -DHCP4_ARGS="-q" - -# ipv6 runtime parameters -DHCP6_ARGS="-q" - diff --git a/extra/dhcp/dhcp.conf.d b/extra/dhcp/dhcp.conf.d deleted file mode 100644 index 99ba6d13d..000000000 --- a/extra/dhcp/dhcp.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP server daemon -# - -DHCP_ARGS="-q" - diff --git a/extra/dhcp/dhcp4 b/extra/dhcp/dhcp4 deleted file mode 100644 index 8e1277a37..000000000 --- a/extra/dhcp/dhcp4 +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcpd.pid" - -if [[ -f $PIDFILE ]]; then - read -r PID < "$PIDFILE" - - # prevent stale pidfiles from hanging around - if [[ ! -d /proc/$PID ]]; then - echo 'pid not found. deleteing stale pidfile' - unset PID - rm -f "$PIDFILE" - fi -fi - -case "$1" in - start) - stat_busy "Starting DHCPv4 Server" - if [[ $PID ]]; then - stat_fail - exit 1 - fi - if /usr/sbin/dhcpd -4 -pf "$PIDFILE" $DHCP4_ARGS; then - add_daemon dhcp4 - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping DHCPv4 Server" - if [[ ! $PID ]]; then - stat_fail - exit 1 - fi - if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then - rm_daemon dhcp4 - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - diff --git a/extra/dhcp/dhcp6 b/extra/dhcp/dhcp6 deleted file mode 100644 index 6b4b4d359..000000000 --- a/extra/dhcp/dhcp6 +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcp6.pid" - -if [[ -f $PIDFILE ]]; then - read -r PID < "$PIDFILE" - - # prevent stale pidfiles from hanging around - if [[ ! -d /proc/$PID ]]; then - echo 'pid not found. deleteing stale pidfile' - unset PID - rm -f "$PIDFILE" - fi -fi - -case "$1" in - start) - stat_busy "Starting DHCPv6 Server" - if [[ $PID ]]; then - stat_fail - exit 1 - fi - if /usr/sbin/dhcpd -6 -pf "$PIDFILE" $DHCP6_ARGS; then - add_daemon dhcp6 - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping DHCPv6 Server" - if [[ ! $PID ]]; then - stat_fail - exit 1 - fi - if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then - rm_daemon dhcp6 - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - diff --git a/extra/dhcp/dhcpd b/extra/dhcp/dhcpd deleted file mode 100755 index 1fbb31e7c..000000000 --- a/extra/dhcp/dhcpd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcpd.pid" -PID=`cat $PIDFILE 2>/dev/null` -case "$1" in - start) - stat_busy "Starting DHCP Server" - if [ "$PID" = "" ]; then - /usr/sbin/dhcpd $DHCP_ARGS - fi - if [ "$PID" != "" -o $? -gt 0 ]; then - stat_fail - else - add_daemon dhcpd - stat_done - fi - ;; - stop) - stat_busy "Stopping DHCP Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - rm -f $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dhcpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 4217fbf8f..634e8d8ec 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 184369 2013-05-06 19:36:56Z foutrelis $ +# $Id: PKGBUILD 187093 2013-06-03 17:45:39Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=3.1.0 -pkgrel=4 +pkgver=3.2.0 +pkgrel=2 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' - 'cmake' 'automoc4' 'doxygen' 'lensfun') + 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "digikam-3.1.0-htmlexport.patch" "digikam-3.1.0-fixed-pngs.tar.gz") noextract=("digikam-3.1.0-fixed-pngs.tar.gz") -sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd' - 'ef3ee0b6e56e692eb7c10cda5cd581d20c3c46bb' +sha1sums=('666f1d937dc033ddb880aed8a32e7943113d973f' 'b0a1991e0df9b72c79562c719bc9d944a3b8bc78') prepare() { @@ -27,9 +25,6 @@ prepare() { cd ${pkgname}-${pkgver} - # https://bugs.kde.org/show_bug.cgi?id=316620 - patch -Np1 -i "${srcdir}/digikam-3.1.0-htmlexport.patch" - # Fix invalid PNG images to work with libpng 1.6 # https://bugs.kde.org/show_bug.cgi?id=319350 tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1 @@ -50,7 +45,7 @@ package_digikam() { pkgdesc="Digital photo management application for KDE" depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun') - optdepends=('kipi-plugins: for more extras and plugins') + optdepends=('kipi-plugins: more tools and plugins') install=digikam.install cd build/core @@ -60,7 +55,7 @@ package_digikam() { cd ../../build/po make DESTDIR="${pkgdir}" install - # Fix conflicts with kde-l10n-* + # Fix conflicts with kde-l10n-* (FS#33762) rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkipi.mo } @@ -98,12 +93,14 @@ package_libmediawiki() { package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" - depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'libkvkontakte' 'libkexiv2') - optdepends=('libkgeomap' - 'libmediawiki' - 'libgpod' - 'hugin') + depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2') + optdepends=('libkgeomap: Geolocalize tool' + 'libmediawiki: MediaWiki Export plugin' + 'libkvkontakte: VKontakte.ru Exporter plugin' + 'libgpod: iPodExport plugin' + 'opencv: Remove Red Eyes plugin' + 'imagemagick: Video SlideShow plugin' + 'qt-gstreamer: Video SlideShow plugin') install=kipi-plugins.install cd build/extra/kipi-plugins diff --git a/extra/digikam/digikam-3.1.0-htmlexport.patch b/extra/digikam/digikam-3.1.0-htmlexport.patch deleted file mode 100644 index c9e2ff365..000000000 --- a/extra/digikam/digikam-3.1.0-htmlexport.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-11 10:24:11.000000000 +0200 -+++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-13 00:15:05.539275132 +0200 -@@ -468,9 +468,9 @@ - # Currently the cmake module distributed w/ cmake uses a different variable - # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule - # distributed w/ kdelibs LIBEXSLT_LIBRARIES. -- if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) -- set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES}) -- endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) -+ if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) -+ set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES}) -+ endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) - IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) - ADD_SUBDIRECTORY(htmlexport) - ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index c21a98267..0c74200e2 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186001 2013-05-20 08:28:29Z andyrtr $ +# $Id: PKGBUILD 188728 2013-06-18 15:46:35Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('e6c011b4bbddf19e79205d012723449a' +md5sums=('306664f09560d2c6515ba80e1dd7f353' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 88621b001..43f81f44b 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185541 2013-05-14 21:40:19Z andrea $ +# $Id: PKGBUILD 188088 2013-06-08 19:38:24Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata) @@ -13,7 +13,7 @@ install=$pkgname.install url="http://www.gnome.org" license=(GPL) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('570d97150ed04e8b6681814731c4d216bda44e164533b28953e38319fec21015') +sha256sums=('4f60403ec17b462fc39f59193093d9819c534bbce689e14cbab20bc262ca5870') build() { cd "$pkgname-$pkgver" diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index e7a3ac883..a5f9df144 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185542 2013-05-14 21:40:20Z andrea $ +# $Id: PKGBUILD 188090 2013-06-08 19:44:06Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2.1') @@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ff3586b76013f71b0c32339279985cb0e2e1706bd181726ce9d00ebf4387cdd9') +sha256sums=('948dbee5e31b364155719003a0a8b28dfa270aae5f364b5614faa0b262a7ff3a') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index fd61dd3b3..1cd35cf91 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185540 2013-05-14 21:40:18Z andrea $ +# $Id: PKGBUILD 188089 2013-06-08 19:43:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') license=(GPL) @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6333864015e83c2120ffe7adb262ac3055ac82995a915071440be96e08a73112') +sha256sums=('b0ee1eae5f4752eeb0b62c3be2daa08195ab4fd19092bfe6e75d02ac457ebe3a') build() { cd $pkgname-$pkgver diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 0f95ef0e6..35a95f28d 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184374 2013-05-06 19:37:01Z foutrelis $ +# $Id: PKGBUILD 188169 2013-06-11 11:59:02Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.9.2 +pkgver=2.9.3 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2"{,.asc}) -sha1sums=('4d7d183491f916c8f1db668065f986f4a845503e' 'SKIP') +sha1sums=('6e93c9bbc339d36002ead189d0a94880f58876bd' 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index a929f0a3b..befd6efeb 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183356 2013-04-21 22:09:07Z heftig $ +# $Id: PKGBUILD 188065 2013-06-08 08:06:46Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.9.1 -pkgrel=3 +pkgver=0.9.2 +pkgrel=1 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64 'mips64el') url="http://telepathy.freedesktop.org/wiki/Folks" @@ -13,7 +13,7 @@ makedepends=(gobject-introspection intltool) install=folks.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('102b1867355d16e73a837871a058dda13c74fa385908ddda1623893ab0baee4a') +sha256sums=('4b034ffe83928acd8a7d607edab60f36eb13801a9d3fcc34ccc7c34a16747818') build() { cd "$pkgname-$pkgver" diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index 514dc00bf..2b7bcc010 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171437 2012-11-17 15:03:45Z ronald $ +# $Id: PKGBUILD 187057 2013-06-03 11:16:31Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse pkgver=2.9.2 -pkgrel=1 +pkgrel=3 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64' 'mips64el') url="http://fuse.sourceforge.net/" @@ -19,14 +19,18 @@ options=(!libtool) sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab' '3b42e37a741d4651099225987dc40e7f02a716ad') -build() { +prepare() { cd "$pkgname-$pkgver" - # fix building with glibc-2.14 - sed -i '1i#define _GNU_SOURCE' util/fusermount.c + sed -i '1i#define _GNU_SOURCE' util/fusermount.c + + sed -i "/MOUNT_FUSE_PATH=/s#/sbin#/usr/bin#" configure +} - ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \ - --enable-util --bindir=/bin +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib \ + --enable-lib --enable-util make } @@ -38,7 +42,6 @@ package() { # Remove init script in wrong path # Don't add our own for now, as fusectl fs oopses on 2.6.18 rm -rf ${pkgdir}/etc/init.d - #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse # install sample config file install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index bb5602e78..527e3cd30 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179963 2013-03-13 14:27:34Z jgc $ +# $Id: PKGBUILD 187058 2013-06-03 11:16:33Z allan $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf pkgver=3.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A configuration database system" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -23,7 +23,7 @@ sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') -build() { +prepare() { cd "GConf-$pkgver" # Patch from fedora - reloads gconf after installing schemas @@ -33,6 +33,10 @@ build() { # Python2 fix sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert +} + +build() { + cd "GConf-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/GConf \ @@ -48,5 +52,5 @@ package() { install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system" install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/" - install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg" + install -m755 "$srcdir/gconfpkg" "$pkgdir/usr/bin/gconfpkg" } diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 8a61d7f96..43651ad2a 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184380 2013-05-06 19:37:23Z foutrelis $ +# $Id: PKGBUILD 187905 2013-06-07 22:45:04Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.28.1 -pkgrel=2 +pkgver=2.28.2 +pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb') +sha256sums=('183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617') build() { cd gdk-pixbuf-$pkgver diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 471ef2a53..6c225a409 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183315 2013-04-21 22:06:33Z heftig $ +# $Id: PKGBUILD 188471 2013-06-14 19:27:51Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gdm pkgname=(gdm libgdm) -pkgver=3.8.1.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="Gnome Display Manager" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=(itstool intltool gnome-doc-utils gobject-introspection) checkdepends=('check') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz fix_external_program_directories.patch) -sha256sums=('16f8141040798ba00be0d718ba24cce927d6412b767d091f9ee5bf93f5800ba8' +sha256sums=('1d0ed61ac2b184c62acb0d09a5b7c03793b5793599dbb6888d7fe8d1fb6e8da2' 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') build() { @@ -25,6 +25,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm \ --localstatedir=/var \ diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index 1f1778b19..7d14e7a82 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185106 2013-05-11 07:24:47Z bpiotrowski $ +# $Id: PKGBUILD 187002 2013-06-03 07:04:28Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> @@ -6,7 +6,7 @@ pkgname=giflib pkgver=4.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64' 'mips64el') @@ -17,12 +17,15 @@ provides=("libungif=${pkgver}") conflicts=('libungif') replaces=('libungif') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bbd3324af24156d5d7e66ab1cee8508d') +source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 + giflib-4.2.1-quantize.patch) +md5sums=('bbd3324af24156d5d7e66ab1cee8508d' + '67e46b344340ac10f4f597d772679f23') prepare() { cd ${pkgname}-${pkgver} sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac + patch -Np1 -i "$srcdir"/giflib-4.2.1-quantize.patch autoreconf -fi } diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch new file mode 100644 index 000000000..197f88b77 --- /dev/null +++ b/extra/giflib/giflib-4.2.1-quantize.patch @@ -0,0 +1,404 @@ +diff -up giflib-4.2.1/lib/Makefile.in.quantize giflib-4.2.1/lib/Makefile.in +--- giflib-4.2.1/lib/Makefile.in.quantize 2012-10-09 00:37:59.000000000 -0300 ++++ giflib-4.2.1/lib/Makefile.in 2012-11-17 12:16:04.485736553 -0200 +@@ -77,7 +77,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" + LTLIBRARIES = $(lib_LTLIBRARIES) + libgif_la_DEPENDENCIES = + am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \ +- gifalloc.lo gif_err.lo ++ gifalloc.lo gif_err.lo quantize.lo + libgif_la_OBJECTS = $(am_libgif_la_OBJECTS) + libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -234,6 +234,7 @@ libgif_la_SOURCES = dgif_lib.c \ + gif_hash.h \ + gifalloc.c \ + gif_err.c \ ++ quantize.c \ + gif_lib_private.h + + libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ +@@ -319,6 +320,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h +--- giflib-4.2.1/lib/gif_lib.h.quantize 2012-10-09 00:36:32.000000000 -0300 ++++ giflib-4.2.1/lib/gif_lib.h 2012-11-17 12:16:04.488735917 -0200 +@@ -180,6 +180,15 @@ int DGifCloseFile(GifFileType * GifFile) + #define D_GIF_ERR_IMAGE_DEFECT 112 + #define D_GIF_ERR_EOF_TOO_SOON 113 + ++/****************************************************************************** ++ * O.K., here are the routines from GIF_LIB file QUANTIZE.C. ++******************************************************************************/ ++int QuantizeBuffer(unsigned int Width, unsigned int Height, ++ int *ColorMapSize, GifByteType * RedInput, ++ GifByteType * GreenInput, GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap); ++ + /* These are legacy. You probably do not want to call them directly */ + int DGifGetScreenDesc(GifFileType * GifFile); + int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType); +diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c +--- giflib-4.2.1/lib/quantize.c.quantize 2012-11-17 12:17:44.741435334 -0200 ++++ giflib-4.2.1/lib/quantize.c 2012-11-17 12:16:04.491735283 -0200 +@@ -0,0 +1,332 @@ ++/***************************************************************************** ++ * "Gif-Lib" - Yet another gif library. ++ * ++ * Written by: Gershon Elber IBM PC Ver 0.1, Jun. 1989 ++ ****************************************************************************** ++ * Module to quatize high resolution image into lower one. You may want to ++ * peek into the following article this code is based on: ++ * "Color Image Quantization for frame buffer Display", by Paul Heckbert ++ * SIGGRAPH 1982 page 297-307. ++ ****************************************************************************** ++ * History: ++ * 5 Jan 90 - Version 1.0 by Gershon Elber. ++ *****************************************************************************/ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#ifdef __MSDOS__ ++#include <dos.h> ++#include <alloc.h> ++#include <graphics.h> ++#endif /* __MSDOS__ */ ++ ++#include <stdlib.h> ++#include <stdio.h> ++#include "gif_lib.h" ++#include "gif_lib_private.h" ++ ++#define ABS(x) ((x) > 0 ? (x) : (-(x))) ++ ++#define PROGRAM_NAME "giflib" ++ ++/* The colors are stripped to 5 bits per primary color if non MSDOS system ++ * or to 4 (not enough memory...) if MSDOS as first step. ++ */ ++#ifdef __MSDOS__ ++#define COLOR_ARRAY_SIZE 4096 ++#define BITS_PER_PRIM_COLOR 4 ++#define MAX_PRIM_COLOR 0x0f ++#else ++#define COLOR_ARRAY_SIZE 32768 ++#define BITS_PER_PRIM_COLOR 5 ++#define MAX_PRIM_COLOR 0x1f ++#endif /* __MSDOS__ */ ++ ++static int SortRGBAxis; ++ ++typedef struct QuantizedColorType { ++ GifByteType RGB[3]; ++ GifByteType NewColorIndex; ++ long Count; ++ struct QuantizedColorType *Pnext; ++} QuantizedColorType; ++ ++typedef struct NewColorMapType { ++ GifByteType RGBMin[3], RGBWidth[3]; ++ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ ++ unsigned long Count; /* Total number of pixels in all the entries */ ++ QuantizedColorType *QuantizedColors; ++} NewColorMapType; ++ ++static int SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize); ++static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2); ++ ++/****************************************************************************** ++ * Quantize high resolution image into lower one. Input image consists of a ++ * 2D array for each of the RGB colors with size Width by Height. There is no ++ * Color map for the input. Output is a quantized image with 2D array of ++ * indexes into the output color map. ++ * Note input image can be 24 bits at the most (8 for red/green/blue) and ++ * the output has 256 colors at the most (256 entries in the color map.). ++ * ColorMapSize specifies size of color map up to 256 and will be updated to ++ * real size before returning. ++ * Also non of the parameter are allocated by this routine. ++ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. ++ ******************************************************************************/ ++int ++QuantizeBuffer(unsigned int Width, ++ unsigned int Height, ++ int *ColorMapSize, ++ GifByteType * RedInput, ++ GifByteType * GreenInput, ++ GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap) { ++ ++ unsigned int Index, NumOfEntries; ++ int i, j, MaxRGBError[3]; ++ unsigned int NewColorMapSize; ++ long Red, Green, Blue; ++ NewColorMapType NewColorSubdiv[256]; ++ QuantizedColorType *ColorArrayEntries, *QuantizedColor; ++ ++ ColorArrayEntries = (QuantizedColorType *)malloc( ++ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); ++ if (ColorArrayEntries == NULL) { ++ _GifError = E_GIF_ERR_NOT_ENOUGH_MEM; ++ return GIF_ERROR; ++ } ++ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) { ++ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); ++ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & ++ MAX_PRIM_COLOR; ++ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; ++ ColorArrayEntries[i].Count = 0; ++ } ++ ++ /* Sample the colors and their distribution: */ ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ ColorArrayEntries[Index].Count++; ++ } ++ ++ /* Put all the colors in the first entry of the color map, and call the ++ * recursive subdivision process. */ ++ for (i = 0; i < 256; i++) { ++ NewColorSubdiv[i].QuantizedColors = NULL; ++ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[i].RGBMin[j] = 0; ++ NewColorSubdiv[i].RGBWidth[j] = 255; ++ } ++ } ++ ++ /* Find the non empty entries in the color table and chain them: */ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) ++ if (ColorArrayEntries[i].Count > 0) ++ break; ++ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; ++ NumOfEntries = 1; ++ while (++i < COLOR_ARRAY_SIZE) ++ if (ColorArrayEntries[i].Count > 0) { ++ QuantizedColor->Pnext = &ColorArrayEntries[i]; ++ QuantizedColor = &ColorArrayEntries[i]; ++ NumOfEntries++; ++ } ++ QuantizedColor->Pnext = NULL; ++ ++ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ ++ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ ++ NewColorMapSize = 1; ++ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != ++ GIF_OK) { ++ free((char *)ColorArrayEntries); ++ return GIF_ERROR; ++ } ++ if (NewColorMapSize < *ColorMapSize) { ++ /* And clear rest of color map: */ ++ for (i = NewColorMapSize; i < *ColorMapSize; i++) ++ OutputColorMap[i].Red = OutputColorMap[i].Green = ++ OutputColorMap[i].Blue = 0; ++ } ++ ++ /* Average the colors in each entry to be the color to be used in the ++ * output color map, and plug it into the output color map itself. */ ++ for (i = 0; i < NewColorMapSize; i++) { ++ if ((j = NewColorSubdiv[i].NumEntries) > 0) { ++ QuantizedColor = NewColorSubdiv[i].QuantizedColors; ++ Red = Green = Blue = 0; ++ while (QuantizedColor) { ++ QuantizedColor->NewColorIndex = i; ++ Red += QuantizedColor->RGB[0]; ++ Green += QuantizedColor->RGB[1]; ++ Blue += QuantizedColor->RGB[2]; ++ QuantizedColor = QuantizedColor->Pnext; ++ } ++ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; ++ } else ++ fprintf(stderr, ++ "\n%s: Null entry in quantized color map - that's weird.\n", ++ PROGRAM_NAME); ++ } ++ ++ /* Finally scan the input buffer again and put the mapped index in the ++ * output buffer. */ ++ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ Index = ColorArrayEntries[Index].NewColorIndex; ++ OutputBuffer[i] = Index; ++ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) ++ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); ++ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) ++ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); ++ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) ++ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); ++ } ++ ++#ifdef DEBUG ++ fprintf(stderr, ++ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", ++ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); ++#endif /* DEBUG */ ++ ++ free((char *)ColorArrayEntries); ++ ++ *ColorMapSize = NewColorMapSize; ++ ++ return GIF_OK; ++} ++ ++/****************************************************************************** ++ * Routine to subdivide the RGB space recursively using median cut in each ++ * axes alternatingly until ColorMapSize different cubes exists. ++ * The biggest cube in one dimension is subdivide unless it has only one entry. ++ * Returns GIF_ERROR if failed, otherwise GIF_OK. ++ ******************************************************************************/ ++static int ++SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize) { ++ ++ int MaxSize; ++ unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor; ++ long Sum, Count; ++ QuantizedColorType *QuantizedColor, **SortArray; ++ ++ while (ColorMapSize > *NewColorMapSize) { ++ /* Find candidate for subdivision: */ ++ MaxSize = -1; ++ for (i = 0; i < *NewColorMapSize; i++) { ++ for (j = 0; j < 3; j++) { ++ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && ++ (NewColorSubdiv[i].NumEntries > 1)) { ++ MaxSize = NewColorSubdiv[i].RGBWidth[j]; ++ Index = i; ++ SortRGBAxis = j; ++ } ++ } ++ } ++ ++ if (MaxSize == -1) ++ return GIF_OK; ++ ++ /* Split the entry Index into two along the axis SortRGBAxis: */ ++ ++ /* Sort all elements in that entry along the given axis and split at ++ * the median. */ ++ SortArray = (QuantizedColorType **)malloc( ++ sizeof(QuantizedColorType *) * ++ NewColorSubdiv[Index].NumEntries); ++ if (SortArray == NULL) ++ return GIF_ERROR; ++ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; ++ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; ++ j++, QuantizedColor = QuantizedColor->Pnext) ++ SortArray[j] = QuantizedColor; ++ ++ qsort(SortArray, NewColorSubdiv[Index].NumEntries, ++ sizeof(QuantizedColorType *), SortCmpRtn); ++ ++ /* Relink the sorted list into one: */ ++ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) ++ SortArray[j]->Pnext = SortArray[j + 1]; ++ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; ++ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; ++ free((char *)SortArray); ++ ++ /* Now simply add the Counts until we have half of the Count: */ ++ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; ++ NumEntries = 1; ++ Count = QuantizedColor->Count; ++ while ((Sum -= QuantizedColor->Pnext->Count) >= 0 && ++ QuantizedColor->Pnext != NULL && ++ QuantizedColor->Pnext->Pnext != NULL) { ++ QuantizedColor = QuantizedColor->Pnext; ++ NumEntries++; ++ Count += QuantizedColor->Count; ++ } ++ /* Save the values of the last color of the first half, and first ++ * of the second half so we can update the Bounding Boxes later. ++ * Also as the colors are quantized and the BBoxes are full 0..255, ++ * they need to be rescaled. ++ */ ++ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ ++ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ ++ MaxColor <<= (8 - BITS_PER_PRIM_COLOR); ++ MinColor <<= (8 - BITS_PER_PRIM_COLOR); ++ ++ /* Partition right here: */ ++ NewColorSubdiv[*NewColorMapSize].QuantizedColors = ++ QuantizedColor->Pnext; ++ QuantizedColor->Pnext = NULL; ++ NewColorSubdiv[*NewColorMapSize].Count = Count; ++ NewColorSubdiv[Index].Count -= Count; ++ NewColorSubdiv[*NewColorMapSize].NumEntries = ++ NewColorSubdiv[Index].NumEntries - NumEntries; ++ NewColorSubdiv[Index].NumEntries = NumEntries; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[*NewColorMapSize].RGBMin[j] = ++ NewColorSubdiv[Index].RGBMin[j]; ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = ++ NewColorSubdiv[Index].RGBWidth[j]; ++ } ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; ++ ++ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = ++ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; ++ ++ (*NewColorMapSize)++; ++ } ++ ++ return GIF_OK; ++} ++ ++/**************************************************************************** ++ * Routine called by qsort to compare to entries. ++ ****************************************************************************/ ++static int ++SortCmpRtn(const VoidPtr Entry1, ++ const VoidPtr Entry2) { ++ ++ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - ++ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; ++} +diff -up giflib-4.2.1/util/rgb2gif.c.quantize giflib-4.2.1/util/rgb2gif.c +--- giflib-4.2.1/util/rgb2gif.c.quantize 2012-10-09 00:28:12.000000000 -0300 ++++ giflib-4.2.1/util/rgb2gif.c 2012-11-17 12:16:04.490735495 -0200 +@@ -129,7 +129,7 @@ static int SortCmpRtn(const void *Entry1 + * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. + ******************************************************************************/ + static int +-QuantizeBuffer(unsigned int Width, ++GifQuantizeBuffer(unsigned int Width, + unsigned int Height, + int *ColorMapSize, + GifByteType * RedInput, +@@ -428,7 +428,7 @@ int main(int argc, char **argv) + sizeof(GifByteType))) == NULL) + GIF_EXIT("Failed to allocate memory required, aborted."); + +- if (QuantizeBuffer(Width, Height, &ColorMapSize, ++ if (GifQuantizeBuffer(Width, Height, &ColorMapSize, + RedBuffer, GreenBuffer, BlueBuffer, + OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) + QuitGifError(NULL); diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 161a431da..42ed4765d 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186460 2013-05-26 20:12:59Z dan $ +# $Id: PKGBUILD 188161 2013-06-10 22:30:55Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3 +pkgver=1.8.3.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('d91b6099fb6763cf92c696977a247060' - '0b469c0fd81b4a56b9059d7c443282f0' +md5sums=('35401b410e7f248b13e35a1069aca2e2' + '3f801cc82a58c2c2ceeab95975114113' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 77761149a..74c73d9ff 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 183369 2013-04-21 22:09:32Z heftig $ +# $Id: PKGBUILD 188094 2013-06-09 11:29:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.8.0 -pkgrel=1 +pkgver=3.8.1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeBluetooth" -license=('GPL' 'LGPL') -depends=('gtk3' 'hicolor-icon-theme' 'libnotify') -makedepends=('intltool' 'gobject-introspection' 'itstool' 'docbook-xsl') -options=('!libtool' '!emptydirs') +license=(GPL LGPL) +depends=(gtk3 hicolor-icon-theme libnotify bluez4) +makedepends=(intltool gobject-introspection itstool docbook-xsl) +options=(!libtool !emptydirs) install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('70f275922f10ac9f40eb7d57f89193502ee490894b5b721d0f6273432fc97f82' +sha256sums=('8095fcfa014931773e9d231dff76c6924f43abfbe4c5525cf07fd2d7f8e1f770' '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53') build() { @@ -26,6 +26,10 @@ build() { --disable-desktop-update \ --disable-icon-update \ --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index c9dd18a58..6d17f5df6 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185633 2013-05-16 14:54:23Z heftig $ +# $Id: PKGBUILD 188128 2013-06-10 07:55:22Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.8.2.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('d38cf534eeeffa4db81edf9db92c0c188d5ffd52cd7091352a0972b2b5c655cb') +sha256sums=('c45493ca7de778029ea78bcf328410a6399dfd91f50241c6f6b4420115c2e786') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 5ba599d6d..1c9c043e9 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185509 2013-05-14 12:14:45Z heftig $ +# $Id: PKGBUILD 187908 2013-06-07 23:36:32Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -23,7 +23,7 @@ url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('abf6c1acb0b82631e730cb32762deff905fd4f776b89b475b8e732dc73a9d1fb') +sha256sums=('e78a5b01692ccfe825e079d795d9e9610fcb94853c0e6d747b2d8d36dead9d84') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index c1cd8b85d..9bad9ef45 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 185455 2013-05-14 10:21:59Z heftig $ +# $Id: PKGBUILD 188610 2013-06-16 23:56:02Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.8.2 -pkgrel=1 +pkgver=3.8.3 +pkgrel=2 epoch=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL') -depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config' 'iso-codes') -makedepends=('intltool' 'gobject-introspection' 'itstool') +license=(GPL LGPL) +depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes) +makedepends=(intltool gobject-introspection itstool) url="http://www.gnome.org" -groups=('gnome') -options=('!libtool') +groups=(gnome) +options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('af4ec330fa61ee761daf2d5e481e2f9ffbd068d135d5e31a3eaf274524cba33d') +sha256sums=('c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2') build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-desktop \ - --with-gnome-distributor="Arch Linux" + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static \ + --with-gnome-distributor="Arch Linux" make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index a032e2db7..830d2116d 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185457 2013-05-14 10:25:02Z heftig $ +# $Id: PKGBUILD 188472 2013-06-14 19:29:50Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=3.8.2.1 +pkgver=3.8.3.1 pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -11,12 +11,12 @@ license=(GPL) groups=(gnome-extra) depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata tracker libzapojit webkitgtk3) -makedepends=(intltool gobject-introspection itstool) +makedepends=(intltool gobject-introspection itstool docbook-xsl) optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('52cbe1590b47fbf446becde227e0fa3772dda589b631ab1350a034c2eae77b85') +sha256sums=('608d965857a0dc0230f0c2408dc28acd78fba5e77b2ba4a1c7fe99376c05b551') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 898a2131b..a7df534fb 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185507 2013-05-14 12:11:03Z heftig $ +# $Id: PKGBUILD 187903 2013-06-07 22:41:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be') +sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 949e5a37b..35b067508 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186665 2013-05-30 12:26:35Z heftig $ +# $Id: PKGBUILD 187902 2013-06-07 22:40:58Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.2 -pkgrel=4 +pkgver=3.8.3 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,19 +19,15 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch popupmenu.patch) -sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' - '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d') + nm-libexecdir.patch) +sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch - - # FS#35326 (from gnome-3-8 branch) - patch -Np1 -i ../popupmenu.patch } build() { diff --git a/extra/gnome-shell/popupmenu.patch b/extra/gnome-shell/popupmenu.patch deleted file mode 100644 index 035432cd5..000000000 --- a/extra/gnome-shell/popupmenu.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001 -From: Florian Müllner <fmuellner@gnome.org> -Date: Tue, 14 May 2013 16:55:08 +0000 -Subject: PopupMenuManager: Fix child menus - -Since commit c84dc6254d2d65c, popup menus are closed automatically -when another menu opens (to catch the case where a menu is opened -by keyboard shortcut, which wasn't handled before). However in the -case of child menus, both child and parent are expected to be visible, -so handle this case explicitly. - -https://bugzilla.gnome.org/show_bug.cgi?id=699678 ---- -diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js -index fc37dd8..ab6c795 100644 ---- a/js/ui/popupMenu.js -+++ b/js/ui/popupMenu.js -@@ -2124,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({ - - _onMenuOpenState: function(menu, open) { - if (open) { -- if (this.activeMenu) -+ if (this.activeMenu && !this.activeMenu.isChildMenu(menu)) - this.activeMenu.close(BoxPointer.PopupAnimation.FADE); - this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor, - onUngrab: Lang.bind(this, this._closeMenu, menu) }); --- -cgit v0.9.1 diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index a020fefaf..83525bdf0 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185395 2013-05-13 18:52:30Z heftig $ +# $Id: PKGBUILD 188152 2013-06-10 16:22:47Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('4937dfe9e88fcf56de6ed670989cd119b468a32bb078c6cf720c3c8831915347') +sha256sums=('b368a9220f9a50fecdb57ba8ce7008c65e3c236bc700325a45ecb806f3ab4651') build() { cd $pkgname-$pkgver diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index bc897d81c..827fb93ec 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173829 2012-12-24 16:03:19Z jgc $ +# $Id: PKGBUILD 188077 2013-06-08 11:18:22Z bpiotrowski $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.4.11 -pkgrel=2 +pkgver=2.4.13 +pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnucash.org" @@ -17,10 +17,16 @@ optdepends=('evince: for print preview' options=('!libtool' '!makeflags' '!emptydirs') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c157ad7ea0960c71966f5071acd9018580ece538') +sha1sums=('cd28d4e7d84d71ade56173734d634ccadc59ed81') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|guile-config|guile-config1.8|g' configure +} build() { cd "${srcdir}/${pkgname}-${pkgver}" + export GUILE=/usr/bin/guile1.8 ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \ --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking make diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 5c31a4028..0f50c438b 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185059 2013-05-10 18:32:00Z andyrtr $ +# $Id: PKGBUILD 187148 2013-06-04 15:50:10Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.1.11 +pkgver=3.2.1 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -11,15 +11,21 @@ license=('GPL3' 'LGPL2.1') url="http://www.gnutls.org/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('b1c8f431f7c258a1e76cdba05cc1dd88' - 'SKIP') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig} + check_fix.diff) +md5sums=('c220b50736f61292ed8722d5132b6a3e' + 'SKIP' + '53ae2a58a401d9e6d052910670da8b07') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # fix i686 test suite failure + patch -Np1 -i ${srcdir}/check_fix.diff + ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -31,6 +37,7 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" make -k check + #make -j1 check } package() { diff --git a/extra/gnutls/check_fix.diff b/extra/gnutls/check_fix.diff new file mode 100644 index 000000000..f7c7e32c3 --- /dev/null +++ b/extra/gnutls/check_fix.diff @@ -0,0 +1,34 @@ +From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos <nmav@gnutls.org> +Date: Sun, 2 Jun 2013 12:10:06 +0200 +Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems. + +--- + tests/cert-tests/pem-decoding | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding +index fe769ec..f8c6372 100755 +--- a/tests/cert-tests/pem-decoding ++++ b/tests/cert-tests/pem-decoding +@@ -61,7 +61,9 @@ if test "$rc" != "0"; then + exit $rc + fi + +-diff $srcdir/complex-cert.pem tmp-pem.pem ++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1 ++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2 ++diff tmp1 tmp2 + rc=$? + + if test "$rc" != "0"; then +@@ -69,6 +71,6 @@ if test "$rc" != "0"; then + exit $rc + fi + +-rm -f tmp-pem.pem ++rm -f tmp-pem.pem tmp1 tmp2 + + exit 0 +-- +1.7.1 diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD index b8e7fdc69..b53c67c02 100644 --- a/extra/gphoto2/PKGBUILD +++ b/extra/gphoto2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179980 2013-03-13 20:13:10Z jgc $ +# $Id: PKGBUILD 188639 2013-06-17 09:41:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=gphoto2 -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="A digital camera download and access program." arch=(i686 x86_64 'mips64el') @@ -11,7 +11,7 @@ url="http://www.gphoto.org" license=('GPL' 'LGPL') depends=('libgphoto2' 'popt' 'readline') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('03cda6d5b7c647ac4c90d0081f2cb7c7') +md5sums=('7e59e7e06a58febd35820978c6e48287') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index cf42e5a1f..de6cbd64e 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185608 2013-05-15 22:56:58Z tomegun $ +# $Id: PKGBUILD 187860 2013-06-07 09:24:56Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,12 +6,12 @@ pkgname=gpsd pkgver=3.9 -pkgrel=2 +pkgrel=3 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') url="http://catb.org/gpsd/" license=('BSD') -depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') +depends=('python2' 'libusb' 'bluez-libs' 'desktop-file-utils') optdepends=('php: generate a PHP status page for your GPS' 'php-gd: image support for the PHP status page' 'pygtk: GUI frontends') diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index dbf1df9d3..680294ec3 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186328 2013-05-24 20:18:53Z andyrtr $ +# $Id: PKGBUILD 188519 2013-06-15 07:02:29Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') @@ -10,23 +10,40 @@ url="http://projects.palaso.org/projects/graphitedev" pkgdesc='reimplementation of the SIL Graphite text processing engine' license=('LGPL' 'GPL' 'custom') depends=('gcc-libs') -makedepends=('cmake' 'freetype2' 'python2') -# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly +makedepends=('cmake' 'freetype2' 'python2') + # - only for docs - target doesn't install properly + # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to be missing options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('4bfd5db6c91a4097cd76a699beaca70e') +source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz + graphite2-1.2.0-cmakepath.patch) +md5sums=('7042305e4208af4c2d5249d814ccce58' + '00353b67941dbc30b76a43253760769e') build() { cd "${srcdir}" + + # python2 fixes sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py} + + # fix install path - .cmake files contain architecture dependend content - patch taken from FC/Slackware + pushd graphite2-${pkgver} + patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch + popd + mkdir build cd build cmake -G "Unix Makefiles" ../graphite2-${pkgver} \ + -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DGRAPHITE2_COMPARE_RENDERER=OFF - make -# make docs + -DGRAPHITE2_COMPARE_RENDERER=OFF \ + #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target will be fixed + + # fix unwanted -O3 cflag (taken form Debian) + find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \; + + make + #make docs } check() { @@ -37,7 +54,8 @@ check() { package() { cd "${srcdir}"/build - make DESTDIR="$pkgdir/" install + # FIXME: all target doesn't install the docs target files + make DESTDIR="$pkgdir/" install # licenses mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} diff --git a/extra/graphite/graphite2-1.2.0-cmakepath.patch b/extra/graphite/graphite2-1.2.0-cmakepath.patch new file mode 100644 index 000000000..ee71cd6de --- /dev/null +++ b/extra/graphite/graphite2-1.2.0-cmakepath.patch @@ -0,0 +1,9 @@ +diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt +--- graphite2-1.2.0.orig/src/CMakeLists.txt 2013-01-29 15:47:32.465841769 +0530 ++++ graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530 +@@ -136,4 +136,4 @@ + + + install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) +-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_) ++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_) diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index f8952e875..0ee45abf2 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186382 2013-05-26 09:24:35Z bluewind $ +# $Id: PKGBUILD 188078 2013-06-08 11:18:23Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.1 -pkgrel=4 +pkgrel=5 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index 6cd486b41..59afb9248 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 183264 2013-04-19 23:02:28Z heftig $ +# $Id: PKGBUILD 188473 2013-06-14 19:32:02Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) license=(LGPL) url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" -makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva) +makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva + libxrandr) options=(!libtool !emptydirs) source=($url/$pkgbase-${pkgver}.tar.bz2) -sha1sums=('f99f657c8c19dd008a8066d8b2237aff4a05810d') +sha1sums=('acd624693e392d6fd037d7072613e7384ebd6371') prepare() { cd $pkgbase-$pkgver @@ -40,14 +41,14 @@ check() { } package_gst-vaapi() { - depends=(gst-plugins-base gst-plugins-bad libva) + depends=(gst-plugins-base gst-plugins-bad libva libxrandr) cd $pkgbase-$pkgver/build-1.0 make DESTDIR="$pkgdir" install } package_gstreamer0.10-vaapi() { - depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva) + depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva libxrandr) cd $pkgbase-$pkgver/build-0.10 make DESTDIR="$pkgdir" install diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index c691ea0a7..48928df3a 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185341 2013-05-13 13:52:12Z heftig $ +# $Id: PKGBUILD 188597 2013-06-16 18:27:06Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.18 +pkgver=2.24.19 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385' +sha256sums=('15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD index 46985e4b0..565a2f9d1 100644 --- a/extra/gts/PKGBUILD +++ b/extra/gts/PKGBUILD @@ -1,5 +1,4 @@ -# $Id: PKGBUILD 143014 2011-11-20 23:59:13Z bisson $ - +# $Id: PKGBUILD 188503 2013-06-15 04:44:21Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thomas Dziedzic <gostrc at gmail> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +6,7 @@ pkgname=gts pkgver=0.7.6 -pkgrel=2.2 +pkgrel=3 pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles' url='http://gts.sourceforge.net/' license=('LGPL') @@ -15,6 +14,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('glib2') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040') + options=('!libtool') build() { diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD index b42673104..e1fb8eb71 100644 --- a/extra/guile/PKGBUILD +++ b/extra/guile/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 150868 2012-02-23 13:23:16Z ibiru $ +# $Id: PKGBUILD 188079 2013-06-08 11:18:24Z bpiotrowski $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=guile -pkgver=1.8.8 -pkgrel=2.2 +pkgver=2.0.9 +pkgrel=1 pkgdesc="a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo') +depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo' 'libunistring' 'gc' 'libffi') install=guile.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('18661a8fdfef13e2fcb7651720aa53f3') +md5sums=('531839c3fe887382ca9d4774db544d34') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/guile1.8/PKGBUILD b/extra/guile1.8/PKGBUILD new file mode 100644 index 000000000..00991e313 --- /dev/null +++ b/extra/guile1.8/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 188080 2013-06-08 11:18:25Z bpiotrowski $ +# Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> + +pkgname=guile1.8 +pkgver=1.8.8 +pkgrel=3 +pkgdesc='Portable, embeddable Scheme implementation written in C. Legacy branch.' +url="http://www.gnu.org/software/guile/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo') +source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-$pkgver.tar.gz) +options=('!libtool') +md5sums=('18661a8fdfef13e2fcb7651720aa53f3') + +build() { + cd guile-$pkgver + ./configure --prefix=/usr \ + --disable-static \ + --disable-error-on-warning \ + --program-suffix=1.8 + make LDFLAGS+="-lpthread" +} + +package() { + cd guile-$pkgver + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/share/info + sed -i '1s/guile/guile1.8/' -i "$pkgdir"/usr/bin/guile-config1.8 + mv "$pkgdir"/usr/share/aclocal/guile.m4 "$pkgdir"/usr/share/aclocal/guile18.m4 +} diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 2bcd1cf06..384f2d116 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 185516 2013-05-14 16:46:51Z heftig $ +# $Id: PKGBUILD 188470 2013-06-14 19:24:13Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') -pkgver=1.16.2 +pkgver=1.16.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') +makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('6b0e62d27fe73844efb536689057b762fbce085984800c83395371306ec547f1') +sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49') build() { cd "$pkgbase-$pkgver" @@ -96,7 +96,7 @@ package_gvfs-gphoto2() { package_gvfs-obexftp() { pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez4' 'obex-data-server') install=gvfs-module.install cd "$pkgbase-$pkgver/daemon" diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 1d005d29f..05f197b67 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,29 +1,46 @@ -# $Id: PKGBUILD 186346 2013-05-25 04:11:23Z foutrelis $ +# $Id: PKGBUILD 187876 2013-06-07 17:10:53Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=harfbuzz -pkgver=0.9.17 -pkgrel=2 -pkgdesc="OpenType text shaping engine." +pkgbase=(harfbuzz) +pkgname=(harfbuzz harfbuzz-icu) +pkgver=0.9.18 +pkgrel=1 +pkgdesc="OpenType text shaping engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" -license=('MIT') -depends=('icu' 'glib2' 'freetype2' 'graphite>=1.2.0') -makedepends=('icu' 'cairo' 'glib2' 'freetype2') -optdepends=('cairo: hb-view program') +license=(MIT) +makedepends=(glib2 freetype2 graphite cairo icu) options=(!libtool) -source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed') +source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) +sha256sums=('fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908') build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr + cd $pkgbase-$pkgver + ./configure --prefix=/usr \ + --with-glib --with-freetype --with-cairo --with-icu --with-graphite2 make } -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING" +package_harfbuzz() { + depends=(glib2 freetype2 graphite) + optdepends=('cairo: hb-view program') + + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING" + +# Split harfbuzz-icu + mkdir -p ../hb-icu/usr/{include/harfbuzz,lib/pkgconfig}; cd ../hb-icu + mv "$pkgdir"/usr/lib/libharfbuzz-icu* ./usr/lib + mv "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc ./usr/lib/pkgconfig + mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz +} + +package_harfbuzz-icu(){ + pkgdesc="$pkgdesc (ICU integration)" + depends=(harfbuzz icu) + + mv hb-icu/* "$pkgdir" + + install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING" } diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 6145832a7..41ddf12bc 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180744 2013-03-26 01:47:54Z stephane $ +# $Id: PKGBUILD 188118 2013-06-10 06:43:40Z bpiotrowski $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.6.2 +pkgver=1.7.1 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('BSD') depends=('sh' 'pciutils' 'cairo' 'libxml2') makedepends=('pkg-config') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('f9d9938d427e65257d1745ffc1d10634251cdc09') +source=(http://www.open-mpi.org/software/hwloc/v1.7/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('7bb4e6c68d1c24f881d3f7ddf0682b50622351c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD index baa62dbb6..9c90f3bc5 100644 --- a/extra/ifplugd/PKGBUILD +++ b/extra/ifplugd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165791 2012-08-30 09:38:27Z thomas $ +# $Id: PKGBUILD 187834 2013-06-06 18:34:52Z thomas $ # Contributor: Manolis Tzanidakis # Contributor: kevin <kevin@archlinux.org> # Maintainer: pkgname=ifplugd pkgver=0.28 -pkgrel=13 +pkgrel=14 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal." arch=('i686' 'x86_64' 'mips64el') url="http://0pointer.de/lennart/projects/ifplugd" @@ -13,17 +13,15 @@ install=ifplugd.install license=('GPL2') depends=('libdaemon' 'bash') backup=('etc/ifplugd/ifplugd.conf') -options=('!makeflags') +options=('!makeflags' '!emptydirs') source=($url/${pkgname}-${pkgver}.tar.gz ifplugd-0.28-interface.patch ifplugd-fix-return-value.patch - ifplugd ifplugd-daemon ifplugd.systemd) md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '54eb22844b5aeed161c0b80aa9008570' 'f26dbd7597d9d637f0b2b104b11ab820' - '1ea9aa64415a5a9e27b84634cd08a7f2' 'f2e8a37af52b79ee0e3c5bcc2470ce10' '3dc2ce45d0e12d155ecc7a5bc9e3ee04') @@ -41,11 +39,9 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # replace the default init script & action files with ours. - install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd install -D -m755 ${srcdir}/ifplugd-daemon ${pkgdir}/usr/bin/ifplugd-daemon - # remove default action script - rm -f ${pkgdir}/etc/ifplugd/ifplugd.action + # remove the default init script and action script + rm -f ${pkgdir}/etc/{ifplugd/ifplugd.action,rc.d/ifplugd} # install systemd unit install -D -m644 ${srcdir}/ifplugd.systemd ${pkgdir}/usr/lib/systemd/system/ifplugd@.service } diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd deleted file mode 100644 index 354238fe2..000000000 --- a/extra/ifplugd/ifplugd +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# -# ifplugd daemon script for Arch Linux - -. /etc/rc.conf -. /etc/rc.d/functions - -shopt -s extglob - -# env vars -daemonname=ifplugd -cfg=/etc/ifplugd/ifplugd.conf -PID=$(pidof -o %PPID ifplugd) - -# source configuration file -[[ -r $cfg ]] && . "$cfg" - -# discover interfaces to monitor -net_ifs=($INTERFACES) - -case $1 in - start) - stat_busy "Starting $daemonname: ${net_ifs[*]}" - - for nic in "${net_ifs[@]}"; do - # only start if a PID doesn't already exist - if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then - /usr/bin/ifplugd-daemon $nic - - # use presence of PID file to check for start success - [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err )) - fi - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - add_daemon $daemonname - stat_done - fi - ;; - stop) - stat_busy "Stopping $daemonname: ${net_ifs[*]}" - - for nic in /var/run/ifplugd.*.pid; do - [[ -f $nic ]] || { (( ++err )); break; } - nic=${nic%.pid} - nic=${nic##*.} - ifplugd -k -i "$nic" || (( ++err )) - done - - if (( err )); then - stat_fail - exit 1 - else - rm_daemon $daemonname - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - status) - for nic in "${net_ifs[@]}"; do - ifplugd -c -i "$nic" - done - unset nic - ;; - suspend) - stat_busy "Suspending $daemonname: ${net_ifs[*]}" - for nic in "${net_ifs[@]}"; do - ifplugd -S -i $nic || (( ++err )) - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - stat_done - fi - ;; - resume) - stat_busy "Resuming $daemonname ${net_ifs[*]}" - - for nic in "${net_ifs[@]}"; do - ifplugd -R -i $nic || (( ++err )) - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|status|suspend|resume}" -esac -exit 0 diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index df0d77d66..252085b35 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186384 2013-05-26 09:24:37Z bluewind $ +# $Id: PKGBUILD 187911 2013-06-08 05:14:18Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.5.7 +pkgver=6.8.5.10 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('f393612e9797a6129f2cac7f83df337bb54ecf76' +sha1sums=('ae47754c676df262956d1c740cf4ff297dfda71b' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD index 7274afa72..cc8675afb 100644 --- a/extra/iptraf-ng/PKGBUILD +++ b/extra/iptraf-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160611 2012-06-02 21:10:00Z ibiru $ +# $Id: PKGBUILD 187060 2013-06-03 11:16:37Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: sh0 <mee@sh0.org> pkgname=iptraf-ng pkgver=1.1.3.1 -pkgrel=1.1 +pkgrel=2 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)" url="https://fedorahosted.org/iptraf-ng/" arch=('i686' 'x86_64' 'mips64el') @@ -13,15 +13,19 @@ license=('GPL2') replaces=('iptraf') options=('!libtool') source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz - 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch) + iptraf-ng-linux-3.5-compat.patch) md5sums=('1a2c02944b0b012d6a3de96207610fa2' - 'd5eab1e094b93f0e3a256cf9ccfaa9c3') + 'd2ddee5f9ff485155235f7cb4671d8fb') + +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i ${srcdir}/iptraf-ng-linux-3.5-compat.patch +} build() { cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --sbindir=/usr/sbin + --localstatedir=/var --sbindir=/usr/bin make CFLAGS="$CFLAGS -std=gnu99" } diff --git a/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch new file mode 100644 index 000000000..85fd791df --- /dev/null +++ b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch @@ -0,0 +1,127 @@ +From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001 +From: Nikola Pajkovsky <npajkovs@redhat.com> +Date: Wed, 23 May 2012 16:32:27 +0200 +Subject: [PATCH 01/91] token-ring: kernel v3.5 kill off token-ring support + +Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com> +--- + src/hostmon.c | 10 ---------- + src/iptraf-ng-compat.h | 1 - + src/othptab.c | 6 ------ + src/packet.c | 27 --------------------------- + src/tcptable.c | 4 ---- + 5 files changed, 48 deletions(-) + +diff --git a/src/hostmon.c b/src/hostmon.c +index 40a2b95..72b91f8 100644 +--- a/src/hostmon.c ++++ b/src/hostmon.c +@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr, + FDDI_K_ALEN); + list = flist; + break; } +- case ARPHRD_IEEE802: +- case ARPHRD_IEEE802_TR: { +- struct trh_hdr *hdr_trh = +- (struct trh_hdr *)pkt.pkt_buf; +- memcpy(scratch_saddr, hdr_trh->saddr, +- TR_ALEN); +- memcpy(scratch_daddr, hdr_trh->daddr, +- TR_ALEN); +- list = flist; +- break; } + default: + /* unknown link protocol */ + continue; +diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h +index d5aee4a..2d9da96 100644 +--- a/src/iptraf-ng-compat.h ++++ b/src/iptraf-ng-compat.h +@@ -39,7 +39,6 @@ + #include <linux/if_ether.h> + #include <linux/if_packet.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> + #include <linux/types.h> + #include <linux/isdn.h> + +diff --git a/src/othptab.c b/src/othptab.c +index d12cdfd..1181eb1 100644 +--- a/src/othptab.c ++++ b/src/othptab.c +@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt, + saddr), new_entry->smacaddr); + convmacaddr((char *) (((struct fddihdr *) packet)-> + daddr), new_entry->dmacaddr); +- } else if ((pkt->pkt_hatype == ARPHRD_IEEE802) +- || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) { +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- saddr), new_entry->smacaddr); +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- daddr), new_entry->dmacaddr); + } + } + +diff --git a/src/packet.c b/src/packet.c +index a43a27a..f3e4304 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len) + return (u_short) (~sum); + } + +-static unsigned int get_tr_ip_offset(char *pkt) +-{ +- struct trh_hdr *trh; +- unsigned int riflen = 0; +- +- trh = (struct trh_hdr *) pkt; +- +- /* +- * Check if this packet has TR routing information and get +- * its length. +- */ +- if (trh->saddr[0] & TR_RII) +- riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8; +- +- return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen + +- sizeof(struct trllc); +-} +- + static int packet_adjust(struct pkt_hdr *pkt) + { + int retval = 0; +@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt) + pkt->pkt_payload += sizeof(struct fddihdr); + pkt->pkt_len -= sizeof(struct fddihdr); + break; +- case ARPHRD_IEEE802_TR: +- case ARPHRD_IEEE802: +- pkt->pkt_payload = pkt->pkt_buf; +- /* Token Ring patch supplied by Tomas Dvorak */ +- /* Get the start of the IP packet from the Token Ring frame. */ +- unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload); +- pkt->pkt_payload += dataoffset; +- pkt->pkt_len -= dataoffset; +- break; + default: + /* return a NULL packet to signal an unrecognized link */ + /* protocol to the caller. Hopefully, this switch statement */ +diff --git a/src/tcptable.c b/src/tcptable.c +index 56c4780..b0e5ccc 100644 +--- a/src/tcptable.c ++++ b/src/tcptable.c +@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry, + } else if (linkproto == ARPHRD_FDDI) { + convmacaddr((char *) (((struct fddihdr *) packet)-> + saddr), newmacaddr); +- } else if ((linkproto == ARPHRD_IEEE802) +- || (linkproto == ARPHRD_IEEE802_TR)) { +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- saddr), newmacaddr); + } + + if (tableentry->smacaddr[0] != '\0') { +-- +1.8.3 + diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 886c0ff0d..e0e653f03 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/irqbalance" @@ -12,7 +12,7 @@ depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz irqbalance.service) -md5sums=('b6403fa067c96adce448a48c9993654d' +md5sums=('b73b1a5a9e1c3c428ae39024c711e41e' 'a97ad17dc7df98b81acb500b27f931e5') build() { diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD index fb0005b72..b5227742f 100644 --- a/extra/isapnptools/PKGBUILD +++ b/extra/isapnptools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185816 2013-05-19 12:09:03Z giovanni $ +# $Id: PKGBUILD 188739 2013-06-19 02:11:11Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=isapnptools @@ -9,7 +9,8 @@ url="http://www.roestock.demon.co.uk/isapnptools/" depends=('glibc') arch=('i686' 'x86_64') license=('GPL') -source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") +#source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") +source=("http://ibiblio.org/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") md5sums=('b997ba56583dc850fce9b93d658dfa0c') build() { diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 0c5e6b813..a5f225cca 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186020 2013-05-20 13:53:06Z guillaume $ +# $Id: PKGBUILD 188157 2013-06-10 20:38:57Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -7,23 +7,23 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 -_updatever=u21 -_icedtea_ver=2.3.9 +_updatever=u40 +_icedtea_ver=2.4.0 -# check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=47a6bf94ce11 -_JAXP_CHANGESET=d2142901bcb7 -_JAXWS_CHANGESET=b1877762d45c -_JDK_CHANGESET=8e91101e36f0 -_LANGTOOLS_CHANGESET=fd956199cb82 -_OPENJDK_CHANGESET=12b96a57263c +# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am +_CORBA_CHANGESET=71d5ec2f3dfb +_JAXP_CHANGESET=5eaf3bca7f68 +_JAXWS_CHANGESET=9d2007a13c02 +_JDK_CHANGESET=29ce11184945 +_LANGTOOLS_CHANGESET=ffb1b6bc4750 +_OPENJDK_CHANGESET=9c74cb4a3ae8 -_HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map +_HOTSPOT_CHANGESET=c67fd7874b1a # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=4 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -33,7 +33,7 @@ makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget') [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3 +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedtea_ver:0:3} source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz @@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da' - '651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc' - '7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934' - '8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6' - 'b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc' - '349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e' - '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12' - 'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac' +sha256sums=('be030583f0216151bd4b67b354085bf957b532d7bd2d67f14166bb6a1fc5497a' + '4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579' + '0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c' + '25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd' + '4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456' + '13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352' + '80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3' + '34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9' 'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3' diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD index 843e56686..96e2ad232 100644 --- a/extra/json-c/PKGBUILD +++ b/extra/json-c/PKGBUILD @@ -1,28 +1,21 @@ -# $Id: PKGBUILD 176239 2013-01-28 00:11:44Z heftig $ +# $Id: PKGBUILD 188176 2013-06-11 17:10:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: congyiwu <congyiwu AT gmail DOT com> pkgname=json-c -pkgver=0.10 -pkgrel=2 +pkgver=0.11 +pkgrel=1 pkgdesc="A JSON implementation in C" url="https://github.com/json-c/json-c/wiki" -license=("MIT") +license=(MIT) arch=('i686' 'x86_64' 'mips64el') -depends=('glibc') -source=(https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('a4edc79410eb894f08d7d52ca9f88732') -options=(!libtool) +depends=(glibc) +options=(!libtool !makeflags) +source=(https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz) +sha256sums=('28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c') + build() { cd $pkgname-$pkgver - - ## from http://pkgs.fedoraproject.org/cgit/json-c.git/tree/json-c.spec - # Hack to get json_object_iterator.c compiled - sed -e 's/json_object.c/json_object.c json_object_iterator.c/' \ - -e 's/json_object.h/json_object.h json_object_iterator.h/' \ - -e 's/json_object.lo/json_object.lo json_object_iterator.lo/' \ - -i Makefile.in - ./configure --prefix=/usr --disable-static make } @@ -30,5 +23,5 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD new file mode 100644 index 000000000..94a3aae2b --- /dev/null +++ b/extra/jsoncpp/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 188521 2013-06-15 07:18:30Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Jonahtan Schaeffer <joschaeffer@gmail.com> +# COntributor: Drake Arconis <lightdrake@gmail.com> + +pkgname=jsoncpp +pkgver=0.5.0 +pkgrel=4 +pkgdesc="A JSON C++ library" +url='http://jsoncpp.sourceforge.net/' +license=('custom:Public_Domain') +arch=('i686' 'x86_64') +depends=('gcc-libs') +makedepends=('scons') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-src-${pkgver}.tar.gz") +md5sums=('24482b67c1cb17aac1ed1814288a3a8f') + +build() { + cd ${pkgname}-src-${pkgver} + scons platform=linux-gcc +} + +package() { + cd ${pkgname}-src-${pkgver} + + install -d "${pkgdir}"/usr/include/jsoncpp + cp -r include/json "${pkgdir}"/usr/include/jsoncpp/json + + install -Dm644 buildscons/linux-gcc-*/src/lib_json/libjson_linux-gcc*libmt.so \ + "${pkgdir}"/usr/lib/libjsoncpp.so + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index e6732f8db..e0ef39ff2 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184849 2013-05-09 09:42:19Z andrea $ +# $Id: PKGBUILD 187927 2013-06-08 07:59:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('0c00782aea70ad1963e303b1eec55482265f0b37') +sha1sums=('a339ad9eeff20ba384a03d2dff5b4d3622f9e17d') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index a5d2c3055..5c8839f2f 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184876 2013-05-09 09:42:49Z andrea $ +# $Id: PKGBUILD 187954 2013-06-08 07:59:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('ae73088307c31f53c9ac6c2a949b3a32ffad3b0b') +sha1sums=('3a4d718251fb8f5e66c127028dbca99607eb4b66') build() { mkdir build diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 05a1ba5ea..3dcdb3506 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184877 2013-05-09 09:42:50Z andrea $ +# $Id: PKGBUILD 187955 2013-06-08 07:59:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('9db691a3a2571db88ae1ed94355797a4466928dc') +sha1sums=('c7e6946120b34e6a5963f103430da1d3ca812ca8') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index ede29daac..ce6110987 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184878 2013-05-09 09:42:51Z andrea $ +# $Id: PKGBUILD 187956 2013-06-08 07:59:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('3976b199ed9ee1785c97920f2454bc988523dd8f') +sha1sums=('68e9ec4b646db7b7711a08ecf62e1011be60024e') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index 17267cba5..2787ba36d 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184879 2013-05-09 09:42:52Z andrea $ +# $Id: PKGBUILD 187957 2013-06-08 07:59:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('8314f6913059a7f012896be80705893876d1eb37') +sha1sums=('e3e635780254a2ac9ce94c5c1f21bfabc4b59121') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index d21feaff5..89402afcf 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184880 2013-05-09 09:42:53Z andrea $ +# $Id: PKGBUILD 187958 2013-06-08 07:59:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('3a9b2265592f45c3d07ae88e551aac0dceeded0e') +sha1sums=('3236b2fcb79f95a1eb44928a2cd286243f0b128c') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index ae163dee6..eb9b6cf89 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184881 2013-05-09 09:42:54Z andrea $ +# $Id: PKGBUILD 187959 2013-06-08 07:59:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdeadmin pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -14,14 +14,15 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdelibs' 'kdebase-runtime' 'kdepimlibs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('fefba9f6dc817b6c569d76efc536a7ae0c1371df' +sha1sums=('422b9cd97d40191080ee4a121fda24fb19759216' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') -build() { - cd ${srcdir}/${pkgbase}-${pkgver} +prepare() { + cd ${pkgbase}-${pkgver} patch -p1 -i ${srcdir}/syslog-path.patch +} - cd ${srcdir} +build() { mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index c4c149fb2..7f36675eb 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184882 2013-05-09 09:42:55Z andrea $ +# $Id: PKGBUILD 187960 2013-06-08 07:59:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('45baac5806471aa33e976e06652f828d989e6b67') +sha1sums=('b41e00708a595f4ee310a69c7326a6f956e8c6e2') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index faf8ddaf1..11c370600 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184883 2013-05-09 09:42:56Z andrea $ +# $Id: PKGBUILD 187961 2013-06-08 07:59:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('fd5d00103c2d6f8c446286f997edd286a719e1e9') +sha1sums=('8fdc5965837f104ddc9923e97bb1499f6293c833') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 0816713f8..2bf2aafab 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184862 2013-05-09 09:42:34Z andrea $ +# $Id: PKGBUILD 187940 2013-06-08 07:59:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') @@ -27,7 +27,7 @@ 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=('3fc316e34ba10db3adad8b1a4bee61aaf8b58840' +sha1sums=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' @@ -37,7 +37,7 @@ sha1sums=('3fc316e34ba10db3adad8b1a4bee61aaf8b58840' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514') -build() { +prepare() { cd ${_pkgname}-${pkgver} # reads the shell scripts in /etc/kde/ @@ -47,9 +47,9 @@ build() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch +} - cd ../ - +build() { mkdir build cd build cmake ../${_pkgname}-${pkgver} \ diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 3aad2172e..efbd9f19d 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184864 2013-05-09 09:42:37Z andrea $ +# $Id: PKGBUILD 187942 2013-06-08 07:59:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konq-plugins' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,7 +19,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=('c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08') +sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d') build() { cd ${srcdir} @@ -37,7 +37,10 @@ package_kdebase-dolphin() { pkgdesc='File Manager' depends=('kdebase-runtime' 'kdebase-lib' 'nepomuk-widgets') optdepends=('kdegraphics-svgpart: thumbailers for SVG files' - 'kdegraphics-thumbnailers: thumbnailers for graphics file' + 'kdegraphics-thumbnailers: thumbnailers for various graphics files' + 'kdemultimedia-ffmpegthumbs: thumbnailers for video files' + 'kdemultimedia-mplayerthumbs: thumbnailers for video files' + 'icoutils: thumbnailers for MS files' 'ruby: servicemenu installation') url="http://kde.org/applications/system/dolphin/" install=kdebase-dolphin.install diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 0200a90be..1ae1a8126 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184884 2013-05-09 09:42:57Z andrea $ +# $Id: PKGBUILD 187962 2013-06-08 07:59:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.10.3 +pkgver=4.10.4 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=('6fadbe971f4db404fc30cf62fed264e9b06d3cef') +sha1sums=('87fb44759e2f4ffa1fbcbebb0f15b359f02875b8') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 311c13d3e..1c8772651 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184885 2013-05-09 09:42:58Z andrea $ +# $Id: PKGBUILD 187963 2013-06-08 07:59:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -17,14 +17,15 @@ optdepends=('kdegraphics-okular: okular bindings' conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'ruby19.patch') -sha1sums=('43d15e26ba9219874d8efc0140c5fb3eaac97792' +sha1sums=('d4b2920db047a10addbd1a8818878b2f93c75648' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') -build() { +prepare() { cd korundum-${pkgver} patch -p1 -i "${srcdir}/ruby19.patch" - cd ../ +} +build() { mkdir build cd build cmake ../korundum-${pkgver} \ diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 8583105ba..b8d38e105 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184886 2013-05-09 09:42:59Z andrea $ +# $Id: PKGBUILD 187964 2013-06-08 07:59:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64' 'mips64el') @@ -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=('ce5075da229c52ba5aab1139c843686213d23bff') +sha1sums=('04ab37ee0c6fcf0a3d7824b49f73529d4f480a0d') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 736e7712e..978794432 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186386 2013-05-26 09:24:39Z bluewind $ +# $Id: PKGBUILD 187965 2013-06-08 07:59:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" arch=('i686' 'x86_64' 'mips64el') @@ -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=('7db692b0a06ba421caa870fc254f03c2e3bf4e79') +sha1sums=('034a5f0b98cb361cad8bb684a4834f47d16efb9c') build() { mkdir build diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 723c9b265..8e1f3070e 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186387 2013-05-26 09:24:45Z bluewind $ +# $Id: PKGBUILD 187936 2013-06-08 07:59:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" arch=('i686' 'x86_64' 'mips64el') @@ -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=('261e1c4d9a6a216d7b5b5e2962ba5266f0d62bdf') +sha1sums=('8b72c8c53d74b2bc8f38baca6c599067a6cfaac6') build() { mkdir build diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 7b69f6519..1d709f430 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 184855 2013-05-09 09:42:26Z andrea $ +# $Id: PKGBUILD 188702 2013-06-18 10:31:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.10.3 -pkgrel=1 +pkgver=4.10.4 +pkgrel=2 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' - 'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') +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=('71dfb717cafc40331118b2b98c9b4075cd9b1c0d') +sha1sums=('4243f60d549b75ad734141ad2bfef884d12d014e') build() { export PYTHONDONTWRITEBYTECODE="TRUE" @@ -44,7 +44,7 @@ build() { package_kdebindings-python() { pkgdesc="A set of Python 3.x bindings for KDE" - depends=('kdepim-runtime' 'pyqt' 'kdebindings-python-common') + depends=('kdepim-runtime' 'python-pyqt4' 'kdebindings-python-common') cd "${srcdir}"/build make DESTDIR="${pkgdir}" install @@ -58,7 +58,7 @@ package_kdebindings-python() { package_kdebindings-python2() { pkgdesc="A set of Python 2.x bindings for KDE" - depends=('kdepim-runtime' 'python2-pyqt' 'kdebindings-python-common') + depends=('kdepim-runtime' 'python2-pyqt4' 'kdebindings-python-common') conflicts=('kdebindings-python<4.8.1-2') cd "${srcdir}"/build-python2 diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 8df530d9d..c84ad53ff 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184860 2013-05-09 09:42:31Z andrea $ +# $Id: PKGBUILD 187938 2013-06-08 07:59:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.10.3 +pkgver=4.10.4 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=('78a6fce69f751e8c4542431484d5e7fcb6362263') +sha1sums=('70fa8ea5ee961ece5d29cb84cb37c57923f18d85') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index ef87a7a93..59acd2122 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184859 2013-05-09 09:42:30Z andrea $ +# $Id: PKGBUILD 187937 2013-06-08 07:59:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.10.3 +pkgver=4.10.4 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=('2fa451fddf1b05fde705f16bd24a0914aa3eb0de') +sha1sums=('1a0503ef0117aa19cdffdddc9501fee83411d576') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index e4c20aeee..beb566986 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184852 2013-05-09 09:42:23Z andrea $ +# $Id: PKGBUILD 187930 2013-06-08 07:59:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.10.3 +pkgver=4.10.4 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=('701e34f9dcc4e246e7361c472bfdb5a472ac31b2') +sha1sums=('57c92b313bae5274b571c09f94cf599d1afd4846') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 1c783c8cb..3ac063966 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184857 2013-05-09 09:42:28Z andrea $ +# $Id: PKGBUILD 187935 2013-06-08 07:59:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.10.3 +pkgver=4.10.4 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=('459ce74e658f30799164aee291e57c6ad5800734') +sha1sums=('557f3a888759cb3dd397466bd16246a1ef5858f2') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 559511ee9..544939e8a 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184853 2013-05-09 09:42:24Z andrea $ +# $Id: PKGBUILD 187931 2013-06-08 07:59:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.10.3 +pkgver=4.10.4 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=('1e30ffc4747b6e01f24a487b31d1b07623afdfba') +sha1sums=('292285272998b096eef62812e65b5027cf2800ec') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 30a18b2d9..4b63b0e41 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184871 2013-05-09 09:42:44Z andrea $ +# $Id: PKGBUILD 187949 2013-06-08 07:59:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.10.3 +pkgver=4.10.4 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=('d2b986516a5f9ecaa1ed4151afe9f0958b68c868') +sha1sums=('46de1f60e149f6b5a526fa62e6dcf52ade9d4eff') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index f4569c01b..5c50b9b80 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184888 2013-05-09 09:43:01Z andrea $ +# $Id: PKGBUILD 187966 2013-06-08 07:59:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.10.3 +pkgver=4.10.4 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=('ff5e39fd1880dde2c11f6e3cbd89f7a8cead7154') +sha1sums=('ea4d9363c6bf08683a5c9733d11ec7928a358f73') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index a1ea2f5a8..565689876 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186565 2013-05-29 07:12:45Z andrea $ +# $Id: PKGBUILD 187967 2013-06-08 07:59:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" arch=('i686' 'x86_64' 'mips64el') @@ -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=('ae2c9c50cc79030a3f15106d059997da5c37a886' +sha1sums=('3ecd559d6563945ed7730a524c2da5d637a340ba' 'c02051c30ece57800d693da60280b0bdb5f45697') prepare() { diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index caaf68b4d..a4633d125 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184890 2013-05-09 09:43:04Z andrea $ +# $Id: PKGBUILD 187968 2013-06-08 07:59:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.10.3 +pkgver=4.10.4 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=('c3c237cdf891259b2bef399d2b5c75a420e21d55') +sha1sums=('86032621d84ef5d8ea68cf9b0e7b696b96154ece') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 92a962bfe..2493416f2 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184891 2013-05-09 09:43:05Z andrea $ +# $Id: PKGBUILD 187969 2013-06-08 07:59:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.10.3 +pkgver=4.10.4 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=('2711ee3b9914329d9813c24798cf57811dd7eadd') +sha1sums=('b8225cae39c1b27d1defabd08cd2e64e5c893602') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 61d9a4f10..b8e1b45ae 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184892 2013-05-09 09:43:06Z andrea $ +# $Id: PKGBUILD 187970 2013-06-08 07:59:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.10.3 +pkgver=4.10.4 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=('8aa646830e3f09162d98c9dab1650321d92ef90f') +sha1sums=('fa1635720602ba02cb0064d3c01c752d208f5e09') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index 2bba377b8..b18b17ced 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184893 2013-05-09 09:43:08Z andrea $ +# $Id: PKGBUILD 187971 2013-06-08 07:59:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.10.3 +pkgver=4.10.4 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=('c4effef0b1f6e54c5ca1dc4d3642398ccc180551') +sha1sums=('be9dd5ce3a0b8b7162faf1f78c22a7aeb5a8449c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index a8c2db75c..7cdaf68b6 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184894 2013-05-09 09:43:09Z andrea $ +# $Id: PKGBUILD 187972 2013-06-08 07:59:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.10.3 +pkgver=4.10.4 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=('92189b526e1cd6138e7e884d60f0a6f76bb9a7df') +sha1sums=('a283d3521e853d040e7938e004fcbef6cf41aa82') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 946610e90..ca5d48365 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184895 2013-05-09 09:43:11Z andrea $ +# $Id: PKGBUILD 187973 2013-06-08 07:59:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.10.3 +pkgver=4.10.4 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=('ee2071d89c65b47ace7fc38d0fb07c5b74883bab') +sha1sums=('1d1a8d7dc99e59bcb006302d1bb7d9a8366041d9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 79ae84063..c88c5a4dd 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184896 2013-05-09 09:43:12Z andrea $ +# $Id: PKGBUILD 187974 2013-06-08 07:59:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.10.3 +pkgver=4.10.4 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=('aea9806a7e52f5381dc479cd72069b2bcd9e9cc2') +sha1sums=('91c0880d48ed16e05481c3ce424075d30f695bf4') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index a5685e2c9..ab2bdf211 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184897 2013-05-09 09:43:14Z andrea $ +# $Id: PKGBUILD 187975 2013-06-08 08:00:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.10.3 +pkgver=4.10.4 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=('906db6f251621983dc7c737424af0484706a1bbf') +sha1sums=('970620fc621dd31c99c71bd3b446da4d1d3015c4') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index f1375ff2c..37677c5d5 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184898 2013-05-09 09:43:15Z andrea $ +# $Id: PKGBUILD 187976 2013-06-08 08:00:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.10.3 +pkgver=4.10.4 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=('f40332da60528898909858b9271ab04a73ceba78') +sha1sums=('5141988a04d1a9e428c41cc751cd217a53fef13a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 4722faccb..0e69c0c3e 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184899 2013-05-09 09:43:17Z andrea $ +# $Id: PKGBUILD 187977 2013-06-08 08:00:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.10.3 +pkgver=4.10.4 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=('0579eb13e5a764afc390e11acbb3da5ee40f63aa') +sha1sums=('e212aee5cdee0d767efd9d004a17238f043485a2') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 97f471360..6971bf592 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184900 2013-05-09 09:43:19Z andrea $ +# $Id: PKGBUILD 187978 2013-06-08 08:00:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.10.3 +pkgver=4.10.4 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=('32490b846b468dc9a8393c0a70cb0d0e805163a8') +sha1sums=('9a434b7e2c9b67cce4611ad443cfd1ef9a190436') build() { mkdir build diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index 2609bfcee..caa89639d 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184901 2013-05-09 09:43:20Z andrea $ +# $Id: PKGBUILD 187979 2013-06-08 08:00:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.10.3 +pkgver=4.10.4 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=('076345fadaf98bdc878cb4b9f99e759bb2642b2d') +sha1sums=('dfda5d6f0af6bfc2853595a5af86c7a96cd66c33') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index fd7a75440..e1b7409f6 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184902 2013-05-09 09:43:22Z andrea $ +# $Id: PKGBUILD 187980 2013-06-08 08:00:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.10.3 +pkgver=4.10.4 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=('8df184d9647dfbf342dcd3adcc674f2c9b50af39') +sha1sums=('82cc5e6abb7ab10bf1da247f67293d45b3d38195') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index d9e5a145e..7f552dbbe 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184903 2013-05-09 09:43:23Z andrea $ +# $Id: PKGBUILD 187981 2013-06-08 08:00:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.10.3 +pkgver=4.10.4 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=('0286f384cc3dfb9c6b7ca39badd50a18fa579f16') +sha1sums=('3c321e7f4a9a136cc29227c98d10bd3f4551f32b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 995c35078..08459332f 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184866 2013-05-09 09:42:39Z andrea $ +# $Id: PKGBUILD 187944 2013-06-08 07:59:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.10.3 +pkgver=4.10.4 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=('814fffa64d91bec647c3f7e5cb130a2027dd6815') +sha1sums=('664ff3564e2136566808d2ea801b42ede04d6a8d') build() { mkdir build diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index dc1f74cf0..79610b18a 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184904 2013-05-09 09:43:25Z andrea $ +# $Id: PKGBUILD 187982 2013-06-08 08:00:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.10.3 +pkgver=4.10.4 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=('7995139b4fc5604f6a71e5747f4db0de41bb666c') +sha1sums=('20b4e8e98487bc05602a15969bac63ea64a6ac74') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index c55a6b542..7c7738207 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184905 2013-05-09 09:43:26Z andrea $ +# $Id: PKGBUILD 187983 2013-06-08 08:00:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.10.3 +pkgver=4.10.4 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=('efcce4ba4c8a211d494c3537b1c0c2e421fa7586') +sha1sums=('d13d686b77a36ca488ab6f545e0871ad37f9b490') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 847b5a5ca..dfebfafa4 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184906 2013-05-09 09:43:28Z andrea $ +# $Id: PKGBUILD 187984 2013-06-08 08:00:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.10.3 +pkgver=4.10.4 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=('aeb9aaee1a2ec3faf410da4319d0f7a7f27c3630') +sha1sums=('c09ba436f60bf856733e50bd331e84a8b1f975fb') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index f3331665e..8baf3884f 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184907 2013-05-09 09:43:29Z andrea $ +# $Id: PKGBUILD 187985 2013-06-08 08:00:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.10.3 +pkgver=4.10.4 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=('85a85c09deb6f04bcf90279785d099aa31ce0262') +sha1sums=('3dcbd853ede5fbc6517d52faa8722395ecf0eb0b') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index 3c2bc7c9b..6ee2a6ff2 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184908 2013-05-09 09:43:31Z andrea $ +# $Id: PKGBUILD 187986 2013-06-08 08:00:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bomber -pkgver=4.10.3 +pkgver=4.10.4 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=('b2cf0a81d282424811cdc527545a132ef5d73a3a') +sha1sums=('88f98c0179516cfd08952112fb6dc6ba6bb85231') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 67c30edf4..25008fee8 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184909 2013-05-09 09:43:32Z andrea $ +# $Id: PKGBUILD 187987 2013-06-08 08:00:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bovo -pkgver=4.10.3 +pkgver=4.10.4 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=('53fa8f79b8a6d048a00da0cfc703f400c6ddd178') +sha1sums=('102ceee58b4851b24cb23bd4907449cdd63aa3d7') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index b1f04a297..b8cf9165a 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184910 2013-05-09 09:43:34Z andrea $ +# $Id: PKGBUILD 187988 2013-06-08 08:00:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-granatier -pkgver=4.10.3 +pkgver=4.10.4 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=('4a135280da57cac2cadc2874c27b50fc7740bebf') +sha1sums=('b49be2c81a8b8670bfe8f53ae09e9aab9de5134a') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index 91615d120..c636906f9 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184912 2013-05-09 09:43:37Z andrea $ +# $Id: PKGBUILD 187990 2013-06-08 08:00:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kapman -pkgver=4.10.3 +pkgver=4.10.4 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=('83fda18300857338a698fff899cb2569ec4539fb') +sha1sums=('6dbb6b7f4a87aa2cd21d13330913d7a999b888e8') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index f6bc1c5d5..c89ad6099 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184913 2013-05-09 09:43:39Z andrea $ +# $Id: PKGBUILD 187991 2013-06-08 08:00:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-katomic -pkgver=4.10.3 +pkgver=4.10.4 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=('69cf2cedad8575b32fbb685c1116bfd2c7090ebf') +sha1sums=('6c4893910a11f2c1bc20492a93d6475fa397f9df') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index eae2394df..60dcbc11b 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184914 2013-05-09 09:43:41Z andrea $ +# $Id: PKGBUILD 187992 2013-06-08 08:00:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblackbox -pkgver=4.10.3 +pkgver=4.10.4 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=('2953256d4659cca0a2a4b35d2c81fe1569bbb762') +sha1sums=('dd19f0c54740e5e0add1271ebd6595f237a670d5') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index fdafd4881..6b5116b55 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184915 2013-05-09 09:43:44Z andrea $ +# $Id: PKGBUILD 187993 2013-06-08 08:00:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblocks -pkgver=4.10.3 +pkgver=4.10.4 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=('2a43bd8f55474122b241c8993fe98cbd26d36b98') +sha1sums=('e6c9e5d3dc368d87afe82375d3537aeb03247edb') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index 39014c6f8..353e13dde 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184916 2013-05-09 09:43:46Z andrea $ +# $Id: PKGBUILD 187994 2013-06-08 08:00:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbounce -pkgver=4.10.3 +pkgver=4.10.4 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=('6c83f932c62d29432aef0403733998a4ae0ca7ad') +sha1sums=('481fb1b98597ae0cceadcfb7d7b5d4b1171e1267') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index 7ec258b52..ae33ee756 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184917 2013-05-09 09:43:47Z andrea $ +# $Id: PKGBUILD 187995 2013-06-08 08:00:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbreakout -pkgver=4.10.3 +pkgver=4.10.4 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=('8d8508abde6eb2d0aaf75a66ffb253e2f7a67046') +sha1sums=('c8c5acdf8ca4915b37c6fa8e5cf6725e21ab97fa') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index ecd2c5a03..c5ef52b67 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184918 2013-05-09 09:43:48Z andrea $ +# $Id: PKGBUILD 187996 2013-06-08 08:00:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kdiamond -pkgver=4.10.3 +pkgver=4.10.4 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=('ba11547157b1b5d7b789fd2c854aebb3ff5b1714') +sha1sums=('acb1b7cdfdc30025a4686321ab0ef226c8adb1e0') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index e602a066e..6eeff0f0a 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184919 2013-05-09 09:43:50Z andrea $ +# $Id: PKGBUILD 187997 2013-06-08 08:00:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kfourinline -pkgver=4.10.3 +pkgver=4.10.4 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=('d49eff3bc2198c4ebb7d14a664ed7b2271e4ca32') +sha1sums=('263a7a641c3f48f078aebbc179ec2475558605e8') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index 3ef15549d..7a8d4adbd 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184920 2013-05-09 09:43:52Z andrea $ +# $Id: PKGBUILD 187998 2013-06-08 08:00:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kgoldrunner -pkgver=4.10.3 +pkgver=4.10.4 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=('3701237b7c3b15d4d4ffe17d78c8470231004d0a') +sha1sums=('95fc29d606d5b491920c612e1887b1699aad4481') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index 5cce3d51c..825c1c938 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184921 2013-05-09 09:43:53Z andrea $ +# $Id: PKGBUILD 187999 2013-06-08 08:00:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kigo -pkgver=4.10.3 +pkgver=4.10.4 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=('370656ff032a8980579b5a478a7868598035c897') +sha1sums=('caad098497bdd71184983cc22cfd23fe71bb243a') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index b8c74c993..4ec19ff9c 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184922 2013-05-09 09:43:55Z andrea $ +# $Id: PKGBUILD 188000 2013-06-08 08:00:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-killbots -pkgver=4.10.3 +pkgver=4.10.4 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=('9b580830f82468351fb91306f30a085519432b10') +sha1sums=('5fef75ba6d3c849ce271164a532eaddde1c41cd4') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index e58006502..c26f2f174 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184923 2013-05-09 09:43:56Z andrea $ +# $Id: PKGBUILD 188001 2013-06-08 08:00:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kiriki -pkgver=4.10.3 +pkgver=4.10.4 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=('9ec35954ba2eab34d6a760d17f3ab5ebfa193a61') +sha1sums=('a724586705a9bb66d4a9af684a0b56239d395e5e') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 6e0cb1db2..49b7addda 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184924 2013-05-09 09:43:58Z andrea $ +# $Id: PKGBUILD 188002 2013-06-08 08:00:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kjumpingcube -pkgver=4.10.3 +pkgver=4.10.4 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=('9c46888572703e2f1d632e09ba5330e8434c51c1') +sha1sums=('012a89130cb95f8ae223f1dfb8380e1316ac91be') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index bd02c3d26..4e17debf7 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184925 2013-05-09 09:43:59Z andrea $ +# $Id: PKGBUILD 188003 2013-06-08 08:00:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klickety -pkgver=4.10.3 +pkgver=4.10.4 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=('2ac5e9e52b3312bc54b9d02a5210caccc83f7f39') +sha1sums=('e7540d663a36a580e68d8ac69ba229c42db724f6') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index a02ae4ec3..66fed7127 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184926 2013-05-09 09:44:00Z andrea $ +# $Id: PKGBUILD 188004 2013-06-08 08:00:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klines -pkgver=4.10.3 +pkgver=4.10.4 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=('474bab91de2112f55c5286f754778cd638d0862c') +sha1sums=('6cbd46188030e3f495812a5d50e34be9936cdb08') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index f630b6392..6d7c80f1e 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184927 2013-05-09 09:44:03Z andrea $ +# $Id: PKGBUILD 188005 2013-06-08 08:00:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmahjongg -pkgver=4.10.3 +pkgver=4.10.4 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=('8c1168da227c5be6775ae71adfaa7be39ce69a28') +sha1sums=('ebecd24f0da87165d0b8859444d035019a7bcd5a') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index 66abc5ec5..4158ddc30 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184928 2013-05-09 09:44:05Z andrea $ +# $Id: PKGBUILD 188006 2013-06-08 08:00:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmines -pkgver=4.10.3 +pkgver=4.10.4 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=('9f0130c4ce1276bbc0b8d89880d5db73efdc3aef') +sha1sums=('950f28e722db36daee4ee187f696eaa51415b752') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index 96676a096..973c9f00a 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184929 2013-05-09 09:44:06Z andrea $ +# $Id: PKGBUILD 188007 2013-06-08 08:00:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knavalbattle -pkgver=4.10.3 +pkgver=4.10.4 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=('aa6e06896e93c5e33623a55c0b5d2c15cd49ea97') +sha1sums=('cf55f549029647b59b082bc2ab9383a5375a416c') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index 1423d4617..9f801cec5 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184930 2013-05-09 09:44:08Z andrea $ +# $Id: PKGBUILD 188008 2013-06-08 08:00:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knetwalk -pkgver=4.10.3 +pkgver=4.10.4 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=('13dfaa5039b53fc6b50e5c8e4998324b283806f0') +sha1sums=('482d4ba187a55ba32841e141ce3717ad94306377') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index 7eda18ba8..528a232ab 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184931 2013-05-09 09:44:09Z andrea $ +# $Id: PKGBUILD 188009 2013-06-08 08:00:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kolf -pkgver=4.10.3 +pkgver=4.10.4 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=('f35c94f3e184e8b1bcaab50e519b424e580c5665') +sha1sums=('ec61e9d436c59cc738f340b7ca27e8ccef017b2f') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index 96b12cf1c..bbc850b5c 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184932 2013-05-09 09:44:10Z andrea $ +# $Id: PKGBUILD 188010 2013-06-08 08:00:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kollision -pkgver=4.10.3 +pkgver=4.10.4 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=('196770d3b15a74c4399348549efea5f1b5f2808e') +sha1sums=('bd7839e85789894010a2df0171e417a008afd753') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index 904796aa1..0ec218ceb 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184933 2013-05-09 09:44:13Z andrea $ +# $Id: PKGBUILD 188011 2013-06-08 08:00:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-konquest -pkgver=4.10.3 +pkgver=4.10.4 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=('7034913a42475d21af4adb28257b088172e771da') +sha1sums=('a238dee4a52ad6a051d53843112f85a7a912355f') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index 3f8b92166..44d6e7211 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184934 2013-05-09 09:44:16Z andrea $ +# $Id: PKGBUILD 188012 2013-06-08 08:01:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kpatience -pkgver=4.10.3 +pkgver=4.10.4 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=('b2c9a9c65ab4a3760400cf51d055989f08464851') +sha1sums=('c5ab4a1a27c4fe2f88e456af08aca3a4d2d1340e') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index cc45473ff..f9cbf9bff 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184935 2013-05-09 09:44:18Z andrea $ +# $Id: PKGBUILD 188013 2013-06-08 08:01:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kreversi -pkgver=4.10.3 +pkgver=4.10.4 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=('a2b35641a39706de0deda9ea4777ff0b2ebde367') +sha1sums=('b30a93287348fd2394b9abf4e60b07f29bdccbfb') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index 8d11f38a5..28532127a 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184936 2013-05-09 09:44:19Z andrea $ +# $Id: PKGBUILD 188014 2013-06-08 08:01:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kshisen -pkgver=4.10.3 +pkgver=4.10.4 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=('36f8e99e64d9fd29e6b264c9c83fda38f5f09423') +sha1sums=('c09157433df05f409046606d890b0935c167b877') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index 05e95403c..34f4d08ff 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184937 2013-05-09 09:44:20Z andrea $ +# $Id: PKGBUILD 188015 2013-06-08 08:01:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksirk -pkgver=4.10.3 +pkgver=4.10.4 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=('69181f4ac4338e76295cd25926b23a38bbba36dd') +sha1sums=('f0145f13d8ead33d37855298f8732ac82ea7dbe1') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index 0f33ac599..de3357ee0 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184938 2013-05-09 09:44:22Z andrea $ +# $Id: PKGBUILD 188016 2013-06-08 08:01:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksnakeduel -pkgver=4.10.3 +pkgver=4.10.4 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=('e492edb83f0c7c284934d6b7eec53c737cbe197a') +sha1sums=('21fec5a9e979065958ccb670a7198ecd82a334fb') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index cf575aca8..6197885c6 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184939 2013-05-09 09:44:24Z andrea $ +# $Id: PKGBUILD 188017 2013-06-08 08:01:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kspaceduel -pkgver=4.10.3 +pkgver=4.10.4 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=('20fe3641363fc8a7a6d21bf8c2da810b4687bc76') +sha1sums=('e4e8667c2961bae7a96143ccc7dc342d3c959799') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index a19925138..573eed219 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184940 2013-05-09 09:44:25Z andrea $ +# $Id: PKGBUILD 188018 2013-06-08 08:01:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksquares -pkgver=4.10.3 +pkgver=4.10.4 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=('1def07ebcfed0d2edc8771cb2c3c25de9ea9e0c5') +sha1sums=('6553d30c4f983fd3346ad85e551afbbdb590442c') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index c083d1644..15d22736f 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184941 2013-05-09 09:44:26Z andrea $ +# $Id: PKGBUILD 188019 2013-06-08 08:01:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksudoku -pkgver=4.10.3 +pkgver=4.10.4 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=('5421c4693119defc9001e59a044e5b197f1ebc91') +sha1sums=('563d086f2b8fe844c7ae5b3fcecef496cb851d20') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 6548e2ea1..440498402 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184942 2013-05-09 09:44:28Z andrea $ +# $Id: PKGBUILD 188020 2013-06-08 08:01:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ktuberling -pkgver=4.10.3 +pkgver=4.10.4 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=('223838a37bcdc0b1b45ef04140437a1a59b1c2a8') +sha1sums=('209f64812e1aa9a6bd4f5ae87a83e6cb096d42f7') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index 31400c8af..10b923e99 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184943 2013-05-09 09:44:30Z andrea $ +# $Id: PKGBUILD 188021 2013-06-08 08:01:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kubrick -pkgver=4.10.3 +pkgver=4.10.4 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=('54680f556ff5678e5091fcd254c3576c11396a39') +sha1sums=('4b40f130930594908b0764744947c9a2deb1954e') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index eabcdb6b1..bb83e6700 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184944 2013-05-09 09:44:31Z andrea $ +# $Id: PKGBUILD 188022 2013-06-08 08:01:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-lskat -pkgver=4.10.3 +pkgver=4.10.4 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=('3223e7680c81d09e926d6c04b59f7b403e1b41b0') +sha1sums=('060cdb3f02655a82442b8eff9ef3d3b2be12fd9c') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index dfc7107ce..d9d5a7e00 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184945 2013-05-09 09:44:33Z andrea $ +# $Id: PKGBUILD 188023 2013-06-08 08:01:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-palapeli -pkgver=4.10.3 +pkgver=4.10.4 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=('251df2913548628f245516341a6c91a7edc1632c') +sha1sums=('595572e46a0dbd31fe3bb8cb623602dadf3d8753') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index f1d7d6f2d..ab0817b38 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184946 2013-05-09 09:44:34Z andrea $ +# $Id: PKGBUILD 188024 2013-06-08 08:01:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-picmi -pkgver=4.10.3 +pkgver=4.10.4 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=('af60a275f0b06a4ae2fe552cf7973a510e2a7f6b') +sha1sums=('ef1a3c217432e44f4f3f146a54513b9ea56b4c96') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 8e5f6b71b..b620ba2f7 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184947 2013-05-09 09:44:36Z andrea $ +# $Id: PKGBUILD 188025 2013-06-08 08:01:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.10.3 +pkgver=4.10.4 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=('1b020d9689a3b401f254ae6f26bc0f1e2455e11e') +sha1sums=('0cd301a65f800a201a57295984374612db7d6377') build() { mkdir build diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index dc48d1ea3..a04834fc3 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184948 2013-05-09 09:44:37Z andrea $ +# $Id: PKGBUILD 188026 2013-06-08 08:01:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.10.3 +pkgver=4.10.4 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=('72a724c99cada0ed81c18dde1ad2e93b4907631f') +sha1sums=('022c0ab35f4a57e6bbf200caff0a8f2688f47b2a') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 7eddc4926..1c099ce00 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184949 2013-05-09 09:44:39Z andrea $ +# $Id: PKGBUILD 188027 2013-06-08 08:01:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.10.3 +pkgver=4.10.4 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=('5d76ce1018f9852f0de2a5f8fa2affde8021c834') +sha1sums=('baa625095edbee3b943a0e09287a7c2bff7c20af') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index b2833dd41..6f1b36ca2 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184950 2013-05-09 09:44:40Z andrea $ +# $Id: PKGBUILD 188028 2013-06-08 08:01:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.10.3 +pkgver=4.10.4 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=('7e246704a1e639886925d794dcb4bfab7bb993ca') +sha1sums=('e9441c3358e2be76912a5879decedfa911809247') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 410a35c96..471cd21ad 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184951 2013-05-09 09:44:41Z andrea $ +# $Id: PKGBUILD 188029 2013-06-08 08:01:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.10.3 +pkgver=4.10.4 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=('8e1b458bd98c25bf5ab4a8dfaa883fd314ee4232') +sha1sums=('8578d6e50f60955392ac7c9e6aff93696126247f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 25c0f49c3..9b6857ffc 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184952 2013-05-09 09:44:44Z andrea $ +# $Id: PKGBUILD 188030 2013-06-08 08:01:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.10.3 +pkgver=4.10.4 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=('fba61042b5a5f9cfac5b078238cd350f6ffa0bdf') +sha1sums=('f762162c9fcb276c6c52508c70eea95ba135e4be') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 7514a15e4..6dcde696c 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184953 2013-05-09 09:44:45Z andrea $ +# $Id: PKGBUILD 188031 2013-06-08 08:01:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.10.3 +pkgver=4.10.4 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=('5620639393632a68a30c6e726aa8925f455c2f7a') +sha1sums=('34a8f6c379aa2defca2441c7f2583f1d75f99441') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index c23d196ce..25fa594d6 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184954 2013-05-09 09:44:47Z andrea $ +# $Id: PKGBUILD 188032 2013-06-08 08:01:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.10.3 +pkgver=4.10.4 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=('c0b2b72cd26b64a930d3a14c0508ab2685caed5a') +sha1sums=('6550523e0270447a00b7c498fbe03f67b425626b') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 339519ec4..0cea57133 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184955 2013-05-09 09:44:49Z andrea $ +# $Id: PKGBUILD 188033 2013-06-08 08:01:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.10.3 +pkgver=4.10.4 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=('fe06feea93d3f38196a29dc410ee1427cfefa382') +sha1sums=('f4b58972ce05a4bdfcb94c972b023f168d3172e9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index e442a99f6..ca290f5a5 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184854 2013-05-09 09:42:25Z andrea $ +# $Id: PKGBUILD 187932 2013-06-08 07:59:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -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=('b9e7cd50a430b215b2d802e2f2bdd3a254bdd700') +sha1sums=('7659ac1e1d9832f541f605abbfc47da9d3ab2356') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 8b67e1038..0f81b4a15 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184956 2013-05-09 09:44:51Z andrea $ +# $Id: PKGBUILD 188034 2013-06-08 08:01:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.10.3 +pkgver=4.10.4 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=('6e71181e30e003641893bbdbcfca508d1fde41a4') +sha1sums=('70feca363d1a5d5aa9d784d62819a34eb701054f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 9fd230548..f7c1e3e11 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184957 2013-05-09 09:44:53Z andrea $ +# $Id: PKGBUILD 188035 2013-06-08 08:01:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.10.3 +pkgver=4.10.4 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=('61869d8bac977faa151356583475f324a29f9d68') +sha1sums=('356f0bb93514b240a67b0a02edad15ac5e107fdb') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 3a6386469..f24d37a01 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184958 2013-05-09 09:44:54Z andrea $ +# $Id: PKGBUILD 188036 2013-06-08 08:01:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.10.3 +pkgver=4.10.4 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=('c128aef92f9bd61b18ca9f9db9a43e6652454313') +sha1sums=('e9c939d22a4dd6c17cdda9da964434e014d6b771') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index dd2f171fd..9a24d7cf5 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184959 2013-05-09 09:44:55Z andrea $ +# $Id: PKGBUILD 188037 2013-06-08 08:01:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.10.3 +pkgver=4.10.4 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=('5539c665dd3173493d0a45fb775c27a4a84a2b3d') +sha1sums=('7dbd0c6b08fe0b4223012f7332e661c9cd046697') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 91ff2b4b7..8d5cdc6f4 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184960 2013-05-09 09:44:57Z andrea $ +# $Id: PKGBUILD 188038 2013-06-08 08:01:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.10.3 +pkgver=4.10.4 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=('9ebb61b985a6054f690ff8f89e638ad8da6a483a') +sha1sums=('c7ff43b01890318ed0c629eed64fe36cc2e15db6') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 6fcb30472..57c08ecc1 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184961 2013-05-09 09:45:00Z andrea $ +# $Id: PKGBUILD 188039 2013-06-08 08:01:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.10.3 +pkgver=4.10.4 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=('1b4508d3f1c74a8d1a6136f27ba233ae3fb84eda') +sha1sums=('6c1e4fcb3fe8ecabca3a49718b815eda0f20c5cc') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index d26c00cbe..042db5183 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184962 2013-05-09 09:45:01Z andrea $ +# $Id: PKGBUILD 188040 2013-06-08 08:01:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.10.3 +pkgver=4.10.4 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=('d889a49e4cafef2ed10879a7e314e1d14bb09dd5') +sha1sums=('92af1645405b88aef85505649e68e3fcab4a7841') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 70ee10891..5fdf38288 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184963 2013-05-09 09:45:03Z andrea $ +# $Id: PKGBUILD 188041 2013-06-08 08:01:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.10.3 +pkgver=4.10.4 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=('09289c9bb6bd5e592d214f3f665078010e9a7dd2') +sha1sums=('d392101358196e0b99bc15846b895dff9c88cafc') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index ba59de64a..d3d9ad7a5 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184964 2013-05-09 09:45:04Z andrea $ +# $Id: PKGBUILD 188042 2013-06-08 08:01:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.10.3 +pkgver=4.10.4 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=('e2cbfef5d1cdfcc7145fae803971d799f8739c37') +sha1sums=('e3e3c0b60897559ce3f5ff8a0f5dfe7bcd10ae98') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 82392b8a2..cb09a4512 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184965 2013-05-09 09:45:06Z andrea $ +# $Id: PKGBUILD 188043 2013-06-08 08:01:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.10.3 +pkgver=4.10.4 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=('f6446375ff72ffa841c223252dea1f0f95d73939') +sha1sums=('3b82041ae4a297c448971bb3faeb9e5492654310') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index ef9b57c2b..d85b87a86 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184966 2013-05-09 09:45:08Z andrea $ +# $Id: PKGBUILD 188553 2013-06-15 11:11:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -9,26 +9,27 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.10.3 -pkgrel=1 +pkgver=4.10.4 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' - 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') + 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d' +sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') -build() { +prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch - cd ../ +} +build() { mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 92ba11dc4..fd6e82a1f 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186222 2013-05-22 07:16:17Z andrea $ +# $Id: PKGBUILD 187929 2013-06-08 07:59:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' @@ -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=('43a9cf46818d1d7b26253e08e8cee99a554a736a') +sha1sums=('1ef9a4b6224363db2c3b50199dd302cea57c3a27') build() { mkdir build diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 8eab686ca..7d4aad653 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185544 2013-05-14 21:40:23Z andrea $ +# $Id: PKGBUILD 187925 2013-06-08 07:59:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.10.3 -pkgrel=3 +pkgver=4.10.4 +pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepimlibs' @@ -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=('7ede01b2f169c066c98f553606e99817d83f252b') +sha1sums=('58f785dbc07932aad01bd7beeeceacc8fefac0bd') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index f58b37c9b..dabd76d63 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184968 2013-05-09 09:45:14Z andrea $ +# $Id: PKGBUILD 188046 2013-06-08 08:01:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -86,7 +86,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=('e1d2f452e4560c4c8d13573505cc4c3538f36e46') +sha1sums=('bdc8f5db0253132f8007d52fc79d8aa2ea2f9e0a') build() { mkdir build diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index f9df83069..d0ad3cb44 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,7 +4,7 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0.8 +pkgver=0.9.0.9 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2") -sha256sums=('c3b4458faf3bea75c5952ffe20b55724246c9cc3cd751a484b3e1832240d3ad6') +sha256sums=('d6a7603df2a48e14cef4c44dcaee5773d7ed3cad5b8780307b356df4639231ca') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 6245dee7b..6fb1ea26a 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 184856 2013-05-09 09:42:28Z andrea $ +# $Id: PKGBUILD 188716 2013-06-18 14:20:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.10.3 -pkgrel=1 +pkgver=4.10.4 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') 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=('6fe0e8c0cee9a21df4c4271861e10e249896d873' +sha1sums=('167c7bc7f9f83f4017f006e2b4c2a3ec24eb6c9d' 'dc70306c507083cf9b4bb1c536858742292fa1bf') -build() { +prepare() { cd kate-${pkgver} patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch - cd ../ +} +build() { mkdir build cd build cmake ../kate-${pkgver} \ diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index a4933395f..6d615223f 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184969 2013-05-09 09:45:18Z andrea $ +# $Id: PKGBUILD 188047 2013-06-08 08:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,7 +16,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-poxml' 'kdesdk-strigi-analyzers' 'kdesdk-umbrello') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -26,16 +26,17 @@ 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=('84d16fb8ecea59118c4bbe273d1b8149c6739c0a' +sha1sums=('da886df4ddebb12e760db7469de1350feed2b338' '07db42bbcae402c292eebf002e549b04162621c5') -build() { - cd ${srcdir}/${pkgbase}-${pkgver} +prepare() { + cd ${pkgbase}-${pkgver} # Fix hardcoded python2 cmd patch -Np1 -i ${srcdir}/fix-python2-path.patch +} - cd ${srcdir} +build() { mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index a471fdb12..6eac7a25e 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184970 2013-05-09 09:45:19Z andrea $ +# $Id: PKGBUILD 188048 2013-06-08 08:01:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('1272b33ff3ef669ab309c8c230d3609d597c743b') +sha1sums=('ad148c0b8acdcc8062d832ca21bb84284bcab841') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index f9fc23194..64a1eb1f0 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184972 2013-05-09 09:45:22Z andrea $ +# $Id: PKGBUILD 188050 2013-06-08 08:02:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.10.3 +pkgver=4.10.4 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=('ebfa5a9cc39abf311208d6a9d058e5003cb4daf8') +sha1sums=('acc3004826ae3afd3f87463b6c36661c566a8c7b') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index b7bad19bb..92475c793 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184973 2013-05-09 09:45:23Z andrea $ +# $Id: PKGBUILD 188051 2013-06-08 08:02:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.10.3 +pkgver=4.10.4 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=('c80f91c2f41a60cca670c8cb1b5e2c395e935fac') +sha1sums=('8c8aa571a6e3541e276128503358c6de6bf8e20a') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 52de8daba..9a2e544ea 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184974 2013-05-09 09:45:25Z andrea $ +# $Id: PKGBUILD 188052 2013-06-08 08:02:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.10.3 +pkgver=4.10.4 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=('15360b8b7d1878b146cc38030e8ab59d2fa76acc') +sha1sums=('bd3525ffc4fbd2e0f8fbbdd377b00ac21ae9241d') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index b58775b06..3cd9bc54b 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184975 2013-05-09 09:45:26Z andrea $ +# $Id: PKGBUILD 188053 2013-06-08 08:02:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64' 'mips64el') @@ -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=('a88a393714a127a5629c2b50690ee6766c6ed484') +sha1sums=('9d0c6f9a476610670cc7775b6bb5cc5f014f8536') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 3bb9765ac..bf389fc13 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184976 2013-05-09 09:45:28Z andrea $ +# $Id: PKGBUILD 188054 2013-06-08 08:02:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.10.3 +pkgver=4.10.4 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=('25ff13f6551542eb58384c7606837c05a452fb54') +sha1sums=('12160f2b5e7bb94cd72d090627f39b4eaa2ae03e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 1949395fe..cef8c9182 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184977 2013-05-09 09:45:29Z andrea $ +# $Id: PKGBUILD 188055 2013-06-08 08:02:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.10.3 +pkgver=4.10.4 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=('ba92c6edcf6ce857fec7969aab5a8b8afce2d43c') +sha1sums=('b4d9773326dfe16f3b50b6f16b52c906b7c3180e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 03445586e..85f9325fc 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.10.3 +pkgver=4.10.4 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=('5a3df78e08688647224c63418363940b222abe21') +sha1sums=('9e8ee623f83a7d909b1e4385430c9716807bfa2e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 1b82fc623..6c5b89040 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184979 2013-05-09 09:45:32Z andrea $ +# $Id: PKGBUILD 188057 2013-06-08 08:02:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.10.3 +pkgver=4.10.4 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=('c39948abf291f0ddd9e07cdc6b9d48922f62b317') +sha1sums=('f98109823013dd6ee7cff81e55f338dbd8695eab') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 7ebde17ed..7aa80414e 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184980 2013-05-09 09:45:34Z andrea $ +# $Id: PKGBUILD 188058 2013-06-08 08:02:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.10.3 +pkgver=4.10.4 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=('41a32b861ea2dcf4892c0161bce90996e9c8bd3d') +sha1sums=('47198c116fab656279090e9461daf334381554b2') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index bf3b026e5..7106e1082 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184981 2013-05-09 09:45:35Z andrea $ +# $Id: PKGBUILD 188059 2013-06-08 08:02:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-print-manager -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A tool for managing print jobs and printers" arch=('i686' 'x86_64' 'mips64el') @@ -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=('91b98fd9827e61bc9b351fc7027df8212764f817') +sha1sums=('a2adfbb31a78f1f7978997844c1d758fac53098a') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 3c5cfc950..28f62fd27 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184982 2013-05-09 09:45:37Z andrea $ +# $Id: PKGBUILD 188060 2013-06-08 08:02:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.10.3 +pkgver=4.10.4 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=('b74241f3357a91149bbb1610ee7e944e053b25ff') +sha1sums=('0c5addd5093d676ba2733c7132d4a231f0e6955e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index f61c8d971..75890f0c0 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184983 2013-05-09 09:45:38Z andrea $ +# $Id: PKGBUILD 188061 2013-06-08 08:02:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.10.3 +pkgver=4.10.4 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=('978f599562a6c9b2792fa7383f333d7048309ab6') +sha1sums=('646e60691f68bfbff9b5ecc57cf0e198a6229a53') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 663bfa15e..0cca96ed0 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184984 2013-05-09 09:45:40Z andrea $ +# $Id: PKGBUILD 188062 2013-06-08 08:02:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('ea30f3187bd40eb0b972f2a9a7275674d6cee286') +sha1sums=('d54b8a154350795613080a5f28f56bbf80c10ed2') build() { cd $srcdir diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index a50a798fc..b06e04747 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186877 2013-05-31 13:31:02Z andrea $ +# $Id: PKGBUILD 187862 2013-06-07 09:24:58Z tomegun $ # Maintainer: # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> @@ -7,12 +7,12 @@ pkgname=kismet pkgver=2013_03_R1b _realver="${pkgver//_/-}" -pkgrel=1 +pkgrel=2 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64' 'mips64el') url="http://www.kismetwireless.net/" license=('GPL') -depends=('libpcap' 'pcre' 'bluez') +depends=('libpcap' 'pcre' 'bluez-libs' 'libcap') optdepends=('gpsd: log coordinates of detected networks' 'wireshark-cli: provide OUI files used to determine device manufacturer' 'wireshark-cli: mergecap, to merge multiple capture files' diff --git a/extra/kscreen/PKGBUILD b/extra/kscreen/PKGBUILD new file mode 100644 index 000000000..ff0a6b34a --- /dev/null +++ b/extra/kscreen/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 188671 2013-06-17 16:27:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=kscreen +pkgver=1.0 +pkgrel=1 +pkgdesc="KDE's screen management software" +arch=('i686' 'x86_64') +url='https://projects.kde.org/kscreen' +license=('GPL' 'LGPL') +depends=('kdebase-runtime' "libkscreen>=${pkgver}") +makedepends=('cmake' 'automoc4') +install=$pkgname.install +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('52a0fef238ed71c08ee853f55e53f8bb') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/extra/kscreen/kscreen.install b/extra/kscreen/kscreen.install new file mode 100644 index 000000000..53d2ba911 --- /dev/null +++ b/extra/kscreen/kscreen.install @@ -0,0 +1,16 @@ +post_install() { + printf "==> To enable KSceen, run in a terminal:\n" + printf " qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor\n" + printf " qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false\n" + printf " qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen\n" + + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD index abce75267..1fbc25589 100644 --- a/extra/leveldb/PKGBUILD +++ b/extra/leveldb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178002 2013-02-13 01:27:04Z dreisner $ +# $Id: PKGBUILD 188250 2013-06-13 13:52:03Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: feydaykyn <feydaykyn@yahoo.fr> pkgname=leveldb -pkgver=1.9.0 +pkgver=1.10.0 pkgrel=1 pkgdesc="A fast and lightweight key/value database library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="https://code.google.com/p/leveldb/" license=('BSD') depends=('gperftools' 'snappy') source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('4d832277120912211998a2334fb975b995d51885') +sha1sums=('d5b234658138d07f6edc2de24e01d9b0585c03cb') build() { make -C "$pkgname-$pkgver" diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD index d73898bd6..0b8127c56 100644 --- a/extra/libatasmart/PKGBUILD +++ b/extra/libatasmart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165610 2012-08-27 09:02:59Z jgc $ +# $Id: PKGBUILD 187061 2013-06-03 11:16:38Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libatasmart pkgver=0.19 -pkgrel=1.1 +pkgrel=2 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -18,6 +18,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --disable-static make } diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index 04b1f6cc2..a64cadc07 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 180983 2013-03-29 12:07:34Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 187863 2013-06-07 09:24:59Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') -depends=('qt4' 'bluez') +depends=('qt4' 'bluez4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('fcb1480feba45dcd076b3ee54150bdf5') diff --git a/extra/libbonobo/PKGBUILD b/extra/libbonobo/PKGBUILD index 582deca83..4a2759600 100644 --- a/extra/libbonobo/PKGBUILD +++ b/extra/libbonobo/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 177011 2013-02-04 08:29:28Z jgc $ +# $Id: PKGBUILD 187062 2013-06-03 11:16:40Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libbonobo pkgver=2.32.1 -pkgrel=3 +pkgrel=4 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') -depends=('orbit2' 'libxml2' 'glib2') +depends=('orbit2' 'libxml2' 'glib2' 'popt') makedepends=('intltool' 'pkgconfig') options=('!libtool') backup=('etc/bonobo-activation/bonobo-activation-config.xml') @@ -18,9 +18,14 @@ install=libbonobo.install sha256sums=('9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b' '081de245c42de10ebeea3cbcd819c5ce5d0a15b9bdde9c2098302b1e14965af2') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s#-DG_DISABLE_DEPRECATED##" activation-server/Makefile.in +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/bonobo make diff --git a/extra/libbsd/LICENSE b/extra/libbsd/LICENSE deleted file mode 100644 index 7dcbfc2ba..000000000 --- a/extra/libbsd/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index 9fdf78b95..703d14ace 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -1,30 +1,48 @@ -# $Id: PKGBUILD 180872 2013-03-27 14:45:32Z tpowa $ +# $Id: PKGBUILD 188690 2013-06-18 01:22:22Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=libbsd -pkgver=0.4.2 -pkgrel=1.1 +pkgver=0.5.2 +pkgrel=2 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64' 'mips64el') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') -source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -md5sums=('591fc9de4ca22f78cf87a94e648a92f4') +options=('!libtool') +source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc} + spt.patch) +md5sums=('be8b2e0dc4614699834c49693574fd1a' + 'SKIP' + '56236fb72c8ec6cbdbd0daa5f404bccb') + +prepare() { + cd $pkgname-$pkgver + + # Paper over a firefox crash + # http://lists.freedesktop.org/archives/libbsd/2013-June/000085.html + patch -Np1 -i ../spt.patch +} build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } +check() { + cd $pkgname-$pkgver + + make check +} + package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE + make DESTDIR="$pkgdir" install + install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/extra/libbsd/spt.patch b/extra/libbsd/spt.patch new file mode 100644 index 000000000..b19dc9b87 --- /dev/null +++ b/extra/libbsd/spt.patch @@ -0,0 +1,50 @@ +diff -u -r libbsd-0.5.2-orig/src/setproctitle.c libbsd-0.5.2/src/setproctitle.c +--- libbsd-0.5.2-orig/src/setproctitle.c 2013-06-08 18:26:04.000000000 +0200 ++++ libbsd-0.5.2/src/setproctitle.c 2013-06-18 02:35:59.441393418 +0200 +@@ -86,7 +86,7 @@ + if (environ != envp) + return 0; + +- /* Make a copy of the old environ array of pointers, in case ++ /* Make a deep copy of the old environ array of pointers, in case + * clearenv() or setenv() is implemented to free the internal + * environ array, because we will need to access the old environ + * contents to make the new copy. */ +@@ -94,11 +94,13 @@ + envcopy = malloc(envsize); + if (envcopy == NULL) + return errno; +- memcpy(envcopy, envp, envsize); ++ for (i = 0; envp[i]; i++) envcopy[i] = strdup(envp[i]); ++ envcopy[i] = NULL; + + error = spt_clearenv(); + if (error) { + environ = envp; ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + return error; + } +@@ -116,18 +118,20 @@ + if (error) { + #ifdef HAVE_CLEARENV + /* Because the old environ might not be available +- * anymore we will make do with the shallow copy. */ ++ * anymore we will make do with the deep copy. */ + environ = envcopy; + #else + environ = envp; ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + #endif + return error; + } + } + +- /* Dispose of the shallow copy, now that we've finished transfering ++ /* Dispose of the deep copy, now that we've finished transfering + * the old environment. */ ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + + return 0; diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index 0352443e1..3b5e6e174 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 173082 2012-12-10 12:00:17Z jgc $ +# $Id: PKGBUILD 187881 2013-06-07 18:21:07Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.30 -pkgrel=3 +pkgrel=4 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64 'mips64el') license=(LGPL) depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop) -makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3) +makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3 git) options=(!emptydirs) -url=http://0pointer.de/lennart/projects/libcanberra -source=("$url/$pkgbase-$pkgver.tar.xz" - libcanberra.xinit) -sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72' +url="http://0pointer.de/lennart/projects/libcanberra" +source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4" libcanberra.xinit) +sha256sums=('SKIP' '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') _plugindir=usr/lib/$pkgbase-$pkgver +prepare() { + cd $pkgbase + ./autogen.sh +} + build() { - cd $pkgbase-$pkgver + cd $pkgbase ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ --disable-static --with-builtin=dso --enable-null --disable-oss \ --enable-alsa --enable-gstreamer --enable-pulse \ - --with-systemdsystemunitdir=/usr/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc # Fight unused direct deps sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -37,7 +41,7 @@ package_libcanberra() { optdepends=("$pkgbase-pulse: PulseAudio driver" "$pkgbase-gstreamer: GStreamer driver") - cd $pkgbase-$pkgver + cd $pkgbase make -j1 DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/libcanberra-gtk*.la diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD index c33f5eb13..a85a15626 100644 --- a/extra/libdmtx/PKGBUILD +++ b/extra/libdmtx/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 149704 2012-02-09 14:15:34Z andrea $ +# $Id: PKGBUILD 188766 2013-06-19 20:23:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: jose <jose1711 [at] gmail (dot) com> pkgname=libdmtx pkgver=0.7.4 -pkgrel=3.1 +pkgrel=4 pkgdesc="A software for reading and writing Data Matrix 2D barcodes" url="http://www.libdmtx.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') depends=('glibc') +options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('d3a4c0becd92895eb606dbdb78b023e2') -options=('!libtool') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD index 9569ef05a..ff458ed14 100644 --- a/extra/libgphoto2/PKGBUILD +++ b/extra/libgphoto2/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 179978 2013-03-13 20:08:25Z jgc $ +# $Id: PKGBUILD 188179 2013-06-11 19:26:15Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=libgphoto2 -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64 'mips64el') url="http://www.gphoto.org" license=(LGPL) -depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb') +depends=('libexif' 'libjpeg' 'gd' 'libltdl' 'libusb') install=libgphoto2.install options=('libtool') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz) -md5sums=('92780eb4baf7b512b86b5e7300ec91a5') +md5sums=('d9f4462957e59bf2b2eb3b1ea8423570') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD index 0bd75b576..a10af3943 100644 --- a/extra/libhangul/PKGBUILD +++ b/extra/libhangul/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 140549 2011-10-17 07:24:10Z bisson $ +# $Id: PKGBUILD 188501 2013-06-15 04:42:48Z bisson $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libhangul pkgver=0.1.0 -pkgrel=1 -_filecode=6000 +pkgrel=2 pkgdesc='Input method library for Korean' -arch=('i686' 'x86_64' 'mips64el') -url='http://kldp.net/projects/hangul/' +url='http://code.google.com/p/libhangul/' license=('LGPL') -options=('!libtool') -source=("https://libhangul.googlecode.com/files/libhangul-${pkgver}.tar.gz") +arch=('i686' 'x86_64' 'mips64el') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no + ./configure --prefix=/usr --disable-static make } diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD index df025d12b..e1ba0323e 100644 --- a/extra/libindi/PKGBUILD +++ b/extra/libindi/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 62098 2010-01-02 09:13:44Z tpowa $ +# $Id: PKGBUILD 188185 2013-06-11 20:41:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libindi pkgver=0.9.6 -pkgrel=1.1 +pkgrel=2 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation" url="http://www.indilib.org/index.php?title=Main_Page" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat') -makedepends=('pkgconfig' 'cmake' 'boost') +makedepends=('cmake' 'boost') options=('!libtool') source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz") md5sums=('c1456544a36f543e2884f88913cf3eb0') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,6 +25,11 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}"/usr/lib/udev/rules.d + mv "${pkgdir}"/etc/udev/rules.d/99-gpusb.rules \ + "${pkgdir}"/usr/lib/udev/rules.d/ + rmdir "${pkgdir}"/etc/udev/rules.d "${pkgdir}"/etc/udev "${pkgdir}"/etc } diff --git a/extra/libiodbc/PKGBUILD b/extra/libiodbc/PKGBUILD index 106baf027..6b6227807 100644 --- a/extra/libiodbc/PKGBUILD +++ b/extra/libiodbc/PKGBUILD @@ -1,36 +1,35 @@ -# $Id: PKGBUILD 4453 2009-10-23 09:11:19Z spupykin $ +# $Id: PKGBUILD 188768 2013-06-19 20:32:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libiodbc pkgver=3.52.8 -pkgrel=1 +pkgrel=2 pkgdesc='Independent Open DataBase Connectivity for Linux' arch=('i686' 'x86_64' 'mips64el') url="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/" license=('LGPL') -depends=('glibc' 'sh') +depends=('sh') makedepends=('chrpath') -replaces=('iodbc') -conflicts=('iodbc') options=('!libtool') source=("http://downloads.sourceforge.net/iodbc/${pkgname}-${pkgver}.tar.gz") md5sums=('9889f95f632f10895ff53b8a22162810') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-static \ --includedir=/usr/include/libiodbc \ --disable-gui \ - --disable-libodbc + --disable-libodbc make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + chrpath -d ${pkgdir}/usr/bin/iodbctest{,w} rm -rf ${pkgdir}/usr/share/libiodbc/ } diff --git a/extra/libiscsi/PKGBUILD b/extra/libiscsi/PKGBUILD index 26f3c5381..022c26a78 100644 --- a/extra/libiscsi/PKGBUILD +++ b/extra/libiscsi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186551 2013-05-28 18:43:28Z tpowa $ +# $Id: PKGBUILD 187826 2013-06-06 15:44:51Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libiscsi pkgver=1.7.0 -pkgrel=1 +pkgrel=2 depends=('glibc' 'popt') -pkgdesc="Library that provides generic access to USB device" +pkgdesc="Clientside library to implement the iSCSI protocol" arch=(i686 x86_64) url="https://github.com/sahlberg/libiscsi" license=('LGPL') diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index e0654b595..b58503776 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184872 2013-05-09 09:42:45Z andrea $ +# $Id: PKGBUILD 187950 2013-06-08 07:59:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.10.3 +pkgver=4.10.4 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=('1ca7e92544a1d3c49e5ddf3583c3c2b976a7990b') +sha1sums=('a9017c1922ee56f51c16c617e9046ccb6149ccd5') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index d4c8b4b9d..68225a978 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184873 2013-05-09 09:42:46Z andrea $ +# $Id: PKGBUILD 187951 2013-06-08 07:59:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.10.3 +pkgver=4.10.4 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=('cc6ad902a6c94c68a1b8d27aabdbcac1df547cd8') +sha1sums=('d442e7d4257b68f182815f3a4330982a026b7dc3') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 611e3870e..819d7d53c 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184867 2013-05-09 09:42:40Z andrea $ +# $Id: PKGBUILD 187945 2013-06-08 07:59:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.10.3 +pkgver=4.10.4 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=('801770f6eefc85b0939304bc0c5acf399fa988ed') +sha1sums=('3390eb344d62f7e44fe5db65eb171d397142fa96') build() { mkdir build diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 7c020e14f..8c3ea236d 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184865 2013-05-09 09:42:38Z andrea $ +# $Id: PKGBUILD 187943 2013-06-08 07:59:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.10.3 +pkgver=4.10.4 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=('99e781b0c6ab8907e15f9d2dff6f3a778e40c331') +sha1sums=('78b56f1388be8fcbfc0d9f4f9e395a6ae5f25d7f') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index fd6f082cc..4f9ffb501 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184874 2013-05-09 09:42:47Z andrea $ +# $Id: PKGBUILD 187952 2013-06-08 07:59:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdegames -pkgver=4.10.3 +pkgver=4.10.4 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=('1a6385ee9bbbfc1f8d992df6efd716727e9ba3a4') +sha1sums=('5c3ff5f9ac6c7f4c80044e67cad1863631c0a7e6') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index ac09d4206..bc614dfea 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184868 2013-05-09 09:42:41Z andrea $ +# $Id: PKGBUILD 187946 2013-06-08 07:59:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.10.3 +pkgver=4.10.4 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=('57f3d52c8ff6b58af55fb83d38d7479688bd681b') +sha1sums=('88db6d3eae13ac1dd0113e456cb1f6ad8f31c7b3') build() { cd "${srcdir}" diff --git a/extra/libkeybinder3/PKGBUILD b/extra/libkeybinder3/PKGBUILD new file mode 100644 index 000000000..55bbfa97b --- /dev/null +++ b/extra/libkeybinder3/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 188643 2013-06-17 09:55:24Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: speps <speps at aur dot archlinux dot org> + +pkgname=libkeybinder3 +pkgver=0.3.0 +pkgrel=3 +pkgdesc="A library for registering global keyboard shortcuts" +arch=('i686' 'x86_64') +url="http://kaizer.se/wiki/keybinder/" +license=('MIT') +depends=('gtk3') +makedepends=('gtk-doc' 'gobject-introspection') +optdepends=('lua-lgi: lua bindings') +options=('!libtool') +source=(http://archive.ubuntu.com/ubuntu/pool/universe/k/keybinder-3.0/keybinder-3.0_${pkgver}.orig.tar.gz) +sha1sums=('53167d295ffa1d356bfad6f9360b90bd85e8fb26') + +build() { + cd keybinder-3.0-${pkgver} + ./configure --prefix=/usr --enable-gtk-doc + make +} + +package() { + cd keybinder-3.0-${pkgver} + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index fe054d4c5..805629acf 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.10.3 +pkgver=4.10.4 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=('5b8ac6703026cd0fe1bcc29f6f3dc1e6cf724b15') +sha1sums=('f4d96eddaad6e160c3ca579420117ed2deec74f6') build() { cd "${srcdir}" diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index 7961301f8..c3fc14617 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184875 2013-05-09 09:42:48Z andrea $ +# $Id: PKGBUILD 187953 2013-06-08 07:59:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkmahjongg -pkgver=4.10.3 +pkgver=4.10.4 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=('d33446dcd5cbc455fdd2bf09406b5a4ce15d683b') +sha1sums=('5bb8fbcc696702489fb12dde5f8a098aecdd9a3a') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 7df552562..d72ffc11f 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184870 2013-05-09 09:42:43Z andrea $ +# $Id: PKGBUILD 187948 2013-06-08 07:59:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.10.3 +pkgver=4.10.4 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=('1b9af8bf3b0ed24211115d16937f56414222738c') +sha1sums=('6bb65bd85a9e65dfc20448a359df77c11e6aca55') build() { cd "${srcdir}" diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD new file mode 100644 index 000000000..00d84af60 --- /dev/null +++ b/extra/libkscreen/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 188666 2013-06-17 16:24:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=libkscreen +pkgver=1.0 +pkgrel=1 +pkgdesc="KDE's screen management library" +arch=('i686' 'x86_64') +url='https://projects.kde.org/libkscreen' +license=('GPL') +depends=('kdelibs' 'qjson') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('83dc38c6ff5d33f253f7d9a43bc986cb') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD index 901429d4c..b00ae9f5b 100644 --- a/extra/libmbim/PKGBUILD +++ b/extra/libmbim/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186608 2013-05-30 04:01:37Z heftig $ +# $Id: PKGBUILD 188603 2013-06-16 20:32:24Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libmbim -pkgver=1.0.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="MBIM modem protocol helper library" arch=(i686 x86_64) @@ -11,14 +11,8 @@ license=(GPL2) depends=(glib2 bash systemd) makedepends=(gtk-doc python) options=('!libtool') -source=($url/snapshot/$pkgname-$pkgver.tar.xz format.patch) -sha256sums=('c3d668a5dc51700749a62fb5d50f149900e8dd4265e4d132c1d9cc4cb77eef0c' - 'fbf54d12660c132f756c59cebd448a38750e3bbc9de8a7a97ceda466440dcb41') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../format.patch -} +source=(http://cgit.freedesktop.org/libmbim/libmbim/snapshot/$pkgname-$pkgver.tar.xz) +sha256sums=('0b00085486bb34b772e56643d6605eaffc3b2dd620485bc598cab8b0c6051825') build() { cd $pkgname-$pkgver diff --git a/extra/libmbim/format.patch b/extra/libmbim/format.patch deleted file mode 100644 index 4bd4c0eea..000000000 --- a/extra/libmbim/format.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r libmbim-1.0.0/cli/mbimcli-basic-connect.c libmbim-1.0.0-format/cli/mbimcli-basic-connect.c ---- libmbim-1.0.0/cli/mbimcli-basic-connect.c 2013-05-22 16:20:29.000000000 +0200 -+++ libmbim-1.0.0-format/cli/mbimcli-basic-connect.c 2013-05-30 05:53:49.269777442 +0200 -@@ -909,8 +909,8 @@ - "\t Network error: '%s'\n" - "\t Packet service state: '%s'\n" - "\tAvailable data classes: '%s'\n" -- "\t Uplink speed: '%lu bps'\n" -- "\t Downlink speed: '%lu bps'\n", -+ "\t Uplink speed: '%" G_GUINT64_FORMAT " bps'\n" -+ "\t Downlink speed: '%" G_GUINT64_FORMAT " bps'\n", - mbim_device_get_path_display (device), - VALIDATE_UNKNOWN (mbim_nw_error_get_string (nw_error)), - VALIDATE_UNKNOWN (mbim_packet_service_state_get_string (packet_service_state)), diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index bfac9d035..cb2b98529 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183434 2013-04-21 22:11:27Z heftig $ +# $Id: PKGBUILD 188712 2013-06-18 13:46:20Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.8.0 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -19,17 +19,30 @@ options=('!libtool') install=libpeas.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz js17.patch) -sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe' - '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889') +sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d' + '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f') -build() { +prepare() { cd $pkgname-$pkgver patch -Np1 -i ../js17.patch +} + +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var --enable-compile-warnings=no + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install diff --git a/extra/libpeas/js17.patch b/extra/libpeas/js17.patch index b0f7d041d..7f54a1803 100644 --- a/extra/libpeas/js17.patch +++ b/extra/libpeas/js17.patch @@ -1,24 +1,46 @@ -diff -u -r libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c ---- libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c 2013-01-05 20:32:04.000000000 +0100 -+++ libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c 2013-04-03 00:22:56.726029598 +0200 -@@ -362,7 +362,7 @@ +From 8c54d0ee9c929d9141f74a0c047fed2e28347aa3 Mon Sep 17 00:00:00 2001 +From: Garrett Regier <garrettregier@gmail.com> +Date: Sat, 27 Apr 2013 11:36:13 +0000 +Subject: Fix Gjs plugin loader + +The garbage collection now takes a runtime instead of a contex +so just use Gjs's gc method to do the right thing and jsvals +cannot be compared anymore. +--- +diff --git a/loaders/gjs/peas-extension-gjs.c b/loaders/gjs/peas-extension-gjs.c +index 2a71ff8..0ec418c 100644 +--- a/loaders/gjs/peas-extension-gjs.c ++++ b/loaders/gjs/peas-extension-gjs.c +@@ -362,7 +362,7 @@ peas_extension_gjs_call (PeasExtensionWrapper *exten, if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval), nth_out_arg++, &js_value) || - js_value == JSVAL_VOID) -+ js_value.asBits == JSVAL_VOID.asBits) ++ JSVAL_IS_VOID (js_value)) { g_warning ("Error failed to get out argument %i", nth_out_arg); return FALSE; -diff -u -r libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c ---- libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c 2012-08-15 12:40:31.000000000 +0200 -+++ libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c 2013-04-03 00:19:12.884403305 +0200 -@@ -279,7 +279,7 @@ +diff --git a/loaders/gjs/peas-plugin-loader-gjs.c b/loaders/gjs/peas-plugin-loader-gjs.c +index d9acfdf..8cea724 100644 +--- a/loaders/gjs/peas-plugin-loader-gjs.c ++++ b/loaders/gjs/peas-plugin-loader-gjs.c +@@ -279,7 +279,7 @@ peas_plugin_loader_gjs_create_extension (PeasPluginLoader *loader, if (!JS_GetPropertyById (js_context, ginfo->extensions, prop_name_id, &prop_extension_ctor) || - prop_extension_ctor != extension_ctor) -+ prop_extension_ctor.asBits != extension_ctor.asBits) ++ JSVAL_TO_OBJECT (prop_extension_ctor) != JSVAL_TO_OBJECT (extension_ctor)) continue; if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) || +@@ -327,7 +327,7 @@ static void + garbage_collect (PeasPluginInfo *info, + GjsInfo *ginfo) + { +- JS_GC (gjs_context_get_native_context (ginfo->context)); ++ gjs_context_gc (ginfo->context); + } + + static void +-- +cgit v0.9.2 diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index a81628eb0..eb350d700 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186348 2013-05-25 05:24:32Z foutrelis $ +# $Id: PKGBUILD 188760 2013-06-19 19:35:08Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.3.3 -pkgver=4.0.3 -pkgrel=3 +_LOver=4.0.4.2 +pkgver=4.0.4 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,7 +29,7 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez-libs' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" @@ -74,9 +74,9 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_additional_source_url}/libcdr-0.0.12.tar.bz2 - ${_additional_source_url}/libmspub-0.0.5.tar.bz2 - ${_additional_source_url}/libvisio-0.0.26.tar.bz2 + ${_additional_source_url}/libcdr-0.0.14.tar.bz2 + ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libvisio-0.0.28.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @@ -108,12 +108,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libcdr-0.0.12.tar.bz2 - libmspub-0.0.5.tar.bz2 - libvisio-0.0.26.tar.bz2) -md5sums=('7bcde561375f3bbce08f6d05451c8ad7' - '994b1f3015668335c30b53ddd3d60dc8' - '05b9ba0e86181bda3afeadcaba9202a3' + libcdr-0.0.14.tar.bz2 + libmspub-0.0.6.tar.bz2 + libvisio-0.0.28.tar.bz2) +md5sums=('19462798bbf6e1dc75a8b12bd1775ea2' + 'a4d5e6504a3251b7a7fbe17216f8d6e7' + '0ba553eea7284abe1370157bb35bd355' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -143,9 +143,9 @@ md5sums=('7bcde561375f3bbce08f6d05451c8ad7' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' - '6db2c96a4ae5977da8b84893c1441038' - '881c4628ec5f54d47f35d5d19e335662' - '2f638cf6f92cec59c9205ac3cbf1702e' + 'd88f9b94df880d2c05be943b000ca112' + '1120705cd0f0d9bd5506360bf57b6c2e' + '05574c2ec54dd0c29d75cacdf9419f44' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') diff --git a/extra/libreoffice/PKGBUILD.41 b/extra/libreoffice/PKGBUILD.41 new file mode 100644 index 000000000..30930fce4 --- /dev/null +++ b/extra/libreoffice/PKGBUILD.41 @@ -0,0 +1,660 @@ +# $Id: PKGBUILD 186347 2013-05-25 05:23:41Z foutrelis $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> + +pkgbase="libreoffice" +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' + 'libreoffice-postgresql-connector' + 'libreoffice-extension-presentation-minimizer' + 'libreoffice-extension-wiki-publisher' + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) +_LOver=4.1.0.0.beta2 +pkgver=4.1.0 +pkgrel=0.2 #beta2 +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' + 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' + 'clucene' 'bluez-libs' # 'harfbuzz' + # the runtime dependencies + "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' + 'ttf-dejavu') # to satisfy regression tests + +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors + +_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" +source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz + ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + ${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 + ${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 + ${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz + ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 + ${_additional_source_url}/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 + ${_additional_source_url}/libcdr-0.0.14.tar.bz2 + ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libmwaw-0.1.9.tar.bz2 + ${_additional_source_url}/libvisio-0.0.28.tar.bz2 + make-pyuno-work-with-system-wide-module-install.diff + libreoffice-common.sh libreoffice-common.csh + fix_install.diff) +noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + 185d60944ea767075d27247c3162b3bc-unowinreg.dll + 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 + b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 + c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 + libcdr-0.0.14.tar.bz2 + libmspub-0.0.6.tar.bz2 + libmwaw-0.1.9.tar.bz2 + libvisio-0.0.28.tar.bz2 ) +md5sums=('a785e1ed4809246edc39d0b55a807cdd' + '96ea39853d9058cb9e98749539827187' + '6ecbe09a87d5c2c1a186671d24643111' + 'f02578f5218f217a9f20e9c30e119c6a' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + '2a177023f9ea8ec8bd00837605c5df1b' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '625ff5f2f968dd908bca43c9469d6e6b' + '2c9b0f83ed5890af02c0df1c1776f39b' + '2e482c7567908d334785ce7d69ddfff7' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '08c85a6d6d793daee14e10e22eefdc4b' + 'dc3d21a3921931096d6e80f6701f6763' + 'b2371dc7cf4811c9d32146eec913d296' + 'ea2acaf140ae40a87a952caa75184f4d' + '36271d3fa0d9dec1632029b6d7aac925' + '0168229624cfac409e766913506961a8' + '17410483b5b5f267aa18b7e00b65e6e0' + '185d60944ea767075d27247c3162b3bc' + '8473296c671b6e3dd8197f4145e0854b' + 'c48827713e93539dc7285f9e86ffbdc5' + 'd88f9b94df880d2c05be943b000ca112' + '1120705cd0f0d9bd5506360bf57b6c2e' + '2090daf6e8a27b52e8c5f26c915bd7c5' + '05574c2ec54dd0c29d75cacdf9419f44' + '07d2bf5ad839a394cca008b3ec6e7bb1' + '4195735a80876ae812fca5736b50192a' + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' + 'd1fa6b1b1820cc5a7154720a1dcb0a4a') + +prepare() { + + cd ${srcdir}/libreoffice-$_LOver + + # fix exttextcat build error + # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + unset CPPFLAGS + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # fix not upstreamable pyuno paths - patch taken from Debian + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + + # fix file-lists + # http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-1&id=8ce82f83fb8146b684bec5d903d76f034ba37d4a + patch -Np1 -i ${srcdir}/fix_install.diff + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + + # qt4 fix + sed -i "s:qmake:qmake-qt4:g" configure.ac +} + +build() { + cd ${srcdir}/libreoffice-$_LOver + + #autoconf -f + + # non-SMP test build + #export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + + ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-gtk3 \ + --enable-gstreamer \ + --enable-lockdown\ + --enable-opengl \ + --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --without-afms\ + --without-system-libwps\ + --without-system-libcdr \ + --without-system-mdds\ + --without-myspell-dicts \ + --without-system-libvisio \ + --without-system-libcmis \ + --without-system-libmspub \ + --without-system-libexttextcat \ + --without-system-orcus \ + --without-system-liblangtag \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --without-system-libodfgen \ + --without-system-libmwaw \ + --without-system-harfbuzz \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-npapi-headers \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mythes\ + --with-system-headers\ + --without-system-hsqldb \ + --with-alloc=system\ + --with-system-clucene\ + --without-system-servlet-api + +# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 + +# --without-ppds\ # breaks spadmin permission + +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + + touch src.downloaded + #./download + make + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-common() { + + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" + install=libreoffice-common.install + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' + 'libcups: adds printing support' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping /macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' + 'gtk2: for browser plugin') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf) + groups=('libreoffice') + provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # allow to preset desired VLC + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh + rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py + + # workaround all packages now depend on that file + cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd +} + +package_libreoffice-base() { + pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." + install=libreoffice-base.install + depends=('libreoffice-common') + optdepends=('libreoffice-postgresql-connector') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-postgresql-connector() { + pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" + depends=('libreoffice-base' 'postgresql-libs') + groups=('libreoffice') + replaces=('libreoffice') + + # workaround double entries in the file list + mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig + sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + install=libreoffice-calc.install + depends=('libreoffice-common' 'lpsolve' ) + #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + install=libreoffice-draw.install + depends=('libreoffice-common') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3 + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + install=libreoffice-impress.install + depends=('libreoffice-common') + optdepends=('glu: for the OGLTrans extension') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Application for LibreOffice." + depends=('libreoffice-common') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # fix environment path to keep compatibility with other java-environments + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} +} + +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; +} + +package_libreoffice-writer() { + pkgdesc="Word Processor Application for LibreOffice." + install=libreoffice-writer.install + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # for workaround this file belongs now to common + rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd +} + +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice-common' 'gcc-libs') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer +} + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} diff --git a/extra/libreoffice/fix_install.diff b/extra/libreoffice/fix_install.diff new file mode 100644 index 000000000..b16320a22 --- /dev/null +++ b/extra/libreoffice/fix_install.diff @@ -0,0 +1,82 @@ +From 8ce82f83fb8146b684bec5d903d76f034ba37d4a Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Fri, 07 Jun 2013 12:13:24 +0000 +Subject: distro-install-file-lists: handle new filelists created for 4.1 + +Change-Id: I2d7a52b396a46f1f6546b92eb5612958a2cb7397 +--- +diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists +index d83855b..bbd462b 100755 +--- a/bin/distro-install-file-lists ++++ b/bin/distro-install-file-lists +@@ -80,6 +80,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + gid_Module_Root_Files_[0-9] \ + gid_Module_Root_Hack \ + gid_Module_Oo_Linguistic \ ++ gid_Module_Root_Extension_Dictionary_* \ + gid_Module_Root_Ure_Hidden ; do + merge_flists $module $FILELISTSDIR/common_list.txt + done +@@ -100,6 +101,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/math_list.txt + merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/impress_list.txt + merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/writer_list.txt ++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/base_list.txt ++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/draw_list.txt ++ + # FIXME: small; low dependencies; why optional module? + merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/impress_list.txt + else +@@ -115,6 +119,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/common_list.txt + # FIXME: small; low dependencies; why optional module? + merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt + fi +@@ -133,26 +139,26 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt + else + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt + fi + else + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt + fi + +@@ -413,7 +419,7 @@ else + create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer + create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress + create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base +- create_package_directory gid_Module_Optional_Pyuno pkg/python-uno ++ create_package_directory gid_Module_Pyuno pkg/python-uno + create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome + create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde + create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/librelogo.diff b/extra/libreoffice/librelogo.diff deleted file mode 100644 index c17143225..000000000 --- a/extra/libreoffice/librelogo.diff +++ /dev/null @@ -1,43 +0,0 @@ -From 939daba04c25a9a3b7be2f3df39692453cf9a304 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Thu, 21 Mar 2013 14:57:18 +0000 -Subject: Missing dependency of librelogo on writer - -...at least due to dependency of librelogo.xcd on writer.xcd, see -82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "Missing dependency." - -Otherwise, having librelogo installed but not writer will cause an uncaught -RuntimeException from configmgr::Components::parseXcdFiles -(configmgr/source/components.cxx) early on in soffice.bin. - -(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3) -Conflicts: - setup_native/source/packinfo/packinfo_office.txt - -Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08 -Reviewed-on: https://gerrit.libreoffice.org/2898 -Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> -Reviewed-by: Andras Timar <atimar@suse.com> -Reviewed-by: Petr Mladek <pmladek@suse.cz> -Tested-by: Petr Mladek <pmladek@suse.cz> ---- -diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt -index 3e8c89e..cbf8c490 100644 ---- a/setup_native/source/packinfo/packinfo_office.txt -+++ b/setup_native/source/packinfo/packinfo_office.txt -@@ -314,10 +314,10 @@ End - Start - module = "gid_Module_Optional_Pyuno_LibreLogo" - solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo" --solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython" -+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython" - packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" --freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" --requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" -+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" -+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" - copyright = "2012 The Document Foundation" - solariscopyright = "solariscopyrightfile" - vendor = "The Document Foundation" --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libsmbios/PKGBUILD b/extra/libsmbios/PKGBUILD index d13dd6dce..d7dab5cf0 100644 --- a/extra/libsmbios/PKGBUILD +++ b/extra/libsmbios/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 144413 2011-12-05 15:46:35Z jgc $ +# $Id: PKGBUILD 187063 2013-06-03 11:16:41Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: daniel g. siegel <dgsiegel@gmail.com> pkgname=libsmbios pkgver=2.2.28 -pkgrel=1 +pkgrel=2 pkgdesc="A library for providing access to as much BIOS information as possible" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://linux.dell.com/libsmbios/main/index.html" license=('GPL' 'custom') depends=('gcc-libs') @@ -21,7 +21,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" mkdir build cd build - PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc --disable-static + PYTHON=python2 ../configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-static mkdir -p out/libsmbios_c mkdir -p out/libsmbios_c++ make @@ -31,7 +31,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install - chrpath -d "${pkgdir}/usr/sbin/smbios-sys-info-lite" + chrpath -d "${pkgdir}/usr/bin/smbios-sys-info-lite" cp -a ../src/include/* "${pkgdir}/usr/include/" cp -a out/public-include/* "${pkgdir}/usr/include/" @@ -40,7 +40,7 @@ package() { rm -rf "${pkgdir}/usr/lib/yum-plugins" sed -e 's|#!/usr/bin/python|#!/usr/bin/python2|g' \ - -i "${pkgdir}"/usr/sbin/smbios-{{wakeup,token,wireless}-ctl,lcd-brightness,rbu-bios-update,passwd,sys-info} + -i "${pkgdir}"/usr/bin/smbios-{{wakeup,token,wireless}-ctl,lcd-brightness,rbu-bios-update,passwd,sys-info} install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 ../COPYING-OSL "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD index 706f208fe..3ff349f22 100644 --- a/extra/libspiro/PKGBUILD +++ b/extra/libspiro/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 145163 2011-12-18 12:09:22Z bisson $ -# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr> +# $Id: PKGBUILD 188499 2013-06-15 04:42:05Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr> pkgname=libspiro pkgver=20071029 -pkgrel=2.2 +pkgrel=3 pkgdesc='Simplifies the drawing of beautiful curves' url='http://libspiro.sourceforge.net/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2") sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD index 1013f6bc8..c6d6294f8 100644 --- a/extra/libsrtp/PKGBUILD +++ b/extra/libsrtp/PKGBUILD @@ -1,30 +1,42 @@ -# $Id: PKGBUILD 159152 2012-05-16 20:08:38Z andrea $ +# $Id: PKGBUILD 188535 2013-06-15 10:01:17Z andrea $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Yejun Yang <yejunx AT gmail DOT com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=libsrtp -pkgver=1.4.4 -pkgrel=2 +pkgver=15.1c9bd90 +pkgrel=1 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" url="http://srtp.sourceforge.net/srtp.html" arch=('i686' 'x86_64' 'mips64el') license=('BSD') -source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz" - "mips.patch") -md5sums=('9b449edb011c934ca97009e7e0566d22' +depends=('glibc') +makedepends=('git') +source=("git://git.linphone.org/srtp.git#commit=1c9bd90" + "mips.patch") +md5sums=('SKIP' 'bfb3ec203daf786b9ffb33f30cb126ea') -build() { - cd "${srcdir}"/srtp +pkgver() { + cd srtp + echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) +} + +prepare() { + cd srtp patch -Np1 -i "$srcdir/mips.patch" + autoconf +} + +build() { + cd srtp ./configure --prefix=/usr - make CFLAGS="${CFLAGS} -fPIC" + make } package() { - cd "${srcdir}"/srtp + cd srtp make DESTDIR="${pkgdir}" install install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/core/libusb-compat/PKGBUILD b/extra/libusb-compat/PKGBUILD index 569cb84c0..8094d64fc 100644 --- a/core/libusb-compat/PKGBUILD +++ b/extra/libusb-compat/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169660 2012-10-25 08:23:04Z eric $ -# Maintainer: +# $Id: PKGBUILD 188653 2013-06-17 10:53:32Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: arjan <arjan@archlinux.org> pkgname=libusb-compat -pkgver=0.1.4 -pkgrel=2 +pkgver=0.1.5 +pkgrel=1 pkgdesc="Library to enable user space application programs to communicate with USB devices" arch=('i686' 'x86_64' 'mips64el') url="http://libusb.sourceforge.net/" @@ -13,7 +13,6 @@ license=('LGPL') depends=('libusb' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2ca521fffadd0c28fdf174e6ec73865b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,3 +25,4 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('2780b6a758a1e2c2943bdbf7faf740e4') diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 867f03f25..762f82dfc 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178618 2013-02-25 20:45:01Z andyrtr $ +# $Id: PKGBUILD 187152 2013-06-04 16:06:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.5.0 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86') +sha256sums=('53131412343ec252307fe14903deaf54c356f9414d72d49180c2091dcd7019fa') build() { cd "${srcdir}/libX11-${pkgver}" diff --git a/extra/libx11/xorg.csh b/extra/libx11/xorg.csh deleted file mode 100644 index 39d5a9715..000000000 --- a/extra/libx11/xorg.csh +++ /dev/null @@ -1,15 +0,0 @@ -setenv XDG_DATA_HOME ${HOME}/.local/share -setenv XDG_CONFIG_HOME ${HOME}/.config -setenv XDG_CACHE_HOME ${HOME}/.cache - -if (! ($?XDG_DATA_DIRS) ) then - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/ -else - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:${XDG_DATA_DIRS} -endif - -if (! ($?XDG_CONFIG_DIRS) ) then - setenv XDG_CONFIG_DIRS /etc/xdg -else - setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS} -endif diff --git a/extra/libx11/xorg.sh b/extra/libx11/xorg.sh deleted file mode 100644 index 4fc02e322..000000000 --- a/extra/libx11/xorg.sh +++ /dev/null @@ -1,15 +0,0 @@ -export XDG_DATA_HOME=$HOME/.local/share -export XDG_CONFIG_HOME=$HOME/.config -export XDG_CACHE_HOME=$HOME/.cache - -if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/ -else - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:$XDG_DATA_DIRS -fi - -if [ -z $XDG_CONFIG_DIRS ]; then - export XDG_CONFIG_DIRS=/etc/xdg -else - export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS -fi diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD index 7a4dd7345..1651fda73 100644 --- a/extra/libxkbcommon/PKGBUILD +++ b/extra/libxkbcommon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181161 2013-04-01 20:10:49Z heftig $ +# $Id: PKGBUILD 188191 2013-06-12 13:53:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> pkgname=libxkbcommon -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc="Keyboard handling library using XKB data" arch=(i686 x86_64 mips64el) @@ -14,7 +14,8 @@ depends=(xkeyboard-config) makedepends=(doxygen xorg-util-macros) options=('!libtool') source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz") -md5sums=('22a046100738f99b4cc0297aa210f4e4') +#source=("$pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git") +md5sums=('7287ea51df79c0f80e92b970a30b95e9') build() { cd $pkgname-$pkgver diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD index e288114dc..89d193dfa 100644 --- a/extra/libxml2/PKGBUILD +++ b/extra/libxml2/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 185108 2013-05-11 07:24:50Z bpiotrowski $ +# $Id: PKGBUILD 187170 2013-06-04 17:39:43Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 pkgver=2.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="XML parsing library, version 2" -arch=(i686 x86_64 'mips64el') -license=('custom') -depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7' 'xz') +arch=(i686 x86_64 mips64el) +license=('MIT') +depends=('zlib' 'readline' 'ncurses' 'xz') makedepends=('python2') options=('!libtool') url="http://www.xmlsoft.org/" diff --git a/extra/libxrender/PKGBUILD b/extra/libxrender/PKGBUILD index 24de8a9f4..24785f486 100644 --- a/extra/libxrender/PKGBUILD +++ b/extra/libxrender/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152786 2012-03-09 16:24:03Z andyrtr $ +# $Id: PKGBUILD 188444 2013-06-14 06:38:04Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxrender -pkgver=0.9.7 -pkgrel=1.2 +pkgver=0.9.8 +pkgrel=1 pkgdesc="X Rendering Extension client library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11>=1.3.4' 'renderproto') makedepends=('pkgconfig') options=('!libtool') source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2) -sha1sums=('6e4d75d8316d5217324258f555eba3a5d383feb2') +sha256sums=('1d14b02f0060aec5d90dfdcf16a996f17002e515292906ed26e3dcbba0f4fc62') build() { cd "${srcdir}/libXrender-${pkgver}" diff --git a/extra/libxvmc/PKGBUILD b/extra/libxvmc/PKGBUILD index 38f6b369e..8b10db470 100644 --- a/extra/libxvmc/PKGBUILD +++ b/extra/libxvmc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152797 2012-03-09 16:34:16Z andyrtr $ +# $Id: PKGBUILD 188450 2013-06-14 09:23:32Z lcarlier $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxvmc -pkgver=1.0.7 -pkgrel=1.1 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 Video Motion Compensation extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxv') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2") -sha1sums=('b8ee482514dfdf226694c830bdf292cc14e1cb91') +sha256sums=('5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204') build() { cd ${srcdir}/libXvMC-${pkgver} diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index eabfb6a73..99ad5a40a 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183248 2013-04-19 14:20:16Z giovanni $ +# $Id: PKGBUILD 188255 2013-06-13 15:52:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.11 +pkgver=4.7.12 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1a990ecf0b517813a4c7b3b6f9c01f00') +md5sums=('f4f0b731dc0bbd1c7adfe9a8ef7ab116') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 4d4a02319..960b8092c 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186968 2013-06-01 19:28:52Z giovanni $ +# $Id: PKGBUILD 188257 2013-06-13 16:04:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.05.30 +pkgver=2013.06.06 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('c3f776e18b3aa5f1cafc7a551fcf8059') +md5sums=('81431f6217725e2b1c3f1a16fca19221') build() { cd ${srcdir}/live diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index ac62f6ed0..c77faf380 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183300 2013-04-20 23:37:12Z foutrelis $ +# $Id: PKGBUILD 188592 2013-06-16 17:21:04Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -9,90 +9,48 @@ # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> -pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=3.2 -pkgrel=6 +pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer') +pkgver=3.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx') -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz - http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz + http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz + http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz + clang-3.3-use-gold-linker.patch llvm-Config-config.h - llvm-Config-llvm-config.h - cindexer-clang-path.patch - enable-lto.patch - llvm-3.1-fix-debug-line-info.patch - clang-3.2-fix-std-thread-with-libstdc++.patch - clang-3.1-fix-libprofile_rt.a-location.patch) -sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343' - '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658' - 'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1' + llvm-Config-llvm-config.h) +sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578' + 'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996' + '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423' + '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' - '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48' - '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' - 'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b' - 'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d' - '02b2c0fd29bc165140eb4524700254bfdd88369706719acb3f3be3134f1e67e8' - '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137') + '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') prepare() { - cd "$srcdir/$pkgname-$pkgver.src" + cd "$srcdir/llvm-$pkgver.src" # At the present, clang must reside inside the LLVM source code tree to build # See http://llvm.org/bugs/show_bug.cgi?id=4840 - mv "$srcdir/clang-$pkgver.src" tools/clang + mv "$srcdir/cfe-$pkgver.src" tools/clang mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ + # Fix docs installation directory + sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ Makefile.config.in - sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib/llvm:' \ - tools/llvm-config/llvm-config.cpp - sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \ - autoconf/configure.ac \ - configure # Fix insecure rpath (http://bugs.archlinux.org/task/14017) sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) - patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - - # Make -flto work - # Use gold instead of default linker, and always use the plugin - patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - - # Fix FS#34861: crash on apps built using C++11's std::thread - # http://llvm.org/bugs/show_bug.cgi?id=12730 - patch -d tools/clang -Np2 -i \ - "$srcdir/clang-3.2-fix-std-thread-with-libstdc++.patch" - - # Fix FS#29984: [clang] -coverage is broken - patch -d tools/clang -Np1 -i \ - "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch" - - # Fix FS#31098: LLVM 3.1 produces invalid debug information - # http://llvm.org/bugs/show_bug.cgi?id=13211 - patch -Np1 -i "$srcdir/llvm-3.1-fix-debug-line-info.patch" - - # Drop "svn" suffix from version string - sed -i 's/3\.2svn/3.2/g' configure - - # Prepare Python 2 override - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" + # Make -flto work; use ld.gold instead of the default linker + patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch" } build() { - cd "$srcdir/$pkgname-$pkgver.src" + cd "$srcdir/llvm-$pkgver.src" # Apply strip option to configure _optimized_switch="enable" @@ -101,34 +59,33 @@ build() { # Include location of libffi headers in CPPFLAGS CPPFLAGS+=" $(pkg-config --cflags libffi)" - # Use Python 2 - export PATH="$srcdir/python2-path:$PATH" - # Force the use of GCC instead of clang CC=gcc CXX=g++ \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib/llvm \ --sysconfdir=/etc \ --enable-shared \ --enable-libffi \ --enable-targets=all \ + --enable-experimental-targets=R600 \ --disable-expensive-checks \ --disable-debug-runtime \ --disable-assertions \ --with-binutils-include=/usr/include \ + --with-python=/usr/bin/python2 \ --$_optimized_switch-optimized make REQUIRES_RTTI=1 make -C docs -f Makefile.sphinx man make -C docs -f Makefile.sphinx html + make -C tools/clang/docs -f Makefile.sphinx html } package_llvm() { pkgdesc="Low Level Virtual Machine" - depends=('perl' 'libffi') + depends=("llvm-libs=$pkgver-$pkgrel" 'perl') - cd "$srcdir/$pkgname-$pkgver.src" + cd "$srcdir/llvm-$pkgver.src" # We move the clang directory out of the tree so it won't get installed and # then we bring it back in for the clang package @@ -138,27 +95,26 @@ package_llvm() { make -j1 DESTDIR="$pkgdir" install mv "$srcdir/clang" tools + # The runtime library goes into llvm-libs + mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir" + # OCaml bindings go to a separate package rm -rf "$srcdir"/{ocaml,ocamldoc} mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" # Remove duplicate files installed by the OCaml bindings - rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} + rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz} # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a + chmod -x "$pkgdir"/usr/lib/*.a # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" + rm "$pkgdir"/usr/lib/*LLVMHello.* # Symlink LLVMgold.so into /usr/lib/bfd-plugins # (https://bugs.archlinux.org/task/28479) install -d "$pkgdir/usr/lib/bfd-plugins" - ln -s ../llvm/LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" + ln -s ../LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" if [[ $CARCH == x86_64 ]]; then # Needed for multilib (https://bugs.archlinux.org/task/29951) @@ -175,12 +131,22 @@ package_llvm() { cp docs/_build/man/*.1 "$pkgdir/usr/share/man/man1/" # Install html docs - cp -r docs/_build/html/* "$pkgdir/usr/share/doc/llvm/html/" - rm -r "$pkgdir/usr/share/doc/llvm/html/_sources" + cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/" + rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources" install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } +package_llvm-libs() { + pkgdesc="Low Level Virtual Machine (runtime library)" + depends=('gcc-libs' 'zlib' 'libffi') + + install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so" + + install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + package_llvm-ocaml() { pkgdesc="OCaml bindings for LLVM" depends=("llvm=$pkgver-$pkgrel" 'ocaml') @@ -210,12 +176,16 @@ package_clang() { make DESTDIR="$pkgdir" install # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a + chmod -x "$pkgdir"/usr/lib/*.a # Revert the path change in case we want to do a repackage later sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ "$srcdir/llvm-$pkgver.src/Makefile.config" + # Install html docs + cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/" + rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" } diff --git a/extra/llvm/cindexer-clang-path.patch b/extra/llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/extra/llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch b/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch deleted file mode 100644 index 080aa4fca..000000000 --- a/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr clang-3.1.src.orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp ---- clang-3.1.src.orig/lib/Driver/Tools.cpp 2012-04-19 00:32:25.000000000 +0300 -+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-05-23 21:12:08.000000000 +0300 -@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a"; - - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); - } diff --git a/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch b/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch deleted file mode 100644 index 6963603b1..000000000 --- a/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- cfe/trunk/lib/Basic/Targets.cpp 2013/04/04 23:51:36 178815 -+++ cfe/trunk/lib/Basic/Targets.cpp 2013/04/04 23:53:43 178816 -@@ -2730,6 +2730,14 @@ - case NoMMX3DNow: - break; - } -+ -+ if (CPU >= CK_i486) { -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1"); -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2"); -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4"); -+ } -+ if (CPU >= CK_i586) -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8"); - } - - bool X86TargetInfo::hasFeature(StringRef Feature) const { diff --git a/extra/llvm/clang-3.3-use-gold-linker.patch b/extra/llvm/clang-3.3-use-gold-linker.patch new file mode 100644 index 000000000..76905a64e --- /dev/null +++ b/extra/llvm/clang-3.3-use-gold-linker.patch @@ -0,0 +1,12 @@ +diff -upr cfe.src.orig/lib/Driver/ToolChains.cpp cfe.src/lib/Driver/ToolChains.cpp +--- cfe.src.orig/lib/Driver/ToolChains.cpp 2013-06-08 16:17:19.000000000 +0300 ++++ cfe.src/lib/Driver/ToolChains.cpp 2013-06-08 16:17:33.000000000 +0300 +@@ -2220,7 +2220,7 @@ Linux::Linux(const Driver &D, const llvm + PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + + GCCInstallation.getTriple().str() + "/bin").str()); + +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); + + Distro Distro = DetectDistro(Arch); + diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch deleted file mode 100644 index 9f43e657e..000000000 --- a/extra/llvm/enable-lto.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,7 +1398,7 @@ - PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + - GCCInstallation.getTriple() + "/bin").str()); - -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - // Tell the linker to load the plugin. This has to come before AddLinkerInputs - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. - if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - } - - AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs); - } diff --git a/extra/llvm/llvm-3.1-fix-debug-line-info.patch b/extra/llvm/llvm-3.1-fix-debug-line-info.patch deleted file mode 100644 index de2d46b61..000000000 --- a/extra/llvm/llvm-3.1-fix-debug-line-info.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001 -From: Ben Longbons <b.r.longbons@gmail.com> -Date: Fri, 29 Jun 2012 12:58:34 -0700 -Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue - lines in a function." - -This meants that the debugger could find meaningful line information. - -This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. ---- - lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++----- - test/DebugInfo/X86/ending-run.ll | 6 ++---- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -index 3e79a6d..24aedfb 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { - if (!MI->isDebugValue()) { - DebugLoc DL = MI->getDebugLoc(); - if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { -- unsigned Flags = 0; -+ unsigned Flags = DWARF2_FLAG_IS_STMT; - PrevInstLoc = DL; - if (DL == PrologEndLoc) { - Flags |= DWARF2_FLAG_PROLOGUE_END; - PrologEndLoc = DebugLoc(); - } -- if (PrologEndLoc.isUnknown()) -- Flags |= DWARF2_FLAG_IS_STMT; -- - if (!DL.isUnknown()) { - const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); - recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { - MF->getFunction()->getContext()); - recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), - FnStartDL.getScope(MF->getFunction()->getContext()), -- 0); -+ DWARF2_FLAG_IS_STMT); - } - } - -diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll -index 6935c47..0cd3de1 100644 ---- a/test/DebugInfo/X86/ending-run.ll -+++ b/test/DebugInfo/X86/ending-run.ll -@@ -1,11 +1,9 @@ - ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj - ; RUN: llvm-dwarfdump %t | FileCheck %s - --; Check that the line table starts at 7, not 4, but that the first --; statement isn't until line 8. -+; Check that the line table starts at 7, not 4. - --; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt --; CHECK: 0x0000000000000000 7 0 1 0 -+; CHECK: 0x0000000000000000 7 0 1 0 is_stmt - ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end - - define i32 @callee(i32 %x) nounwind uwtable ssp { --- -1.7.10 - diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD index e11622b06..1ac9d3db7 100644 --- a/extra/lsof/PKGBUILD +++ b/extra/lsof/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179524 2013-03-06 00:34:51Z tomegun $ +# $Id: PKGBUILD 187064 2013-06-03 11:16:43Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -7,7 +7,7 @@ pkgname=lsof pkgver=4.87 -pkgrel=1 +pkgrel=2 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64' 'mips64el') url="http://people.freebsd.org/~abe/" @@ -34,7 +34,7 @@ package() { $pkgdir/usr/share/doc/$pkgname/$file done - install -Dm0755 -o root -g root lsof ${pkgdir}/usr/sbin/lsof + install -Dm0755 -o root -g root lsof ${pkgdir}/usr/bin/lsof install -Dm0644 -o root -g root lsof.8 ${pkgdir}/usr/share/man/man8/lsof.8 install -D -m0644 -o root -g root ${srcdir}/license.txt \ diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 007735319..784354ec1 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185029 2013-05-10 12:32:47Z juergen $ +# $Id: PKGBUILD 187812 2013-06-06 11:09:25Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.30.0 -pkgrel=1 +pkgrel=2 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.1.7' 'texinfo' 'sh') + depends=('sbcl=1.1.8' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index cd31148ff..db347f8d2 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $ +# $Id: PKGBUILD 188540 2013-06-15 10:10:22Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Adrià Arrufat <swiftscythe@gmail.com> pkgname=mediastreamer -pkgver=2.8.2 -pkgrel=5 +pkgver=2.9.0 +pkgrel=1 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" license=('GPL') -depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') -makedepends=('intltool') +depends=('ortp' 'ffmpeg' 'libxv' 'glew' 'libupnp') +# xxd from Vim is needed to build +makedepends=('intltool' 'vim') options=('!libtool') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - mediastreamer-ffmpeg.patch) -md5sums=('e51ea9d5fce1396b374d10473dfbadec' - '805da7def98f367e621363fa0c951fe8' - '553d5d47ea4a8c8dfeabdc0281849d5f') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch -} +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +md5sums=('f2ea0fe731a363749a81b6eaac22a62c' + 'SKIP') build() { cd $pkgname-$pkgver diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch deleted file mode 100644 index 3304e9f56..000000000 --- a/extra/mediastreamer/mediastreamer-ffmpeg.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit f586917ea4d66f9ba8910f0967a8830e54d50784 -Author: Yann Diorcet <yann.diorcet@belledonne-communications.com> -Date: Tue Jun 5 11:07:48 2012 +0200 - - Fixes for new versions of ffmpeg - -diff --git a/src/h264dec.c b/src/h264dec.c -index c4a84ee..5229b5e 100644 ---- a/src/h264dec.c -+++ b/src/h264dec.c -@@ -45,7 +45,9 @@ typedef struct _DecData{ - static void ffmpeg_init(){ - static bool_t done=FALSE; - if (!done){ -+#ifdef FF_API_AVCODEC_INIT - avcodec_init(); -+#endif - avcodec_register_all(); - done=TRUE; - } -diff --git a/src/videoenc.c b/src/videoenc.c -index 21d016f..fb35760 100644 ---- a/src/videoenc.c -+++ b/src/videoenc.c -@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - static bool_t avcodec_initialized=FALSE; - -+#ifndef FF_I_TYPE -+#define FF_I_TYPE AV_PICTURE_TYPE_I -+#endif -+ - #ifdef ENABLE_LOG_FFMPEG - - void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) -@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) - - void ms_ffmpeg_check_init(){ - if(!avcodec_initialized){ -+#ifdef FF_API_AVCODEC_INIT - avcodec_init(); -+#endif - avcodec_register_all(); - avcodec_initialized=TRUE; - #ifdef ENABLE_LOG_FFMPEG -@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ - if (s->profile==0){ - s->codec=CODEC_ID_H263; - }else{ -+ /* - c->flags|=CODEC_FLAG_H263P_UMV; - c->flags|=CODEC_FLAG_AC_PRED; - c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -- /* - c->flags|=CODEC_FLAG_OBMC; - c->flags|=CODEC_FLAG_AC_PRED; - */ diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index f8407e622..fcf5d170a 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185603 2013-05-15 19:30:15Z giovanni $ +# $Id: PKGBUILD 187158 2013-06-04 16:22:02Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -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=('db34e6085b71c33ba250e689b1535101' +md5sums=('55f6ea5982cf87836113376174826e8c' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 540845fad..4ef875761 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 183639 2013-04-25 18:36:08Z heftig $ +# $Id: PKGBUILD 187818 2013-06-06 13:48:42Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=modemmanager _realname=ModemManager -pkgver=0.7.990 -pkgrel=4 +pkgver=0.7.991 +pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64' 'mips64el') url="http://cgit.freedesktop.org/ModemManager/ModemManager/" license=(GPL2) -depends=(udev ppp libqmi polkit hicolor-icon-theme) +depends=(udev ppp libqmi libmbim polkit hicolor-icon-theme) makedepends=(intltool git gtk-doc) optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') options=('!libtool') install=modemmanager.install #source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz) -source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=135bec6") +source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=a00f1d7") sha256sums=('SKIP') build() { @@ -24,6 +24,7 @@ build() { ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --with-udev-base-dir=/usr/lib/udev \ --disable-static \ --with-polkit diff --git a/extra/modemmanager/modemmanager.install b/extra/modemmanager/modemmanager.install index be187f2b4..d0e87bc18 100644 --- a/extra/modemmanager/modemmanager.install +++ b/extra/modemmanager/modemmanager.install @@ -1,6 +1,7 @@ post_install() { - type -P gtk-update-icon-cache &>/dev/null && + if type -P gtk-update-icon-cache &>/dev/null; then gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + fi } post_upgrade() { diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 8b2870dc0..2e0cf0f28 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185614 2013-05-16 03:14:17Z eric $ +# $Id: PKGBUILD 187066 2013-06-03 11:16:46Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') pkgver=1.4.31 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://msmtp.sourceforge.net" @@ -48,7 +48,6 @@ package_msmtp-mta() { provides=('smtp-forwarder') conflicts=('smtp-forwarder') - install -d "${pkgdir}"/usr/{s,}bin + install -d "${pkgdir}"/usr/bin ln -s msmtp "${pkgdir}/usr/bin/sendmail" - ln -s ../bin/msmtp "${pkgdir}/usr/sbin/sendmail" } diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 6df2b9bed..d3e701687 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186664 2013-05-30 12:25:27Z heftig $ +# $Id: PKGBUILD 187901 2013-06-07 22:39:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 mips64el) license=('GPL') @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2dddb1f699a94e9d294c36127e0642f5afa1fa8853cb1b47187ece16457fce65') +sha256sums=('3078162c3adef95fb207cc1945b863575ff180709d6394f5cf14e7d0f49b6c2a') build() { cd "$pkgname-$pkgver" diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index e807f3ef0..7cee1de43 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183320 2013-04-21 22:06:39Z heftig $ +# $Id: PKGBUILD 188611 2013-06-16 23:57:46Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=nautilus pkgname=(nautilus libnautilus-extension) -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME file manager" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ makedepends=(intltool gobject-introspection python) url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) -sha256sums=('9827e939aa0621041754379ca0227ceb82877785f013dd5935ecc4b791314892') +sha256sums=('dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75') build() { cd $pkgbase-$pkgver diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index a2e14c4dd..cedf8841f 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184846 2013-05-09 09:42:16Z andrea $ +# $Id: PKGBUILD 187924 2013-06-08 07:59:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.10.3 +pkgver=4.10.4 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=('205cb87512c3d24f41295a534770779e41051a29') +sha1sums=('28d9641ffc1b877f0cd0d27343b56563ed2bc74d') build() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index f70b3fae9..5a5d121d3 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184863 2013-05-09 09:42:35Z andrea $ +# $Id: PKGBUILD 187941 2013-06-08 07:59:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-widgets -pkgver=4.10.3 +pkgver=4.10.4 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=('19a02e2ea861f69da51eef24ae951fef449c3bfb') +sha1sums=('fb7379a3b324b2660f220094c8273860722fe3f1') build() { mkdir build diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 18c8e0007..ffd23bb15 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184181 2013-05-03 08:14:17Z foutrelis $ +# $Id: PKGBUILD 187895 2013-06-07 21:36:22Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,31 +6,20 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.8.0 -pkgrel=3 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64' 'mips64el') license=(GPL) url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify +depends=("networkmanager>=${pkgver::5}" libsecret gtk3 libnotify gnome-icon-theme mobile-broadband-provider-info iso-codes) makedepends=(intltool gnome-bluetooth gobject-introspection) optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz - fixed-signal-icons.tar.xz) -noextract=(fixed-signal-icons.tar.xz) -sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590' - '08ffd9d045c98119eb1991c036f41e51950e72eea5638549075239256c000e91') - -prepare() { - cd ${pkgname}-${pkgver} - - # Fix signal icons to work with libpng 1.6 - # https://bugzilla.gnome.org/show_bug.cgi?id=697286 - tar xf ${srcdir}/fixed-signal-icons.tar.xz -} +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) +sha256sums=('a540c743971c199a7b8663a8d0a38eb66a4c13a6b5124cd3a7495c75560aadc7') build() { cd ${pkgname}-${pkgver} @@ -39,7 +28,8 @@ build() { --libexecdir=/usr/lib/networkmanager \ --disable-static \ --disable-maintainer-mode \ - --disable-migration + --disable-migration \ + --with-modem-manager-1 make } diff --git a/extra/network-manager-applet/fixed-signal-icons.tar.xz b/extra/network-manager-applet/fixed-signal-icons.tar.xz Binary files differdeleted file mode 100644 index 1f85541dc..000000000 --- a/extra/network-manager-applet/fixed-signal-icons.tar.xz +++ /dev/null diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index b406ae5d5..55bcf19ff 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179569 2013-03-07 11:54:27Z foutrelis $ +# $Id: PKGBUILD 187896 2013-06-07 21:36:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('c12487f57ad2f2386db4b103397e3cb66bf34ba589c5f48c3c5ec0b5547e4d9b') +sha256sums=('8c3b393d155448d41f5de539d4920f0e5205a087aa5b25ed65601d6a370c44eb') build() { cd NetworkManager-openconnect-${pkgver} diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 5a963c814..39387b87a 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179570 2013-03-07 11:54:28Z foutrelis $ +# $Id: PKGBUILD 187897 2013-06-07 21:37:29Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('4196f4c124426884657c8d0e2578f4d35205b8981a46bf645fd599fb238395ce') +sha256sums=('d1c032f30e3c58d6d6bc371aad6d7e757f748d23a9240c077294492753078359') build() { cd NetworkManager-openvpn-${pkgver} diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index ed14fbc72..80d46e896 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179571 2013-03-07 11:54:28Z foutrelis $ +# $Id: PKGBUILD 187898 2013-06-07 21:38:15Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,16 @@ options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz gtk_table_to_gtk_grid.patch) -sha256sums=('34d0981462d8948ace0dd4f49478c86017b53516afbbf62e2a4c6c0adc679cc8' +sha256sums=('7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac' '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215') -build() { +prepare() { cd NetworkManager-pptp-${pkgver} patch -Np1 -i ../gtk_table_to_gtk_grid.patch +} + +build() { + cd NetworkManager-pptp-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index 84be26b9f..f0c4a178e 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185909 2013-05-19 18:47:29Z dreisner $ +# $Id: PKGBUILD 187899 2013-06-07 21:38:48Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.8.0 -pkgrel=2 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,15 +13,8 @@ makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz - "vpnc-paths.patch") -sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1' - '0b07abc21823b316bfd9a9faf7bf34ded35d66e904d081c5e285f8dc8ce30a54') - -prepare() { - cd NetworkManager-vpnc-${pkgver} - patch -Np1 <"$srcdir/vpnc-paths.patch" -} +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) +sha256sums=('adf6f4abd29d3f0384ef55fdfea75e6cd56088a0ecdfed2454305fd9e08318a1') build() { cd NetworkManager-vpnc-${pkgver} diff --git a/extra/networkmanager-vpnc/vpnc-paths.patch b/extra/networkmanager-vpnc/vpnc-paths.patch deleted file mode 100644 index eccdf65b2..000000000 --- a/extra/networkmanager-vpnc/vpnc-paths.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/nm-vpnc-service.c 2013-05-19 14:21:35.465816746 -0400 -+++ b/src/nm-vpnc-service.c 2013-05-19 14:23:57.554908088 -0400 -@@ -54,6 +54,7 @@ - - static const char *vpnc_binary_paths[] = - { -+ "/usr/bin/vpnc", - "/usr/sbin/vpnc", - "/sbin/vpnc", - "/usr/local/sbin/vpnc", diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index fb381f16c..f8826c1ea 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183447 2013-04-21 22:11:49Z heftig $ +# $Id: PKGBUILD 187894 2013-06-07 21:35:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -8,50 +8,50 @@ pkgname=networkmanager _pkgname=NetworkManager -pkgver=0.9.8.0 -pkgrel=3 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/$_pkgname/" depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client libsoup systemd modemmanager) -makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc) +makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git) optdepends=('dhclient: DHCPv6 support' - 'iptables: Connection sharing' 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support' + 'bluez4: Bluetooth support' 'openresolv: resolvconf support' 'ppp: Dialup connection support') options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install +#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) -sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b' + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') -build() { +prepare() { cd $_pkgname-$pkgver - patch -Np1 -i ../disable_set_hostname.patch - patch -Np1 -i ../dnsmasq-path.patch - #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi +} +build() { + cd $_pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/networkmanager \ + --sbindir=/usr/bin \ --with-crypto=nss \ - --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/usr/sbin/dhcpcd \ - --with-iptables=/usr/sbin/iptables \ + --with-dhclient=/usr/bin/dhclient \ + --with-dhcpcd=/usr/bin/dhcpcd \ + --with-iptables=/usr/bin/iptables \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-udev-dir=/usr/lib/udev \ - --with-resolvconf=/usr/sbin/resolvconf \ + --with-resolvconf=/usr/bin/resolvconf \ --with-session-tracking=systemd \ --with-modem-manager-1 \ --disable-static \ diff --git a/extra/networkmanager/dnsmasq-path.patch b/extra/networkmanager/dnsmasq-path.patch deleted file mode 100644 index c0e713266..000000000 --- a/extra/networkmanager/dnsmasq-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c ---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 -+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 -@@ -52,8 +52,11 @@ - find_dnsmasq (void) - { - static const char *paths[] = { -+ "/usr/local/bin/dnsmasq", - "/usr/local/sbin/dnsmasq", -+ "/usr/bin/dnsmasq", - "/usr/sbin/dnsmasq", -+ "/bin/dnsmasq", - "/sbin/dnsmasq", - NULL - }; -diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c ---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 -+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 -@@ -170,8 +170,11 @@ - nm_find_dnsmasq (void) - { - static const char *dnsmasq_binary_paths[] = { -+ "/usr/local/bin/dnsmasq", - "/usr/local/sbin/dnsmasq", -+ "/usr/bin/dnsmasq", - "/usr/sbin/dnsmasq", -+ "/bin/dnsmasq", - "/sbin/dnsmasq", - NULL - }; diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index f9c429c43..daec052c4 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173177 2012-12-12 00:31:59Z eric $ +# $Id: PKGBUILD 188110 2013-06-10 00:00:35Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -18,7 +18,7 @@ sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + export PYTHON=python2 ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ @@ -29,9 +29,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm "${pkgdir}"/usr/bin/uninstall_zenmap install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 17a50e340..af2212d26 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186962 2013-06-01 15:32:06Z eric $ +# $Id: PKGBUILD 187105 2013-06-03 20:13:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,12 +6,12 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=6 +pkgrel=7 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.muiline.com/obex-data-server" license=('GPL') -depends=('dbus-glib' 'openobex' 'imagemagick') +depends=('dbus-glib' 'openobex' 'imagemagick' 'libusb-compat') source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz" "obex-data-server-openobex17.patch") md5sums=('961ca5db6fe9c97024e133cc6203cc4d' diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD index 2f851ddfb..083752d7c 100644 --- a/extra/obexd/PKGBUILD +++ b/extra/obexd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170095 2012-11-01 11:22:52Z andrea $ +# $Id: PKGBUILD 187865 2013-06-07 09:25:01Z tomegun $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> @@ -6,16 +6,17 @@ pkgbase=obexd pkgname=('obexd-client' 'obexd-server') epoch=1 pkgver=0.46 -pkgrel=1 +pkgrel=2 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -makedepends=('bluez' 'libical') +makedepends=('bluez4' 'bluez-libs' 'libical' 'glib2') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2") md5sums=('625f0417d119437429c9cce29479cfa4') build() { cd ${pkgbase}-${pkgver} + sed -i 's/#include <string.h>/&\n#include <stdio.h>/' plugins/mas.c ./configure --prefix=/usr \ --libexecdir=/usr/lib/obexd make @@ -23,7 +24,7 @@ build() { package_obexd-client() { pkgdesc="D-Bus service providing high-level OBEX client side functionality" - depends=('bluez') + depends=('bluez4' 'bluez-libs' 'glib2') provides=("obexd=${pkgver}") replaces=('obexd') conflicts=('obexd') @@ -37,7 +38,7 @@ package_obexd-client() { package_obexd-server() { pkgdesc="D-Bus service providing high-level OBEX server side functionality" - depends=('bluez' 'libical') + depends=('bluez4' 'bluez-libs' 'libical' 'glib2') conflicts=('obex-data-server') cd ${pkgbase}-${pkgver}/src diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index 17a5926d3..ef2ca5730 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 184417 2013-05-06 19:39:02Z foutrelis $ +# $Id: PKGBUILD 188593 2013-06-16 17:21:06Z foutrelis $ # Maintainer: # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl pkgver=0.9.18 -pkgrel=2 +pkgrel=3 pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gcc-libs' 'llvm') -makedepends=('cmake' 'libpng') +depends=('gcc-libs' 'llvm-libs') +makedepends=('cmake' 'libpng' 'llvm') optdepends=('libpng: for using the png extension') source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 + opengtl-0.9.18-llvm-3.3.patch opengtl-0.9.18-memcpy.patch) sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8' + 'c43418bc039660ae86cb86b8b8175342793cb1361c699faa9b6342bc896e3d6c' '357cc2e538bbaaffe7d58956959d8a7fbae09741d4a87488a5a8c51ec645d23a') prepare() { mkdir build + + # Fix build with LLVM 3.3 (patch from Fedora) + patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-llvm-3.3.patch" + + # Fix build with libpng 1.6 patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch" } diff --git a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch new file mode 100644 index 000000000..80280979f --- /dev/null +++ b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch @@ -0,0 +1,732 @@ +diff -up OpenGTL-0.9.18/CMakeLists.txt.jx OpenGTL-0.9.18/CMakeLists.txt +--- OpenGTL-0.9.18/CMakeLists.txt.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/CMakeLists.txt 2013-05-08 15:39:25.090057193 -0400 +@@ -78,8 +78,8 @@ else(MSVC) + FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS ) + endif(MSVC) + +-if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STREQUAL "3.2svn" OR LLVM_VERSION STREQUAL "3.2" ) ) # There is no way with MSVC to know the llvm version +- message(FATAL_ERROR "LLVM 3.0 or 3.1 or 3.2 is required.") ++if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.3svn" OR LLVM_VERSION STREQUAL "3.3" ) ) # There is no way with MSVC to know the llvm version ++ message(FATAL_ERROR "LLVM 3.3 is required.") + endif() + + if(MSVC) +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -27,10 +27,10 @@ + #include <climits> + + // LLVM +-#include <llvm/InstrTypes.h> ++#include <llvm/IR/InstrTypes.h> + // #include <llvm/Linker.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/Module.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Module.h> + // #include <llvm/Transforms/Utils/Cloning.h> + // Library Loader + #ifdef LLVM_27_OR_28 +@@ -214,7 +214,7 @@ bool Compiler::compile(bool _isStandardL + return success; + } + +-#include <llvm/ValueSymbolTable.h> ++#include <llvm/IR/ValueSymbolTable.h> + + bool Compiler::importModule(const GTLCore::String& name) + { +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -19,9 +19,9 @@ + + #include "ParserNG.h" + +-#include <llvm/Constants.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/Type.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Type.h> + + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> + #include <GTLCore/CompilationMessage.h> +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -38,7 +38,7 @@ + using namespace OpenCTL; + + // LLVM +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <llvm/Bitcode/ReaderWriter.h> + #ifdef LLVM_27_OR_28 + #include <llvm/System/Path.h> +@@ -47,8 +47,7 @@ using namespace OpenCTL; + #include <llvm/Support/Path.h> + #include <llvm/Support/DynamicLibrary.h> + #endif +-#include <llvm/Module.h> +-#include <llvm/LLVMContext.h> ++#include <llvm/IR/LLVMContext.h> + + struct Module::Private { + Private() : moduleData(0), isStandardLibrary(false) {} +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -20,16 +20,16 @@ + #include "Program.h" + + // LLVM +-#include <llvm/DerivedTypes.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> + #include <llvm/Transforms/Utils/Cloning.h> + + // Passes + #include <llvm/PassManager.h> + #include <llvm/Analysis/LoopPass.h> + #include <llvm/Analysis/Verifier.h> +-#include <llvm/GlobalVariable.h> ++#include <llvm/IR/GlobalVariable.h> + + // GTLCore + #include "GTLCore/Buffer.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -20,9 +20,9 @@ + #include "AccessorExpression.h" + + #include <llvm/ADT/ArrayRef.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,7 +19,7 @@ + + #include "BinaryExpression.h" + +-#include <llvm/Instructions.h> ++#include <llvm/IR/Instructions.h> + + #include <GTLCore/Debug.h> + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,10 +19,10 @@ + + #include "CompoundExpression.h" + +-#include <llvm/Constants.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Instructions.h> + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,10 +19,10 @@ + + #include "ConstantCompoundExpression.h" + +-#include <llvm/Constants.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Instructions.h> + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -19,11 +19,11 @@ + + #include "Expression.h" + +-#include <llvm/Constant.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Instructions.h> + + #include "GTLCore/LLVMBackend/CodeGenerator_p.h" + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -19,10 +19,10 @@ + + #include "FunctionDeclaration.h" + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> +-#include <llvm/Type.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Type.h> + + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> + #include <GTLCore/LLVMBackend/ExpressionResult_p.h> +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -21,8 +21,8 @@ + + #include <stdlib.h> + +-#include <llvm/Constant.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/Instructions.h> + + #include "../Type.h" + #include "../LLVMBackend/CodeGenerator_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -21,12 +21,12 @@ + + // LLVM + #include <llvm/ADT/ArrayRef.h> +-#include <llvm/BasicBlock.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> ++#include <llvm/IR/BasicBlock.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> + + // GTLCore + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -19,9 +19,9 @@ + + #include "Tree.h" + +-#include <llvm/Constant.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Type.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Type.h> + + #include "FunctionDeclaration.h" + +@@ -37,8 +37,8 @@ + #include "GTLCore/LLVMBackend/Visitor_p.h" + + #include "Expression.h" +-#include <llvm/Module.h> +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/DerivedTypes.h> + + using namespace GTLCore::AST; + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -22,9 +22,9 @@ + #include <map> + #include <fstream> + +-#include <llvm/Module.h> +-#include <llvm/Value.h> +-#include <llvm/Type.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/Value.h> ++#include <llvm/IR/Type.h> + #include <llvm/Support/Path.h> + #include <llvm/Support/raw_ostream.h> + +@@ -418,9 +418,9 @@ namespace GTLCore { + + #ifdef OPENGTL_ENABLE_DEBUG_OUTPUT + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Function.h> +-#include <llvm/Type.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Type.h> + + void compareFunctionParameters( llvm::Value* func, const std::vector<llvm::Value*>& params ) + { +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -21,9 +21,9 @@ + + #include <llvm/ExecutionEngine/GenericValue.h> + #include <llvm/ExecutionEngine/ExecutionEngine.h> +-#include <llvm/Function.h> +- +-#include <llvm/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output + + #include "VirtualMachine_p.h" + +@@ -35,7 +35,6 @@ + #include "LLVMBackend/GenerationContext_p.h" + #include "ModuleData_p.h" + #include "LLVMBackend/CodeGenerator_p.h" +-#include <llvm/Instructions.h> + #include "Type_p.h" + #include <GTLCore/Parameter.h> + #include "PrimitiveTypesTraits_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -21,9 +21,9 @@ + + #include <cstdarg> + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Module.h> +-#include <llvm/Type.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/Type.h> + + #include "Parameter.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -19,12 +19,12 @@ + + #include "CodeGenerator_p.h" + +-#include <llvm/CallingConv.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> +-#include <llvm/Value.h> ++#include <llvm/IR/CallingConv.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/Value.h> + + #include "GTLCore/Debug.h" + #include "ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -20,7 +20,7 @@ + #include "ContextManager_p.h" + + #include <llvm/Support/ThreadLocal.h> +-#include <llvm/LLVMContext.h> ++#include <llvm/IR/LLVMContext.h> + + using namespace LLVMBackend; + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -20,7 +20,7 @@ + #include "ExpressionGenerationContext_p.h" + + #include "GTLCore/Debug.h" +-#include <llvm/BasicBlock.h> ++#include <llvm/IR/BasicBlock.h> + + #include "GTLCore/Macros_p.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -19,8 +19,8 @@ + + #include "ExpressionResult_p.h" + +-#include "llvm/Constant.h" +-#include "llvm/DerivedTypes.h" ++#include "llvm/IR/Constant.h" ++#include "llvm/IR/DerivedTypes.h" + + #include "../Type.h" + #include "../Type_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -22,8 +22,8 @@ + #include "GTLCore/ModuleData_p.h" + #include "GTLCore/Debug.h" + +-#include "llvm/BasicBlock.h" +-#include "llvm/Function.h" ++#include "llvm/IR/BasicBlock.h" ++#include "llvm/IR/Function.h" + + #include "GTLCore/AST/Statement.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -20,12 +20,12 @@ + #include "Visitor_p.h" + + // LLVM +-#include <llvm/BasicBlock.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> +-#include <llvm/GlobalVariable.h> ++#include <llvm/IR/BasicBlock.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/GlobalVariable.h> + + // GTLCore + #include "CodeGenerator_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp 2013-05-08 15:41:21.422512114 -0400 +@@ -21,7 +21,7 @@ + + #include <sstream> + +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <llvm/PassManager.h> + #include <llvm/Target/TargetMachine.h> + #include <llvm/Analysis/Verifier.h> +@@ -242,7 +242,7 @@ void ModuleData::doLink() + GTL_ASSERT( not m_llvmLinkedModule ); + m_llvmLinkedModule = m_llvmModule; + m_llvmModule = llvm::CloneModule( m_llvmModule ); +- llvm::Linker linker("", m_llvmLinkedModule); ++ llvm::Linker linker(m_llvmLinkedModule); + std::string errorMessage; + foreach( const llvm::Module* mod, m_linkModuleWith ) + { +@@ -270,18 +270,11 @@ void ModuleData::doLink() + hide.push_back(name); + } + } +- linker.LinkInModule( clone, &errorMessage ); ++ linker.linkInModule( clone, &errorMessage ); + + GTL_DEBUG("Linking error: " << errorMessage ); + delete clone; + } +- foreach( const GTLCore::String& mod, m_linkModuleWithArchives ) +- { +- bool v = false; +- linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v); +- } +- +- linker.releaseModule(); + + // Hide symbols + foreach(GTLCore::String name, hide) +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -25,7 +25,7 @@ + + #include <iostream> + +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/DerivedTypes.h> + + #include "wrappers/StructWrap.h" + #include "SharedPointer.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -30,8 +30,8 @@ + + using namespace GTLCore; + +-#include <llvm/Type.h> +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/Type.h> ++#include <llvm/IR/DerivedTypes.h> + + Type::StructDataMember::Information::~Information() + { +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,8 +19,8 @@ + + #include "Value_p.h" + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Type.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Type.h> + + #include "Debug.h" + #include "Value.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,8 +19,8 @@ + + #include "VariableNG_p.h" + +-#include <llvm/Constants.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Instructions.h> + + #include "LLVMBackend/CodeGenerator_p.h" + #include "Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -21,10 +21,10 @@ + + // JIT + #include <llvm/ExecutionEngine/ExecutionEngine.h> +-#include <llvm/Module.h> +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/DerivedTypes.h> + #include <llvm/Target/TargetOptions.h> +-#include <llvm/LLVMContext.h> ++#include <llvm/IR/LLVMContext.h> + #include <llvm/Support/CommandLine.h> + #include <llvm/Support/Threading.h> + #include <llvm/Support/ErrorHandling.h> +@@ -48,7 +48,8 @@ struct VirtualMachine::Private { + VirtualMachine* VirtualMachine::Private::virtualMachine = 0; + int VirtualMachine::Private::optimLevel = 2; + +-void gtl_llvm_error_handler(void *user_data, const std::string& reason) ++void gtl_llvm_error_handler(void *user_data, const std::string& reason, ++ bool gen_crash_diag) + { + GTL_ABORT(reason); + } +@@ -58,11 +59,7 @@ VirtualMachine::VirtualMachine() : d(new + { + d->executionEngine = 0; + +-#ifdef LLVM_27 +- llvm::llvm_install_error_handler(>l_llvm_error_handler); +-#else +- llvm::install_fatal_error_handler(>l_llvm_error_handler); +-#endif ++ llvm::install_fatal_error_handler(gtl_llvm_error_handler); + + llvm::llvm_start_multithreaded(); + +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,7 +19,7 @@ + + #include "Compiler_p.h" + +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <llvm/PassManager.h> + + #include "GTLCore/AST/Expression.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -22,9 +22,9 @@ + + #include <sstream> + +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <llvm/Support/DynamicLibrary.h> +-#include <llvm/LLVMContext.h> ++#include <llvm/IR/LLVMContext.h> + + #include "GTLCore/CompilationMessage.h" + #include "GTLCore/Function.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -29,7 +29,7 @@ + + #include "Library.h" + #include <GTLCore/Function_p.h> +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <GTLCore/Type_p.h> + + using namespace GTLFragment; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -21,14 +21,14 @@ + + #include <vector> + +-#include <llvm/CallingConv.h> +-#include <llvm/Constants.h> +-#include <llvm/Constant.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> +-#include <llvm/Value.h> ++#include <llvm/IR/CallingConv.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/Value.h> + + #include "GTLCore/LLVMBackend/CodeGenerator_p.h" + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -28,13 +28,13 @@ + #include "CodeGenerator_p.h" + #include <GTLFragment/wrappers/ColorWrap_p.h> + #include <GTLCore/Type_p.h> +-#include <llvm/Value.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/CallingConv.h> +-#include <llvm/Module.h> ++#include <llvm/IR/Value.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/CallingConv.h> ++#include <llvm/IR/Module.h> + #include <GTLCore/LLVMBackend/ExpressionGenerationContext_p.h> + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Instructions.h> + #include <GTLCore/TypesManager.h> + + using namespace OpenShiva; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -22,7 +22,7 @@ + #include <sstream> + #include <fstream> + +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + + #include "GTLCore/CompilationMessage.h" + #include "GTLCore/Function.h" +@@ -48,7 +48,7 @@ + #include "wrappers/ImageWrap_p.h" + #include "wrappers/RegionWrap_p.h" + #include <GTLCore/AST/Tree.h> +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/DerivedTypes.h> + + using namespace OpenShiva; + +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -19,7 +19,8 @@ + + #include "PixelConvertExpressionFactory_p.h" + +-#include <llvm/Instructions.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Function.h> + + #include "GTLCore/Type.h" + #include "GTLCore/AST/ConvertExpression.h" +@@ -34,7 +35,6 @@ + #include <GTLCore/VariableNG_p.h> + #include <GTLCore/LLVMBackend/Visitor_p.h> + #include <GTLFragment/wrappers/ColorWrap_p.h> +-#include <llvm/Function.h> + #include <GTLCore/Type_p.h> + + using namespace OpenShiva; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -20,11 +20,11 @@ + #include "PixelVisitor_p.h" + + // LLVM +-#include <llvm/Constant.h> +-#include <llvm/Constants.h> +-#include <llvm/BasicBlock.h> +-#include <llvm/Instructions.h> +-#include <llvm/Function.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/BasicBlock.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Function.h> + + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" + #include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h" +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -22,9 +22,9 @@ + #include <map> + #include <vector> + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Function.h> +-#include <llvm/Module.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Module.h> + + #include "GTLCore/Function_p.h" + #include "GTLCore/Macros.h" diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD index 4c9edf088..5d153c9bc 100644 --- a/extra/openobex/PKGBUILD +++ b/extra/openobex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186964 2013-06-01 15:32:09Z eric $ +# $Id: PKGBUILD 187866 2013-06-07 09:25:02Z tomegun $ # Maintainer: # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,12 +6,12 @@ pkgname=openobex pkgver=1.7 -pkgrel=5 +pkgrel=6 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" url="http://dev.zuckschwerdt.org/openobex/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') -depends=('bluez' 'libusbx') +depends=('libusbx' 'bluez-libs') makedepends=('cmake') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) @@ -19,12 +19,6 @@ md5sums=('11031f6f0b876bb6259bd27106491528') prepare() { mkdir build - - cd ${pkgname}-${pkgver}-Source - - # Fix path to obex-check-device in udev rule - # https://bugs.archlinux.org/task/35547 - sed -i 's:/sbin/:/bin/:' udev/openobex.rules.in } build() { @@ -33,8 +27,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_INSTALL_SBINDIR=bin + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_SBINDIR=/usr/bin make all openobex-apps } @@ -43,4 +37,9 @@ package() { make DESTDIR="${pkgdir}" install cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/" install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a" + + # usrmove + cd "$pkgdir" + mv lib/udev usr/lib/ + rmdir lib } diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD index b1747f65e..68a44139d 100644 --- a/extra/ortp/PKGBUILD +++ b/extra/ortp/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 162825 2012-07-01 07:46:57Z andrea $ +# $Id: PKGBUILD 188538 2013-06-15 10:09:55Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=ortp -pkgver=0.20.0.20120701 -pkgrel=1.1 +pkgver=0.22.0 +pkgrel=1 pkgdesc="A Real-time Transport Protocol (RTP) library" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng/code_review/ortp" license=('GPL3') depends=('libzrtpcpp' 'libsrtp') options=('!libtool') -#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig} -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('91b66787c6ac3e8d4d43946beb7611ce') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig}) +sha1sums=('3f4712307ceba27c6498abd2090f411e02084dbd' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} - ./autogen.sh ./configure --prefix=/usr \ --enable-zrtp \ --disable-strict @@ -28,6 +27,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index be6f51b14..53cb50634 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 186400 2013-05-26 09:25:06Z bluewind $ +# $Id: PKGBUILD 188483 2013-06-14 22:43:41Z eric $ # Maintainer: -# Contributor: Tom Killian <tomk@runbox.com> -# Contributor: francois at archlinux dot org pkgname=perl-dbd-sqlite -_cpanname=DBD-SQLite -pkgver=1.37 -pkgrel=2 +pkgver=1.39 +pkgrel=1 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64' 'mips64el') -url="http://search.cpan.org/dist/${_cpanname}" +url="http://search.cpan.org/dist/DBD-SQLite" license=('GPL' 'PerlArtistic') depends=('perl-dbi' 'sqlite') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('b8ac1c584befa63cd5ffc391b2366e84') +source=(http://www.cpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-${pkgver}.tar.gz) +md5sums=('8ca0719852fcbcbbee470c705eeff24a') build() { - cd "${srcdir}/${_cpanname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd DBD-SQLite-${pkgver} + perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_cpanname}-${pkgver}" + cd DBD-SQLite-${pkgver} make test } package() { - cd "${srcdir}/${_cpanname}-${pkgver}" + cd DBD-SQLite-${pkgver} make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 115fcee5f..50c9121ac 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186413 2013-05-26 09:25:31Z bluewind $ +# $Id: PKGBUILD 188575 2013-06-15 17:19:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.54 -pkgrel=2 +pkgver=1.55 +pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('26e758fff1c90cb00e9358fea7e1e22f') +md5sums=('473b8d66ca69d5784bb0e428721f58e0') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 14940a564..fe8f71b77 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,37 +1,31 @@ -# $Id: PKGBUILD 186421 2013-05-26 09:25:51Z bluewind $ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 187097 2013-06-03 18:17:55Z eric $ +# Maintainer: pkgname=perl-yaml-syck -_realname=YAML-Syck -pkgver=1.25 -pkgrel=2 +pkgver=1.27 +pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64' 'mips64el') -license=('custom') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/YAML-Syck/" +license=('BSD' 'custom') depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('847f315cbd074b42c44f360383ac13e9') +source=(http://www.cpan.org/authors/id/T/TO/TODDR/YAML-Syck-$pkgver.tar.gz) +md5sums=('8920091e68a078cfa9c42041e5759162') build() { - cd "${srcdir}/${_realname}-$pkgver" - - # install module in vendor directories. + cd YAML-Syck-$pkgver perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-$pkgver" + cd YAML-Syck-$pkgver make test } package() { - cd "${srcdir}/${_realname}-$pkgver" + cd YAML-Syck-$pkgver make install DESTDIR="${pkgdir}" - - # license. install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index aa0950a3b..2e9035390 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $ +# $Id: PKGBUILD 187846 2013-06-07 04:00:16Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,24 +21,24 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.15 -pkgrel=3 +pkgver=5.4.16 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' - 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('145ea5e845e910443ff1eddb3dbcf56a' +md5sums=('3d2c694d28861d707b2622c3cc941cff' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' 'e036c721e5ad927cd1613c7475a58b3a' - '4af4d94f3db58437eef8db87d16a5fab' + 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') prepare() { @@ -84,6 +84,7 @@ build() { --with-curl=shared \ --with-db4=/usr \ --with-enchant=shared,/usr \ + --with-fpm-systemd \ --with-freetype-dir=/usr \ --with-gd=shared \ --with-gdbm \ diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service index 1ae62051f..6e2faafd8 100644 --- a/extra/php/php-fpm.service +++ b/extra/php/php-fpm.service @@ -3,10 +3,10 @@ Description=The PHP FastCGI Process Manager After=syslog.target network.target [Service] -Type=forking +Type=notify PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true -ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid +ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid ExecReload=/bin/kill -USR2 $MAINPID [Install] diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 92622c22a..65e20e86f 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186354 2013-05-25 09:05:56Z andyrtr $ +# $Id: PKGBUILD 188729 2013-06-18 15:46:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.2 +_dcpkgver=2.2.3 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD index 5722959a4..fcb190d32 100644 --- a/extra/pm-utils/PKGBUILD +++ b/extra/pm-utils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159434 2012-05-24 09:48:16Z bluewind $ +# $Id: PKGBUILD 187068 2013-06-03 11:16:50Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=pm-utils pkgver=1.4.1 -pkgrel=5.1 +pkgrel=6 pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64' 'mips64el') url="http://pm-utils.freedesktop.org" @@ -31,6 +31,7 @@ build() { patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --localstatedir=/var make } diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index d0b97eadc..9bcfbe2c2 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 183452 2013-04-21 22:11:58Z heftig $ +# $Id: PKGBUILD 188528 2013-06-15 09:16:15Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.110 -pkgrel=2 +pkgver=0.111 +pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64 'mips64el') license=(LGPL) url="http://www.freedesktop.org/wiki/Software/polkit" -depends=(glib2 pam expat libsystemd js185) +depends=(glib2 pam expat libsystemd js) makedepends=(intltool gtk-doc gobject-introspection) options=('!libtool') install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz polkit.pam) -md5sums=('06e0d3b72e566ac277fc35c8206d2a28' - '6564f95878297b954f0572bc1610dd15') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --disable-static --enable-gtk-doc + --enable-libsystemd-login=yes --disable-static \ + --enable-gtk-doc make } @@ -36,3 +34,5 @@ package() { install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" } +md5sums=('81b116edf986d8e13502929a171f4e0d' + '6564f95878297b954f0572bc1610dd15') diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 9711c7064..777ad72d2 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186342 2013-05-25 02:56:35Z foutrelis $ +# $Id: PKGBUILD 188733 2013-06-18 15:55:17Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.4 +pkgver=0.22.5 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') @@ -13,11 +13,10 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('49d55921ce795778c7231fe9f2fe923b' +md5sums=('1cd27460f7e3379d1eb109cfd7bcdb39' '9dc64c254a31e570507bdd4ad4ba629a') build() { -# . /etc/profile.d/qt4.sh cd "${srcdir}" ln -sf test-${_testtag} test diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 2b245e213..6c00f6326 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185572 2013-05-15 08:05:31Z bpiotrowski $ +# $Id: PKGBUILD 187156 2013-06-04 16:15:46Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.10.0 -pkgrel=5 +pkgrel=7 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -15,12 +15,10 @@ depends=('pcre' 'libsasl' 'libldap' 'db' backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' - 'service' - 'rc.d') + 'service') sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' - '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' - '40c6be2eb55e6437a402f43775cdb3d22ea87a66') + '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') @@ -38,10 +36,12 @@ build() { -DHAS_PGSQL -I/usr/include/postgresql \ -DHAS_SQLITE \ -DHAS_CDB \ - -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ + -DDEF_COMMAND_DIR=\"/usr/bin\" \ -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ - -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \ -DDEF_README_DIR=\"/usr/share/doc/postfix\" \ + -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ ' AUXLIBS=' \ -lsasl2 \ -lldap -llber \ @@ -60,7 +60,6 @@ package() { sh postfix-install -non-interactive install_root="${pkgdir}" - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" diff --git a/extra/postfix/install b/extra/postfix/install index 7230359fc..c7e06b07e 100644 --- a/extra/postfix/install +++ b/extra/postfix/install @@ -1,5 +1,5 @@ post_upgrade() { - /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix upgrade-package + /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package chown postfix var/lib/postfix } diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d deleted file mode 100755 index fa314bb84..000000000 --- a/extra/postfix/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=postfix - -case "$1" in -start) - stat_busy "Starting $name daemon" - /usr/sbin/postfix start &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - /usr/sbin/postfix stop &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - /usr/sbin/postfix reload &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 70575cf3a..580ebf716 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181159 2013-04-01 19:36:12Z heftig $ +# $Id: PKGBUILD 188177 2013-06-11 17:10:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,20 +7,20 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=3.0 -pkgrel=3 +pkgver=4.0 +pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb udev dbus-core avahi bluez gconf intltool jack sbc - openssl fftw orc json-c gtk2 webrtc-audio-processing - systemd check) + speex tdb systemd dbus avahi bluez4 bluez-libs gconf intltool jack sbc + openssl fftw orc json-c gtk3 webrtc-audio-processing + check) [ "$CARCH" != "mips64el" ] && makedepends+=(lirc-utils) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz pulseaudio.xinit) -sha256sums=('c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d' +sha256sums=('35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae' 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { @@ -43,10 +43,11 @@ build() { } package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc - libsamplerate webrtc-audio-processing systemd sbc) + depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc + libsamplerate webrtc-audio-processing sbc) optdepends=('avahi: zeroconf support' - 'bluez: bluetooth support' + 'bluez4: bluetooth support' + 'bluez-libs: bluetooth support' 'gconf: configuration through gconf (paprefs)' 'jack: jack support' 'openssl: RAOP support' @@ -56,7 +57,8 @@ package_pulseaudio() { install=pulseaudio.install cd $pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install \ + bashcompletiondir=/usr/share/bash-completion/completions # Disable autospawn by default sed -e '/autospawn/iautospawn=no' \ @@ -87,6 +89,9 @@ package_pulseaudio() { # cap is handled in .install chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper" + install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ + "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" + ### Split libpulse mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}} @@ -117,7 +122,7 @@ package_pulseaudio() { package_libpulse() { pkgdesc="$pkgdesc (client library)" - depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c) + depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt4/PKGBUILD index ff4e2ca59..8fba5379f 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt4/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 183563 2013-04-23 13:10:46Z andrea $ +# $Id: PKGBUILD 188683 2013-06-17 19:05:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> -pkgbase=pyqt -pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') -pkgver=4.10.1 -pkgrel=1 +pkgbase=pyqt4 +pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4') +pkgver=4.10.2 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') -source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('e5973c4ec0b0469f329bc00209d2ad9c') +source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('9257e12fec9b1b21e5a0d76d455d1691') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} @@ -43,9 +43,12 @@ build() { make } -package_pyqt-common(){ - pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" +package_pyqt4-common(){ + pkgdesc="Common PyQt files shared between python-pyqt4 and python2-pyqt4" depends=('qt4') + replaces=('pyqt-common') + conflicts=('pyqt-common') + provides=("pyqt-common=${pkgver}") cd PyQt-x11-gpl-${pkgver} make -C pyrcc DESTDIR="${pkgdir}" install @@ -54,12 +57,15 @@ package_pyqt-common(){ install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } -package_pyqt(){ +package_python-pyqt4(){ pkgdesc="A set of Python 3.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common') + depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt4-common') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('pyqt') + conflicts=('pyqt') + provides=("pyqt=${pkgver}") cd PyQt-x11-gpl-${pkgver} # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR @@ -70,24 +76,26 @@ package_pyqt(){ rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } -package_python2-pyqt(){ +package_python2-pyqt4(){ pkgdesc="A set of Python 2.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') + depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt4-common') optdepends=('phonon: enable audio and video in PyQt applications' 'python2-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - provides=('python2-qt') + replaces=('python2-pyqt') + conflicts=('python2-pyqt') + provides=("python2-pyqt=${pkgver}") cd Py2Qt-x11-gpl-${pkgver} # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - # Fix conflicts with pyqt + # Fix conflicts with python-pyqt4 mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 - # Provided by pyqt + # Provided by python-pyqt4 rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} - rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpyqt4.so rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 3985812b8..c8272f0d2 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 183648 2013-04-26 02:48:29Z angvp $ +# $Id: PKGBUILD 188212 2013-06-13 03:55:11Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.1.2 +pkgver=3.2.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'custom') url="http://lxml.de/" -makedepends=('python2' 'python' 'libxslt') +makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('6f2173f4fd5b13fbc9f8a5096d23d524' +md5sums=('d183ccd6bbd5ca139e9db9e9a675787e' 'SKIP') -check() { - cd lxml-$pkgver - make PYTHON=python2 test - make PYTHON=python test -} +# Temporary commented due a conflict with devtools and lxml +#check() { +# cd lxml-$pkgver +# make PYTHON=python2 test +# make PYTHON=python test +#} package_python2-lxml() { pkgdesc="Python2 binding for the libxml2 and libxslt libraries" @@ -39,8 +40,7 @@ package_python2-lxml() { package_python-lxml() { pkgdesc="Python3 binding for the libxml2 and libxslt libraries" depends=('python' 'libxslt') - optdepends=('python-cssselect' - 'python-lxml-docs: offline docs') + optdepends=('python-lxml-docs: offline docs') cd lxml-$pkgver python setup.py install --root="${pkgdir}" --optimize=1 diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 2c9cdb73d..d97731c19 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,35 +1,31 @@ # $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=1.4.1 -pkgrel=3 +pkgver=1.4.2 +pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng') +depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' 'libiscsi') backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 - doc-fix-sheepdog-invalid-texi-table-list-syntax.patch 65-kvm.rules) replaces=('qemu-kvm') -options=(!strip) +options=(!strip !libtool) prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld - # fix building with tex version 5.0 - # https://bugs.launchpad.net/qemu/+bug/1130533 - patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch } build () { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu @@ -57,6 +53,5 @@ package() { done } -md5sums=('eb2d696956324722b5ecfa46e41f9a75' - 'b431782f310bfc6af4ef21a8068f866b' +md5sums=('b3eafa033ae4b8faba584f9f141b888f' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch b/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch deleted file mode 100644 index bacc87e80..000000000 --- a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/qemu-options.hx b/qemu-options.hx -index 4bc9c85..3af60bf 100644 ---- a/qemu-options.hx -+++ b/qemu-options.hx -@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked - devices. - - Syntax for specifying a sheepdog device --@table @list --``sheepdog:<vdiname>'' -- --``sheepdog:<vdiname>:<snapid>'' -- --``sheepdog:<vdiname>:<tag>'' -- --``sheepdog:<host>:<port>:<vdiname>'' -- --``sheepdog:<host>:<port>:<vdiname>:<snapid>'' -- --``sheepdog:<host>:<port>:<vdiname>:<tag>'' -+@table @code -+@item sheepdog:<vdiname> -+@item sheepdog:<vdiname>:<snapid> -+@item sheepdog:<vdiname>:<tag> -+@item sheepdog:<host>:<port>:<vdiname> -+@item sheepdog:<host>:<port>:<vdiname>:<snapid> -+@item sheepdog:<host>:<port>:<vdiname>:<tag> - @end table - - Example diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 6583f720d..aa335c293 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 179562 2013-03-07 08:19:46Z andrea $ +# $Id: PKGBUILD 188708 2013-06-18 12:21:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.7.1 -pkgrel=1 +pkgver=2.7.2 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt' 'pyqt' 'chrpath') +makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('da8939b5679a075e30c6632e54dc5abf' +md5sums=('0fbfb06078f206a241a62c94861cce21' 'eae1bd23117c5f1f7f172a1c1e11f600') build() { @@ -21,21 +21,21 @@ build() { patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" cd Qt4Qt5 - qmake qscintilla.pro + qmake-qt4 qscintilla.pro make cd ../designer-Qt4Qt5 - qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make cd ../ cp -rf Python Python2 cd Python - python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c + python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make cd ../Python2 - python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c + python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make } @@ -63,7 +63,7 @@ package_python-qscintilla-common() { package_python-qscintilla() { pkgdesc="Python 3.x bindings for QScintilla2" - depends=('python-qscintilla-common' 'pyqt') + depends=('python-qscintilla-common' 'python-pyqt4') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ @@ -72,7 +72,7 @@ package_python-qscintilla() { package_python2-qscintilla() { pkgdesc="Python 2.x bindings for QScintilla2" - depends=('python-qscintilla-common' 'python2-pyqt') + depends=('python-qscintilla-common' 'python2-pyqt4') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" install -Dm755 Qsci.so \ diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index 7925e4a87..f1a873c99 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185732 2013-05-18 02:31:12Z eric $ +# $Id: PKGBUILD 188741 2013-06-19 03:52:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.3.4 +pkgver=5.3.5 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop racket-libpng16.patch) -sha1sums=('7e37738e34c73a25bc7d51aeb53cf3dc5b0d533d' +sha1sums=('8a895454a9e0fdf689368fa54ce63ba88d432c5e' 'a20808f6b250225704856f82a544681a962a299d' '5b0260f92fc1ec4dc09d90a5264683bd3b5eed5e') diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index 5906558de..1b19b9e24 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172942 2012-12-07 18:25:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 187070 2013-06-03 11:16:53Z allan $ +# Maintainer: # Contributor: xduugu # Contributor: Elis Hughes <elishughes@googlemail.com> pkgname=rtmpdump pkgver=20121203 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64' 'mips64el') url="http://rtmpdump.mplayerhq.hu/" @@ -22,4 +22,8 @@ build() { package() { make -C "$pkgname-$pkgver" prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin } diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch new file mode 100644 index 000000000..8bfd29b66 --- /dev/null +++ b/extra/sane/1.0.23-hp2400c.patch @@ -0,0 +1,81 @@ +From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr> +Date: Mon, 3 Jun 2013 06:33:08 +0200 +Subject: [PATCH] bug 314293 fix + +- don't use non-existent end of records +--- + ChangeLog | 3 +++ + backend/genesys_gl646.c | 14 +++++++------- + 2 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c +index c6a5af5..2d5cddc 100644 +--- a/backend/genesys_gl646.c ++++ b/backend/genesys_gl646.c +@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color) + i = 0; + dpi = 9600; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* computes distance and keep mode if it is closer than previous */ + if (sensor == sensor_master[i].sensor +@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color) + dpi = 0; + dist = 9600; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color) + + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color) + + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev, + * sensor mode setting */ + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + if (dev->model->ccd_type == sensor_master[i].sensor + && sensor_master[i].dpi == xresolution +@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev, + * motor mode setting */ + i = 0; + nb = sizeof (motor_master) / sizeof (Motor_Master); +- while (motor_master[i].motor != -1 && i < nb) ++ while (i < nb) + { + if (dev->model->motor_type == motor_master[i].motor + && motor_master[i].dpi == resolution +@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev, + /* now we can search for the specific sensor settings */ + i = 0; + nb = sizeof (sensor_settings) / sizeof (Sensor_Settings); +- while (sensor_settings[i].sensor != -1 && i < nb) ++ while (i < nb) + { + if (sensor->sensor == sensor_settings[i].sensor + && sensor->cksel == sensor_settings[i].cksel) +-- +1.7.2.5 + diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 494ff622e..82f211b7b 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $ +# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.23 -pkgrel=6 +pkgrel=7 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') @@ -19,12 +19,14 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'saned.socket' 'saned.service' 'kodakaio.c.patch' - 'network.patch') + 'network.patch' + '1.0.23-hp2400c.patch') options=(!libtool) prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - + # fix FS#35549 + patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch # fix FS#33657 patch -Np0 -i ${srcdir}/kodakaio.c.patch # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 @@ -74,4 +76,5 @@ md5sums=('e226a89c54173efea80e91e9a5eb6573' 'e57e9e15528f47f5f1b3f1411135ed5d' '3f9fe36b0c4ff0b01b53b1cffa5d9700' 'e65dbefb7c3d69955fb6eb3ace14aa12' - '44e77692c52db15b0f530a1d9a8e1296') + '44e77692c52db15b0f530a1d9a8e1296' + '0c8bfabcaa499c4a2583aa2fe53d1686') diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 2d46784a0..dbeffd68b 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185032 2013-05-10 12:58:50Z juergen $ +# $Id: PKGBUILD 187814 2013-06-06 11:10:02Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pk "arch-fixes.lisp" "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" "texinfo-4.13a-data_types.patch") -md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85' +md5sums=('118dea06e26151d8315a118169ec16ec' '7ac0c1936547f4278198b8bf7725204d' '71ba711519209b5fb583fed2b3d86fcb' 'd8574782ff7def1e2dc5c291dbeaec18') diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD index ea6422191..660a683df 100644 --- a/extra/scim-anthy/PKGBUILD +++ b/extra/scim-anthy/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 148916 2012-02-05 11:55:48Z ibiru $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188489 2013-06-15 00:05:53Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=scim-anthy pkgver=1.2.7 -pkgrel=3 +pkgrel=4 _filecode=37309 pkgdesc='Japanese input method module for SCIM' -arch=('i686' 'x86_64' 'mips64el') url='http://sourceforge.jp/projects/scim-imengine/' +arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('scim' 'anthy') -options=('!libtool') source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz") sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8') +options=('!libtool') + build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-static diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD index c3cdb0257..6afc9a65a 100644 --- a/extra/scim-chewing/PKGBUILD +++ b/extra/scim-chewing/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 176853 2013-02-01 14:44:22Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: whisky <archlinux.cle(at)gmail.com> +# $Id: PKGBUILD 188490 2013-06-15 00:05:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: whisky <archlinux.cle(at)gmail.com> +# Contributor: damir <damir@archlinux.org> pkgname=scim-chewing pkgver=0.3.5 -pkgrel=1 +pkgrel=2 pkgdesc='Traditional Chinese input method module for SCIM' url='http://chewing.csie.net/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') makedepends=('intltool') depends=('scim' 'libchewing') source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") sha1sums=('f26ced990f0c9e5d43e271cd6e77583de81a008d') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD index 7b7631e83..6a5f52d94 100644 --- a/extra/scim-hangul/PKGBUILD +++ b/extra/scim-hangul/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 165326 2012-08-15 15:47:04Z bisson $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188491 2013-06-15 00:05:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=scim-hangul pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Korean input method module for SCIM' url='http://www.scim-im.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('libhangul' 'scim') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" '2012.patch') sha1sums=('2ba06a6d851a1d86c5a9b659c573bfd87e6a7555' 'a046c40b78521f85418b8ad2138b51815d47abec') -build() { +options=('!libtool') + +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../2012.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-skim-support make } diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD index 8e52e1311..c600b5193 100644 --- a/extra/scim-m17n/PKGBUILD +++ b/extra/scim-m17n/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 149048 2012-02-05 15:25:52Z bisson $ +# $Id: PKGBUILD 188492 2013-06-15 00:05:56Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> # Contributor: damir <damir@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-m17n pkgver=0.2.3 -pkgrel=4 +pkgrel=5 pkgdesc='Multilingual input method module for SCIM' url='http://www.scim-im.org/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('scim' 'm17n-lib') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz") sha1sums=('96172846eaa211d2bde0f76184990d13e5ecdaea') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no + ./configure --prefix=/usr --disable-static make } diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD index 905db2a4c..d3c3833bc 100644 --- a/extra/scim-pinyin/PKGBUILD +++ b/extra/scim-pinyin/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 165322 2012-08-15 15:28:33Z bisson $ +# $Id: PKGBUILD 188493 2013-06-15 00:05:57Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributer: Gan Lu <rhythm.gan@gmail.com> pkgname=scim-pinyin pkgver=0.5.92 -pkgrel=1 +pkgrel=2 pkgdesc='Chinese pinyin input for SCIM' url='http://www.scim-im.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('scim') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz") sha1sums=('d7c2d52a5712753af241a5301db23527ba438ea1') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - + ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD index 8af63073b..1810ec6dc 100644 --- a/extra/scim-tables/PKGBUILD +++ b/extra/scim-tables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183256 2013-04-19 15:20:34Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: Gan Lu <rhythm.gan@gmail.com> +# $Id: PKGBUILD 188494 2013-06-15 00:05:58Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Gan Lu <rhythm.gan@gmail.com> +# Contributor: damir <damir@archlinux.org> pkgname=scim-tables -pkgver=0.5.12 +pkgver=0.5.13 pkgrel=1 pkgdesc='Generic table input method module for SCIM' url='http://www.scim-im.org/' @@ -13,7 +13,7 @@ license=('GPL') depends=('scim') makedepends=('intltool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c83515c1c3ce0c40fb7cf30f576d8837a06a626f') +sha1sums=('75363466cfca30e3cdff804e0dad713f12521776') options=('!libtool') diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD index 0a5f38545..0f4395780 100644 --- a/extra/scim-uim/PKGBUILD +++ b/extra/scim-uim/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 166977 2012-09-24 04:57:10Z bisson $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188495 2013-06-15 00:05:59Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org +# Contributor: damir <damir@archlinux.org> pkgname=scim-uim pkgver=0.2.0 -pkgrel=6 +pkgrel=7 pkgdesc='UIM bridging input engine for SCIM' url='http://www.scim-im.org/' license=('GPL') -options=('!libtool') depends=('scim' 'uim') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" @@ -18,10 +17,16 @@ sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a' 'a9d67946f956d0572c73065e2b4b268bfdf149e3' '3b083260910f7855b5446960ab1203c052f4b56c') -build() { +options=('!libtool') + +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../fix-gcc43-build.patch patch -p1 -i ../uim-1.5.5-header.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index 78426f80f..cb888f1ff 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 185781 2013-05-18 17:19:08Z bisson $ +# $Id: PKGBUILD 188488 2013-06-15 00:05:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim pkgver=1.4.14 -pkgrel=3 +pkgrel=4 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('LGPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('libltdl' 'gtk2') -makedepends=('intltool' 'optipng') -backup=('etc/scim/config' 'etc/scim/global') +optdepends=('qt4: qt4 immodule' + 'gtk3: gtk3 immodule') +makedepends=('intltool' 'qt4' 'gtk3' 'optipng') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b') +backup=('etc/scim/config' 'etc/scim/global') +options=('!libtool') install=install -prepare() { - find -name '*.png' -exec optipng -quiet -force -fix {} + -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" + find -name '*.png' -exec optipng -quiet -force -fix {} + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-static \ + --with-qt4-moc=/usr/bin/moc-qt4 \ + --with-gtk-version=2 # no gtk3 support in scim-anthy make } diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD index 38d4ea6e4..6f6f4ea70 100644 --- a/extra/serf/PKGBUILD +++ b/extra/serf/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 179622 2013-03-08 20:38:44Z eric $ +# $Id: PKGBUILD 188137 2013-06-10 13:00:19Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=serf -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="High-performance asynchronous HTTP client library" url="http://code.google.com/p/serf/" @@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('Apache') depends=('apr' 'apr-util' 'openssl' 'zlib') source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('30b29bd9214d50887abcc20cf82096aaaf5d1d61') +sha1sums=('f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd') options=('!libtool') build() { diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD index 88611c74a..061a34bc0 100644 --- a/extra/sg3_utils/PKGBUILD +++ b/extra/sg3_utils/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 180167 2013-03-18 13:36:39Z jgc $ +#$Id: PKGBUILD 188647 2013-06-17 10:00:27Z jgc $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=sg3_utils -pkgver=1.35 +pkgver=1.36 pkgrel=1 pkgdesc="Generic SCSI utilities" arch=(i686 x86_64 'mips64el') @@ -10,8 +10,8 @@ url="http://sg.danny.cz/sg/sg3_utils.html" license=('GPL' 'custom:BSD') depends=('glibc') options=('!libtool') -source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz) -md5sums=('55c32fb95a5b3907687b023f392fbd3c') +source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz) +md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 6465992f3..75950afcd 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 183493 2013-04-22 09:21:24Z andrea $ +# $Id: PKGBUILD 188678 2013-06-17 18:06:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14.6 +pkgver=4.14.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('d6493b9f0a7911566545f694327314c4') +md5sums=('f5c8001f16ecffd711708de0e07d542f') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD index 1737dc6f6..59491036f 100644 --- a/extra/sonata/PKGBUILD +++ b/extra/sonata/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 175943 2013-01-25 08:23:07Z andrea $ +# $Id: PKGBUILD 188210 2013-06-13 03:01:29Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=sonata pkgver=1.6.2.1 -pkgrel=9 +pkgrel=10 pkgdesc="Elegant GTK+ music client for MPD" arch=('i686' 'x86_64' 'mips64el') url="http://sonata.berlios.de/" license=('GPL3') depends=('pygtk' 'python2-mpd') -optdepends=('gnome-python-extras: Enhanced system tray support' +optdepends=('python2-egg: Enhanced system tray support' 'python2-tagpy: Metadata editing support' 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') +provides=('python2-mmkeys') source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz info.py.patch) md5sums=('0b912325e7175abad3bf6c0edc071e05' diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index daa7eeafb..2344af353 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185272 2013-05-12 17:03:55Z bluewind $ +# $Id: PKGBUILD 187368 2013-06-05 15:55:32Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=spamassassin pkgver=3.3.2 -pkgrel=8 +pkgrel=9 pkgdesc="A mail filter to identify spam." arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -12,7 +12,7 @@ url="http://spamassassin.apache.org" depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl' 'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http' 'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay') -makedepends=('razor' 'perl-dbi') +makedepends=('razor' 'perl-dbi') optdepends=('razor: to identify collaborately-flagged spam') backup=('etc/mail/spamassassin/local.cf' 'etc/mail/spamassassin/init.pre' @@ -23,9 +23,17 @@ backup=('etc/mail/spamassassin/local.cf' install="${pkgname}.install" options=('!emptydirs') source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" - 'spamassassin.service') + 'spamassassin.service' + 'perl-5.18-fixes.patch') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' - 'ded3e012a4d502df001f2d97c495cc4e') + 'b8dcea016fb73b074b941e832cfae5c9' + '6cf63928eeeaea25967c2ffd875d106a') + +prepare() { + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + + patch -p0 -d lib -i "$srcdir/perl-5.18-fixes.patch" +} build() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" diff --git a/extra/spamassassin/perl-5.18-fixes.patch b/extra/spamassassin/perl-5.18-fixes.patch new file mode 100644 index 000000000..74277fc8b --- /dev/null +++ b/extra/spamassassin/perl-5.18-fixes.patch @@ -0,0 +1,97 @@ +--- Mail/SpamAssassin/AsyncLoop.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/AsyncLoop.pm 2013-05-29 01:37:58.000000000 +0200 +@@ -361,5 +361,12 @@ + $now = time; # capture new timestamp, after possible sleep in 'select' + +- while (my($key,$ent) = each %$pending) { ++ # A callback routine may generate another DNS query, which may insert ++ # an entry into the %$pending hash thus invalidating the each() context. ++ # So, make sure that callbacks are not called while the each() context ++ # is open, or avoid using each(). [Bug 6937] ++ # ++ # while (my($key,$ent) = each %$pending) { ++ foreach my $key (keys %$pending) { ++ my $ent = $pending->{$key}; + my $id = $ent->{id}; + if (defined $ent->{poll_callback}) { # call a "poll_callback" if exists +@@ -449,5 +456,6 @@ + my $foundcnt = 0; + my $now = time; +- while (my($key,$ent) = each %$pending) { ++ foreach my $key (keys %$pending) { ++ my $ent = $pending->{$key}; + dbg("async: aborting after %.3f s, %s: %s", + $now - $ent->{start_time}, +--- Mail/SpamAssassin/Conf/Parser.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/Conf/Parser.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -1249,5 +1249,5 @@ + my $mods = ''; + local ($1,$2); +- if ($re =~ s/^m{//) { ++ if ($re =~ s/^m\{//) { + $re =~ s/}([a-z]*)$//; $mods = $1; + } +--- Mail/SpamAssassin/DnsResolver.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/DnsResolver.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -441,8 +441,14 @@ + if (!defined($timeout) || $timeout > 0) + { $timer = $self->{main}->time_method("poll_dns_idle") } ++ $! = 0; + ($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout); + } + if (!defined $nfound || $nfound < 0) { +- warn "dns: select failed: $!"; ++ if ($!) { warn "dns: select failed: $!\n" } ++ else { info("dns: select interrupted") } ++ return; ++ } elsif (!$nfound) { ++ if (!defined $timeout) { warn("dns: select returned empty-handed\n") } ++ elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) } + return; + } +--- Mail/SpamAssassin/Message.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/Message.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -567,5 +567,5 @@ + # bug 5557: windows requires tmp file be closed before it can be rm'd + if (ref $part->{'raw'} eq 'GLOB') { +- close($part->{'raw'}) or die "error closing input file: $!"; ++ close($part->{'raw'}) or warn "error closing input file: $!"; + } + +--- Mail/SpamAssassin/PerMsgStatus.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/PerMsgStatus.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -421,6 +421,6 @@ + } + +- # ignore tests with 0 score in this scoreset +- next if ($scores->{$test} == 0); ++ # ignore tests with 0 score (or undefined) in this scoreset ++ next if !$scores->{$test}; + + # Go ahead and add points to the proper locations +@@ -1253,11 +1253,10 @@ + my $line = ''; + foreach my $test (sort @{$self->{test_names_hit}}) { +- if (!$line) { +- $line .= $test . "=" . $self->{conf}->{scores}->{$test}; +- } else { +- $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test}; +- } ++ my $score = $self->{conf}->{scores}->{$test}; ++ $score = '0' if !defined $score; ++ $line .= $arg if $line ne ''; ++ $line .= $test . "=" . $score; + } +- $line ? $line : 'none'; ++ $line ne '' ? $line : 'none'; + }, + +--- Mail/SpamAssassin/Util.pm~ 2013-05-29 01:29:59.000000000 +0200 ++++ Mail/SpamAssassin/Util.pm 2013-05-29 01:33:16.000000000 +0200 +@@ -1588,5 +1588,5 @@ + return undef; # invalid + } +- elsif ($re =~ s/^m{//) { # m{foo/bar} ++ elsif ($re =~ s/^m\{//) { # m{foo/bar} + $delim = '}'; + } diff --git a/extra/spamassassin/spamassassin.service b/extra/spamassassin/spamassassin.service index 2ccfa5b11..e9c9c07fd 100644 --- a/extra/spamassassin/spamassassin.service +++ b/extra/spamassassin/spamassassin.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/spamd.pid -ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c +ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c -c -x --virtual-config-dir=/var/lib/spamassassin -u nobody StandardOutput=syslog StandardError=syslog Restart=always diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD index ac2b8bb4f..b821e2889 100644 --- a/extra/ssmtp/PKGBUILD +++ b/extra/ssmtp/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 151206 2012-02-25 07:42:28Z pierre $ -# Maintainer: Hugo Doria <hugo@archlinux.org> +# $Id: PKGBUILD 187071 2013-06-03 11:16:54Z allan $ +# Maintainer: pkgname=ssmtp pkgver=2.64 -pkgrel=3.1 +pkgrel=4 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://packages.debian.org/stable/mail/ssmtp" -depends=('openssl') +depends=('openssl' 'inetutils') conflicts=('exim') provides=('smtp-forwarder') backup=('etc/ssmtp/ssmtp.conf' 'etc/ssmtp/revaliases') @@ -40,4 +40,7 @@ package() { ln -s ssmtp "${pkgdir}/usr/sbin/sendmail" ln -s ssmtp "${pkgdir}/usr/sbin/newaliases" ln -s ssmtp "${pkgdir}/usr/sbin/mailq" + # usrmove + cd "$pkgdir" + mv usr/sbin usr/bin } diff --git a/extra/strace/PKGBUILD b/extra/strace/PKGBUILD index 094abadd2..3cb8d7ddf 100644 --- a/extra/strace/PKGBUILD +++ b/extra/strace/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158298 2012-05-03 15:18:30Z giovanni $ +# $Id: PKGBUILD 187820 2013-06-06 14:47:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=strace -pkgver=4.7 +pkgver=4.8 pkgrel=1 pkgdesc="A useful diagnositic, instructional, and debugging tool" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://sourceforge.net/projects/strace/" license=('custom') depends=('perl') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.xz") -md5sums=('6054c3880a00c6703f83b57f15e04642') +md5sums=('c575ef43829586801f514fd91bfe7575') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -24,5 +24,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index 6bf0c5f97..6b2f06e48 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 178998 2013-03-01 10:25:57Z andrea $ +# $Id: PKGBUILD 187012 2013-06-03 08:51:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=strigi pkgver=0.7.8 -pkgrel=2 +pkgrel=3 pkgdesc="Fast crawling desktop search engine with Qt GUI" arch=('i686' 'x86_64' 'mips64el') url='http://strigi.sourceforge.net/' license=('GPL2') -depends=('exiv2' 'libxml2' 'boost-libs' 'qt4') +depends=('dbus' 'exiv2' 'libxml2' 'boost-libs') makedepends=('cmake' 'pkg-config' 'boost') optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') -source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('d69443234f4286d71997db9de543331a') +source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc48.patch') +md5sums=('d69443234f4286d71997db9de543331a' + 'd48d65014650644ba61821813101c2f4') -build() { - . /etc/profile.d/qt4.sh +prepare() { + cd ${pkgname}-${pkgver}/libstreams + patch -p1 -i "${srcdir}"/gcc48.patch +} +build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -31,24 +36,12 @@ build() { -DENABLE_FAM=OFF \ -DENABLE_CLUCENE=OFF \ -DENABLE_CLUCENE_NG=OFF \ - -DENABLE_FFMPEG=OFF + -DENABLE_FFMPEG=OFF \ + -DENABLE_QT4=OFF make } package() { - pushd build/libstreams - make DESTDIR="${pkgdir}" install - popd - - pushd build/libstreamanalyzer - make DESTDIR="${pkgdir}" install - popd - - pushd build/strigiclient/lib/searchclient/qtdbus - make DESTDIR="${pkgdir}" install - popd - - pushd build/strigiutils + cd build make DESTDIR="${pkgdir}" install - popd } diff --git a/extra/strigi/gcc48.patch b/extra/strigi/gcc48.patch new file mode 100644 index 000000000..ed60e4fbb --- /dev/null +++ b/extra/strigi/gcc48.patch @@ -0,0 +1,12 @@ +--- a/include/strigi/bufferedstream.h ++++ b/include/strigi/bufferedstream.h +@@ -34,7 +34,7 @@ + * BufferedStream will do the rest. + */ + template <class T> +-class BufferedStream : public StreamBase<T> { ++class STREAMS_EXPORT BufferedStream : public StreamBase<T> { + private: + StreamBuffer<T> buffer; + bool finishedWritingToBuffer; + diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index a5a36561f..3169b1d34 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186427 2013-05-26 09:26:08Z bluewind $ +# $Id: PKGBUILD 188189 2013-06-12 11:20:08Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.9 -pkgrel=6 +pkgver=1.7.10 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -28,7 +28,7 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.as svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('8d532025771a67c06c23f299699f056f' +md5sums=('4088a77e14232876c9b4ff1541e6e200' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' 'bb2857eceafcfac35dde39dcffad2314' diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index cb2f95646..be0e5829f 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173268 2012-12-17 16:30:15Z stephane $ +# $Id: PKGBUILD 188138 2013-06-10 13:01:07Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig -pkgver=2.0.9 +pkgver=2.0.10 pkgrel=1 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.swig.org/" license=('custom') depends=('zlib' 'pcre') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('7984bf1043f522e88ea51d4bd21c97d3c68342be') +sha1sums=('ad6f95ce9b9da4a8f5b80ac1848d26c76f518d84') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 3c54082b4..006459cbb 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185556 2013-05-15 00:48:48Z dreisner $ +# $Id: PKGBUILD 188171 2013-06-11 16:24:06Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=syslog-ng -pkgver=3.4.1 -pkgrel=3 +pkgver=3.4.2 +pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') @@ -21,7 +21,7 @@ install=$pkgname.install source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz" syslog-ng.conf syslog-ng.logrotate) -sha1sums=('e75892262863b77f74a401d19661164154f716e7' +sha1sums=('96474f955fb51d4f31ce1154c84b0cb48c8748d2' '0aaf695ea6756b59198ff2e4af237b4a6186525d' '949128fe3d7f77a7aab99048061f885bc758000c') diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index c81afb68e..8ae557e05 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 179001 2013-03-01 10:26:20Z andrea $ +# $Id: PKGBUILD 188082 2013-06-08 11:18:26Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Christopher Reimer <c.reimer1993@gmail.com> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993@gmail.com> pkgname=texmacs -pkgver=1.0.7.16 +pkgver=1.0.7.19 pkgrel=2 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('i686' 'x86_64' 'mips64el') url="http://www.texmacs.org/" license=('GPL') -depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info' +depends=('perl' 'guile1.8' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info' 'desktop-file-utils' 'qt4') # do not remove texlive-core dependency, as it is needed! optdepends=('transfig: convert images using fig2ps' @@ -19,7 +18,7 @@ optdepends=('transfig: convert images using fig2ps' source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz) install=texmacs.install options=('!emptydirs') -sha1sums=('bd73a8ff1c5361161cc65c57dfe8e706a1859231') +sha1sums=('855b8252f561b69deb45a3b80f4531a9055ea465') build() { cd ${srcdir}/TeXmacs-${pkgver}-src @@ -28,6 +27,9 @@ build() { TeXmacs/misc/inkscape_plugin/texmacs_reedit.py sed -i 's/"python"/"python2"/' plugins/python/progs/init-python.scm sed -i '/^LDPATH/d' src/makefile.in + sed -i -e 's/guile /guile1.8 /g' \ + -e 's/guile-config/guile-config1.8/g' \ + configure # Don't generate icon-cache and mime-database (namcap tells that they should not be in a package) sed -i '/update-mime-database/d' Makefile.in @@ -36,7 +38,10 @@ build() { # Unused i386 binary making strip fail. rm plugins/maxima/bin/maxima_filter - + + export QMAKE=qmake-qt4 + export MOC=moc-qt4 + export UIC=uic-qt4 ./configure --prefix=/usr \ --mandir=/usr/share/man \ --libexecdir=/usr/lib diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index becc1ec6c..8b589160f 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $ +# $Id: PKGBUILD 187072 2013-06-03 11:16:56Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -19,6 +19,7 @@ sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8') build() { cd "udisks-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD index dd234ef85..92176aa3b 100644 --- a/extra/usbmuxd/PKGBUILD +++ b/extra/usbmuxd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $ +# $Id: PKGBUILD 187073 2013-06-03 11:16:58Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64' 'mips64el') @@ -32,10 +32,13 @@ package() { # fix udev dir being hardcoded mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" rmdir "${pkgdir}/lib" + # usrmove + mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/" + rmdir "${pkgdir}/usr/sbin" # install systemd service file install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service # use udev rule that works with systemd - install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ + install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ } md5sums=('87fd27773a84e97ac6e2dc28b08d682e' 'dae0660f972510a6483992b5b81e1b5a' diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 7de2cf5c4..83c9ac161 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184233 2013-05-04 14:56:27Z thomas $ +# $Id: PKGBUILD 187074 2013-06-03 11:16:59Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/libv4l" @@ -23,7 +23,7 @@ options=(!libtool) build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD index 4557f28db..e336788a2 100644 --- a/extra/v86d/PKGBUILD +++ b/extra/v86d/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 159626 2012-05-25 23:57:39Z dreisner $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> +# $Id: PKGBUILD 187075 2013-06-03 11:17:01Z allan $ +# Maintainer: pkgname=v86d pkgver=0.1.10 -pkgrel=4 +pkgrel=5 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" arch=("i686" "x86_64" 'mips64el') -url="http://dev.gentoo.org/~spock/projects/uvesafb/" +url="https://github.com/mjanusz/v86d" license=('GPL2') depends=('glibc') +makedepends=('git') options=('!makeflags') -source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 - v86d +source=("git://github.com/mjanusz/v86d.git#tag=$pkgname-$pkgver" + v86d_install v86d_hook modprobe.uvesafb) -md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' +md5sums=(SKIP '66ab32602ab29cc5635eaac7f3e42283' '5f75b8bc4a7ddf595014591e5db263cb' '2d7cc8dc6a41916a13869212d0191147') build() { - cd "$srcdir/v86d-$pkgver" + cd "$pkgname" ./configure --with-x86emu # we only need /usr/include/video/uvesafb.h make KDIR=/usr } package() { - cd "$srcdir/v86d-$pkgver" + cd "$pkgname" make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir/v86d" "$pkgdir/usr/lib/initcpio/install/v86d" + install -D -m644 "$srcdir/v86d_install" "$pkgdir/usr/lib/initcpio/install/v86d" install -D -m644 "$srcdir/v86d_hook" "$pkgdir/usr/lib/initcpio/hooks/v86d" install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/usr/lib/modprobe.d/uvesafb.conf" + + # usrmove + cd "$pkgdir" + mv sbin usr/bin } diff --git a/extra/v86d/v86d b/extra/v86d/v86d_install index 840b34eec..840b34eec 100644 --- a/extra/v86d/v86d +++ b/extra/v86d/v86d_install diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 0905938e4..5b31b6d97 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185368 2013-05-13 17:51:30Z dreisner $ +# $Id: PKGBUILD 188735 2013-06-18 17:08:27Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=varnish -pkgver=3.0.3 -pkgrel=3 +pkgver=3.0.4 +pkgrel=1 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64' 'mips64el') url="http://www.varnish-cache.org/" @@ -18,17 +18,13 @@ options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" varnish-vcl-reload varnish.service) -md5sums=('714310c83fdbd2061d897dacd3f63d8b' +md5sums=('a130ce9c3504b9603a46542635e18701' '03196dee7fc68e75069393d52c370762' 'a59b17d8e3066abcf3dd7755a2212dd4') build() { cd "$pkgname-$pkgver" - # disable JIT compilation, as it's crashy crashy (bug in PCRE) - # this is flagged out and disabled by default in $nextrelease of Varnish. - sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 89e79b0ef..2fa15ab4c 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z giovanni $ +# $Id: PKGBUILD 188100 2013-06-09 13:12:36Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -69,6 +69,10 @@ build() { [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" + # fix for flac-1.3.0 + sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c + sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c + CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index 5357adaec..346232971 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $ +# $Id: PKGBUILD 188481 2013-06-14 22:21:14Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vte @@ -12,9 +12,9 @@ depends=('gtk2' 'vte-common') makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz -make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) + make_alt_work.patch) sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae' - '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') + '978c989fb63884289068bcee05a92614a3a2be9e5d9386ab789dfb87163b92c8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vte/make_alt_work.patch b/extra/vte/make_alt_work.patch new file mode 100644 index 000000000..8e6e3fcad --- /dev/null +++ b/extra/vte/make_alt_work.patch @@ -0,0 +1,21 @@ +From b73782a28894e25ed146271f9d6c6775a6836199 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod <behdad@behdad.org> +Date: Fri, 04 Jun 2010 18:36:45 +0000 +Subject: Bug 601926 - Don't hardcode meta to alt + +--- +diff --git a/src/keymap.h b/src/keymap.h +index 3a4cefe..243e22e 100644 +--- a/src/keymap.h ++++ b/src/keymap.h +@@ -27,7 +27,7 @@ + + G_BEGIN_DECLS + +-#define VTE_META_MASK GDK_MOD1_MASK ++#define VTE_META_MASK GDK_META_MASK + #define VTE_NUMLOCK_MASK GDK_MOD2_MASK + + /* Map the specified keyval/modifier setup, dependent on the mode, to either +-- +cgit v0.9.2 diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 29bb4fc41..a2cc1a60a 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185394 2013-05-13 18:51:37Z heftig $ +# $Id: PKGBUILD 188151 2013-06-10 16:21:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.5 +pkgver=0.34.6 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) -sha256sums=('8847fb75b620a94ba62c2ffd9e1653396978106f294574ba24a19ced259a7351') +sha256sums=('e1dcc30ec8df24ec5f7f100ca231ab96da0e560b0bfddec3617c962943d8f3f3') build() { cd "vte-$pkgver" diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index cd262f582..560eb2945 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178840 2013-02-27 15:05:46Z thomas $ +# $Id: PKGBUILD 187076 2013-06-03 11:17:02Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=watchdog pkgver=5.13 -pkgrel=1 +pkgrel=2 pkgdesc="Watchdog daemon" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/watchdog" @@ -15,14 +15,18 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz watchdog.systemd) md5sums=('153455f008f1cf8f65f6ad9586a21ff1' 'c90c2686975b5254f82b3de683f1f442' - 'a835ae5cbdbb21c19a468dedb5d734e4') + '06677f094ec76b7fbb7b0db141209dec') +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch +} build() { cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/watchdog/watchdog.systemd b/extra/watchdog/watchdog.systemd index 57c73fb45..4bd08f95c 100644 --- a/extra/watchdog/watchdog.systemd +++ b/extra/watchdog/watchdog.systemd @@ -4,7 +4,7 @@ Description=Watchdog Daemon [Service] Type=forking PIDFile=/run/watchdog.pid -ExecStart=/usr/sbin/watchdog +ExecStart=/usr/bin/watchdog [Install] WantedBy=multi-user.target diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index e95bccc34..bc3cf4a87 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 185357 2013-05-13 17:34:56Z heftig $ +# $Id: PKGBUILD 188207 2013-06-12 20:16:30Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> -pkgbase=webkitgtk -pkgname=('webkitgtk3') -pkgver=2.0.2 +pkgname=webkitgtk +pkgver=2.0.3 pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +arch=(i686 x86_64 mips64el) url="http://webkitgtk.org/" -license=('custom') -makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp') -options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/$pkgbase-$pkgver.tar.xz - 0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch) -sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2' - '7b4c1419342bafcca642d7a41abe92713810401591906b081fe476169cb9a3aa') +license=(custom) +depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs + libsecret libwebp harfbuzz-icu) +makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc) +optdepends=('gtk2: Netscape plugin support') +provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") +conflicts=(webkitgtk3 libwebkit3) +replaces=(webkitgtk3 libwebkit3) +options=(!libtool !emptydirs) +source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz) +sha256sums=('9bf8a32afbf087c4fc2c652b193a52c44b180735ba9c7c8db88137904d458e1b') prepare() { cd $pkgbase-$pkgver - mkdir build-gtk3 + if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ @@ -27,15 +30,12 @@ prepare() { Source/WTF/wtf/Platform.h fi - # Fix build on 32-bit platforms. - patch -p1 -i "$srcdir/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch" - # Won't be made before files there. - mkdir -p build-gtk3/Programs/resources + mkdir -p Programs/resources } build() { - cd $pkgbase-$pkgver/build-gtk3 + cd $pkgname-$pkgver if [ "$CARCH" = "mips64el" ]; then # Optimizations make it segfault when running; without @@ -47,19 +47,19 @@ build() { extra="--disable-fast-malloc --disable-optimizations" fi - ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 --enable-introspection $extra + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/$pkgname \ + --enable-introspection \ + ${extra} + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make all stamp-po } -package_webkitgtk3() { - pkgdesc="GTK+ Web content engine library for GTK+ 3.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk3' 'gst-plugins-base-libs' 'libsecret' 'libwebp') - conflicts=('libwebkit3') - provides=("libwebkit3=${pkgver}") - replaces=('libwebkit3') - optdepends=('gtk2: Webkit2 plugin support') - - cd $pkgbase-$pkgver/build-gtk3 +package() { + cd $pkgname-$pkgver make -j1 DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD index 035ad7e92..c7a7d2206 100644 --- a/extra/webkitgtk2/PKGBUILD +++ b/extra/webkitgtk2/PKGBUILD @@ -1,20 +1,29 @@ -# $Id: PKGBUILD 184447 2013-05-06 19:40:08Z foutrelis $ +# $Id: PKGBUILD 188485 2013-06-14 23:12:24Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk2 pkgver=1.10.2 -pkgrel=5 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=7 +pkgdesc="GTK+ Web content engine library for GTK+ 2.0" +arch=(i686 x86_64 mips64el) url="http://webkitgtk.org/" -license=('custom') -makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') -options=('!libtool' '!emptydirs') +license=(custom) +depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk2 gstreamer0.10-base + icu) +makedepends=(gperf gobject-introspection python2 mesa ruby gtk-doc) +optdepends=() +provides=("libwebkit=${pkgver}") +conflicts=(libwebkit) +replaces=(libwebkit) +options=(!libtool !emptydirs) source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c') build() { - cd "$srcdir/webkitgtk-$pkgver" - mkdir build-gtk2 + cd webkitgtk-$pkgver + + # Suppress a *lot* of gcc 4.8 warnings + CPPFLAGS+=" -Wno-unused-local-typedefs" if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. @@ -30,25 +39,23 @@ build() { extra="--disable-fast-malloc --disable-optimizations" fi - cd build-gtk2 - PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/$pkgname \ --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk2 \ + --disable-webkit2 \ --with-gstreamer=0.10 \ --with-gtk=2.0 \ - --disable-webkit2 $extra + $extra + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make all stamp-po } package() { - pkgdesc="GTK+ Web content engine library for GTK+ 2.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base') - conflicts=('libwebkit') - provides=("libwebkit=${pkgver}") - replaces=('libwebkit') - - cd "$srcdir/webkitgtk-$pkgver/build-gtk2" + cd webkitgtk-$pkgver make -j1 DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -r "$pkgdir/usr/share/gtk-doc/html/webkitgtk" } diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index a2e21d979..20aae0027 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185261 2013-05-12 16:27:13Z giovanni $ +# $Id: PKGBUILD 187179 2013-06-04 21:40:01Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois pkgver=5.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') url="http://www.linux.it/~md/software/" @@ -17,7 +17,7 @@ md5sums=('8f873c1c51592ee419b2a46b0a3c8432') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1 + make prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1 HAVE_ICONV=1 } package() { diff --git a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch new file mode 100644 index 000000000..0b8b91363 --- /dev/null +++ b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch @@ -0,0 +1,77 @@ +--- doc/asn2deb.pod.orig 2013-06-06 21:30:28.314150100 +0200 ++++ doc/asn2deb.pod 2013-06-06 21:31:59.448850746 +0200 +@@ -5,8 +5,21 @@ + + =head1 SYNOPSIS + +-B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] +-[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] ++B<asn2deb> ++S<[ B<-a> E<lt>ASN.1 fileE<gt> ]> ++S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]> ++S<[ B<-d> E<lt>optsE<gt> ]> ++S<[ B<--dbopts>=E<lt>optsE<gt> ]> ++S<[ B<-e> E<lt>addressE<gt> ]> ++S<[ B<--email>=E<lt>addressE<gt> ]> ++S<[ B<-h> ]> ++S<[ B<--help> ]> ++S<[ B<-n> E<lt>nameE<gt> ]> ++S<[ B<--name>=E<lt>nameE<gt> ]> ++S<[ B<-p> ]> ++S<[ B<--preserve> ]> ++S< [B<-v> ]> ++S<[ B<--version> ]> + + =head1 DESCRIPTION + +@@ -19,31 +32,31 @@ + + =over 4 + +-=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file> ++=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt> + + ASN.1 file to use (mandatory). + +-=item B<-d >I<opts> B<--dbopts=>I<opts> ++=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt> + + options for dpkg-buildpackage. + +-=item B<-e >I<address> B<--email=>I<address> ++=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt> + + use e-mail address. + +-=item B<-h> B<--help> ++=item -h --help + + print help and exit. + +-=item B<-n >I<name> B<--name=>I<name> ++=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt> + + use user name. + +-=item B<-p> B<--preserve> ++=item -p --preserve + + do not overwrite files. + +-=item B<-v> B<--version> ++=item -v --version + + print version and exit. + +@@ -68,8 +81,8 @@ + + =head1 AUTHOR + +-B<W. Borgert> Author. ++B<W. Borgert> Author. + + =head1 COPYRIGHT + +-Copyright (C) 2003, 2005 W. Borger +\ No newline at end of file ++Copyright (C) 2003, 2005 W. Borger diff --git a/extra/wireshark/02_enable-version.diff b/extra/wireshark/02_enable-version.diff deleted file mode 100644 index db2f3726e..000000000 --- a/extra/wireshark/02_enable-version.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:42.863854681 +0100 -+++ configure.in 2013-02-02 22:13:40.888683191 +0100 -@@ -185,7 +185,7 @@ - [use GnuTLS library @<:@default=yes@:>@]), - with_gnutls="$withval", with_gnutls="yes") - if test "x$with_gnutls" = "xyes"; then -- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3], -+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0], - [ - echo "GnuTLS found, enabling SSL decryption" - AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library]) diff --git a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch new file mode 100644 index 000000000..bc4000b8f --- /dev/null +++ b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch @@ -0,0 +1,77 @@ +--- doc/idl2deb.pod.orig 2013-06-06 21:31:06.674726010 +0200 ++++ doc/idl2deb.pod 2013-06-06 21:35:38.522125866 +0200 +@@ -5,9 +5,21 @@ + + =head1 SYNOPSIS + +-B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>] +-[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] +- ++B<idl2deb> ++S< [ B<-d> E<lt>optsE<gt> ]> ++S< [ B<--dbopts>=E<lt>optsE<gt> ]> ++S< [ B<-e> E<lt>addressE<gt> ]> ++S< [ B<--email>=E<lt>addressE<gt> ]> ++S< [ B<-h> ]> ++S< [ B<--help> ]> ++S< [ B<-i> E<lt>idlfileE<gt> ]> ++S< [ B<--idl>=E<lt>idlfileE<gt> ]> ++S< [ B<-n> E<lt>nameE<gt> ]> ++S< [ B<--name>=E<lt>nameE<gt> ]> ++S< [ B<-p> ]> ++S< [ B<--preserve> ]> ++S< [ B<-v> ]> ++S< [ B<--version> ]> + + =head1 DESCRIPTION + +@@ -19,31 +31,31 @@ + + =over 4 + +-=item B<-d>I<opts> B<--dbopts=>I<opts> ++=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt> + + options for dpkg-buildpackage. + +-=item B<-e >I<address> B<--email=>I<address> ++=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt> + + use e-mail address. + +-=item B<-i >I<idlfile> B<--idl=>I<idlfile> ++=item -h --help + +-IDL file to use (mandatory) ++print help and exit. + +-=item B<-h> B<--help> ++=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt> + +-print help and exit. ++IDL file to use (mandatory) + +-=item B<-n >I<name> B<--name=>I<name> ++=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt> + + use user name. + +-=item B<-p> B<--preserve> ++=item -p --preserve + + do not overwrite files. + +-=item B<-v> B<--version> ++=item -v --version + + print version and exit. + +@@ -67,7 +79,7 @@ + + =head1 AUTHOR + +-B<W. Borgert> Author. ++B<W. Borgert> Author. + + =head1 COPYRIGHT + diff --git a/extra/wireshark/03_force_utf8_for_pod2man.patch b/extra/wireshark/03_force_utf8_for_pod2man.patch new file mode 100644 index 000000000..ace641100 --- /dev/null +++ b/extra/wireshark/03_force_utf8_for_pod2man.patch @@ -0,0 +1,22 @@ +--- doc/Makefile.am (revision 49837) ++++ doc/Makefile.am (working copy) +@@ -123,6 +123,7 @@ + $(AM_V_POD2MAN)$(POD2MAN) \ + --center="The Wireshark Network Analyzer" \ + --release=$(VERSION) \ ++ --utf8 \ + $< > $@ + + .pod.html: ../config.h $(top_srcdir)/docbook/ws.css +--- doc/wireshark.pod.template (revision 49837) ++++ doc/wireshark.pod.template (working copy) +@@ -1,4 +1,9 @@ ++=begin man ++ ++=encoding utf8 ++ ++=end man + + =head1 NAME + + wireshark - Interactively dump and analyze network traffic diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 4e7d51f14..3db3d41be 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,32 +1,43 @@ -# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $ +# $Id: PKGBUILD 188206 2013-06-12 20:04:04Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.7 -pkgrel=1 +pkgver=1.10.0 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' +makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua51' 'python') url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 02_enable-version.diff) -sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842' - 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') + 01_fix_encoding_asn2deb_pod.patch + 02_fix_encoding_idl2deb_pod.patch + 03_force_utf8_for_pod2man.patch) +sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add' + '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d' + 'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27' + '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p0 < ${srcdir}/02_enable-version.diff + # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774 + for p in 01_fix_encoding_asn2deb_pod.patch \ + 02_fix_encoding_idl2deb_pod.patch \ + 03_force_utf8_for_pod2man.patch; + do + patch -p0 <${srcdir}/${p} + done ./autogen.sh ./configure \ --prefix=/usr \ --with-ssl \ --with-zlib=yes \ - --with-lua + --with-lua \ + --with-gtk3=yes make all } @@ -56,7 +67,7 @@ package_wireshark-cli() { package_wireshark-gtk() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' - depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') + depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') install=wireshark-gtk.install replaces=(wireshark) conflicts=(wireshark) diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD index a14ed2300..5ed7de404 100644 --- a/extra/wpa_supplicant_gui/PKGBUILD +++ b/extra/wpa_supplicant_gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179006 2013-03-01 10:27:04Z andrea $ +# $Id: PKGBUILD 187078 2013-06-03 11:17:10Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant_gui pkgver=2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A Qt frontend to wpa_supplicant" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') @@ -13,16 +13,15 @@ source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz") sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09') build() { - . /etc/profile.d/qt4.sh cd wpa_supplicant-${pkgver} cd wpa_supplicant/wpa_gui-qt4 - qmake QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" + qmake-qt4 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" make } package() { cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4" - install -Dm755 wpa_gui "${pkgdir}/usr/sbin/wpa_gui" + install -Dm755 wpa_gui "${pkgdir}/usr/bin/wpa_gui" install -Dm644 icons/wpa_gui.svg "${pkgdir}/usr/share/pixmaps/wpa_gui.svg" install -Dm644 wpa_gui.desktop "${pkgdir}/usr/share/applications/wpa_gui.desktop" install -Dm644 "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8" \ diff --git a/extra/x11-ssh-askpass/PKGBUILD b/extra/x11-ssh-askpass/PKGBUILD index 5d3d0f2f1..9e88da1da 100644 --- a/extra/x11-ssh-askpass/PKGBUILD +++ b/extra/x11-ssh-askpass/PKGBUILD @@ -1,5 +1,4 @@ -# $Id: PKGBUILD 140828 2011-10-19 22:29:39Z bisson $ - +# $Id: PKGBUILD 188167 2013-06-11 06:50:06Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Mike Sampson <mike at sambodata dot com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -7,7 +6,7 @@ pkgname=x11-ssh-askpass pkgver=1.2.4.1 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight passphrase dialog for SSH' url='http://www.jmknoble.net/software/x11-ssh-askpass/' license=('custom') @@ -22,7 +21,6 @@ sha1sums=('78c992951685d4dbffb77536f37b83ae2a6eafc7' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --mandir=/usr/share/man \ --libexecdir=/usr/lib/ssh \ @@ -35,10 +33,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install.man - install -Dm755 ../profile.d "${pkgdir}/etc/profile.d/${pkgname}.sh" - install -d "${pkgdir}/usr/share/licenses/${pkgname}" sed '109,174p;d' README > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm755 ../profile.d "${pkgdir}/etc/profile.d/${pkgname}.sh" } diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 298458759..9cc8a9e2e 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $ +# $Id: PKGBUILD 188542 2013-06-15 10:17:06Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,8 +7,8 @@ # Contributor: Milan KnÞek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.0.2 -pkgrel=2 +pkgver=4.0.1.1 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') url="http://www.x2go.org/" @@ -20,19 +20,13 @@ options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz - x2goserver.service - revert.patch) -md5sums=('6b8cecfdd31a8877203f50d3666c265f' - 'f76081c01e40b6206895d194dc949707' - 'c487c31e7c0aa9a73323313007497764') + x2goserver.service) +md5sums=('d970699f1df8d7096a7d3151c0ede447' + 'f76081c01e40b6206895d194dc949707') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # revert an upstream commit that breaks sessions showing up - # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f - patch -Rp1 -i ${srcdir}/revert.patch - # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -45,7 +39,7 @@ build() { sed -i "s:-o root -g root ::g" $Makefile done - make + make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" } package() { @@ -60,8 +54,8 @@ package() { install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start - install -dm755 $pkgdir/lib/modules-load.d - echo "fuse" > $pkgdir/lib/modules-load.d/x2goserver.conf + install -dm755 $pkgdir/usr/lib/modules-load.d + echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" diff --git a/extra/x2goserver/revert.patch b/extra/x2goserver/revert.patch deleted file mode 100644 index 023bbd18c..000000000 --- a/extra/x2goserver/revert.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001 -From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Date: Sun, 19 May 2013 00:41:32 +0200 -Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c. - Hard-code path to x2gosqlitewrapper.pl during build via - defining a macro in the Makefile. Thanks to Richard - Weinberger for spotting this!!! - ---- - Makefile | 2 +- - debian/changelog | 3 +++ - debian/rules | 4 +-- - x2goserver/Makefile | 4 +-- - x2goserver/x2gosqlitewrapper.c | 54 +++------------------------------------- - 5 files changed, 12 insertions(+), 55 deletions(-) - -diff --git a/Makefile b/Makefile -index 3be40f9..588084f 100755 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ RM_FILE=rm -f - RM_DIR=rmdir -p --ignore-fail-on-non-empty - - DESTDIR= --PREFIX=/usr/local -+PREFIX ?= /usr/local - ETCDIR=/etc/x2go - LIBDIR=$(PREFIX)/lib/x2go - SHAREDIR=$(PREFIX)/share/x2go -diff --git a/debian/changelog b/debian/changelog -index 470a502..2cf2dde 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low - * New upstream version (4.0.0.2): - - Use make_path from File::Path in x2godbadmin to create user directory if - not present. (Fixes: #200). -+ - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to -+ x2gosqlitewrapper.pl during build via defining a macro in the Makefile. -+ Thanks to Richard Weinberger for spotting this!!! - /debian/control: - + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: - #163). -diff --git a/debian/rules b/debian/rules -index b32e08d..5bb94b2 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -1,10 +1,10 @@ - #!/usr/bin/make -f - - %: -- dh $@ -+ PREFIX=/usr dh $@ - - override_dh_auto_install: -- make -f Makefile build-arch -+ PREFIX=/usr make -f Makefile build-arch - - override_dh_auto_clean: - rm -fv x2gosqlitewrapper -diff --git a/x2goserver/Makefile b/x2goserver/Makefile -index 4287478..e9d56e6 100755 ---- a/x2goserver/Makefile -+++ b/x2goserver/Makefile -@@ -15,7 +15,7 @@ RM_FILE=rm -f - RM_DIR=rmdir -p --ignore-fail-on-non-empty - - DESTDIR= --PREFIX=/usr/local -+PREFIX ?= /usr/local - ETCDIR=/etc/x2go - BINDIR=$(PREFIX)/bin - SBINDIR=$(PREFIX)/sbin -@@ -41,7 +41,7 @@ build: build-arch build-indep - build-arch: build_setgidwrappers - - build_setgidwrappers: -- $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c - - build-indep: build_man2html - -diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c -index a134efc..ad95eff 100644 ---- a/x2goserver/x2gosqlitewrapper.c -+++ b/x2goserver/x2gosqlitewrapper.c -@@ -21,58 +21,12 @@ - * - */ - --#include <stdio.h> --#include <stdlib.h> --#include <unistd.h> --#include <libgen.h> --#include <errno.h> -- - int main( int argc, char *argv[] ) { -- char * x2gosqlitewrapper = NULL; -- size_t path_max; -- --/* -- The following snippet is taken from the realpath manpage --*/ --#ifdef PATH_MAX -- path_max = PATH_MAX; --#else -- path_max = pathconf (".", _PC_PATH_MAX); -- if (path_max <= 0){ -- path_max = 4096; -- } --#endif -- { -- // allocate dynamic buffer in stack: this needs C99 or gnu?? -- char buffer[path_max]; -- ssize_t rvrl; -- int rvap; -- -- // resolve link of /proc/self/exe to find out where we are -- rvrl = readlink("/proc/self/exe", buffer, path_max); -- if(rvrl == -1){ -- perror("readlink(\"/proc/self/exe\",buffer,path_max)"); -- exit(EXIT_FAILURE); -- } -- if(rvrl >= path_max){ -- fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); -- exit(EXIT_FAILURE); -- } -- -- // derive the full path of x2gosqlitewrapper.pl from path of this binary -- rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); -- if(rvap == -1){ -- fprintf(stderr, "Failed to allocate memory calling asprintf\n"); -- exit(EXIT_FAILURE); -- } -- -- // execute the script, running with user-rights of this binary -- execv(x2gosqlitewrapper, argv); - -- } -+ char x2gosqlitewrapper[] = TRUSTED_BINARY; - -- // ...fail -- fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); -- return EXIT_FAILURE; -+ argv[0] = "x2gosqlitewrapper.pl"; -+ // execute the script, running with user-rights of this binary -+ execv(x2gosqlitewrapper, argv); - - } --- -1.7.9.5 - diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 2f0f13e72..c936481fc 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186484 2013-05-27 13:17:23Z andyrtr $ +# $Id: PKGBUILD 187885 2013-06-07 20:50:17Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.8 +pkgver=2.21.9 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4d850c0515012ca370a72469dfbfa6161aa9ee5bb39779fab5f496f2d94acf8f') +sha256sums=('1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD index 7f55ea4f5..51ac07260 100644 --- a/extra/xf86-video-modesetting/PKGBUILD +++ b/extra/xf86-video-modesetting/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180914 2013-03-27 23:14:30Z andyrtr $ +# $Id: PKGBUILD 188204 2013-06-12 19:08:23Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=xf86-video-modesetting -pkgver=0.7.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="X.org generic modesetting video driver" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac') +sha256sums=('13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 5de63e725..c3a3570fb 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180916 2013-03-27 23:16:59Z andyrtr $ +# $Id: PKGBUILD 188202 2013-06-12 18:59:24Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') install=$pkgname.install source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2) -sha256sums=('d187c658e1823ca829c941f3f601f8e7220d427e079c3e52b94ecff45bc2e131') +sha256sums=('9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617') build() { cd $pkgname-$pkgver diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index ca81d3f20..4d0c167c0 100644 --- a/extra/yp-tools/PKGBUILD +++ b/extra/yp-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184213 2013-05-03 22:54:47Z tomegun $ +# $Id: PKGBUILD 187079 2013-06-03 11:17:12Z allan $ # Mantainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,7 +6,7 @@ pkgname=yp-tools pkgver=2.14 -pkgrel=2 +pkgrel=3 pkgdesc='Linux NIS Tools' arch=('i686' 'x86_64' 'mips64el') url='http://www.linux-nis.org/nis/yp-tools/' @@ -29,6 +29,10 @@ package() { make DESTDIR="$pkgdir" install install -D -m644 ../domainname.conf "${pkgdir}/etc/nisdomainname" install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service" + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin } md5sums=('ba1f121c17e3ad65368be173b977cd13' '5a78cd2218936241133e5f61383a2dc8' diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index ca388b4aa..3abcbe7a7 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173826 2012-12-24 15:21:31Z pierre $ +# $Id: PKGBUILD 187080 2013-06-03 11:17:13Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh pkgver=5.0.2 -pkgrel=1.1 +pkgrel=2 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64' 'mips64el') url='http://www.zsh.org/' @@ -11,7 +11,7 @@ license=('custom') depends=('pcre' 'libcap' 'gdbm') backup=('etc/zsh/zprofile') install=zsh.install -source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'zprofile') md5sums=('b8f2ad691acf58b3252225746480dcad' '24a9335edf77252a7b5f52e079f7aef7') @@ -19,12 +19,6 @@ md5sums=('b8f2ad691acf58b3252225746480dcad' build() { cd "${srcdir}/${pkgname}-${pkgver}" - # FS#16360 - sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ - Doc/zsh.texi \ - Completion/Unix/Type/_services \ - Completion/Unix/Command/_init_d - # Set correct keymap path sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys @@ -34,7 +28,6 @@ build() { rm -f Completion/Unix/Command/_osc ./configure --prefix=/usr \ - --bindir=/bin \ --enable-etcdir=/etc/zsh \ --enable-zshenv=/etc/zsh/zshenv \ --enable-zlogin=/etc/zsh/zlogin \ @@ -51,7 +44,7 @@ build() { --enable-pcre \ --enable-cap \ --enable-zsh-secure-free - make all info + make } check() { @@ -61,7 +54,7 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install install.info + make DESTDIR="${pkgdir}/" install install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/zsh/zsh.install b/extra/zsh/zsh.install index 8e54d92ee..a2aafa252 100644 --- a/extra/zsh/zsh.install +++ b/extra/zsh/zsh.install @@ -1,12 +1,5 @@ -infodir=usr/share/info -filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6) - post_install() { - grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells } post_upgrade() { @@ -14,9 +7,5 @@ post_upgrade() { } pre_remove() { - sed -i '/^\/bin\/zsh/d' etc/shells - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells } diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD index c07603a1c..7c87dc2b9 100644 --- a/extra/zvbi/PKGBUILD +++ b/extra/zvbi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184458 2013-05-06 19:40:33Z foutrelis $ +# $Id: PKGBUILD 187081 2013-06-03 11:17:17Z allan $ # Maintainer: # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=zvbi pkgver=0.2.33 -pkgrel=5 +pkgrel=6 pkgdesc="VBI capture and decoding library" url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" arch=('i686' 'x86_64' 'mips64el') @@ -35,4 +35,9 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin/ + rmdir usr/sbin } diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index ca6fbb0fa..3ea34ec08 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ +# $Id: PKGBUILD 188067 2013-06-08 08:17:48Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '558743403ba219c51570d29e03d362d5' '7985f1e2cdb6838cf89bd85c0229db6a' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' @@ -117,14 +117,16 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install mkinitcpio preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index a5e974c9b..4fcf06d11 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.9.4-1-LIBRE-PAE +KERNEL_VERSION= # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 7ae0ec08c..2291b6f45 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ +# $Id: PKGBUILD 188067 2013-06-08 08:17:48Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '558743403ba219c51570d29e03d362d5' '8cc2a43c771d0fbb652c8264c746c007' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' @@ -117,14 +117,16 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install mkinitcpio preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 2bde797ef..4b7373be1 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.9.4-1-LIBRE-XEN +KERNEL_VERSION= # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD deleted file mode 100644 index 430ab93d5..000000000 --- a/libre-testing/libretools/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# Maintainer: Joshua Haase <hahj87@gmail.com -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: fauno <fauno@kiwwwi.com.ar> - -pkgbase=libretools -pkgname=(libretools libretools-mips64el) -pkgdesc="Programs for Parabola development" -url="https://projects.parabolagnulinux.org/packages/libretools.git/" -license=('GPL3' 'GPL2') - -pkgver=20130528.2 -_libretools_commit=e5c22aaf01484e7fa5926952bbcacd56228dbb64 -_devtools_commit=d197eacf8b7aba0796a0f6ac6ac1667564bd614e - -_packages_url=https://projects.parabolagnulinux.org/packages -source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 - $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) - -pkgrel=1 -arch=('any') -makedepends=(emacs) # emacs --batch is used during the build to process text -checkdepends=(sh-roundup) - -build() { - cd "$srcdir" - ln -sf devtools-par-$_devtools_commit devtools-par - cd "$srcdir/$pkgbase-$_libretools_commit" - make build-libretools build-libretools-mips64el build-doc -} - -check() { - cd "$srcdir/$pkgbase-$_libretools_commit" - - # some tests require 'sudo'; trick those into passing - mkdir "$srcdir/bin" - ln -s $(which true) "$srcdir/bin/sudo" - _PATH=$PATH - export PATH="$srcdir/bin:$PATH" - - make check - - export PATH=$_PATH -} - -package_libretools() { - backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) - install=libretools.install - replaces=(chroottools) - - depends=( - arch-install-scripts # `archroot` uses `pacstrap` - git # `createworkdir` - openssh # `librerelease` - rsync # `librerelease` and `makechrootpkg.sh` - subversion # `diff-unfree` - tokyocabinet # `treepkg` - wget # `aur` and `lib/blacklist.sh` - ) - optdepends=('namcap: to check package files') - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools install-doc DESTDIR="$pkgdir" -} - -package_libretools-mips64el() { - pkgdesc="Scripts for Parabola development (for mips64el architecture)" - backup=('etc/libretools.d/mips64el.conf') - depends=("$pkgbase=$pkgver") - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools-mips64el DESTDIR="$pkgdir" -} - -md5sums=('47ff5308a56dd8ae2cf18b82a99b0021' - '05b987e6b39c963154489ac6d01d0965') diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install deleted file mode 100644 index ff6a238fe..000000000 --- a/libre-testing/libretools/libretools.install +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' - -# arg 1: the new package version -post_install() { - if grep -q 'libre::' etc/makepkg.conf; then - libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" - else - libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" - printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf - fi -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - post_install -} - -pre_remove() { - if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then - libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" - sed -i '/libre::/d' - else - libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" - fi -} diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index 248da54c7..30ef5cec2 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgbase=abiword pkgbase=abiword-libre pkgname=('abiword-libre' 'abiword-libre-plugins') pkgver=2.8.6 -pkgrel=9 +pkgrel=9.1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.abisource.com" diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD index 1abcd02dc..259cf007f 100644 --- a/libre/abs-libre/PKGBUILD +++ b/libre/abs-libre/PKGBUILD @@ -1,48 +1,51 @@ -# $Id: PKGBUILD 134858 2011-08-08 04:45:57Z allan $ +# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $ # Maintainer: Allan McRae <allan@archlinux.org> _pkgname=abs pkgname=abs-libre #CARCH=mips64el -pkgver=2.4.3 -pkgrel=3 +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) -md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd') +source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' + 'a628f7d5b1cd1e838366b88709690c24') provides=("${_pkgname}=${pkgver}") replaces=("${_pkgname}") conflicts=("${_pkgname}") build() { - cd ${srcdir}/${_pkgname} + cd "$_pkgname-$pkgver" - make prefix=/usr sysconfdir=/etc prepare - make DESTDIR=${pkgdir} install + make +} + +package() { + cd "$_pkgname-$pkgver" + + make DESTDIR="${pkgdir}" install # Add readme file, and make base /var/abs path - install -dm0755 ${pkgdir}/var/abs/local/ - install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README + 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 - case $CARCH in - "i686") - sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf - ;; - "x86_64") - sed -i '/ARCH=/s|i686|x86_64|' ${pkgdir}/etc/abs.conf - ;; - "mips64el") + 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 - ;; - esac + fi } - diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD index 07dc6e87c..81db4af67 100644 --- a/libre/audio-convert-libre/PKGBUILD +++ b/libre/audio-convert-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Igor Galic <i.galic@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=audio-convert pkgname=audio-convert-libre pkgver=0.3.1.1 -pkgrel=6 -pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma (without nonfree faac recommendation)" +pkgrel=7 +pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma, without nonfree faac recommendation" arch=('any') url="http://freshmeat.net/projects/audio-convert" license=('GPL') @@ -23,8 +23,11 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2) -md5sums=('0c6b61bc96be4c9879f85b000192f3fd') +sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b') package() { install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname" + +#FS#29260 fix + sed -i '46 s/^/#/' "$pkgdir/usr/bin/$_pkgname" } diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 2dc83cb5e..a00a75488 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=1 +pkgrel=2 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") diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index f226b76fd..e9dbc1f62 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -11,7 +11,7 @@ else _spndesc='' fi epoch=8 -pkgver=2.67a +pkgver=2.67b _jpgver=1.5 _pyver=3.3 pkgrel=1 @@ -59,10 +59,10 @@ conflicts=${_pkgname%-$_pkgflag} replaces=${_pkgname%-$_pkgflag} install=$_pkgname.install source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz -sha512sums=1336ed00ab51c581ab5b8ef6ace04b3684290b287745de3260e4072e3527501bf62472057c4c521533678b2529b7d0c2dca93d0ca3854e29d82443a78d5c4061 +sha512sums=d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525 prepare() { - mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build + mkdir $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build } build() { @@ -70,7 +70,7 @@ build() { [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' - setarch $CARCH cmake ..\ + cmake ..\ -DCMAKE_BUILD_TYPE=Release\ -DCMAKE_INSTALL_PREFIX=/usr\ -DOPENIMAGEIO_ROOT_DIR=/usr\ @@ -96,16 +96,15 @@ build() { -DWITH_PYTHON_INSTALL=OFF\ -DWITH_SYSTEM_GLEW=ON - setarch $CARCH make $MAKEFLAGS - setarch $CARCH make + make $MAKEFLAGS + make } package() { cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build - setarch $CARCH make DESTDIR=$pkgdir install - setarch $CARCH python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag} - # drop nonfree povray render support - rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray + make DESTDIR=$pkgdir install + rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray # drop nonfree povray render support + python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag} || return 0 } # vim:set ts=2 sw=2 et: diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD index 4cd8c2927..ef25ff8ff 100644 --- a/libre/bogofilter-libre/PKGBUILD +++ b/libre/bogofilter-libre/PKGBUILD @@ -1,33 +1,29 @@ -# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $ +# $Id: PKGBUILD 183193 2013-04-18 17:14:00Z andyrtr $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Low Kian Seong <fastmail_low@speedymail.org> _pkgname=bogofilter pkgname=bogofilter-libre -pkgver=1.2.2 -pkgrel=5.2 -pkgdesc="A fast Bayesian spam filtering tool" +pkgver=1.2.3 +pkgrel=1 +pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://bogofilter.sourceforge.net" depends=('db' 'perl' 'gsl') backup=('etc/bogofilter/bogofilter.cf') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz) -md5sums=('af9c7857c66b1884c820f54f23082701') +source=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2) +md5sums=('c3ed7f483b83abcbf6d8c797084bd06e') provides=("${_pkgname}=${pkgver}") replaces=("${_pkgname}") conflicts=("${_pkgname}") -mksource() { - [ -f ${_pkgname}-${pkgver}.tar.bz2 ] || wget http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2 - tar xf ${_pkgname}-${pkgver}.tar.bz2 - # Remove noncommercial files. - rm ${_pkgname}-${pkgver}/doc/bogofilter-SA-{2005-0{1,2},2010-01} - tar cJf ${pkgname}-${pkgver}.tar.xz ${_pkgname}-${pkgver} -} - build() { cd "${srcdir}/${_pkgname}-${pkgver}" + + # Remove noncommercial files. + rm doc/bogofilter-SA-{2005-0{1,2},2010-01} + ./configure --prefix=/usr \ --sysconfdir=/etc/bogofilter \ --localstatedir=/var \ diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index b88e9d544..c52f3e673 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=bumblebee pkgname=bumblebee-libre pkgver=3.2.1 -pkgrel=1 +pkgrel=3 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" arch=('i686' 'x86_64' 'mips64el') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -47,6 +47,7 @@ build() { ./configure \ CONF_DRIVER=nouveau \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --without-pidfile @@ -60,6 +61,7 @@ package() { # Install systemd unit install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" + sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" # Make bash_completion work mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun" diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index f7dfe3489..2057bf70b 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91579 2013-05-24 14:55:19Z dwallace $ +# $Id: PKGBUILD 92904 2013-06-18 12:33:10Z andrea $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,8 +9,8 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.32 -pkgrel=1 +pkgver=0.9.35 +pkgrel=2 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -19,7 +19,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 'python2-imaging' 'shared-mime-info' 'python2-dnspython' - 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' + 'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect') makedepends=('python2-pycountry' 'qt4-private-headers') optdepends=('ipython2: to use calibre-debug') @@ -30,11 +30,10 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('3b1c89a84872df900b9cfb706027df67' +md5sums=('070aa5c1da33fb2ba9a2c0150d7a55c5' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') - prepare(){ cd "${srcdir}/${_pkgname}" #rm -rf src/{cherrypy,pyPdf} @@ -60,7 +59,9 @@ build() { LANG='en_US.UTF-8' python2 setup.py build # LANG='en_US.UTF-8' python2 setup.py resources - LANG='en_US.UTF-8' python2 setup.py translations + + # Don't build translations since building them is broken badly + # LANG='en_US.UTF-8' python2 setup.py translations } package() { diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 8ea0dbba7..00f097046 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $ +# $Id: PKGBUILD 92742 2013-06-14 12:09:51Z tpowa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -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=45 +pkgrel=46 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/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index af8125f1f..75cf2c1bd 100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=cdrkit pkgname=cdrkit-libre pkgver=1.1.11 -pkgrel=2.4 +pkgrel=3 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)" arch=('i686' 'x86_64' 'mips64el') url="http://cdrkit.org/" @@ -19,11 +19,16 @@ replaces=('cdrkit' 'cdrtools') source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz) md5sums=('efe08e2f3ca478486037b053acd512e9') -build() { +prepare() { cd "$srcdir/$_pkgname-$pkgver" + sed -i "s#sbin#bin#" netscsid/CMakeLists.txt # Remove nonfree apple_driver utility rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}} +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" make } diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 2db7dbbc5..b9088a4ff 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92066 2013-05-31 05:55:37Z fyan $ +# $Id: PKGBUILD 92845 2013-06-17 02:16:42Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.2.0 +pkgver=3.2.2 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 } -sha512sums=('e96b874fd53c771535098c1077200b5ab88aa628383f7af56f861c952a534283942ce34647f279bf4229bfc3a0114f81a7ae3deca4e8e7931d7551fdb75c68c0' - '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' - '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') +md5sums=('bea9522b2b008ffe4eeb0c7156753899' + 'fe4a243fabe24608f5c05e40f0f118f6' + 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD index 2a0ce65ce..d9a171e10 100644 --- a/libre/claws-mail-libre/PKGBUILD +++ b/libre/claws-mail-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 188143 2013-06-10 13:35:31Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=claws-mail-libre _pkgflag=libre _pkgname=${pkgname%-$_pkgflag} -pkgver=3.9.1 -pkgrel=3 +pkgver=3.9.2 +pkgrel=1 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support' arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -40,7 +40,7 @@ provides=("$_pkgname=$pkgver" 'claws') options=(!libtool) install=$_pkgname.install source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('8adc734912ff1b83545cb12850100473' +md5sums=('90de2a265e65fbd9dffdbf428bb0ee28' 'SKIP') build() { diff --git a/libre/claws-mail-libre/claws-mail.install b/libre/claws-mail-libre/claws-mail.install index 94313db3a..4d2f155d4 100644 --- a/libre/claws-mail-libre/claws-mail.install +++ b/libre/claws-mail-libre/claws-mail.install @@ -1,5 +1,5 @@ post_install() { - echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins" + echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin" gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q } @@ -13,3 +13,4 @@ post_remove() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q } + diff --git a/libre/devtools-legacy/PKGBUILD b/libre/devtools-legacy/PKGBUILD new file mode 100644 index 000000000..2ff4cbc42 --- /dev/null +++ b/libre/devtools-legacy/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=devtools-legacy +_pkgname=devtools +pkgver=20130408 +pkgrel=1 +pkgdesc='Tools for Arch Linux package maintainers (legacy)' +arch=('any') +license=('GPL') +url='http://projects.archlinux.org/devtools.git/' +depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts') +conflicts=$_pkgname +source=("ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + "ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz.sig") +md5sums=('12b42b429744af6517ae789f728e9f63' + 'SKIP') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + make PREFIX=/usr +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + make PREFIX=/usr DESTDIR=${pkgdir} install +} + diff --git a/libre/distcc-nozeroconf/PKGBUILD b/libre/distcc-nozeroconf/PKGBUILD new file mode 100644 index 000000000..2537b2f87 --- /dev/null +++ b/libre/distcc-nozeroconf/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +_pkgname=distcc +pkgname=distcc-nozeroconf +pkgver=3.1 +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +pkgrel=11 +pkgdesc="A distributed C, C++, Obj C compiler (without zeroconf support)" +arch=('i686' 'x86_64') +url="http://code.google.com/p/distcc/" +license=('GPL') +depends=('gcc' 'popt') +makedepends=('gtk2' 'pkgconfig' 'python2') +optdepends=('gtk2: for distccmon-gnome' + 'python2') +backup=('etc/conf.d/distccd' + 'etc/distcc/hosts') +source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2 + distccd.conf.d + distccd.service) +md5sums=('a1a9d3853df7133669fffec2a9aab9f3' + '239aae53250e3e35288cba566bc0bbf1' + '09f0688da9c1840e518d2593bd5c3830') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --with-gtk \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --without-avahi + + make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2 +} + +check() { + cd "${srcdir}/${_pkgname}-${pkgver}" +# make TEST_PYTHON=/usr/bin/python2 check +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install + install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd + + install -d ${pkgdir}/usr/lib/${_pkgname}/bin + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++ + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++ + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp + + install -Dm0644 $srcdir/distccd.service $pkgdir/usr/lib/systemd/system/distccd.service +} diff --git a/libre/distcc-nozeroconf/distccd.conf.d b/libre/distcc-nozeroconf/distccd.conf.d new file mode 100644 index 000000000..2fe7a4cc6 --- /dev/null +++ b/libre/distcc-nozeroconf/distccd.conf.d @@ -0,0 +1,7 @@ +# +# Parameters to be passed to distccd +# +# You must explicitly add IPs (or subnets) that are allowed to connect, +# using the --allow switch. See the distccd manpage for more info. +# +DISTCC_ARGS="--allow 127.0.0.1" diff --git a/libre/distcc-nozeroconf/distccd.service b/libre/distcc-nozeroconf/distccd.service new file mode 100644 index 000000000..0b72fecc3 --- /dev/null +++ b/libre/distcc-nozeroconf/distccd.service @@ -0,0 +1,12 @@ +[Unit] +Description=A distributed C/C++ compiler +Documentation=man:distccd(1) +After=network.target + +[Service] +User=nobody +EnvironmentFile=/etc/conf.d/distccd +ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD index fb47a8fad..120eda3b2 100644 --- a/libre/ecasound-libre/PKGBUILD +++ b/libre/ecasound-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 180827 2013-03-26 13:29:04Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -7,13 +7,12 @@ _pkgname=ecasound pkgname=ecasound-libre pkgver=2.9.0 -pkgrel=2.1 -pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)" +pkgrel=3 +pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.eca.cx/ecasound/" license=('GPL' 'LGPL') -depends=('audiofile' 'liblo' - 'liboil' 'lilv') +depends=('audiofile' 'liblo' 'liboil' 'lilv') makedepends=('python2' 'ruby') optdepends=('python2: ecamonitor, ECI API' 'ruby: ECI API' @@ -27,14 +26,16 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver options=('!libtool') -source=(http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz) -md5sums=('05e7d4664cdf4c7a138c098e9506a551') +source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz" + 'ruby2.patch') +md5sums=('05e7d4664cdf4c7a138c098e9506a551' + '6909dbd4f67f76d3bd31ce7c7fe16212') build() { cd "$srcdir/$_pkgname-$pkgver" - # use vendor_ruby for ruby files - sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure + # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files + patch -Np1 -i "$srcdir/ruby2.patch" PYTHONPATH=/usr/bin/python2 ./configure \ --prefix=/usr \ diff --git a/libre/ecasound-libre/ruby2.patch b/libre/ecasound-libre/ruby2.patch new file mode 100644 index 000000000..d55f12140 --- /dev/null +++ b/libre/ecasound-libre/ruby2.patch @@ -0,0 +1,12 @@ +diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure +--- ecasound-2.9.0.orig/configure 2013-03-26 17:14:51.759045636 +0800 ++++ ecasound-2.9.0/configure 2013-03-26 17:15:50.502060731 +0800 +@@ -6535,7 +6535,7 @@ + rubyecasound_support=no + ECA_S_RUBY_SITEDIR="" + else +- ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" ++ ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" + fi + + diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index eac7300d4..60fa5924b 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem -pkgver=2013.03 +pkgver=2013.05 pkgrel=2 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') @@ -21,26 +21,6 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' 'locale.sh') -md5sums=('7b8e40f8f793e60f471511641bb1c9f2' - '6be47d893fd49b2e4a8c0e811b350861' - '9e4533df61f0c82d6b2e2371f7376282' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '1cfd310dff0804a7d21958487c32a3b1' - '2ef2429c2c98d0883906aa6f5363be80' - '693c97f2c9a519bb97a17008e92c2b74' - '1745349eb24ed21b4cfaa6f423bddb76' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - 'f45389e116ab0b9e9968287617d27c7d' - 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130' - 'd5732ffdb3488e1383d4ea199343e767' - '3807d07215d9116331fe1cf8feeaa0f8') build() { cd ${srcdir} @@ -90,7 +70,7 @@ package() { # # setup /usr hierarchy # - for d in bin include lib sbin share/misc src; do + for d in bin include lib share/misc src; do install -d -m755 usr/${d} done for d in $(seq 8); do @@ -112,6 +92,13 @@ package() { ) # + # add bin symlinks + # + ln -s usr/bin ${pkgdir}/bin + ln -s usr/bin ${pkgdir}/sbin + ln -s bin ${pkgdir}/usr/sbin + + # # install parabola(7) manpage # install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7 @@ -124,3 +111,23 @@ package() { done ln -s ../man usr/local/share/man } +md5sums=('7b8e40f8f793e60f471511641bb1c9f2' + '6be47d893fd49b2e4a8c0e811b350861' + '9e4533df61f0c82d6b2e2371f7376282' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '1cfd310dff0804a7d21958487c32a3b1' + '2ef2429c2c98d0883906aa6f5363be80' + '693c97f2c9a519bb97a17008e92c2b74' + '1745349eb24ed21b4cfaa6f423bddb76' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + 'f45389e116ab0b9e9968287617d27c7d' + '0b6f835598c7640184e476057b3c7722' + 'a8a962370cd0128465d514e6a1f74130' + 'd5732ffdb3488e1383d4ea199343e767' + '3807d07215d9116331fe1cf8feeaa0f8') diff --git a/libre/filesystem/profile b/libre/filesystem/profile index 3bc22db9f..59d0abc83 100644 --- a/libre/filesystem/profile +++ b/libre/filesystem/profile @@ -4,7 +4,7 @@ umask 022 # Set our default path -PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin" +PATH="/usr/local/sbin:/usr/local/bin:/usr/bin" export PATH # Load profiles from /etc/profile.d diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD index 73a7af6c4..eeb26a639 100644 --- a/libre/foomatic-filters-libre/PKGBUILD +++ b/libre/foomatic-filters-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 185778 2013-05-18 16:33:20Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgbase="foomatic" pkgname=('foomatic-filters-libre') arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20120712 +_snapdate=20130518 _filtersver=4.0.17 pkgver=${_filtersver}_${_snapdate} pkgrel=1 @@ -18,7 +18,7 @@ md5sums=('b05f5dcbfe359f198eef3df5b283d896') package_foomatic-filters-libre() { - pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format." + pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format, without nonfree scripts" # arch=('i686' 'x86_64') license=('GPL') backup=(etc/foomatic/filter.conf) @@ -30,6 +30,7 @@ package_foomatic-filters-libre() { 'net-snmp: certain (mostly HP) printers need it to work') cd ${srcdir}/foomatic-filters-${_filtersver} + # remove nonfree scripts rm -rfv test/{lsbfuncs,shfuncs,tcm,tetapi}.sh ./configure --prefix=/usr --sysconfdir=/etc make diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD index 8df68e2b6..6a07966b2 100644 --- a/libre/gnormalize-libre/PKGBUILD +++ b/libre/gnormalize-libre/PKGBUILD @@ -1,5 +1,6 @@ -# $Id$ -# Maintainer: Chris Brannon <cmbrannon79@gmail.com> +# $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor:JZsolt Varadi (karmaxxl) # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,13 +8,13 @@ _pkgname=gnormalize pkgname=gnormalize-libre pkgver=0.63 -pkgrel=4 -pkgdesc="An audio normalizer, converter, encoder/decoder, ripper, tagger and player (without nonfree faac and mac recommendation)" -arch=(any) -url="http://gnormalize.sourceforge.net/" +pkgrel=5 +pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation' +arch=('any') +url='http://gnormalize.sourceforge.net/' license=('GPL') -depends=(perl cddb_get desktop-file-utils gtk2-perl hicolor-icon-theme) -makedepends=('xz') +depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme') +makedepends=('xz' 'gendesk') optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer' 'lame: MP3 encoding' 'mpg321: MP3 playing' @@ -29,26 +30,33 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver install=gnormalize.install -source=(http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz - gnormalize.desktop) -md5sums=('25ca7520731e61a8b7f4b7fa61928d54' '81c6dffab2139816919842e042705884') +source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz") +sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6') -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - install -Dm755 gnormalize "${pkgdir}/usr/bin/gnormalize" +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + + gendesk -n --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --mimetypes \ + 'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg' lzma -qd gnormalize.1.lzma - install -Dm644 gnormalize.1 "${pkgdir}/usr/share/man/man1/gnormalize.1" - install -d "${pkgdir}/usr/share/gnormalize/animations" - install -m644 animations/*.gif "${pkgdir}/usr/share/gnormalize/animations/" - install -Dm644 README "${pkgdir}/usr/share/doc/gnormalize/README" - install -Dm644 icons/gnormalize.png \ - "${pkgdir}/usr/share/pixmaps/gnormalize.png" +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname" + install -Dm644 "$_pkgname.1" "$pkgdir/usr/share/man/man1/$_pkgname.1" + install -d "$pkgdir/usr/share/$_pkgname/animations" + install -m644 animations/*.gif "$pkgdir/usr/share/$_pkgname/animations/" + install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README" + install -Dm644 "icons/$_pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$_pkgname.png" for i in 16 32 48 ; do - install -Dm644 icons/gnormalize-${i}.png \ - "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/gnormalize.png" + install -Dm644 "icons/gnormalize-$i.png" \ + "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$_pkgname.png" done - install -Dm644 "${srcdir}/gnormalize.desktop" \ - "${pkgdir}/usr/share/applications/gnormalize.desktop" + install -Dm644 "$_pkgname.desktop" \ + "$pkgdir/usr/share/applications/$_pkgname.desktop" } # vim:set ts=2 sw=2 et: diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD index 6c2afd3a8..dd7940c2c 100644 --- a/libre/grub-legacy/PKGBUILD +++ b/libre/grub-legacy/PKGBUILD @@ -7,7 +7,7 @@ pkgname=grub-legacy _srcname=grub pkgver=0.97 -pkgrel=24 +pkgrel=25 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)" arch=('i686' 'x86_64') license=('GPL') @@ -80,10 +80,10 @@ build() { patch -Np1 -i ../040_all_grub-0.96-nxstack.patch # patch from frugalware to make it boot when more than 2GB ram installed patch -Np1 -i ../05-grub-0.97-initrdaddr.diff - CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ + CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \ --mandir=/usr/share/man --infodir=/usr/share/info else - CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ + CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \ --mandir=/usr/share/man --infodir=/usr/share/info fi } @@ -94,6 +94,6 @@ package() { CFLAGS= make make DESTDIR=${pkgdir} install install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst - install -D -m755 ../install-grub ${pkgdir}/sbin/install-grub + install -D -m755 ../install-grub ${pkgdir}/usr/bin/install-grub } diff --git a/libre/grub/20_memtest86+ b/libre/grub/20_memtest86+ deleted file mode 100644 index 1d3096f6b..000000000 --- a/libre/grub/20_memtest86+ +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e -######################################################## -# This script generates a memtest86+ entry on grub.cfg # -# if memtest is installed on the system. # -######################################################## - -prefix="/usr" -exec_prefix="${prefix}" - -datarootdir="/usr/share" -datadir="${datarootdir}" - -. "${datadir}/grub/grub-mkconfig_lib" - -MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" -CLASS="--class memtest86 --class gnu --class tool" - -if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then - # image exists, create menu entry - echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 - cat << EOF -menuentry "Memory test (memtest86+)" $CLASS { -EOF - prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" - cat << EOF - linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` -} -EOF -fi diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+ new file mode 100644 index 000000000..086f0cc84 --- /dev/null +++ b/libre/grub/60_memtest86+ @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +######################################################## +# This script generates a memtest86+ entry on grub.cfg # +# if memtest is installed on the system. # +######################################################## + +prefix="/usr" +exec_prefix="${prefix}" + +datarootdir="/usr/share" +datadir="${datarootdir}" + +. "${datadir}/grub/grub-mkconfig_lib" + +MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" +CLASS="--class memtest86 --class gnu --class tool" + +if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then + ## image exists, create menu entry + echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2 + _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})" + _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})" + _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})" + cat << EOF +if [ "\${grub_platform}" == "pc" ]; then + menuentry "Memory Tester (memtest86+)" ${CLASS} { + search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID} + linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86} + } +fi +EOF +fi diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 3969d713a..522c1517d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -9,11 +9,11 @@ _grub_915_ver=9 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') pkgbase=grub pkgver=2.00 -pkgrel=2 +pkgrel=5 url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') -makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' +makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" @@ -23,10 +23,21 @@ source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" 'parabola_grub_mkconfig_fixes.patch' 'grub.default' 'grub.cfg' - '20_memtest86+' + '60_memtest86+' 'grub_bzr_export.sh' '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch' 'grub-2.00-fix-docs.patch') +md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' + '704ea9f250b6137f05fa0197fd07053a' + '77f7d5f8ce395663cd7fff4d37099957' + 'a80e2b1d3bab778c3b6117d5a698992f' + 'c776aaf2cc35488a7c531b59e697470d' + '52d374e0194e3f2e39ff7c92ecd58a6c' + '255eafb440b8c285b20431366c2d2d27' + 'be55eabc102f2c60b38ed35c203686d6' + 'f343ed2340ebc86c427873641bb72419' + 'ab751d1d8cd3fd47e5ee24d71ecc31ed' + '342dd18472a24e5fd252458b24f39a29') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" @@ -181,7 +192,9 @@ build() { package_grub-common() { pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)" - depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse') + depends=('sh' 'xz' 'gettext' 'device-mapper') + optdepends=('freetype2: for grub-mkfont usage' + 'fuse: for grub-mount usage') conflicts=('grub-legacy' 'grub') replaces=('grub2-common') provides=('grub2-common') @@ -197,7 +210,7 @@ package_grub-common() { echo ## install extra /etc/grub.d/ files - install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" + install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" ## install /etc/default/grub (used by grub-mkconfig) install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" @@ -253,14 +266,3 @@ package_grub-efi-i386() { rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true } -md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' - '704ea9f250b6137f05fa0197fd07053a' - '77f7d5f8ce395663cd7fff4d37099957' - 'a80e2b1d3bab778c3b6117d5a698992f' - 'c776aaf2cc35488a7c531b59e697470d' - '52d374e0194e3f2e39ff7c92ecd58a6c' - '255eafb440b8c285b20431366c2d2d27' - '9b6358d3de5c4bb95a041ab7c44a21ec' - 'f343ed2340ebc86c427873641bb72419' - 'ab751d1d8cd3fd47e5ee24d71ecc31ed' - '342dd18472a24e5fd252458b24f39a29') diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 1195912e8..156525eef 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186011 2013-05-20 13:11:55Z tomegun $ +# $Id: PKGBUILD 188624 2013-06-17 06:29:16Z tpowa $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -6,7 +6,7 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname="gummiboot" -pkgver="31" +pkgver="33" pkgrel="1" pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 62bca0307..d5a72e95c 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184487 2013-05-07 13:27:00Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): MichaÅ‚ MasÅ‚owski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.10.3 +pkgver=4.10.4 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=('c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08' +sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d' '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 6d3291252..4b6f40af9 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184473 2013-05-07 13:26:42Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.10.3 +pkgver=4.10.4 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=('22869b2ee7eb4b5b341a6d596dd904c0b0b812d1' +sha1sums=('f406c8c9e42c2508a7acf88b9719f5fa5b4683a1' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 96c8530a3..ea698dfd7 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185044 2013-05-10 17:08:02Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.10.3 -pkgrel=3 +pkgver=4.10.4 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -23,31 +23,24 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'qt4.patch' - 'security-fix.patch' 'fix-xfreepixmap-call.patch' 'khtml-fsdg.diff') -sha1sums=('aa154998e227121be82f5b04442e908e7dece01b' +sha1sums=('b5db1b91bd96b44ebd1b5e71019bb95b59775237' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - '506562009a667f18481be0d2c5035b181fce38bb' - '556c5473219d8208ec920f46c08bf61fda5b60d9' 'a1502a964081ad583a00cf90c56e74bf60121830') -build() { - cd ${_pkgname}-${pkgver} +prepare() { + cd "${srcdir}"/${_pkgname}-${pkgver} # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch # qmake refers to Qt5 patch -p1 -i "${srcdir}"/qt4.patch # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff +} - # KDEBUG#319428 - patch -p1 -i "${srcdir}"/security-fix.patch - # KDEBUG#319137 - patch -p1 -i "${srcdir}"/fix-xfreepixmap-call.patch - - cd ../ - +build() { + cd "${srcdir}" mkdir build cd build cmake ../${_pkgname}-${pkgver} \ diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 463f69c88..89ed6edf3 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 184589 2013-05-07 13:30:07Z andrea $ +# $Id: PKGBUILD 188552 2013-06-15 11:11:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.10.3 -pkgrel=1 +pkgver=4.10.4 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -14,13 +14,13 @@ groups=('kde' 'kdenetwork') makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' - 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') + 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d' +sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') -build() { +prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch cd ../ @@ -28,7 +28,9 @@ build() { sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" sed 's/, Skype//' -i "${pkgbase}-${pkgver}/doc/kopete/index.docbook" +} +build() { mkdir build cd build cmake ../${pkgbase}-${pkgver} \ @@ -46,7 +48,7 @@ build() { package_kdenetwork-kopete-libre() { pkgdesc='Instant Messenger, without skype support' depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' - 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') + 'libidn' 'qimageblitz' 'libgadu') conflicts=('kdenetwork-kopete') provides=("kdenetwork-kopete=${pkgver}") replaces=('kdenetwork-kopete') diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 7ed1b1a01..007ed7f74 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185074 2013-05-10 20:52:59Z tomegun $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -22,8 +22,8 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -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=('78ca9b822f905355ec00142a7de6c08c38b97c08') +sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3') build() { mkdir build diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 90921bb7d..6b7a264ae 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184594 2013-05-07 13:30:17Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.10.3 +pkgver=4.10.4 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=('26437751ddf6f466a948a402f253f66bfc19660e' +sha1sums=('3b98f04817a31b14b8899ddf024b03ff14420ea7' 'a0a836950f185d9b2245204579f969203036fdec') build() { diff --git a/libre/libretools-legacy/PKGBUILD b/libre/libretools-legacy/PKGBUILD new file mode 100644 index 000000000..59e383449 --- /dev/null +++ b/libre/libretools-legacy/PKGBUILD @@ -0,0 +1,100 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> +# Maintainer: Joshua Haase <hahj87@gmail.com +# Contributor: fauno <fauno@kiwwwi.com.ar> + +pkgbase=libretools +pkgname=(libretools-legacy libretools-legacy-pr libretools-legacy-mips64el) +pkgver=20120924 +pkgrel=1 +pkgdesc="Programs for Parabola development (legacy)" +arch=('any') +url="http://parabolagnulinux.org" +license=('GPL3+') +depends=(openssh rsync git wget devtools-legacy) +install=libretools-legacy.install +source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-v$pkgver.tar) +md5sums=(dfb8cb24d3deda29178d0fdc20b0e4bd) +conflicts=libretools + +package_libretools-legacy() { + backup=(etc/libretools.conf) + + cd $srcdir/$pkgbase-v$pkgver + + # fixing librebasebuilder librechroot libremakepkg !!!NEED MORE PATCH for makechrootpkg -d and mkarchroot -n!!! + # more info in: + # https://projects.archlinux.org/devtools.git/commit/?id=abba9f07a6d703cd97fc2d2bbd397072d5bf796d + # https://projects.archlinux.org/devtools.git/commit/?id=453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1 + #sed -i 's|makechrootpkg -d -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|makechrootpkg -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|; + # s|mkarchroot -n|mkarchroot|; + # s|mkarchroot -r "/clean" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "/clean"|; + # s|mkarchroot -r "bash" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "bash"|; + # s|mkarchroot -u "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" pacman -Syu --noconfirm|; + # ' librebasebuilder librechroot libremakepkg + + install -d ${pkgdir}/etc/libretools.d + install -m644 libretools.conf ${pkgdir}/etc/ + + install -d ${pkgdir}/usr/bin + install -m755 abslibre-commit ${pkgdir}/usr/bin + install -m755 add-mips64el ${pkgdir}/usr/bin + install -m755 aur ${pkgdir}/usr/bin + install -m755 buildenv ${pkgdir}/usr/bin + install -m755 chcleanup ${pkgdir}/usr/bin + install -m755 createworkdir ${pkgdir}/usr/bin + install -m755 diff-unfree ${pkgdir}/usr/bin + install -m755 fullpkg ${pkgdir}/usr/bin + install -m755 fullpkg-build ${pkgdir}/usr/bin + install -m755 fullpkg-find ${pkgdir}/usr/bin + install -m755 is_built ${pkgdir}/usr/bin + install -m755 is_unfree ${pkgdir}/usr/bin + install -m755 lb ${pkgdir}/usr/bin + install -m755 libreaddiff ${pkgdir}/usr/bin + install -m755 librebasebuilder ${pkgdir}/usr/bin + install -m755 librechroot ${pkgdir}/usr/bin + install -m755 librecommit ${pkgdir}/usr/bin + install -m755 librediff ${pkgdir}/usr/bin + install -m755 libremakepkg ${pkgdir}/usr/bin + install -m755 libremessages ${pkgdir}/usr/bin + install -m755 libremkchroot ${pkgdir}/usr/bin + install -m755 librerelease ${pkgdir}/usr/bin + install -m755 librerepkg ${pkgdir}/usr/bin + install -m755 librestage ${pkgdir}/usr/bin + install -m755 pkgbuild-check-nonfree ${pkgdir}/usr/bin + install -m755 toru ${pkgdir}/usr/bin + install -m755 toru-path ${pkgdir}/usr/bin + install -m755 toru-utils ${pkgdir}/usr/bin + install -m755 toru-where ${pkgdir}/usr/bin + install -m755 updateabslibre ${pkgdir}/usr/bin + install -m755 update-cleansystem ${pkgdir}/usr/bin + + install -d ${pkgdir}/usr/share/pacman + install -m755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman +} + +package_libretools-legacy-pr() { + backup=('etc/libretools.d/prtools.conf') + + cd $srcdir/$pkgbase-v$pkgver + + install -d ${pkgdir}/etc/libretools.d + install -m644 prtools/prtools.conf ${pkgdir}/etc/libretools.d + + install -d ${pkgdir}/usr/bin + install -m755 prtools/prfullpkg ${pkgdir}/usr/bin + install -m755 prtools/prmipsrelease ${pkgdir}/usr/bin + install -m755 prtools/prtoru ${pkgdir}/usr/bin +} + +package_libretools-legacy-mips64el() { + backup=('etc/libretools.d/mips64el.conf') + + cd $srcdir/$pkgbase-v$pkgver + + install -d ${pkgdir}/etc/libretools.d + install -m755 mips64el/mips64el.conf ${pkgdir}/etc/libretools.d + + install -d ${pkgdir}/usr/bin + install -m755 mips64el/mips-add ${pkgdir}/usr/bin + install -m755 mips64el/mipsrelease ${pkgdir}/usr/bin +} diff --git a/libre/libretools-legacy/libretools-legacy.install b/libre/libretools-legacy/libretools-legacy.install new file mode 100644 index 000000000..3ede1f904 --- /dev/null +++ b/libre/libretools-legacy/libretools-legacy.install @@ -0,0 +1,28 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + cat <<EOF +Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide +and follow instructions there before using libretools. + +If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg +and install libretools-\$arch if avaliable + +EOF + update-cleansystem +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + cat <<EOF +Check your /etc/libretools.conf, it has changed substantially. + +If using fullpkg, you should install libretools-\$arch if avaliable + +EOF + update-cleansystem +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 9f67689df..49dc7feb2 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -1,41 +1,68 @@ # Maintainer: Joshua Haase <hahj87@gmail.com # Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Márcio Silva <coadde@lavabit.com> pkgbase=libretools pkgname=(libretools libretools-mips64el) -pkgver=20130117 pkgdesc="Programs for Parabola development" -url="https://projects.parabolagnulinux.org/libretools.git/" -license=('GPL3+' 'GPL2') +url="https://projects.parabolagnulinux.org/packages/libretools.git/" +license=('GPL3' 'GPL2') -pkgrel=3 +pkgver=20130611 +_libretools_commit=e6944bc03f587ad177c6b825e3f4c116fb9b9b12 +_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f + +_packages_url=https://projects.parabolagnulinux.org/packages +source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 + $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) + +pkgrel=1 arch=('any') -groups=(base-devel) -depends=(openssh rsync git wget tokyocabinet) -conflicts=(chroottools) -source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar) +makedepends=(emacs) # emacs --batch is used during the build to process text +checkdepends=(sh-roundup) build() { - cd "$srcdir/$pkgbase-$pkgver" - make + cd "$srcdir" + ln -sf devtools-par-$_devtools_commit devtools-par + cd "$srcdir/$pkgbase-$_libretools_commit" + make build-libretools build-libretools-mips64el build-doc +} + +check() { + cd "$srcdir/$pkgbase-$_libretools_commit" + + make check TESTENVFLAGS='--no-network --no-sudo' } package_libretools() { - backup=(etc/libretools.conf etc/libretools.d/chroot.conf) + backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install + replaces=(chroottools) + conflicts=(devtools) + + depends=( + arch-install-scripts # `archroot` uses `pacstrap` + git # `createworkdir` (also mips-add in -mips64el) + openssh # `librerelease` + rsync # `librerelease` and `makechrootpkg.sh` + subversion # `diff-unfree` + tokyocabinet # `treepkg` + wget # `aur` and `lib/blacklist.sh` + ) + optdepends=('namcap: to check package files') - cd "$srcdir/$pkgbase-$pkgver" - make install-libretools DESTDIR="$pkgdir" - install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-libretools install-doc DESTDIR="$pkgdir" } package_libretools-mips64el() { pkgdesc="Scripts for Parabola development (for mips64el architecture)" - backup=('etc/libretools.d/mips64el.conf') + depends=("$pkgbase=$pkgver") - cd "$srcdir/$pkgbase-$pkgver" + cd "$srcdir/$pkgbase-$_libretools_commit" make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('77dcfb2fbf5b8a9894a13c5e6151b693') +md5sums=('3d5645488481fab48954e194274f70ac' + 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 0b53dd8e2..ff6a238fe 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,28 +1,28 @@ #!/bin/sh +_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' + # arg 1: the new package version post_install() { - update-cleansystem - cat <<EOF -Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide -and follow instructions there before using libretools. - -If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg -and install libretools-\$arch if avaliable - -EOF + if grep -q 'libre::' etc/makepkg.conf; then + libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" + else + libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" + printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf + fi } ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { - update-cleansystem - cat <<EOF -Check your /etc/libretools.conf, it has changed substantially. - -If using fullpkg, you should install libretools-\$arch if avaliable - -EOF + post_install } -# vim:set ts=2 sw=2 et: +pre_remove() { + if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then + libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" + sed -i '/libre::/d' + else + libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" + fi +} diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index ec385c23a..3608300a6 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.9.4 +_kernver=3.9.6 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=5 +pkgrel=7 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-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 7c3e3ad47..39607a3cf 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.80 +_kernver=3.0.82 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=4 +pkgrel=6 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts 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 baab66b5c..c4b444dcb 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186439 2013-05-26 15:23:17Z tpowa $ +# $Id: PKGBUILD 188451 2013-06-14 09:44:50Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=80 +_sublevel=82 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.80 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.81 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ 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' - '6dfc33fc2587b36e2bf61ff1b26584c2' + 'a4abefba847776433cf2b316b2b28eac' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '7a0757288e0f61cbd91f7fc6b2bafb7b') + '2169bc4aa45d9725394cf52a4c9fa91e') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -204,14 +204,18 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install fallback mkinitcpio.conf file and preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 3c8ebbdae..d0d47c6a0 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.80-1-LIBRE-LTS +KERNEL_VERSION= # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8ba93e018..b6b433ca4 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ +# $Id: PKGBUILD 188461 2013-06-14 12:19:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -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=4 +_sublevel=6 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # 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' - 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' - 'b0bc969b9e8c1767b16cdc0504a7bad7' - '42dfd3a3702433b68c079d6b3fd13c3c' + '7dba3beb8f739ca133be09f92ff1dc67' + 'b3458a2d80ce102b384586d4bddfddf0' + '52c2de7d1cb41727679e8061baef1741' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '846eb5948403dd0f2f02c50d3acb69c3') + '50c2274bf466dffc149332fc2f5efd40') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -183,14 +183,16 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install mkinitcpio preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 107968129..c91f26163 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -6022,7 +6022,7 @@ CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 24d6be2bd..f4c0f5937 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -5813,7 +5813,7 @@ CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 619ad6090..3f5daa725 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.9.4-1-LIBRE +KERNEL_VERSION= # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 509275d5d..6f3e30c18 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186447 2013-05-26 15:45:25Z tpowa $ +# $Id: PKGBUILD 188459 2013-06-14 11:00:50Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=46 +pkgrel=47 epoch=1 _extramodules=extramodules-3.9-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release/PKGBUILD index 51ec79bea..adf9c4774 100644 --- a/libre/lsb-release-libre/PKGBUILD +++ b/libre/lsb-release/PKGBUILD @@ -1,35 +1,36 @@ -# Parabola maintainer: MichaÅ‚ MasÅ‚owski <mtjm@mtjm.eu> -# Parabola contributor: André Silva <andre.paulista@adinet.com.uy> -# $Id: PKGBUILD 22635 2010-07-25 20:05:28Z svenstaro $ +# $Id: PKGBUILD 79819 2012-11-13 13:12:30Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Malte Rabenseifner <malte@zearan.de> # Contributor: John Gerritse <reaphsharc@gmail.com> +# Maintainer (Parabola): MichaÅ‚ MasÅ‚owski <mtjm@mtjm.eu> +# Contributor (Parabola): André Silva emulatorman@lavabit.com> -_pkgname=lsb-release -pkgname=lsb-release-libre +pkgname=lsb-release pkgver=1.4 -pkgrel=12 -pkgdesc="LSB version query program with Parabola name" +pkgrel=13 +pkgdesc="LSB version query program (Parabola rebranded)" arch=('any') url="http://www.linuxbase.org/" license=('GPL2') -provides=('lsb-release') -conflicts=('lsb-release') -replaces=('lsb-release') +depends=('bash') +provides=('lsb-release-libre') +conflicts=('lsb-release-libre') +replaces=('lsb-release-libre') install=lsb-release.install -source=(http://downloads.sourceforge.net/lsb/$_pkgname-$pkgver.tar.gz) +source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz) md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4') build() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" install -dm755 "$pkgdir/etc" + echo "LSB_VERSION=$pkgver" >> "$pkgdir/etc/lsb-release" echo "DISTRIB_ID=parabola" > "$pkgdir/etc/lsb-release" echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release" echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release" diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release/lsb-release.install index 62d404892..62d404892 100644 --- a/libre/lsb-release-libre/lsb-release.install +++ b/libre/lsb-release/lsb-release.install diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index fabd87469..bcfbef9d8 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,36 +1,44 @@ -# $Id$ +# $Id: PKGBUILD 87679 2013-04-05 09:08:28Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> _pkgname=mc pkgname=mc-libre -pkgver=4.8.4 +pkgver=4.8.8 pkgrel=1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" +pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed" arch=('i686' 'x86_64' 'mips64el') url="http://www.ibiblio.org/mc/" license=('GPL') -depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang') +depends=( + 'e2fsprogs' + 'glib2' + 'gpm' + 'libssh2' + 'pcre' + 'slang') makedepends=('libxt' 'libx11') -optdepends=('p7zip: support for 7zip archives' - 'mtools: a+ extfs' - 'cdparanoia: audio extfs' - 'gawk: hp48+ extfs' - 'cdrkit: iso9660 extfs' - 'perl: needed by several extfs scripts' - 'python-boto: s3+ extfs' - 'python2-pytz: s3+ extfs' - 'p7zip: u7z extfs' - 'arj: uarj extfs' - 'cabextract: ucab extfs' - 'ununrar: urar extfs' - 'zip: uzip extfs') +optdepends=( + 'cabextract: ucab extfs' + 'cdparanoia: audio extfs' + 'cdrkit: iso9660 extfs' + 'gawk: hp48+ extfs' + 'aspell: spelling corrections' + 'cvs: CVS support' + 'mtools: a+ extfs' + 'perl: needed by several extfs scripts' + 'python2-boto: s3+ extfs' + 'python2-pytz: s3+ extfs' + 'smb: VFS support' + 'arj: uarj extfs' + 'unar: urar extfs' + 'zip: uzip extfs' + 'p7zip: support for 7zip archives') conflicts=('mc') replaces=('mc') provides=("mc=${pkgver}") options=('!emptydirs' '!makeflags') backup=('etc/mc/edit.indent.rc' - 'etc/mc/edit.spell.rc' 'etc/mc/filehighlight.ini' 'etc/mc/mcedit.menu' 'etc/mc/mc.ext' @@ -40,30 +48,25 @@ backup=('etc/mc/edit.indent.rc' source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2") build() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure \ - --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --enable-background --enable-charset --enable-largefile \ - --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \ - --with-screen=slang --with-subshell --with-vfs --with-x \ - --without-debug --without-gnome --without-included-gettext \ - --libexecdir=/usr/lib + ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \ + --with-x --libexecdir=/usr/lib - make + make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install - # Fix FS#15177 - sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" + # Fix FS#15177 + sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ + -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" - sed 's#/usr/bin/env python#/usr/bin/python2#' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" + sed 's#/usr/bin/env python#/usr/bin/python2#' \ + -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('a8edb8226cb25869f925ecce043faf1e') +md5sums=('324ff5a192d30d3a3b234c130550eb0a') diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD index 16d595f12..a64f141fd 100644 --- a/libre/mksyslinux/PKGBUILD +++ b/libre/mksyslinux/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186874 2013-05-31 13:27:18Z tpowa $ +# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=mksyslinux -pkgver=2013.05 +pkgver=2013.06 pkgrel=1 pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)" arch=(any) @@ -21,6 +21,6 @@ package() install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg" } md5sums=('287aad9693ca8061495e248c41ba43a7' - 'd958575945e4ce8a9002bd056e2f14be' - '1f1e2d80e28b087e4103282bc5c44071' + '0a9fd93356b5d98ab386f28bc849b808' + '15742e47e40a46491694b4b7680d4e38' 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux index 4db771f83..96ad45133 100755 --- a/libre/mksyslinux/mksyslinux +++ b/libre/mksyslinux/mksyslinux @@ -71,13 +71,14 @@ export RUNPROGRAM="${APPNAME}" export USEKERNEL=${VERSION} # begin script [ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} -mkdir -p ${TEMPDIR}/$BOOTDIRNAME +mkdir -p ${TEMPDIR} echo ":: Mounting ${DEVICE} ..." if ! [ "${IMAGENAME}" = "" ]; then modprobe loop else mount ${DEVICE} ${TEMPDIR} || exit 1 fi +mkdir -p ${TEMPDIR}/${BOOTDIRNAME} # prepare syslinux bootloader install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin for i in /usr/lib/syslinux/*.c32; do @@ -102,7 +103,7 @@ else sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ ${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg fi -[ ! -s ${TEMPDIR}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 +[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." # generate initramdisk echo ":: Creating initramdisk ..." @@ -136,7 +137,7 @@ else echo ":: Installing MBR on ${MBRDEVICE} ..." cat ${MBR} > ${MBRDEVICE} echo ":: Installing SYSLINUX on ${DEVICE} ..." - syslinux -o offset ${DEVICE} && echo "Installation completed." + syslinux -t offset ${DEVICE} && echo "Installation completed." fi # clean /tmp rm -r ${TEMPDIR} diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf index ab2d4978a..cfbfc49d8 100644 --- a/libre/mksyslinux/mksyslinux.conf +++ b/libre/mksyslinux/mksyslinux.conf @@ -20,7 +20,7 @@ KERNEL="/boot/vmlinuz-linux-libre" BOOTMESSAGE="/usr/share/mksyslinux/boot.msg" OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg" -syslinux.cfg file to use +# syslinux.cfg file to use SYSLINUXCFG="" # Prompt on boot, 1=yes 0=no diff --git a/libre-testing/ronn/PKGBUILD b/libre/ronn/PKGBUILD index 4bd097048..4bd097048 100644 --- a/libre-testing/ronn/PKGBUILD +++ b/libre/ronn/PKGBUILD diff --git a/libre-testing/ruby-hpricot/PKGBUILD b/libre/ruby-hpricot/PKGBUILD index ad9aefc36..ad9aefc36 100644 --- a/libre-testing/ruby-hpricot/PKGBUILD +++ b/libre/ruby-hpricot/PKGBUILD diff --git a/libre-testing/ruby-mustache/PKGBUILD b/libre/ruby-mustache/PKGBUILD index d7090cc0d..d7090cc0d 100644 --- a/libre-testing/ruby-mustache/PKGBUILD +++ b/libre/ruby-mustache/PKGBUILD diff --git a/libre-testing/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD index 76e4b58bd..76e4b58bd 100644 --- a/libre-testing/ruby-rdiscount/PKGBUILD +++ b/libre/ruby-rdiscount/PKGBUILD diff --git a/libre-testing/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD index 7c17669d3..7c17669d3 100644 --- a/libre-testing/sh-roundup/PKGBUILD +++ b/libre/sh-roundup/PKGBUILD diff --git a/libre-testing/sh-roundup/makefile-fix.patch b/libre/sh-roundup/makefile-fix.patch index b97bebf23..b97bebf23 100644 --- a/libre-testing/sh-roundup/makefile-fix.patch +++ b/libre/sh-roundup/makefile-fix.patch diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index a5c04bec4..b8872fa5d 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90159 2013-05-07 13:40:35Z stativ $ +# $Id: PKGBUILD 92587 2013-06-09 14:53:02Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') @@ -36,7 +36,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('08076f9d8c017d8c31f18b94bc9e6878') +md5sums=('1c18d9227bac57a910e2a7b2e18870d8') build() { cd "$srcdir"/$_pkgname-$pkgver diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index d873da4f7..27758d8a0 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 92647 2013-06-10 15:12:25Z bpiotrowski $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> _pkgname=spectrwm pkgname=spectrwm-libre -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('c572727b5fb9fe3674c03a7e51d191c4' +md5sums=('7698a5b219fdabad07a76ef45b1360d1' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e') @@ -56,8 +56,8 @@ package() { install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" - ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" - ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" + #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" + #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" # fix this for real in the makefile rm "$pkgdir/usr/bin/scrotwm" diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index d23deae0a..f9907d3f4 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185894 2013-05-19 17:17:51Z tpowa $ +# $Id: PKGBUILD 187808 2013-06-06 07:51:31Z tpowa $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=syslinux -pkgver=5.01 -pkgrel=4 +pkgver=5.10 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://www.syslinux.org" @@ -25,7 +25,7 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux.cfg syslinux-install_update splash.png) -md5sums=('6c21244277fa4e444967ba45469de863' +md5sums=('8f51d6a5d2730f534ba90e71f3347bff' '25af85a05e7b212b7fb8b7587175e492' 'e5a69630e3f7083aad2d14362b6117b3' '4450792e13a0270c1b89bb6a66ce2fbc' diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update index 6d52f7703..47d4d88be 100644 --- a/libre/syslinux/syslinux-install_update +++ b/libre/syslinux/syslinux-install_update @@ -334,7 +334,7 @@ _install() { update() { # Update c32 files in /boot, if /boot is not on same fs if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.{c32}; do + for file in "$bootpath"/*.c32; do file=${file##*/} cp "$libpath/$file" "$bootpath/$file" &> /dev/null done diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 4dd77dda3..4a9a91be1 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $ +# $Id: PKGBUILD 92750 2013-06-14 12:14:28Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=22 +pkgrel=23 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/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules index e4de1dca7..39ae3a4ec 100644 --- a/libre/vhba-module-libre/60-vhba.rules +++ b/libre/vhba-module-libre/60-vhba.rules @@ -1,13 +1 @@ -ACTION=="remove", GOTO="vhba_end" -KERNEL!="vhba_ctl", GOTO="vhba_end" - -NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" - -TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess" -TAG+="udev-acl" -GOTO="vhba_end" - -LABEL="vhba_uaccess" -TAG+="uaccess" - -LABEL="vhba_end" +ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess" diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index b1f8c6ffb..1016c0185 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $ +# $Id: PKGBUILD 92752 2013-06-14 12:15:10Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -6,9 +6,9 @@ _pkgname=vhba-module pkgname=vhba-module-libre -pkgver=20120422 +pkgver=20130607 _extramodules=extramodules-3.9-LIBRE -pkgrel=25 +pkgrel=2 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" @@ -22,28 +22,24 @@ conflicts=('vhba-module') provides=("vhba-module=$pkgver") source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2" '60-vhba.rules') -md5sums=('d97372da1d270d1605742b2995fb6678' - 'b5e82d0160e7a181219b67c1794d5c27') +md5sums=('92a681e4665aa85a8335d00395a61697' + '4dc37dc348b5a2c83585829bde790dcc') build() { - cd "$srcdir/$_pkgname-$pkgver" - + cd $_pkgname-$pkgver _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - make KDIR=/usr/lib/modules/$_kernver/build } package() { - cd "$srcdir/$_pkgname-$pkgver" - - install -Dm644 vhba.ko \ - "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ - "$startdir/vhba-module.install" - - install -Dm644 "$srcdir/60-vhba.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" + cd $_pkgname-$pkgver + install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" + install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" + + cd $startdir + cp -f $install ${install}.pkg + true && install=${install}.pkg + sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install } # vim:set ts=2 sw=2 et: diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install index 88b96f7b4..793cffd8d 100644 --- a/libre/vhba-module-libre/vhba-module.install +++ b/libre/vhba-module-libre/vhba-module.install @@ -1,6 +1,7 @@ +EXTRAMODULES= + _updatemod() { echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.9-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index a6c22c177..313b4f783 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91728 2013-05-26 15:42:12Z tpowa $ +# $Id: PKGBUILD 92754 2013-06-14 12:16:21Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 -pkgrel=6 +pkgrel=8 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index 9a98c5752..a52b9cf64 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -1,4 +1,4 @@ -VERSION='3.9.4-1-LIBRE' +VERSION='3.9.6-1-LIBRE' post_install() { cat << EOF diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index f0ca024ed..089ccc4d8 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -1,4 +1,4 @@ -VERSION='3.9.4-1-LIBRE' +VERSION='3.9.6-1-LIBRE' post_install() { cat << EOF diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index 684efe7c2..1a81e15d4 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=11 +pkgrel=12 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' arch=( i686 @@ -38,7 +38,7 @@ depends=( optdepends=net-tools makedepends=( help2man - libxslt + #libxslt lynx net-tools openssh @@ -82,42 +82,42 @@ prepare() { s|/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin|/usr/bin|; ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) #sed -i 's|/lib64|/lib|; - # ' $(grep -rl /lib64) + # ' $(grep -rlI /lib64) #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rl usr/libexec) + # ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') sed -i 's|OpenSource / ||; s|opensource / ||; - s|OpenSource|FreeSoftware|; - s|opensource|freesoftware|; + 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 -ril opensource) + ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -193,7 +193,7 @@ prepare() { s|MkGNU/Linux|MkLinux|; s|SEGNU/Linux|SELinux|; s|VA GNU/Linux Cluster|VA Linux Cluster|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) } build() { diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD index e176cb112..7bd87f791 100644 --- a/pcr/corosync/PKGBUILD +++ b/pcr/corosync/PKGBUILD @@ -3,7 +3,7 @@ pkgname=corosync _pkgflag=lts pkgver=2.3.0 -pkgrel=2 +pkgrel=4 pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications' arch=( i686 @@ -13,21 +13,23 @@ arch=( url=http://www.$pkgname.org license=BSD depends=( + dbus libqb libstatgrab net-snmp nss ) -makedepends=doxygen +optdepends='augeas: for config files' +makedepends=( + augeas + doxygen + graphviz +) conflicts=$pkgname-$_pkgflag options=(!libtool) source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51 -prepare() { - cd $srcdir/$pkgname-$pkgver -} - build() { cd $srcdir/$pkgname-$pkgver setarch $CARCH ./configure --prefix=/usr\ @@ -49,6 +51,7 @@ build() { --enable-xmlconf\ --libdir=/usr/lib\ --localstatedir=/var\ + --sbindir=/usr/bin\ --sysconfdir=/etc\ --with-initddir=/etc/rc.d\ --with-systemddir=/usr/lib/systemd/system diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD index e46a7d0b1..d5a45b5b1 100644 --- a/pcr/debootstrap/PKGBUILD +++ b/pcr/debootstrap/PKGBUILD @@ -1,9 +1,8 @@ -# $Id$ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=debootstrap -pkgver=1.0.48 -pkgrel=1 +pkgver=1.0.52 +pkgrel=3 pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt" arch=('any') license=('GPL') @@ -13,15 +12,20 @@ source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver 'metad' 'trisquel') install="debootstrap.install" -md5sums=('f75ae43204ed273c7a95c12a5a2f715a' +md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a' '4425300ca68d60fb60a6d699e153a519' 'b020aa8426e70a6024c8e76312c17d78') package(){ - tar -xzf "$srcdir/data.tar.gz" -C "$pkgdir/" - + tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/" + # move the executables to /usr/bin + mkdir -p ${pkgdir}/usr/bin + mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/" + rmdir "${pkgdir}/usr/sbin" + # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) + sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap # doesn't work with gpg 2.x, patch to point to gpg1v - sed 's/gpgv/gpg1v/g;' -i "$pkgdir/usr/sbin/debootstrap" "$pkgdir/usr/share/debootstrap/functions" + sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions" # add gNewSense script install -m644 metad "$pkgdir/usr/share/debootstrap/scripts" diff --git a/pcr/drumgizmo/PKGBUILD b/pcr/drumgizmo/PKGBUILD new file mode 100644 index 000000000..d423a6f82 --- /dev/null +++ b/pcr/drumgizmo/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=drumgizmo +pkgver=0.9.3 +pkgrel=1 +pkgdesc="A drum LV2 plugin and stand-alone application" +arch=('i686' 'x86_64') +url="http://www.drumgizmo.org/" +license=('GPL') +groups=('lv2-plugins') +depends=('lv2' 'libsmf' 'libao' 'jack' 'qt4') +options=('!libtool') +source=("${url}releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('a0aeef33f74792afd528bec21b8d0f6b') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-static=no + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/drumkv1/PKGBUILD b/pcr/drumkv1/PKGBUILD new file mode 100644 index 000000000..4a55012f6 --- /dev/null +++ b/pcr/drumkv1/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=drumkv1 +pkgver=0.3.3 +pkgrel=1 +pkgdesc="An old-school drum-kit sampler" +arch=('i686' 'x86_64') +url="http://$pkgname.sourceforge.net/$pkgname-index.html" +license=('GPL') +groups=('lv2-plugins') +depends=('jack' 'liblo' 'lv2' 'qt4') +install="$pkgname.install" +source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('d7c7270fdd01552b74eead36dd638ea4') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # x86_64 lib path fix + sed -i "s/lib64/lib/" src/src_lv2.pro + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/drumkv1/drumkv1.install b/pcr/drumkv1/drumkv1.install new file mode 100644 index 000000000..029294d67 --- /dev/null +++ b/pcr/drumkv1/drumkv1.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD index 3a2e54dd8..9fed072aa 100644 --- a/pcr/ganglia/PKGBUILD +++ b/pcr/ganglia/PKGBUILD @@ -2,8 +2,8 @@ pkgname=ganglia pkgver=3.6.0 -pkgrel=1 -pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids' +pkgrel=4 +pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.' arch=( i686 x86_64 @@ -18,41 +18,35 @@ depends=( python2 rrdtool ) +install=$pkgname.install options=(!libtool) optdepends="$pkgname-web: Web frontend" backup=( - etc/gmond.conf - etc/gmetad.conf + etc/ganglia/gmond.conf + etc/ganglia/gmetad.conf +) +source=( + http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + gmetad.service.in + gmond.service.in +) +sha512sums=( + 2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394 + a42b7dcb7dd81961cc9fef114f8c4c352375ed931dc2ae77b1139c6fde7cbd6544fcb5fe286ff6066ef37696821dc9f6fcab7c6b14d3ebaa59e895219cd89836 + c362a383cbbaf5540b5d698f664534bd0da73bcc5ee4336c468844ed17706e05450f35e4f6cf969f1d2495c462883873b30e4575b9ee8ded74ab475afda608bb ) -source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz -sha512sums=2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394 prepare() { cd $srcdir/$pkgname-$pkgver + #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure - touch gm{on,eta}d/gm{on,eta}d.service.in - echo '[Unit]' > gmetad/gmetad.service.in - echo 'Description=Ganglia Meta Daemon' >> gmetad/gmetad.service.in - echo 'After=network.target' >> gmetad/gmetad.service.in - echo '' >> gmetad/gmetad.service.in - echo '[Service]' >> gmetad/gmetad.service.in - echo 'Type=forking' >> gmetad/gmetad.service.in - echo 'PIDFile=/run/gmetad.pid' >> gmetad/gmetad.service.in - echo 'ExecStart=/usr/sbin/gmetad -p /run/gmetad.pid' >> gmetad/gmetad.service.in - echo '' >> gmetad/gmetad.service.in - echo '[Install]' >> gmetad/gmetad.service.in - echo 'WantedBy=multi-user.target' >> gmetad/gmetad.service.in + sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.in - echo '[Unit]' > gmond/gmond.service.in - echo 'Description=Ganglia Monitor Daemon' >> gmond/gmond.service.in - echo 'After=network.target' >> gmond/gmond.service.in - echo '' >> gmond/gmond.service.in - echo '[Service]' >> gmond/gmond.service.in - echo 'ExecStart=/usr/sbin/gmond -f -p /run/gmond.pid' >> gmond/gmond.service.in - echo '' >> gmond/gmond.service.in - echo '[Install]' >> gmond/gmond.service.in - echo 'WantedBy=multi-user.target' >> gmond/gmond.service.in + # FIXME: Hopefully this will soon no longer be required? + msg2 'Copying systemd units into source as workaround for bug' + cp $srcdir/gmetad.service.in gmetad/gmetad.service.in + cp $srcdir/gmond.service.in gmond/gmond.service.in } build() { @@ -60,13 +54,16 @@ build() { setarch $CARCH ./configure --prefix=/usr\ --enable-gexec\ --enable-perl\ + --enable-setuid=ganglia\ --enable-status\ --disable-static\ --libdir=/usr/lib\ --with-gmetad\ --with-python=/usr/bin/python2\ - --sysconfdir=/etc + --sbindir=/usr/bin\ + --sysconfdir=/etc/ganglia # --enable-php\ +# --enable-setgid=ganglia\ setarch $CARCH make } @@ -77,5 +74,5 @@ package() { mkdir $pkgdir/usr/lib/$pkgname/python_modules msg2 'Generating default gmond.conf' - ./gmond/gmond --default_config > $pkgdir/etc/gmond.conf + ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf } diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install new file mode 100644 index 000000000..6a196af1f --- /dev/null +++ b/pcr/ganglia/ganglia.install @@ -0,0 +1,24 @@ +post_install() { + if [ "`vercmp $2 3.4.0`" -lt 0 ]; then + echo 'WARNING: The ganglia package has been split. If you use the' \ + "web frontend, you'll need to install the ganglia-web package as well." + fi + id ganglia >& /dev/null + if [ $? -ne 0 ]; then + echo 'Adding ganglia system group and user...' + groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia + # Lock the account to prevent logging in + passwd -l ganglia &> /dev/null + fi + install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds +} + +post_upgrade() { + post_install +} + +post_remove() { + echo 'Removing ganglia system group and user...' + userdel ganglia + echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.' +} diff --git a/pcr/ganglia/gmetad.service.in b/pcr/ganglia/gmetad.service.in new file mode 100644 index 000000000..a721c2b4c --- /dev/null +++ b/pcr/ganglia/gmetad.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Ganglia Meta Daemon +After=network.target + +[Service] +Type=forking +PIDFile=/run/gmetad.pid +ExecStart=/usr/bin/gmetad -p /run/gmetad.pid + +[Install] +WantedBy=multi-user.target diff --git a/pcr/ganglia/gmond.service.in b/pcr/ganglia/gmond.service.in new file mode 100644 index 000000000..5cbd31629 --- /dev/null +++ b/pcr/ganglia/gmond.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Ganglia Monitor Daemon +After=network.target + +[Service] +ExecStart=/usr/bin/gmond -f -p /run/gmond.pid + +[Install] +WantedBy=multi-user.target diff --git a/pcr/gitflow/PKGBUILD b/pcr/gitflow/PKGBUILD new file mode 100644 index 000000000..b62042262 --- /dev/null +++ b/pcr/gitflow/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Techlive Zheng <techlivezheng@gmail.com> +# Contributor: Ernie Brodeur <ebrodeur@ujami.net> + +pkgname=gitflow +pkgver=0.4.1 +pkgrel=3 +pkgdesc='Extend git with the Gitflow branching model.' +arch=('any') +url='https://github.com/nvie/gitflow' +license=('BSD') +depends=('git' 'shflags') +source=("https://github.com/nvie/gitflow/tarball/${pkgver}/${pkgname}-${pkgver}.tar.gz") +md5sums=('adc7a52512052938a9b42ac8bd7d91dd') + +prepare() { + cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*` + sed -i "s:\$GITFLOW_DIR/gitflow-shFlags:/usr/share/lib/shflags/shflags.sh:" git-flow +} + +package() { + cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*` + + install -d -m 0755 $pkgdir/usr/lib/git-core + install -m 0755 git-flow $pkgdir/usr/lib/git-core + install -m 0644 git-flow-feature \ + git-flow-hotfix \ + git-flow-release \ + git-flow-support \ + git-flow-version \ + git-flow-init \ + gitflow-common \ + $pkgdir/usr/lib/git-core/ +} +md5sums=('adc7a52512052938a9b42ac8bd7d91dd') diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD index f9ee9254b..a33250f84 100644 --- a/pcr/heartbeat/PKGBUILD +++ b/pcr/heartbeat/PKGBUILD @@ -3,7 +3,7 @@ pkgname=heartbeat pkgver=3.0.5 _pkgver=${pkgver::1}_${pkgver:2:1} -pkgrel=10 +pkgrel=11 pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)' arch=( i686 @@ -50,42 +50,42 @@ prepare() { " configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) #sed -i 's|/lib64|/lib|; - # ' $(grep -rl /lib64) + # ' $(grep -rlI /lib64) #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rl usr/libexec) + # ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') #sed -i 's|OpenSource / ||; # s|opensource / ||; - # s|OpenSource|FreeSoftware|; - # s|opensource|freesoftware|; + # 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 -ril opensource) + # ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -163,7 +163,7 @@ prepare() { s|SEGNU/Linux|SELinux|; s|VA GNU/Linux Cluster|VA Linux Cluster|; s|ConfigureLinux|ConfigureGNULinux|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) } build() { @@ -175,7 +175,8 @@ build() { --enable-valgrind\ --libdir=/usr/lib\ --localstatedir=/var\ - --sysconfdir=/etc + --sysconfdir=/etc\ + --with-initdir=/etc/rc.d setarch $CARCH make } diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD index 6b9d7d9d7..85b3ff082 100644 --- a/pcr/libqb/PKGBUILD +++ b/pcr/libqb/PKGBUILD @@ -2,7 +2,7 @@ pkgname=libqb pkgver=0.14.4 -pkgrel=2 +pkgrel=3 pkgdesc='Library with the primary purpose of providing high performance client server reusable features' arch=( i686 @@ -14,7 +14,7 @@ makedepends=( splint ) license=LGPL2.1 -options=!libtool +options=(!libtool) url=https://github.com/asalkeld/$pkgname/wiki source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977 @@ -25,7 +25,8 @@ build() { setarch $CARCH ./configure --prefix=/usr\ --disable-fatal-warnings\ --disable-static\ - --libdir=/usr/lib + --libdir=/usr/lib\ + --sbindir=/usr/bin setarch $CARCH make } diff --git a/pcr/lv2-ir/PKGBUILD b/pcr/lv2-ir/PKGBUILD new file mode 100644 index 000000000..cdeaf7414 --- /dev/null +++ b/pcr/lv2-ir/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=lv2-ir +pkgver=1.3.2 +pkgrel=1 +pkgdesc="zero-latency, realtime, high performance signal convolver especially for creating reverb effects." +arch=('i686' 'x86_64') +url="http://factorial.hu/plugins/lv2/ir" +license=('GPL') +depends=('zita-convolver' 'libsamplerate' 'gtk2') +provides=('ir-lv2') +conflicts=('ir-lv2') +groups=('lv2-plugins') +makedepends=('lv2core' ) + +source=("http://factorial.hu/system/files/ir.lv2-${pkgver}.tar.gz") +md5sums=('01140e1f70e7f4949f502eafc1958bcd') + +build() { + cd "$srcdir/ir.lv2-${pkgver}" + make + make convert4chan +} + +package() { + cd "$srcdir/ir.lv2-${pkgver}" + make PREFIX="$pkgdir/usr" install + install -Dm755 convert4chan "$pkgdir/usr/bin/convert4chan" + # fixed location + sed -i 's/, but seem like its gone://' README + sed -i 's@rhythminmind.net/1313@rhythminmind.net/STN@' README + install -Dm644 README "${pkgdir}"/usr/share/doc/$pkgname/README +} diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD index 0c7057908..0db1b1068 100644 --- a/pcr/mednafen-server/PKGBUILD +++ b/pcr/mednafen-server/PKGBUILD @@ -1,26 +1,24 @@ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=mednafen-server +_pkgname=${pkgname%-server} pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='A server multi-system gaming emulator' -url=http://${pkgname%-server}.sourceforge.net/ -license=( - GPL -) +url=http://$_pkgname.sourceforge.net/ +license=GPL2 arch=( i686 x86_64 mips64el ) +backup=etc/$pkgname/standard.conf source=( - http://downloads.sourceforge.net/project/${pkgname%-server}/Mednafen-Server/$pkgver/$pkgname-$pkgver.tar.gz - ${pkgname}d + http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz $pkgname.service ) sha512sums=( 700b2021e5085761b90bb5ee802ff9ccded3cdade76682fe9faa98ebbb0653c9b00baea5baa1c486f850bad606aae33a88e4d9486015babb210648aa0cd4542d - 55cba761db9c10978a5146e4f92ccce2a645e0566d0744e745b36ede56a0332d1cb1f6c8a09df6a1c01320b539f07ccd7073b2d85eca6b340449a1c3b9761407 cd3d19b789ec7f62c4b8f5fe0f93e7836fab5406a3416434701caf6404cce02c7223dcb8b82bd1e4b00bdcf4df623f0cd44f850a7f79a7be73e04c0804972700 ) @@ -34,6 +32,5 @@ package() { cd $srcdir/$pkgname make DESTDIR=$pkgdir install install -Dm644 standard.conf $pkgdir/etc/$pkgname/standard.conf - install -Dm644 $srcdir/${pkgname}d $pkgdir/etc/rc.d/$pkgname install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD index 543002e04..57a04c290 100644 --- a/pcr/miniupnpd/PKGBUILD +++ b/pcr/miniupnpd/PKGBUILD @@ -1,20 +1,19 @@ # $Id$ -# Maintainer: None +# Maintainer: fauno <fauno@parabola.nu> pkgname=miniupnpd pkgver=1.8.20130503 -pkgrel=1 +pkgrel=3 pkgdesc="Lightweight UPnP IGD daemon" arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" license=('BSD') backup=(etc/miniupnpd/miniupnpd.conf) -depends=('libnfnetlink' 'iptables>=1.4.3') +depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools') makedepends=('lsb-release') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.systemd) md5sums=('484dbda7c428b2d5f3768500a48d3375' - 'f862f79b673359adc80faf0be914394f' - '2cc73f661cacb2fa374eee3d1030f428') + '0c3f1777b6c043dd5029092d62896660') build() { cd "$srcdir/$pkgname-$pkgver" @@ -34,8 +33,11 @@ package() { install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" - sed -i 's:/sbin/iptables:/usr/sbin/iptables: + sed -i 's:/s\?bin/iptables:/usr/bin/iptables: s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/ s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf" + # usrmove + cd "$pkgdir" + mv usr/sbin usr/bin } diff --git a/pcr/miniupnpd/miniupnpd.systemd b/pcr/miniupnpd/miniupnpd.systemd index 4c5aa77cc..88973535c 100644 --- a/pcr/miniupnpd/miniupnpd.systemd +++ b/pcr/miniupnpd/miniupnpd.systemd @@ -3,9 +3,9 @@ Description=Lightweight UPnP IGD daemon [Service] ExecStartPre=/etc/miniupnpd/iptables_init.sh -ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d +ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d ExecStopPost=/etc/miniupnpd/iptables_removeall.sh -PIDFile=/var/run/miniupnpd.pid +PIDFile=/run/miniupnpd.pid StandardOutput=null [Install] diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD index d274631eb..f83e05741 100644 --- a/pcr/monkeysphere/PKGBUILD +++ b/pcr/monkeysphere/PKGBUILD @@ -4,15 +4,27 @@ # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $ pkgname=monkeysphere pkgver=0.35 -pkgrel=4 +pkgrel=5 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication" arch=('any') url="http://web.monkeysphere.info/" license=('GPL3') depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1') -source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz) +source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz + binmerge.patch) install=monkeysphere.install -md5sums=('481ac14c9fdef0ccd1944c593bd4f517') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Ni "${srcdir}/binmerge.patch" +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make test +} package() { cd "$srcdir/$pkgname-$pkgver" @@ -20,3 +32,5 @@ package() { make DESTDIR="$pkgdir/" install mkdir -p $pkgdir/var/lib/monkeysphere } +md5sums=('481ac14c9fdef0ccd1944c593bd4f517' + 'a8bd35dc7dd58b5952beeecafe5045a7') diff --git a/pcr/monkeysphere/binmerge.patch b/pcr/monkeysphere/binmerge.patch new file mode 100644 index 000000000..48d945511 --- /dev/null +++ b/pcr/monkeysphere/binmerge.patch @@ -0,0 +1,25 @@ +--- Makefile.orig 2013-06-07 13:02:23.123944233 -0300 ++++ Makefile 2013-06-07 13:02:43.351065809 -0300 +@@ -36,17 +36,17 @@ + # this target is to be called from the tarball, not from the git + # working dir! + install: all installman +- mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin ++ mkdir -p $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions + mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere + mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere + printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION + install src/monkeysphere $(DESTDIR)$(PREFIX)/bin + sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere +- install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin +- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host +- install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin +- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication ++ install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin ++ sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host ++ install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin ++ sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication + install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere + install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere + install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD index 652e75691..2f765ad13 100644 --- a/pcr/mosquitto/PKGBUILD +++ b/pcr/mosquitto/PKGBUILD @@ -4,22 +4,27 @@ pkgname=mosquitto pkgver=1.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="An Open Source MQTT v3.1 Broker" arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el') url="http://mosquitto.org/" makedepends=('python') optdepends=('python: python support') license=('BSD') -source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" ) +source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" + "binmerge.patch") md5sums=('fd0cae17221d778b0a002c31e6c3de9e' 'SKIP' - 'b7cdd7a65d9a7ac5a8c2456f4b1f2d8f') + '58af79ed48be928f91e5435cda82bb8b' + '27e24b672d63b797f0e026ab85c64c4b') + +prepare() { + cd "$srcdir/$pkgname-$pkgver/src" + patch -N -i ${srcdir}/binmerge.patch +} build() { cd "$srcdir/$pkgname-$pkgver" - #Remove hardcoded prefix - find -name Makefile -exec sed '/prefix=/d' -i {} \; make prefix=/usr } diff --git a/pcr/mosquitto/binmerge.patch b/pcr/mosquitto/binmerge.patch new file mode 100644 index 000000000..d6d79041d --- /dev/null +++ b/pcr/mosquitto/binmerge.patch @@ -0,0 +1,21 @@ +--- src/Makefile.orig 2013-06-03 12:23:15.288586121 -0300 ++++ src/Makefile 2013-06-03 12:23:29.455571403 -0300 +@@ -90,15 +90,15 @@ + ${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@ + + install : all +- $(INSTALL) -d ${DESTDIR}$(prefix)/sbin +- $(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto ++ $(INSTALL) -d ${DESTDIR}$(prefix)/bin ++ $(INSTALL) -s mosquitto ${DESTDIR}${prefix}/bin/mosquitto + $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h + ifeq ($(WITH_TLS),yes) + $(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd + endif + + uninstall : +- -rm -f ${DESTDIR}${prefix}/sbin/mosquitto ++ -rm -f ${DESTDIR}${prefix}/bin/mosquitto + -rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h + -rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd + diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service index 7e9ef7cc8..9626cbc45 100644 --- a/pcr/mosquitto/mosquitto.service +++ b/pcr/mosquitto/mosquitto.service @@ -12,9 +12,9 @@ Requires=network.target [Service] Type=forking -ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -d -ExecStartPre=/bin/rm -f /var/run/mosquitto.pid -PIDFile=/var/run/mosquitto.pid +ExecStart=/usr/bin/mosquitto -c /etc/mosquitto/mosquitto.conf -d +ExecStartPre=/usr/bin/rm -f /run/mosquitto.pid +PIDFile=/run/mosquitto.pid Restart=on-abort [Install] diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD index f87ce7e2a..b16132dab 100644 --- a/pcr/netatalk/PKGBUILD +++ b/pcr/netatalk/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Farhan Yousaf <farhany at xaviya dot com> pkgname=netatalk -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=2 pkgdesc='A kernel-level implementation of AFP services' arch=('i686' 'x86_64' 'mips64el') @@ -19,17 +19,24 @@ options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('0a6f3acefd27ad63d2cde6ae4702e1b4') +md5sums=('f455505884a6aea307640d46a6577fd1') -build() { +prepare() { cd $pkgname-$pkgver - sed -i -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4 + sed -i -e 's:AX_CHECK_DOCBOOK:[AX_CHECK_DOCBOOK]:' -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4 sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in} cp /usr/share/automake*/missing . + autoreconf -i +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --localstatedir=/var/state \ --sysconfdir=/etc \ --with-init-style=systemd \ diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog index 712a8e5c1..8e1937a6c 100644 --- a/pcr/netatalk/netatalk.changelog +++ b/pcr/netatalk/netatalk.changelog @@ -1,3 +1,15 @@ +2013-06-03 SJ_UnderWater + + * 3.0.4-2: + move sbindir + +2013-05-26 SJ_UnderWater + + * 3.0.4-1: + package update + minor fixes + dbus-glib dependency + 2013-03-27 SJ_UnderWater * 3.0.3-1: diff --git a/pcr/opendnssec/LICENSE b/pcr/opendnssec/LICENSE new file mode 100644 index 000000000..5700d408a --- /dev/null +++ b/pcr/opendnssec/LICENSE @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2009 Nominet UK. All rights reserved. + * Copyright (c) 2010 .SE (The Internet Infrastructure Foundation). + * Copyright (c) 2009 NLNet Labs. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* pkcs11.h + Copyright 2006, 2007 g10 Code GmbH + Copyright 2006 Andreas Jellinghaus + + This file is free software; as a special exception the author gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. */
\ No newline at end of file diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD new file mode 100644 index 000000000..065a1ec68 --- /dev/null +++ b/pcr/opendnssec/PKGBUILD @@ -0,0 +1,77 @@ +# Maintainer: Javier Torres <javitonino [at] gmail [dot] com> + +pkgname=opendnssec +pkgver=1.4.0 +pkgrel=3 +pkgdesc="Turn-key solution for DNSSEC (sqlite3)" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.opendnssec.org/" +license=('BSD') +depends=('libxml2' 'ldns' 'sqlite3' 'softhsm') +backup=("etc/opendnssec/conf.xml" + "etc/opendnssec/kasp.xml" + "etc/opendnssec/zonelist.xml") +install="opendnssec.install" +source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig} + "pid-path.patch" + "ods-signer.service" + "ods-enforcer.service") +sha256sums=('36d4926dcdf351a527ad7600b151ab6cc56d0a472a7eb8871eecd70afef9e101' + 'SKIP' + '487a4c05a07feb97c865ddc4c13d00eea6ce8b2b1e5031983c15484f4991ebed' + '1a8cdec0e97a33048956268b766da570f8f7a90d05af59e547219f1381832071' + '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # /var/lib/run -> /var/run + patch -p0 -i "${srcdir}/pid-path.patch" + + aclocal + autoconf + automake --add-missing +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --datarootdir=/usr/share \ + --localstatedir=/var/lib \ + --sysconfdir=/etc \ + --with-pkcs11-softhsm=/usr/lib/libsofthsm.so \ + --sbindir=/usr/bin + + # Create the correct (/var/run/opendnssec) directory + sed -i \ + -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run\/opendnssec/#Removed/" \ + -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run/\$(INSTALL) -d \$(DESTDIR)\$(OPENDNSSEC_PID_DIR)/" \ + Makefile + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -d "${pkgdir}/var/run/opendnssec" + + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/etc/rc.d" + install -Dm0644 "${srcdir}/ods-signer.service" \ + "${pkgdir}/usr/lib/systemd/system/ods-signer.service" + install -Dm0644 "${srcdir}/ods-enforcer.service" \ + "${pkgdir}/usr/lib/systemd/system/ods-enforcer.service" + install -Dm0644 "LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm0644 "enforcer/utils/migrate_adapters_1.sqlite3" \ + "${pkgdir}/usr/share/opendnssec" + + chown -R 227:227 "${pkgdir}/etc/opendnssec" \ + "${pkgdir}/var/lib/opendnssec" \ + "${pkgdir}/var/run/opendnssec" + chmod 750 "${pkgdir}/etc/opendnssec" \ + "${pkgdir}/var/lib/opendnssec" \ + "${pkgdir}/var/run/opendnssec" +} diff --git a/pcr/opendnssec/ods-enforcer.service b/pcr/opendnssec/ods-enforcer.service new file mode 100644 index 000000000..f0d0050d0 --- /dev/null +++ b/pcr/opendnssec/ods-enforcer.service @@ -0,0 +1,13 @@ +[Unit] +Description=OpenDNSSEC Enforcer +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/opendnssec/enforcerd.pid +ExecStart=/usr/bin/ods-control enforcer start +ExecStop=/usr/bin/ods-control enforcer stop + +[Install] +WantedBy=multi-user.target + diff --git a/pcr/opendnssec/ods-signer.service b/pcr/opendnssec/ods-signer.service new file mode 100644 index 000000000..26cc03481 --- /dev/null +++ b/pcr/opendnssec/ods-signer.service @@ -0,0 +1,13 @@ +[Unit] +Description=OpenDNSSEC Signer +After=syslog.target nerwork.target + +[Service] +Type=forking +PIDFile=/run/opendnssec/signerd.pid +ExecStart=/usr/bin/ods-control signer start +ExecStop=/usr/bin/ods-control signer stop + +[Install] +WantedBy=multi-user.target + diff --git a/pcr/opendnssec/opendnssec.install b/pcr/opendnssec/opendnssec.install new file mode 100644 index 000000000..0c74659ee --- /dev/null +++ b/pcr/opendnssec/opendnssec.install @@ -0,0 +1,27 @@ +post_install() { + if [ -z "`grep '^opendnssec:' /etc/group`" ]; then + groupadd -g 227 opendnssec + fi + if [ -z "`grep '^opendnssec:' /etc/passwd`" ]; then + useradd -u 227 -d /var/lib/opendnssec -g opendnssec -s /bin/false opendnssec + fi + + echo ">> You need an HSM implementation (try softhsm)" +} + + +post_upgrade() { + post_install $1 + OLD=$(echo $2 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g") + NEW=$(echo $1 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g") + if [ $OLD != "1.4" -a $NEW == "1.4" ]; then + echo ">> NOTICE: UPGRADE TO 1.4" + echo "This update requires upgrading the database" + echo "Run /usr/share/opendnssec/migrate_adapters_1.sqlite3 on your kasp database" + echo "e.g: sqlite3 kasp.db < /usr/share/opendnssec/migrate_adapters_1.sqlite3" + fi +} + +post_remove() { + userdel opendnssec +} diff --git a/pcr/opendnssec/pid-path.patch b/pcr/opendnssec/pid-path.patch new file mode 100644 index 000000000..88c750cf2 --- /dev/null +++ b/pcr/opendnssec/pid-path.patch @@ -0,0 +1,24 @@ +--- Makefile.am 2012-07-17 08:53:51.000000000 +0200 ++++ Makefile.am 2012-11-20 21:56:11.000000000 +0100 +@@ -30,8 +30,8 @@ + $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf + $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned + $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed +- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run +- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec ++ $(INSTALL) -d $(DESTDIR)/var/run ++ $(INSTALL) -d $(DESTDIR)/var/run/opendnssec + + docs: + (cd libhsm; $(MAKE) doxygen) +--- m4/opendnssec_common.m4 2012-11-01 11:56:59.000000000 +0100 ++++ m4/opendnssec_common.m4 2012-11-20 21:52:56.000000000 +0100 +@@ -19,7 +19,7 @@ + OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec + OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec + OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec" +-OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec" ++OPENDNSSEC_PID_DIR="/var/run/opendnssec" + + AC_SUBST([OPENDNSSEC_BIN_DIR]) + AC_SUBST([OPENDNSSEC_SBIN_DIR]) diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD index 26a2830d6..cb5f09b4c 100644 --- a/pcr/openswan/PKGBUILD +++ b/pcr/openswan/PKGBUILD @@ -1,26 +1,31 @@ # Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info> pkgname=openswan pkgver=2.6.38 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source implementation of IPsec for the Linux operating system" url="http://www.openswan.org" license=('GPL' 'custom') arch=('i686' 'x86_64' 'mips64el') depends=('iproute2>=2.6.8' 'gmp' 'perl') makedepends=('flex' 'bison') -conflicts=('ipsec-tools' 'openswan') -provides=('openswan') +conflicts=('ipsec-tools') backup=(etc/ipsec.conf \ etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear}) source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz openswan openswan.service) +prepare() { + cd $srcdir/openswan-$pkgver + # Change install paths to Arch defaults + sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc +} + build() { cd $srcdir/openswan-$pkgver # Change install paths to Arch defaults - sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc + sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc make USE_XAUTH=true USE_OBJDIR=true programs } diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD index 7ee8209ad..3681f9111 100644 --- a/pcr/pacemaker/PKGBUILD +++ b/pcr/pacemaker/PKGBUILD @@ -2,7 +2,7 @@ pkgname=pacemaker pkgver=1.1.9 -pkgrel=5 +pkgrel=6 pkgdesc='Cluster resource manager (Linux-HA)' arch=( i686 @@ -44,33 +44,33 @@ prepare() { ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) sed -i 's|/lib64|/lib|; - ' $(grep -rl /lib64) + ' $(grep -rlI /lib64) sed -i 's|usr/libexec|usr/lib|; - ' $(grep -rl usr/libexec) + ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') sed -i 's|OpenSource / ||; s|opensource / ||; s|OpenSource|FreeSoftware|; @@ -79,7 +79,7 @@ prepare() { 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 -ril opensource) + ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -155,7 +155,7 @@ prepare() { s|MkGNU/Linux|MkLinux|; s|SEGNU/Linux|SELinux|; s|VA GNU/Linux Cluster|VA Linux Cluster|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) sed -i 's|Linux|GNU/Linux|; s|ArchGNU/Linux|ArchLinux|; s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; @@ -178,7 +178,7 @@ prepare() { s|MkGNU/Linux|MkLinux|; s|SEGNU/Linux|SELinux|; s|VA GNU/Linux Cluster|VA Linux Cluster|; - ' $(grep -rl Linux | grep .po) + ' $(grep -rlI Linux | grep .po) } build() { diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 88f951d03..6fe28cc7c 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -3,19 +3,22 @@ # Run `makepkg -sp SRCBUILD` if you want to update the source tarball -pkgname=pandoc +pkgname=pandoc-static +_pkgname=pandoc pkgver=1.11.1 -pkgrel=1 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') makedepends=('ghc' 'sh' 'cabal-install') options=(strip !makeflags !distcc !emptydirs) -source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} +#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} +source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} SRCBUILD) # citeproc-hs-pre-0.3.7.patch) -conflicts=('haskell-pandoc') +replaces=('pandoc') +provides=('pandoc') optdepends=('texlive-most: for pdf creation') md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' 'SKIP' @@ -23,13 +26,13 @@ md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' # PKGBUILD functions build() { - mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} - cd ${srcdir}/${pkgname}-${pkgver} + mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}} + cd ${srcdir}/${_pkgname}-${pkgver} # Patches from the next citeproc-hs release # These are needed because 0.3.6 with embed_data_files is broken # darcs diff --from-tag=0.3.6 -# pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6 +# pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6 # patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch # popd @@ -37,29 +40,29 @@ build() { # Skip already built [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue - pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null + pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null msg2 "Building $_hkpkg" case $_hkpkg in - $pkgname-$pkgver) - HOME=${srcdir}/${pkgname}-${pkgver} \ + $_pkgname-$pkgver) + HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal configure --flags='-library blaze_html_0_5' \ --prefix=/usr \ --libdir=${srcdir}/build/usr/lib -v - HOME=${srcdir}/${pkgname}-${pkgver} \ + HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal build ;; citeproc-hs-*) - HOME=${srcdir}/${pkgname}-${pkgver} \ + HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal install --flags='embed_data_files' \ --prefix=${srcdir}/build/usr -v ;; *) - HOME=${srcdir}/${pkgname}-${pkgver} \ + HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal install --prefix=${srcdir}/build/usr ;; esac @@ -70,7 +73,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver} + cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver} runghc Setup.hs copy --destdir=${pkgdir}/ @@ -81,7 +84,7 @@ package() { # EC is unfree and makes Parabola TeXLive cry # besides, it's unneeded - sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex + sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD index 46c95ede1..66505fcbe 100644 --- a/pcr/resource-agent/PKGBUILD +++ b/pcr/resource-agent/PKGBUILD @@ -7,7 +7,7 @@ _pkgnamex=${_pkgname1^}_${_pkgname2^} _pkgnamey=${pkgname}s _pkgnamez=ha-${_pkgname1}${_pkgname2} pkgver=3.9.5 -pkgrel=5 +pkgrel=6 pkgdesc='Standardized interface for a cluster resource (Linux-HA)' arch=( i686 @@ -28,7 +28,7 @@ depends=( ) optdepends=net-tools makedepends=( - libxslt + #libxslt libvirt net-tools openssh @@ -47,42 +47,42 @@ prepare() { ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) sed -i 's|/lib64|/lib|; - ' $(grep -rl /lib64) + ' $(grep -rlI /lib64) #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rl usr/libexec) + # ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') sed -i 's|OpenSource / ||; s|opensource / ||; - s|OpenSource|FreeSoftware|; - s|opensource|freesoftware|; + 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 -ril opensource) + ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -161,7 +161,7 @@ prepare() { s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|; / 2.6, the alignment should be / s|GNU/Linux|Linux|; s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) } build() { diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD new file mode 100644 index 000000000..36bfeb18e --- /dev/null +++ b/pcr/retroshare/PKGBUILD @@ -0,0 +1,148 @@ +# Maintainer: stqn +# Contributor: JHeaton <jheaton at archlinux dot us> +# Contributor: Tristero <tristero at online dot de> +# Contributor: funkyou + +# Set this to true to build and install retroshare-nogui +_build_nogui=false + +# Set this to true to build and install the plugins +_build_linkscloud=true +_build_feedreader=true +_build_voip=true + +### Nothing to be changed below this line ### + +pkgname=retroshare +pkgver=0.5.4e +pkgrel=3 +pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail." +arch=('i686' 'x86_64') +url="http://retroshare.sourceforge.net/" +license=('LGPL' 'GPL') +depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss') +install="${pkgname}.install" + +source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \ + ${pkgname}.install \ + ${pkgname}.desktop) + +sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda' + '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9' + '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29') + +# Add missing dependencies if needed +[[ $_build_nogui == true ]] && depends=(${depends[@]} 'libssh' 'protobuf') +[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex') +[[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt') + +build() { + local _srcdir="${srcdir}/retroshare-0.5.4/src" + local _qmake='qmake-qt4' + + msg "Compiling OpenPGP-SDK..." + cd "${_srcdir}/openpgpsdk/src" + $_qmake + make + + msg "Compiling libbitdht..." + cd "${_srcdir}/libbitdht/src" + $_qmake + make + + msg "Compiling libretroshare..." + cd "${_srcdir}/libretroshare/src" + $_qmake + make + + msg "Compiling retroshare-gui..." + cd "${_srcdir}/retroshare-gui/src" + $_qmake + make + + if [[ "$_build_voip" == "true" ]] ; then + msg "Compiling VOIP plugin..." + cd "${_srcdir}/plugins/VOIP" + sed -i 's/lessThan.*/true {/' VOIP.pro + $_qmake + make + fi + + if [[ "$_build_feedreader" == "true" ]] ; then + msg "Compiling FeedReader plugin..." + cd "${_srcdir}/plugins/FeedReader" + $_qmake + make + fi + + if [[ "$_build_linkscloud" == "true" ]] ; then + msg "Compiling LinksCloud plugin..." + cd "${_srcdir}/plugins/LinksCloud" + $_qmake + make + fi + + if [[ $_build_nogui == "true" ]] ; then + msg "Compiling retroshare-nogui..." + cd "${_srcdir}/rsctrl/src" + make + cd "${_srcdir}/retroshare-nogui/src" + sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro + $_qmake + make + fi +} + +package() { + local _srcdir="${srcdir}/retroshare-0.5.4/src" + + # --- Install Files --- + + msg "Installing files to fakeroot-environment..." + + install -D -m 755 \ + "${_srcdir}/retroshare-gui/src/RetroShare" \ + "${pkgdir}/usr/bin/${pkgname}" + + if [[ "$_build_nogui" == "true" ]] ; then + install -D -m 755 \ + "${_srcdir}/retroshare-nogui/src/retroshare-nogui" \ + "${pkgdir}/usr/bin/${pkgname}-nogui" + fi + + # Plugins + if [[ "$_build_linkscloud" == "true" ]] ; then + install -D -m 755 \ + "${_srcdir}/plugins/LinksCloud/libLinksCloud.so" \ + "${pkgdir}/usr/lib/retroshare/extensions/libLinksCloud.so" + fi + if [[ "$_build_voip" == "true" ]] ; then + install -D -m 755 \ + "${_srcdir}/plugins/VOIP/libVOIP.so" \ + "${pkgdir}/usr/lib/retroshare/extensions/libVOIP.so" + fi + if [[ "$_build_feedreader" == "true" ]] ; then + install -D -m 755 \ + "${_srcdir}/plugins/FeedReader/libFeedReader.so" \ + "${pkgdir}/usr/lib/retroshare/extensions/libFeedReader.so" + fi + + # Icons + install -D -m 644 \ + "${_srcdir}/retroshare-gui/src/gui/images/retrosharelogo2.png" \ + "${pkgdir}/usr/share/pixmaps/retroshare.png" + + # Desktop File + install -D -m 644 \ + "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + + # bdboot (needed to bootstrap the DHT) + install -D -m 644 \ + "${_srcdir}/libbitdht/src/bitdht/bdboot.txt" \ + "${pkgdir}/usr/share/RetroShare/bdboot.txt" + + # Skins + cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/" + find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \; +} diff --git a/pcr/retroshare/retroshare.desktop b/pcr/retroshare/retroshare.desktop new file mode 100644 index 000000000..0c3f56180 --- /dev/null +++ b/pcr/retroshare/retroshare.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=RetroShare +GenericName=Sharing Network +Comment=Secure Communication with Your Friends +Icon=/usr/share/pixmaps/retroshare.png +Exec=/usr/bin/retroshare +Terminal=false +StartupNotify=true +Categories=Network;InstantMessaging;FileTransfer;Chat;Email; diff --git a/pcr/retroshare/retroshare.install b/pcr/retroshare/retroshare.install new file mode 100644 index 000000000..e48df1361 --- /dev/null +++ b/pcr/retroshare/retroshare.install @@ -0,0 +1,15 @@ +post_install() { + # Update Desktop DB + if [[ -x /usr/bin/update-desktop-database ]]; then + echo "Update desktop database..." + update-desktop-database -q ; + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/rfc5766-turn-server/ChangeLog b/pcr/rfc5766-turn-server/ChangeLog new file mode 100644 index 000000000..5accefa5b --- /dev/null +++ b/pcr/rfc5766-turn-server/ChangeLog @@ -0,0 +1,5 @@ +2013-06-05 Vladimir Tsanev <tsachev@gamil.com> + + * 1.8.6.0-1 : + Initial package created. + diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD new file mode 100644 index 000000000..81eb3d14d --- /dev/null +++ b/pcr/rfc5766-turn-server/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Vladimir Tsanev <tsachev@gmail.com> + +pkgname=rfc5766-turn-server +_portname=turnserver +pkgver=1.8.6.0 +pkgrel=1 +epoch= +pkgdesc="Free open source implementation of TURN and STUN Server" +arch=('i686' 'x86_64') +url="http://code.google.com/p/rfc5766-turn-server/" +license=('custom:BSDNew') +makedepends=('gcc>=3.4.4' 'make') +depends=('libevent') +#no redis headers in redi package +optdepends=('postgresql-client: to use postgresql' 'libmysqlclient') +backup=("etc/turnserver.conf" "etc/turnuserdb.conf") +changelog=ChangeLog +source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz) +sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2') + +build() { + cd "${srcdir}/$_portname-${pkgver}" + + PREFIX=/usr \ + MANPREFIX=/usr/share \ + EXAMPLESDIR="/usr/share/$pkgname/examples" \ + DOCSDIR="/usr/share/doc/$pkgname" \ + LIBDIR=/usr/lib \ + SCHEMADIR="/usr/share/$pkgname" \ + TURNINCLUDEDIR="/usr/include/turn" + ./configure + + make +} + +check() { + cd "${srcdir}/$_portname-${pkgver}" + make check +} + +package() { + cd "${srcdir}/$_portname-${pkgver}" + make \ + PREFIX="$pkgdir/usr" \ + MANPREFIX="$pkgdir/usr/share" \ + EXAMPLESDIR="$pkgdir/usr/share/$pkgname/examples" \ + DOCSDIR="$pkgdir/usr/share/doc/$pkgname" \ + LIBDIR="$pkgdir/usr/lib" \ + SCHEMADIR="$pkgdir/usr/share/$pkgname" \ + TURNINCLUDEDIR="$pkgdir/usr/include/turn" \ + install + + + install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf" + install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf" + rm -r "$pkgdir/usr/etc" + + chmod 644 "$pkgdir/usr/lib/libturnclient.a" + + install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD index 074205e79..7b20fc288 100644 --- a/pcr/ruby-headers/PKGBUILD +++ b/pcr/ruby-headers/PKGBUILD @@ -3,8 +3,8 @@ pkgname=ruby-headers _pkgname=ruby -pkgver=2.0.0_p0 -_pkgver=2.0.0-p0 +pkgver=2.0.0_p195 +_pkgver=2.0.0-p195 pkgrel=1 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug." arch=('any') @@ -23,4 +23,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a') +md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6') diff --git a/pcr/samplv1/PKGBUILD b/pcr/samplv1/PKGBUILD new file mode 100644 index 000000000..e2258a88b --- /dev/null +++ b/pcr/samplv1/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=samplv1 +pkgver=0.3.3 +pkgrel=1 +pkgdesc="Polyphonic sampler synthesizer with stereo fx" +arch=('i686' 'x86_64') +url="http://$pkgname.sourceforge.net/$pkgname-index.html" +license=('GPL') +groups=('lv2-plugins') +depends=('jack' 'liblo' 'lv2' 'qt4') +install="$pkgname.install" +source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('2540ab3ef3da39bd4da8a1ab8ff9334d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # x86_64 lib path fix + sed -i "s/lib64/lib/" src/src_lv2.pro + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/samplv1/samplv1.install b/pcr/samplv1/samplv1.install new file mode 100644 index 000000000..029294d67 --- /dev/null +++ b/pcr/samplv1/samplv1.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD index 41cba9632..1b30f06c2 100644 --- a/pcr/setbfree/PKGBUILD +++ b/pcr/setbfree/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Guest One <theguestone at gmail dot com> pkgname=setbfree -pkgver=0.5.5 +pkgver=0.7.2 pkgrel=1 pkgdesc="A DSP Tonewheel Organ emulator." -arch=('i686') +arch=('i686' 'x86_64') url="http://setbfree.org/" license=('GPL') depends=('jack' 'liblo' 'tk' 'desktop-file-utils') @@ -12,7 +12,7 @@ makedepends=('lv2') install="$pkgname.install" source=("https://github.com/pantherb/setBfree/tarball/v$pkgver" "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop") -md5sums=('604cc477a6fa76ee936f1d010c815c55' +md5sums=('7b64947289687cbf71b9e87fdd006f36' '8c2a863562f26856dcff0a456cf36dcf') build() { @@ -27,6 +27,20 @@ package() { # desktop file install -Dm644 ../$pkgname.desktop \ "$pkgdir/usr/share/applications/$pkgname.desktop" + + # icon + install -Dm644 doc/setBfree.png \ + "$pkgdir/usr/share/icons/setBfree.png" + + # man + install -d "$pkgdir/usr/share/man/man1" + install -Dm644 doc/*.1 \ + "$pkgdir/usr/share/man/man1" + + # docs + install -d "$pkgdir/usr/share/doc/$pkgname" + install -Dm644 doc/{midi.txt,signal_flow.png} \ + "$pkgdir/usr/share/doc/$pkgname" } # vim:set ts=2 sw=2 et: diff --git a/pcr/setbfree/setbfree.desktop b/pcr/setbfree/setbfree.desktop deleted file mode 100644 index 0e9d14452..000000000 --- a/pcr/setbfree/setbfree.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=setBfree -GenericName=DSP tonewheel organ -Comment=MIDI-controlled, software synthesizer using JACK -Icon=setBfree -Exec=setBfree-start -Terminal=false -Categories=AudioVideo;Audio; diff --git a/pcr/shflags/PKGBUILD b/pcr/shflags/PKGBUILD new file mode 100644 index 000000000..c4f3ee7a9 --- /dev/null +++ b/pcr/shflags/PKGBUILD @@ -0,0 +1,31 @@ +#Maintainer max_meyer +pkgname=shflags +pkgver=1.0.3 +pkgrel=1 +pkgdesc="Shell Flags (shFlags) is a library written to greatly simplify the handling of command-line flags" +arch=(any) +url="http://code.google.com/p/shflags/" +license=('LGPL') +depends=(sh) +provides=(shflags) +optdepends=(bash zsh dash ksh) +options=(zipman) +source=(http://shflags.googlecode.com/files/$pkgname-$pkgver.tgz{,.sig}) +md5sums=('b4d7133696ec05b71b27d8df5e278f0f' + 'SKIP') + +package() { + src="$srcdir/$pkgname-$pkgver/src/" + dst="$pkgdir/usr/share/lib/shflags" + mkdir -p "$dst" + + if [ -f "$src/shflags" ]; then + cp "$src/shflags" "$dst/shflags.sh" + else + msg "Warning shflags not found" + exit 1 + fi + +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/softhsm/PKGBUILD b/pcr/softhsm/PKGBUILD new file mode 100644 index 000000000..f3fbcecaf --- /dev/null +++ b/pcr/softhsm/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Javier Torres <javitonino [at] gmail [dot] com> + +pkgname=softhsm +pkgver=1.3.4 +pkgrel=1 +pkgdesc="Software PKCS11 store" +arch=('i686' 'x86_64') +url="http://www.opendnssec.org/softhsm/" +license=('custom' 'BSD') +depends=('botan' 'sqlite3') +backup=("etc/softhsm.conf") +source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig}) +sha1sums=('f09b6828776bcf9fef1dd46cfa7a495da01c7747' + 'SKIP') +sha256sums=('f10319dfa651023dad3d0845d284ec08ef982c1fc1bdb55cf8a725f762961e97' + 'SKIP') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # /usr/lib/softhsm -> /usr/bin (no subdirectory) + sed -i \ + -e "s/full_libdir=\"\$full_libdir\/softhsm\"/#full_libdir=\"\$full_libdir\/softhsm\"/" \ + -e "s/libdir=\$full_libdir/#libdir=\$full_libdir/" \ + configure +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --datarootdir=/usr/share \ + --localstatedir=/var/lib \ + --sysconfdir=/etc \ + --with-botan=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + install -Dm0644 "LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD new file mode 100644 index 000000000..0f06af418 --- /dev/null +++ b/pcr/spacenav-daemon/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=spacenav-daemon +_pkgname=${pkgname%-daemon} +pkgver=0.5 +pkgrel=3 +pkgdesc="Free Spacenav Daemon is a free alternative to the 3Dconnexion device driver, for their 3D input devices." +arch=( + i686 + x86_64 + mips64el +) +conflicts=${_pkgname}d +replaces=${_pkgname}d +url=http://$_pkgname.sourceforge.net/ +license=GPL2 +depends=libx11 +backup=etc/spnavrc +source=( + http://downloads.sourceforge.net/$_pkgname/${_pkgname}d-$pkgver.tar.gz + $_pkgname.service + spnavrc +) +sha512sums=( + 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2 + 61397646f7dda23b2cef5168f23e21c017801f156374c7fab7bae650cd3cee0ea173d3cb65ae2f0be580aa399999a388df2d804b9d00c01db430c820dbc60160 + f97866a77fe9e6bee8df046ad62576a1cdbba26323218cd6336de66e0898f403bb33da12666fe75f00bb9bf078f895e8e7de360196079f83082fc94a23f71728 +) + +build() { + cd $srcdir/${_pkgname}d-$pkgver + ./configure --prefix=$pkgdir/usr + make +} + +package() { + cd $srcdir/${_pkgname}d-$pkgver + make DESTDIR=$pkgdir install + + install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service + install -Dm644 $srcdir/spnavrc $pkgdir/etc/spnavrc +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/spacenavd/spacenav.service b/pcr/spacenav-daemon/spacenav.service index 30e8019e9..30e8019e9 100644 --- a/pcr/spacenavd/spacenav.service +++ b/pcr/spacenav-daemon/spacenav.service diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc new file mode 100644 index 000000000..7d19ae03b --- /dev/null +++ b/pcr/spacenav-daemon/spnavrc @@ -0,0 +1,8 @@ +# sensitivity is multiplied with every motion (1.0 normal). +sensitivity = 1.000 + +# dead zone; any motion less than this number, is discarded as noise. +dead-zone = 2 + +# disable led +led = 0 diff --git a/pcr/spacenavd/PKGBUILD b/pcr/spacenavd/PKGBUILD deleted file mode 100644 index cf8a43c32..000000000 --- a/pcr/spacenavd/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Jan Hambrecht <jaham at gmx dot net> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgname=spacenavd -pkgver=0.5 -pkgrel=2 -pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)." -arch=('i686' 'x86_64' 'mips64el') -url="http://spacenav.sourceforge.net/" -license=('GPL') -depends=('libx11') -backup=('etc/spnavrc') -source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz - spacenavd - spacenav.service) - -md5sums=('0bb21da5315bd376aa508157a9455aaa' - '27a739300d4de07920879af2d2bdd47f' - 'b404c8021254636b861651a7a48d17a6') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=$pkgdir/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 - # for initscript service - install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1 - # for systend service - install -D -m755 $srcdir/spacenav.service $pkgdir/usr/lib/systemd/system/spacenav.service || return 1 -} diff --git a/pcr/spacenavd/spacenavd b/pcr/spacenavd/spacenavd deleted file mode 100644 index 61946197c..000000000 --- a/pcr/spacenavd/spacenavd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON=/usr/bin/spacenavd - -PID=`pidof -o %PPID $DAEMON` -case "$1" in - start) - stat_busy "Starting Spacenavigator Daemon" - [ -z "$PID" ] && $DAEMON - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon spacenavd - stat_done - fi - ;; - stop) - stat_busy "Stopping Spacenavigator Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon spacenavd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD index 2ec8bc5b7..617f9d269 100644 --- a/pcr/strongswan/PKGBUILD +++ b/pcr/strongswan/PKGBUILD @@ -8,7 +8,7 @@ pkgname=strongswan pkgver=5.0.4 -pkgrel=5 +pkgrel=6 pkgdesc="open source IPsec implementation" url='http://www.strongswan.org' license=("GPL") @@ -25,6 +25,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --with-ipsecdir=/usr/lib/strongswan \ @@ -45,7 +46,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install - install -d ${pkgdir}/etc/rc.d - ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec - install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan } diff --git a/pcr/strongswan/strongswan.rc b/pcr/strongswan/strongswan.rc deleted file mode 100644 index 58c99c092..000000000 --- a/pcr/strongswan/strongswan.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting strongSwan IPsec" - /usr/sbin/ipsec start - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon strongswan - fi - ;; - stop) - stat_busy "Stopping strongSwan IPsec" - /usr/sbin/ipsec stop - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - rm_daemon strongswan - fi - ;; - restart) - stat_busy "Restarting strongSwan IPsec" - /usr/sbin/ipsec restart - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon strongswan - fi - ;; - status) - /usr/sbin/ipsec status - ;; - *) - echo "usage: $0 {start|stop|restart|status}" -esac - diff --git a/pcr/synthv1/PKGBUILD b/pcr/synthv1/PKGBUILD index a0d858664..1a96b84f8 100644 --- a/pcr/synthv1/PKGBUILD +++ b/pcr/synthv1/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: Guest One <theguestone at gmail dot com> pkgname=synthv1 -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=1 pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx" -arch=('i686') +arch=('i686' 'x86_64') url="http://$pkgname.sourceforge.net/$pkgname-index.html" license=('GPL') -depends=('lv2' 'jack' 'qt4') +groups=('lv2-plugins') +depends=('jack' 'liblo' 'lv2' 'qt4') install="$pkgname.install" source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('88fd93df7cd6754de355edb5fe3cb3e7') +md5sums=('18bd21921ee65b718b2feb1d0ab03ac7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/synthv1/synthv1.install b/pcr/synthv1/synthv1.install index bce670aff..029294d67 100644 --- a/pcr/synthv1/synthv1.install +++ b/pcr/synthv1/synthv1.install @@ -1,5 +1,5 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null update-desktop-database -q } diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD index ff02793aa..db8b7b101 100644 --- a/pcr/triceratops-lv2/PKGBUILD +++ b/pcr/triceratops-lv2/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: Guest One <theguestone at gmail dot com> pkgname=triceratops-lv2 -pkgver=0.1.6c +pkgver=0.1.7 pkgrel=1 pkgdesc="Polyphonic synthesizer LV2 plugin" -arch=('i686') -url="http://sourceforge.net/projects/triceratops/" +arch=('i686' 'x86_64') +url="http://deliriumdecrypted.blogspot.com/" license=('GPL') +groups=('lv2-plugins') depends=('gtkmm' 'lv2') makedepends=('python2') source=("http://downloads.sourceforge.net/project/${pkgname/-lv2}/$pkgname-v$pkgver.tar.gz") -md5sums=('7a0755876c4d3af6f1b4cac899679472') +md5sums=('b4f058c30b3b218bd21dbaa04430dd8b') build() { cd "$srcdir/$pkgname-v$pkgver" diff --git a/pcr/zita-convolver/PKGBUILD b/pcr/zita-convolver/PKGBUILD new file mode 100644 index 000000000..5017f144f --- /dev/null +++ b/pcr/zita-convolver/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer : Guest One <theguestone at gmail dot com> + +pkgname=zita-convolver +pkgver=3.1.0 +pkgrel=1 +pkgdesc="Convolution library for aeolus and jconvolver" +arch=('i686' 'x86_64') +url="http://kokkinizita.linuxaudio.org/linuxaudio" +license=('GPL') +depends=('fftw' 'gcc-libs') +source=("http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-$pkgver.tar.bz2") +md5sums=('7e264d0fb0d8ea277cdb4e33d764c68a') + +build() { + cd "$srcdir/zita-convolver-$pkgver/libs" + + sed -i 's/usr\/local/usr/' Makefile + sed -i 's/ldconfig//' Makefile + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/libs" + + make SUFFIX="" PREFIX="$pkgdir/usr" DESTDIR=${PKGDIR} install + + + # Another failed attempt at trying to be clever. A simple call to ldconfig might have worked. + # ln -s lib$pkgname.so.$pkgver \ + # "$pkgdir/usr/lib/lib$pkgname.so.${pkgver%%.*}" + + # ln -s lib${pkgname}.so.$pkgver ${pkgdir}/usr/lib/lib${pkgname}.so +} + + |