- updated to 1.23

- pl.po updated upstream
- fix build with wxWidgets 3.0

diff --git a/wxWidgets3.patch b/wxWidgets3.patch
new file mode 100644 (file)
index 0000000..d73632f
--- /dev/null
+++ b/wxWidgets3.patch
@@ -0,0 +1,20 @@
+--- xchm-1.23/src/chmframe.cpp~        2013-08-30 10:31:38.000000000 +0200
++++ xchm-1.23/src/chmframe.cpp 2014-01-18 16:36:29.792122290 +0100
+@@ -265,7 +265,7 @@
+               enu.EnumerateFacenames();
+               _normalFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
++#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7) || (wxMAJOR_VERSION == 3)
+               *_normalFonts = enu.GetFacenames();
+ #else
+               *_normalFonts = *enu.GetFacenames();
+@@ -278,7 +278,7 @@
+               enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+               _fixedFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
++#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7) || (wxMAJOR_VERSION == 3)
+               *_fixedFonts = enu.GetFacenames();
+ #else
+               *_fixedFonts = *enu.GetFacenames();

diff --git a/xchm-pl.po-update.patch b/xchm-pl.po-update.patch
deleted file mode 100644 (file)
index 5fe2006..0000000
--- a/xchm-pl.po-update.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- xchm-1.20/po/pl.po.orig    2011-05-06 12:51:17.000000000 +0200
-+++ xchm-1.20/po/pl.po 2011-05-20 16:50:33.742972078 +0200
-@@ -1,15 +1,15 @@
- # Polish translation for xchm.
- # This file is distributed under the same license as the xchm package.
--# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2007.
-+# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2011.
- #
- # vi:encoding=utf-8
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: xchm 1.11\n"
-+"Project-Id-Version: xchm 1.20\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2011-05-06 13:51+0300\n"
--"PO-Revision-Date: 2007-03-29 19:30+0200\n"
-+"PO-Revision-Date: 2011-05-20 16:45+0200\n"
- "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
- "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
- "Language: pl\n"
-@@ -115,12 +115,11 @@
- 
- #: src/chmframe.cpp:59
- msgid "Close the current tab"
--msgstr ""
-+msgstr "Zamknij bieżącą zakładkę"
- 
- #: src/chmframe.cpp:60
--#, fuzzy
- msgid "Open a new tab"
--msgstr "Otworzenie książki CHM."
-+msgstr "Otwórz nową zakładkę"
- 
- #: src/chmframe.cpp:61
- msgid "Associate the .chm file extension with xCHM."
-@@ -175,9 +174,8 @@
- msgstr "Wy&drukuj stronę...\tCtrl-P"
- 
- #: src/chmframe.cpp:765
--#, fuzzy
- msgid "Fon&ts.."
--msgstr "Fonty..."
-+msgstr "Fon&ty..."
- 
- #: src/chmframe.cpp:768
- msgid "&Show contents tree\tCtrl-S"
-@@ -204,14 +202,12 @@
- msgstr "&Początek\tCtrl-H"
- 
- #: src/chmframe.cpp:798
--#, fuzzy
- msgid "For&ward\tAlt-RIGHT"
--msgstr "&W przód\tCtrl-W"
-+msgstr "&W przód\tAlt-Prawo"
- 
- #: src/chmframe.cpp:800
--#, fuzzy
- msgid "&Back\tAlt-LEFT"
--msgstr "W &tył\tCtrl-B"
-+msgstr "W &tył\tAlt-Lewo"
- 
- #: src/chmframe.cpp:803
- msgid "&About..\tF1"
-@@ -226,14 +222,12 @@
- msgstr "&Znajdź...\tCtrl-F"
- 
- #: src/chmframe.cpp:809
--#, fuzzy
- msgid "&Close tab\tCtrl-W"
--msgstr "&Początek\tCtrl-H"
-+msgstr "Za&mknij zakładkę\tCtrl-W"
- 
- #: src/chmframe.cpp:810
--#, fuzzy
- msgid "&New tab\tCtrl-T"
--msgstr "Fon&ty...\tCtrl-T"
-+msgstr "&Nowa zakładka\tCtrl-T"
- 
- #: src/chmframe.cpp:813
- msgid "&File"
-@@ -329,7 +323,7 @@
- 
- #: src/chmhtmlwindow.cpp:52
- msgid "&Open in a new tab"
--msgstr ""
-+msgstr "&Otwórz w nowej zakładce"
- 
- #: src/chmhtmlwindow.cpp:55
- msgid "&Copy selection"
-@@ -386,14 +380,3 @@
- #: src/chmsearchpanel.cpp:55
- msgid "Search contents for occurences of the specified text."
- msgstr "Poszukiwanie w treści wystąpień podanego tekstu."
--
--#~ msgid ""
--#~ "This is experimental code, and doing this will overwrite any previously "
--#~ "registered CHM viewer associations.\n"
--#~ "\n"
--#~ "Are you sure you know what you're doing?"
--#~ msgstr ""
--#~ "Ten kod jest eksperymentalny i wykonanie go nadpisze wszystkie poprzednio "
--#~ "zarejestrowane powiązania przeglądarek CHM.\n"
--#~ "\n"
--#~ "Na pewno wiesz co robisz?"

diff --git a/xchm.spec b/xchm.spec
index 5e3ee0926c83eb39d3ac1b94c84ea52c9f372773..7d355403557879d26fa6d1efb9bda1ce2f63b04d 100644 (file)
--- a/xchm.spec
+++ b/xchm.spec
@@ -6,14 +6,14 @@
 Summary:       CHM viewer for UNIX
 Summary(pl.UTF-8):     Przeglądarka CHM dla Uniksów
 Name:          xchm
-Version:       1.20
-Release:       2
+Version:       1.23
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/xchm/%{name}-%{version}.tar.gz
-# Source0-md5: 85943645d20af536704a20b58ebd5849
+# Source0-md5: 486d029bd81071a2d04e7181909b1602
 Source1:       %{name}.desktop
-Patch0:                %{name}-pl.po-update.patch
+Patch0:                wxWidgets3.patch
 URL:           http://xchm.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake