[arch-commits] Commit in kdelibs/trunk (PKGBUILD use-qmake4-for-qt4.patch)

[Andrea Scarpino]

    Date: Monday, February 25, 2013 @ 17:39:09
  Author: andrea
Revision: 178547

upgpkg: kdelibs 4.10.0-3

Do not look for 'qmake' as this could referer to the qt5 version

Added:
  kdelibs/trunk/use-qmake4-for-qt4.patch
Modified:
  kdelibs/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   19 ++++++++++++-------
 use-qmake4-for-qt4.patch |   11 +++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-25 16:33:39 UTC (rev 178546)
+++ PKGBUILD	2013-02-25 16:39:09 UTC (rev 178547)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -12,25 +12,30 @@
 depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
-        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon' 'qtwebkit'
-        'media-player-info' 'libxtst' 'libutempter')
+        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
+        'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'use-qmake4-for-qt4.patch')
 sha1sums=('093bfd214511bae7fda88242413c6ed4ff0b18f0'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          'ceb41e4bb8eb2b3612d011d68199b1d5b9dd3151')
 
 build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
+       . /etc/profile.d/qt4.sh
 
+       cd ${pkgname}-${pkgver}
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
        # add Archlinux menu entry
        patch -p1 -i "${srcdir}"/archlinux-menu.patch
+       # Do not look for 'qmake' as this could referer to the qt5 version
+       patch -p1 -i "${srcdir}"/use-qmake4-for-qt4.patch
+       cd ../
 
-       cd "${srcdir}"
        mkdir build
        cd build
        cmake ../${pkgname}-${pkgver} \

Added: use-qmake4-for-qt4.patch
===================================================================
--- use-qmake4-for-qt4.patch	                        (rev 0)
+++ use-qmake4-for-qt4.patch	2013-02-25 16:39:09 UTC (rev 178547)
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.0/cmake/modules/FindQt4.cmake~	2013-02-24 15:26:19.081415233 +0000
++++ kdelibs-4.10.0/cmake/modules/FindQt4.cmake	2013-02-24 15:26:45.531216103 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"