[arch-commits] Commit in deepin-image-viewer/trunk (2 files)

[Felix Yan]

    Date: Friday, October 23, 2020 @ 20:54:19
  Author: felixonmars
Revision: 730867

upgpkg: deepin-image-viewer 5.6.3.8-1

Modified:
  deepin-image-viewer/trunk/PKGBUILD
Deleted:
  deepin-image-viewer/trunk/deepin-image-viewer-qt5.15.patch

----------------------------------+
 PKGBUILD                         |   15 ++++---
 deepin-image-viewer-qt5.15.patch |   72 -------------------------------------
 2 files changed, 8 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-23 20:54:15 UTC (rev 730866)
+++ PKGBUILD	2020-10-23 20:54:19 UTC (rev 730867)
@@ -1,7 +1,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-image-viewer
-pkgver=5.6.3.7
+pkgver=5.6.3.8
 pkgrel=1
 pkgdesc='An image viewing tool with fashion interface and smooth performance'
 arch=('x86_64')
@@ -12,13 +12,14 @@
 optdepends=('deepin-manual: for help menual'
             'deepin-shortcut-viewer: for shortcut display')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-image-viewer/archive/$pkgver.tar.gz"
-        deepin-image-viewer-qt5.15.patch)
-sha512sums=('cf73eab16517062f5c529c1d0f5256a6979ab59827b5e8652ed846123d7d26a2bd13f8889cab7a130fbc9275485c177a6c1173397b41a601d7c8a0b4dc51ca36'
-            'e802fa93972bf3d32c3672603e41bc662866aaf7e458b0cd7eeef786e22348c57161d3292754df5357beae6bb3b475bd45dfc6912c969200e4bf079c00b77763')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-image-viewer/archive/$pkgver.tar.gz")
+sha512sums=('29c83b0832230da6a5d5ea32cb36afb504a9f91477ce5fb93ea1f00f37d07358cbc378515d676b651b3b20415ced593f389f13ac5daa0a13a5a7db20c11b553e')
 
 prepare() {
-  patch -d $pkgname-$pkgver -p1 -i ../deepin-image-viewer-qt5.15.patch # Fix build with Qt 5.15
+  # They are moving files around without merging patches. Wow.
+  cd deepin-image-viewer-$pkgver/src/viewer
+  sed -i '/#include <QDebug>/a #include <QPainterPath>' module/view/contents/ttbcontent.cpp widgets/thumbnaillistview.cpp widgets/popupmenustyle.cpp widgets/thumbnaildelegate.cpp
+  sed -i '/#include <QtDebug>/a #include <QPainterPath>' module/view/contents/imageinfowidget.cpp
 }
 
 build() {
@@ -29,5 +30,5 @@
 
 package() {
   cd deepin-image-viewer-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
+  make INSTALL_ROOT="$pkgdir" install -j1
 }

Deleted: deepin-image-viewer-qt5.15.patch
===================================================================
--- deepin-image-viewer-qt5.15.patch	2020-10-23 20:54:15 UTC (rev 730866)
+++ deepin-image-viewer-qt5.15.patch	2020-10-23 20:54:19 UTC (rev 730867)
@@ -1,72 +0,0 @@
-diff --git a/viewer/frame/toptoolbar.cpp b/viewer/frame/toptoolbar.cpp
-index 545ab1fb..89648d2b 100644
---- a/viewer/frame/toptoolbar.cpp
-+++ b/viewer/frame/toptoolbar.cpp
-@@ -37,6 +37,7 @@
- #include <QImageReader>
- #include <QLabel>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QProcess>
- #include <QResizeEvent>
- #include <QShortcut>
-diff --git a/viewer/module/view/contents/imageinfowidget.cpp b/viewer/module/view/contents/imageinfowidget.cpp
-index ec6e8b91..623734b4 100644
---- a/viewer/module/view/contents/imageinfowidget.cpp
-+++ b/viewer/module/view/contents/imageinfowidget.cpp
-@@ -34,6 +34,7 @@
- #include <QScrollBar>
- #include <QString>
- #include <QtDebug>
-+#include <QPainterPath>
- 
- namespace {
- 
-diff --git a/viewer/module/view/contents/ttbcontent.cpp b/viewer/module/view/contents/ttbcontent.cpp
-index 07d6b211..cc4718be 100644
---- a/viewer/module/view/contents/ttbcontent.cpp
-+++ b/viewer/module/view/contents/ttbcontent.cpp
-@@ -35,6 +35,7 @@
- #include <QHBoxLayout>
- #include <QTimer>
- #include <QtMath>
-+#include <QPainterPath>
- 
- #define TTB 0
- 
-diff --git a/viewer/widgets/popupmenustyle.cpp b/viewer/widgets/popupmenustyle.cpp
-index ddb509cd..0fd91f73 100644
---- a/viewer/widgets/popupmenustyle.cpp
-+++ b/viewer/widgets/popupmenustyle.cpp
-@@ -19,6 +19,7 @@
- #include <QPixmap>
- #include <QPixmapCache>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleOption>
- #include <QStyleOptionMenuItem>
- 
-diff --git a/viewer/widgets/thumbnaildelegate.cpp b/viewer/widgets/thumbnaildelegate.cpp
-index 64bd65ef..1a09702d 100644
---- a/viewer/widgets/thumbnaildelegate.cpp
-+++ b/viewer/widgets/thumbnaildelegate.cpp
-@@ -23,6 +23,7 @@
- #include <QHBoxLayout>
- #include <QLineEdit>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmapCache>
- #include <QStandardItemModel>
- #include <QThread>
-diff --git a/viewer/widgets/thumbnaillistview.cpp b/viewer/widgets/thumbnaillistview.cpp
-index 0681c9d9..1f2f3940 100644
---- a/viewer/widgets/thumbnaillistview.cpp
-+++ b/viewer/widgets/thumbnaillistview.cpp
-@@ -30,6 +30,7 @@
- #include <QMutex>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
- #include <QScrollBar>
- #include <QStandardItemModel>