From 8996dd88e696bae485c13257572e2f38f5633251 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Sep 2013 01:42:57 -0700 Subject: Fri Sep 13 01:42:32 PDT 2013 --- community/xboard/PKGBUILD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'community/xboard/PKGBUILD') diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index b2ca19414..33f49f31a 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90592 2013-05-13 10:00:14Z spupykin $ +# $Id: PKGBUILD 97081 2013-09-12 10:17:03Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jason Chu # Contributor: Tom Newsom pkgname=xboard pkgver=4.7.1 -pkgrel=1 +pkgrel=3 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64') url="http://www.gnu.org/software/xboard/" @@ -21,7 +21,7 @@ md5sums=('e42383c4594c24ebf2f9fdc5dc89e255') build() { cd "${srcdir}" - gendesk + gendesk $startdir/PKGBUILD cd "${pkgname}-${pkgver}" sed -i 's/fairymax/gnuchess/g' {xaw,gtk}/xboard.h xboard.conf.in @@ -37,8 +37,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -Dm644 ${srcdir}/${pkgname}.png \ ${pkgdir}/usr/share/pixmaps/${pkgname}.png install -Dm755 ${srcdir}/${pkgname}-${pkgver}/cmail \ -- cgit v1.2.3-54-g00ecf From edb4c972d5d23fcff220b7d3c33d3202bcb16af3 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Sep 2013 02:21:59 -0700 Subject: Tue Sep 24 02:19:00 PDT 2013 --- community/flightgear/PKGBUILD | 8 +-- community/gloox/PKGBUILD | 6 +- community/minitube/PKGBUILD | 15 ++-- community/opendkim/PKGBUILD | 8 +-- community/qcad/PKGBUILD | 9 +-- community/rsyslog/PKGBUILD | 6 +- community/simgear/PKGBUILD | 10 +-- community/spice-gtk3/PKGBUILD | 7 +- community/squid/PKGBUILD | 6 +- community/sysstat/PKGBUILD | 8 +-- community/xboard/PKGBUILD | 8 +-- core/fakeroot/PKGBUILD | 6 +- extra/geoip/PKGBUILD | 21 ++++-- extra/geoip/pkgconfig.patch | 8 +++ extra/java7-openjdk/PKGBUILD | 116 +++++++++++++++--------------- extra/network-manager-applet/PKGBUILD | 6 +- extra/networkmanager-openconnect/PKGBUILD | 8 +-- extra/networkmanager-openvpn/PKGBUILD | 6 +- extra/networkmanager-pptp/PKGBUILD | 6 +- extra/networkmanager-vpnc/PKGBUILD | 8 +-- extra/networkmanager/PKGBUILD | 6 +- extra/serf/PKGBUILD | 20 ++++-- extra/subversion/PKGBUILD | 20 +++--- extra/vte3/PKGBUILD | 6 +- libre/bfgminer-libre/PKGBUILD | 6 +- libre/doublecmd-libre/PKGBUILD | 6 +- libre/icecat-noscript/PKGBUILD | 8 +-- libre/iceweasel-noscript/PKGBUILD | 6 +- pcr/sqlcipher/PKGBUILD | 31 ++++++++ 29 files changed, 222 insertions(+), 163 deletions(-) create mode 100644 extra/geoip/pkgconfig.patch create mode 100644 pcr/sqlcipher/PKGBUILD (limited to 'community/xboard/PKGBUILD') diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 61709421f..d38942ee4 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94473 2013-07-25 13:17:05Z spupykin $ +# $Id: PKGBUILD 97537 2013-09-23 17:38:40Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=flightgear -pkgver=2.10.0 -pkgrel=4 +pkgver=2.12.0 +pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') @@ -16,7 +16,7 @@ options=('!makeflags') #source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") #source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") -md5sums=('ae7fc8d1e446c5d1fe2aa82ee41dcac5') +md5sums=('23e2de5f311f4cbe94ec3386736ee8a5') build() { cd $srcdir/flightgear-$pkgver diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD index d2001f81e..845206f10 100644 --- a/community/gloox/PKGBUILD +++ b/community/gloox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93658 2013-07-08 11:17:28Z spupykin $ +# $Id: PKGBUILD 97518 2013-09-23 16:14:07Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea pkgname=gloox -pkgver=1.0.2 +pkgver=1.0.6 pkgrel=1 pkgdesc="C++ libraries for development of Jabber client/component/server" arch=(i686 x86_64) @@ -12,7 +12,7 @@ options=('!libtool') license=("GPL") depends=('libidn' 'gnutls') source=(http://camaya.net/download/gloox-$pkgver.tar.bz2) -md5sums=('4c446ee186406c3b3a24402418127faa') +md5sums=('80ba7fa1220913a9f67bf6f3183aafbd') build() { cd $srcdir/gloox-$pkgver diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD index 186477069..029cf3b1b 100644 --- a/community/minitube/PKGBUILD +++ b/community/minitube/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 97038 2013-09-11 07:54:39Z bpiotrowski $ +# $Id: PKGBUILD 97545 2013-09-23 20:44:05Z speps $ # Maintainer : speps # Contributor: Andrea Scarpino pkgname=minitube -pkgver=2.1 +pkgver=2.1.3 pkgrel=1 pkgdesc="A native YouTube client in Qt. Watch YouTube videos without Flash Player" arch=('i686' 'x86_64') url='http://flavio.tordini.org/minitube' -license=('GPL') +license=('GPL3') depends=('phonon') install="$pkgname.install" -source=("ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) -md5sums=('5851cb3e75b39ab7dfbdd45a8ebc6197' - 'SKIP') +source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('b43df4358de2e170d7e22370b39bd1ec') build() { - cd $pkgname-$pkgver + cd $pkgname qmake-qt4 } package() { - cd $pkgname-$pkgver + cd $pkgname make install INSTALL_ROOT="$pkgdir/" } diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index d88c3a5f1..16596caec 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91498 2013-05-23 10:14:14Z spupykin $ +# $Id: PKGBUILD 97519 2013-09-23 16:14:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Thomas Jost pkgname=opendkim -pkgver=2.8.3 -pkgrel=3 +pkgver=2.8.4 +pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" @@ -17,7 +17,7 @@ install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf opendkim.service) -md5sums=('0ae9d37e3221a244eb34c3e0e2d665cc' +md5sums=('17f667d022c167c7874a993e928d4a6d' '3e2bb1058ac0662f01e675aa6ac7ee8f' '85010750a21954e2d3cf5d57fe210d3f') diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index cf17e1398..b6919a163 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96852 2013-09-06 18:23:57Z spupykin $ +# $Id: PKGBUILD 97523 2013-09-23 16:15:04Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Stefan Husmann # Contributor: Giovanni Scafora # Contributor: Daniel J Griffiths pkgname=qcad -pkgver=3.2.2.2 +pkgver=3.3.1.0 pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('glu') options=(libtool) source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('49c05861b309c48f04ed7910b496e48c' +md5sums=('e6e469482b40515980c416e61482abc2' '35100eaedbdf6625f6e6a09b177854cd') prepare() { @@ -64,6 +64,7 @@ package() { install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop install -dm0755 $pkgdir/usr/bin - echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH exec ./qcad-bin' >$pkgdir/usr/bin/qcad + echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad + chmod 0755 $pkgdir/usr/bin/qcad } diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 4091d499c..f4d3b7021 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 93676 2013-07-08 11:20:55Z spupykin $ +# $Id: PKGBUILD 97525 2013-09-23 16:15:36Z spupykin $ # Maintainer: Sergej Pupykin pkgname=rsyslog -pkgver=7.4.2 +pkgver=7.4.4 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" @@ -22,7 +22,7 @@ options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('52ba87ddce153625ec4e4a2e60c4ec0e' +md5sums=('ebcc010a6205c28eb505c0fe862f32c6' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index af8420930..00b0628cf 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94470 2013-07-25 12:34:11Z spupykin $ +# $Id: PKGBUILD 97539 2013-09-23 17:39:01Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=simgear -pkgver=2.10.0 -pkgrel=2 +pkgver=2.12.0 +pkgrel=1 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) depends=('glut' 'freealut' 'plib' 'openscenegraph') @@ -17,12 +17,12 @@ options=('!makeflags') #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2" "osg-3.2.patch") -md5sums=('0ec974d3778f777d5c99c89db671fcc7' +md5sums=('dfc752f4759a2f795b7cdc9dad28411e' 'd7f35f02d88c6ef9c58e07b8431811e6') prepare() { cd $srcdir/simgear-$pkgver - patch -p1 <$srcdir/osg-3.2.patch +# patch -p1 <$srcdir/osg-3.2.patch } build() { diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD index 803951dfc..bd7afb102 100644 --- a/community/spice-gtk3/PKGBUILD +++ b/community/spice-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93453 2013-07-03 13:44:50Z spupykin $ +# $Id: PKGBUILD 97529 2013-09-23 16:16:35Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Stefano Facchini # Contributor: Jonathan Lestrelin @@ -6,8 +6,8 @@ # Contributor: Lucio Zara pkgname=spice-gtk3 -pkgver=0.20 -pkgrel=2 +pkgver=0.21 +pkgrel=1 pkgdesc="A Gtk client and libraries for SPICE remote desktop servers (gtk3 version)." arch=('x86_64' 'i686') url="http://spice-space.org" @@ -18,6 +18,7 @@ conflicts=('spice-gtk') options=('!libtool') source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2") sha256sums=('b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df') +sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564') build() { cd "$srcdir/spice-gtk-$pkgver" diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index b76e30b91..febc414d7 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94128 2013-07-14 18:31:46Z spupykin $ +# $Id: PKGBUILD 97531 2013-09-23 16:17:02Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Mark Coolen # Contributor: Tom Newsom # Contributor: Kevin Piche pkgname=squid -pkgver=3.3.8 +pkgver=3.3.9 pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') @@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('ec1654d28e29bdd2ee342ffb655ecc72' +md5sums=('f08bffe795260cecca828331c579e0c4' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e') diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 4e2d23b81..4348774e8 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92869 2013-06-17 10:57:15Z spupykin $ +# $Id: PKGBUILD 97533 2013-09-23 16:17:24Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Martin Devera pkgname=sysstat -pkgver=10.1.6 -pkgrel=2 +pkgver=10.1.7 +pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat' source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat.service lib64-fix.patch) -md5sums=('909135c84e36d780d501274e7450f924' +md5sums=('112c8cc92114c961709d09f6afa537bd' '12ba479c606620193e8b7c6e982d5088' '7ffa6bf990609d85367070f71b40a34b') diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index 33f49f31a..13c602417 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97081 2013-09-12 10:17:03Z spupykin $ +# $Id: PKGBUILD 97535 2013-09-23 16:17:42Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jason Chu # Contributor: Tom Newsom pkgname=xboard -pkgver=4.7.1 -pkgrel=3 +pkgver=4.7.2 +pkgrel=1 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64') url="http://www.gnu.org/software/xboard/" @@ -17,7 +17,7 @@ makedepends=('gendesk') optdepends=('perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('e42383c4594c24ebf2f9fdc5dc89e255') +md5sums=('83ec086cbf5c4bc362a188654a9332fc') build() { cd "${srcdir}" diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index 0ed7113df..aee4b7891 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186069 2013-05-20 23:10:56Z allan $ +# $Id: PKGBUILD 194710 2013-09-23 00:56:24Z allan $ # Maintainer: Allan McRae # Contributor: Jochem Kossen pkgname=fakeroot -pkgver=1.19 +pkgver=1.20 pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('3a00a1264cb31a815552050ef0c2468b') +md5sums=('9777a81d4d1878422447a1d0030c1f9f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD index e409fb486..bfef8fbc1 100644 --- a/extra/geoip/PKGBUILD +++ b/extra/geoip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183169 2013-04-18 10:54:20Z juergen $ +# $Id: PKGBUILD 194736 2013-09-23 12:28:32Z jgc $ # Maintainer: Dan McGee # Contributor: Manolis Tzanidakis pkgname=geoip -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=('i686' 'x86_64') @@ -12,11 +12,18 @@ license=('GPL') depends=('zlib' 'geoip-database') backup=('etc/geoip/GeoIP.conf') options=('!libtool' '!emptydirs') -source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz) -sha256sums=('d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2') +source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz + pkgconfig.patch) +sha256sums=('ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731' + '64a6a608beabdc553019237d7da808dc234f760c21040036b2f589eaebba5d10') + +prepare() { + cd GeoIP-$pkgver + patch -Np1 -i ../pkgconfig.patch +} build() { - cd "$srcdir/GeoIP-$pkgver" + cd GeoIP-$pkgver autoreconf -vi ./configure \ @@ -27,12 +34,12 @@ build() { } check() { - cd "$srcdir/GeoIP-$pkgver" + cd GeoIP-$pkgver make check } package() { - cd "$srcdir/GeoIP-$pkgver" + cd GeoIP-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/geoip/pkgconfig.patch b/extra/geoip/pkgconfig.patch new file mode 100644 index 000000000..ed3fee9e7 --- /dev/null +++ b/extra/geoip/pkgconfig.patch @@ -0,0 +1,8 @@ +--- GeoIP-1.5.1/geoip.pc.in.orig 2013-03-23 02:26:09.000000000 +0000 ++++ GeoIP-1.5.1/geoip.pc.in 2013-09-23 12:04:07.441555775 +0000 +@@ -1,4 +1,5 @@ + prefix=@prefix@ ++exec_prefix=${prefix} + libdir=@libdir@ + includedir=@includedir@ + datadir=@datarootdir@ diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 1743f2af7..5bd2ea109 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 193198 2013-08-18 17:27:18Z andyrtr $ +# $Id: PKGBUILD 194862 2013-09-23 20:40:54Z guillaume $ # Maintainer: Andreas Radke # Maintainer: Guillaume ALAUX # Contributor: Jan de Groot -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' - 'openjdk7-src' 'openjdk7-doc') +pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 _updatever=u40 -_icedtea_ver=2.4.1 +_icedtea_ver=2.4.2 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am -_CORBA_CHANGESET=23ae4e0e0cce -_JAXP_CHANGESET=5be6b670d08b -_JAXWS_CHANGESET=c0e48fdfb695 -_JDK_CHANGESET=65d95818d79e -_LANGTOOLS_CHANGESET=91c95fd8eea8 -_OPENJDK_CHANGESET=ae86c6974e8e +_CORBA_CHANGESET=5ea58899ae9f +_JAXP_CHANGESET=135f46e0e653 +_JAXWS_CHANGESET=a2ff16e5361f +_JDK_CHANGESET=4bf5ac86e0e4 +_LANGTOOLS_CHANGESET=06ea051f7ffe +_OPENJDK_CHANGESET=6125b83238df -_HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map +_HOTSPOT_CHANGESET=b732355257e3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -48,14 +47,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a' - 'f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a' - '618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395' - 'df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34' - '972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037' - '97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432' - '6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561' - 'f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42' +sha256sums=('3dab1edc5c0391bd67cfac60cbfb5c91aee6ea9726043252d9f216dfafd236b6' + 'bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b' + '41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8' + '3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde' + 'ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda' + '8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a' + 'd2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735' + '4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' @@ -72,7 +71,7 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz" "${_HOTSPOT_CHANGESET}.tar.gz") _jvmdir=/usr/lib/jvm/java-7-openjdk - + [ "$CARCH" = "x86_64" ] && _JARCH=amd64 [ "$CARCH" = "i686" ] && _JARCH=i386 @@ -159,8 +158,8 @@ package_jre7-openjdk-headless() { rm -f lib/fontconfig.*.properties.src rm -f lib/fontconfig.properties.src - install -d -m755 ${pkgdir}/${_jvmdir}/jre/ - cp -a bin lib ${pkgdir}/${_jvmdir}/jre + install -d -m755 ${pkgdir}${_jvmdir}/jre + cp -a bin lib ${pkgdir}${_jvmdir}/jre # Install man pages pushd ../../j2re-image/man @@ -172,22 +171,22 @@ package_jre7-openjdk-headless() { # more files that belong to the desktop package mkdir ${srcdir}/tmp-desktop-jre for file in \ - "/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \ - "/usr/share/man/ja/man1/policytool.1" \ - "/usr/share/man/man1/policytool.1"; do + "${_jvmdir}/jre/bin/policytool" \ + "${_jvmdir}/jre/lib/${_JARCH}/libjsoundalsa.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/libpulse-java.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/libsplashscreen.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/xawt/libmawt.so" \ + "/usr/share/man/ja/man1/policytool.1" \ + "/usr/share/man/man1/policytool.1"; do dirname=`dirname $file` install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true # mv file from fakeinstall to pkgdir mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file done - rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt + rmdir ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/xawt # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin + pushd ${pkgdir}${_jvmdir}/jre/bin install -m755 -d ${pkgdir}/usr/bin/ for file in *; do ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin @@ -195,8 +194,8 @@ package_jre7-openjdk-headless() { popd # Link JKS keystore from ca-certificates-java - rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" + rm -f ${pkgdir}${_jvmdir}/jre/lib/security/cacerts + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" # Set some variables install -m755 -d ${pkgdir}/etc/profile.d/ @@ -213,31 +212,36 @@ package_jre7-openjdk-headless() { # Put some more files under backup control install -m755 -d ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ # install dummy links to make them found by JAVA - cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/ + cd ${pkgdir}${_jvmdir}/jre/lib/ for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do ln -vsf /etc/java-7-openjdk/`basename $file` . done # some more install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security} - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/images/cursors/cursors.properties \ + ${pkgdir}/etc/java-7-openjdk/cursors/ + pushd ${pkgdir}${_jvmdir}/jre/lib/images/cursors/ ln -vsf /etc/java-7-openjdk/cursors/cursors.properties . popd - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management + mv ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password.template \ + ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password + mv ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl.template \ + ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl + install -m644 ${pkgdir}${_jvmdir}/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} \ + ${pkgdir}/etc/java-7-openjdk/management/ + pushd ${pkgdir}${_jvmdir}/jre/lib/management ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} . popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security + install -m644 ${pkgdir}${_jvmdir}/jre/lib/security/{java.policy,java.security,nss.cfg} \ + ${pkgdir}/etc/java-7-openjdk/security/ + pushd ${pkgdir}${_jvmdir}/jre/lib/security ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} . popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ + pushd ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/ ln -vsf /etc/java-7-openjdk/jvm.cfg . popd } @@ -257,7 +261,7 @@ package_jre7-openjdk() { mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin + pushd ${pkgdir}${_jvmdir}/jre/bin install -m755 -d ${pkgdir}/usr/bin/ for file in *; do ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin @@ -293,13 +297,13 @@ package_jdk7-openjdk() { cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" # Main files - install -m755 -d ${pkgdir}/${_jvmdir}/ + install -m755 -d ${pkgdir}${_jvmdir} - cp -a include lib ${pkgdir}/${_jvmdir} + cp -a include lib ${pkgdir}${_jvmdir} # 'bin' files pushd bin - install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ + install -m755 -d ${pkgdir}${_jvmdir}/bin/ \ ${pkgdir}/usr/bin/ \ ${pkgdir}/usr/share/man/{,ja/}man1/ @@ -307,10 +311,10 @@ package_jdk7-openjdk() { for b in $(ls | grep -v java-rmi.cgi); do if [ -e ../jre/bin/${b} ]; then # Provide a link of the jre binary in the jdk/bin/ directory - ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} + ln -s ../jre/bin/${b} ${pkgdir}${_jvmdir}/bin/${b} else # Copy binary to jdk/bin/ - install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} + install -m755 ${b} ${pkgdir}${_jvmdir}/bin/${b} # Copy man page install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 @@ -325,7 +329,7 @@ package_jdk7-openjdk() { install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications # Handling 'java-rmi.cgi' separately - install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + install -m755 -D bin/java-rmi.cgi ${pkgdir}${_jvmdir}/bin/java-rmi.cgi # Set some variables install -m755 -d ${pkgdir}/etc/profile.d/ @@ -333,7 +337,7 @@ package_jdk7-openjdk() { install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh # Temporarily fixing FS#35141 - chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar + chmod go+r ${pkgdir}${_jvmdir}/lib/sa-jdi.jar # link license install -m755 -d ${pkgdir}/usr/share/licenses @@ -345,7 +349,7 @@ package_openjdk7-src() { replaces=('openjdk6-src') install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ - ${pkgdir}/${_jvmdir}/src.zip + ${pkgdir}${_jvmdir}/src.zip } package_openjdk7-doc() { diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index c4ead710b..614bd4014 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187895 2013-06-07 21:36:22Z heftig $ +# $Id: PKGBUILD 194795 2013-09-23 17:22:29Z heftig $ # Maintainer: Jan de Groot # Contributor: Arjan Timmerman # Contributor: Wael Nasreddine @@ -6,7 +6,7 @@ # Contributor: Will Rea pkgname=network-manager-applet -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=(i686 x86_64) @@ -19,7 +19,7 @@ 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) -sha256sums=('a540c743971c199a7b8663a8d0a38eb66a4c13a6b5124cd3a7495c75560aadc7') +sha256sums=('f68849291047c94487279aab4a6cb90945ad351df02da621a73b413e6c6c198c') build() { cd ${pkgname}-${pkgver} diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 3715cfe43..209b9f644 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 187896 2013-06-07 21:36:56Z heftig $ +# $Id: PKGBUILD 194796 2013-09-23 17:23:08Z heftig $ # Maintainer: Ionut Biru pkgname=networkmanager-openconnect -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" 'openconnect' 'gconf' 'libgnome-keyring') +depends=("networkmanager>=${pkgver::5}" 'openconnect' 'libgnome-keyring' 'gtk3') makedepends=('intltool') 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=('8c3b393d155448d41f5de539d4920f0e5205a087aa5b25ed65601d6a370c44eb') +sha256sums=('99b4dc03da311026eaa4bee2ff3f141270e8ba4bf341762d4eeee7152be387b6') build() { cd NetworkManager-openconnect-${pkgver} diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 371ac8923..54fe7dcea 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187897 2013-06-07 21:37:29Z heftig $ +# $Id: PKGBUILD 194797 2013-09-23 17:23:43Z heftig $ # Maintainer: Ionut Biru pkgname=networkmanager-openvpn -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64') @@ -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=('d1c032f30e3c58d6d6bc371aad6d7e757f748d23a9240c077294492753078359') +sha256sums=('af8c52b6a61af3c178eed1ea8f1d4704bea87331fde43deb3d4aafe1821e6687') build() { cd NetworkManager-openvpn-${pkgver} diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index 1d243ef0c..ea583279d 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187898 2013-06-07 21:38:15Z heftig $ +# $Id: PKGBUILD 194798 2013-09-23 17:24:22Z heftig $ # Maintainer: Ionut Biru pkgname=networkmanager-pptp -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ 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=('7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac' +sha256sums=('97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8' '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215') prepare() { diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index 2735dd46d..1581d541b 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 187899 2013-06-07 21:38:48Z heftig $ +# $Id: PKGBUILD 194799 2013-09-23 17:25:00Z heftig $ # Maintainer: Ionut Biru pkgname=networkmanager-vpnc -pkgver=0.9.8.2 +pkgver=0.9.8.6 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring') +depends=("networkmanager>=${pkgver%.*}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring') 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) -sha256sums=('adf6f4abd29d3f0384ef55fdfea75e6cd56088a0ecdfed2454305fd9e08318a1') +sha256sums=('40306cd713d4e6e9df6a520d2992664d22173b3327e94df45a6dac23f0a8abd6') build() { cd NetworkManager-vpnc-${pkgver} diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index ad3dcf193..b93a02674 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187894 2013-06-07 21:35:29Z heftig $ +# $Id: PKGBUILD 194794 2013-09-23 17:21:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Jan de Groot # Contributor: Wael Nasreddine @@ -8,7 +8,7 @@ pkgname=networkmanager _pkgname=NetworkManager -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') @@ -28,7 +28,7 @@ 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) -sha256sums=('5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead' +sha256sums=('4c9ff0aaf52bee8df9a73290ec2b3f4441ff504420d0b0dfd729b00a92d80d99' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD index c5429b0c4..1bc1faa20 100644 --- a/extra/serf/PKGBUILD +++ b/extra/serf/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 193131 2013-08-17 07:19:26Z angvp $ -# Maintainer: Stéphane Gaudreault +# $Id: PKGBUILD 194737 2013-09-23 12:42:49Z angvp $ +# Maintainer: Angel Velasquez +# Contributor: Stéphane Gaudreault pkgname=serf -pkgver=1.3.0 -pkgrel=1 +pkgver=1.3.1 +pkgrel=2 pkgdesc="High-performance asynchronous HTTP client library" arch=('i686' 'x86_64') url="http://code.google.com/p/serf/" @@ -11,8 +12,15 @@ license=('Apache') depends=('apr-util') makedepends=('scons') options=('!libtool' '!staticlibs') -source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('14ed3e1dc195016a548499b3831f3df6b2501d27') +source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 'serf-ssl-allocator-v2.patch') +md5sums=('da5aca0cad19fd9c19129c3f8f7393dd' + 'a0ff486ee26f86cb2825decfd1dc8355') + +prepare() { + mv serf-ssl-allocator-v2.patch ${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} + patch -Np0 -i serf-ssl-allocator-v2.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 49bcc275d..630097a0d 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 193132 2013-08-17 07:19:28Z angvp $ +# $Id: PKGBUILD 194714 2013-09-23 03:35:04Z angvp $ # Maintainer: Angel Velasquez # Contributor: Stéphane Gaudreault # Contributor: Paul Mattal # Contributor: Jason Chu pkgname=subversion -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.3 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') url="http://subversion.apache.org/" @@ -24,13 +24,13 @@ provides=('svn') backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc} +source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9' +md5sums=('7d7bd97347a4491e1ffb529563ce2e9e' 'SKIP' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' @@ -60,11 +60,11 @@ build() { swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl swig-rb } -check() { - cd ${pkgname}-${pkgver} - export LANG=C LC_ALL=C - make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl -} +#check() { +# cd ${pkgname}-${pkgver} +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl +#} package() { cd ${pkgname}-${pkgver} diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index f2cf427a4..c82f7fcad 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189823 2013-07-08 16:52:35Z heftig $ +# $Id: PKGBUILD 194827 2013-09-23 18:45:48Z heftig $ # Maintainer: Ionut Biru pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.7 +pkgver=0.34.8 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') @@ -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=('187e49cca574f548d04ceea701e95a1531ff9dd9cd1953ce6455824720dab932') +sha256sums=('126ffb7d5a5da35639df003c84ff11ccc92f3fc8b1556d3e8b0f7314c8d909d0') build() { cd "vte-$pkgver" diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index 86e2bba5b..80e3d75e0 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96961 2013-09-09 10:42:24Z tredaelli $ +# $Id: PKGBUILD 97509 2013-09-23 12:27:29Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Andy Weidenbaum _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ license=('GPL3') options=(!libtool) source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 remove-dangerous-rpath.patch) -sha256sums=('39cd2b01d9096e837ccc4b3b0201711345d286f8fd02be20c3e79c8db94c122a' +sha256sums=('db8cdc4272950e12804961d21365ed96f3ef5262549cc0dfd6ebd2004e5d57d8' 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index 9c51e7fbf..8b8ec9477 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -1,12 +1,12 @@ # vim:set ft=sh: -# $Id: PKGBUILD 94327 2013-07-20 16:50:58Z idevolder $ +# $Id: PKGBUILD 97498 2013-09-22 18:08:53Z idevolder $ # Maintainer: BlackIkeEagle # Contributor: (sirocco AT ngs.ru) _pkgbase=doublecmd pkgbase=doublecmd-libre pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt') -pkgver=0.5.6 +pkgver=0.5.7 _helpver=0.5.5 pkgrel=1 url="http://doublecmd.sourceforge.net/" @@ -24,7 +24,7 @@ source=( "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz" "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz" ) -sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5' +sha256sums=('8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343' '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf') build() { diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 9ce528bd3..35e6d73c1 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $ +# $Id: PKGBUILD 97515 2013-09-23 16:13:35Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.6.7 -pkgrel=1.1 +pkgver=2.6.7.1 +pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('10b6704f34568d226fb5fe69b7d6043d') +md5sums=('fcc2cbd8792d215604e3fe89847bc936') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 2d5f48040..f6e6a2d43 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $ +# $Id: PKGBUILD 97515 2013-09-23 16:13:35Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.6.7 +pkgver=2.6.7.1 pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('10b6704f34568d226fb5fe69b7d6043d') +md5sums=('fcc2cbd8792d215604e3fe89847bc936') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/pcr/sqlcipher/PKGBUILD b/pcr/sqlcipher/PKGBUILD new file mode 100644 index 000000000..45a3efbe9 --- /dev/null +++ b/pcr/sqlcipher/PKGBUILD @@ -0,0 +1,31 @@ +pkgname=sqlcipher +pkgver=2.2.1 +pkgrel=1 +pkgdesc="SQLite extension that provides transparent 256-bit AES encryption of database files" +arch=('i686' 'x86_64') +url="http://sqlcipher.net/" +license=('BSD') +makedepends=('tcl' 'openssl' 'sqlite3' 'git') +source=($pkgname-$pkgver::git+https://github.com/sqlcipher/sqlcipher#tag=v${pkgver}) +sha1sums=('SKIP') +sha256sums=('SKIP') + +pkgver() { + echo $pkgver +} + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-tcl \ + --enable-tempstore=yes \ + CFLAGS="$CFLAGS -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR="$pkgdir/" install + install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} -- cgit v1.2.3-54-g00ecf From 5758d40da140a8e3602b08938ab5584a5afb0082 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 Sep 2013 03:23:44 -0700 Subject: Thu Sep 26 03:20:04 PDT 2013 --- community/awesome/PKGBUILD | 5 +- community/freerdp/PKGBUILD | 11 +- community/freerdp/patch_numblock.patch | 12 + ...store-user-group-ID-values-in-virIdentity.patch | 156 +++ ...stem-identity-includes-process-start-time.patch | 70 + ...-for-using-3-arg-pkcheck-syntax-for-proce.patch | 159 +++ community/libvirt/PKGBUILD | 22 +- community/nodejs/PKGBUILD | 6 +- community/tint2/PKGBUILD | 35 +- community/tint2/fix_defunct_processes.patch | 31 + community/tint2/middle_click_on_clock.patch | 75 + community/virtualbox-modules-lts/PKGBUILD | 6 +- community/xboard/PKGBUILD | 7 +- extra/dovecot/PKGBUILD | 8 +- extra/kdesdk-poxml/PKGBUILD | 4 +- extra/mariadb/PKGBUILD | 76 +- extra/php-xcache/PKGBUILD | 6 +- extra/pigeonhole/PKGBUILD | 6 +- extra/ruby/0001-remove-db-support.patch | 35 + extra/ruby/PKGBUILD | 15 +- extra/udisks2/PKGBUILD | 8 +- extra/xf86-video-fbdev/PKGBUILD | 16 +- extra/xf86-video-fbdev/git-fix.diff | 29 - extra/xf86-video-savage/PKGBUILD | 18 +- extra/xf86-video-savage/git_fixes.diff | 64 - .../3.11-haswell-intel_pstate.patch | 32 + kernels/linux-libre-pae/3.11.1-fix-skge.patch | 34 + kernels/linux-libre-pae/PKGBUILD | 20 +- .../3.11-haswell-intel_pstate.patch | 32 + kernels/linux-libre-xen/3.11.1-fix-skge.patch | 34 + kernels/linux-libre-xen/PKGBUILD | 20 +- libre/linux-libre/3.11-haswell-intel_pstate.patch | 32 + libre/linux-libre/3.11.1-fix-skge.patch | 34 + libre/linux-libre/PKGBUILD | 18 +- pcr/dratmenu/PKGBUILD | 36 + pcr/python-jedi/PKGBUILD | 23 + pcr/ttf-font-awesome/PKGBUILD | 19 + pcr/ttf-font-awesome/ttf-font-awesome.install | 20 + pcr/xfwm4-titleless/PKGBUILD | 46 + .../xfwm4-hide-titlebar-when-maximized.patch | 1456 ++++++++++++++++++++ pcr/xfwm4-titleless/xfwm4.install | 13 + 41 files changed, 2542 insertions(+), 207 deletions(-) create mode 100644 community/freerdp/patch_numblock.patch create mode 100644 community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch create mode 100644 community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch create mode 100644 community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch create mode 100644 community/tint2/fix_defunct_processes.patch create mode 100644 community/tint2/middle_click_on_clock.patch create mode 100644 extra/ruby/0001-remove-db-support.patch delete mode 100644 extra/xf86-video-fbdev/git-fix.diff delete mode 100644 extra/xf86-video-savage/git_fixes.diff create mode 100644 kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch create mode 100644 kernels/linux-libre-pae/3.11.1-fix-skge.patch create mode 100644 kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch create mode 100644 kernels/linux-libre-xen/3.11.1-fix-skge.patch create mode 100644 libre/linux-libre/3.11-haswell-intel_pstate.patch create mode 100644 libre/linux-libre/3.11.1-fix-skge.patch create mode 100644 pcr/dratmenu/PKGBUILD create mode 100644 pcr/python-jedi/PKGBUILD create mode 100644 pcr/ttf-font-awesome/PKGBUILD create mode 100644 pcr/ttf-font-awesome/ttf-font-awesome.install create mode 100644 pcr/xfwm4-titleless/PKGBUILD create mode 100644 pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch create mode 100644 pcr/xfwm4-titleless/xfwm4.install (limited to 'community/xboard/PKGBUILD') diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD index d308ec13e..fc53a149f 100644 --- a/community/awesome/PKGBUILD +++ b/community/awesome/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97098 2013-09-12 18:19:17Z seblu $ +# $Id: PKGBUILD 97620 2013-09-25 19:19:38Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Ronald van Haren @@ -6,7 +6,7 @@ pkgname=awesome pkgver=3.5.1 -pkgrel=2 +pkgrel=3 pkgdesc='Highly configurable framework window manager' arch=('i686' 'x86_64') url='http://awesome.naquadah.org/' @@ -42,6 +42,7 @@ optdepends=( 'vicious: widgets for the Awesome window manager' ) provides=('notification-daemon') +backup=('etc/xdg/awesome/rc.lua') source=("$url/download/$pkgname-$pkgver.tar.xz") md5sums=('f528f66ddcdb07f24e6f494837371702') diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 7f6f85ca4..9bee67b95 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94879 2013-08-01 06:54:53Z bpiotrowski $ +# $Id: PKGBUILD 97610 2013-09-25 13:56:48Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Stijn Segers pkgname=freerdp pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Free RDP client" arch=('i686' 'x86_64') url="http://freerdp.sourceforge.net" @@ -16,13 +16,16 @@ conflicts=('freerdp-git') changelog=${pkgname}.changelog options=('!libtool') source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz - ffmpeg2.0.patch) + ffmpeg2.0.patch + patch_numblock.patch) md5sums=('c260051a94caff590def5caa4fcf59d6' - '1260eecf01ea5212e2db8ac9c5e7fa6d') + '1260eecf01ea5212e2db8ac9c5e7fa6d' + 'ac581d445ded7cdbd59082a48d9c28ac') prepare() { cd $srcdir/FreeRDP-$pkgver patch -Np1 -i ../ffmpeg2.0.patch + patch -Np1 -i ../patch_numblock.patch } build() { diff --git a/community/freerdp/patch_numblock.patch b/community/freerdp/patch_numblock.patch new file mode 100644 index 000000000..62a23d582 --- /dev/null +++ b/community/freerdp/patch_numblock.patch @@ -0,0 +1,12 @@ +diff -u -r -N old/include/freerdp/kbd/vkcodes.h new/include/freerdp/kbd/vkcodes.h +--- old/include/freerdp/kbd/vkcodes.h 2013-09-19 12:46:07.124339712 +0200 ++++ new/include/freerdp/kbd/vkcodes.h 2013-09-19 12:45:51.621005583 +0200 +@@ -434,7 +434,7 @@ + { 0x00, 0, "VK_SEPARATOR" , NULL }, + { 0x4A, 0, "VK_SUBTRACT" , "KPSU" }, + { 0x53, 0, "VK_DECIMAL" , "KPDL" }, +- { 0x35, 0, "VK_DIVIDE" , "KPDV" }, ++ { 0x35, 1, "VK_DIVIDE" , "KPDV" }, + { 0x3B, 0, "VK_F1" , "FK01" }, + { 0x3C, 0, "VK_F2" , "FK02" }, + { 0x3D, 0, "VK_F3" , "FK03" }, diff --git a/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch b/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch new file mode 100644 index 000000000..70a613820 --- /dev/null +++ b/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch @@ -0,0 +1,156 @@ +From 02432e3afa32e9866fbf1317069b422ef552d1d4 Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Thu, 22 Aug 2013 16:00:01 +0100 +Subject: [PATCH 1/3] Also store user & group ID values in virIdentity + +Future improvements to the polkit code will require access to +the numeric user ID, not merely user name. + +Signed-off-by: Daniel P. Berrange +--- + src/rpc/virnetserverclient.c | 18 ++++++++++++++++++ + src/util/viridentity.c | 23 +++++++++++++++++++---- + src/util/viridentity.h | 2 ++ + 3 files changed, 39 insertions(+), 4 deletions(-) + +diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c +index 83d5cf1..f30dd08 100644 +--- a/src/rpc/virnetserverclient.c ++++ b/src/rpc/virnetserverclient.c +@@ -652,7 +652,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) + char *processid = NULL; + char *processtime = NULL; + char *username = NULL; ++ char *userid = NULL; + char *groupname = NULL; ++ char *groupid = NULL; + #if WITH_SASL + char *saslname = NULL; + #endif +@@ -672,8 +674,12 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) + + if (!(username = virGetUserName(uid))) + goto cleanup; ++ if (virAsprintf(&userid, "%d", uid) < 0) ++ goto cleanup; + if (!(groupname = virGetGroupName(gid))) + goto cleanup; ++ if (virAsprintf(&userid, "%d", gid) < 0) ++ goto cleanup; + if (virAsprintf(&processid, "%llu", + (unsigned long long)pid) < 0) + goto cleanup; +@@ -710,11 +716,21 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) + VIR_IDENTITY_ATTR_UNIX_USER_NAME, + username) < 0) + goto error; ++ if (userid && ++ virIdentitySetAttr(ret, ++ VIR_IDENTITY_ATTR_UNIX_USER_ID, ++ userid) < 0) ++ goto error; + if (groupname && + virIdentitySetAttr(ret, + VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, + groupname) < 0) + goto error; ++ if (groupid && ++ virIdentitySetAttr(ret, ++ VIR_IDENTITY_ATTR_UNIX_GROUP_ID, ++ groupid) < 0) ++ goto error; + if (processid && + virIdentitySetAttr(ret, + VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, +@@ -745,7 +761,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) + + cleanup: + VIR_FREE(username); ++ VIR_FREE(userid); + VIR_FREE(groupname); ++ VIR_FREE(groupid); + VIR_FREE(processid); + VIR_FREE(processtime); + VIR_FREE(seccontext); +diff --git a/src/util/viridentity.c b/src/util/viridentity.c +index 781f660..03c375b 100644 +--- a/src/util/viridentity.c ++++ b/src/util/viridentity.c +@@ -133,7 +133,9 @@ int virIdentitySetCurrent(virIdentityPtr ident) + virIdentityPtr virIdentityGetSystem(void) + { + char *username = NULL; ++ char *userid = NULL; + char *groupname = NULL; ++ char *groupid = NULL; + char *seccontext = NULL; + virIdentityPtr ret = NULL; + #if WITH_SELINUX +@@ -147,8 +149,13 @@ virIdentityPtr virIdentityGetSystem(void) + + if (!(username = virGetUserName(getuid()))) + goto cleanup; ++ if (virAsprintf(&userid, "%d", (int)getuid()) < 0) ++ goto cleanup; ++ + if (!(groupname = virGetGroupName(getgid()))) + goto cleanup; ++ if (virAsprintf(&groupid, "%d", (int)getgid()) < 0) ++ goto cleanup; + + #if WITH_SELINUX + if (getcon(&con) < 0) { +@@ -166,16 +173,22 @@ virIdentityPtr virIdentityGetSystem(void) + if (!(ret = virIdentityNew())) + goto cleanup; + +- if (username && +- virIdentitySetAttr(ret, ++ if (virIdentitySetAttr(ret, + VIR_IDENTITY_ATTR_UNIX_USER_NAME, + username) < 0) + goto error; +- if (groupname && +- virIdentitySetAttr(ret, ++ if (virIdentitySetAttr(ret, ++ VIR_IDENTITY_ATTR_UNIX_USER_ID, ++ userid) < 0) ++ goto error; ++ if (virIdentitySetAttr(ret, + VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, + groupname) < 0) + goto error; ++ if (virIdentitySetAttr(ret, ++ VIR_IDENTITY_ATTR_UNIX_GROUP_ID, ++ groupid) < 0) ++ goto error; + if (seccontext && + virIdentitySetAttr(ret, + VIR_IDENTITY_ATTR_SELINUX_CONTEXT, +@@ -188,7 +201,9 @@ virIdentityPtr virIdentityGetSystem(void) + + cleanup: + VIR_FREE(username); ++ VIR_FREE(userid); + VIR_FREE(groupname); ++ VIR_FREE(groupid); + VIR_FREE(seccontext); + VIR_FREE(processid); + return ret; +diff --git a/src/util/viridentity.h b/src/util/viridentity.h +index 4bae8d6..a240c2d 100644 +--- a/src/util/viridentity.h ++++ b/src/util/viridentity.h +@@ -29,7 +29,9 @@ typedef virIdentity *virIdentityPtr; + + typedef enum { + VIR_IDENTITY_ATTR_UNIX_USER_NAME, ++ VIR_IDENTITY_ATTR_UNIX_USER_ID, + VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, ++ VIR_IDENTITY_ATTR_UNIX_GROUP_ID, + VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, + VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, + VIR_IDENTITY_ATTR_SASL_USER_NAME, +-- +1.8.3.1 + diff --git a/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch b/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch new file mode 100644 index 000000000..1fba7d56c --- /dev/null +++ b/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch @@ -0,0 +1,70 @@ +From f26b6e44bf0c3efe8167a528141224ccb7623b4a Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Wed, 28 Aug 2013 15:22:05 +0100 +Subject: [PATCH 2/3] Ensure system identity includes process start time + +The polkit access driver will want to use the process start +time field. This was already set for network identities, but +not for the system identity. + +Signed-off-by: Daniel P. Berrange +--- + src/util/viridentity.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/util/viridentity.c b/src/util/viridentity.c +index 03c375b..f681f85 100644 +--- a/src/util/viridentity.c ++++ b/src/util/viridentity.c +@@ -35,6 +35,7 @@ + #include "virthread.h" + #include "virutil.h" + #include "virstring.h" ++#include "virprocess.h" + + #define VIR_FROM_THIS VIR_FROM_IDENTITY + +@@ -142,11 +143,20 @@ virIdentityPtr virIdentityGetSystem(void) + security_context_t con; + #endif + char *processid = NULL; ++ unsigned long long timestamp; ++ char *processtime = NULL; + + if (virAsprintf(&processid, "%llu", + (unsigned long long)getpid()) < 0) + goto cleanup; + ++ if (virProcessGetStartTime(getpid(), ×tamp) < 0) ++ goto cleanup; ++ ++ if (timestamp != 0 && ++ virAsprintf(&processtime, "%llu", timestamp) < 0) ++ goto cleanup; ++ + if (!(username = virGetUserName(getuid()))) + goto cleanup; + if (virAsprintf(&userid, "%d", (int)getuid()) < 0) +@@ -198,6 +208,11 @@ virIdentityPtr virIdentityGetSystem(void) + VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, + processid) < 0) + goto error; ++ if (processtime && ++ virIdentitySetAttr(ret, ++ VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, ++ processtime) < 0) ++ goto error; + + cleanup: + VIR_FREE(username); +@@ -206,6 +221,7 @@ cleanup: + VIR_FREE(groupid); + VIR_FREE(seccontext); + VIR_FREE(processid); ++ VIR_FREE(processtime); + return ret; + + error: +-- +1.8.3.1 + diff --git a/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch b/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch new file mode 100644 index 000000000..8882f1227 --- /dev/null +++ b/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch @@ -0,0 +1,159 @@ +From 4a061ec8fe94857dd21acf401c66195ec51b1234 Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Wed, 28 Aug 2013 15:25:40 +0100 +Subject: [PATCH 3/3] Add support for using 3-arg pkcheck syntax for process + +With the existing pkcheck (pid, start time) tuple for identifying +the process, there is a race condition, where a process can make +a libvirt RPC call and in another thread exec a setuid application, +causing it to change to effective UID 0. This in turn causes polkit +to do its permission check based on the wrong UID. + +To address this, libvirt must get the UID the caller had at time +of connect() (from SO_PEERCRED) and pass a (pid, start time, uid) +triple to the pkcheck program. + +Signed-off-by: Colin Walters +Signed-off-by: Daniel P. Berrange +--- + configure.ac | 8 ++++++++ + daemon/remote.c | 21 +++++++++++++++++--- + src/access/viraccessdriverpolkit.c | 40 +++++++++++++++++++++++++++++++++----- + 3 files changed, 61 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 94a2e19..3dfbb4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1184,6 +1184,14 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then + AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH]) + if test "x$PKCHECK_PATH" != "x" ; then + AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program]) ++ AC_MSG_CHECKING([whether pkcheck supports uid value]) ++ pkcheck_supports_uid=$($PKG_CONFIG --variable pkcheck_supports_uid polkit-gobject-1) ++ if test "x$pkcheck_supports_uid" = "xtrue"; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([PKCHECK_SUPPORTS_UID], 1, [Pass uid to pkcheck]) ++ else ++ AC_MSG_RESULT([no]) ++ fi + AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, + [use PolicyKit for UNIX socket access checks]) + AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1, +diff --git a/daemon/remote.c b/daemon/remote.c +index 03d5557..6132091 100644 +--- a/daemon/remote.c ++++ b/daemon/remote.c +@@ -2731,10 +2731,12 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, + int status = -1; + char *ident = NULL; + bool authdismissed = 0; ++ bool supportsuid = 0; + char *pkout = NULL; + struct daemonClientPrivate *priv = + virNetServerClientGetPrivateData(client); + virCommandPtr cmd = NULL; ++ static bool polkitInsecureWarned = false; + + virMutexLock(&priv->lock); + action = virNetServerClientGetReadonly(client) ? +@@ -2756,14 +2758,27 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, + goto authfail; + } + ++ if (timestamp == 0) { ++ VIR_WARN("Failing polkit auth due to missing client (pid=%lld) start time", ++ (long long)callerPid); ++ goto authfail; ++ } ++ + VIR_INFO("Checking PID %lld running as %d", + (long long) callerPid, callerUid); + + virCommandAddArg(cmd, "--process"); +- if (timestamp != 0) { +- virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp); ++# ifdef PKCHECK_SUPPORTS_UID ++ supportsuid = 1; ++# endif ++ if (supportsuid) { ++ virCommandAddArgFormat(cmd, "%lld,%llu,%lu", (long long) callerPid, timestamp, (unsigned long) callerUid); + } else { +- virCommandAddArgFormat(cmd, "%lld", (long long) callerPid); ++ if (!polkitInsecureWarned) { ++ VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure."); ++ polkitInsecureWarned = true; ++ } ++ virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp); + } + virCommandAddArg(cmd, "--allow-user-interaction"); + +diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c +index 4c76e64..d980820 100644 +--- a/src/access/viraccessdriverpolkit.c ++++ b/src/access/viraccessdriverpolkit.c +@@ -72,8 +72,12 @@ static char * + virAccessDriverPolkitFormatProcess(const char *actionid) + { + virIdentityPtr identity = virIdentityGetCurrent(); +- const char *process = NULL; ++ const char *callerPid = NULL; ++ const char *callerTime = NULL; ++ const char *callerUid = NULL; + char *ret = NULL; ++ bool supportsuid = 0; ++ static bool polkitInsecureWarned = false; + + if (!identity) { + virAccessError(VIR_ERR_ACCESS_DENIED, +@@ -81,17 +85,43 @@ virAccessDriverPolkitFormatProcess(const char *actionid) + actionid); + return NULL; + } +- if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &process) < 0) ++ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &callerPid) < 0) ++ goto cleanup; ++ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, &callerTime) < 0) ++ goto cleanup; ++ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_USER_ID, &callerUid) < 0) + goto cleanup; + +- if (!process) { ++ if (!callerPid) { + virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No UNIX process ID available")); + goto cleanup; + } +- +- if (VIR_STRDUP(ret, process) < 0) ++ if (!callerTime) { ++ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", ++ _("No UNIX process start time available")); ++ goto cleanup; ++ } ++ if (!callerUid) { ++ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", ++ _("No UNIX caller UID available")); + goto cleanup; ++ } ++ ++#ifdef PKCHECK_SUPPORTS_UID ++ supportsuid = 1; ++#endif ++ if (supportsuid) { ++ if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0) ++ goto cleanup; ++ } else { ++ if (!polkitInsecureWarned) { ++ VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure."); ++ polkitInsecureWarned = true; ++ } ++ if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0) ++ goto cleanup; ++ } + + cleanup: + virObjectUnref(identity); +-- +1.8.3.1 + diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index bb7d38bc7..cfeb7738b 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96612 2013-09-02 10:46:37Z spupykin $ +# $Id: PKGBUILD 97608 2013-09-25 13:45:00Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -32,11 +32,25 @@ install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d - libvirt.tmpfiles.d) + libvirt.tmpfiles.d + 0001-Also-store-user-group-ID-values-in-virIdentity.patch + 0002-Ensure-system-identity-includes-process-start-time.patch + 0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch) md5sums=('1835bbfa492099bce12e2934870e5611' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f') + '020971887442ebbf1b6949e031c8dd3f' + '60912fc049f0e8cf8d89c919ea619415' + 'a42387495f75dd918a6c25b36eb3b428' + '2dba51f17f37f59585852092e4c86e44') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/0001-Also-store-user-group-ID-values-in-virIdentity.patch + patch -p1 <$srcdir/0002-Ensure-system-identity-includes-process-start-time.patch + patch -p1 <$srcdir/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch + autoreconf +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index c17656108..1f5b7434a 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96776 2013-09-04 21:38:52Z bpiotrowski $ +# $Id: PKGBUILD 97596 2013-09-25 06:59:41Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.18 +pkgver=0.10.19 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('3ee4436473869d4d84bb5cad4352b09ace00656467eca7d6db7cd7da5b8c5495') +sha256sums=('e50787672cdf6afa6caeef9345ca40c4a69f96a31829a0884ea6ed63dfdde21e') prepare() { cd node-v$pkgver diff --git a/community/tint2/PKGBUILD b/community/tint2/PKGBUILD index 09bc4aff4..2571b8dee 100644 --- a/community/tint2/PKGBUILD +++ b/community/tint2/PKGBUILD @@ -1,43 +1,50 @@ -# $Id: PKGBUILD 64903 2012-02-18 20:04:04Z bpiotrowski $ +# $Id: PKGBUILD 97618 2013-09-25 18:19:34Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Blue Peppers # Contributor: Stefan Husmann< stefan-husmann@t-online.de> pkgname=tint2 pkgver=0.11 -pkgrel=5 -pkgdesc="A basic, good-looking task manager for WMs" +pkgrel=6 +pkgdesc='Basic, good-looking task manager for WMs' arch=('i686' 'x86_64') url="http://code.google.com/p/tint2/" license=('GPL2') conflicts=('ttm-svn' 'tint') replaces=('tint') depends=('gtk2' 'imlib2') -optdepends=('pygtk: for using tint2conf') +optdepends=('pygtk: for tint2wizard') makedepends=('pygtk' 'cmake') provides=('tint') -source=("http://$pkgname.googlecode.com/files/$pkgname-${pkgver}.tar.bz2" - 'add-power-now-support.patch') +source=(http://tint2.googlecode.com/files/tint2-$pkgver.tar.bz2 + add-power-now-support.patch + fix_defunct_processes.patch + middle_click_on_clock.patch) md5sums=('6fc5731e7425125fa84a2add5cef4bff' - '6cfcad028f1bd2f69812167f5395f890') + '6cfcad028f1bd2f69812167f5395f890' + 'b3d052ac5ada81c56e36133b1ecdee8c' + 'f7918d29a87422aab6fb9d922867d8f8') -build() { - cd "$srcdir/$pkgname-${pkgver}" +prepare() { + cd $pkgname-$pkgver - # add support for power_now battery attribute (fixes FS#21954) patch -Np0 -i ../add-power-now-support.patch + patch -Np0 -i ../fix_defunct_processes.patch + patch -Np0 -i ../middle_click_on_clock.patch # python2 fix sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/tint2conf/tintwizard.py sed -i 's_python _python2 _' src/tint2conf/main.c +} + +build() { + cd $pkgname-$pkgver - [ -d build ] || mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr ../ + cmake -DCMAKE_INSTALL_PREFIX=/usr . make } package() { - cd "$srcdir/$pkgname-${pkgver}/build" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/tint2/fix_defunct_processes.patch b/community/tint2/fix_defunct_processes.patch new file mode 100644 index 000000000..28ea6c27a --- /dev/null +++ b/community/tint2/fix_defunct_processes.patch @@ -0,0 +1,31 @@ +http://code.google.com/p/tint2/issues/detail?id=430 +Submitted By: David B. Cortarello (Nomius) +Date: 18-05-2013 +Initial Package Version: subversion trunk (revision 652) +Description: Fix zombie (defunct) processes created in clock_action. +This patch provides the following bugfixes: + * This patch uses waitpid with WNOHANG to eliminate all zombie processes created by tint2 (in particular by the clock -right or left- click). This is done by a small hack in the update_clocks_min, called to "redraw" that area. + +--- src/clock/clock.c (revision 652) ++++ src/clock/clock.c (working copy) +@@ -23,6 +23,8 @@ + #include + #include + #include ++#include ++#include + + #include "window.h" + #include "server.h" +@@ -98,6 +103,10 @@ + // remember old_sec because after suspend/hibernate the clock should be updated directly, and not + // on next minute change + time_t old_sec = time_clock.tv_sec; ++ ++ // Little hack to wait executed commands in clock_action avoiding zombies ++ waitpid(-1, NULL, WNOHANG); ++ + gettimeofday(&time_clock, 0); + if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) { + int i; + diff --git a/community/tint2/middle_click_on_clock.patch b/community/tint2/middle_click_on_clock.patch new file mode 100644 index 000000000..800c15c44 --- /dev/null +++ b/community/tint2/middle_click_on_clock.patch @@ -0,0 +1,75 @@ +http://code.google.com/p/tint2/issues/detail?id=430 +Submitted By: David B. Cortarello (Nomius) +Date: 18-05-2013 +Initial Package Version: subversion trunk (revision 652) +Description: Implemented middle click mouse button in the clock to execute tasks. +* Implemented middle click mouse button over the clock by accepting the button 2 in the clock_action. +* A new configuration parameter was created called clock_mclick_command, which works in the same way +* clock_lclick_command and clock_rclick_command does. + +Index: src/clock/clock.c +=================================================================== +--- src/clock/clock.c (revision 652) ++++ src/clock/clock.c (working copy) +@@ -39,6 +41,7 @@ + char *time_tooltip_format; + char *time_tooltip_timezone; + char *clock_lclick_command; ++char *clock_mclick_command; + char *clock_rclick_command; + struct timeval time_clock; + PangoFontDescription *time1_font_desc; +@@ -61,6 +64,7 @@ + time_tooltip_format = 0; + time_tooltip_timezone = 0; + clock_lclick_command = 0; ++ clock_mclick_command = 0; + clock_rclick_command = 0; + time1_font_desc = 0; + time2_font_desc = 0; +@@ -77,6 +81,7 @@ + if (time2_timezone) g_free(time2_timezone); + if (time_tooltip_timezone) g_free(time_tooltip_timezone); + if (clock_lclick_command) g_free(clock_lclick_command); ++ if (clock_mclick_command) g_free(clock_mclick_command); + if (clock_rclick_command) g_free(clock_rclick_command); + if (clock_timeout) stop_timeout(clock_timeout); + } +@@ -254,6 +263,9 @@ + case 1: + command = clock_lclick_command; + break; ++ case 2: ++ command = clock_mclick_command; ++ break; + case 3: + command = clock_rclick_command; + break; +Index: src/clock/clock.h +=================================================================== +--- src/clock/clock.h (revision 652) ++++ src/clock/clock.h (working copy) +@@ -33,6 +33,7 @@ + extern PangoFontDescription *time1_font_desc; + extern PangoFontDescription *time2_font_desc; + extern char *clock_lclick_command; ++extern char *clock_mclick_command; + extern char *clock_rclick_command; + extern int clock_enabled; + +Index: src/config.c +=================================================================== +--- src/config.c (revision 652) ++++ src/config.c (working copy) +@@ -396,6 +396,10 @@ + if (strlen(value) > 0) + clock_lclick_command = strdup(value); + } ++ else if (strcmp(key, "clock_mclick_command") == 0) { ++ if (strlen(value) > 0) ++ clock_mclick_command = strdup(value); ++ } + else if (strcmp(key, "clock_rclick_command") == 0) { + if (strlen(value) > 0) + clock_rclick_command = strdup(value); + diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index 22476422e..85bee4fb0 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97440 2013-09-20 06:39:24Z bpiotrowski $ +# $Id: PKGBUILD 97616 2013-09-25 18:03:31Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Ionut Biru # Contributor: Sébastien Luttringer @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') pkgver=4.2.18 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -53,7 +53,7 @@ package_virtualbox-guest-modules-lts(){ depends=('linux-lts>=3.10' 'linux-lts<3.11') replaces=('virtualbox-archlinux-modules-lts') conflicts=('virtualbox-archlinux-modules-lts') - provides=("virtualbox-host-modules=$pkgver") + provides=("virtualbox-guest-modules=$pkgver") install=virtualbox-guest-modules-lts.install cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index 13c602417..f9687dc57 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97535 2013-09-23 16:17:42Z spupykin $ +# $Id: PKGBUILD 97605 2013-09-25 13:39:22Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jason Chu # Contributor: Tom Newsom pkgname=xboard pkgver=4.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64') url="http://www.gnu.org/software/xboard/" @@ -29,7 +29,8 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --sysconfdir=/etc \ - --with-gtk + --with-gtk \ + --enable-zippy make } diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 4c7da1644..faec2395f 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192152 2013-08-06 14:10:47Z andyrtr $ +# $Id: PKGBUILD 195140 2013-09-25 15:41:44Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Paul Mattal # Contributor: Federico Quagliata (quaqo) @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('0096442e2a1739b1b7997a833248a263' +md5sums=('db65988ef2e6889dd8b49c132b21fc8f' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') @@ -32,7 +32,7 @@ build() { cd ${srcdir}/$pkgname-$pkgver # fix build with recent clucene (FC) - sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in +# sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in # fix path in helper script sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD index 70346c1a9..7ac28eecf 100644 --- a/extra/kdesdk-poxml/PKGBUILD +++ b/extra/kdesdk-poxml/PKGBUILD @@ -3,14 +3,14 @@ pkgname=kdesdk-poxml pkgver=4.11.1 -pkgrel=1 +pkgrel=2 pkgdesc='Translates DocBook XML files using gettext po files' url='https://projects.kde.org/projects/kde/kdesdk/poxml' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdesdk') depends=('kdelibs') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'antlr2') optdepends=('antlr2: required for po2xml and swappo tool') source=("http://download.kde.org/stable/${pkgver}/src/poxml-${pkgver}.tar.xz") sha1sums=('5c43a53f4106d80826865590a218ea63aa6c15c7') diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 25560318d..1125dfc74 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 193074 2013-08-15 15:18:16Z bpiotrowski $ +# $Id: PKGBUILD 195113 2013-09-25 07:07:22Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski pkgbase=mariadb -pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.32 -pkgrel=2 +pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb') +pkgver=5.5.33.a +_pkgver=${pkgver/.a/a} +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url='http://mariadb.org/' makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') -source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz +source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468' +sha256sums=('adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') +prepare() { + cd $pkgbase-$_pkgver + sed -i '63d' storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake +} + build() { - cd $srcdir mkdir build cd build - cmake ../$pkgbase-$pkgver \ + cmake ../$pkgbase-$_pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -53,6 +58,7 @@ build() { -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITH_TOKUDB_STORAGE_ENGINE=1 \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ -DWITHOUT_PBXT_STORAGE_ENGINE=1 \ @@ -70,16 +76,15 @@ package_libmariadbclient() { conflicts=('libmysqlclient') provides=("libmysqlclient=$pkgver") - cd "$srcdir"/build + cd build for dir in include libmysql libmysqld libservices; do make -C $dir DESTDIR="$pkgdir" install done - install -d "$pkgdir"/usr/bin - install -m755 scripts/mysql_config "$pkgdir"/usr/bin/ + install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config install -d "$pkgdir"/usr/share/man/man1 for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 done } @@ -89,17 +94,26 @@ package_mariadb-clients() { conflicts=('mysql-clients') provides=("mysql-clients=$pkgver") - cd "$srcdir"/build + cd build make -C client DESTDIR="$pkgdir" install # install man pages install -d "$pkgdir"/usr/share/man/man1 for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 done # provided by mariadb rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} + +} + +package_mytop() { + pkgdesc='Top clone for MariaDB' + depends=('perl-dbd-mysql' 'perl-term-readkey') + + cd build + install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop } package_mariadb() { @@ -107,31 +121,33 @@ package_mariadb() { backup=('etc/mysql/my.cnf') install=mariadb.install depends=('mariadb-clients' 'inetutils') - conflicts=('mysql' 'mytop') - provides=("mysql=$pkgver" 'mytop') - optdepends=('perl-dbd-mysql: mytop dependency' - 'perl-term-readkey: mytop dependency') + conflicts=('mysql') + provides=("mysql=$pkgver") options=('emptydirs') - cd "$srcdir"/build + cd build make DESTDIR="$pkgdir" install install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf - install -Dm755 "$srcdir"/mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post - install -Dm644 "$srcdir"/mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service - install -Dm644 "$srcdir"/mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf + install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post + install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service + install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf # provided by libmariadbclient - rm "$pkgdir"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} - rm "$pkgdir"/usr/lib/libmysql* - rm -r "$pkgdir"/usr/include/ - rm "$pkgdir"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + cd "$pkgdir" + rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} + rm usr/lib/libmysql* + rm -r usr/include/ + rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 # provided by mariadb-clients - rm "$pkgdir"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm "$pkgdir"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + + # provided by mytop + rm usr/bin/mytop # not needed - rm -r "$pkgdir"/usr/{data,mysql-test,sql-bench} - rm "$pkgdir"/usr/share/man/man1/mysql-test-run.pl.1 + rm -r usr/{data,mysql-test,sql-bench} + rm usr/share/man/man1/mysql-test-run.pl.1 } diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD index 37b93da0d..a995f2197 100644 --- a/extra/php-xcache/PKGBUILD +++ b/extra/php-xcache/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194213 2013-09-10 15:28:33Z pierre $ +# $Id: PKGBUILD 195126 2013-09-25 11:18:14Z pierre $ # Maintainer: Pierre Schmitz pkgname=php-xcache pkgver=3.1.0dev -_svnrev=1368 -pkgrel=13 +_svnrev=1394 +pkgrel=14 arch=('i686' 'x86_64') pkgdesc='A PHP opcode cacher' url='http://xcache.lighttpd.net/' diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 34046030f..1d1fd930e 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192153 2013-08-06 14:10:47Z andyrtr $ +# $Id: PKGBUILD 195141 2013-09-25 15:41:45Z andyrtr $ # Maintainer: Andreas Radke # Contributorr: Peter Lewis @@ -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.5 +_dcpkgver=2.2.6 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" diff --git a/extra/ruby/0001-remove-db-support.patch b/extra/ruby/0001-remove-db-support.patch new file mode 100644 index 000000000..bdd7e5871 --- /dev/null +++ b/extra/ruby/0001-remove-db-support.patch @@ -0,0 +1,35 @@ +From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic +Date: Sat, 10 Aug 2013 10:50:16 -0700 +Subject: [PATCH] remove db support + +--- + ext/dbm/extconf.rb | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb +index 32a9446..2412404 100644 +--- a/ext/dbm/extconf.rb ++++ b/ext/dbm/extconf.rb +@@ -5,17 +5,11 @@ dir_config("dbm") + if dblib = with_config("dbm-type", nil) + dblib = dblib.split(/[ ,]+/) + else +- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm) ++ dblib = %w(libc gdbm_compat gdbm qdbm) + end + + headers = { + "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc. +- "db" => ["db.h"], +- "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"], +- "db2" => ["db2/db.h", "db2.h", "db.h"], +- "db3" => ["db3/db.h", "db3.h", "db.h"], +- "db4" => ["db4/db.h", "db4.h", "db.h"], +- "db5" => ["db5/db.h", "db5.h", "db.h"], + "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1 + "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0 + "qdbm" => ["qdbm/relic.h", "relic.h"], +-- +1.8.3.4 + diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 2446d2a73..5737c5a6a 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -5,20 +5,25 @@ pkgname=('ruby' 'ruby-docs') pkgver=2.0.0_p247 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') -makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" - 'gemrc') + 'gemrc' + '0001-remove-db-support.patch') md5sums=('60913f3eec0c4071f44df42600be2604' - '6fb8e7a09955e0f64be3158fb4a27e7a') + '6fb8e7a09955e0f64be3158fb4a27e7a' + 'b93ff50214a3da26525244cf37b71a8f') build() { cd ruby-${pkgver//_/-} + # use gdbm because db v6 changed the license to AGPL + patch -Np1 -i ${srcdir}/0001-remove-db-support.patch + PKG_CONFIG=/usr/bin/pkg-config ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -37,7 +42,7 @@ check() { package_ruby() { pkgdesc='An object-oriented language for quick and easy programming' - depends=('openssl' 'libffi' 'libyaml') + depends=('gdbm' 'openssl' 'libffi' 'libyaml') optdepends=('tk: for Ruby/TK' 'ruby-docs: Ruby documentation') provides=('rubygems' 'rake') diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index 3ad4e5588..53aa1d3d4 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194551 2013-09-18 12:53:28Z tomegun $ +# $Id: PKGBUILD 195132 2013-09-25 13:30:53Z jgc $ # Maintainer: Ionut Biru pkgname=udisks2 pkgver=2.1.1 -pkgrel=1 +pkgrel=3 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -11,7 +11,9 @@ license=('GPL2') depends=('glib2' 'systemd' 'polkit' 'libatasmart' 'util-linux') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python') optdepends=('parted: partition management' - 'gptfdisk: GUID partition table support') + 'gptfdisk: GUID partition table support' + 'ntfs-3g: NTFS filesystem management support' + 'dosfstools: VFAT filesystem management support') options=(!libtool) source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) sha256sums=('013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb') diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD index 6d7cec9fe..ec16a2fea 100644 --- a/extra/xf86-video-fbdev/PKGBUILD +++ b/extra/xf86-video-fbdev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180197 2013-03-18 16:09:06Z andyrtr $ +# $Id: PKGBUILD 195144 2013-09-25 17:08:11Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-fbdev -pkgver=0.4.3 -pkgrel=3 +pkgver=0.4.4 +pkgrel=1 pkgdesc="X.org framebuffer video driver" arch=(i686 x86_64) license=('custom') @@ -13,19 +13,17 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff) -sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831' - '4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git-fix.diff + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xf86-video-fbdev/git-fix.diff b/extra/xf86-video-fbdev/git-fix.diff deleted file mode 100644 index 138d5bc2a..000000000 --- a/extra/xf86-video-fbdev/git-fix.diff +++ /dev/null @@ -1,29 +0,0 @@ -From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:54:37 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -diff --git a/src/fbdev.c b/src/fbdev.c -index cd7ebc5..f5a7378 100644 ---- a/src/fbdev.c -+++ b/src/fbdev.c -@@ -14,7 +14,6 @@ - #include "xf86_OSproc.h" - - #include "mipointer.h" --#include "mibstore.h" - #include "micmap.h" - #include "colormapst.h" - #include "xf86cmap.h" -@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) - } - - xf86SetBlackWhitePixels(pScreen); -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD index d5f9a2eea..08158f8fc 100644 --- a/extra/xf86-video-savage/PKGBUILD +++ b/extra/xf86-video-savage/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $ +# $Id: PKGBUILD 195146 2013-09-25 17:11:53Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-savage -pkgver=2.3.6 -pkgrel=4 +pkgver=2.3.7 +pkgrel=1 pkgdesc="X.org savage video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,21 +14,17 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS optdepends=('savage-dri: DRI1 support from community repo') options=(!libtool) groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git_fixes.diff) -sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6' - 'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.diff + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff deleted file mode 100644 index 8d5ef49b0..000000000 --- a/extra/xf86-video-savage/git_fixes.diff +++ /dev/null @@ -1,64 +0,0 @@ -From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 18 Jul 2012 08:52:38 +0000 -Subject: savage: move compat-api.h down to proper place. - -This screws up when DRI isn't enabled. - -Signed-off-by: Dave Airlie ---- -diff --git a/src/savage_driver.h b/src/savage_driver.h -index b604292..ec4b1ea 100644 ---- a/src/savage_driver.h -+++ b/src/savage_driver.h -@@ -85,8 +85,6 @@ - #include "GL/glxint.h" - #include "xf86drm.h" - --#include "compat-api.h" -- - /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up - * to 32 clients. */ - #define SAVAGE_NUM_BUFFERS 32 -@@ -153,6 +151,8 @@ typedef struct _server{ - - #endif - -+#include "compat-api.h" -+ - typedef enum { - MT_NONE, - MT_CRT, --- -cgit v0.9.0.2-2-gbebe -From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Sat, 22 Dec 2012 10:00:00 +0000 -Subject: savage: fix default accel arch when built with no XAA - -Signed-off-by: Dave Airlie ---- -diff --git a/src/savage_driver.c b/src/savage_driver.c -index 026bf5c..5b49e60 100644 ---- a/src/savage_driver.c -+++ b/src/savage_driver.c -@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) - from = X_DEFAULT; - char *strptr; - if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { -+#ifdef HAVE_XAA_H - if(!xf86NameCmp(strptr,"XAA")) { - from = X_CONFIG; - psav->useEXA = FALSE; -@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) - from = X_CONFIG; - psav->useEXA = TRUE; - } -+#else -+ psav->useEXA = TRUE; -+#endif - } - xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", - psav->useEXA ? "EXA" : "XAA"); --- -cgit v0.9.0.2-2-gbebe diff --git a/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch b/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch new file mode 100644 index 000000000..1f376b518 --- /dev/null +++ b/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch @@ -0,0 +1,32 @@ +From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001 +From: Nell Hardcastle +Date: Sun, 30 Jun 2013 22:58:57 +0000 +Subject: intel_pstate: Add Haswell CPU models + +Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge +model (0x3E) is also included. Models referenced from +tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit + +Signed-off-by: Nell Hardcastle +Acked-by: Viresh Kumar +Acked-by: Dirk Brandewie +Signed-off-by: Rafael J. Wysocki +--- +diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c +index 6efd96c..9733f29 100644 +--- a/drivers/cpufreq/intel_pstate.c ++++ b/drivers/cpufreq/intel_pstate.c +@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { + ICPU(0x2a, default_policy), + ICPU(0x2d, default_policy), + ICPU(0x3a, default_policy), ++ ICPU(0x3c, default_policy), ++ ICPU(0x3e, default_policy), ++ ICPU(0x3f, default_policy), ++ ICPU(0x45, default_policy), ++ ICPU(0x46, default_policy), + {} + }; + MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids); +-- +cgit v0.9.2 diff --git a/kernels/linux-libre-pae/3.11.1-fix-skge.patch b/kernels/linux-libre-pae/3.11.1-fix-skge.patch new file mode 100644 index 000000000..26d90e080 --- /dev/null +++ b/kernels/linux-libre-pae/3.11.1-fix-skge.patch @@ -0,0 +1,34 @@ +--- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400 ++++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400 +@@ -3086,23 +3086,27 @@ + PCI_DMA_FROMDEVICE); + skge_rx_reuse(e, skge->rx_buf_size); + } else { ++ struct skge_element ee; + struct sk_buff *nskb; + + nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); + if (!nskb) + goto resubmit; + ++ ee = *e; ++ ++ skb = ee.skb; ++ prefetch(skb->data); ++ + if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) { + dev_kfree_skb(nskb); + goto resubmit; + } + + pci_unmap_single(skge->hw->pdev, +- dma_unmap_addr(e, mapaddr), +- dma_unmap_len(e, maplen), ++ dma_unmap_addr(&ee, mapaddr), ++ dma_unmap_len(&ee, maplen), + PCI_DMA_FROMDEVICE); +- skb = e->skb; +- prefetch(skb->data); + } + + skb_put(skb, len); diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 2ca4cb45f..73b12e493 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194378 2013-09-15 09:16:34Z tpowa $ +# $Id: PKGBUILD 195142 2013-09-25 15:58:07Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.11 pkgver=${_basekernel}.1 -pkgrel=1 +pkgrel=3 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -21,14 +21,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'criu-no-expert.patch') + 'criu-no-expert.patch' + '3.11.1-fix-skge.patch' + '3.11-haswell-intel_pstate.patch') md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' '7b051faf375c76d4763a24048c52600b' 'bef7b3ced683c4dc9361f8739ec9f566' 'f302c931bd85309da9d9792b4cc96467' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' - 'd50c1ac47394e9aec637002ef3392bd1') + 'd50c1ac47394e9aec637002ef3392bd1' + '4fcee2b4485492dcfdead632275198eb' + '1040ae6c10d4a68f89899f94a2318a17') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE @@ -48,6 +52,14 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # #36865 fix broken skge network module + patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch" + + # add intel haswell support to intel_pstate + # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37 + # will be in 3.12 + patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch" + # allow criu without expert option set # patch from fedora patch -Np1 -i "${srcdir}/criu-no-expert.patch" diff --git a/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch b/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch new file mode 100644 index 000000000..1f376b518 --- /dev/null +++ b/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch @@ -0,0 +1,32 @@ +From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001 +From: Nell Hardcastle +Date: Sun, 30 Jun 2013 22:58:57 +0000 +Subject: intel_pstate: Add Haswell CPU models + +Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge +model (0x3E) is also included. Models referenced from +tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit + +Signed-off-by: Nell Hardcastle +Acked-by: Viresh Kumar +Acked-by: Dirk Brandewie +Signed-off-by: Rafael J. Wysocki +--- +diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c +index 6efd96c..9733f29 100644 +--- a/drivers/cpufreq/intel_pstate.c ++++ b/drivers/cpufreq/intel_pstate.c +@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { + ICPU(0x2a, default_policy), + ICPU(0x2d, default_policy), + ICPU(0x3a, default_policy), ++ ICPU(0x3c, default_policy), ++ ICPU(0x3e, default_policy), ++ ICPU(0x3f, default_policy), ++ ICPU(0x45, default_policy), ++ ICPU(0x46, default_policy), + {} + }; + MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids); +-- +cgit v0.9.2 diff --git a/kernels/linux-libre-xen/3.11.1-fix-skge.patch b/kernels/linux-libre-xen/3.11.1-fix-skge.patch new file mode 100644 index 000000000..26d90e080 --- /dev/null +++ b/kernels/linux-libre-xen/3.11.1-fix-skge.patch @@ -0,0 +1,34 @@ +--- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400 ++++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400 +@@ -3086,23 +3086,27 @@ + PCI_DMA_FROMDEVICE); + skge_rx_reuse(e, skge->rx_buf_size); + } else { ++ struct skge_element ee; + struct sk_buff *nskb; + + nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); + if (!nskb) + goto resubmit; + ++ ee = *e; ++ ++ skb = ee.skb; ++ prefetch(skb->data); ++ + if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) { + dev_kfree_skb(nskb); + goto resubmit; + } + + pci_unmap_single(skge->hw->pdev, +- dma_unmap_addr(e, mapaddr), +- dma_unmap_len(e, maplen), ++ dma_unmap_addr(&ee, mapaddr), ++ dma_unmap_len(&ee, maplen), + PCI_DMA_FROMDEVICE); +- skb = e->skb; +- prefetch(skb->data); + } + + skb_put(skb, len); diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 7ff630c05..437c48670 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194378 2013-09-15 09:16:34Z tpowa $ +# $Id: PKGBUILD 195142 2013-09-25 15:58:07Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.11 pkgver=${_basekernel}.1 -pkgrel=1 +pkgrel=3 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -21,14 +21,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'criu-no-expert.patch') + 'criu-no-expert.patch' + '3.11.1-fix-skge.patch' + '3.11-haswell-intel_pstate.patch') md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' '7b051faf375c76d4763a24048c52600b' '212338fa662436f9590026c9a71d82f7' 'b7c2805bb287a644c0a303bf7721e534' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' - 'd50c1ac47394e9aec637002ef3392bd1') + 'd50c1ac47394e9aec637002ef3392bd1' + '4fcee2b4485492dcfdead632275198eb' + '1040ae6c10d4a68f89899f94a2318a17') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN @@ -48,6 +52,14 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # #36865 fix broken skge network module + patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch" + + # add intel haswell support to intel_pstate + # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37 + # will be in 3.12 + patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch" + # allow criu without expert option set # patch from fedora patch -Np1 -i "${srcdir}/criu-no-expert.patch" diff --git a/libre/linux-libre/3.11-haswell-intel_pstate.patch b/libre/linux-libre/3.11-haswell-intel_pstate.patch new file mode 100644 index 000000000..1f376b518 --- /dev/null +++ b/libre/linux-libre/3.11-haswell-intel_pstate.patch @@ -0,0 +1,32 @@ +From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001 +From: Nell Hardcastle +Date: Sun, 30 Jun 2013 22:58:57 +0000 +Subject: intel_pstate: Add Haswell CPU models + +Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge +model (0x3E) is also included. Models referenced from +tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit + +Signed-off-by: Nell Hardcastle +Acked-by: Viresh Kumar +Acked-by: Dirk Brandewie +Signed-off-by: Rafael J. Wysocki +--- +diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c +index 6efd96c..9733f29 100644 +--- a/drivers/cpufreq/intel_pstate.c ++++ b/drivers/cpufreq/intel_pstate.c +@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { + ICPU(0x2a, default_policy), + ICPU(0x2d, default_policy), + ICPU(0x3a, default_policy), ++ ICPU(0x3c, default_policy), ++ ICPU(0x3e, default_policy), ++ ICPU(0x3f, default_policy), ++ ICPU(0x45, default_policy), ++ ICPU(0x46, default_policy), + {} + }; + MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids); +-- +cgit v0.9.2 diff --git a/libre/linux-libre/3.11.1-fix-skge.patch b/libre/linux-libre/3.11.1-fix-skge.patch new file mode 100644 index 000000000..26d90e080 --- /dev/null +++ b/libre/linux-libre/3.11.1-fix-skge.patch @@ -0,0 +1,34 @@ +--- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400 ++++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400 +@@ -3086,23 +3086,27 @@ + PCI_DMA_FROMDEVICE); + skge_rx_reuse(e, skge->rx_buf_size); + } else { ++ struct skge_element ee; + struct sk_buff *nskb; + + nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); + if (!nskb) + goto resubmit; + ++ ee = *e; ++ ++ skb = ee.skb; ++ prefetch(skb->data); ++ + if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) { + dev_kfree_skb(nskb); + goto resubmit; + } + + pci_unmap_single(skge->hw->pdev, +- dma_unmap_addr(e, mapaddr), +- dma_unmap_len(e, maplen), ++ dma_unmap_addr(&ee, mapaddr), ++ dma_unmap_len(&ee, maplen), + PCI_DMA_FROMDEVICE); +- skb = e->skb; +- prefetch(skb->data); + } + + skb_put(skb, len); diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 70d9f739b..1f0e471eb 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194378 2013-09-15 09:16:34Z tpowa $ +# $Id: PKGBUILD 195142 2013-09-25 15:58:07Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -12,8 +12,8 @@ pkgbase=linux-libre # Build stock -LIBRE kernel _basekernel=3.11 _sublevel=1 pkgver=${_basekernel}.${_sublevel} -pkgrel=1 -_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver +pkgrel=3 +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,6 +30,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' + '3.11.1-fix-skge.patch' + '3.11-haswell-intel_pstate.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' '7b051faf375c76d4763a24048c52600b' @@ -41,6 +43,8 @@ md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' + '4fcee2b4485492dcfdead632275198eb' + '1040ae6c10d4a68f89899f94a2318a17' '135ff203ec680a91e87eed4df72f453d') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. @@ -66,6 +70,14 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # #36865 fix broken skge network module + patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch" + + # add intel haswell support to intel_pstate + # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37 + # will be in 3.12 + patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch" + # allow criu without expert option set # patch from fedora patch -Np1 -i "${srcdir}/criu-no-expert.patch" diff --git a/pcr/dratmenu/PKGBUILD b/pcr/dratmenu/PKGBUILD new file mode 100644 index 000000000..8d6a2b357 --- /dev/null +++ b/pcr/dratmenu/PKGBUILD @@ -0,0 +1,36 @@ +# Contributor: ivoarch +# Maintainer : Parabola Aurélien DESBRIÈRES + +pkgname=dratmenu +pkgver=20121218 +pkgrel=1 +pkgdesc="ratpoison window dmenu" +arch=('any') +url="https://github.com/dimatura/dratmenu.git" +license=('GPL') +depends=('dmenu' 'python2') +makedepends=('git') + +_gitroot="https://github.com/dimatura/dratmenu.git" +_gitname="master" + +build() { + cd $srcdir + + if [ -d $srcdir/$pkgname ] ; then + msg "update git" + cd $pkgname && git pull origin + else + msg "clone git" + git clone $_gitroot + fi +} + +package() { + mkdir -p $pkgdir/usr/lib/python2.7/site-packages + cp -r $srcdir/$pkgname $pkgdir/usr/lib/python2.7/site-packages + mkdir -p $pkgdir/usr/bin + echo "#!/bin/bash + python2 /usr/lib/python2.7/site-packages/$pkgname/dratmenu.py" > $pkgdir/usr/bin/dratmenu + chmod +x $pkgdir/usr/bin/dratmenu +} diff --git a/pcr/python-jedi/PKGBUILD b/pcr/python-jedi/PKGBUILD new file mode 100644 index 000000000..d34823097 --- /dev/null +++ b/pcr/python-jedi/PKGBUILD @@ -0,0 +1,23 @@ +# Contributor: Jesus Alvarez +# Contributor: Danilo Bargen +# Maintainer : Parabola Aurélien DESBRIÈRES +pkgname=python-jedi +pkgver=0.7.0 +pkgrel=1 +pkgdesc="Awesome autocompletion for python. Official PKGBUILD." +arch=('any') +url="https://github.com/davidhalter/jedi" +license=('LGPL3') +depends=('python') +makedepends=('python-distribute') +conflicts=('jedi-git' 'python3-jedi-git') +options=(!emptydirs) +source=("https://pypi.python.org/packages/source/j/jedi/jedi-${pkgver}.tar.gz") + + +package() { + cd "$srcdir/jedi-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ttf-font-awesome/PKGBUILD b/pcr/ttf-font-awesome/PKGBUILD new file mode 100644 index 000000000..abb63b8a6 --- /dev/null +++ b/pcr/ttf-font-awesome/PKGBUILD @@ -0,0 +1,19 @@ +#Contributer: UNKNOWN o_O +#Maintainer : Parabola Aurélien DESBRIÈRES + +pkgname=ttf-font-awesome +pkgver=3.2.1 +pkgrel=2 +pkgdesc="Iconic font designed for Bootstrap" +url="http://fortawesome.github.io/Font-Awesome/" +license=('CCPL') +depends=('fontconfig' 'xorg-font-utils') +options=("!strip") +install=$pkgname.install +arch=('any') +source=('http://fortawesome.github.io/Font-Awesome/assets/font-awesome.zip') + +package() { + install -d "$pkgdir/usr/share/fonts/TTF" + cp -dpr --no-preserve=ownership "$srcdir/font-awesome/font/"*.ttf "$pkgdir/usr/share/fonts/TTF/" +} diff --git a/pcr/ttf-font-awesome/ttf-font-awesome.install b/pcr/ttf-font-awesome/ttf-font-awesome.install new file mode 100644 index 000000000..56632d242 --- /dev/null +++ b/pcr/ttf-font-awesome/ttf-font-awesome.install @@ -0,0 +1,20 @@ +post_install() { + echo -n "Updating font cache..." + fc-cache -f > /dev/null + mkfontscale /usr/share/fonts/TTF + mkfontdir /usr/share/fonts/TTF + echo "done." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +op=$1 +shift + +$op $* diff --git a/pcr/xfwm4-titleless/PKGBUILD b/pcr/xfwm4-titleless/PKGBUILD new file mode 100644 index 000000000..dd80d287d --- /dev/null +++ b/pcr/xfwm4-titleless/PKGBUILD @@ -0,0 +1,46 @@ +# Contributor: Christian Hesse +# Contributor: Evangelos Foutras +# Contributor: tobias +# Maintainer : Parabola Aurélien DESBRIÈRES + +pkgname=xfwm4-titleless +pkgver=4.10.1 +pkgrel=1 +pkgdesc="Xfce window manager - patched with option to hide titlebar when maximized" +arch=('i686' 'x86_64') +url="https://bitbucket.org/thesame/xfwm4-titleless" +license=('GPL2') +depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme') +makedepends=('intltool') +options=('!libtool') +conflicts=('xfwm4') +provides=('xfwm4') +install=${pkgname%%-*}.install +source=("http://archive.xfce.org/src/xfce/${pkgname%%-*}/4.10/${pkgname%%-*}-${pkgver}.tar.bz2" + "xfwm4-hide-titlebar-when-maximized.patch") + +build() { + cd "${srcdir}/${pkgname%%-*}-${pkgver}" + + patch -Np1 < ${srcdir}/xfwm4-hide-titlebar-when-maximized.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-startup-notification \ + --enable-randr \ + --enable-compositor \ + --enable-xsync \ + --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname%%-*}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} + diff --git a/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch b/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch new file mode 100644 index 000000000..fa43b6b8e --- /dev/null +++ b/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch @@ -0,0 +1,1456 @@ +From 999c375f5342947525813584fbdc92f3b63dced6 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 25 Sep 2013 15:16:57 +0200 +Subject: [PATCH 1/1] xfwm4: hide titlebar when maximized + +--- + defaults/defaults | 1 + + settings-dialogs/tweaks-settings.c | 5 + + settings-dialogs/xfwm4-tweaks-dialog.glade | 25 +- + settings-dialogs/xfwm4-tweaks-dialog_ui.h | 612 +++++++++++++++-------------- + src/client.c | 6 + + src/client.h | 1 + + src/display.c | 3 +- + src/display.h | 1 + + src/events.c | 5 + + src/frame.c | 366 ++++++++++------- + src/netwm.c | 38 ++ + src/placement.c | 4 +- + src/settings.c | 8 + + src/settings.h | 1 + + 14 files changed, 616 insertions(+), 460 deletions(-) + +diff --git a/defaults/defaults b/defaults/defaults +index 6db210a..1582fc1 100644 +--- a/defaults/defaults ++++ b/defaults/defaults +@@ -1,5 +1,6 @@ + activate_action=bring + borderless_maximize=true ++titleless_maximize=false + box_move=false + box_resize=false + button_layout=O|SHMC +diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c +index f60b606..2532733 100644 +--- a/settings-dialogs/tweaks-settings.c ++++ b/settings-dialogs/tweaks-settings.c +@@ -180,6 +180,7 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder) + GtkWidget *easy_click_combo_box = GTK_WIDGET (gtk_builder_get_object (builder, "easy_click_combo_box")); + GtkWidget *raise_with_any_button_check = GTK_WIDGET (gtk_builder_get_object (builder, "raise_with_any_button_check")); + GtkWidget *borderless_maximize_check = GTK_WIDGET (gtk_builder_get_object (builder, "borderless_maximize_check")); ++ GtkWidget *titleless_maximize_check = GTK_WIDGET (gtk_builder_get_object (builder, "titleless_maximize_check")); + GtkWidget *restore_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "restore_on_move_check")); + GtkWidget *tile_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "tile_on_move_check")); + GtkWidget *snap_resist_check = GTK_WIDGET (gtk_builder_get_object (builder, "snap_resist_check")); +@@ -336,6 +337,10 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder) + G_TYPE_BOOLEAN, + (GObject *)borderless_maximize_check, "active"); + xfconf_g_property_bind (xfwm4_channel, ++ "/general/titleless_maximize", ++ G_TYPE_BOOLEAN, ++ (GObject *)titleless_maximize_check, "active"); ++ xfconf_g_property_bind (xfwm4_channel, + "/general/restore_on_move", + G_TYPE_BOOLEAN, + (GObject *)restore_on_move_check, "active"); +diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade +index bd2a86f..7d604c6 100644 +--- a/settings-dialogs/xfwm4-tweaks-dialog.glade ++++ b/settings-dialogs/xfwm4-tweaks-dialog.glade +@@ -343,6 +343,21 @@ or "skip taskbar" properties set + + + ++ ++ Hide _title of windows when maximized ++ True ++ True ++ False ++ True ++ True ++ ++ ++ False ++ False ++ 3 ++ ++ ++ + + Restore original _size of maximized windows when moving + True +@@ -354,7 +369,7 @@ or "skip taskbar" properties set + + False + False +- 3 ++ 4 + + + +@@ -369,7 +384,7 @@ or "skip taskbar" properties set + + False + False +- 4 ++ 5 + + + +@@ -384,7 +399,7 @@ or "skip taskbar" properties set + + False + False +- 5 ++ 6 + + + +@@ -399,7 +414,7 @@ or "skip taskbar" properties set + + False + False +- 5 ++ 7 + + + +@@ -414,7 +429,7 @@ or "skip taskbar" properties set + + False + False +- 6 ++ 8 + + + +diff --git a/settings-dialogs/xfwm4-tweaks-dialog_ui.h b/settings-dialogs/xfwm4-tweaks-dialog_ui.h +index a6121dd..8ddbf30 100644 +--- a/settings-dialogs/xfwm4-tweaks-dialog_ui.h ++++ b/settings-dialogs/xfwm4-tweaks-dialog_ui.h +@@ -177,332 +177,340 @@ static const char tweaks_dialog_ui[] = + "y>TrueFalseFalse2Restore original _size of maxim" +- "ized windows when movingTrueTrueFalseTrueTrueFalseF" +- "alse3Automatically _tile windows " +- "when moving toward the screen edgeTrueTrueFalseTrueTrueFalseFalse4Use _edge resistanc" +- "e instead of window snappingTrue<" +- "/property>TrueFalseTru" +- "eTrue<" +- "packing>FalseFalse5Notify of _urgency by making w" +- "indow\'s decoration blinkTrueHide _title of windows when " ++ "maximizedTrueTrue" ++ "FalseTrueTrueFalseFalse" ++ "3Restore original _size of maximized wind" ++ "ows when movingTrueTrueFalseTrue<" ++ "property name=\"draw_indicator\">TrueFalseFalse4" ++ "Automatically _tile windows when movi" ++ "ng toward the screen edgeTrueTrueFalseTrueTrueFalse" + "False5<" +- "property name=\"label\" translatable=\"yes\">Keep urgent windows _blink" +- "ing repeatedlyTrueUse _edge resistance instead" ++ " of window snappingTrueTrueFalseTrueTrue<" ++ "property name=\"expand\">FalseFalse<" ++ "/property>6Notify of _urgency by making window\'s " ++ "decoration blinkTrueTrueFalseTrue" ++ "TrueFalseFalse7Keep urgent windows _blinking repea" ++ "tedlyTrueTrueFals" ++ "eTrueTrueFalseFalse82True_Acce" ++ "ssibilityTrue2FalseTrue12vert" ++ "ical6Use the _mouse wheel on the desktop to swi" ++ "tch workspacesTrueTrueFalseTrueTrueFalseFalse62True_AccessibilityTrue2FalseTrue12vertical6" +- "Use the _mouse wheel on the desk" +- "top to switch workspacesTrueTrueFalseTrueTrueFalseF" +- "alse0_Remember and recall pre" +- "vious workspace\nwhen switching via keyboard shortcutsTrueTrueFalseTrueTrueFalseFalse1" +- "Wrap workspaces depending on the actual desktop _layoutTrueTrue<" +- "/property>FalseTrueTrueFalseFalse2W" +- "rap workspaces when the _first or the last workspace is reachedTrueTrueFalse<" +- "property name=\"use_underline\">TrueTrueFa" +- "lseFalse33True_WorkspacesTrue<" +- "property name=\"position\">3Fals" +- "eTrue12vertical" +- "6True0_" +- "Minimum size of windows to trigger smart placement:Trueplacement_ratio_scaleFalseFalse0True612True1" +- "2True<i>Small</i>TrueFalseFalse0TrueTrueadjustment1False" +- "False1<" +- "property name=\"visible\">True<i>Large</i&" +- "gt;TrueFalse2<" +- "property name=\"expand\">FalseFalse<" +- "/property>1Truevertical6True0By default, place windows:0True612True6vertical6At the _center of the screenTrueTrueFalseTrueTrue0<" +- "/child>Under the mouse _po" +- "interTrueTrueFals" +- "eTrueTrueTrueplacement_center_option11Fals" +- "eFalse24True_PlacementTrue4FalseTrue12vertical6_Enable display compositingTrueTrueFalseTrueTrueFalseFalse0TrueFalseTrue" +- "neverautomaticTruequeue" +- "none" +- "True612Truevertical6Display _fullscreen overlay windows directly0<" ++ "object class=\"GtkCheckButton\" id=\"toggle_workspaces_check\">_Remember and recall previous wor" ++ "kspace\nwhen switching via keyboard shortcutsTrueTrue" ++ "FalseTrueTrueFalseFalse1Wrap wor" ++ "kspaces depending on the actual desktop _layoutTrueTrueFalseTrueTrueFalse0Show shadows under _regular windowsTrueTrueFalseTrueTrueFalse1Show shadows under po" +- "p_up windowsTrueTrueFalseTrueTrueFalse2Show " +- "shadows under _dock windowsTrueTrueFalseTrue" +- "TrueFalse3True0Op" +- "aci_ty of window decorations:Trueframe_opacity_scale<" +- "/property>False<" +- "property name=\"position\">4Tr" +- "ue212TrueTrue<i>Transparent</i>" +- ";TrueFalseF" +- "alse0False2Wrap wo" ++ "rkspaces when the _first or the last workspace is reachedTrueTru" ++ "eFalseTrueTrueFalseFalse33True_WorkspacesTrue3False<" ++ "property name=\"visible\">True12vertical6True0_Minimu" ++ "m size of windows to trigger smart placement:Truepla" ++ "cement_ratio_scaleFalseFalse0True" ++ "612True12True<i>Small</i>TrueFalseFalse0TrueTrueadjustment1FalseFalse<" ++ "/property>1True<i>Large</i>True" ++ "False2" ++ "FalseFalse1Truevertical6True0By default, place windows:0True612<" ++ "property name=\"visible\">True6vertical6At the _center of the screenTrueTrueFalseTrueTrue0" ++ "Under the mouse _pointer<" ++ "/property>TrueTrueFalseTrueTrueTrueplacement_center_option<" ++ "packing>11<" ++ "/packing>FalseFalse24True<" ++ "property name=\"label\" translatable=\"yes\">_PlacementTrue4FalseTrue1" ++ "2vertical6_Enable display compositingTru" ++ "eTrueFalseT" ++ "rueTrueFalseFalse0" ++ "TrueFalseTrueneverautomaticTruequeuenone" ++ "True612Truevertical6D" ++ "isplay _fullscreen overlay windows directlyTrueTrueFalseTrueTrueFalse0Show shadows under _regular windowsTrueTrueFalseTrueTrueFals" ++ "e1<" ++ "child><" ++ "property name=\"label\" translatable=\"yes\">Show shadows under pop_up " ++ "windowsTrueTrueFa" ++ "lseTrueTrueFalse2Show shado" ++ "ws under _dock windowsTrueTrueFalseTrueTrueFalse3True0Opaci_t" ++ "y of window decorations:Tru" ++ "eframe_opacity_scaleFalse4True212TrueTrue<i>Transparent</i>True" ++ "FalseFalse" ++ "0TrueTruediscontinuousadjustment2FalseFalse1True<i>Opaque</i>T" ++ "rueFalseFalse" ++ "2FalseFalse5<" ++ "object class=\"GtkLabel\" id=\"label13\">Tru" ++ "e0Opacity of _inactive windows:Trueinactive_opacity_scaleFalseFalse6True" ++ "212TrueTrue<i>Transparent</i><" ++ "/property>TrueFalseFal" ++ "se0" ++ "TrueTruediscontinuousadjustment3FalseFalse1True<i>Opaque</i>TrueFalseFalse2<" ++ "property name=\"expand\">FalseFalse<" ++ "/property>7True0Opacity of windows during _move:Truemove_opacity_scaleFalseFalse" ++ "8T" ++ "rue212TrueTrue<i>Transparent</i&g" ++ "t;TrueFalse" ++ "False0TrueTruediscontinuousadjustment2adjustment4FalseFalse1True<i>Opaque</i>TrueFalseFalse2FalseFalse59True0Opacity of _inactive windows:Trueinactive_opacity_scaleFalseFalse6" +- "True212TrueTrue<i>Transparent</i&g" +- "t;TrueFalse" +- "False0TrueTru" +- "ediscontinuousadjustment3FalseFals" +- "e1<" +- "/packing>True<i>Opaque</i>TrueFalse" +- "False2FalseFal" +- "se7" +- "True0Opacity of windows during _move:Truemove_opacity_scaleOpacity of windows during resi_ze:Trueresize_opacity_scaleFalseFalse8True212TrueTrue<i>Transparent<" +- "/i>True" +- "FalseFalse0<" +- "/child>TrueTru" +- "ediscontinuousadjustment4FalseFals" +- "e1<" +- "/packing>True<i>Opaque</i>TrueFalse" +- "False2FalseFal" +- "se9" +- "True0Opacity of windows during resi_ze:Trueresize_opacity_scaleFalseFalse10True212TrueTrue<i>Transparent" +- "</i>TrueFalseFalse0TrueTruediscontinuousadjustment5False" +- "False1<" +- "property name=\"visible\">True<i>Opaque</i>TrueF" +- "alseFalse10<" ++ "object class=\"GtkAlignment\" id=\"alignment8\">True212TrueTrue<i>Transparent<" ++ ";/i>TrueFalseFalse0" ++ "" ++ "True" ++ "Truediscontinuousadjustment5FalseF" ++ "alse1True<i>Opaque</i>TrueFa" ++ "lseFalse2False" + "False11" + }; + +-static const unsigned tweaks_dialog_ui_length = 37803u; ++static const unsigned tweaks_dialog_ui_length = 38338u; + +diff --git a/src/client.c b/src/client.c +index 4e86808..b92c264 100644 +--- a/src/client.c ++++ b/src/client.c +@@ -64,6 +64,8 @@ + #include "xsync.h" + #include "event_filter.h" + ++//#define TRACE(fmt, ...) printf(fmt"\n", ##__VA_ARGS__); fflush(stdout); ++ + /* Event mask definition */ + + #define POINTER_EVENT_MASK \ +@@ -173,6 +175,7 @@ clientCreateTitleName (Client *c, gchar *name, gchar *hostname) + gchar *title; + + g_return_val_if_fail (c != NULL, NULL); ++ + TRACE ("entering clientCreateTitleName"); + + screen_info = c->screen_info; +@@ -1729,6 +1732,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture) + clientGetInitialNetWmDesktop (c); + /* workarea will be updated when shown, no need to worry here */ + clientGetNetStruts (c); ++ clientGetExtra (c); + + /* Once we know the type of window, we can initialize window position */ + if (!FLAG_TEST (c->xfwm_flags, XFWM_FLAG_SESSION_MANAGED)) +@@ -3137,6 +3141,8 @@ clientNewMaxSize (Client *c, XWindowChanges *wc, GdkRectangle *rect, tilePositio + wc->width = full_w - frameLeft (c) - frameRight (c); + wc->height = full_h - frameTop (c) - frameBottom (c); + ++ TRACE ("clientNewMaxSize %d %d %d %d", wc->x, wc->y, wc->width, wc->height); ++ + return ((wc->width <= c->size->max_width) && (wc->height <= c->size->max_height)); + } + +diff --git a/src/client.h b/src/client.h +index e8bc4e3..b5e54df 100644 +--- a/src/client.h ++++ b/src/client.h +@@ -161,6 +161,7 @@ + #define CLIENT_FLAG_DEMANDS_ATTENTION (1L<<17) + #define CLIENT_FLAG_HAS_SHAPE (1L<<18) + #define CLIENT_FLAG_FULLSCREN_MONITORS (1L<<19) ++#define CLIENT_FLAG_TITLELESS_MAXIMIZE (1L<<20) + + #define WM_FLAG_DELETE (1L<<0) + #define WM_FLAG_INPUT (1L<<1) +diff --git a/src/display.c b/src/display.c +index 00318d5..4f847f4 100644 +--- a/src/display.c ++++ b/src/display.c +@@ -169,7 +169,8 @@ myDisplayInitAtoms (DisplayInfo *display_info) + "XFWM4_COMPOSITING_MANAGER", + "XFWM4_TIMESTAMP_PROP", + "_XROOTPMAP_ID", +- "_XSETROOT_ID" ++ "_XSETROOT_ID", ++ "_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED" + }; + + g_assert (ATOM_COUNT == G_N_ELEMENTS (atom_names)); +diff --git a/src/display.h b/src/display.h +index 8797237..a297cf2 100644 +--- a/src/display.h ++++ b/src/display.h +@@ -265,6 +265,7 @@ enum + XFWM4_TIMESTAMP_PROP, + XROOTPMAP, + XSETROOT, ++ _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, + ATOM_COUNT + }; + +diff --git a/src/events.c b/src/events.c +index 4b49171..044cd11 100644 +--- a/src/events.c ++++ b/src/events.c +@@ -1921,6 +1921,11 @@ handlePropertyNotify (DisplayInfo *display_info, XPropertyEvent * ev) + TRACE ("Window 0x%lx has NET_WM_SYNC_REQUEST_COUNTER set to 0x%lx", c->window, c->xsync_counter); + } + #endif /* HAVE_XSYNC */ ++ else if (ev->atom == display_info->atoms[_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED]) ++ { ++ TRACE ("Client \"%s\" Window 0x%lx has received GTK CRAP\n", c->name, c->window); ++ clientUpdateExtra (c); ++ } + + return status; + } +diff --git a/src/frame.c b/src/frame.c +index 7f4cbd3..23c01cd 100644 +--- a/src/frame.c ++++ b/src/frame.c +@@ -39,6 +39,8 @@ + #include "frame.h" + #include "compositor.h" + ++//#define TRACE(fmt, ...) printf(fmt"\n", ##__VA_ARGS__); fflush(stdout); ++ + typedef struct + { + xfwmPixmap pm_title; +@@ -121,7 +123,14 @@ frameTop (Client * c) + + g_return_val_if_fail (c != NULL, 0); + if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER) +- && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) ++ && !(FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN) ++ || (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT) ++ && (c->screen_info->params->titleless_maximize ++ || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE)) ++ && c->screen_info->params->borderless_maximize ++ ) ++ ) ++ ) + { + return c->screen_info->title[TITLE_3][ACTIVE].height; + } +@@ -136,8 +145,13 @@ frameBottom (Client * c) + g_return_val_if_fail (c != NULL, 0); + if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER) + && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN) +- && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED) +- || !(c->screen_info->params->borderless_maximize))) ++ && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED) ++ && (c->screen_info->params->borderless_maximize)) ++ && !(FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT) ++ && (c->screen_info->params->borderless_maximize) ++ && (c->screen_info->params->titleless_maximize ++ || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE))) ++ ) + { + return c->screen_info->sides[SIDE_BOTTOM][ACTIVE].height; + } +@@ -203,7 +217,14 @@ frameHeight (Client * c) + return frameTop (c) + frameBottom (c); + } + else if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER) +- && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) ++ && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN) ++ && !( ++ FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT) ++ && (c->screen_info->params->borderless_maximize) ++ && (c->screen_info->params->titleless_maximize ++ || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE)) ++ )) ++ + { + return c->height + frameTop (c) + frameBottom (c); + } +@@ -882,6 +903,7 @@ frameDrawWin (Client * c) + gboolean requires_clearing; + gboolean width_changed; + gboolean height_changed; ++ gboolean vert_only; + + TRACE ("entering frameDraw"); + TRACE ("drawing frame for \"%s\" (0x%lx)", c->name, c->window); +@@ -955,128 +977,152 @@ frameDrawWin (Client * c) + } + + if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER) +- && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) ++ && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN) ++ && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED) ++ && (c->screen_info->params->borderless_maximize) ++ && (c->screen_info->params->titleless_maximize ++ || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE)) ++ )) + { +- /* First, hide the buttons that we don't have... */ +- for (i = 0; i < BUTTON_COUNT; i++) ++ vert_only = FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT) ++ && (c->screen_info->params->borderless_maximize) //only vertical decorations shown (titleless vertical maximize) ++ && (c->screen_info->params->titleless_maximize ++ || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE)); ++ ++ if (vert_only) + { +- char b = getLetterFromButton (i, c); +- if ((!b) || !strchr (screen_info->params->button_layout, b)) ++ //hide all buttons ++ for (i = 0; i < BUTTON_COUNT; i++) + { + xfwmWindowHide (&c->buttons[i]); + } ++ xfwmWindowHide (&c->title); ++ xfwmWindowHide (&c->sides[SIDE_BOTTOM]); ++ xfwmWindowHide (&c->sides[SIDE_TOP]); ++ xfwmWindowHide (&c->corners[CORNER_TOP_LEFT]); ++ xfwmWindowHide (&c->corners[CORNER_TOP_RIGHT]); ++ xfwmWindowHide (&c->corners[CORNER_BOTTOM_LEFT]); ++ xfwmWindowHide (&c->corners[CORNER_BOTTOM_RIGHT]); + } +- +- /* Then, show the ones that we do have on left... */ +- x = frameLeft (c) + frameButtonOffset (c); +- if (x < 0) +- { +- x = 0; +- } +- right = frameWidth (c) - frameRight (c) - frameButtonOffset (c); +- for (i = 0; i < strlen (screen_info->params->button_layout); i++) ++ else + { +- button = getButtonFromLetter (screen_info->params->button_layout[i], c); +- if (button == TITLE_SEPARATOR) ++ /* First, hide the buttons that we don't have... */ ++ for (i = 0; i < BUTTON_COUNT; i++) + { +- break; +- } +- else if (button >= 0) +- { +- if (x + screen_info->buttons[button][state].width + screen_info->params->button_spacing < right) +- { +- my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state)); +- if (!xfwmPixmapNone(my_pixmap)) +- { +- xfwmWindowSetBG (&c->buttons[button], my_pixmap); +- } +- xfwmWindowShow (&c->buttons[button], x, +- (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2, +- screen_info->buttons[button][state].width, +- screen_info->buttons[button][state].height, TRUE); +- button_x[button] = x; +- x = x + screen_info->buttons[button][state].width + +- screen_info->params->button_spacing; +- } +- else ++ char b = getLetterFromButton (i, c); ++ if ((!b) || !strchr (screen_info->params->button_layout, b)) + { +- xfwmWindowHide (&c->buttons[button]); ++ xfwmWindowHide (&c->buttons[i]); + } + } +- } +- left = x + screen_info->params->button_spacing; + +- /* and those that we do have on right... */ +- x = frameWidth (c) - frameRight (c) + screen_info->params->button_spacing - +- frameButtonOffset (c); +- for (j = strlen (screen_info->params->button_layout) - 1; j >= i; j--) +- { +- button = getButtonFromLetter (screen_info->params->button_layout[j], c); +- if (button == TITLE_SEPARATOR) ++ /* Then, show the ones that we do have on left... */ ++ x = frameLeft (c) + frameButtonOffset (c); ++ if (x < 0) + { +- break; ++ x = 0; + } +- else if (button >= 0) ++ right = frameWidth (c) - frameRight (c) - frameButtonOffset (c); ++ for (i = 0; i < strlen (screen_info->params->button_layout); i++) + { +- if (x - screen_info->buttons[button][state].width - screen_info->params->button_spacing > left) ++ button = getButtonFromLetter (screen_info->params->button_layout[i], c); ++ if (button == TITLE_SEPARATOR) + { +- my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state)); +- if (!xfwmPixmapNone(my_pixmap)) ++ break; ++ } ++ else if (button >= 0) ++ { ++ if (x + screen_info->buttons[button][state].width + screen_info->params->button_spacing < right) ++ { ++ my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state)); ++ if (!xfwmPixmapNone(my_pixmap)) ++ { ++ xfwmWindowSetBG (&c->buttons[button], my_pixmap); ++ } ++ xfwmWindowShow (&c->buttons[button], x, ++ (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2, ++ screen_info->buttons[button][state].width, ++ screen_info->buttons[button][state].height, TRUE); ++ button_x[button] = x; ++ x = x + screen_info->buttons[button][state].width + ++ screen_info->params->button_spacing; ++ } ++ else + { +- xfwmWindowSetBG (&c->buttons[button], my_pixmap); ++ xfwmWindowHide (&c->buttons[button]); + } +- x = x - screen_info->buttons[button][state].width - +- screen_info->params->button_spacing; +- xfwmWindowShow (&c->buttons[button], x, +- (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2, +- screen_info->buttons[button][state].width, +- screen_info->buttons[button][state].height, TRUE); +- button_x[button] = x; + } +- else ++ } ++ left = x + screen_info->params->button_spacing; ++ ++ /* and those that we do have on right... */ ++ x = frameWidth (c) - frameRight (c) + screen_info->params->button_spacing - ++ frameButtonOffset (c); ++ for (j = strlen (screen_info->params->button_layout) - 1; j >= i; j--) ++ { ++ button = getButtonFromLetter (screen_info->params->button_layout[j], c); ++ if (button == TITLE_SEPARATOR) + { +- xfwmWindowHide (&c->buttons[button]); ++ break; ++ } ++ else if (button >= 0) ++ { ++ if (x - screen_info->buttons[button][state].width - screen_info->params->button_spacing > left) ++ { ++ my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state)); ++ if (!xfwmPixmapNone(my_pixmap)) ++ { ++ xfwmWindowSetBG (&c->buttons[button], my_pixmap); ++ } ++ x = x - screen_info->buttons[button][state].width - ++ screen_info->params->button_spacing; ++ xfwmWindowShow (&c->buttons[button], x, ++ (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2, ++ screen_info->buttons[button][state].width, ++ screen_info->buttons[button][state].height, TRUE); ++ button_x[button] = x; ++ } ++ else ++ { ++ xfwmWindowHide (&c->buttons[button]); ++ } + } + } ++ left = left - 2 * screen_info->params->button_spacing; ++ right = x; ++ xfwmPixmapInit (screen_info, &frame_pix.pm_title); ++ xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_TOP]); ++ xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM]); ++ ++ top_width = frameWidth (c) - frameTopLeftWidth (c, state) - frameTopRightWidth (c, state); ++ bottom_width = frameWidth (c) - ++ screen_info->corners[CORNER_BOTTOM_LEFT][state].width - ++ screen_info->corners[CORNER_BOTTOM_RIGHT][state].width; ++ ++ /* The title is almost always visible */ ++ frameCreateTitlePixmap (c, state, left, right, &frame_pix.pm_title, &frame_pix.pm_sides[SIDE_TOP]); ++ xfwmWindowSetBG (&c->title, &frame_pix.pm_title); ++ xfwmWindowShow (&c->title, ++ frameTopLeftWidth (c, state), 0, top_width, ++ frameTop (c), (requires_clearing | width_changed)); ++ ++ /* Corners are never resized, we need to update them separately */ ++ if (requires_clearing) ++ { ++ xfwmWindowSetBG (&c->corners[CORNER_TOP_LEFT], ++ &screen_info->corners[CORNER_TOP_LEFT][state]); ++ xfwmWindowSetBG (&c->corners[CORNER_TOP_RIGHT], ++ &screen_info->corners[CORNER_TOP_RIGHT][state]); ++ xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_LEFT], ++ &screen_info->corners[CORNER_BOTTOM_LEFT][state]); ++ xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_RIGHT], ++ &screen_info->corners[CORNER_BOTTOM_RIGHT][state]); ++ } + } +- left = left - 2 * screen_info->params->button_spacing; +- right = x; +- +- top_width = frameWidth (c) - frameTopLeftWidth (c, state) - frameTopRightWidth (c, state); +- bottom_width = frameWidth (c) - +- screen_info->corners[CORNER_BOTTOM_LEFT][state].width - +- screen_info->corners[CORNER_BOTTOM_RIGHT][state].width; +- left_height = frameHeight (c) - frameTop (c) - +- screen_info->corners[CORNER_BOTTOM_LEFT][state].height; +- right_height = frameHeight (c) - frameTop (c) - +- screen_info->corners[CORNER_BOTTOM_RIGHT][state].height; +- +- xfwmPixmapInit (screen_info, &frame_pix.pm_title); +- xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_TOP]); +- xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM]); ++ + xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_LEFT]); + xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_RIGHT]); + +- /* The title is always visible */ +- frameCreateTitlePixmap (c, state, left, right, &frame_pix.pm_title, &frame_pix.pm_sides[SIDE_TOP]); +- xfwmWindowSetBG (&c->title, &frame_pix.pm_title); +- xfwmWindowShow (&c->title, +- frameTopLeftWidth (c, state), 0, top_width, +- frameTop (c), (requires_clearing | width_changed)); +- +- /* Corners are never resized, we need to update them separately */ +- if (requires_clearing) +- { +- xfwmWindowSetBG (&c->corners[CORNER_TOP_LEFT], +- &screen_info->corners[CORNER_TOP_LEFT][state]); +- xfwmWindowSetBG (&c->corners[CORNER_TOP_RIGHT], +- &screen_info->corners[CORNER_TOP_RIGHT][state]); +- xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_LEFT], +- &screen_info->corners[CORNER_BOTTOM_LEFT][state]); +- xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_RIGHT], +- &screen_info->corners[CORNER_BOTTOM_RIGHT][state]); +- } +- + if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED) + && (c->screen_info->params->borderless_maximize)) + { +@@ -1091,6 +1137,18 @@ frameDrawWin (Client * c) + } + else + { ++ if (vert_only) ++ { ++ left_height = right_height = c->height; ++ } ++ else ++ { ++ left_height = frameHeight (c) - frameTop (c) ++ - screen_info->corners[CORNER_BOTTOM_LEFT][state].height; ++ right_height = frameHeight (c) - frameTop (c) ++ - screen_info->corners[CORNER_BOTTOM_RIGHT][state].height; ++ } ++ + if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED)) + { + xfwmWindowHide (&c->sides[SIDE_LEFT]); +@@ -1120,63 +1178,69 @@ frameDrawWin (Client * c) + right_height, (requires_clearing | height_changed)); + } + +- xfwmPixmapCreate (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM], +- bottom_width, frameBottom (c)); +- xfwmPixmapFill (&screen_info->sides[SIDE_BOTTOM][state], +- &frame_pix.pm_sides[SIDE_BOTTOM], +- 0, 0, bottom_width, frameBottom (c)); +- xfwmWindowSetBG (&c->sides[SIDE_BOTTOM], +- &frame_pix.pm_sides[SIDE_BOTTOM]); +- xfwmWindowShow (&c->sides[SIDE_BOTTOM], +- screen_info->corners[CORNER_BOTTOM_LEFT][state].width, +- frameHeight (c) - frameBottom (c), bottom_width, frameBottom (c), +- (requires_clearing | width_changed)); +- +- if (!xfwmPixmapNone(&frame_pix.pm_sides[SIDE_TOP])) ++ if (!vert_only) + { +- xfwmWindowSetBG (&c->sides[SIDE_TOP], &frame_pix.pm_sides[SIDE_TOP]); +- xfwmWindowShow (&c->sides[SIDE_TOP], +- screen_info->corners[CORNER_TOP_LEFT][state].width, +- 0, top_width, frame_pix.pm_sides[SIDE_TOP].height, ++ xfwmPixmapCreate (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM], ++ bottom_width, frameBottom (c)); ++ xfwmPixmapFill (&screen_info->sides[SIDE_BOTTOM][state], ++ &frame_pix.pm_sides[SIDE_BOTTOM], ++ 0, 0, bottom_width, frameBottom (c)); ++ xfwmWindowSetBG (&c->sides[SIDE_BOTTOM], ++ &frame_pix.pm_sides[SIDE_BOTTOM]); ++ xfwmWindowShow (&c->sides[SIDE_BOTTOM], ++ screen_info->corners[CORNER_BOTTOM_LEFT][state].width, ++ frameHeight (c) - frameBottom (c), bottom_width, frameBottom (c), + (requires_clearing | width_changed)); +- } +- else +- { +- xfwmWindowHide (&c->sides[SIDE_TOP]); +- } + +- xfwmWindowShow (&c->corners[CORNER_TOP_LEFT], 0, 0, +- frameTopLeftWidth (c, state), +- screen_info->corners[CORNER_TOP_LEFT][state].height, +- requires_clearing); +- +- xfwmWindowShow (&c->corners[CORNER_TOP_RIGHT], +- frameWidth (c) - frameTopRightWidth (c, state), +- 0, frameTopRightWidth (c, state), +- screen_info->corners[CORNER_TOP_RIGHT][state].height, +- requires_clearing); +- +- xfwmWindowShow (&c->corners[CORNER_BOTTOM_LEFT], 0, +- frameHeight (c) - +- screen_info->corners[CORNER_BOTTOM_LEFT][state].height, +- screen_info->corners[CORNER_BOTTOM_LEFT][state].width, +- screen_info->corners[CORNER_BOTTOM_LEFT][state].height, +- requires_clearing); +- +- xfwmWindowShow (&c->corners[CORNER_BOTTOM_RIGHT], +- frameWidth (c) - +- screen_info->corners[CORNER_BOTTOM_RIGHT][state].width, +- frameHeight (c) - +- screen_info->corners[CORNER_BOTTOM_RIGHT][state].height, +- screen_info->corners[CORNER_BOTTOM_RIGHT][state].width, +- screen_info->corners[CORNER_BOTTOM_RIGHT][state].height, +- requires_clearing); ++ if (!xfwmPixmapNone(&frame_pix.pm_sides[SIDE_TOP])) ++ { ++ xfwmWindowSetBG (&c->sides[SIDE_TOP], &frame_pix.pm_sides[SIDE_TOP]); ++ xfwmWindowShow (&c->sides[SIDE_TOP], ++ screen_info->corners[CORNER_TOP_LEFT][state].width, ++ 0, top_width, frame_pix.pm_sides[SIDE_TOP].height, ++ (requires_clearing | width_changed)); ++ } ++ else ++ { ++ xfwmWindowHide (&c->sides[SIDE_TOP]); ++ } ++ ++ xfwmWindowShow (&c->corners[CORNER_TOP_LEFT], 0, 0, ++ frameTopLeftWidth (c, state), ++ screen_info->corners[CORNER_TOP_LEFT][state].height, ++ requires_clearing); ++ ++ xfwmWindowShow (&c->corners[CORNER_TOP_RIGHT], ++ frameWidth (c) - frameTopRightWidth (c, state), ++ 0, frameTopRightWidth (c, state), ++ screen_info->corners[CORNER_TOP_RIGHT][state].height, ++ requires_clearing); ++ ++ xfwmWindowShow (&c->corners[CORNER_BOTTOM_LEFT], 0, ++ frameHeight (c) - ++ screen_info->corners[CORNER_BOTTOM_LEFT][state].height, ++ screen_info->corners[CORNER_BOTTOM_LEFT][state].width, ++ screen_info->corners[CORNER_BOTTOM_LEFT][state].height, ++ requires_clearing); ++ ++ xfwmWindowShow (&c->corners[CORNER_BOTTOM_RIGHT], ++ frameWidth (c) - ++ screen_info->corners[CORNER_BOTTOM_RIGHT][state].width, ++ frameHeight (c) - ++ screen_info->corners[CORNER_BOTTOM_RIGHT][state].height, ++ screen_info->corners[CORNER_BOTTOM_RIGHT][state].width, ++ screen_info->corners[CORNER_BOTTOM_RIGHT][state].height, ++ requires_clearing); ++ } + } + frameSetShape (c, state, &frame_pix, button_x); + +- xfwmPixmapFree (&frame_pix.pm_title); +- xfwmPixmapFree (&frame_pix.pm_sides[SIDE_TOP]); +- xfwmPixmapFree (&frame_pix.pm_sides[SIDE_BOTTOM]); ++ if (!vert_only) ++ { ++ xfwmPixmapFree (&frame_pix.pm_title); ++ xfwmPixmapFree (&frame_pix.pm_sides[SIDE_TOP]); ++ xfwmPixmapFree (&frame_pix.pm_sides[SIDE_BOTTOM]); ++ } + xfwmPixmapFree (&frame_pix.pm_sides[SIDE_LEFT]); + xfwmPixmapFree (&frame_pix.pm_sides[SIDE_RIGHT]); + } +diff --git a/src/netwm.c b/src/netwm.c +index 1352f08..9e3647c 100644 +--- a/src/netwm.c ++++ b/src/netwm.c +@@ -136,6 +136,44 @@ clientSetNetState (Client * c) + } + + void ++clientGetExtra (Client *c) ++{ ++ long val; ++ DisplayInfo *display_info; ++ ++ display_info = c->screen_info->display_info; ++ ++ getHint (display_info, c->window, _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, &val); ++ if (val) ++ FLAG_SET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE); ++} ++ ++void ++clientUpdateExtra (Client *c) ++{ ++ long val; ++ unsigned long maximization_flags = 0L; ++ DisplayInfo *display_info; ++ ++ display_info = c->screen_info->display_info; ++ ++ getHint (display_info, c->window, _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, &val); ++ if (val) ++ FLAG_SET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE); ++ else ++ FLAG_UNSET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE); ++ ++ if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) ++ { ++ maximization_flags = c->flags & CLIENT_FLAG_MAXIMIZED; ++ ++ /* Force an update by clearing the internal flags */ ++ FLAG_UNSET (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ | CLIENT_FLAG_MAXIMIZED_VERT); ++ clientToggleMaximized (c, maximization_flags, TRUE); ++ } ++} ++ ++void + clientGetNetState (Client * c) + { + ScreenInfo *screen_info; +diff --git a/src/placement.c b/src/placement.c +index 01f2590..64719a7 100644 +--- a/src/placement.c ++++ b/src/placement.c +@@ -38,7 +38,6 @@ + #include "frame.h" + #include "netwm.h" + +- + /* Compute rectangle overlap area */ + + static inline unsigned long +@@ -108,6 +107,8 @@ clientMaxSpace (ScreenInfo *screen_info, int *x, int *y, int *w, int *h) + g_return_if_fail (w != NULL); + g_return_if_fail (h != NULL); + ++ TRACE ("entering clientMaxSpace"); ++ + screen_width = 0; + screen_height = 0; + delta = 0; +@@ -157,6 +158,7 @@ clientMaxSpace (ScreenInfo *screen_info, int *x, int *y, int *w, int *h) + } + } + } ++ TRACE ("clientMaxSpace result %d %d %d %d", *x, *y, *w, *h); + } + + gboolean +diff --git a/src/settings.c b/src/settings.c +index 607bb7b..37b6c2a 100644 +--- a/src/settings.c ++++ b/src/settings.c +@@ -667,6 +667,7 @@ loadSettings (ScreenInfo *screen_info) + /* You can change the order of the following parameters */ + {"activate_action", NULL, G_TYPE_STRING, TRUE}, + {"borderless_maximize", NULL, G_TYPE_BOOLEAN, TRUE}, ++ {"titleless_maximize", NULL, G_TYPE_BOOLEAN, TRUE}, + {"box_move", NULL, G_TYPE_BOOLEAN, TRUE}, + {"box_resize", NULL, G_TYPE_BOOLEAN, TRUE}, + {"button_layout", NULL, G_TYPE_STRING, TRUE}, +@@ -753,6 +754,8 @@ loadSettings (ScreenInfo *screen_info) + + screen_info->params->borderless_maximize = + getBoolValue ("borderless_maximize", rc); ++ screen_info->params->titleless_maximize = ++ getBoolValue ("titleless_maximize", rc); + screen_info->params->box_resize = + getBoolValue ("box_resize", rc); + screen_info->params->box_move = +@@ -1261,6 +1264,11 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_ + screen_info->params->borderless_maximize = g_value_get_boolean (value); + reloadScreenSettings (screen_info, UPDATE_MAXIMIZE); + } ++ else if (!strcmp (name, "titleless_maximize")) ++ { ++ screen_info->params->titleless_maximize = g_value_get_boolean (value); ++ reloadScreenSettings (screen_info, UPDATE_MAXIMIZE); ++ } + else if (!strcmp (name, "cycle_minimum")) + { + screen_info->params->cycle_minimum = g_value_get_boolean (value); +diff --git a/src/settings.h b/src/settings.h +index be01b6b..ea8b79b 100644 +--- a/src/settings.h ++++ b/src/settings.h +@@ -197,6 +197,7 @@ struct _XfwmParams + int title_shadow[2]; + int wrap_resistance; + gboolean borderless_maximize; ++ gboolean titleless_maximize; + gboolean box_move; + gboolean box_resize; + gboolean click_to_focus; +-- +1.8.4 + diff --git a/pcr/xfwm4-titleless/xfwm4.install b/pcr/xfwm4-titleless/xfwm4.install new file mode 100644 index 000000000..e4f8fd06c --- /dev/null +++ b/pcr/xfwm4-titleless/xfwm4.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From a1792bae6f21dd0cca9e5a0d5cfad55edc1c4955 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 1 Oct 2013 03:07:25 -0700 Subject: Tue Oct 1 03:05:59 PDT 2013 --- community/9base/PKGBUILD | 11 ++- community/bchunk/PKGBUILD | 19 +++-- community/cinnamon/PKGBUILD | 6 +- community/classpath/PKGBUILD | 10 ++- community/cmus/PKGBUILD | 38 +++++---- community/cmus/cdio-git.patch | 137 +++++++++++++++++++++++++++++++++ community/fdupes/PKGBUILD | 30 +++++--- community/gdc/PKGBUILD | 4 +- community/gwibber/PKGBUILD | 24 ++++-- community/gwibber/gwibber-pillow.patch | 24 ++++++ community/jansson/PKGBUILD | 6 +- community/lz4/PKGBUILD | 4 +- community/mlt/PKGBUILD | 6 +- community/parrot/PKGBUILD | 6 +- community/pgadmin3/PKGBUILD | 9 +-- community/plan9port/PKGBUILD | 6 +- community/python-pillow/PKGBUILD | 68 ++++++++++++++++ community/python-pillow/pull325.diff | 38 +++++++++ community/qtcurve-qt4/PKGBUILD | 35 +++++++++ community/sk1/PKGBUILD | 19 +++-- community/sk1/fix_pillow_import.patch | 35 +++++++++ community/uniconvertor/PKGBUILD | 6 +- community/xboard/PKGBUILD | 12 +-- community/xmms2/PKGBUILD | 7 +- community/xosd/PKGBUILD | 8 +- extra/asymptote/PKGBUILD | 6 +- extra/python-geoip/PKGBUILD | 8 +- extra/rsync/PKGBUILD | 17 ++-- libre/libretools/PKGBUILD | 12 +-- 29 files changed, 489 insertions(+), 122 deletions(-) create mode 100644 community/cmus/cdio-git.patch create mode 100644 community/gwibber/gwibber-pillow.patch create mode 100644 community/python-pillow/PKGBUILD create mode 100644 community/python-pillow/pull325.diff create mode 100644 community/qtcurve-qt4/PKGBUILD create mode 100644 community/sk1/fix_pillow_import.patch (limited to 'community/xboard/PKGBUILD') diff --git a/community/9base/PKGBUILD b/community/9base/PKGBUILD index a38a266bd..92bcce809 100644 --- a/community/9base/PKGBUILD +++ b/community/9base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68390 2012-03-23 21:00:56Z cbrannon $ +# $Id: PKGBUILD 97894 2013-09-30 20:21:53Z bpiotrowski $ # Maintainer: Chris Brannon # Contributor: Jeff Mickey # Contributor: Aaron, phrakture, Griffin @@ -6,7 +6,7 @@ pkgname=9base pkgver=6 -pkgrel=4 +pkgrel=5 pkgdesc="Port of various original Plan9 tools to unix" url="http://tools.suckless.org/9base" source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz 9 plan9.sh) @@ -16,9 +16,8 @@ provides=('plan9') arch=('i686' 'x86_64') license=('custom') -build() -{ - cd "$srcdir/$pkgname-$pkgver" +build() { + cd $pkgname-$pkgver case $CARCH in i686) sed -i 's#^OBJTYPE\s.*$#OBJTYPE = 386#' config.mk ;; @@ -36,7 +35,7 @@ build() } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -m755 ../9 "$pkgdir/opt/plan9/bin/" install -D -m755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh" diff --git a/community/bchunk/PKGBUILD b/community/bchunk/PKGBUILD index 2a8ac0198..23533b0d5 100644 --- a/community/bchunk/PKGBUILD +++ b/community/bchunk/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Xyne # Contributor: Jaroslaw Swierczynski # Contributor: eric # Contributor: Markus Meissner @@ -6,25 +7,23 @@ pkgname=bchunk pkgver=1.2.0 pkgrel=3 pkgdesc="A Tool to Convert *.raw *.bin files to an ISO file" -url="http://hes.iki.fi/bchunk/" +url="http://he.fi/bchunk/" arch=('i686' 'x86_64') license=('GPL') depends=('glibc') -source=(http://hes.iki.fi/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://he.fi/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('6a613da3f34f9a303f202d2e9731d231') build() { - cd ${srcdir}/${pkgname}-${pkgver} - + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/share/man/man1 - - make PREFIX=${pkgdir}/usr MAN_DIR=${pkgdir}/usr/share/man install - chown root.root ${pkgdir}/usr/share/man/man1/bchunk.1 + cd "$srcdir/$pkgname-$pkgver" + install -dm755 "$pkgdir"/usr/{bin,share/man/man1} + make PREFIX="$pkgdir/usr" MAN_DIR="$pkgdir/usr/share/man" install + chown root:root "$pkgdir/usr/share/man/man1/bchunk.1" } + # vim: ts=2 sw=2 et ft=sh diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 0571d4230..cd3603d04 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95592 2013-08-14 21:28:25Z bgyorgy $ +# $Id: PKGBUILD 97850 2013-09-30 10:27:55Z allan $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.8.8 -pkgrel=4 +pkgrel=5 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -14,7 +14,7 @@ license=('GPL2') depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg' - 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging' + 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat' 'gnome-panel') makedepends=('gnome-common' 'intltool') diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD index 729e13a9a..a222c9f35 100644 --- a/community/classpath/PKGBUILD +++ b/community/classpath/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 59865 2011-12-01 13:10:18Z spupykin $ +# $Id: PKGBUILD 97832 2013-09-30 10:02:06Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: tardo # Contributor: Sean Gillespie pkgname=classpath pkgver=0.98 -pkgrel=4 +pkgrel=5 pkgdesc="A free replacement for Sun's proprietary core Java class libraries." arch=('i686' 'x86_64') url="http://www.gnu.org/software/classpath/" license=('GPL') depends=('gtk2>=2.8' 'libxtst' 'libsm') -makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'openjdk6') +makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment') optdepends=('file' 'gconf') source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz) md5sums=('90c6571b8b0309e372faa0f9f6255ea9') @@ -30,6 +30,10 @@ EOF ./configure --prefix=/usr --disable-Werror --disable-plugin make EXAMPLESDIR= +} + +package() { + cd $srcdir/$pkgname-$pkgver make EXAMPLESDIR= DESTDIR=$pkgdir install rm -f $pkgdir/usr/bin/gappletviewer diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index eccd1eee4..5d54d3c79 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 94872 2013-08-01 06:54:46Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 97815 2013-09-30 02:36:29Z xyne $ +# Maintainer: Xyne +# Contributor: Bartłomiej Piotrowski # Contributor: Aaron Griffin # Contributor: dorphell pkgname=cmus pkgver=2.5.0 -pkgrel=3 +pkgrel=4 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug' - 'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack') +makedepends=( + 'faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug' 'libcdio-paranoia' + 'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack' +) optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' 'libpulse: for PulseAudio output plugin support' @@ -24,23 +27,32 @@ optdepends=('alsa-lib: for ALSA output plugin support' 'libmp4v2: for mp4 input plugin support' 'libmpcdec: for musepack input plugin support' 'libvorbis: for vorbis input plugin support' + 'libcdio-paranoia: for cdio support' 'opusfile: for opus input plugin support' 'wavpack: for wavpack input plugin support') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2 - cmus-2.5.0-opus-support.patch) + cmus-2.5.0-opus-support.patch + cdio-git.patch) sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b' - '5e524f54d565dfa30760562c223bc0e2e8ed00a0') + '5e524f54d565dfa30760562c223bc0e2e8ed00a0' + '77738acc7d4e71f6d396a5cd464dbbce0168b6b7') + +prepare() { + cd "$srcdir/$pkgname-v$pkgver" + # Inherited from Bart or earlier. + patch -Np1 -i "$srcdir/cmus-2.5.0-opus-support.patch" + # Include changes from git for compatibility with new cdio. + patch -N -i "$srcdir/cdio-git.patch" +} build() { - cd $srcdir/$pkgname-v$pkgver - patch -Np1 -i $srcdir/cmus-2.5.0-opus-support.patch + cd "$srcdir/$pkgname-v$pkgver" ./configure prefix=/usr make } package() { - cd $srcdir/$pkgname-v$pkgver - make DESTDIR=$pkgdir install - - install -Dm 644 contrib/_cmus $pkgdir/usr/share/zsh/site-functions/_cmus + cd "$srcdir/$pkgname-v$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 contrib/_cmus "$pkgdir"/usr/share/zsh/site-functions/_cmus } diff --git a/community/cmus/cdio-git.patch b/community/cmus/cdio-git.patch new file mode 100644 index 000000000..8c549bee7 --- /dev/null +++ b/community/cmus/cdio-git.patch @@ -0,0 +1,137 @@ +*** cdio.c 2012-11-07 08:46:17.000000000 +0000 +--- cmus-git/src/cmus/cdio.c 2013-09-30 02:21:10.518785946 +0000 +*************** +*** 1,5 **** + /* +! * Copyright 2011 Various Authors + * Copyright 2011 Johannes Weißl + * + * Based on cdda.c from XMMS2. +--- 1,5 ---- + /* +! * Copyright 2011-2013 Various Authors + * Copyright 2011 Johannes Weißl + * + * Based on cdda.c from XMMS2. +*************** +*** 27,35 **** + #include "comment.h" + #include "discid.h" + +- #include + #include + #include + #include + #include + #include +--- 27,40 ---- + #include "comment.h" + #include "discid.h" + + #include + #include ++ #if LIBCDIO_VERSION_NUM >= 90 ++ #include ++ #else ++ #include ++ #endif ++ + #include + #include + #include +*************** +*** 352,375 **** + GROWING_KEYVALS(c); + const char *artist = NULL, *albumartist = NULL, *album = NULL, + *title = NULL, *genre = NULL, *comment = NULL; +! const cdtext_t *cdtext_track, *cdtext_album; + #ifdef HAVE_CDDB + cddb_conn_t *cddb_conn = NULL; + cddb_disc_t *cddb_disc = NULL; + #endif + char buf[64]; + +! cdtext_track = cdio_get_cdtext(priv->cdio, priv->track); +! if (cdtext_track) { +! char * const *field = cdtext_track->field; + artist = field[CDTEXT_PERFORMER]; + title = field[CDTEXT_TITLE]; + genre = field[CDTEXT_GENRE]; + comment = field[CDTEXT_MESSAGE]; + } +! cdtext_album = cdio_get_cdtext(priv->cdio, 0); +! if (cdtext_album) { +! char * const *field = cdtext_album->field; + album = field[CDTEXT_TITLE]; + albumartist = field[CDTEXT_PERFORMER]; + if (!artist) +--- 357,403 ---- + GROWING_KEYVALS(c); + const char *artist = NULL, *albumartist = NULL, *album = NULL, + *title = NULL, *genre = NULL, *comment = NULL; +! int track_comments_found = 0; +! const cdtext_t *cdt; + #ifdef HAVE_CDDB + cddb_conn_t *cddb_conn = NULL; + cddb_disc_t *cddb_disc = NULL; + #endif + char buf[64]; + +! #if LIBCDIO_VERSION_NUM >= 90 +! cdt = cdio_get_cdtext(priv->cdio); +! if (cdt) { +! artist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, priv->track); +! title = cdtext_get(cdt, CDTEXT_FIELD_TITLE, priv->track); +! genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, priv->track); +! comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, priv->track); +! +! if (title) +! track_comments_found = 1; +! +! album = cdtext_get(cdt, CDTEXT_FIELD_TITLE, 0); +! albumartist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, 0); +! if (!artist) +! artist = albumartist; +! if (!genre) +! genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, 0); +! if (!comment) +! comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, 0); +! } +! #else +! cdt = cdio_get_cdtext(priv->cdio, priv->track); +! if (cdt) { +! track_comments_found = 1; +! char * const *field = cdt->field; + artist = field[CDTEXT_PERFORMER]; + title = field[CDTEXT_TITLE]; + genre = field[CDTEXT_GENRE]; + comment = field[CDTEXT_MESSAGE]; + } +! cdt = cdio_get_cdtext(priv->cdio, 0); +! if (cdt) { +! char * const *field = cdt->field; + album = field[CDTEXT_TITLE]; + albumartist = field[CDTEXT_PERFORMER]; + if (!artist) +*************** +*** 379,387 **** + if (!comment) + comment = field[CDTEXT_MESSAGE]; + } + + #ifdef HAVE_CDDB +! if (!cdtext_track && cddb_url && cddb_url[0]) { + cddb_track_t *cddb_track; + track_t i_tracks = cdio_get_num_tracks(priv->cdio); + track_t i_first_track = cdio_get_first_track_num(priv->cdio); +--- 407,416 ---- + if (!comment) + comment = field[CDTEXT_MESSAGE]; + } ++ #endif + + #ifdef HAVE_CDDB +! if (!track_comments_found && cddb_url && cddb_url[0]) { + cddb_track_t *cddb_track; + track_t i_tracks = cdio_get_num_tracks(priv->cdio); + track_t i_first_track = cdio_get_first_track_num(priv->cdio); diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD index 9dfae23a5..3b299b2a0 100644 --- a/community/fdupes/PKGBUILD +++ b/community/fdupes/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 90262 2013-05-10 16:06:17Z jelle $ -# Maintainer: Daenyth +# $Id: PKGBUILD 97812 2013-09-30 02:00:27Z xyne $ +# Maintainer: Xyne +# Contributor: Daenyth # Contributor: Chris Winter pkgname=fdupes @@ -11,19 +12,24 @@ url="http://code.google.com/p/fdupes/" license=('MIT') depends=(glibc) source=(http://fdupes.googlecode.com/files/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('47d0410c90c9e51e450933ba35a32b62' - '47f17890218f832f870bf7a02eaeb017') +sha256sums=('87dbc85b7b9cdb9626e713dd8078bd7487bceb58d47ceaff5404a9e6fd062881' + '6300e5a838d8a0f08b412742cb755c22708970aef420dbad5dc65ca7de677e39') build() { - cd $srcdir/$pkgname-$pkgver - + cd "$srcdir/$pkgname-$pkgver" make PREFIX=/usr } -package(){ - cd $srcdir/$pkgname-$pkgver - - install -d ${pkgdir}/usr/{share/man/man1,bin} - make PREFIX=$pkgdir/usr DESTDIR=${pkgdir}/usr/bin INSTALLDIR=${pkgdir}/usr/bin MAN_DIR=${pkgdir}/usr/share/man/man1 install - install -D -m644 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +package(){ + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir"/usr/{share/man/man1,bin} + make \ + PREFIX="$pkgdir/usr" \ + DESTDIR="$pkgdir/usr/bin" \ + INSTALLDIR="$pkgdir"/usr/bin \ + MAN_DIR="$pkgdir"/usr/share/man/man1 \ + install + install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim: set ts=2 sw=2 et: diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index c3201b9ac..5b0628024 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC" license=('GPL') @@ -69,7 +69,7 @@ build() package_gdc() { - depends=('libmpc' 'zlib') + depends=('gcc' 'binutils') optdepends=('libgphobos-devel: D standard library, GDC version') pkgdesc="Compiler for D programming language wich uses gcc backend" diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD index 6bf243222..cda7de6b6 100644 --- a/community/gwibber/PKGBUILD +++ b/community/gwibber/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $ +# $Id: PKGBUILD 97853 2013-09-30 10:27:58Z allan $ # Maintainer: Balló György pkgname=gwibber pkgver=3.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" arch=('i686' 'x86_64') url="http://gwibber.com/" license=('GPL') -depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') +depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-pillow' 'python2-xdg' 'dconf') makedepends=('intltool' 'vala') options=('!libtool') install=$pkgname.install @@ -16,14 +16,16 @@ source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$p lp_934530.patch lp_1051801.patch lp_1088775.patch - gtkspell3-port.patch) + gtkspell3-port.patch + gwibber-pillow.patch) md5sums=('5988e36e9f592c6eca6537ba6878307a' '8c43ae0ed96c52602befeff640a8672a' '0eb53f4f248a6c600b6c6dfaac12341f' '5698a3b1699c018719b193362486c9b5' - 'e8c657543542d8141fdfe4b87a24d7fe') + 'e8c657543542d8141fdfe4b87a24d7fe' + '8380d55786490965dfad37be09216dcb') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' @@ -35,6 +37,9 @@ build() { # Port to the new gtkspell3 patch -Np1 -i "$srcdir/gtkspell3-port.patch" + # Port to python-pillow + patch -Np1 -i "$srcdir/gwibber-pillow.patch" + # Use the standalone accounts configuration panel sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py @@ -42,6 +47,12 @@ build() { # Remove unneeded dependency on libdbusmenu sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in} + # Fix libaccounts-glib dependency + sed -i 's/--pkg accounts/--pkg libaccounts-glib/' */Makefile.{am,in} */*/Makefile.{am,in} +} + +build() { + cd "$srcdir/$pkgname-$pkgver" autoreconf -fi intltoolize --force ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ @@ -51,6 +62,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install } diff --git a/community/gwibber/gwibber-pillow.patch b/community/gwibber/gwibber-pillow.patch new file mode 100644 index 000000000..211d22e73 --- /dev/null +++ b/community/gwibber/gwibber-pillow.patch @@ -0,0 +1,24 @@ +diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py gwibber-3.6.0/gwibber/microblog/util/imagehandler.py +--- gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py 2012-08-21 06:14:09.000000000 +0200 ++++ gwibber-3.6.0/gwibber/microblog/util/imagehandler.py 2013-09-15 15:03:07.056371930 +0200 +@@ -1,6 +1,7 @@ + #!/usr/bin/env python + +-import os, hashlib, urllib2, Image ++import os, hashlib, urllib2 ++from PIL import Image + + DEFAULT_AVATAR = 'http://digg.com/img/udl.png' + +diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/resources.py gwibber-3.6.0/gwibber/microblog/util/resources.py +--- gwibber-3.6.0.orig/gwibber/microblog/util/resources.py 2012-08-21 06:14:09.000000000 +0200 ++++ gwibber-3.6.0/gwibber/microblog/util/resources.py 2013-09-15 15:02:36.825648020 +0200 +@@ -8,7 +8,7 @@ + from hashlib import sha1 + from os import makedirs, remove, environ + from os.path import join, isdir, realpath, exists +-import Image ++from PIL import Image + from datetime import datetime + from gwibber.microblog import network + from gwibber.microblog.util.const import * diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD index db43bce92..7dc08d820 100644 --- a/community/jansson/PKGBUILD +++ b/community/jansson/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76779 2012-09-29 19:28:30Z kkeen $ +# $Id: PKGBUILD 97810 2013-09-30 00:05:41Z kkeen $ # Maintainer: Kyle Keen # Contributor: Dave Reisner pkgname=jansson -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc='C library for encoding, decoding and manipulating JSON data' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glibc') license=('MIT') options=('!libtool') source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2") -md5sums=('3aaa1bb1195d705fac602b7504c9b945') +md5sums=('ab239be8c08871c8463b27cf7610947c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index c1ebdfefc..cb41d89e5 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97016 2013-09-10 10:58:05Z seblu $ +# $Id: PKGBUILD 97896 2013-09-30 21:39:10Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=104 +pkgver=105 pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 5962f270b..e0c5b8f9e 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96457 2013-08-29 15:10:58Z spupykin $ +# $Id: PKGBUILD 97836 2013-09-30 10:02:55Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Fabian Schoelzel # Contributor: funkyou @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.9.0 -pkgrel=4 +pkgrel=5 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') url="http://www.mltframework.org" @@ -25,7 +25,7 @@ build() { cd "$srcdir/mlt-$pkgver" msg "SSE2=$SSE2" - ./configure --prefix=/usr --disable-gtk2 \ + ./configure --prefix=/usr \ --avformat-swscale \ --enable-gpl --enable-gpl3 make diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index e36b3debe..7e07d2623 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94711 2013-07-29 10:19:02Z spupykin $ +# $Id: PKGBUILD 97838 2013-09-30 10:03:17Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: mpie pkgname=parrot -pkgver=5.6.0 +pkgver=5.7.0 #_rel=stable _rel=devel pkgrel=1 @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('7bf098790c5772bb45480abe3e425f3c') +md5sums=('3fcb1b21a3d71be8c4a4111fcac56278') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index 3621196b2..c73581bcd 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97013 2013-09-10 10:15:36Z spupykin $ +# $Id: PKGBUILD 97840 2013-09-30 10:03:39Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Douglas Soares de Andrade # Contributor: Benjamin Andresen @@ -6,13 +6,13 @@ pkgname=pgadmin3 pkgver=1.18.0 -pkgrel=1 +pkgrel=2 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64') url="http://www.pgadmin.org" license=('custom') depends=('wxgtk' 'postgresql-libs' 'libxslt') -makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick') +makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick') _categories="Development;Application" source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) md5sums=('ed1968a9abda0064be68bf57d7ccad43') @@ -21,7 +21,6 @@ build() { cd "$srcdir" convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png cp pgadmin3-3.png pgadmin3.png - gendesk $startdir/PKGBUILD cd "pgadmin3-${pkgver}" [ -f Makefile ] || ./configure --prefix=/usr @@ -36,5 +35,5 @@ package() { install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico install -Dm644 "$srcdir/pgadmin3.png" "$pkgdir/usr/share/pixmaps/pgadmin3.png" - install -Dm644 "$srcdir/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop" + install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop" } diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 3769cfbd8..00581da7b 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97651 2013-09-26 18:54:27Z arodseth $ +# $Id: PKGBUILD 97830 2013-09-30 09:18:30Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: phrakture # Contributor: Fazlul Shahriar # Contributor: Chris Brannon pkgname=plan9port -pkgver=20130926 +pkgver=20130927 pkgrel=1 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686') @@ -18,7 +18,7 @@ install='plan9.install' options=('!zipman') source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz" 'plan9.sh') -sha256sums=('9ba90b04bc45bec3e197e6c12f68f270c15ba1a9f68a6051e1f2b99503b6b2a7' +sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542' '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d') package() { diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD new file mode 100644 index 000000000..3cf4c2a3c --- /dev/null +++ b/community/python-pillow/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 97882 2013-09-30 13:00:41Z bgyorgy $ +# Maintainer: Kyle Keen +# Contributor: minder + +pkgbase=python-pillow +pkgname=(python-pillow python2-pillow) +_appname=Pillow +pkgver=2.1.0 +pkgrel=5 +pkgdesc="Python Imaging Library (PIL) fork. Python3 version." +arch=('i686' 'x86_64') +url="http://python-imaging.github.io/" +license=('BSD') +makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') +# remove pull325.diff on 2.1.1 release, fixes FS#36945 +source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip" + "pull325.diff") +md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200' + 'aa3fa12bd2d61041f6d01fedddab39fb') + +build() { + cd "$srcdir" + cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" +} + +package_python-pillow() { + depends=('python' 'lcms' 'libwebp') + optdepends=('tk: for the ImageTK module' + 'sane: for the Sane module' + 'python-pyqt4: for the ImageQt module') + cd "$srcdir/$_appname-$pkgver" + python3 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane + python3 setup.py install --root="$pkgdir/" --optimize=0 + popd + install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # clean up bins + cd "$pkgdir/usr/bin" + for f in *.py; do + mv "$f" "${f%.py}" + done +} + +package_python2-pillow() { + pkgdesc="Python Imaging Library (PIL) fork. Python2 version." + depends=('python2' 'lcms' 'libwebp') + optdepends=('tk: for the ImageTK module' + 'sane: for the Sane module' + 'python2-pyqt4: for the ImageQt module') + provides=('python-imaging' 'python2-imaging') + conflicts=('python-imaging' 'python2-imaging') + replaces=('python2-imaging') + cd "$srcdir/${_appname}2-$pkgver" + patch -Np1 -i ../pull325.diff + python2 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane + python2 setup.py install --root="$pkgdir/" --optimize=0 + popd + install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # clean up bins + cd "$pkgdir/usr/bin" + for f in *.py; do + mv "$f" "${f%.py}2" + done +} + diff --git a/community/python-pillow/pull325.diff b/community/python-pillow/pull325.diff new file mode 100644 index 000000000..48b36ab48 --- /dev/null +++ b/community/python-pillow/pull325.diff @@ -0,0 +1,38 @@ +diff --git a/PIL/Image.py b/PIL/Image.py +index bb15aaa..2e120e5 100644 +--- a/PIL/Image.py ++++ b/PIL/Image.py +@@ -706,7 +706,7 @@ def convert(self, mode=None, data=None, dither=None, + if self.mode == "L" and mode == "RGBA" and "transparency" in self.info: + from PIL import ImagePalette + self.mode = "P" +- bytePalette = bytes([i//3 for i in range(768)]) ++ bytePalette = bytes(bytearray([i//3 for i in range(768)])) + self.palette = ImagePalette.raw("RGB", bytePalette) + self.palette.dirty = 1 + self.load() +diff --git a/_imaging.c b/_imaging.c +index 9f48030..84f06e9 100644 +--- a/_imaging.c ++++ b/_imaging.c +@@ -287,6 +287,7 @@ int PyImaging_GetBuffer(PyObject* buffer, Py_buffer *view) + static const char* wrong_raw_mode = "unrecognized raw mode"; + static const char* outside_image = "image index out of range"; + static const char* outside_palette = "palette index out of range"; ++static const char* wrong_palette_size = "invalid palette size"; + static const char* no_palette = "image has no palette"; + static const char* readonly = "image is readonly"; + /* static const char* no_content = "image has no content"; */ +@@ -1413,6 +1414,11 @@ int PyImaging_GetBuffer(PyObject* buffer, Py_buffer *view) + return NULL; + } + ++ if ( palettesize * 8 / bits > 256) { ++ PyErr_SetString(PyExc_ValueError, wrong_palette_size); ++ return NULL; ++ } ++ + ImagingPaletteDelete(self->image->palette); + + strcpy(self->image->mode, "P"); + diff --git a/community/qtcurve-qt4/PKGBUILD b/community/qtcurve-qt4/PKGBUILD new file mode 100644 index 000000000..078bf49d9 --- /dev/null +++ b/community/qtcurve-qt4/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=qtcurve-qt4 +pkgver=1.8.15 +pkgrel=1 +arch=('i686' 'x86_64') +groups=('qtcurve') +license=('GPL') +pkgdesc='A configurable set of widget styles for KDE and Gtk' +url='https://github.com/QtCurve/qtcurve-qt4' +depends=('kdebase-workspace') +makedepends=('cmake' 'automoc4') +replaces=('qtcurve-kde4') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/QtCurve/qtcurve-qt4/archive/${pkgver}.tar.gz") +md5sums=('ee0b35fe428807b0dc2b0c57e5eb4f38') + +build() { + cd ${pkgname}-${pkgver} + + sed -i "s/QApplication/QCoreApplication/g" tools/gen_image_header_qt4.cpp + mkdir build + cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${pkgname}-${pkgver}/build + make DESTDIR="${pkgdir}" install +} diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index ce9d43be2..cdba8f23c 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 81608 2012-12-25 00:34:13Z foutrelis $ +# $Id: PKGBUILD 97887 2013-09-30 13:21:30Z bgyorgy $ # Maintainer: Sergej Pupykin # Contributor: ConnorBehan pkgname=sk1 pkgver=0.9.1 -pkgrel=9 +pkgrel=11 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64) url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl' 'tk' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'pyxml' 'zenity' 'sk1libs') license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop + fix_pillow_import.patch build-fix.patch) -md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' - 'bbf6f10b8155838eede93b5abed724f5' - 'b22c3c7b6a979c0a4e59ecaa2bd2182b') -build() { +package() { local _tclver=`pacman -Q tcl` local _tclnum=${tclver:4:3} local _tcldir='tcl'${tclnum} cd $srcdir/sK1-${pkgver}pre + # pillow import fix + patch -Np1 -i $srcdir/fix_pillow_import.patch + # python2 fix sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py @@ -44,3 +45,7 @@ build() { sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1 } +md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' + 'bbf6f10b8155838eede93b5abed724f5' + '4a44dd89707b19fe58f4c124ed321236' + 'b22c3c7b6a979c0a4e59ecaa2bd2182b') diff --git a/community/sk1/fix_pillow_import.patch b/community/sk1/fix_pillow_import.patch new file mode 100644 index 000000000..7306dd3b6 --- /dev/null +++ b/community/sk1/fix_pillow_import.patch @@ -0,0 +1,35 @@ +diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py +--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py 2009-07-16 23:26:15.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py 2013-09-22 09:52:26.543457833 +0000 +@@ -24,7 +24,7 @@ + + import tooltips + +-import Image, ImageTk, ImageDraw ++from PIL import Image, ImageTk, ImageDraw + + DEFAULT_WIDTH=0.283286 + DEFAULT_CORNER=const.JoinMiter +diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py +--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py 2009-05-15 22:11:39.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py 2013-09-22 09:52:13.216885815 +0000 +@@ -24,7 +24,7 @@ + + import tooltips + +-import Image, ImageTk, ImageDraw ++from PIL import Image, ImageTk, ImageDraw + + DEFAULT_WIDTH=0.283286 + DEFAULT_CORNER=const.JoinMiter +diff -aur sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py +--- sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py 2009-04-30 02:58:41.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py 2013-09-22 09:52:38.150044124 +0000 +@@ -8,7 +8,7 @@ + # The color sample size is 31x20 px + + from Ttk import TButton +-import Image, ImageTk ++from PIL import Image, ImageTk + + class TColorButton(TButton): diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD index 5a2c6f383..c8efbd281 100644 --- a/community/uniconvertor/PKGBUILD +++ b/community/uniconvertor/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 78268 2012-10-17 10:27:59Z allan $ +# $Id: PKGBUILD 97864 2013-09-30 10:28:08Z allan $ # Maintainer: Sergej Pupykin # Contributor: Roberto Alsina pkgname=uniconvertor pkgver=1.1.5 -pkgrel=6 +pkgrel=7 pkgdesc="A universal vector graphics translator using sK1 engine." arch=('i686' 'x86_64') url="http://sk1project.org/modules.php?name=Products&product=uniconvertor" license=('GPL') -depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs') +depends=('python2' 'python2-pillow' 'python2-reportlab' 'sk1libs') makedepends=('gcc') source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz) md5sums=('d1272315a58304ece2ff588834e23f72') diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index f9687dc57..c84973936 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97605 2013-09-25 13:39:22Z spupykin $ +# $Id: PKGBUILD 97844 2013-09-30 10:04:25Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jason Chu # Contributor: Tom Newsom pkgname=xboard pkgver=4.7.2 -pkgrel=2 +pkgrel=3 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64') url="http://www.gnu.org/software/xboard/" @@ -13,16 +13,12 @@ license=('GPL3') depends=('gnuchess' 'texinfo' 'xdg-utils' 'xorg-fonts-75dpi' 'xorg-fonts-100dpi' 'gtk2' 'cairo' 'librsvg') -makedepends=('gendesk') optdepends=('perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('83ec086cbf5c4bc362a188654a9332fc') build() { - cd "${srcdir}" - gendesk $startdir/PKGBUILD - cd "${pkgname}-${pkgver}" sed -i 's/fairymax/gnuchess/g' {xaw,gtk}/xboard.h xboard.conf.in ./configure \ @@ -36,11 +32,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png install -Dm755 ${srcdir}/${pkgname}-${pkgver}/cmail \ ${pkgdir}/usr/bin/cmail } diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index e7fa795bb..8d9963c87 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94916 2013-08-01 06:55:59Z bpiotrowski $ +# $Id: PKGBUILD 97846 2013-09-30 10:05:03Z spupykin $ # Maintainer: Sergej Pupykin pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=19 +pkgrel=20 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -13,7 +13,7 @@ depends=('sqlite' 'libmad') makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' 'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout' 'libdiscid' 'libcdio-paranoia' - 'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex' + 'libvorbis' 'libxml2' 'mpg123' 'perl' 'pulseaudio' 'pyrex' 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi') optdepends=('alsa-lib: ALSA audio output' 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' @@ -37,7 +37,6 @@ optdepends=('alsa-lib: ALSA audio output' 'libvorbis: Ogg Vorbis support' 'libxml2: XSPF and podcast support' 'mpg123: alternative MP3 plugin' - 'oss: OSS audio output' 'perl: Perl language bindings' 'pulseaudio: PulseAudio audio output' 'pyrex: Python language bindings' diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD index 675b532d9..d6f4400d1 100644 --- a/community/xosd/PKGBUILD +++ b/community/xosd/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 61859 2012-01-09 10:23:17Z spupykin $ +# $Id: PKGBUILD 97848 2013-09-30 10:05:25Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Damir Perisa pkgname=xosd pkgver=2.2.14 -pkgrel=5 +pkgrel=6 pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools" arch=('i686' 'x86_64') license=('GPL2') url="http://www.ignavus.net/software.html" depends=('libxt' 'libxinerama' 'sh') -makedepends=('xmms' 'bmp' 'gdk-pixbuf') -optdepends=('gdk-pixbuf: for using the bmp or xmms plugin') +makedepends=('xmms' 'gdk-pixbuf') +optdepends=('gdk-pixbuf: for using the xmms plugin') options=('!libtool') source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz" "http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver-2.debian.tar.gz") diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index eca3192f2..6b289393c 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191983 2013-08-03 19:18:46Z remy $ +# $Id: PKGBUILD 195314 2013-09-30 10:28:34Z allan $ # Maintainer: Rémy Oudompheng # Contributor: Firmicus # Contributor: bender02 at gmx dot com pkgname=asymptote pkgver=2.24 -pkgrel=1 +pkgrel=2 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64') url="http://asymptote.sourceforge.net/" @@ -16,7 +16,7 @@ makedepends=('ghostscript' 'imagemagick' 'texlive-plainextra' # For texinfo ) optdepends=('python2: for the xasy GUI' - 'python-imaging: for the xasy GUI' + 'python2-pillow: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index 01ab96af0..dc15efab0 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186477 2013-05-27 11:23:42Z foutrelis $ +# $Id: PKGBUILD 195467 2013-09-30 13:27:17Z jgc $ # Maintainer: # Contributor: Angel Velasquez # Contributor: Jan de Groot @@ -6,7 +6,7 @@ pkgname=('python2-geoip') pkgbase=python-geoip pkgver=1.2.8 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" arch=('i686' 'x86_64') url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10" @@ -16,12 +16,12 @@ source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.ta sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73') build() { - cd "$srcdir/GeoIP-Python-$pkgver" + cd "GeoIP-Python-$pkgver" python2 setup.py build } package_python2-geoip() { - cd "$srcdir/GeoIP-Python-$pkgver" + cd "GeoIP-Python-$pkgver" python2 setup.py install --root="$pkgdir" -O1 } diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index 9cc142f00..4744ab5b8 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 185234 2013-05-12 10:36:09Z pierre $ +# $Id: PKGBUILD 195476 2013-09-30 19:07:27Z pierre $ pkgname=rsync -pkgver=3.0.9 -pkgrel=6 +pkgver=3.1.0 +pkgrel=1 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64') url="http://samba.anu.edu.au/rsync/" license=('GPL3') -depends=('perl') +depends=('perl' 'popt') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz" + "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc" 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service' 'rsyncd.socket' 'rsyncd@.service') -md5sums=('5ee72266fe2c1822333c407e1761b92b' +md5sums=('3be148772a33224771a8d4d2a028b132' + 'SKIP' 'bce64d122a8e0f86872a4a21a03bc7f3' 'ea3e9277dc908bc51f9eddc0f6b935c1' '084140868d38cf3e937a2db716d47c0f' @@ -21,7 +23,10 @@ md5sums=('5ee72266fe2c1822333c407e1761b92b' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-included-popt + ./configure --prefix=/usr \ + --with-included-popt=no \ + --with-included-zlib=no \ + --disable-debug make } diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 953cd18b1..9228e28a5 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,15 +9,15 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130914 -_libretools_commit=ab8dc8d4204d198f01e1fc7f59498a2794df829f -_devtools_commit=6fbdc4eb481302541cf8fa282fb3453e4c5d0d16 +pkgver=20130930 +_libretools_commit=1e16e59a861c8359dffe0af5b8dd4d2922f4018e +_devtools_commit=f566ebf8345cf39f1d50eaa6a679b3ca7088f4eb _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 +pkgrel=2 arch=('any') makedepends=(emacs ronn) # emacs --batch is used during the build to process text checkdepends=(sh-roundup) @@ -83,5 +83,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('91b1d56254bd61f1266ee2cb20e671a3' - 'f44ca55997ab9598b7f1a8aeb2379b52') +md5sums=('134ad4f9d4d8bad135e28c62b9856cda' + 'a3cc8d8fc2daa370799249a4ea5caafc') -- cgit v1.2.3-54-g00ecf