From 5fbf372a8511b8cca83e142fdad56659915edcbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Wed, 8 May 2024 18:43:43 +0200 Subject: [PATCH 1/2] Revert to 32bit GNU gettext 0.22.3 on Windows The dependency was accidentally bumped to a version that switched to 64bit binaries built against UCRT. This is incompatible with Poedit 3.4 compatibility with 32bit Windows 7. This partially reverts commit 512418fac73bf8db345eada56626e677a6852b4c. --- Poedit.vcxproj | 4 ++-- packages.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Poedit.vcxproj b/Poedit.vcxproj index e034a43e1b..ad855bc395 100644 --- a/Poedit.vcxproj +++ b/Poedit.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -355,6 +355,6 @@ - + \ No newline at end of file diff --git a/packages.config b/packages.config index 2c35a85fed..f51d96f1d4 100644 --- a/packages.config +++ b/packages.config @@ -1,6 +1,6 @@  - + From 6d98a1ba8873cfd9e57765684102c2663e3c78a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Thu, 9 May 2024 16:49:19 +0200 Subject: [PATCH 2/2] Increase version to 3.4.4, update NEWS --- NEWS | 6 ++++++ Poedit.xcodeproj/project.pbxproj | 4 ++-- configure.ac | 2 +- snap/snapcraft.yaml | 2 +- src/version.h | 4 ++-- win32/poedit.iss | 2 +- win32/version.props | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 699e63f445..8f2de285b1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +Version 3.4.4 +------------- + +- [Windows] Revert back to 32bit GNU gettext bundled binaries. + + Version 3.4.3 ------------- diff --git a/Poedit.xcodeproj/project.pbxproj b/Poedit.xcodeproj/project.pbxproj index 3bb0f5ed53..cf39dcf38d 100644 --- a/Poedit.xcodeproj/project.pbxproj +++ b/Poedit.xcodeproj/project.pbxproj @@ -1867,7 +1867,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; POEDIT_FEATURES = ""; - POEDIT_VERSION = 3.4.3; + POEDIT_VERSION = 3.4.4; SDKROOT = macosx; WX_DEFINES = "__WXOSX_COCOA__ __WX__ __WXMAC_XCODE__=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1"; }; @@ -1939,7 +1939,7 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.14; POEDIT_FEATURES = ""; - POEDIT_VERSION = 3.4.3; + POEDIT_VERSION = 3.4.4; SDKROOT = macosx; WX_DEFINES = "__WXOSX_COCOA__ __WX__ __WXMAC_XCODE__=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1"; }; diff --git a/configure.ac b/configure.ac index 1acc38f761..34109fa5e2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT([poedit], [3.4.3], [help@poedit.net]) +AC_INIT([poedit], [3.4.4], [help@poedit.net]) AC_CONFIG_AUX_DIR([admin]) AC_CONFIG_MACRO_DIR([admin]) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0b884db466..962f54b6f9 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: poedit -version: "3.4.3" +version: "3.4.4" title: Poedit summary: Simple translation editor description: > diff --git a/src/version.h b/src/version.h index fc7820d1f1..19ce7e708f 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #ifndef Poedit_version_h #define Poedit_version_h -#define POEDIT_VERSION "3.4.3" -#define POEDIT_VERSION_WIN 3,4,3 +#define POEDIT_VERSION "3.4.4" +#define POEDIT_VERSION_WIN 3,4,4 #endif // Poedit_version_h diff --git a/win32/poedit.iss b/win32/poedit.iss index 0da21d9ef1..bf87d7cf3d 100644 --- a/win32/poedit.iss +++ b/win32/poedit.iss @@ -30,7 +30,7 @@ #include "../" + CONFIG + "/git_build_number.h" -#define VERSION "3.4.3" +#define VERSION "3.4.4" #define VERSION_WIN VERSION + "." + Str(POEDIT_GIT_BUILD_NUMBER) #ifndef CRT_REDIST diff --git a/win32/version.props b/win32/version.props index e476bca80f..92548ee159 100644 --- a/win32/version.props +++ b/win32/version.props @@ -1,6 +1,6 @@ - 3.4.3 + 3.4.4