[arch-commits] Commit in deepin-album/repos/community-x86_64 (4 files)

Felix Yan felixonmars at archlinux.org
Thu Oct 22 10:18:50 UTC 2020


    Date: Thursday, October 22, 2020 @ 10:18:50
  Author: felixonmars
Revision: 728930

archrelease: copy trunk to community-x86_64

Added:
  deepin-album/repos/community-x86_64/PKGBUILD
    (from rev 728929, deepin-album/trunk/PKGBUILD)
  deepin-album/repos/community-x86_64/deepin-album-qt5.15.patch
    (from rev 728929, 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                  |   64 +++++++++++----------
 deepin-album-qt5.15.patch |  132 ++++++++++++++++----------------------------
 2 files changed, 81 insertions(+), 115 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-22 10:18:43 UTC (rev 728929)
+++ PKGBUILD	2020-10-22 10:18:50 UTC (rev 728930)
@@ -1,31 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-album
-pkgver=5.6.9.16
-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=('57a13ad1ee46c70e6fc7f09b92be504695bae21873f6615ee7cefe5b6ee18f94a45c332b6195d71506fb32a23ca6f580e0a296860796aba21916f186a0a4ea4d'
-            'bd263f21eef20b586b3c673bb9bb3fcdb53f8f708f57335ce27edcd6069048e8a2e03a46cd9849f24b37165ccd108cd96e20adfc83d5d82a544d61b96fc5d297')
-
-prepare() {
-  patch -d $pkgname-$pkgver -p1 -i ../deepin-album-qt5.15.patch # Fix build with Qt 5.15
-}
-
-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 728929, deepin-album/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-22 10:18:50 UTC (rev 728930)
@@ -0,0 +1,33 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-album
+pkgver=5.6.9.17
+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=('91598841fd8831653f88ab037a45a1eb3792965934863b2b6416af2ab7e66560cfb906b0246c9f60b9a51c39cd96bba8d185814f4a1c2b912ab3fae54b8f0492'
+            '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
+}

Deleted: deepin-album-qt5.15.patch
===================================================================
--- deepin-album-qt5.15.patch	2020-10-22 10:18:43 UTC (rev 728929)
+++ deepin-album-qt5.15.patch	2020-10-22 10:18:50 UTC (rev 728930)
@@ -1,84 +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/imageinfowidget.cpp b/module/view/contents/imageinfowidget.cpp
-index 534bcbf..f9d5440 100644
---- a/module/view/contents/imageinfowidget.cpp
-+++ b/module/view/contents/imageinfowidget.cpp
-@@ -33,6 +33,7 @@
- #include <QPushButton>
- #include <QScrollBar>
- #include <QtDebug>
-+#include <QPainterPath>
- #include <DPushButton>
- #include <DScrollBar>
- #include <DFontSizeManager>
-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/dialogs/imginfodialog.cpp b/widgets/dialogs/imginfodialog.cpp
-index 9b12d06..cb463eb 100644
---- a/widgets/dialogs/imginfodialog.cpp
-+++ b/widgets/dialogs/imginfodialog.cpp
-@@ -35,6 +35,7 @@
- #include <DApplicationHelper>
- #include <DDialogCloseButton>
- #include <QGraphicsOpacityEffect>
-+#include <QPainterPath>
- 
- namespace {
- 
-diff --git a/widgets/dlmenuarrow.h b/widgets/dlmenuarrow.h
-index fe01781..201a6d2 100644
---- a/widgets/dlmenuarrow.h
-+++ b/widgets/dlmenuarrow.h
-@@ -7,6 +7,7 @@
- #include <QEvent>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
- 
- DWIDGET_USE_NAMESPACE
-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 728929, deepin-album/trunk/deepin-album-qt5.15.patch)
===================================================================
--- deepin-album-qt5.15.patch	                        (rev 0)
+++ deepin-album-qt5.15.patch	2020-10-22 10:18:50 UTC (rev 728930)
@@ -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>
+ 



More information about the arch-commits mailing list