diff --git a/qtcurve/PKGBUILD b/qtcurve/PKGBUILD index 29cfce219..57d9f75e5 100644 --- a/qtcurve/PKGBUILD +++ b/qtcurve/PKGBUILD @@ -4,7 +4,7 @@ # contributor (x86_64): Giuseppe CalĂ  pkgname=qtcurve -pkgver=1.8.12 +pkgver=1.8.13 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -14,22 +14,23 @@ depends=('kde-workspace') makedepends=('cmake' 'automoc4') categories=('system') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" - 'bypass-kde-config.patch') -md5sums=('8a08d28204fab1b3db6813519f174014' - '3f6681147cc361bd2bfd4d7477f2a8d0') + 'fix-kwin_decoration-macro.patch') +md5sums=('94ba22bc487a18f585249c2967878189' + '7366e45ef9f24f53a36f87a539a937d6') build() { 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 + patch -Np1 -i "${srcdir}/fix-kwin_decoration-macro.patch" mkdir -p "${srcdir}/build" cd "${srcdir}/build" - cmake "../QtCurve-KDE4-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DQTC_STYLE_SUPPORT=true + cmake "${srcdir}/QtCurve-KDE4-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DQTC_KWIN=true \ + -DQTC_STYLE_SUPPORT=true \ + || return 1 + make } @@ -38,3 +39,4 @@ package() { make DESTDIR="${pkgdir}" install } +# vim:set ts=2 sw=2 et: diff --git a/qtcurve/bypass-kde-config.patch b/qtcurve/bypass-kde-config.patch deleted file mode 100644 index d09e5ead5..000000000 --- a/qtcurve/bypass-kde-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Pino Toscano -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) diff --git a/qtcurve/fix-kwin_decoration-macro.patch b/qtcurve/fix-kwin_decoration-macro.patch new file mode 100644 index 000000000..6202e7b87 --- /dev/null +++ b/qtcurve/fix-kwin_decoration-macro.patch @@ -0,0 +1,15 @@ +diff -Naur a/kwin/qtcurvehandler.cpp b/kwin/qtcurvehandler.cpp +--- a/kwin/qtcurvehandler.cpp 2012-08-02 13:36:58.811347708 +0000 ++++ b/kwin/qtcurvehandler.cpp 2012-08-02 13:38:03.240996792 +0000 +@@ -489,6 +489,11 @@ + + extern "C" + { ++ KWIN_EXPORT int decoration_version() ++ { ++ return KWIN_DECORATION_API_VERSION; ++ } ++ + KDE_EXPORT KDecorationFactory *create_factory() + { + KWinQtCurve::handler = new KWinQtCurve::QtCurveHandler();