diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-03-07 20:25:20 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-03-07 20:25:20 -0200 |
| commit | ba30e56a848d8d9684ae86e0e8538d545014aba9 (patch) | |
| tree | 06f30532da5158671e0d2c5a21165a268852ffd7 /libre | |
| parent | 3be99db4ee121c6626b805cf0eb1a9616308fb39 (diff) | |
| download | abslibre-ba30e56a848d8d9684ae86e0e8538d545014aba9.tar.gz abslibre-ba30e56a848d8d9684ae86e0e8538d545014aba9.tar.bz2 abslibre-ba30e56a848d8d9684ae86e0e8538d545014aba9.zip | |
kdelibs-4.10.1-2: qmake refers to Qt5
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/kdelibs-libre/qt4.patch | 11 |
2 files changed, 22 insertions, 9 deletions
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 18947854a..e2bf371e0 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179135 2013-03-04 11:09:00Z andrea $ +# $Id: PKGBUILD 179600 2013-03-07 17:47:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -22,21 +22,23 @@ replaces=('kdelibs') conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' - 'khtml-fsdg.diff') + 'kde-applications-menu.patch' 'qt4.patch') sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'a1502a964081ad583a00cf90c56e74bf60121830') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67') build() { - cd "${srcdir}"/${_pkgname}-${pkgver} - + cd ${_pkgname}-${pkgver} # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch + # qmake refers to Qt5 + patch -p1 -i "${srcdir}"/qt4.patch + # Don't ask the user to download a plugin, it's probably nonfree. - patch -p1 -i "${srcdir}"/khtml-fsdg.diff + rm -v khtml/html/html_objectimpl.cpp + + cd ../ - cd "${srcdir}" mkdir build cd build cmake ../${_pkgname}-${pkgver} \ diff --git a/libre/kdelibs-libre/qt4.patch b/libre/kdelibs-libre/qt4.patch new file mode 100644 index 000000000..bb4312d40 --- /dev/null +++ b/libre/kdelibs-libre/qt4.patch @@ -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" |