[arch-commits] Commit in qt4/repos/extra-x86_64 (16 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Tue Jul 2 11:12:21 UTC 2013
Date: Tuesday, July 2, 2013 @ 13:12:21
Author: andrea
Revision: 189290
archrelease: copy trunk to extra-x86_64
Added:
qt4/repos/extra-x86_64/PKGBUILD
(from rev 189289, qt4/trunk/PKGBUILD)
qt4/repos/extra-x86_64/assistant-qt4.desktop
(from rev 189289, qt4/trunk/assistant-qt4.desktop)
qt4/repos/extra-x86_64/designer-qt4.desktop
(from rev 189289, qt4/trunk/designer-qt4.desktop)
qt4/repos/extra-x86_64/improve-cups-support.patch
(from rev 189289, qt4/trunk/improve-cups-support.patch)
qt4/repos/extra-x86_64/linguist-qt4.desktop
(from rev 189289, qt4/trunk/linguist-qt4.desktop)
qt4/repos/extra-x86_64/qdbusviewer-qt4.desktop
(from rev 189289, qt4/trunk/qdbusviewer-qt4.desktop)
qt4/repos/extra-x86_64/qt4.install
(from rev 189289, qt4/trunk/qt4.install)
qt4/repos/extra-x86_64/qtconfig-qt4.desktop
(from rev 189289, qt4/trunk/qtconfig-qt4.desktop)
Deleted:
qt4/repos/extra-x86_64/PKGBUILD
qt4/repos/extra-x86_64/assistant-qt4.desktop
qt4/repos/extra-x86_64/designer-qt4.desktop
qt4/repos/extra-x86_64/improve-cups-support.patch
qt4/repos/extra-x86_64/linguist-qt4.desktop
qt4/repos/extra-x86_64/qdbusviewer-qt4.desktop
qt4/repos/extra-x86_64/qt4.install
qt4/repos/extra-x86_64/qtconfig-qt4.desktop
----------------------------+
PKGBUILD | 283 ++++++++++++++++++++++---------------------
assistant-qt4.desktop | 18 +-
designer-qt4.desktop | 22 +--
improve-cups-support.patch | 168 ++++++++++++-------------
linguist-qt4.desktop | 20 +--
qdbusviewer-qt4.desktop | 20 +--
qt4.install | 24 +--
qtconfig-qt4.desktop | 18 +-
8 files changed, 291 insertions(+), 282 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-02 11:12:11 UTC (rev 189289)
+++ PKGBUILD 2013-07-02 11:12:21 UTC (rev 189290)
@@ -1,137 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=qt4
-pkgver=4.8.4
-pkgrel=18
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-pkgdesc='A cross-platform application and UI framework'
-depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
- 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
- 'mesa-libgl')
-optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmariadbclient: MariaDB driver'
- 'unixodbc: ODBC driver'
- 'libfbclient: Firebird/iBase driver'
- 'libxinerama: Xinerama support'
- 'libxcursor: Xcursor support'
- 'libxfixes: Xfixes support'
- 'icu: Unicode support')
-install="${pkgname}.install"
-options=('!libtool')
-replaces=('qt<=4.8.4')
-conflicts=('qt')
-_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
- 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
- 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
- 'improve-cups-support.patch')
-md5sums=('89c5ecba180cae74c66260ac732dc5cb'
- 'a16638f4781e56e7887ff8212a322ecc'
- '8a28b3f52dbeb685d4b69440b520a3e1'
- '9727c406c240990870c905696a8c5bd1'
- '0e384663d3dd32abe35f5331c4147569'
- 'b859c5673e5098c39f72b2252947049e'
- 'c439c7731c25387352d8453ca7574971')
-
-build() {
- cd ${_pkgfqn}
-
- # (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}
-
- sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
- sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -bindir /usr/lib/qt4/bin \
- -headerdir /usr/include/qt4 \
- -docdir /usr/share/doc/qt4 \
- -plugindir /usr/lib/qt4/plugins \
- -importdir /usr/lib/qt4/imports \
- -datadir /usr/share/qt4 \
- -translationdir /usr/share/qt4/translations \
- -sysconfdir /etc/xdg \
- -examplesdir /usr/share/doc/qt4/examples \
- -demosdir /usr/share/doc/qt4/demos \
- -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
- -system-sqlite \
- -no-phonon \
- -no-phonon-backend \
- -no-webkit \
- -graphicssystem raster \
- -openssl-linked \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -silent \
- -no-rpath \
- -optimized-qmake \
- -reduce-relocations \
- -dbus-linked \
- -no-openvg
- make
-}
-
-package() {
- cd ${_pkgfqn}
- make INSTALL_ROOT="${pkgdir}" install
-
- # install missing icons and desktop files
- install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
- "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/qt4logo.png
- install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
- "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/assistant-qt4.png
- install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \
- "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/assistant-qt4.png
- install -D -m644 tools/designer/src/designer/images/designer.png \
- "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/designer-qt4.png
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -D -m644 ${icon} \
- "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt4.png
- done
- install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \
- "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png
- install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
- "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png
-
- install -d "${pkgdir}"/usr/share/applications
- install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \
- "${pkgdir}"/usr/share/applications/
-
- # Useful symlinks for cmake and configure scripts
- install -d "${pkgdir}"/usr/bin
- for b in "${pkgdir}"/usr/lib/qt4/bin/*; do
- ln -s /usr/lib/qt4/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt4
- done
-
- # install license addition
- install -D -m644 LGPL_EXCEPTION.txt \
- ${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
-
- # Fix wrong libs path in pkgconfig files
- find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
- -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
- # Fix wrong bins path in pkgconfig files
- find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
- -exec sed -i 's|/usr/bin/|/usr/lib/qt4/bin/|g' {} \;
-
- # Fix wrong path in prl files
- find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-
- # The TGA plugin is broken (FS#33568)
- rm "${pkgdir}"/usr/lib/qt4/plugins/imageformats/libqtga.so
-}
Copied: qt4/repos/extra-x86_64/PKGBUILD (from rev 189289, qt4/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-07-02 11:12:21 UTC (rev 189290)
@@ -0,0 +1,146 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=qt4
+pkgver=4.8.5
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL')
+pkgdesc='A cross-platform application and UI framework'
+depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
+ 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+ 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
+ 'mesa-libgl')
+optdepends=('qtchooser: set the default Qt toolkit'
+ 'postgresql-libs: PostgreSQL driver'
+ 'libmariadbclient: MariaDB driver'
+ 'unixodbc: ODBC driver'
+ 'libfbclient: Firebird/iBase driver'
+ 'libxinerama: Xinerama support'
+ 'libxcursor: Xcursor support'
+ 'libxfixes: Xfixes support'
+ 'icu: Unicode support')
+install="${pkgname}.install"
+options=('!libtool')
+replaces=('qt<=4.8.4')
+conflicts=('qt')
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz"
+ 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
+ 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
+ 'improve-cups-support.patch')
+md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
+ 'a16638f4781e56e7887ff8212a322ecc'
+ '8a28b3f52dbeb685d4b69440b520a3e1'
+ '9727c406c240990870c905696a8c5bd1'
+ '0e384663d3dd32abe35f5331c4147569'
+ 'b859c5673e5098c39f72b2252947049e'
+ 'c439c7731c25387352d8453ca7574971')
+
+prepare() {
+ cd ${_pkgfqn}
+
+ # (FS#28381) (KDEBUG#180051)
+ patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+ sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
+ sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
+ sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
+
+ cp mkspecs/common/linux{,32}.conf
+ sed -i "/^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g" mkspecs/common/linux32.conf
+ sed -i "s|common/linux.conf|common/linux32.conf|" mkspecs/linux-g++-32/qmake.conf
+}
+
+build() {
+ export QT4DIR="${srcdir}"/${_pkgfqn}
+ export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+
+ cd ${_pkgfqn}
+
+ ./configure -confirm-license -opensource \
+ -prefix /usr \
+ -bindir /usr/lib/qt4/bin \
+ -headerdir /usr/include/qt4 \
+ -docdir /usr/share/doc/qt4 \
+ -plugindir /usr/lib/qt4/plugins \
+ -importdir /usr/lib/qt4/imports \
+ -datadir /usr/share/qt4 \
+ -translationdir /usr/share/qt4/translations \
+ -sysconfdir /etc/xdg \
+ -examplesdir /usr/share/doc/qt4/examples \
+ -demosdir /usr/share/doc/qt4/demos \
+ -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+ -system-sqlite \
+ -no-phonon \
+ -no-phonon-backend \
+ -no-webkit \
+ -graphicssystem raster \
+ -openssl-linked \
+ -nomake demos \
+ -nomake examples \
+ -nomake docs \
+ -silent \
+ -no-rpath \
+ -optimized-qmake \
+ -reduce-relocations \
+ -dbus-linked \
+ -no-openvg
+ make
+}
+
+package() {
+ cd ${_pkgfqn}
+ make INSTALL_ROOT="${pkgdir}" install
+
+ # install missing icons and desktop files
+ install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
+ "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/qt4logo.png
+ install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
+ "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/assistant-qt4.png
+ install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \
+ "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/assistant-qt4.png
+ install -D -m644 tools/designer/src/designer/images/designer.png \
+ "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/designer-qt4.png
+ for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
+ size=$(echo $(basename ${icon}) | cut -d- -f2)
+ install -D -m644 ${icon} \
+ "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt4.png
+ done
+ install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \
+ "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png
+ install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+ "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt4.png
+
+ install -d "${pkgdir}"/usr/share/applications
+ install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \
+ "${pkgdir}"/usr/share/applications/
+
+ # Useful symlinks for cmake and configure scripts
+ install -d "${pkgdir}"/usr/bin
+ for b in "${pkgdir}"/usr/lib/qt4/bin/*; do
+ ln -s /usr/lib/qt4/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt4
+ done
+
+ # install license addition
+ install -D -m644 LGPL_EXCEPTION.txt \
+ ${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+
+ # Fix wrong libs path in pkgconfig files
+ find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
+ -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
+
+ # Fix wrong bins path in pkgconfig files
+ find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
+ -exec sed -i 's|/usr/bin/|/usr/lib/qt4/bin/|g' {} \;
+
+ # Fix wrong path in prl files
+ find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ # The TGA plugin is broken (FS#33568)
+ rm "${pkgdir}"/usr/lib/qt4/plugins/imageformats/libqtga.so
+}
Deleted: assistant-qt4.desktop
===================================================================
--- assistant-qt4.desktop 2013-07-02 11:12:11 UTC (rev 189289)
+++ assistant-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Assistant
-Comment=Shows Qt4 documentation and examples
-Exec=assistant-qt4
-Icon=assistant-qt4
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
Copied: qt4/repos/extra-x86_64/assistant-qt4.desktop (from rev 189289, qt4/trunk/assistant-qt4.desktop)
===================================================================
--- assistant-qt4.desktop (rev 0)
+++ assistant-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Assistant
+Comment=Shows Qt4 documentation and examples
+Exec=assistant-qt4
+Icon=assistant-qt4
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;
Deleted: designer-qt4.desktop
===================================================================
--- designer-qt4.desktop 2013-07-02 11:12:11 UTC (rev 189289)
+++ designer-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt4 applications
-Exec=designer-qt4
-Icon=designer-qt4
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
Copied: qt4/repos/extra-x86_64/designer-qt4.desktop (from rev 189289, qt4/trunk/designer-qt4.desktop)
===================================================================
--- designer-qt4.desktop (rev 0)
+++ designer-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Qt4 Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt4 applications
+Exec=designer-qt4
+Icon=designer-qt4
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
Deleted: improve-cups-support.patch
===================================================================
--- improve-cups-support.patch 2013-07-02 11:12:11 UTC (rev 189289)
+++ improve-cups-support.patch 2013-07-02 11:12:21 UTC (rev 189290)
@@ -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
- }
-
- /*!
Copied: qt4/repos/extra-x86_64/improve-cups-support.patch (from rev 189289, qt4/trunk/improve-cups-support.patch)
===================================================================
--- improve-cups-support.patch (rev 0)
+++ improve-cups-support.patch 2013-07-02 11:12:21 UTC (rev 189290)
@@ -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
+ }
+
+ /*!
Deleted: linguist-qt4.desktop
===================================================================
--- linguist-qt4.desktop 2013-07-02 11:12:11 UTC (rev 189289)
+++ linguist-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Linguist
-Comment=Add translations to Qt4 applications
-Exec=linguist-qt4
-Icon=linguist-qt4
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
Copied: qt4/repos/extra-x86_64/linguist-qt4.desktop (from rev 189289, qt4/trunk/linguist-qt4.desktop)
===================================================================
--- linguist-qt4.desktop (rev 0)
+++ linguist-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt4 Linguist
+Comment=Add translations to Qt4 applications
+Exec=linguist-qt4
+Icon=linguist-qt4
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
Deleted: qdbusviewer-qt4.desktop
===================================================================
--- qdbusviewer-qt4.desktop 2013-07-02 11:12:11 UTC (rev 189289)
+++ qdbusviewer-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt4 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=qdbusviewer-qt4
-Icon=qdbusviewer-qt4
-Terminal=false
-Type=Application
-Categories=Qt;Development;Debugger;
-
Copied: qt4/repos/extra-x86_64/qdbusviewer-qt4.desktop (from rev 189289, qt4/trunk/qdbusviewer-qt4.desktop)
===================================================================
--- qdbusviewer-qt4.desktop (rev 0)
+++ qdbusviewer-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt4 QDbusViewer
+GenericName=D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=qdbusviewer-qt4
+Icon=qdbusviewer-qt4
+Terminal=false
+Type=Application
+Categories=Qt;Development;Debugger;
+
Deleted: qt4.install
===================================================================
--- qt4.install 2013-07-02 11:12:11 UTC (rev 189289)
+++ qt4.install 2013-07-02 11:12:21 UTC (rev 189290)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: qt4/repos/extra-x86_64/qt4.install (from rev 189289, qt4/trunk/qt4.install)
===================================================================
--- qt4.install (rev 0)
+++ qt4.install 2013-07-02 11:12:21 UTC (rev 189290)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: qtconfig-qt4.desktop
===================================================================
--- qtconfig-qt4.desktop 2013-07-02 11:12:11 UTC (rev 189289)
+++ qtconfig-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Config
-Comment=Configure Qt4 behavior, styles, fonts
-Exec=qtconfig-qt4
-Icon=qt4logo
-Terminal=false
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
Copied: qt4/repos/extra-x86_64/qtconfig-qt4.desktop (from rev 189289, qt4/trunk/qtconfig-qt4.desktop)
===================================================================
--- qtconfig-qt4.desktop (rev 0)
+++ qtconfig-qt4.desktop 2013-07-02 11:12:21 UTC (rev 189290)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Config
+Comment=Configure Qt4 behavior, styles, fonts
+Exec=qtconfig-qt4
+Icon=qt4logo
+Terminal=false
+Type=Application
+Categories=Qt;Settings;
+NoDisplay=true
More information about the arch-commits
mailing list