[arch-commits] Commit in deepin-image-viewer/trunk (PKGBUILD fix-crash.patch)

[Felix Yan]

    Date: Friday, January 25, 2019 @ 14:59:30
  Author: felixonmars
Revision: 427801

upgpkg: deepin-image-viewer 1.3.8-1

Modified:
  deepin-image-viewer/trunk/PKGBUILD
Deleted:
  deepin-image-viewer/trunk/fix-crash.patch

-----------------+
 PKGBUILD        |   15 ++++-----------
 fix-crash.patch |   24 ------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-25 14:59:25 UTC (rev 427800)
+++ PKGBUILD	2019-01-25 14:59:30 UTC (rev 427801)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-image-viewer
-pkgver=1.3.7
-pkgrel=2
+pkgver=1.3.8
+pkgrel=1
 pkgdesc='Deepin Image Viewer'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-image-viewer"
@@ -11,16 +11,9 @@
 makedepends=('qt5-tools')
 optdepends=('deepin-manual: view the help manual')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-image-viewer/archive/$pkgver.tar.gz"
-        fix-crash.patch)
-sha512sums=('ad297d2bccdff89d9cc9e2f80c11936bd3910c8dcca72ca88118d2562cfe006944f09a212659efc6eedccc42c14dd5eac19488a05c572b4cab0bd646b8ab9970'
-            '16171440fdb3a430d21406431aab2140d5a1bdde864f815149eca4c03bb4f45a93b9a4936e962826f627793c544b8538723e8087342cebc786daa055db025626')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-image-viewer/archive/$pkgver.tar.gz")
+sha512sums=('4943c963369fbd123668270674144521cf643ca0e3601e4fd13c39e55a05294626f52fbc5d15436873357c835c5502fd3ee335bfba98dd2b86d4f0cf3d11b9e7')
 
-prepare() {
-  cd deepin-image-viewer-$pkgver
-  patch -p1 -i ../fix-crash.patch
-}
-
 build() {
   cd deepin-image-viewer-$pkgver
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=

Deleted: fix-crash.patch
===================================================================
--- fix-crash.patch	2019-01-25 14:59:25 UTC (rev 427800)
+++ fix-crash.patch	2019-01-25 14:59:30 UTC (rev 427801)
@@ -1,24 +0,0 @@
-commit 90dc30b08a06a4ce06b53d1fd0dd096a8f19cd2f
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Fri Jan 11 21:40:40 2019 +0800
-
-    fix: a crash in ImageWidget::event
-    
-    The function is bool typed and should return a correct value. This fixes
-    the crash in https://github.com/linuxdeepin/developer-center/issues/609
-    
-    Change-Id: I2e869910ce186714a480a83a2aa6cc57511d85dd
-
-diff --git a/viewer/module/view/scen/imageview.cpp b/viewer/module/view/scen/imageview.cpp
-index ab08410..3419a60 100644
---- a/viewer/module/view/scen/imageview.cpp
-+++ b/viewer/module/view/scen/imageview.cpp
-@@ -496,7 +496,7 @@ bool ImageView::event(QEvent *event)
-     if (event->type() == QEvent::Gesture)
-         handleGestureEvent(static_cast<QGestureEvent*>(event));
- 
--    QGraphicsView::event(event);
-+    return QGraphicsView::event(event);
- }
- 
- void ImageView::onCacheFinish()