Date: Tuesday, September 14, 2010 @ 10:10:20 Author: andrea Revision: 90635
upgpkg: qtcurve-kde4 1.6.0-1 upstream release Added: qtcurve-kde4/trunk/bypass-kde-config.patch Modified: qtcurve-kde4/trunk/PKGBUILD -------------------------+ PKGBUILD | 15 +++++++++++---- bypass-kde-config.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-09-14 12:43:05 UTC (rev 90634) +++ PKGBUILD 2010-09-14 14:10:20 UTC (rev 90635) @@ -3,7 +3,7 @@ # Contributor: Pierre Schmitz <[email protected]> pkgname=qtcurve-kde4 -pkgver=1.5.2 +pkgver=1.6.0 pkgrel=1 arch=('i686' 'x86_64') groups=('qtcurve') @@ -12,11 +12,18 @@ url='http://www.kde-look.org/content/show.php?content=40492' depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') -source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2";) -md5sums=('6fc73762101a91a09b1359eb5b2689aa') +source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"; + 'bypass-kde-config.patch') +md5sums=('f41f2eedce5680daf6fedce414a0909a' + '3f6681147cc361bd2bfd4d7477f2a8d0') build() { - cd $srcdir + cd ${srcdir}/QtCurve-KDE4-${pkgver} + # Bypass KDE prefix detection by kde4-config, see: + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667 + patch -Np1 -i ${srcdir}/bypass-kde-config.patch + + cd ${srcdir} mkdir build cd build cmake ../QtCurve-KDE4-${pkgver} \ Added: bypass-kde-config.patch =================================================================== --- bypass-kde-config.patch (rev 0) +++ bypass-kde-config.patch 2010-09-14 14:10:20 UTC (rev 90635) @@ -0,0 +1,32 @@ +From: Pino Toscano <[email protected]> +Description: Disable braindead KDE3/4 prefix detection + The current detection of the KDE 3 and KDE 4 prefixes is done running + kde-config and kde4-config, resp. + This can be problematic, as these two could create files in ~/.kde, + thus breaking when the home of the current user (eg in buildds) is read-only. + Given the build system sets anyway "/usr" as prefix of KDE 3 and KDE 4 + if they were not detected, then just let it to. +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,6 +16,11 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CM + set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}") + include(CPack) + ++# Comment the kde3/kde4 prefix detection as a whole as it wants to run ++# kde-config and kde4-config, which in turn can create stuff in ~/.kde. ++# This cannot work on read-only homes. ++# So, the "fallback" prefixes ("/usr" for both) will be used. ++if (BRAINDEAD_DETECTION) + set(OLD_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) + + # Try to find kde4-config... +@@ -48,6 +53,7 @@ if (KDE4_KDECONFIG_EXECUTABLE) + ARGS --prefix + OUTPUT_VARIABLE KDE4PREFIX) + endif (KDE4_KDECONFIG_EXECUTABLE) ++endif (BRAINDEAD_DETECTION) + + if(NOT KDE3PREFIX) + if(KDE4PREFIX)
