diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
commit | dec82423b45179c362a4727cc3d63fb2349af369 (patch) | |
tree | 552f0832ffe5dab6305382ea0c0e4a42da17063a /community/qtcurve-kde4 | |
parent | a0f85906119bcb8e7269dee701076946b3ec45ea (diff) | |
parent | ef815a5d80eecd4ba0679a376386741c374e0d1b (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dzen2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
core/openldap/PKGBUILD
extra/geeqie/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libksane/PKGBUILD
extra/moc/PKGBUILD
extra/strigi/PKGBUILD
extra/vice/PKGBUILD
Diffstat (limited to 'community/qtcurve-kde4')
-rw-r--r-- | community/qtcurve-kde4/PKGBUILD | 11 | ||||
-rw-r--r-- | community/qtcurve-kde4/fix-kwin_decoration-macro.patch | 15 |
2 files changed, 22 insertions, 4 deletions
diff --git a/community/qtcurve-kde4/PKGBUILD b/community/qtcurve-kde4/PKGBUILD index 3033ab832..74cf7c2f9 100644 --- a/community/qtcurve-kde4/PKGBUILD +++ b/community/qtcurve-kde4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74684 2012-08-02 07:17:13Z svenstaro $ +# $Id: PKGBUILD 74842 2012-08-06 23:10:17Z andrea $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-kde4 pkgver=1.8.13 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') groups=('qtcurve') license=('GPL') @@ -14,15 +14,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" - 'bypass-kde-config.patch') + 'bypass-kde-config.patch' + 'fix-kwin_decoration-macro.patch') md5sums=('94ba22bc487a18f585249c2967878189' - '3f6681147cc361bd2bfd4d7477f2a8d0') + '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 diff --git a/community/qtcurve-kde4/fix-kwin_decoration-macro.patch b/community/qtcurve-kde4/fix-kwin_decoration-macro.patch new file mode 100644 index 000000000..6202e7b87 --- /dev/null +++ b/community/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(); |