Date: Thursday, May 28, 2020 @ 10:15:22 Author: felixonmars Revision: 636214
archrelease: copy trunk to community-testing-x86_64 Added: deepin-kwin/repos/community-testing-x86_64/PKGBUILD (from rev 636213, deepin-kwin/trunk/PKGBUILD) deepin-kwin/repos/community-testing-x86_64/deepin-kwin-qt5.15.patch (from rev 636213, deepin-kwin/trunk/deepin-kwin-qt5.15.patch) Deleted: deepin-kwin/repos/community-testing-x86_64/PKGBUILD deepin-kwin/repos/community-testing-x86_64/deepin-kwin-qt5.15.patch --------------------------+ PKGBUILD | 90 ++++++++++++++++++++++----------------------- deepin-kwin-qt5.15.patch | 48 ++++++++++++------------ 2 files changed, 69 insertions(+), 69 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-28 10:15:01 UTC (rev 636213) +++ PKGBUILD 2020-05-28 10:15:22 UTC (rev 636214) @@ -1,45 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-kwin -pkgver=5.0.15 -pkgrel=2 -pkgdesc='KWin configures on DDE' -arch=('x86_64') -url="https://github.com/linuxdeepin/dde-kwin" -license=('GPL3') -groups=('deepin') -depends=('deepin-qt5integration' 'kwin') -makedepends=('cmake' 'expac' 'qt5-tools') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-kwin/archive/$pkgver.tar.gz" - $pkgname-tabbox-chameleon-rename.patch::https://github.com/linuxdeepin/dde-kwin/pull/106.patch - $pkgname-build-fix.patch::https://github.com/linuxdeepin/dde-kwin/pull/109.patch - $pkgname-unload-blur.patch::https://github.com/linuxdeepin/dde-kwin/pull/112.patch - deepin-kwin-qt5.15.patch) -sha512sums=('72371fe88db5f493aa885f5412e8ca16db148e4d3bf7b01902be7d5d3fc3f2e73b5ed7bf67e90a6f60c0a81ea8b3f9b077f89d4ba1dad9d1dfb444d791e8fbb7' - '7ac1a577868b73314274d336287334acc5bf4ac06dde046c93e4c2d3f68a112389c8b0644d1cbc3fde5ba1c01f368676f4f34b4a1b7b6c97a5b73d66507d134d' - '3e10241050959b51bdd6bf752253af61a2b5899c3df5d84716bd1688d9292ff65d2b7d3aea8f61e896081a9bee013cb3f4c2f42f7915038f7f476120a44cf029' - '800bb8770b4a6d835e27f33226f81dce92ddf10c295e02015419788e667e7d46b014d69bde73d03af8f0480c938526b48498368d2f16619689352f0e8e183912' - '8fe73f833e2b24fe9bbaf12220a9d41d5e4808c833d7e7878635a85429e6c474ae79189d75d1d4e77c78bafbe2855db37ded24c85768f9a9415a00a0456c9dce') - -prepare() { - cd dde-kwin-$pkgver - patch -p1 -i ../$pkgname-tabbox-chameleon-rename.patch - patch -p1 -i ../$pkgname-build-fix.patch - patch -p1 -i ../$pkgname-unload-blur.patch - patch -p1 -i ../deepin-kwin-qt5.15.patch # Fix build with Qt 5.15 -} - -build() { - cd dde-kwin-$pkgver - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DKWIN_VERSION=$(expac %v kwin | cut -d - -f 1) - make -} - -package() { - cd dde-kwin-$pkgver - make DESTDIR="$pkgdir" install - - chmod +x "$pkgdir"/usr/bin/kwin_no_scale -} Copied: deepin-kwin/repos/community-testing-x86_64/PKGBUILD (from rev 636213, deepin-kwin/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-28 10:15:22 UTC (rev 636214) @@ -0,0 +1,45 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> +# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> + +pkgname=deepin-kwin +pkgver=5.0.15.1 +pkgrel=1 +pkgdesc='KWin configures on DDE' +arch=('x86_64') +url="https://github.com/linuxdeepin/dde-kwin" +license=('GPL3') +groups=('deepin') +depends=('deepin-qt5integration' 'kwin') +makedepends=('cmake' 'expac' 'qt5-tools') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-kwin/archive/$pkgver.tar.gz" + $pkgname-tabbox-chameleon-rename.patch::https://github.com/linuxdeepin/dde-kwin/pull/106.patch + $pkgname-build-fix.patch::https://github.com/linuxdeepin/dde-kwin/pull/109.patch + $pkgname-unload-blur.patch::https://github.com/linuxdeepin/dde-kwin/pull/112.patch + deepin-kwin-qt5.15.patch) +sha512sums=('a086c4b4b1942f34a346790a23ff8651a66ecb3f2128a83d1966f078f6e32ee031a73b478bc21f6f6aee2935dfb86f7d5c6447628cca437d43be3b09a707aff7' + '7ac1a577868b73314274d336287334acc5bf4ac06dde046c93e4c2d3f68a112389c8b0644d1cbc3fde5ba1c01f368676f4f34b4a1b7b6c97a5b73d66507d134d' + '3e10241050959b51bdd6bf752253af61a2b5899c3df5d84716bd1688d9292ff65d2b7d3aea8f61e896081a9bee013cb3f4c2f42f7915038f7f476120a44cf029' + '800bb8770b4a6d835e27f33226f81dce92ddf10c295e02015419788e667e7d46b014d69bde73d03af8f0480c938526b48498368d2f16619689352f0e8e183912' + '8fe73f833e2b24fe9bbaf12220a9d41d5e4808c833d7e7878635a85429e6c474ae79189d75d1d4e77c78bafbe2855db37ded24c85768f9a9415a00a0456c9dce') + +prepare() { + cd dde-kwin-$pkgver + patch -p1 -i ../$pkgname-tabbox-chameleon-rename.patch + patch -p1 -i ../$pkgname-build-fix.patch + patch -p1 -i ../$pkgname-unload-blur.patch + patch -p1 -i ../deepin-kwin-qt5.15.patch # Fix build with Qt 5.15 +} + +build() { + cd dde-kwin-$pkgver + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DKWIN_VERSION=$(expac %v kwin | cut -d - -f 1) + make +} + +package() { + cd dde-kwin-$pkgver + make DESTDIR="$pkgdir" install + + chmod +x "$pkgdir"/usr/bin/kwin_no_scale +} Deleted: deepin-kwin-qt5.15.patch =================================================================== --- deepin-kwin-qt5.15.patch 2020-05-28 10:15:01 UTC (rev 636213) +++ deepin-kwin-qt5.15.patch 2020-05-28 10:15:22 UTC (rev 636214) @@ -1,24 +0,0 @@ -diff --git a/plugins/kdecoration/chameleon.h b/plugins/kdecoration/chameleon.h -index 3d164ca..a716a7a 100644 ---- a/plugins/kdecoration/chameleon.h -+++ b/plugins/kdecoration/chameleon.h -@@ -32,6 +32,7 @@ - #include <QDir> - #include <QSettings> - #include <QScreen> -+#include <QPainterPath> - - class Settings; - class ChameleonWindowTheme; -diff --git a/plugins/kwineffects/scissor-window/scissorwindow.cpp b/plugins/kwineffects/scissor-window/scissorwindow.cpp -index eb17483..faa898e 100644 ---- a/plugins/kwineffects/scissor-window/scissorwindow.cpp -+++ b/plugins/kwineffects/scissor-window/scissorwindow.cpp -@@ -28,6 +28,7 @@ - #include <kwingltexture.h> - - #include <QPainter> -+#include <QPainterPath> - #include <QExplicitlySharedDataPointer> - #include <QSignalBlocker> - Copied: deepin-kwin/repos/community-testing-x86_64/deepin-kwin-qt5.15.patch (from rev 636213, deepin-kwin/trunk/deepin-kwin-qt5.15.patch) =================================================================== --- deepin-kwin-qt5.15.patch (rev 0) +++ deepin-kwin-qt5.15.patch 2020-05-28 10:15:22 UTC (rev 636214) @@ -0,0 +1,24 @@ +diff --git a/plugins/kdecoration/chameleon.h b/plugins/kdecoration/chameleon.h +index 3d164ca..a716a7a 100644 +--- a/plugins/kdecoration/chameleon.h ++++ b/plugins/kdecoration/chameleon.h +@@ -32,6 +32,7 @@ + #include <QDir> + #include <QSettings> + #include <QScreen> ++#include <QPainterPath> + + class Settings; + class ChameleonWindowTheme; +diff --git a/plugins/kwineffects/scissor-window/scissorwindow.cpp b/plugins/kwineffects/scissor-window/scissorwindow.cpp +index eb17483..faa898e 100644 +--- a/plugins/kwineffects/scissor-window/scissorwindow.cpp ++++ b/plugins/kwineffects/scissor-window/scissorwindow.cpp +@@ -28,6 +28,7 @@ + #include <kwingltexture.h> + + #include <QPainter> ++#include <QPainterPath> + #include <QExplicitlySharedDataPointer> + #include <QSignalBlocker> +