Hello community, here is the log from the commit of package poedit for openSUSE:Factory checked in at 2019-05-21 10:41:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poedit (Old) and /work/SRC/openSUSE:Factory/.poedit.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poedit" Tue May 21 10:41:30 2019 rev:51 rq:704299 version:2.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/poedit/poedit.changes 2019-05-16 22:10:16.526270666 +0200 +++ /work/SRC/openSUSE:Factory/.poedit.new.5148/poedit.changes 2019-05-21 10:41:33.347041202 +0200 @@ -1,0 +2,9 @@ +Mon May 20 17:08:19 UTC 2019 - Antoine Belvire <[email protected]> + +- Poedit 2.2.3: + * Fixed asserts when compiled against wxGTK 3.0 + (gh#vslavik/poedit#571). +- Drop poedit-2.2.2-null-variant.patch: Fixed upstream. +- Fix URL and name case. + +------------------------------------------------------------------- Old: ---- poedit-2.2.2-null-variant.patch poedit-2.2.2.tar.gz New: ---- poedit-2.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poedit.spec ++++++ --- /var/tmp/diff_new_pack.eWYzlB/_old 2019-05-21 10:41:34.651038165 +0200 +++ /var/tmp/diff_new_pack.eWYzlB/_new 2019-05-21 10:41:34.655038156 +0200 @@ -20,15 +20,13 @@ %bcond_without crowdin_integration %bcond_with bundled_deps Name: poedit -Version: 2.2.2 +Version: 2.2.3 Release: 0 Summary: Gettext Catalog Editing Tool License: MIT Group: Development/Tools/Other -URL: http://www.poedit.net/ +URL: https://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 @@ -57,7 +55,7 @@ %endif %description -poEdit is an editor for gettext catalogs (.po files). It is built +Poedit is an editor for gettext catalogs (.po files). It is built with the wxWidgets toolkit, providing a graphical approach to editing catalogs over launching vi and editing the file by hand. @@ -69,7 +67,6 @@ # Remove bundled dependencies, use the ones provided by the distribution rm -r deps %endif -%patch -p1 %build %configure \ ++++++ poedit-2.2.2.tar.gz -> poedit-2.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/NEWS new/poedit-2.2.3/NEWS --- old/poedit-2.2.2/NEWS 2019-05-15 16:24:48.000000000 +0200 +++ new/poedit-2.2.3/NEWS 2019-05-20 13:39:28.000000000 +0200 @@ -1,4 +1,11 @@ +Version 2.2.3 +------------- + +- Fixed asserts when compiled against wxGTK 3.0. +- [Windows] Fixed issue where custom font wasn't respected in some cases. + + Version 2.2.2 ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/configure new/poedit-2.2.3/configure --- old/poedit-2.2.2/configure 2019-05-15 16:25:29.000000000 +0200 +++ new/poedit-2.2.3/configure 2019-05-20 13:40:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for poedit 2.2.2. +# Generated by GNU Autoconf 2.69 for poedit 2.2.3. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='poedit' PACKAGE_TARNAME='poedit' -PACKAGE_VERSION='2.2.2' -PACKAGE_STRING='poedit 2.2.2' +PACKAGE_VERSION='2.2.3' +PACKAGE_STRING='poedit 2.2.3' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1356,7 +1356,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures poedit 2.2.2 to adapt to many kinds of systems. +\`configure' configures poedit 2.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1426,7 +1426,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poedit 2.2.2:";; + short | recursive ) echo "Configuration of poedit 2.2.3:";; esac cat <<\_ACEOF @@ -1583,7 +1583,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poedit configure 2.2.2 +poedit configure 2.2.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1990,7 +1990,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by poedit $as_me 2.2.2, which was +It was created by poedit $as_me 2.2.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2929,7 +2929,7 @@ # Define the identity of the package. PACKAGE='poedit' - VERSION='2.2.2' + VERSION='2.2.3' cat >>confdefs.h <<_ACEOF @@ -9317,7 +9317,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by poedit $as_me 2.2.2, which was +This file was extended by poedit $as_me 2.2.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9374,7 +9374,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -poedit config.status 2.2.2 +poedit config.status 2.2.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/configure.ac new/poedit-2.2.3/configure.ac --- old/poedit-2.2.2/configure.ac 2019-05-15 16:24:48.000000000 +0200 +++ new/poedit-2.2.3/configure.ac 2019-05-20 13:39:28.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.59) -AC_INIT([poedit], [2.2.2], [[email protected]]) +AC_INIT([poedit], [2.2.3], [[email protected]]) AC_CONFIG_AUX_DIR([admin]) AC_CONFIG_MACRO_DIR([admin]) Binary files old/poedit-2.2.2/locales/ca.mo and new/poedit-2.2.3/locales/ca.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/locales/ca.po new/poedit-2.2.3/locales/ca.po --- old/poedit-2.2.2/locales/ca.po 2019-05-15 16:25:44.000000000 +0200 +++ new/poedit-2.2.3/locales/ca.po 2019-05-20 13:40:22.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: poedit\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2019-05-14 19:19+0200\n" -"PO-Revision-Date: 2019-05-14 16:54\n" +"PO-Revision-Date: 2019-05-19 17:44\n" "Last-Translator: Václav Slavík (vslavik)\n" "Language-Team: Catalan\n" "Language: ca_ES\n" @@ -601,9 +601,9 @@ "Suggestions are not available if the translation language is not set " "correctly. Other features, such as plural forms, may be affected as well." msgstr "" -"Els suggeriments no seran disponibles no es defineix la llengua de traducció " -"correctament. Altres funcions, com ara les formes dels plurals, també poden " -"resultar afectades." +"Els suggeriments no seran disponibles si no es defineix la llengua de " +"traducció correctament. Altres funcions, com ara les formes dels plurals, " +"també poden resultar afectades." msgid "Language of the translation is the same as source language." msgstr "La llengua de traducció es la mateixa que la de partida." @@ -1666,10 +1666,10 @@ msgstr "Actualitza des del codi &font" msgid "Update from &POT file…" -msgstr "" +msgstr "Actualitza des d’un fitxer &POT…" msgid "Update from &POT File…" -msgstr "" +msgstr "Actualitza des d’un fitxer &POT…" msgid "Sync with Crowdin" msgstr "Sincronitza amb el Crowdin" Binary files old/poedit-2.2.2/locales/pt_BR.mo and new/poedit-2.2.3/locales/pt_BR.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/locales/pt_BR.po new/poedit-2.2.3/locales/pt_BR.po --- old/poedit-2.2.2/locales/pt_BR.po 2019-05-15 16:24:54.000000000 +0200 +++ new/poedit-2.2.3/locales/pt_BR.po 2019-05-20 13:39:34.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: poedit\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2019-05-14 19:19+0200\n" -"PO-Revision-Date: 2019-05-14 16:56\n" +"PO-Revision-Date: 2019-05-19 17:45\n" "Last-Translator: Václav Slavík (vslavik)\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -322,7 +322,7 @@ msgstr "Apagar" msgid "Spelling and Grammar" -msgstr "Ortografia e Gramática" +msgstr "Ortografia e gramática" msgid "Show Spelling and Grammar" msgstr "Mostrar Ortografia e Gramática" @@ -337,7 +337,7 @@ msgstr "Verificar Gramática com Ortografia" msgid "Correct Spelling Automatically" -msgstr "Corrigir Ortografia Automaticamente" +msgstr "Corrigir ortografia automaticamente" msgid "Substitutions" msgstr "Substituições" @@ -349,7 +349,7 @@ msgstr "Copiar/Colar Inteligente" msgid "Smart Quotes" -msgstr "Aspas Inteligentes" +msgstr "Aspas inteligentes" msgid "Smart Dashes" msgstr "Hífens Inteligentes" @@ -358,7 +358,7 @@ msgstr "Links Inteligentes" msgid "Text Replacement" -msgstr "Substituição de Texto" +msgstr "Substituição de texto" msgid "Transformations" msgstr "Transformações" @@ -584,8 +584,8 @@ msgstr "" "O arquivo continha itens duplicados, o que não é permitido em arquivos PO e " "impediria a utilização do arquivo. O Poedit corrigiu o problema, mas você " -"deve revisar as traduções de todos os itens marcados como incertos e corrigi-" -"los se necessário." +"deve revisar as traduções de todos os itens marcados como provisórios e " +"corrigi-los se necessário." msgid "Language of the translation isn’t set." msgstr "O idioma da tradução não está definido." @@ -785,7 +785,7 @@ msgstr "Pré-traduzida" msgid "Needs Work" -msgstr "Imprecisa" +msgstr "Provisória" #. TRANSLATORS: This indicates that the string's translation isn't final #. and has known problems. For example, it might be machine translated or @@ -796,7 +796,7 @@ #. I am done with it (i.e. consider it good), while "needs work" implies I #. need to return to it and finish the translation. msgid "Needs work" -msgstr "Imprecisa" +msgstr "Provisória" msgid "" "POT files are only templates and don’t contain any translations themselves.\n" @@ -1287,17 +1287,17 @@ "work. Check this option to only include accurate matches." msgstr "" "Por padrão, os resultados imprecisos são preenchidos também e marcados como " -"incertos. Marque esta opção para incluir apenas correspondências exatas." +"provisórios. Marque esta opção para incluir apenas correspondências exatas." msgid "Don’t mark exact matches as needing work" -msgstr "Não marcar ocorrências exatas como imprecisas" +msgstr "Não marcar ocorrências exatas como provisórias" msgid "" "Only enable if you trust the quality of your TM. By default, all matches " "from the TM are marked as needing work and should be reviewed before use." msgstr "" "Apenas ative se você confia na qualidade da sua MT. Por padrão, todas as " -"correspondências da MT são marcadas como imprecisas e devem ser revisadas." +"correspondências da MT são marcadas como provisórias e devem ser revisadas." msgid "" "Pre-translation automatically finds exact or fuzzy matches for untranslated " @@ -1317,7 +1317,7 @@ "The translations were marked as needing work, because they may be " "inaccurate. You should review them for correctness." msgstr "" -"As traduções foram marcadas como imprecisas, porque elas podem estar " +"As traduções foram marcadas como provisórias porque elas podem estar " "incorretas. Você deve revisá-las para correção." msgid "No entries could be pre-translated." @@ -1556,10 +1556,10 @@ msgstr "Copiar do singular" msgid "Translation needs &work" -msgstr "Tradução &imprecisa" +msgstr "Tradução pro&visória" msgid "Translation Needs &Work" -msgstr "Tradução &imprecisa" +msgstr "Tradução pro&visória" msgid "Edit &comment" msgstr "Editar &comentário" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/src/edlistctrl.cpp new/poedit-2.2.3/src/edlistctrl.cpp --- old/poedit-2.2.2/src/edlistctrl.cpp 2019-05-15 16:24:54.000000000 +0200 +++ new/poedit-2.2.3/src/edlistctrl.cpp 2019-05-20 13:39:34.000000000 +0200 @@ -230,13 +230,6 @@ 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 @@ return "string"; case Col_Icon: - return "wxBitmap"; + return "wxIcon"; case Col_Source: case Col_Translation: @@ -293,12 +286,10 @@ 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 +#if defined(__WXGTK__) && !wxCHECK_VERSION(3,1,1) + #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) @@ -307,8 +298,8 @@ 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; @@ -352,7 +343,7 @@ else if (d->HasComment()) variant << m_iconComment; else - NULL_BITMAP(variant); + NULL_ICON(variant); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/src/edlistctrl.h new/poedit-2.2.3/src/edlistctrl.h --- old/poedit-2.2.2/src/edlistctrl.h 2019-05-15 16:24:54.000000000 +0200 +++ new/poedit-2.2.3/src/edlistctrl.h 2019-05-20 13:39:34.000000000 +0200 @@ -297,11 +297,6 @@ 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 }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/src/text_control.cpp new/poedit-2.2.3/src/text_control.cpp --- old/poedit-2.2.2/src/text_control.cpp 2019-05-15 16:24:54.000000000 +0200 +++ new/poedit-2.2.3/src/text_control.cpp 2019-05-20 13:39:34.000000000 +0200 @@ -309,6 +309,17 @@ #ifdef __WXMSW__ +bool CustomizedTextCtrl::SetFont(const wxFont &font) +{ + if (!wxTextCtrl::SetFont(font)) + return false; + + auto style = GetDefaultStyle(); + style.SetFont(font); + SetDefaultStyle(style); + return true; +} + WXDWORD CustomizedTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const { auto msStyle = wxTextCtrl::MSWGetStyle(style, exstyle); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/src/text_control.h new/poedit-2.2.3/src/text_control.h --- old/poedit-2.2.2/src/text_control.h 2019-05-15 16:24:54.000000000 +0200 +++ new/poedit-2.2.3/src/text_control.h 2019-05-20 13:39:34.000000000 +0200 @@ -61,6 +61,7 @@ #endif #ifdef __WXMSW__ + bool SetFont(const wxFont &font) override; WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.2.2/src/version.h new/poedit-2.2.3/src/version.h --- old/poedit-2.2.2/src/version.h 2019-05-15 16:24:54.000000000 +0200 +++ new/poedit-2.2.3/src/version.h 2019-05-20 13:39:34.000000000 +0200 @@ -26,7 +26,7 @@ #ifndef Poedit_version_h #define Poedit_version_h -#define POEDIT_VERSION "2.2.2" -#define POEDIT_VERSION_WIN 2,2,2 +#define POEDIT_VERSION "2.2.3" +#define POEDIT_VERSION_WIN 2,2,3 #endif // Poedit_version_h
