[arch-commits] Commit in poedit/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Tue Sep 12 20:22:11 UTC 2017
Date: Tuesday, September 12, 2017 @ 20:22:10
Author: arojas
Revision: 257180
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
poedit/repos/community-staging-i686/
poedit/repos/community-staging-i686/PKGBUILD
(from rev 257179, poedit/trunk/PKGBUILD)
poedit/repos/community-staging-i686/icu59.patch
(from rev 257179, poedit/trunk/icu59.patch)
poedit/repos/community-staging-i686/poedit-2.0.2_fix_drawroundedrectangle_assert.patch
(from rev 257179, poedit/trunk/poedit-2.0.2_fix_drawroundedrectangle_assert.patch)
poedit/repos/community-staging-x86_64/
poedit/repos/community-staging-x86_64/PKGBUILD
(from rev 257179, poedit/trunk/PKGBUILD)
poedit/repos/community-staging-x86_64/icu59.patch
(from rev 257179, poedit/trunk/icu59.patch)
poedit/repos/community-staging-x86_64/poedit-2.0.2_fix_drawroundedrectangle_assert.patch
(from rev 257179, poedit/trunk/poedit-2.0.2_fix_drawroundedrectangle_assert.patch)
-----------------------------------------------------------------------------+
community-staging-i686/PKGBUILD | 41 ++++++++++
community-staging-i686/icu59.patch | 11 ++
community-staging-i686/poedit-2.0.2_fix_drawroundedrectangle_assert.patch | 29 +++++++
community-staging-x86_64/PKGBUILD | 41 ++++++++++
community-staging-x86_64/icu59.patch | 11 ++
community-staging-x86_64/poedit-2.0.2_fix_drawroundedrectangle_assert.patch | 29 +++++++
6 files changed, 162 insertions(+)
Copied: poedit/repos/community-staging-i686/PKGBUILD (from rev 257179, poedit/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-09-12 20:22:10 UTC (rev 257180)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=poedit
+epoch=1
+pkgver=2.0.3
+pkgrel=2
+pkgdesc="Cross-platform gettext catalogs (.po files) editor"
+arch=('i686' 'x86_64')
+url="http://www.poedit.net/"
+license=('MIT')
+depends=('gtkspell3' 'lucene++' 'wxgtk3')
+makedepends=('boost')
+source=(https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-${pkgver}.tar.gz
+ icu59.patch
+ poedit-2.0.2_fix_drawroundedrectangle_assert.patch)
+sha256sums=('1ff4c7b3966946b2dc06ba8dda5d8861fa00a94d8387821db511f339092d9577'
+ '4d2fcbc1ce5a8d8bab878687337c1f038ed1a83b37652e0a41d7f5c2b26b27bc'
+ '721d81cebd32dd27d678d72f1ad527d7d3d74a49862cfa876cbd14f6b54d21d6')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+# patch -Np1 -i ../icu59.patch
+# patch -Np1 -i ../poedit-2.0.2_fix_drawroundedrectangle_assert.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --libexecdir=/usr/lib/poedit --with-wx-config=/usr/bin/wx-config-gtk3
+ make CPPFLAGS+=' -DUCHAR_TYPE=uint16_t'
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: poedit/repos/community-staging-i686/icu59.patch (from rev 257179, poedit/trunk/icu59.patch)
===================================================================
--- community-staging-i686/icu59.patch (rev 0)
+++ community-staging-i686/icu59.patch 2017-09-12 20:22:10 UTC (rev 257180)
@@ -0,0 +1,11 @@
+diff -upr poedit-2.0.1.orig/src/unicode_helpers.cpp poedit-2.0.1/src/unicode_helpers.cpp
+--- poedit-2.0.1.orig/src/unicode_helpers.cpp 2017-04-26 10:55:31.807183266 +0300
++++ poedit-2.0.1/src/unicode_helpers.cpp 2017-04-26 11:02:47.373899526 +0300
+@@ -25,6 +25,7 @@
+
+ #include "unicode_helpers.h"
+
++#include <unicode/unistr.h>
+ #include "str_helpers.h"
+
+ #include <unicode/ubidi.h>
Copied: poedit/repos/community-staging-i686/poedit-2.0.2_fix_drawroundedrectangle_assert.patch (from rev 257179, poedit/trunk/poedit-2.0.2_fix_drawroundedrectangle_assert.patch)
===================================================================
--- community-staging-i686/poedit-2.0.2_fix_drawroundedrectangle_assert.patch (rev 0)
+++ community-staging-i686/poedit-2.0.2_fix_drawroundedrectangle_assert.patch 2017-09-12 20:22:10 UTC (rev 257180)
@@ -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
+
Copied: poedit/repos/community-staging-x86_64/PKGBUILD (from rev 257179, poedit/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-09-12 20:22:10 UTC (rev 257180)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=poedit
+epoch=1
+pkgver=2.0.3
+pkgrel=2
+pkgdesc="Cross-platform gettext catalogs (.po files) editor"
+arch=('i686' 'x86_64')
+url="http://www.poedit.net/"
+license=('MIT')
+depends=('gtkspell3' 'lucene++' 'wxgtk3')
+makedepends=('boost')
+source=(https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-${pkgver}.tar.gz
+ icu59.patch
+ poedit-2.0.2_fix_drawroundedrectangle_assert.patch)
+sha256sums=('1ff4c7b3966946b2dc06ba8dda5d8861fa00a94d8387821db511f339092d9577'
+ '4d2fcbc1ce5a8d8bab878687337c1f038ed1a83b37652e0a41d7f5c2b26b27bc'
+ '721d81cebd32dd27d678d72f1ad527d7d3d74a49862cfa876cbd14f6b54d21d6')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+# patch -Np1 -i ../icu59.patch
+# patch -Np1 -i ../poedit-2.0.2_fix_drawroundedrectangle_assert.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --libexecdir=/usr/lib/poedit --with-wx-config=/usr/bin/wx-config-gtk3
+ make CPPFLAGS+=' -DUCHAR_TYPE=uint16_t'
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: poedit/repos/community-staging-x86_64/icu59.patch (from rev 257179, poedit/trunk/icu59.patch)
===================================================================
--- community-staging-x86_64/icu59.patch (rev 0)
+++ community-staging-x86_64/icu59.patch 2017-09-12 20:22:10 UTC (rev 257180)
@@ -0,0 +1,11 @@
+diff -upr poedit-2.0.1.orig/src/unicode_helpers.cpp poedit-2.0.1/src/unicode_helpers.cpp
+--- poedit-2.0.1.orig/src/unicode_helpers.cpp 2017-04-26 10:55:31.807183266 +0300
++++ poedit-2.0.1/src/unicode_helpers.cpp 2017-04-26 11:02:47.373899526 +0300
+@@ -25,6 +25,7 @@
+
+ #include "unicode_helpers.h"
+
++#include <unicode/unistr.h>
+ #include "str_helpers.h"
+
+ #include <unicode/ubidi.h>
Copied: poedit/repos/community-staging-x86_64/poedit-2.0.2_fix_drawroundedrectangle_assert.patch (from rev 257179, poedit/trunk/poedit-2.0.2_fix_drawroundedrectangle_assert.patch)
===================================================================
--- community-staging-x86_64/poedit-2.0.2_fix_drawroundedrectangle_assert.patch (rev 0)
+++ community-staging-x86_64/poedit-2.0.2_fix_drawroundedrectangle_assert.patch 2017-09-12 20:22:10 UTC (rev 257180)
@@ -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
+
More information about the arch-commits
mailing list