Bump version 4.20

Signed-off-by: LiMinggang <[email protected]>
LiMinggang · Jun 22, 2023 · 9d03bf3 · 9d03bf3
1 parent 551680d
commit 9d03bf3
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 13 deletions.
diff --git a/README b/README
@@ -112,6 +112,22 @@ ChangeLog:
 Note: Not support wxWidgets 2.X anymore since 0.3.X
 
 Todo:
+Packing for FreeBSD
+
+Mod v0.4.20
+1.Fix: JSON formatter convert Unicode chars to UTF8 chars #309
+2.Fix global-buffer-overflow due EUCTW_TABLE_SIZE
+3.Crashing sequence with nsSJISProber
+4.Input size could not decrease the size of Input control
+5.Fix compiling issue under wx 3.1.4
+6.Fix bug that caused file type detect wrongly
+7.Fix Linux build issue with wxWidgets < 3.1.1
+8.Update Python to 2.7.18
+9.Fix langurage ID of wxWidgets
+10.Update wxWidgets to 3.2.2.1
+11.Don't create new file by double clicking file title tab
+12.Fix VS compiling issue(snprintf)
+13.Fix High DPI awareness issue
 
 Mod v0.4.19
 1.Fix: Disable safe mode in PanChinese search

diff --git a/README.md b/README.md
@@ -81,6 +81,21 @@ Translations
 
 News
 =======
+Mod v0.4.20
+* Fix: JSON formatter convert Unicode chars to UTF8 chars #309
+* Fix global-buffer-overflow due EUCTW_TABLE_SIZE
+* Crashing sequence with nsSJISProber
+* Input size could not decrease the size of Input control
+* Fix compiling issue under wx 3.1.4
+* Fix bug that caused file type detect wrongly
+* Fix Linux build issue with wxWidgets < 3.1.1
+* Update Python to 2.7.18
+* Fix langurage ID of wxWidgets
+* Update wxWidgets to 3.2.2.1
+* Don't create new file by double clicking file title tab
+* Fix VS compiling issue(snprintf)
+* Fix High DPI awareness issue
+
 Mod v0.4.19
 * Fix: Disable safe mode in PanChinese search
 * Fix: String encoding bug in MadPython #304

diff --git a/README.txt b/README.txt
@@ -16,11 +16,11 @@ A. Linux, FreeBSD, and Unix-like OS (__WXGTK__):
       1. wxWidgets-3.1.2 or higher with Unicode and IPC enabled(obsoleted)
       2. Boost-1.56.0 or higher(1.70 is recommended)
 
-      (install wxgtk gtk2-devel/gtk3-devel gettext-devel automake autoconf pkgconf rpm-build (Fedora/Mageia))
+      (install wxgtk3 gtk2-devel/gtk3-devel gettext-devel automake autoconf pkgconf rpm-build (Fedora/Mageia))
       gtk+2.0-dev/libgtk-3-dev automake (Ubuntu/Debian/ElementaryOS)
       copy wxwin.m4 to usr/share/acloXXX/ or install wxGTK-devel
 
-      install wxgtk(and rename the script under /usr/local/bin/wxgtk3uxxx-config tp wx-config)
+      install wxgtk3(and rename the script under /usr/local/bin/wxgtk3uxxx-config to wx-config)
       pkgconf for FreeBSD is recommanded
       sudo portsnap fetch extract(/usr/share/mk/bsd.port.mk not found)
 
@@ -132,7 +132,7 @@ Mod v0.4.20
 7.Fix Linux build issue with wxWidgets < 3.1.1
 8.Update Python to 2.7.18
 9.Fix langurage ID of wxWidgets
-10.Update wxWidgets to 3.2.1
+10.Update wxWidgets to 3.2.2.1
 11.Don't create new file by double clicking file title tab
 12.Fix VS compiling issue(snprintf)
 13.Fix High DPI awareness issue

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,3 +1,19 @@
+madedit-mod (0.4.20-1) stable; urgency=low
+  1.Fix: JSON formatter convert Unicode chars to UTF8 chars #309
+  2.Fix global-buffer-overflow due EUCTW_TABLE_SIZE
+  3.Crashing sequence with nsSJISProber
+  4.Input size could not decrease the size of Input control
+  5.Fix compiling issue under wx 3.1.4
+  6.Fix bug that caused file type detect wrongly
+  7.Fix Linux build issue with wxWidgets < 3.1.1
+  8.Update Python to 2.7.18
+  9.Fix langurage ID of wxWidgets
+  10.Update wxWidgets to 3.2.2.1
+  11.Don't create new file by double clicking file title tab
+  12.Fix VS compiling issue(snprintf)
+  13.Fix High DPI awareness issue
+ -- Minggang Li <[email protected]>  Wed, 21 June 2023 17:35:45 +0800
+
 madedit-mod (0.4.19-1) stable; urgency=low
   1.Fix: Disable safe mode in PanChinese search
   2.Fix: String encoding bug in MadPython #304

diff --git a/packaging/debian/rules b/packaging/debian/rules
@@ -27,7 +27,7 @@ endif
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CXXFLAGS="$(CXXFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-boost=${HOME}/boost_1_71_0 --with-wxdir=${HOME}/wxWidgets-3.1.3
+	CXXFLAGS="$(CXXFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-boost=${HOME}/boost_1_82_0 --with-wxdir=${HOME}/wxWidgets-3.2.2.1
 
 
 build: build-stamp

diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	madedit-mod
-PORTVERSION=	0.4.17
+PORTVERSION=	0.4.20
 CATEGORIES=	editors
 MASTER_SITES=	https://sourceforge.net/projects/${PORTNAME}/files/${PORTVERSION}/
 DISTNAME=	MadEdit-Mod\ ${PORTVERSION}
@@ -16,7 +16,7 @@ USES=		gettext pkgconfig desktop-file-utils
 WANT_UNICODE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-boost=${HOME}/boost_1_70_0
+CONFIGURE_ARGS+=--with-boost=${HOME}/boost_1_82_0
 CONFIGURE_ENV+=	PKG_CONFIG="${PKG_CONFIG}" glib_gtk3_CFLAGS="${glib_gtk2_CFLAGS}" glib_gtk3_LIBS="${glib_gtk2_LIBS}"
 CXXFLAGS+=	${glib_gtk3_CFLAGS}
 CPPFLAGS+=	-I/usr/local/include

diff --git a/packaging/pacman/PKGBUILD b/packaging/pacman/PKGBUILD
@@ -5,8 +5,8 @@
 #   2) Extract('tar -xvf ...') the source code packages at your {HOME} or other(change the {HOME} in './configure ...')
 #   3) Run 'makepkg' under the directory of this file
 
-boost=${HOME}/boost_1_71_0
-wxWidgets=${HOME}/wxWidgets-3.1.3
+boost=${HOME}/boost_1_82_0
+wxWidgets=${HOME}/wxWidgets-3.2.2.1
 pkgname=madedit-mod
 pkgver=$MADEDIT_VERSION
 pkgrel=1
@@ -22,7 +22,7 @@ build() {
 
   sh ./autogen.sh
 
-  sh ./configure --prefix=/usr --with-boost=$boost  --with-wxdir=$wxWidgets --with-gtk=3
+  sh ./configure --prefix=/usr --with-boost=$boost --with-wxdir=$wxWidgets --with-gtk=3
   make
 }
 

diff --git a/packaging/rpm/madedit.spec._ b/packaging/rpm/madedit.spec._
@@ -38,7 +38,7 @@ sed -i 's/^dist_doc_DATA/#dist_doc_DATA/' \
 
 %build
 sh ./autogen.sh
-%configure --disable-dependency-tracking CFLAGS=-fPIC CPPFLAGS=-fPIC CXXFLAGS=-fPIC --with-boost=${HOME}/boost_1_71_0 --with-wxdir=${HOME}/wxWidgets-3.1.3
+%configure --disable-dependency-tracking CFLAGS=-fPIC CPPFLAGS=-fPIC CXXFLAGS=-fPIC --with-boost=${HOME}/boost_1_82_0 --with-wxdir=${HOME}/wxWidgets-3.2.2.1
 make -j4
 make loc
 strip -s ./madedit

diff --git a/packaging/rpm/static_spec.sed b/packaging/rpm/static_spec.sed
@@ -1,3 +1,3 @@
-/%configure/s##& --with-wx-config=${HOME}/wxWidgets-3.1.3/release/bin/wx-config LIBS="${HOME}/wxWidgets-3.1.3/release/lib/libwx_gtk2u_aui-3.1.a ${HOME}/wxWidgets-3.1.3/release/lib/libwx_gtk2u_core-3.1.a ${HOME}/wxWidgets-3.1.3/release/lib/libwx_baseu-3.1.a -lgtk-x11-2.0 -lgthread-2.0 -lX11" glib_gtk2_LIBS="-lm" WX_LIBS="-lm" --with-boost=${HOME}/boost_1_68_0#
-/^BuildRequires:/s#^.*$#BuildRequires: gtk2-devel >= 2.6.0#
-/^Requires:/s#^.*$#Requires: gtk2 >= 2.6.0#
+/%configure/s##& --with-wx-config=${HOME}/wxWidgets-3.2.2.1/release/bin/wx-config LIBS="${HOME}/wxWidgets-3.2.2.1/release/lib/libwx_gtk2u_aui-3.2.a ${HOME}/wxWidgets-3.2.2.1/lib/libwx_gtk3u_core-3.2.a ${HOME}/wxWidgets-3.2.2.1/lib/libwx_baseu-3.2.a -lgtk-x11-3.0 -lgthread-2.0 -lX11" glib_gtk3_LIBS="-lm" WX_LIBS="-lm" --with-boost=${HOME}/boost_1_82_0#
+/^BuildRequires:/s#^.*$#BuildRequires: gtk3-devel#
+/^Requires:/s#^.*$#Requires: gtk3#