[arch-commits] Commit in qt4/repos/staging-i686 (7 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Tue Feb 19 04:40:10 UTC 2013
Date: Tuesday, February 19, 2013 @ 05:40:10
Author: andrea
Revision: 178288
archrelease: copy trunk to staging-i686
Added:
qt4/repos/staging-i686/PKGBUILD
(from rev 178287, qt4/trunk/PKGBUILD)
qt4/repos/staging-i686/improve-cups-support.patch
(from rev 178287, qt4/trunk/improve-cups-support.patch)
qt4/repos/staging-i686/ld-gold.patch
(from rev 178287, qt4/trunk/ld-gold.patch)
qt4/repos/staging-i686/qt4.install
(from rev 178287, qt4/trunk/qt4.install)
qt4/repos/staging-i686/qt4.profile
(from rev 178287, qt4/trunk/qt4.profile)
qt4/repos/staging-i686/qtconfig.desktop
(from rev 178287, qt4/trunk/qtconfig.desktop)
Deleted:
qt4/repos/staging-i686/qt4.profile
----------------------------+
PKGBUILD | 117 +++++++++++++++++++++++++++++++++++++++++++
improve-cups-support.patch | 84 ++++++++++++++++++++++++++++++
ld-gold.patch | 22 ++++++++
qt4.install | 12 ++++
qt4.profile | 2
qtconfig.desktop | 9 +++
6 files changed, 245 insertions(+), 1 deletion(-)
Copied: qt4/repos/staging-i686/PKGBUILD (from rev 178287, qt4/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-02-19 04:40:10 UTC (rev 178288)
@@ -0,0 +1,117 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=qt4
+pkgver=4.8.4
+pkgrel=3
+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' 'glib2' 'dbus'
+ 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+ 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
+optdepends=('postgresql-libs: PostgreSQL driver'
+ 'libmysqlclient: MySQL 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' 'qtwebkit<=2.3.beta2')
+conflicts=('qt<=4.8.4' 'qtwebkit<=2.3.beta2')
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
+ 'qtconfig.desktop' 'qt4.profile'
+ 'improve-cups-support.patch'
+ 'ld-gold.patch')
+md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+ '20ca06ef59775d749b9451ce7437fa9a'
+ '4ed0bd79a310e2b5d34fc71760b99139'
+ 'c439c7731c25387352d8453ca7574971'
+ '864de59a34a2f72ab2668dd918634b64')
+
+build() {
+ cd ${_pkgfqn}
+
+ # (FS#28381) (KDEBUG#180051)
+ patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+ # build on i686 fails
+ patch -p1 -i "${srcdir}"/ld-gold.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 \
+ -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 -Dm644 "${srcdir}"/qtconfig.desktop \
+ "${pkgdir}/usr/share/applications/qtconfig4.desktop"
+
+ # install the profile
+ install -D -m755 "${srcdir}"/qt4.profile "${pkgdir}"/etc/profile.d/qt4.sh
+
+ # install license addition
+ install -D -m644 LGPL_EXCEPTION.txt \
+ ${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+
+ # Fix wrong path in pkgconfig files
+ find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
+ -exec perl -pi -e "s, -L${srcdir}/?\S+,,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/' {} \;
+
+ # Do not install the qttools
+ rm "${pkgdir}"/usr/lib/qt4/bin/{assistant,designer,linguist}
+ rm -r "${pkgdir}"/usr/lib/qt4/plugins/designer
+ rm "${pkgdir}"/usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
+
+ # Remove tests
+ rm -r "${pkgdir}"/usr/tests
+}
Copied: qt4/repos/staging-i686/improve-cups-support.patch (from rev 178287, qt4/trunk/improve-cups-support.patch)
===================================================================
--- improve-cups-support.patch (rev 0)
+++ improve-cups-support.patch 2013-02-19 04:40:10 UTC (rev 178288)
@@ -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
+ }
+
+ /*!
Copied: qt4/repos/staging-i686/ld-gold.patch (from rev 178287, qt4/trunk/ld-gold.patch)
===================================================================
--- ld-gold.patch (rev 0)
+++ ld-gold.patch 2013-02-19 04:40:10 UTC (rev 178288)
@@ -0,0 +1,22 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me 2012-01-24 13:05:50.460890750 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri 2012-01-24 13:19:08.836799974 +0100
+@@ -3,12 +3,12 @@
+ contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+ contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
+
+-linux-g++ {
+-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+- message(Using gold linker)
+- QMAKE_LFLAGS+=-fuse-ld=gold
+-}
+-}
++#linux-g++ {
++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
++# message(Using gold linker)
++# QMAKE_LFLAGS+=-fuse-ld=gold
++#}
++#}
+
+ # We use this flag on production branches
+ # See https://bugs.webkit.org/show_bug.cgi?id=60824
Copied: qt4/repos/staging-i686/qt4.install (from rev 178287, qt4/trunk/qt4.install)
===================================================================
--- qt4.install (rev 0)
+++ qt4.install 2013-02-19 04:40:10 UTC (rev 178288)
@@ -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: qt4.profile
===================================================================
--- qt4.profile 2013-02-19 04:37:26 UTC (rev 178287)
+++ qt4.profile 2013-02-19 04:40:10 UTC (rev 178288)
@@ -1 +0,0 @@
-export PATH=$PATH:/usr/lib/qt4/bin
Copied: qt4/repos/staging-i686/qt4.profile (from rev 178287, qt4/trunk/qt4.profile)
===================================================================
--- qt4.profile (rev 0)
+++ qt4.profile 2013-02-19 04:40:10 UTC (rev 178288)
@@ -0,0 +1 @@
+export PATH=$PATH:/usr/lib/qt4/bin
Copied: qt4/repos/staging-i686/qtconfig.desktop (from rev 178287, qt4/trunk/qtconfig.desktop)
===================================================================
--- qtconfig.desktop (rev 0)
+++ qtconfig.desktop 2013-02-19 04:40:10 UTC (rev 178288)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Config
+Comment=Configure Qt4 behavior, styles, fonts
+Exec=/usr/lib/qt4/bin/qtconfig
+Icon=qt4logo
+Terminal=false
+Type=Application
+Categories=Qt;Settings;
+NoDisplay=true
More information about the arch-commits
mailing list