rpms
/
poedit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New upstream version 2.2.3 

- Drop: poedit-2.2.2-fix_wxBitmap_wxIcon_asserts.patch
This commit is contained in:
Wolfgang Stöggl 2019-05-20 17:14:20 +02:00
parent 70f775fd11
commit db77a2b742
4 changed files with 8 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -30,3 +30,4 @@ poedit-1.4.6.1.tar.gz
/poedit-2.2.tar.gz
/poedit-2.2.1.tar.gz
/poedit-2.2.2.tar.gz
/poedit-2.2.3.tar.gz

116
poedit-2.2.2-fix_wxBitmap_wxIcon_asserts.patch
View File

@ -1,116 +0,0 @@
From 2d1f96f0268400c4a800773310a7f7456689bc18 Mon Sep 17 00:00:00 2001
From: Antoine Belvire <antoine.belvire@opensuse.org>
Date: Thu, 16 May 2019 19:13:54 +0200
Subject: [PATCH 1/2] Drop leftover code for wxGTK < 3.0.3
---
src/edlistctrl.cpp | 11 +----------
src/edlistctrl.h | 5 -----
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/src/edlistctrl.cpp b/src/edlistctrl.cpp
index 46774eb90a..98eaa03980 100644
--- a/src/edlistctrl.cpp
+++ b/src/edlistctrl.cpp
@@ -230,13 +230,6 @@ PoeditListCtrl::Model::Model(TextDirection appTextDir, ColorScheme::Mode visualM
m_iconBookmark = wxArtProvider::GetIcon("ItemBookmarkTemplate");
m_iconError = wxArtProvider::GetIcon("StatusError");
m_iconWarning = wxArtProvider::GetIcon("StatusWarning");
-
-#ifdef HAS_BROKEN_NULL_BITMAPS
- wxImage nullimg(m_iconError.GetSize().x, m_iconError.GetSize().y);
- nullimg.Clear();
- nullimg.SetMaskColour(0, 0, 0);
- m_nullBitmap = wxBitmap(nullimg);
-#endif
}
@@ -293,9 +286,7 @@ wxString PoeditListCtrl::Model::GetColumnType(unsigned int col) const
void PoeditListCtrl::Model::GetValueByRow(wxVariant& variant, unsigned row, unsigned col) const
{
-#if defined(HAS_BROKEN_NULL_BITMAPS)
- #define NULL_BITMAP(variant) variant << m_nullBitmap
-#elif defined(__WXGTK__) && !wxCHECK_VERSION(3,1,1)
+#if defined(__WXGTK__) && !wxCHECK_VERSION(3,1,1)
#define NULL_BITMAP(variant) variant << wxNullBitmap
#else
#define NULL_BITMAP(variant) variant = wxNullVariant
diff --git a/src/edlistctrl.h b/src/edlistctrl.h
index 34ddd44760..361c7c0294 100644
--- a/src/edlistctrl.h
+++ b/src/edlistctrl.h
@@ -297,11 +297,6 @@ class PoeditListCtrl : public wxDataViewCtrl
wxColour m_clrID, m_clrInvalid, m_clrFuzzy;
wxString m_clrContextFg, m_clrContextBg;
wxIcon m_iconComment, m_iconBookmark, m_iconError, m_iconWarning;
-
- #if defined(__WXGTK__) && !wxCHECK_VERSION(3,0,3)
- #define HAS_BROKEN_NULL_BITMAPS
- wxIcon m_nullBitmap;
- #endif
};
From 64c252b0ed04bee927379b5da32c2f86e4dbd458 Mon Sep 17 00:00:00 2001
From: Antoine Belvire <antoine.belvire@opensuse.org>
Date: Thu, 16 May 2019 19:18:17 +0200
Subject: [PATCH 2/2] Fix PoeditListCtrl::Model::GetValueByRow
Commit b33970a replaced wxBitmap by wxIcon but
PoeditListCtrl::Model::GetValueByRow was still assuming that
wxBitmap were manipulated, leading to error messages
"Wrong type, required: wxBitmap but: wxIcon" at runtime.
Fixes #571.
---
src/edlistctrl.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/edlistctrl.cpp b/src/edlistctrl.cpp
index 98eaa03980..d284284592 100644
--- a/src/edlistctrl.cpp
+++ b/src/edlistctrl.cpp
@@ -272,7 +272,7 @@ wxString PoeditListCtrl::Model::GetColumnType(unsigned int col) const
return "string";
case Col_Icon:
- return "wxBitmap";
+ return "wxIcon";
case Col_Source:
case Col_Translation:
@@ -287,9 +287,9 @@ wxString PoeditListCtrl::Model::GetColumnType(unsigned int col) const
void PoeditListCtrl::Model::GetValueByRow(wxVariant& variant, unsigned row, unsigned col) const
{
#if defined(__WXGTK__) && !wxCHECK_VERSION(3,1,1)
- #define NULL_BITMAP(variant) variant << wxNullBitmap
+ #define NULL_ICON(variant) variant << wxNullIcon
#else
- #define NULL_BITMAP(variant) variant = wxNullVariant
+ #define NULL_ICON(variant) variant = wxNullVariant
#endif
if (!m_catalog || m_frozen)
@@ -298,8 +298,8 @@ void PoeditListCtrl::Model::GetValueByRow(wxVariant& variant, unsigned row, unsi
auto type = GetColumnType(col);
if (type == "string")
variant = "";
- else if (type == "wxBitmap")
- NULL_BITMAP(variant);
+ else if (type == "wxIcon")
+ NULL_ICON(variant);
else
#else
variant = wxNullVariant;
@@ -343,7 +343,7 @@ void PoeditListCtrl::Model::GetValueByRow(wxVariant& variant, unsigned row, unsi
else if (d->HasComment())
variant << m_iconComment;
else
- NULL_BITMAP(variant);
+ NULL_ICON(variant);
break;
}

10
poedit.spec
View File

@ -1,6 +1,6 @@
Name: poedit
Version: 2.2.2
Release: 2%{?dist}
Version: 2.2.3
Release: 1%{?dist}
Summary: GUI editor for GNU gettext .po files
Summary(de): Grafischer Editor für GNU Gettext-Dateien
@ -12,8 +12,6 @@ Source1: http://pkgs.fedoraproject.org/cgit/rpms/%{name}.git/plain/%{name
# https://github.com/vslavik/poedit/pull/499
# https://src.fedoraproject.org/rpms/pugixml/pull-request/1
Patch1: poedit-2.1-update_configure_check_for_pugixml.patch
# https://github.com/vslavik/poedit/pull/572
Patch2: poedit-2.2.2-fix_wxBitmap_wxIcon_asserts.patch
BuildRequires: wxGTK3-devel >= 3.0.3
BuildRequires: gtkspell3-devel
@ -101,6 +99,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/net.%{nam
%changelog
* Mon May 20 2019 Wolfgang Stöggl <c72578@yahoo.de> - 2.2.3-1
- New upstream version
- Drop: poedit-2.2.2-fix_wxBitmap_wxIcon_asserts.patch
* Sun May 19 2019 Wolfgang Stöggl <c72578@yahoo.de> - 2.2.2-2
- Add: poedit-2.2.2-fix_wxBitmap_wxIcon_asserts.patch

2
sources
View File

@ -1 +1 @@
SHA512 (poedit-2.2.2.tar.gz) = 4a021ea4143b61e01f8514358cb8164eb3507219eb2fd722e7c1f3f2ed82721fa87755597eacb35138ec4a9ae4590b41f58420811ee937861e477ecc87cc0949
SHA512 (poedit-2.2.3.tar.gz) = 566f397add593d0b05b995cbd1cff1b063b6eb49b02058511f13c27ed5887685816f8dd9280e1a6be2dd594049c6eecd73efc5cf7835475d3cb5a94fe38f280f