Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=71c12d097c68331d425feabc0d8428ba361dbf33
commit 71c12d097c68331d425feabc0d8428ba361dbf33 Author: Marius Cirsta <[email protected]> Date: Wed Aug 28 23:48:51 2013 +0300 kde-theme-qtcurve-1.8.14-2-x86_64 * added patches to fix some bugs diff --git a/source/kde/kde-theme-qtcurve/FrugalBuild b/source/kde/kde-theme-qtcurve/FrugalBuild index 612d201..5328bf4 100644 --- a/source/kde/kde-theme-qtcurve/FrugalBuild +++ b/source/kde/kde-theme-qtcurve/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kde-theme-qtcurve pkgver=1.8.14 -pkgrel=1 +pkgrel=2 pkgdesc="KDE QtCurve Theme" groups=('kde') archs=('i686' 'x86_64') @@ -15,8 +15,11 @@ Finclude kde depends=("${depends[@]}" 'kwin' 'libnepomuk' 'libqt3support' "kdelibs>=$_F_kde_ver") makedepends=("${makedepends[@]}" "kdelibs-compiletime>=$_F_kde_ver") _F_cd_path="QtCurve-KDE4-$pkgver" -source=(http://craigd.wikispaces.com/file/view/QtCurve-KDE4-$pkgver.tar.bz2) +source=(http://craigd.wikispaces.com/file/view/QtCurve-KDE4-$pkgver.tar.bz2 + bypass-kde-config.patch fix-kwin_decoration-macro.patch) up2date="lynx -dump '$url'|grep 'Source (KDE 4.*)'|sed 's/.* - \(.*\).*)/\1/'" -sha1sums=('35f9fc0bb0ac3baf9b1b935a0ebcea6c8278c551') +sha1sums=('35f9fc0bb0ac3baf9b1b935a0ebcea6c8278c551' \ + '8005c8bf0e9c5d75e80b417a01513bd45853274c' \ + 'd5a6d0841504dcdb8bbc7db59b7d5e204aebe43c') # optimization OK diff --git a/source/kde/kde-theme-qtcurve/bypass-kde-config.patch b/source/kde/kde-theme-qtcurve/bypass-kde-config.patch new file mode 100644 index 0000000..d09e5ea --- /dev/null +++ b/source/kde/kde-theme-qtcurve/bypass-kde-config.patch @@ -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) diff --git a/source/kde/kde-theme-qtcurve/fix-kwin_decoration-macro.patch b/source/kde/kde-theme-qtcurve/fix-kwin_decoration-macro.patch new file mode 100644 index 0000000..6202e7b --- /dev/null +++ b/source/kde/kde-theme-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(); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
