[arch-commits] Commit in qt4 (4 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Wed Feb 13 23:06:32 UTC 2013
Date: Thursday, February 14, 2013 @ 00:06:32
Author: andrea
Revision: 178036
Do not need to provide the qt-private-headers package anymore; add replaces/conflicts; do not ship the qttools (assistant, designer...)
Added:
qt4/trunk/
Modified:
qt4/kde-unstable/PKGBUILD
qt4/kde-unstable/qtconfig.desktop
Deleted:
qt4/kde-unstable/fix-crash-in-assistant.patch
------------------------------+
PKGBUILD | 83 +++++++++++++++--------------------------
fix-crash-in-assistant.patch | 11 -----
qtconfig.desktop | 2
3 files changed, 32 insertions(+), 64 deletions(-)
Modified: kde-unstable/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD 2013-02-13 23:00:26 UTC (rev 178035)
+++ kde-unstable/PKGBUILD 2013-02-13 23:06:32 UTC (rev 178036)
@@ -2,30 +2,36 @@
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Pierre Schmitz <pierre at archlinux.de>
-pkgbase=qt4
-pkgname=('qt' 'qt-private-headers')
+pkgname=qt4
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')
+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')
+conflicts=('qt')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
+source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
'qtconfig.desktop'
- 'improve-cups-support.patch'
- 'fix-crash-in-assistant.patch')
+ 'improve-cups-support.patch')
md5sums=('89c5ecba180cae74c66260ac732dc5cb'
- 'f1837a03fd0ebbd2da58975845f278e3'
- '480fea1ed076992b688373c8db274be0'
- '5595c24d5bb942c21e3a4d299e6d0bf1'
- '824a3b77a25e98567f640e0441ccdebc'
- 'c439c7731c25387352d8453ca7574971'
- '57590084078b6379f0501f7728b02ae2')
+ '20ca06ef59775d749b9451ce7437fa9a'
+ 'c439c7731c25387352d8453ca7574971')
build() {
cd ${_pkgfqn}
@@ -33,9 +39,6 @@
# (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}
@@ -74,20 +77,7 @@
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'
+package() {
cd ${_pkgfqn}
make INSTALL_ROOT="${pkgdir}" install
@@ -95,13 +85,12 @@
# 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 -Dm644 "${srcdir}"/qtconfig.desktop \
+ "${pkgdir}/usr/share/applications/qtconfig4.desktop"
# install license addition
install -D -m644 LGPL_EXCEPTION.txt \
- ${pkgdir}/usr/share/licenses/${pkgbase}/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' \
@@ -110,21 +99,11 @@
# 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
+ # 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 /usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
}
Deleted: kde-unstable/fix-crash-in-assistant.patch
===================================================================
--- kde-unstable/fix-crash-in-assistant.patch 2013-02-13 23:00:26 UTC (rev 178035)
+++ kde-unstable/fix-crash-in-assistant.patch 2013-02-13 23:06:32 UTC (rev 178036)
@@ -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);
- }
Modified: kde-unstable/qtconfig.desktop
===================================================================
--- kde-unstable/qtconfig.desktop 2013-02-13 23:00:26 UTC (rev 178035)
+++ kde-unstable/qtconfig.desktop 2013-02-13 23:06:32 UTC (rev 178036)
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Qt4 Config
Comment=Configure Qt4 behavior, styles, fonts
-Exec=/usr/bin/qtconfig
+Exec=/usr/lib/qt4/bin/qtconfig
Icon=qt4logo
Terminal=false
Type=Application
More information about the arch-commits
mailing list