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

[Andrea Scarpino]

    Date: Thursday, February 28, 2013 @ 00:08:32
  Author: andrea
Revision: 178874

upgpkg: kdelibs 4.10.0-4

We cannot use this, but -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake4 as cmake arg

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

--------------------------+
 PKGBUILD                 |   12 +++---------
 use-qmake4-for-qt4.patch |   11 -----------
 2 files changed, 3 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-27 22:38:50 UTC (rev 178873)
+++ PKGBUILD	2013-02-27 23:08:32 UTC (rev 178874)
@@ -4,7 +4,7 @@
 
 pkgname=kdelibs
 pkgver=4.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -17,23 +17,17 @@
 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'
-        'use-qmake4-for-qt4.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
 sha1sums=('093bfd214511bae7fda88242413c6ed4ff0b18f0'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'ceb41e4bb8eb2b3612d011d68199b1d5b9dd3151')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
 build() {
-       . /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 ../
 
        mkdir build

Deleted: use-qmake4-for-qt4.patch
===================================================================
--- use-qmake4-for-qt4.patch	2013-02-27 22:38:50 UTC (rev 178873)
+++ use-qmake4-for-qt4.patch	2013-02-27 23:08:32 UTC (rev 178874)
@@ -1,11 +0,0 @@
---- 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"