Date: Thursday, March 7, 2013 @ 18:47:07 Author: andrea Revision: 179600
upgpkg: kdelibs 4.10.1-2 qmake refers to Qt5 Added: kdelibs/trunk/qt4.patch Modified: kdelibs/trunk/PKGBUILD -----------+ PKGBUILD | 9 ++++++--- qt4.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-07 17:46:37 UTC (rev 179599) +++ PKGBUILD 2013-03-07 17:47:07 UTC (rev 179600) @@ -4,7 +4,7 @@ pkgname=kdelibs pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdelibs' @@ -17,10 +17,11 @@ 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' 'qt4.patch') sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + 'ed1f57ee661e5c7440efcaba7e51d2554709701c') build() { cd ${pkgname}-${pkgver} @@ -28,6 +29,8 @@ patch -p1 -i "${srcdir}"/kde-applications-menu.patch # add Archlinux menu entry patch -p1 -i "${srcdir}"/archlinux-menu.patch + # qmake refers to Qt5 + patch -p1 -i "${srcdir}"/qt4.patch cd ../ mkdir build Added: qt4.patch =================================================================== --- qt4.patch (rev 0) +++ qt4.patch 2013-03-07 17:47:07 UTC (rev 179600) @@ -0,0 +1,11 @@ +--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~ 2013-03-07 16:57:29.735552097 +0000 ++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 +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"