diff options
-rw-r--r-- | community/cegui/PKGBUILD | 27 | ||||
-rw-r--r-- | community/cegui/cegui-0.7.6-python-detection.patch | 11 | ||||
-rw-r--r-- | community/ext4magic/PKGBUILD | 10 | ||||
-rw-r--r-- | community/ht/PKGBUILD | 8 | ||||
-rw-r--r-- | community/medit/PKGBUILD | 10 | ||||
-rw-r--r-- | community/optipng/PKGBUILD | 8 | ||||
-rw-r--r-- | community/pdnsd/PKGBUILD | 12 | ||||
-rw-r--r-- | community/python-sqlalchemy/PKGBUILD | 44 | ||||
-rw-r--r-- | community/redis/PKGBUILD | 6 | ||||
-rw-r--r-- | community/tea/PKGBUILD | 6 | ||||
-rw-r--r-- | community/virtualbox-modules/PKGBUILD | 4 | ||||
-rw-r--r-- | community/xvkbd/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/gif2png/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/iptraf-ng/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libcroco/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/qt/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/qt/improve-cups-support.patch | 84 | ||||
-rw-r--r-- | libre/kdebase-konqueror-libre/PKGBUILD | 9 | ||||
-rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 7 | ||||
-rw-r--r-- | libre/kdenetwork-libre/PKGBUILD | 24 | ||||
-rw-r--r-- | libre/kdeutils-ark-libre/PKGBUILD | 7 | ||||
-rw-r--r-- | libre/linux-libre-api-headers/PKGBUILD | 40 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 3 |
23 files changed, 274 insertions, 92 deletions
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index f8cf2d474..4eca423b8 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64313 2012-02-11 23:19:28Z allan $ +# $Id: PKGBUILD 67327 2012-03-08 18:15:45Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,26 +6,34 @@ pkgname=cegui pkgver=0.7.6 -pkgrel=2 +pkgrel=3 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" #options=('!libtool') license=("MIT") depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') -makedepends=('python2' 'doxygen') -source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) +makedepends=('python2' 'doxygen' 'ogre' 'irrlicht' 'gtk2' 'boost' 'graphviz') +optdepends=("python2: python bindings" + "ogre: ogre module" + "irrlicht: irrlicht module") options=(!libtool) -md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz + cegui-0.7.6-python-detection.patch) +md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3' + '4600775f78b7349621a8a314ade8c902') build() { cd $srcdir/CEGUI-${pkgver} - sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h + patch -Np0 < $srcdir/cegui-0.7.6-python-detection.patch + + ./bootstrap + ./configure --prefix=/usr \ --sysconfdir=/etc \ - --disable-xerces-c \ - --enable-null-renderer + --enable-null-renderer \ + --with-gtk2 make } @@ -35,8 +43,7 @@ package() { make DESTDIR=${pkgdir} install - #build docs - cd doc/doxygen && doxygen + cd doc/doxygen && doxygen cd .. && make DESTDIR=${pkgdir} install-html install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE diff --git a/community/cegui/cegui-0.7.6-python-detection.patch b/community/cegui/cegui-0.7.6-python-detection.patch new file mode 100644 index 000000000..e14cd812e --- /dev/null +++ b/community/cegui/cegui-0.7.6-python-detection.patch @@ -0,0 +1,11 @@ +--- acinclude.m4.original 2012-01-24 10:42:16.066632295 +0100 ++++ acinclude.m4 2012-01-24 10:43:15.800274030 +0100 +@@ -1411,7 +1411,7 @@ + if test x$ax_python_bin != x; then + AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) + AC_CHECK_HEADER([$ax_python_bin/Python.h], +- [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]], ++ [[ax_python_header="/usr/include/$ax_python_bin"]], + ax_python_header=no) + if test x$ax_python_lib != xno; then + if test x$ax_python_header != xno; then diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD index 60b39ffdc..d229cb03f 100644 --- a/community/ext4magic/PKGBUILD +++ b/community/ext4magic/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 61407 2011-12-30 10:27:27Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 67335 2012-03-09 01:54:07Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ext4magic -pkgver=0.2.4 +pkgver=0.3.0 pkgrel=1 pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems' arch=('i686' 'x86_64') url='http://developer.berlios.de/projects/ext4magic/' license=('GPL2') -depends=('util-linux' 'e2fsprogs') +depends=('bzip2' 'file' 'util-linux' 'e2fsprogs') source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('460b6642ee050d02b87395cc3ac6d4b6') +md5sums=('54ed503730b7e279c5cddc99a8821de3') build() { cd $pkgname-$pkgver diff --git a/community/ht/PKGBUILD b/community/ht/PKGBUILD index 3c5a3368a..ecf626536 100644 --- a/community/ht/PKGBUILD +++ b/community/ht/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 65560 2012-02-21 08:56:47Z spupykin $ +# $Id: PKGBUILD 67315 2012-03-08 16:30:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tardo <tardo@nagi-fanboi.net> # Contributor: Simon Morgan <"mra84964@mra.pb.hx".decode('rot-13')> pkgname=ht -pkgver=2.0.18 -pkgrel=2 +pkgver=2.0.20 +pkgrel=1 pkgdesc="A file editor/viewer/analyzer for executables" arch=('i686' 'x86_64' 'mips64el') url="http://hte.sourceforge.net/" license=('GPL') depends=('gcc-libs' 'ncurses' 'lzo2') source=(http://downloads.sourceforge.net/sourceforge/hte/$pkgname-$pkgver.tar.gz) -md5sums=('ce7698b80035bce297374b338045dadd') +md5sums=('22d5a30470032ec8b858d4a3a24f8d02') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD index 728f962c3..4bc379d55 100644 --- a/community/medit/PKGBUILD +++ b/community/medit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60108 2011-12-05 11:28:47Z spupykin $ +# $Id: PKGBUILD 67317 2012-03-08 16:31:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=medit -pkgver=1.0.5 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="A GTK text editor" arch=('i686' 'x86_64' 'mips64el') url="http://mooedit.sourceforge.net" @@ -16,13 +16,13 @@ makedepends=(pkgconfig perlxml intltool gcc-objc) install=medit.install source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2 medit-terminal.patch) -md5sums=('ca790a6153eab7e2a47ac965940c0c7d' +md5sums=('3c561ceb0edebea916f322e5049d9465' 'fc4c193506901379cf2978aba950179b') build() { cd $srcdir/medit-$pkgver export PYTHON=/usr/bin/python2 - patch -p0 <$srcdir/medit-terminal.patch +# patch -p0 <$srcdir/medit-terminal.patch [ -f Makefile ] || ./configure --prefix=/usr make } diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD index 73c31acad..68a499a0f 100644 --- a/community/optipng/PKGBUILD +++ b/community/optipng/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 59287 2011-11-22 15:27:27Z lfleischer $ +# $Id: PKGBUILD 67303 2012-03-08 12:19:11Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=optipng -pkgver=0.6.5 -pkgrel=2 +pkgver=0.7 +pkgrel=1 pkgdesc='Compresses PNG files to a smaller size, without losing any information.' arch=('i686' 'x86_64' 'mips64el') url='http://optipng.sourceforge.net/' license=('ZLIB') depends=('glibc') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('9df5fa7bb45ae096ed6c6e0d8dc43dc7') +md5sums=('9b2f526ce79ea779c7004c7964ee8bcc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index 2d3439434..9b8cfd281 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65623 2012-02-21 12:15:26Z spupykin $ +# $Id: PKGBUILD 67319 2012-03-08 16:32:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrik Nymann Jensen <h@henriknj.dk> pkgname=pdnsd -pkgver=1.2.8 -pkgrel=3 +pkgver=1.2.9 +pkgrel=1 pkgdesc="Is a proxy DNS server with permanent caching" arch=(i686 x86_64 'mips64el') url="http://www.phys.uu.nl/~rombouts/pdnsd/" @@ -13,7 +13,7 @@ depends=('glibc') #backup=('etc/pdnsd.conf') source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$pkgver-par.tar.gz pdnsd) -md5sums=('779c5d19576e561fbf2455de435e5597' +md5sums=('037f79d191b98974ffc2c9649727bf66' '3670bd47c9303fbb655d9216715512de') build() { @@ -21,9 +21,5 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR=$pkgdir install - - mkdir -p $pkgdir/etc/rc.d install -Dm0755 $srcdir/pdnsd $pkgdir/etc/rc.d/pdnsd - mkdir -p $pkgdir/usr/share/ - mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD new file mode 100644 index 000000000..f525225be --- /dev/null +++ b/community/python-sqlalchemy/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 67332 2012-03-09 00:22:36Z seblu $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=python-sqlalchemy +pkgname=('python-sqlalchemy' 'python2-sqlalchemy') +pkgver=0.7.5 +pkgrel=1 +arch=('i686' 'x86_64') # python2 package contain .so +url="http://www.sqlalchemy.org/" +license=('custom: MIT') +makedepends=('python' 'python2' 'python-distribute' 'python2-distribute') +source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") +md5sums=('52e71dddfdb8ca8c5049558a23d26557') + +build() { + cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver + cd SQLAlchemy-$pkgver + python setup.py build + cd ../SQLAlchemy2-$pkgver + python2 setup.py build +} + +package_python-sqlalchemy() { + pkgdesc='Python SQL toolkit and Object Relational Mapper' + depends=('python') + + cd SQLAlchemy-${pkgver} + python setup.py install --root="${pkgdir}" + install -D -m644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-sqlalchemy() { + pkgdesc='Python 2 SQL toolkit and Object Relational Mapper' + depends=('python2') + + cd SQLAlchemy2-$pkgver + python2 setup.py install --root="$pkgdir" + install -D -m644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index faaca7ee4..808c0704d 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64617 2012-02-17 07:14:41Z spupykin $ +# $Id: PKGBUILD 67321 2012-03-08 16:32:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('6afffb6120724183e40f1cac324ac71c' +md5sums=('ac776d25f238b142d3d526cfcdc621ab' '9726d06d0a0c60cb5d55a31b3dc1e55d' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 2ac60989e..01a82c843 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61545 2012-01-02 13:41:07Z spupykin $ +# $Id: PKGBUILD 67323 2012-03-08 16:33:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=31.2.0 +pkgver=32.0.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('720a9b586d0ae3f73f83dc954bd17a21' +md5sums=('42414e1e429d9dd20f4dcda1bedc1163' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 58321e66f..dbaaa736e 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66834 2012-02-29 07:29:58Z ibiru $ +# $Id: PKGBUILD 67305 2012-03-08 13:29:02Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') pkgver=4.1.8 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD index 7ffaa8d2a..631d31c17 100644 --- a/community/xvkbd/PKGBUILD +++ b/community/xvkbd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63496 2012-02-05 11:51:10Z ibiru $ +# $Id: PKGBUILD 67325 2012-03-08 16:34:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi> pkgname=xvkbd -pkgver=3.2 -pkgrel=3 +pkgver=3.3 +pkgrel=1 pkgdesc="virtual (graphical) keyboard program for X Window System" arch=('i686' 'x86_64' 'mips64el') url="http://homepage3.nifty.com/tsato/xvkbd/" @@ -13,7 +13,7 @@ license=('GPL') depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp' 'libxpm') makedepends=('imake') source=(http://homepage3.nifty.com/tsato/xvkbd/xvkbd-$pkgver.tar.gz) -md5sums=('1bce8d6c27e6e7df92ec09b414f82dad') +md5sums=('8495402211a610293563a749bb45a0f0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD index 3615508c3..da989a1d7 100644 --- a/extra/gif2png/PKGBUILD +++ b/extra/gif2png/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149145 2012-02-05 23:59:19Z giovanni $ +# $Id: PKGBUILD 152702 2012-03-09 00:04:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Andrew Rose <ody@netrux.com> pkgname=gif2png -pkgver=2.5.5 +pkgver=2.5.7 pkgrel=1 pkgdesc="A GIF to PNG image format converter" arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,13 @@ url="http://www.catb.org/~esr/gif2png/" license=('ZLIB') depends=('libpng') optdepends=('python2: for using web2png') -source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gif2png-2.5.5-libpng15.patch') -md5sums=('cfb4c003966866b6069d3707bfb12435' - '5b3467b97157f9a7978a230b934bc488') +source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('6da196f7923b7c329b83aa9a1dbf72be') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#env python#env python2#' web2png - patch -Np1 -i ${srcdir}/gif2png-2.5.5-libpng15.patch ./configure --prefix=/usr \ --mandir=/usr/share/man diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD index bfd0634f0..fd0b3ee5b 100644 --- a/extra/iptraf-ng/PKGBUILD +++ b/extra/iptraf-ng/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147066 2012-01-21 14:18:43Z ibiru $ +# $Id: PKGBUILD 152688 2012-03-08 20:30:23Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: sh0 <mee@sh0.org> pkgname=iptraf-ng -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)" url="https://fedorahosted.org/iptraf-ng/" @@ -13,7 +13,7 @@ license=('GPL2') replaces=('iptraf') options=('!libtool') source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('79a3787027515f688a35173ffbee6432') +md5sums=('a48c30c186aafc1e8921b611236b732b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD index 044155702..3778efe01 100644 --- a/extra/libcroco/PKGBUILD +++ b/extra/libcroco/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142887 2011-11-17 18:34:50Z ibiru $ +# $Id: PKGBUILD 152706 2012-03-09 01:01:22Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libcroco -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc="A CSS parsing library" arch=('x86_64' 'i686' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) url="http://www.gnome.org" -sha256sums=('8b7c565bf3eae1dff0a09d128fc3726acc1a492a7de23b25dce803a4f93d42c1') +sha256sums=('c816bad3406c52a98d84a2222c0e4a7b70ee0640b49cde4a236deaa02c4232ea') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 1491eaf99..ee76a64b1 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 151653 2012-02-29 18:44:48Z andrea $ +# $Id: PKGBUILD 152665 2012-03-08 10:07:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.0 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -21,7 +21,8 @@ source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'fix-qgraphicsscene-regression.patch' 'improved-filter-event.patch' 'qurl-backward-compatibility.patch' - 'declarative-fix-sigbus.patch') + 'declarative-fix-sigbus.patch' + 'improve-cups-support.patch') md5sums=('e8a5fdbeba2927c948d9f477a6abe904' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' @@ -30,7 +31,8 @@ md5sums=('e8a5fdbeba2927c948d9f477a6abe904' 'c2e91fc028250a590e76effe234468e2' '444ebeb716d7c7379835efb8aa88e6c8' '7bc255a36733d0fbc80c1902ade4beca' - 'aac963d05a9d5733e2bfce9e26607f51') + 'aac963d05a9d5733e2bfce9e26607f51' + 'c439c7731c25387352d8453ca7574971') build() { cd "${srcdir}"/${_pkgfqn} @@ -43,6 +45,9 @@ build() { patch -p1 -i "${srcdir}"/improved-filter-event.patch patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch + # (FS#28381) (KDEBUG#180051) + patch -p1 -i "${srcdir}"/improve-cups-support.patch + export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} @@ -59,7 +64,7 @@ build() { -importdir /usr/lib/qt/imports \ -datadir /usr/share/qt \ -translationdir /usr/share/qt/translations \ - -sysconfdir /etc \ + -sysconfdir /etc/xdg \ -examplesdir /usr/share/doc/qt/examples \ -demosdir /usr/share/doc/qt/demos \ -plugin-sql-{psql,mysql,sqlite,odbc} \ diff --git a/extra/qt/improve-cups-support.patch b/extra/qt/improve-cups-support.patch new file mode 100644 index 000000000..e0305e11b --- /dev/null +++ b/extra/qt/improve-cups-support.patch @@ -0,0 +1,84 @@ +diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp +--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100 +@@ -569,6 +569,32 @@ + void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups) + { + options.duplex->setEnabled(cups && cups->ppdOption("Duplex")); ++ ++ if (cups) { ++ const ppd_option_t* duplex = cups->ppdOption("Duplex"); ++ if (duplex) { ++ // copy default ppd duplex to qt dialog ++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) ++ options.duplexShort->setChecked(true); ++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) ++ options.duplexLong->setChecked(true); ++ else ++ options.noDuplex->setChecked(true); ++ } ++ ++ if (cups->currentPPD()) { ++ // set default color ++ if (cups->currentPPD()->color_device) ++ options.color->setChecked(true); ++ else ++ options.grayscale->setChecked(true); ++ } ++ ++ // set collation ++ const ppd_option_t *collate = cups->ppdOption("Collate"); ++ if (collate) ++ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); ++ } + } + #endif + +diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp +--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100 +@@ -627,6 +627,44 @@ + && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { + setOutputFormat(QPrinter::PdfFormat); + } ++ ++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) ++ // fill in defaults from ppd file ++ QCUPSSupport cups; ++ ++ int printernum = -1; ++ for (int i = 0; i < cups.availablePrintersCount(); i++) { ++ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) ++ printernum = i; ++ } ++ if (printernum >= 0) { ++ cups.setCurrentPrinter(printernum); ++ ++ const ppd_option_t* duplex = cups.ppdOption("Duplex"); ++ if (duplex) { ++ // copy default ppd duplex to qt dialog ++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) ++ setDuplex(DuplexShortSide); ++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) ++ setDuplex(DuplexLongSide); ++ else ++ setDuplex(DuplexNone); ++ } ++ ++ if (cups.currentPPD()) { ++ // set default color ++ if (cups.currentPPD()->color_device) ++ setColorMode(Color); ++ else ++ setColorMode(GrayScale); ++ } ++ ++ // set collation ++ const ppd_option_t *collate = cups.ppdOption("Collate"); ++ if (collate) ++ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); ++ } ++#endif + } + + /*! diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 48e36633f..f3f344e30 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,11 +1,12 @@ -# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> -# $Id: PKGBUILD 147790 2012-01-28 10:33:05Z andrea $ +# $Id$ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> +# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> +# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.8.0 +pkgver=4.8.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -14,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2" "konq-about-fsdg.diff") -sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3' +sha1sums=('7df527a537b5431ab551339338ea289c32ec43be' 'f41541371414dcbe5e76687835e648112b3ff364') pkgdesc='KDE File Manager & Web Browser' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 56f1000d5..7fcc8e77e 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,12 @@ # $Id: PKGBUILD 149297 2012-02-06 17:49:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.8.0 -pkgrel=3.2 +pkgver=4.8.1 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -23,7 +24,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar. 'kde-applications-menu.patch' 'fix-knotify-filepath.patch' 'khtml-fsdg.diff') -sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a' +sha1sums=('ec393b096003f1dd57c5e2987381b086ba1b363e' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '3312f6005aa56a9b992c74008fe5b314f1c8ffba' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD index c6b7d2826..309a63d5c 100644 --- a/libre/kdenetwork-libre/PKGBUILD +++ b/libre/kdenetwork-libre/PKGBUILD @@ -1,6 +1,7 @@ -# $Id: PKGBUILD 150223 2012-02-15 09:34:48Z andrea $ +# $Id: PKGBUILD 152429 2012-03-06 21:02:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgbase=kdenetwork pkgname=('kdenetwork-filesharing' @@ -10,7 +11,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.8.0 +pkgver=4.8.1 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,22 +21,17 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' 'libktorrent' 'libmms' 'mediastreamer') -source=("http://repo.parabolagnulinux.org/other/${pkgbase}-libre-${pkgver}.tar.xz") -sha1sums=('2472128aef671e3474505cf65397dfc7ef9f79bb') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('e914a1d990ff42ec88cf37ffc897ae9df9b1fa45') # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. -mksource() { - [ -f "${pkgbase}-${pkgver}.tar.bz2" ] || wget "http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - tar xf "${pkgbase}-${pkgver}.tar.bz2" - cd "${pkgbase}-${pkgver}" - sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.txt - rm -rf kopete/protocols/skype - sed 's/, Skype//' -i ./doc/kopete/index.docbook - cd .. - tar cJf "${pkgbase}-libre-${pkgver}.tar.xz" "${pkgbase}-${pkgver}" -} build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.txt + rm -rf kopete/protocols/skype + sed 's/, Skype//' -i ./doc/kopete/index.docbook + cd "${srcdir}" mkdir build cd build diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 737c0cb55..d5e9fb378 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 147905 2012-01-28 10:36:46Z andrea $ +# $Id: PKGBUILD 152399 2012-03-06 18:32:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.8.0 +pkgver=4.8.1 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -18,7 +19,7 @@ replaces=('kdeutils-ark') conflicts=('kdeutils-ark') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.bz2") -sha1sums=('99756e0896938371d6d7036fb3d5d0d152de29c3') +sha1sums=('403622ede8e28ed417c677ac8d71b1221582cff5') build() { cd "${srcdir}" diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD new file mode 100644 index 000000000..49963eb05 --- /dev/null +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> + +# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc + +pkgname=linux-libre-api-headers +pkgver=3.1.6 +_basever=3.1 +pkgrel=2 +pkgdesc="Kernel Libre headers sanitized for use in userspace" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL2') +provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}") +conflicts=('linux-api-headers' 'kernel-headers') +replaces=('linux-api-headers' 'kernel-headers') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-libre/linux-${_basever}-libre.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basever}-libre-${pkgver}-libre.xz") +md5sums=('d73df15ab1d36fe3c102755d8f42117f' + 'cb42276bca126c676c51d02d74bf7fe7') + +build() { + cd ${srcdir}/linux-${_basever} + [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${_basever}-libre-${pkgver}-libre + + make mrproper + make headers_check +} + +package() { + cd ${srcdir}/linux-${_basever} + make INSTALL_HDR_PATH=${pkgdir}/usr headers_install + + # use headers from libdrm + rm -rf ${pkgdir}/usr/include/drm + + # clean-up unnecessary files generated during install + find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f +} diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 63463cc0a..a3a4a283c 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -11,7 +11,7 @@ _basekernel=3.0 _sublevel=23 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.22 # nearly always the same as pkgver -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -140,7 +140,6 @@ build() { package_linux-libre-lts() { pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers" - groups=('base') depends=('coreutils' 'module-init-tools>=3.16') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26-lts' "linux-lts=$pkgver") |