gnucash maint: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Sat Feb 1 12:53:15 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/34609184 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ec7e6c37 (commit)
	from  https://github.com/Gnucash/gnucash/commit/2adaf692 (commit)



commit 3460918492c9303accc7786759ddc4b60d95e71c
Merge: 2adaf692b ec7e6c37d
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Feb 1 18:49:23 2020 +0100

    Merge PR #639


commit ec7e6c37d129ca71acdd225d9f3163c06f750740
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Jan 29 05:44:42 2020 +0100

    Add a warning for gettext < 0.20
    
    They do not recognize <developer_name>GnuCash Project</developer_name>
    in gnucash.appdata (https://savannah.gnu.org/bugs/?50408)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 110315aef..e1ca611a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,11 +272,12 @@ find_library (REGEX_LIBRARY NAMES regex)
 if (ALLOW_OLD_GETTEXT)
     find_package (Gettext REQUIRED)
 else (ALLOW_OLD_GETTEXT)
-    find_package (Gettext 0.19.6)
+    find_package (Gettext 0.20)
     if (NOT GETTEXT_FOUND)
         message (FATAL_ERROR "Note the build can be configured with an older version of gettext by setting ALLOW_OLD_GETTEXT=ON but then some files will not be translated:
         - gnucash.desktop (requires at least gettext 0.19)
-        - gnucash.appdata.xml (requires at least gettext 0.19.6)")
+        - gnucash.appdata.xml (requires at least gettext 0.19.6)
+        - tag developer_name from gnucash.appdata.xml (requires at least gettext 0.20)")
     endif (NOT GETTEXT_FOUND)
 endif (ALLOW_OLD_GETTEXT)
 
@@ -286,6 +287,9 @@ endif ()
 if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
     message (WARNING "Got gettext version ${GETTEXT_VERSION_STRING}, however you need at least gettext version 0.19.6 in order to handle translation of the gnucash.appdata file. The build will be configured with an untranslated gnucash.appdata file.")
 endif ()
+if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.20)
+    message (WARNING "Got gettext version ${GETTEXT_VERSION_STRING}, however you need at least gettext version 0.20 in order to handle the translation of 'GnuCash Project' from the gnucash.appdata file. That message will be missing in gnucash.pot.")
+endif ()
 
 find_path (LIBINTL_INCLUDE_PATH NAMES libintl.h
 		  PATHS /usr/include /opt/gnome/include)
diff --git a/README.dependencies b/README.dependencies
index 0322aad6a..d3dce1198 100644
--- a/README.dependencies
+++ b/README.dependencies
@@ -63,7 +63,7 @@ Libraries/Deps
   guile			2.2.0 or 2.0.0		Must be built with regex
                                                 support enabled
   libxml2		2.5.10
-  gettext               0.19.6                  Can use older if you pass
+  gettext               0.20                    Can use older if you pass
                                                 -DALLOW_OLD_GETTEXT to cmake;
                                                 doesn't include all file types
                                                 when building gnucash.pot.



Summary of changes:
 CMakeLists.txt      | 8 ++++++--
 README.dependencies | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)



More information about the gnucash-changes mailing list