Date: Tuesday, October 27, 2020 @ 21:19:42
Author: felixonmars
Revision: 735170
archrelease: copy trunk to community-x86_64
Added:
deepin-album/repos/community-x86_64/PKGBUILD
(from rev 735169, deepin-album/trunk/PKGBUILD)
deepin-album/repos/community-x86_64/deepin-album-qt5.15.patch
(from rev 735169, 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-27 21:19:23 UTC (rev 735169)
+++ PKGBUILD 2020-10-27 21:19:42 UTC (rev 735170)
@@ -1,33 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-
-pkgname=deepin-album
-pkgver=5.6.9.24
-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=('aeb0d62207cd0dda8e538719fe3d637b740e3e615c31d9b9cbf2e28be68ffa6ba8f36b8b9463463d7f848b8bc953427dda5b64ea5753f8df29dab8ec8f8fcc0a'
-
'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 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 735169,
deepin-album/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-27 21:19:42 UTC (rev 735170)
@@ -0,0 +1,33 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+
+pkgname=deepin-album
+pkgver=5.6.9.25
+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=('71165bc30c9ed9f58529c4e380dd60b1756b8241a850f222c980f19d04080c6b48ab19d36c6a831ab709c1fdc5d65e32e18eac7da14cad563dc407b989e1af52'
+
'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 widgets/dialogs/dfmdarrowlineexpand.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-27 21:19:23 UTC (rev 735169)
+++ deepin-album-qt5.15.patch 2020-10-27 21:19:42 UTC (rev 735170)
@@ -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
735169, deepin-album/trunk/deepin-album-qt5.15.patch)
===================================================================
--- deepin-album-qt5.15.patch (rev 0)
+++ deepin-album-qt5.15.patch 2020-10-27 21:19:42 UTC (rev 735170)
@@ -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>
+
