[arch-commits] Commit in qt4 (9 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Mon Feb 18 21:33:44 UTC 2013
Date: Monday, February 18, 2013 @ 22:33:44
Author: andrea
Revision: 178242
Merge kde-unstable in trunk
Added:
qt4/trunk/
qt4/trunk/PKGBUILD
(from rev 178238, qt4/kde-unstable/PKGBUILD)
qt4/trunk/ld-gold.patch
(from rev 178238, qt4/kde-unstable/ld-gold.patch)
qt4/trunk/qtconfig.desktop
(from rev 178036, qt4/kde-unstable/qtconfig.desktop)
Deleted:
qt4/kde-unstable/
qt4/trunk/
qt4/trunk/PKGBUILD
qt4/trunk/fix-crash-in-assistant.patch
qt4/trunk/qtconfig.desktop
------------------------------+
PKGBUILD | 130 -----------------------------------------
fix-crash-in-assistant.patch | 11 ---
qtconfig.desktop | 9 --
trunk/PKGBUILD | 113 +++++++++++++++++++++++++++++++++++
trunk/ld-gold.patch | 22 ++++++
trunk/qtconfig.desktop | 9 ++
6 files changed, 144 insertions(+), 150 deletions(-)
Deleted: trunk/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD 2013-02-13 22:22:13 UTC (rev 178032)
+++ trunk/PKGBUILD 2013-02-18 21:33:44 UTC (rev 178242)
@@ -1,130 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=qt4
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
- 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
-options=('!libtool')
-_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
- 'qtconfig.desktop'
- 'improve-cups-support.patch'
- 'fix-crash-in-assistant.patch')
-md5sums=('89c5ecba180cae74c66260ac732dc5cb'
- 'f1837a03fd0ebbd2da58975845f278e3'
- '480fea1ed076992b688373c8db274be0'
- '5595c24d5bb942c21e3a4d299e6d0bf1'
- '824a3b77a25e98567f640e0441ccdebc'
- 'c439c7731c25387352d8453ca7574971'
- '57590084078b6379f0501f7728b02ae2')
-
-build() {
- cd ${_pkgfqn}
-
- # (FS#28381) (KDEBUG#180051)
- patch -p1 -i "${srcdir}"/improve-cups-support.patch
-
- # (FS#29469)
- patch -p1 -i "${srcdir}"/fix-crash-in-assistant.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_qt() {
- 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')
- 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='qt4.install'
-
- 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 "${pkgdir}/usr/share/applications"
- install -m644 "${srcdir}"/qtconfig.desktop \
- "${pkgdir}/usr/share/applications/"
-
- # install license addition
- install -D -m644 LGPL_EXCEPTION.txt \
- ${pkgdir}/usr/share/licenses/${pkgbase}/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/' {} \;
-}
-
-package_qt-private-headers(){
- pkgdesc="Qt private headers for development"
- depends=("qt=${pkgver}")
-
- install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
- install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-
- for i in QtCore QtDeclarative QtGui QtScript; do
- cp -r ${_pkgfqn}/include/${i}/private/ \
- "${pkgdir}"/usr/include/${i}/
- done
-
- for i in corelib declarative gui script; do
- cp -r ${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
- done
-}
Copied: qt4/trunk/PKGBUILD (from rev 178238, qt4/kde-unstable/PKGBUILD)
===================================================================
--- trunk/PKGBUILD (rev 0)
+++ trunk/PKGBUILD 2013-02-18 21:33:44 UTC (rev 178242)
@@ -0,0 +1,113 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=qt4
+pkgver=4.8.4
+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' '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'
+ 'improve-cups-support.patch'
+ 'ld-gold.patch')
+md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+ '20ca06ef59775d749b9451ce7437fa9a'
+ '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 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,lconvert,linguist}
+ rm "${pkgdir}"/usr/lib/qt4/bin/{lrelease,lupdate,pixeltool,qcollectiongenerator}
+ rm "${pkgdir}"/usr/lib/qt4/bin/{qdbus,qdbusviewer,qhelpconverter,qhelpgenerator}
+ rm -r "${pkgdir}"/usr/lib/qt4/plugins/designer
+ rm "${pkgdir}"/usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
+}
Deleted: trunk/fix-crash-in-assistant.patch
===================================================================
--- kde-unstable/fix-crash-in-assistant.patch 2013-02-13 22:22:13 UTC (rev 178032)
+++ trunk/fix-crash-in-assistant.patch 2013-02-18 21:33:44 UTC (rev 178242)
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000
-+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000
-@@ -944,8 +944,7 @@
- if (helpEngine.usesAppFont())
- font = helpEngine.appFont();
-
-- const QWidgetList &widgets = qApp->allWidgets();
-- foreach (QWidget* widget, widgets)
-+ foreach (QWidget* widget, QApplication::allWidgets())
- widget->setFont(font);
- }
Copied: qt4/trunk/ld-gold.patch (from rev 178238, qt4/kde-unstable/ld-gold.patch)
===================================================================
--- trunk/ld-gold.patch (rev 0)
+++ trunk/ld-gold.patch 2013-02-18 21:33:44 UTC (rev 178242)
@@ -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
Deleted: trunk/qtconfig.desktop
===================================================================
--- kde-unstable/qtconfig.desktop 2013-02-13 22:22:13 UTC (rev 178032)
+++ trunk/qtconfig.desktop 2013-02-18 21:33:44 UTC (rev 178242)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Config
-Comment=Configure Qt4 behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qt4logo
-Terminal=false
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
Copied: qt4/trunk/qtconfig.desktop (from rev 178036, qt4/kde-unstable/qtconfig.desktop)
===================================================================
--- trunk/qtconfig.desktop (rev 0)
+++ trunk/qtconfig.desktop 2013-02-18 21:33:44 UTC (rev 178242)
@@ -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