Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package poedit for openSUSE:Factory checked in at 2022-04-17 23:50:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poedit (Old) and /work/SRC/openSUSE:Factory/.poedit.new.1941 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poedit" Sun Apr 17 23:50:19 2022 rev:65 rq:970436 version:3.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/poedit/poedit.changes 2022-01-23 12:17:03.567917960 +0100 +++ /work/SRC/openSUSE:Factory/.poedit.new.1941/poedit.changes 2022-04-17 23:51:55.806478895 +0200 @@ -1,0 +2,9 @@ +Sat Apr 16 10:33:45 UTC 2022 - Antoine Belvire <[email protected]> + +- Add poedit-3.0.1-add-icon-about-dialog.patch: Fix display of icon + in about dialog (gh#vslavik/poedit#704). +- Add poedit-3.0.1-fix-sizer-assertion.patch: Fix an assertion + error when opening the code ocurrence window with wxGTK 3.1.6 + (gh#vslavik/poedit#745). + +------------------------------------------------------------------- New: ---- poedit-3.0.1-add-icon-about-dialog.patch poedit-3.0.1-fix-sizer-assertion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poedit.spec ++++++ --- /var/tmp/diff_new_pack.XUfva5/_old 2022-04-17 23:51:56.206479443 +0200 +++ /var/tmp/diff_new_pack.XUfva5/_new 2022-04-17 23:51:56.210479449 +0200 @@ -27,6 +27,10 @@ Group: Development/Tools/Other URL: https://poedit.net/ Source: https://github.com/vslavik/poedit/releases/download/v%{version}-oss/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM poedit-3.0.1-add-icon-about-dialog.patch -- https://github.com/vslavik/poedit/issues/704 +Patch0: poedit-3.0.1-add-icon-about-dialog.patch +# PATCH-FIX-UPSTREAM poedit-3.0.1-fix-sizer-assertion.patch -- https://github.com/vslavik/poedit/issues/745 +Patch2: poedit-3.0.1-fix-sizer-assertion.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libboost_iostreams-devel >= 1.60 @@ -61,7 +65,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %if !%{with bundled_deps} # Remove bundled dependencies, use the ones provided by the distribution rm -r deps ++++++ poedit-3.0.1-add-icon-about-dialog.patch ++++++ >From d8375bfedb6f31ba84ee785d962f24a024a312a5 Mon Sep 17 00:00:00 2001 From: Antoine Belvire <[email protected]> Date: Fri, 25 Mar 2022 18:08:05 +0100 Subject: [PATCH] Fix icon missing in about dialog under wxGTK Fixes #704 --- src/edapp.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/edapp.cpp b/src/edapp.cpp index 95a16eab82..2a98c66996 100644 --- a/src/edapp.cpp +++ b/src/edapp.cpp @@ -1078,6 +1078,7 @@ void PoeditApp::OnAbout(wxCommandEvent&) about.SetCopyright(L"Copyright \u00a9 1999-2021 V??clav Slav??k"); #ifdef __WXGTK__ // other ports would show non-native about dlg about.SetWebSite("https://poedit.net";); + about.SetIcon(wxArtProvider::GetIcon("net.poedit.Poedit", wxART_FRAME_ICON, wxSize(128, 128))); #endif wxAboutBox(about); ++++++ poedit-3.0.1-fix-sizer-assertion.patch ++++++ >From 1a70ce711c685c3292e10e5812d31f11dc6d41ad Mon Sep 17 00:00:00 2001 From: Antoine Belvire <[email protected]> Date: Fri, 15 Apr 2022 18:49:30 +0200 Subject: [PATCH] Fix incorrect parent of a control in FileViewer This caused an assert with wxGTK 3.1.6, which checks for this kind of mistakes. Fixes #745 --- src/fileviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fileviewer.cpp b/src/fileviewer.cpp index 63d5a1336c..e8516e3f81 100644 --- a/src/fileviewer.cpp +++ b/src/fileviewer.cpp @@ -136,7 +136,7 @@ FileViewer::FileViewer(wxWindow*) #endif m_topBarSizer->Add(m_openInEditor, wxSizerFlags().Center().ReserveSpaceEvenIfHidden().Border(wxLEFT, PX(10))); - sizer->Add(new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1)), wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT, PX(5))); + sizer->Add(new wxStaticLine(panel, wxID_ANY, wxDefaultPosition, wxSize(-1, 1)), wxSizerFlags().Expand().Border(wxLEFT|wxRIGHT, PX(5))); m_content = wxWebView::New(panel, wxID_ANY); sizer->Add(m_content, 1, wxEXPAND);
