Your message dated Mon, 10 Mar 2014 17:36:57 +0530
with message-id
<capdygey2uux7ba-v9e1rfmll4rpo_bzwgyp8xfa6ouadq+-...@mail.gmail.com>
and subject line Re: Bug#740991: xchm: Please update to use wxwidgets3.0
has caused the Debian Bug report #740991,
regarding xchm: Please update to use wxwidgets3.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
740991: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740991
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: xchm
Version: 2:1.23-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: wx3.0
Dear maintainer,
We're aiming to migrate the archive to using wxwidgets3.0 instead of
wxwidgets2.8.
I've built and done some testing of your package with the attached patch
to update it to build against wxwidgets3.0, and it all looks good.
I'm happy to NMU this change if you wish me to - just let me know.
Cheers,
Olly
diff -Nru xchm-1.23/debian/changelog xchm-1.23/debian/changelog
--- xchm-1.23/debian/changelog 2013-12-27 00:20:27.000000000 +1300
+++ xchm-1.23/debian/changelog 2014-03-07 16:42:39.000000000 +1300
@@ -1,3 +1,10 @@
+xchm (2:1.23-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to build with libwxgtk3.0-dev (new patch: wx3.0-compat.patch).
+
+ -- Olly Betts <[email protected]> Fri, 07 Mar 2014 16:30:04 +1300
+
xchm (2:1.23-1) unstable; urgency=low
* New upstream release.
diff -Nru xchm-1.23/debian/control xchm-1.23/debian/control
--- xchm-1.23/debian/control 2013-12-26 20:24:44.000000000 +1300
+++ xchm-1.23/debian/control 2014-03-07 16:29:11.000000000 +1300
@@ -6,8 +6,7 @@
debhelper (>= 7.0.50~),
dpkg-dev (>= 1.16.1~),
libchm-dev (>= 2:0.40a),
- libwxgtk2.8-dev
-Build-Conflicts: libwxbase2.6-dev, libwxgtk2.6-dev
+ libwxgtk3.0-dev
Standards-Version: 3.9.5
Homepage: http://xchm.sourceforge.net/
Vcs-Git: git://anonscm.debian.org/collab-maint/xchm.git
diff -Nru xchm-1.23/debian/patches/series xchm-1.23/debian/patches/series
--- xchm-1.23/debian/patches/series 1970-01-01 12:00:00.000000000 +1200
+++ xchm-1.23/debian/patches/series 2014-03-07 16:39:48.000000000 +1300
@@ -0,0 +1 @@
+wx3.0-compat.patch
diff -Nru xchm-1.23/debian/patches/wx3.0-compat.patch xchm-1.23/debian/patches/wx3.0-compat.patch
--- xchm-1.23/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ xchm-1.23/debian/patches/wx3.0-compat.patch 2014-03-07 16:41:51.000000000 +1300
@@ -0,0 +1,32 @@
+Description: Fix code to compile with wxwidgets 3.0
+ Drops support for wx < 2.7, which is just not relevant now. And in fact
+ configure.ac checks for at least 2.8.0.
+Author: Olly Betts <[email protected]>
+Last-Update: 2014-03-07
+
+--- xchm-1.23.orig/src/chmframe.cpp
++++ xchm-1.23/src/chmframe.cpp
+@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ enu.EnumerateFacenames();
+ _normalFonts = new wxArrayString;
+
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ *_normalFonts = enu.GetFacenames();
+-#else
+- *_normalFonts = *enu.GetFacenames();
+-#endif
+ _normalFonts->Sort();
+ }
+
+@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+ _fixedFonts = new wxArrayString;
+
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ *_fixedFonts = enu.GetFacenames();
+-#else
+- *_fixedFonts = *enu.GetFacenames();
+-#endif
+ _fixedFonts->Sort();
+ }
+
--- End Message ---
--- Begin Message ---
Package: xchm
Version: 2:1.23-2
On Fri, Mar 7, 2014 at 10:04 AM, Kartik Mistry <[email protected]> wrote:
> On Fri, Mar 7, 2014 at 9:22 AM, Olly Betts <[email protected]> wrote:
>> I've built and done some testing of your package with the attached patch
>> to update it to build against wxwidgets3.0, and it all looks good.
>>
>> I'm happy to NMU this change if you wish me to - just let me know.
>
> Thanks a lot! I should do upload in a day. If not, I'll let you know for NMU
> :)
Fixed. Forgot to add this in changelog, it seems.
--
Kartik Mistry/કાર્તિક મિસ્ત્રી | IRC: kart_
{kartikm, 0x1f1f}.wordpress.com
--- End Message ---
