From f8ac5d4703080cc87ba2fe36f68df745d3a5f62f Mon Sep 17 00:00:00 2001 From: root Date: Sat, 4 Aug 2012 00:02:16 +0000 Subject: Sat Aug 4 00:02:16 UTC 2012 --- community-staging/qtcurve-kde4/PKGBUILD | 42 ++++++++++++++++++++++ .../qtcurve-kde4/bypass-kde-config.patch | 32 +++++++++++++++++ .../qtcurve-kde4/fix-kwin_decoration-macro.patch | 15 ++++++++ 3 files changed, 89 insertions(+) create mode 100644 community-staging/qtcurve-kde4/PKGBUILD create mode 100644 community-staging/qtcurve-kde4/bypass-kde-config.patch create mode 100644 community-staging/qtcurve-kde4/fix-kwin_decoration-macro.patch (limited to 'community-staging/qtcurve-kde4') diff --git a/community-staging/qtcurve-kde4/PKGBUILD b/community-staging/qtcurve-kde4/PKGBUILD new file mode 100644 index 000000000..65c056cce --- /dev/null +++ b/community-staging/qtcurve-kde4/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 74743 2012-08-03 00:41:28Z svenstaro $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=qtcurve-kde4 +pkgver=1.8.13 +pkgrel=3 +arch=('i686' 'x86_64') +groups=('qtcurve') +license=('GPL') +pkgdesc='A configurable set of widget styles for KDE and Gtk' +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" + 'bypass-kde-config.patch' + 'fix-kwin_decoration-macro.patch') +md5sums=('94ba22bc487a18f585249c2967878189' + '3f6681147cc361bd2bfd4d7477f2a8d0' + '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 -p1 -i "${srcdir}"/bypass-kde-config.patch + patch -p1 -i "${srcdir}"/fix-kwin_decoration-macro.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../QtCurve-KDE4-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/qtcurve-kde4/bypass-kde-config.patch b/community-staging/qtcurve-kde4/bypass-kde-config.patch new file mode 100644 index 000000000..d09e5ead5 --- /dev/null +++ b/community-staging/qtcurve-kde4/bypass-kde-config.patch @@ -0,0 +1,32 @@ +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/community-staging/qtcurve-kde4/fix-kwin_decoration-macro.patch b/community-staging/qtcurve-kde4/fix-kwin_decoration-macro.patch new file mode 100644 index 000000000..6202e7b87 --- /dev/null +++ b/community-staging/qtcurve-kde4/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(); -- cgit v1.2.3-54-g00ecf