From ee754a3fb2f1655eb7826bd6c62c61b3cb4c3ba8 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Sat, 7 Nov 2020 22:25:32 +0100 Subject: [PATCH 1/4] Version bump for 1.37.1 --- NEWS | 3 +++ configure.ac | 2 +- doc/geany.txt | 2 +- geany.exe.manifest | 2 +- geany_private.rc | 4 ++-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 5f57138b8..8ce3cf958 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Geany 1.37.1 (unreleased) + + Geany 1.37 (October 25, 2020) General diff --git a/configure.ac b/configure.ac index 22a0a92e6..0ee15dfa7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.37], +AC_INIT([Geany], [1.37.1], [https://github.com/geany/geany/issues]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/doc/geany.txt b/doc/geany.txt index aee926cc0..396e8f817 100644 --- a/doc/geany.txt +++ b/doc/geany.txt @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.37 +.. |(version)| replace:: 1.37.1 .. -*- reStructuredText -*- ======= diff --git a/geany.exe.manifest b/geany.exe.manifest index 0f74d6e8b..395af9ed5 100644 --- a/geany.exe.manifest +++ b/geany.exe.manifest @@ -1,7 +1,7 @@ diff --git a/geany_private.rc b/geany_private.rc index 197aa1ba0..112e6f805 100644 --- a/geany_private.rc +++ b/geany_private.rc @@ -1,8 +1,8 @@ #include // include for version info constants -#define VER_FILEVERSION 1,37,0,0 -#define VER_FILEVERSION_STR "1.37" +#define VER_FILEVERSION 1,37,1,0 +#define VER_FILEVERSION_STR "1.37.1" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icons/geany.ico" From 847a758c054dd1006e53fe2cfbf4c6c5a720d9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 7 Nov 2020 12:42:16 +0100 Subject: [PATCH 2/4] Fix wrong format specifier in debug message This led to crashes on Windows when starting without an existing configuration file. Closes #2639. --- src/libmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libmain.c b/src/libmain.c index 57476d754..f1fdb41ef 100644 --- a/src/libmain.c +++ b/src/libmain.c @@ -406,7 +406,7 @@ static gint get_windows_socket_port(void) if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR)) { geany_debug( - "No user config file found, use default TCP port (%s).", + "No user config file found, use default TCP port (%d).", SOCKET_WINDOWS_REMOTE_CMD_PORT); g_free(configfile); return SOCKET_WINDOWS_REMOTE_CMD_PORT; From 5807af0f36f670fe1db3c3997d541f792ddd565a Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Sat, 7 Nov 2020 22:30:56 +0100 Subject: [PATCH 3/4] Update NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 8ce3cf958..e7354a8b8 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ Geany 1.37.1 (unreleased) + Windows + * Fix crash on first startup (Issue#2639, PR#2645). + Geany 1.37 (October 25, 2020) From 26f4813f0fad0c377c4698e28b0912afac7950a8 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Sun, 8 Nov 2020 18:14:11 +0100 Subject: [PATCH 4/4] Set release date --- NEWS | 2 +- doc/geany.1.in | 2 +- doc/geany.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index e7354a8b8..d1df48d7b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Geany 1.37.1 (unreleased) +Geany 1.37.1 (November 08, 2020) Windows * Fix crash on first startup (Issue#2639, PR#2645). diff --git a/doc/geany.1.in b/doc/geany.1.in index 6a94bfc8d..3c1c85621 100644 --- a/doc/geany.1.in +++ b/doc/geany.1.in @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "October 25, 2020" "geany @VERSION@" "" +.TH "GEANY" "1" "November 08, 2020" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" diff --git a/doc/geany.txt b/doc/geany.txt index 396e8f817..5e2872241 100644 --- a/doc/geany.txt +++ b/doc/geany.txt @@ -14,7 +14,7 @@ Frank Lanitz, Colomban Wendling, Matthew Brush -:Date: 2020-10-25 +:Date: 2020-11-08 :Version: |(version)| Copyright © 2005 The Geany contributors