[arch-commits] Commit in deepin-image-viewer/repos/community-x86_64 (3 files)

[Felix Yan]

    Date: Friday, January 11, 2019 @ 13:46:22
  Author: felixonmars
Revision: 422412

archrelease: copy trunk to community-x86_64

Added:
  deepin-image-viewer/repos/community-x86_64/PKGBUILD
    (from rev 422411, deepin-image-viewer/trunk/PKGBUILD)
  deepin-image-viewer/repos/community-x86_64/fix-crash.patch
    (from rev 422411, deepin-image-viewer/trunk/fix-crash.patch)
Deleted:
  deepin-image-viewer/repos/community-x86_64/PKGBUILD

-----------------+
 PKGBUILD        |   59 ++++++++++++++++++++++++++++++------------------------
 fix-crash.patch |   24 +++++++++++++++++++++
 2 files changed, 57 insertions(+), 26 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-11 13:46:04 UTC (rev 422411)
+++ PKGBUILD	2019-01-11 13:46:22 UTC (rev 422412)
@@ -1,26 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-image-viewer
-pkgver=1.3.7
-pkgrel=1
-pkgdesc='Deepin Image Viewer'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/deepin-image-viewer"
-license=('GPL3')
-depends=('deepin-qt5integration' 'libexif' 'freeimage' 'libraw' 'qt5-svg' 'deepin-shortcut-viewer')
-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")
-sha512sums=('ad297d2bccdff89d9cc9e2f80c11936bd3910c8dcca72ca88118d2562cfe006944f09a212659efc6eedccc42c14dd5eac19488a05c572b4cab0bd646b8ab9970')
-
-build() {
-  cd deepin-image-viewer-$pkgver
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=
-  make
-}
-
-package() {
-  cd deepin-image-viewer-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: deepin-image-viewer/repos/community-x86_64/PKGBUILD (from rev 422411, deepin-image-viewer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-11 13:46:22 UTC (rev 422412)
@@ -0,0 +1,33 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-image-viewer
+pkgver=1.3.7
+pkgrel=2
+pkgdesc='Deepin Image Viewer'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-image-viewer"
+license=('GPL3')
+depends=('deepin-qt5integration' 'libexif' 'freeimage' 'libraw' 'qt5-svg' 'deepin-shortcut-viewer')
+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')
+
+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=
+  make
+}
+
+package() {
+  cd deepin-image-viewer-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}

Copied: deepin-image-viewer/repos/community-x86_64/fix-crash.patch (from rev 422411, deepin-image-viewer/trunk/fix-crash.patch)
===================================================================
--- fix-crash.patch	                        (rev 0)
+++ fix-crash.patch	2019-01-11 13:46:22 UTC (rev 422412)
@@ -0,0 +1,24 @@
+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()