Date: Sunday, October 25, 2020 @ 23:14:42 Author: felixonmars Revision: 733677
archrelease: copy trunk to community-x86_64 Added: deepin-album/repos/community-x86_64/PKGBUILD (from rev 733676, deepin-album/trunk/PKGBUILD) deepin-album/repos/community-x86_64/deepin-album-qt5.15.patch (from rev 733676, deepin-album/trunk/deepin-album-qt5.15.patch) Deleted: deepin-album/repos/community-x86_64/PKGBUILD deepin-album/repos/community-x86_64/deepin-album-qt5.15.patch ---------------------------+ PKGBUILD | 66 +++++++++++++++--------------- deepin-album-qt5.15.patch | 96 ++++++++++++++++++++++---------------------- 2 files changed, 81 insertions(+), 81 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-10-25 23:14:32 UTC (rev 733676) +++ PKGBUILD 2020-10-25 23:14:42 UTC (rev 733677) @@ -1,33 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=deepin-album -pkgver=5.6.9.21 -pkgrel=1 -pkgdesc='A fashion photo manager for viewing and organizing pictures' -arch=('x86_64') -url="https://github.com/linuxdeepin/deepin-album" -license=('GPL3') -depends=('deepin-qt5integration' 'freeimage' 'gio-qt' 'udisks2-qt5') -makedepends=('qt5-tools') -groups=('deepin-extra') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-album/archive/$pkgver.tar.gz" - deepin-album-qt5.15.patch) -sha512sums=('e263d998d11a65d77460cdb47a96d5e8c07f4e9dd406b450342815b9f8dc1acfb9506d00de8865865788c604678b33fce548f3e25b1f94817f666c11960a1337' - '52c48e5d2efe603cfa0d9ab9db9619370dfcf7fdeab8fb52d94c5481ad98fe3ca5bfadf240e3acc5542dbe5fa1be766ad7189316fc9db3632b76fbfd6ed9c640') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../deepin-album-qt5.15.patch # Fix build with Qt 5.15 - sed -i '1i #include <QPainterPath>' widgets/dlmenuarrow.h widgets/dialogs/dfmdarrowlineexpand.cpp -} - -build() { - cd deepin-album-$pkgver - qmake-qt5 PREFIX=/usr - make -} - -package() { - cd deepin-album-$pkgver - make INSTALL_ROOT="$pkgdir" install -} Copied: deepin-album/repos/community-x86_64/PKGBUILD (from rev 733676, deepin-album/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-10-25 23:14:42 UTC (rev 733677) @@ -0,0 +1,33 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=deepin-album +pkgver=5.6.9.22 +pkgrel=1 +pkgdesc='A fashion photo manager for viewing and organizing pictures' +arch=('x86_64') +url="https://github.com/linuxdeepin/deepin-album" +license=('GPL3') +depends=('deepin-qt5integration' 'freeimage' 'gio-qt' 'udisks2-qt5') +makedepends=('qt5-tools') +groups=('deepin-extra') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-album/archive/$pkgver.tar.gz" + deepin-album-qt5.15.patch) +sha512sums=('dd6080b4f4885b223e4645f4133c9efbf43fbbdce912a21bd9a0d1d89e37b8d4804b73020e72c397e4bfe12db7b96d48333f1ecbd8d9eb89ac8868a908a650da' + '52c48e5d2efe603cfa0d9ab9db9619370dfcf7fdeab8fb52d94c5481ad98fe3ca5bfadf240e3acc5542dbe5fa1be766ad7189316fc9db3632b76fbfd6ed9c640') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../deepin-album-qt5.15.patch # Fix build with Qt 5.15 + sed -i '1i #include <QPainterPath>' widgets/dlmenuarrow.h module/view/contents/imageinfowidget.cpp +} + +build() { + cd deepin-album-$pkgver + qmake-qt5 PREFIX=/usr + make +} + +package() { + cd deepin-album-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Deleted: deepin-album-qt5.15.patch =================================================================== --- deepin-album-qt5.15.patch 2020-10-25 23:14:32 UTC (rev 733676) +++ deepin-album-qt5.15.patch 2020-10-25 23:14:42 UTC (rev 733677) @@ -1,48 +0,0 @@ -diff --git a/frame/toptoolbar.cpp b/frame/toptoolbar.cpp -index f6f8073..a1dc84e 100644 ---- a/frame/toptoolbar.cpp -+++ b/frame/toptoolbar.cpp -@@ -35,6 +35,7 @@ - #include <QDebug> - #include <QHBoxLayout> - #include <QPainter> -+#include <QPainterPath> - #include <QProcess> - #include <QResizeEvent> - #include <QShortcut> -diff --git a/module/view/contents/ttbcontent.cpp b/module/view/contents/ttbcontent.cpp -index 1f95a63..7d03cdc 100644 ---- a/module/view/contents/ttbcontent.cpp -+++ b/module/view/contents/ttbcontent.cpp -@@ -38,6 +38,7 @@ - #include <DApplicationHelper> - #include <DSpinner> - #include <QtMath> -+#include <QPainterPath> - - DWIDGET_USE_NAMESPACE - namespace { -diff --git a/thumbnail/thumbnaildelegate.cpp b/thumbnail/thumbnaildelegate.cpp -index a789f41..3b2b50a 100644 ---- a/thumbnail/thumbnaildelegate.cpp -+++ b/thumbnail/thumbnaildelegate.cpp -@@ -24,6 +24,7 @@ - #include <QHBoxLayout> - #include <QLineEdit> - #include <QPainter> -+#include <QPainterPath> - #include <QPixmapCache> - #include <QStandardItemModel> - #include <QThread> -diff --git a/widgets/popupmenustyle.cpp b/widgets/popupmenustyle.cpp -index ddb509c..0fd91f7 100644 ---- a/widgets/popupmenustyle.cpp -+++ b/widgets/popupmenustyle.cpp -@@ -19,6 +19,7 @@ - #include <QPixmap> - #include <QPixmapCache> - #include <QPainter> -+#include <QPainterPath> - #include <QStyleOption> - #include <QStyleOptionMenuItem> - Copied: deepin-album/repos/community-x86_64/deepin-album-qt5.15.patch (from rev 733676, deepin-album/trunk/deepin-album-qt5.15.patch) =================================================================== --- deepin-album-qt5.15.patch (rev 0) +++ deepin-album-qt5.15.patch 2020-10-25 23:14:42 UTC (rev 733677) @@ -0,0 +1,48 @@ +diff --git a/frame/toptoolbar.cpp b/frame/toptoolbar.cpp +index f6f8073..a1dc84e 100644 +--- a/frame/toptoolbar.cpp ++++ b/frame/toptoolbar.cpp +@@ -35,6 +35,7 @@ + #include <QDebug> + #include <QHBoxLayout> + #include <QPainter> ++#include <QPainterPath> + #include <QProcess> + #include <QResizeEvent> + #include <QShortcut> +diff --git a/module/view/contents/ttbcontent.cpp b/module/view/contents/ttbcontent.cpp +index 1f95a63..7d03cdc 100644 +--- a/module/view/contents/ttbcontent.cpp ++++ b/module/view/contents/ttbcontent.cpp +@@ -38,6 +38,7 @@ + #include <DApplicationHelper> + #include <DSpinner> + #include <QtMath> ++#include <QPainterPath> + + DWIDGET_USE_NAMESPACE + namespace { +diff --git a/thumbnail/thumbnaildelegate.cpp b/thumbnail/thumbnaildelegate.cpp +index a789f41..3b2b50a 100644 +--- a/thumbnail/thumbnaildelegate.cpp ++++ b/thumbnail/thumbnaildelegate.cpp +@@ -24,6 +24,7 @@ + #include <QHBoxLayout> + #include <QLineEdit> + #include <QPainter> ++#include <QPainterPath> + #include <QPixmapCache> + #include <QStandardItemModel> + #include <QThread> +diff --git a/widgets/popupmenustyle.cpp b/widgets/popupmenustyle.cpp +index ddb509c..0fd91f7 100644 +--- a/widgets/popupmenustyle.cpp ++++ b/widgets/popupmenustyle.cpp +@@ -19,6 +19,7 @@ + #include <QPixmap> + #include <QPixmapCache> + #include <QPainter> ++#include <QPainterPath> + #include <QStyleOption> + #include <QStyleOptionMenuItem> +