[cygport - the Cygwin packaging tool] branch master, updated. 0.36.7-3-g69f28e5d

[Jon Turney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=69f28e5d408d2ca4d64517b0923c165dacbb03f9

commit 69f28e5d408d2ca4d64517b0923c165dacbb03f9
Author: Daisuke Fujimura <booleanlabel@gmail.com>
Date:   Sun Dec 17 10:19:17 2023 +0900

    cmake.cygclass: Add a src_test which invokes the cmake test driver
    
    See https://cygwin.com/pipermail/cygwin-apps/2023-October/043227.html
    
    > src_test is not redefined in cmake.cygclass (and ninja.cygclass) in cygport-0.36.3. Therefore, I defined src_test in json-c.cygport.
    >
    > - https://github.com/cygwin/cygport/blob/0.36.6/cygclass/cmake.cygclass
    > - https://github.com/cygwin/cygport/blob/0.36.6/cygclass/ninja.cygclass
    >
    > I agree that it would be preferable to have src_test defined in one of these cygclasses.
    
    The test is executed with or without CYGCMAKE_GENERATOR=Ninja.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=5e8d33461172f632c834652b79c8f4bc5e7a7bbf

commit 5e8d33461172f632c834652b79c8f4bc5e7a7bbf
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sat Sep 23 16:05:59 2023 +0200

    Switch to gpg2

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=d389eaa289464ae450fd7a6adb1cd0a7617680ff

commit d389eaa289464ae450fd7a6adb1cd0a7617680ff
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jan 14 23:18:37 2024 +0000

    testsuite: Fix pangomm1.4 build with latest pango
    
    This probably needs updating to the latest upstream version, but not
    today, so just apply a patch to make it build with latest pango.


Diff:
---
 cygclass/cmake.cygclass                            |  8 +++++
 lib/pkg_pkg.cygpart                                |  4 +--
 lib/src_prep.cygpart                               |  4 +--
 ...01-Don-t-include-individual-pango-headers.patch | 38 ++++++++++++++++++++++
 testsuite/autotools/gtkmm/pangomm1.4.cygport       |  2 ++
 5 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/cygclass/cmake.cygclass b/cygclass/cmake.cygclass
index cab75cf3..d2a7ef09 100644
--- a/cygclass/cmake.cygclass
+++ b/cygclass/cmake.cygclass
@@ -215,6 +215,14 @@ src_compile() {
 }
 #****
 
+#****o* cmake.cygclass/src_test (cmake)
+#  DEFINITION
+src_test() {
+	cd ${B}
+	ctest
+}
+#****
+
 #****o* cmake.cygclass/src_install (cmake)
 #  DEFINITION
 src_install() {
diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index 2a2bb663..c78b1c49 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -505,7 +505,7 @@ __gpg_sign() {
 	echo "${2} signature needs to be updated";
 	rm -f ${1}.sig;
 	# we 'check_prog gpg' in __pkg_srcpkg()
-	gpg --detach-sign ${1};
+	gpg2 --detach-sign ${1};
 }
 
 __squeeze_whitespace() {
@@ -563,7 +563,7 @@ __pkg_srcpkg() {
 
 	if __arg_bool SIG
 	then
-		if check_prog gpg
+		if check_prog gpg2
 		then
 			__gpg_sign ${spkgdir}/${cygportfile} "CYGPORT SCRIPT";
 
diff --git a/lib/src_prep.cygpart b/lib/src_prep.cygpart
index ea91508d..85bd25e8 100644
--- a/lib/src_prep.cygpart
+++ b/lib/src_prep.cygpart
@@ -181,7 +181,7 @@ __gpg_verify() {
 	local _filetype=${2};
 	local _sigext=${3:-sig};
 
-	if ! check_prog gpg
+	if ! check_prog gpg2
 	then
 		# display notice only once
 		if ! defined _gpg_not_found_
@@ -196,7 +196,7 @@ __gpg_verify() {
 	if [ -f ${_file}.${_sigext} ]
 	then
 		inform "${_filetype} signature follows:";
-		gpg --verify ${_file}.${_sigext} ${_file} || true;
+		gpg2 --verify ${_file}.${_sigext} ${_file} || true;
 	fi
 }
 
diff --git a/testsuite/autotools/gtkmm/0001-Don-t-include-individual-pango-headers.patch b/testsuite/autotools/gtkmm/0001-Don-t-include-individual-pango-headers.patch
new file mode 100644
index 00000000..f2c66e6a
--- /dev/null
+++ b/testsuite/autotools/gtkmm/0001-Don-t-include-individual-pango-headers.patch
@@ -0,0 +1,38 @@
+From f065a2967e22658565f4228b73b1511d291e343f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 25 Aug 2021 19:24:35 +0200
+Subject: [PATCH] Don't include individual pango headers
+
+As in every gnome library, you are only supposed
+to include the main pango.h header from the outside.
+
+This was causing build failures after some recent
+pango header rearrangements.
+---
+ pango/src/attributes.hg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pango/src/attributes.hg b/pango/src/attributes.hg
+index e234497..bd09f0f 100644
+--- a/pango/src/attributes.hg
++++ b/pango/src/attributes.hg
+@@ -21,7 +21,7 @@
+ #include <pangomm/rectangle.h>
+ #include <pangomm/color.h>
+ #include <pangomm/fontdescription.h>
+-#include <pango/pango-attributes.h>
++#include <pango/pango.h>
+ #include <glibmm/slisthandle.h>
+ 
+ _DEFS(pangomm,pango)
+--- a/pango/pangomm/attributes.h
++++ b/pango/pangomm/attributes.h
+@@ -29,7 +29,7 @@
+ #include <pangomm/rectangle.h>
+ #include <pangomm/color.h>
+ #include <pangomm/fontdescription.h>
+-#include <pango/pango-attributes.h>
++#include <pango/pango.h>
+ #include <glibmm/slisthandle.h>
+ 
+ 
diff --git a/testsuite/autotools/gtkmm/pangomm1.4.cygport b/testsuite/autotools/gtkmm/pangomm1.4.cygport
index 45cb7d2a..d8f4e0e6 100644
--- a/testsuite/autotools/gtkmm/pangomm1.4.cygport
+++ b/testsuite/autotools/gtkmm/pangomm1.4.cygport
@@ -14,3 +14,5 @@ PKG_NAMES="lib${NAME}_1 lib${NAME}-devel lib${NAME}-doc"
 libpangomm1_4_1_CONTENTS="usr/bin/*mm-1.4-1.dll usr/share/doc/${NAME}/"
 libpangomm1_4_devel_CONTENTS="usr/include/ usr/lib/"
 libpangomm1_4_doc_CONTENTS='usr/share/devhelp/ usr/share/doc/pangomm-1.4/'
+
+PATCH_URI="0001-Don-t-include-individual-pango-headers.patch"