Hello community, here is the log from the commit of package poedit for openSUSE:Factory checked in at 2019-05-16 22:10:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poedit (Old) and /work/SRC/openSUSE:Factory/.poedit.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poedit" Thu May 16 22:10:14 2019 rev:50 rq:703485 version:2.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/poedit/poedit.changes 2019-01-21 10:54:35.759711162 +0100 +++ /work/SRC/openSUSE:Factory/.poedit.new.5148/poedit.changes 2019-05-16 22:10:16.526270666 +0200 @@ -1,0 +2,11 @@ +Wed May 15 17:55:20 UTC 2019 - Antoine Belvire <[email protected]> + +- PoEdit 2.2.2: + * Bug fixes. +- Add poedit-2.2.2-null-variant.patch: Fix type error which is + spammed at runtime (gh#vslavik/poedit#571). +- Move AppData to metainfo folder. +- Don't manually include nlohmann_json directory: configure + script is now able to detect it. + +------------------------------------------------------------------- Old: ---- poedit-2.2.1.tar.gz New: ---- poedit-2.2.2-null-variant.patch poedit-2.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poedit.spec ++++++ --- /var/tmp/diff_new_pack.6zK56V/_old 2019-05-16 22:10:18.674268824 +0200 +++ /var/tmp/diff_new_pack.6zK56V/_new 2019-05-16 22:10:18.718268787 +0200 @@ -20,13 +20,15 @@ %bcond_without crowdin_integration %bcond_with bundled_deps Name: poedit -Version: 2.2.1 +Version: 2.2.2 Release: 0 Summary: Gettext Catalog Editing Tool License: MIT Group: Development/Tools/Other URL: http://www.poedit.net/ Source: https://github.com/vslavik/poedit/releases/download/v%{version}-oss/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM poedit-2.2.2-null-variant.patch -- fix type error spam during execution +Patch: poedit-2.2.2-null-variant.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libboost_iostreams-devel >= 1.60 @@ -67,14 +69,9 @@ # Remove bundled dependencies, use the ones provided by the distribution rm -r deps %endif +%patch -p1 %build -%if !%{with bundled_deps} -# Tweak search path for json header -export CFLAGS="%{optflags} -I%{_includedir}/nlohmann" -export CXXFLAGS="%{optflags} -I%{_includedir}/nlohmann" -%endif - %configure \ %if !%{with language_detection} --without-cld2 \ @@ -98,8 +95,7 @@ %{_datadir}/%{name} %{_datadir}/applications/net.poedit.Poedit.desktop %{_datadir}/applications/net.poedit.PoeditURI.desktop -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/net.poedit.Poedit.appdata.xml +%{_datadir}/metainfo/net.poedit.Poedit.appdata.xml %{_datadir}/icons/hicolor/*/*/* %{_mandir}/man?/* ++++++ poedit-2.2.2-null-variant.patch ++++++ >From 566c4b3f0e8642d29d8053912a34304939de411f Mon Sep 17 00:00:00 2001 From: Antoine Belvire <[email protected]> Date: Wed, 15 May 2019 22:26:24 +0200 Subject: [PATCH] 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. --- src/edlistctrl.cpp | 23 ++++------------------- src/edlistctrl.h | 5 ----- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/edlistctrl.cpp b/src/edlistctrl.cpp index 46774eb90..9b0295e32 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 } @@ -279,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: @@ -293,22 +286,14 @@ 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) - #define NULL_BITMAP(variant) variant << wxNullBitmap -#else - #define NULL_BITMAP(variant) variant = wxNullVariant -#endif - if (!m_catalog || m_frozen) { #if defined(__WXGTK__) && !wxCHECK_VERSION(3,1,1) auto type = GetColumnType(col); if (type == "string") variant = ""; - else if (type == "wxBitmap") - NULL_BITMAP(variant); + else if (type == "wxIcon") + variant << wxNullIcon; else #else variant = wxNullVariant; @@ -352,7 +337,7 @@ void PoeditListCtrl::Model::GetValueByRow(wxVariant& variant, unsigned row, unsi else if (d->HasComment()) variant << m_iconComment; else - NULL_BITMAP(variant); + variant << wxNullIcon; break; } diff --git a/src/edlistctrl.h b/src/edlistctrl.h index 34ddd4476..361c7c029 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 }; -- 2.21.0 ++++++ poedit-2.2.1.tar.gz -> poedit-2.2.2.tar.gz ++++++ ++++ 43671 lines of diff (skipped)
