From 45b0e54b0b89a612f34aa4274252f40898fd2c27 Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Thu, 13 Sep 2012 17:42:53 +0200 Subject: [PATCH] qt: update to 4.8.3. --- srcpkgs/qt/patches/improve-cups-support.patch | 84 ------------------- srcpkgs/qt/template | 7 +- 2 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 srcpkgs/qt/patches/improve-cups-support.patch diff --git a/srcpkgs/qt/patches/improve-cups-support.patch b/srcpkgs/qt/patches/improve-cups-support.patch deleted file mode 100644 index 3c211449e9..0000000000 --- a/srcpkgs/qt/patches/improve-cups-support.patch +++ /dev/null @@ -1,84 +0,0 @@ -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/srcpkgs/qt/template b/srcpkgs/qt/template index 36c94e36b9..b239655042 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,8 +1,7 @@ # Template file for 'qt' pkgname=qt -version=4.8.2 -revision=5 -patch_args="-Np1" +version=4.8.3 +revision=1 _distname=qt-everywhere-opensource-src wrksrc=${_distname}-${version} homepage="http://qt.nokia.com/" @@ -18,7 +17,7 @@ short_desc="A cross-platform application and UI framework" maintainer="Juan RP <xtraeme@gmail.com>" license="GPL-3, LGPL-2.1" distfiles="http://releases.qt-project.org/qt4/source/${_distname}-$version.tar.gz" -checksum=921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 +checksum=f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 long_desc=" Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and maintaining GUI (graphical user interface) applications."