[arch-commits] Commit in qt/repos (8 files)

Andrea Scarpino andrea at archlinux.org
Mon Jan 30 23:08:51 UTC 2012


    Date: Monday, January 30, 2012 @ 18:08:51
  Author: andrea
Revision: 148389

archrelease: copy trunk to testing-i686

Added:
  qt/repos/testing-i686/
  qt/repos/testing-i686/PKGBUILD
    (from rev 148388, qt/trunk/PKGBUILD)
  qt/repos/testing-i686/assistant.desktop
    (from rev 148388, qt/trunk/assistant.desktop)
  qt/repos/testing-i686/designer.desktop
    (from rev 148388, qt/trunk/designer.desktop)
  qt/repos/testing-i686/fix-qurl.patch
    (from rev 148388, qt/trunk/fix-qurl.patch)
  qt/repos/testing-i686/linguist.desktop
    (from rev 148388, qt/trunk/linguist.desktop)
  qt/repos/testing-i686/qt.install
    (from rev 148388, qt/trunk/qt.install)
  qt/repos/testing-i686/qtconfig.desktop
    (from rev 148388, qt/trunk/qtconfig.desktop)

-------------------+
 PKGBUILD          |  131 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 assistant.desktop |    9 +++
 designer.desktop  |   11 ++++
 fix-qurl.patch    |   13 +++++
 linguist.desktop  |   10 +++
 qt.install        |   12 ++++
 qtconfig.desktop  |   10 +++
 7 files changed, 196 insertions(+)

Copied: qt/repos/testing-i686/PKGBUILD (from rev 148388, qt/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-01-30 23:08:51 UTC (rev 148389)
@@ -0,0 +1,131 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=qt
+pkgname=('qt' 'qt-private-headers')
+pkgver=4.8.0
+pkgrel=4
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL')
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' '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')
+options=('!libtool')
+_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
+source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
+        'qtconfig.desktop'
+        'fix-qurl.patch')
+md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
+         'fc211414130ab2764132e7370f8e5caa'
+         '85179f5e0437514f8639957e1d8baf62'
+         'f11852b97583610f3dbb669ebc3e21bc'
+         '6b771c8a81dd90b45e8a79afa0e5bbfd'
+         '7bc255a36733d0fbc80c1902ade4beca')
+
+build() {
+  cd "${srcdir}"/${_pkgfqn}
+
+  # (FS#27757)
+  patch -p1 -i "${srcdir}"/fix-qurl.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 \
+    -docdir /usr/share/doc/qt \
+    -plugindir /usr/lib/qt/plugins \
+    -importdir /usr/lib/qt/imports \
+    -datadir /usr/share/qt \
+    -translationdir /usr/share/qt/translations \
+    -sysconfdir /etc \
+    -examplesdir /usr/share/doc/qt/examples \
+    -demosdir /usr/share/doc/qt/demos \
+    -plugin-sql-{psql,mysql,sqlite,odbc} \
+    -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' 'sqlite3' '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'
+                'libxinerama: Xinerama support'
+                'libxcursor: Xcursor support'
+                'libxfixes: Xfixes support')
+    install='qt.install'
+
+    cd "${srcdir}"/${_pkgfqn}
+    make INSTALL_ROOT="${pkgdir}" install
+
+    # install missing icons and desktop files
+    for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
+      size=$(echo $(basename ${icon}) | cut -d- -f2)
+      install -p -D -m644 ${icon} \
+        "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
+    done
+    install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
+      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
+    install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
+      "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
+    install -p -D -m644 tools/designer/src/designer/images/designer.png \
+      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
+    install -d "${pkgdir}/usr/share/applications"
+    install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
+      "${pkgdir}/usr/share/applications/"
+
+    # install license addition
+    install -D -m644 LGPL_EXCEPTION.txt \
+      ${pkgdir}/usr/share/licenses/qt/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 "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
+        "${pkgdir}"/usr/include/${i}/
+    done
+
+    for i in corelib declarative gui script; do
+      cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
+    done
+}

Copied: qt/repos/testing-i686/assistant.desktop (from rev 148388, qt/trunk/assistant.desktop)
===================================================================
--- testing-i686/assistant.desktop	                        (rev 0)
+++ testing-i686/assistant.desktop	2012-01-30 23:08:51 UTC (rev 148389)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt Assistant
+Comment=Shows Qt documentation and examples
+Exec=/usr/bin/assistant
+Icon=assistant
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;

Copied: qt/repos/testing-i686/designer.desktop (from rev 148388, qt/trunk/designer.desktop)
===================================================================
--- testing-i686/designer.desktop	                        (rev 0)
+++ testing-i686/designer.desktop	2012-01-30 23:08:51 UTC (rev 148389)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Qt Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt applications
+Exec=/usr/bin/designer
+Icon=designer
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;

Copied: qt/repos/testing-i686/fix-qurl.patch (from rev 148388, qt/trunk/fix-qurl.patch)
===================================================================
--- testing-i686/fix-qurl.patch	                        (rev 0)
+++ testing-i686/fix-qurl.patch	2012-01-30 23:08:51 UTC (rev 148389)
@@ -0,0 +1,13 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
+--- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile	2011-10-03 22:44:32.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp	2011-10-27 12:58:35.706815049 -0500
+@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
+ QString QUrl::toLocalFile() const
+ {
+     // the call to isLocalFile() also ensures that we're parsed
+-    if (!isLocalFile())
++    // Treat URLs with no scheme as local for backward compatibility
++    if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
+         return QString();
+ 
+     QString tmp;

Copied: qt/repos/testing-i686/linguist.desktop (from rev 148388, qt/trunk/linguist.desktop)
===================================================================
--- testing-i686/linguist.desktop	                        (rev 0)
+++ testing-i686/linguist.desktop	2012-01-30 23:08:51 UTC (rev 148389)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt Linguist
+Comment=Add translations to Qt applications
+Exec=/usr/bin/linguist
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;

Copied: qt/repos/testing-i686/qt.install (from rev 148388, qt/trunk/qt.install)
===================================================================
--- testing-i686/qt.install	                        (rev 0)
+++ testing-i686/qt.install	2012-01-30 23:08:51 UTC (rev 148389)
@@ -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
+}

Copied: qt/repos/testing-i686/qtconfig.desktop (from rev 148388, qt/trunk/qtconfig.desktop)
===================================================================
--- testing-i686/qtconfig.desktop	                        (rev 0)
+++ testing-i686/qtconfig.desktop	2012-01-30 23:08:51 UTC (rev 148389)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt Config 
+Comment=Configure Qt behavior, styles, fonts
+Exec=/usr/bin/qtconfig
+Icon=qtlogo
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Settings;
+NoDisplay=true




More information about the arch-commits mailing list