diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-09-03 13:06:24 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-09-03 13:06:24 +0000 |
| commit | 129bf63f8416f47bb81fbbd4768288036db1681c (patch) | |
| tree | d26d3b19fd3d974dd46f10f305ee82efc7f5b660 /x11/kdelibs4 | |
| parent | fa7b5e58b9b9f6fb1e313382a39828d16377b867 (diff) | |
Notes
Diffstat (limited to 'x11/kdelibs4')
| -rw-r--r-- | x11/kdelibs4/distinfo | 6 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-Modules_FindQt4.cmake | 39 | ||||
| -rw-r--r-- | x11/kdelibs4/pkg-plist | 1 |
3 files changed, 43 insertions, 3 deletions
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 2195c50be7d4..657ab6a9563a 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-4.1.0.tar.bz2) = 86496aed25d4dce440418b3064a27913 -SHA256 (KDE/kdelibs-4.1.0.tar.bz2) = df59ab19cf8468ada40f6bfc7b687edd8cbea92ed6dfd8db06793602c0d6ae50 -SIZE (KDE/kdelibs-4.1.0.tar.bz2) = 9108493 +MD5 (KDE/kdelibs-4.1.1.tar.bz2) = d75ec557cd864e3f9150059c3e58ed61 +SHA256 (KDE/kdelibs-4.1.1.tar.bz2) = b830e3eba8d65ad257b16c920e1bf18fcc7c0db84ec244d450a0db1cc0626a8f +SIZE (KDE/kdelibs-4.1.1.tar.bz2) = 9110725 diff --git a/x11/kdelibs4/files/patch-Modules_FindQt4.cmake b/x11/kdelibs4/files/patch-Modules_FindQt4.cmake new file mode 100644 index 000000000000..bae246f8f6e2 --- /dev/null +++ b/x11/kdelibs4/files/patch-Modules_FindQt4.cmake @@ -0,0 +1,39 @@ +--- ../cmake/modules/FindQt4.cmake.orig 2008-05-05 22:25:53.000000000 +0400 ++++ ../cmake/modules/FindQt4.cmake 2008-07-21 02:37:16.000000000 +0400 +@@ -293,7 +293,7 @@ + + GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) + # check for qmake +-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake 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" +@@ -915,9 +915,9 @@ + "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL) + + SET(QT_MOC_EXECUTABLE +- ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable") ++ ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE) + SET(QT_UIC_EXECUTABLE +- ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable") ++ ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE) + + FIND_PROGRAM(QT_UIC3_EXECUTABLE + NAMES uic3 +@@ -944,13 +944,13 @@ + ) + + FIND_PROGRAM(QT_LUPDATE_EXECUTABLE +- NAMES lupdate ++ NAMES lupdate-qt4 + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_LRELEASE_EXECUTABLE +- NAMES lrelease ++ NAMES lrelease-qt4 + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 0542b6c0a97c..a8fd983c1da5 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -1620,6 +1620,7 @@ share/apps/cmake/modules/FindCarbon.cmake share/apps/cmake/modules/FindDNSSD.cmake share/apps/cmake/modules/FindENCHANT.cmake share/apps/cmake/modules/FindEigen.cmake +share/apps/cmake/modules/FindEigen2.cmake share/apps/cmake/modules/FindExiv2.cmake share/apps/cmake/modules/FindFAM.cmake share/apps/cmake/modules/FindFFmpeg.cmake |