[arch-commits] Commit in poedit/trunk (2 files)

[Balló György]

    Date: Thursday, July 13, 2017 @ 11:06:33
  Author: bgyorgy
Revision: 244941

upgpkg: poedit 1:2.0.2-3

Fix crash with wxgtk3 (FS#54707)

Added:
  poedit/trunk/poedit-2.0.2_fix_drawroundedrectangle_assert.patch
Modified:
  poedit/trunk/PKGBUILD

----------------------------------------------------+
 PKGBUILD                                           |   10 +++---
 poedit-2.0.2_fix_drawroundedrectangle_assert.patch |   29 +++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-13 10:54:30 UTC (rev 244940)
+++ PKGBUILD	2017-07-13 11:06:33 UTC (rev 244941)
@@ -8,22 +8,24 @@
 pkgname=poedit
 epoch=1
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
 arch=('i686' 'x86_64')
 url="http://www.poedit.net/"
 license=('MIT')
-# poedit-2.0: https://github.com/vslavik/poedit/issues/366
 depends=('gtkspell3' 'lucene++' 'wxgtk3')
 makedepends=('boost')
 source=(https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-${pkgver}.tar.gz
-        icu59.patch)
+        icu59.patch
+        poedit-2.0.2_fix_drawroundedrectangle_assert.patch)
 sha256sums=('b88bc222d4215344d0eb87dda19aafcc0b2465718c4b556015330beb96f7b402'
-            '4d2fcbc1ce5a8d8bab878687337c1f038ed1a83b37652e0a41d7f5c2b26b27bc')
+            '4d2fcbc1ce5a8d8bab878687337c1f038ed1a83b37652e0a41d7f5c2b26b27bc'
+            '721d81cebd32dd27d678d72f1ad527d7d3d74a49862cfa876cbd14f6b54d21d6')
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     patch -Np1 -i ../icu59.patch
+    patch -Np1 -i ../poedit-2.0.2_fix_drawroundedrectangle_assert.patch
 }
 
 build() {

Added: poedit-2.0.2_fix_drawroundedrectangle_assert.patch
===================================================================
--- poedit-2.0.2_fix_drawroundedrectangle_assert.patch	                        (rev 0)
+++ poedit-2.0.2_fix_drawroundedrectangle_assert.patch	2017-07-13 11:06:33 UTC (rev 244941)
@@ -0,0 +1,29 @@
+From 86e0677f48a309314b45ba5f06c1c62d14b2200d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav at slavik.io>
+Date: Thu, 1 Jun 2017 19:19:44 +0200
+Subject: [PATCH] Fix DrawRoundedRectangle assert with wxGTK 3.0
+
+Don't draw if w=0.
+
+Fixes #396.
+---
+ src/editing_area.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/editing_area.cpp b/src/editing_area.cpp
+index e70cce66c..336a4db54 100644
+--- a/src/editing_area.cpp
++++ b/src/editing_area.cpp
+@@ -251,7 +251,8 @@ private:
+         gc->SetPen(*wxTRANSPARENT_PEN);
+ 
+         auto rect = GetClientRect();
+-        gc->DrawRoundedRectangle(rect.x, rect.y, rect.width, rect.height, PX(2));
++        if (!rect.IsEmpty())
++            gc->DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+     }
+ 
+     wxColour m_fg, m_bg;
+-- 
+2.13.0
+