Sat Mar 10 00:01:15 UTC 2012

5 files changed, 104 insertions, 18 deletions

diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD
index fcc3b3dde..a27d77fc6 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')
@@ -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 b6f9dfcb9..1b3e5a30a 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 5d19edc14..fb070215a 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')
@@ -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 77c0ea289..00c71f598 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')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -20,7 +20,8 @@ source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'qtconfig.desktop'
         'fix-qgraphicsscene-regression.patch'
         'improved-filter-event.patch'
-        'qurl-backward-compatibility.patch')
+        'qurl-backward-compatibility.patch'
+        'improve-cups-support.patch')
 md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
@@ -28,7 +29,8 @@ md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
          'c2e91fc028250a590e76effe234468e2'
          '444ebeb716d7c7379835efb8aa88e6c8'
-         '7bc255a36733d0fbc80c1902ade4beca')
+         '7bc255a36733d0fbc80c1902ade4beca'
+         'c439c7731c25387352d8453ca7574971')
 
 build() {
   cd "${srcdir}"/${_pkgfqn}
@@ -39,6 +41,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}
 
@@ -53,7 +58,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
+ }
+ 
+ /*!