[rpms/mingw-glibmm24] rawhide: Patch more build scripts for DESTDIR handling

[rpms/mingw-glibmm24] rawhide: Patch more build scripts for DESTDIR handling

[Sandro Mani]

A new commit has been pushed.

Repo   : rpms/mingw-glibmm24
Branch : rawhide
Commit : 63ca2faacb4b1dd36a730dd98f5ebd2daa583764
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-06-29T08:18:37+02:00
Stats  : +43/-15 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/mingw-glibmm24/c/63ca2faacb4b1dd36a730dd98f5ebd2daa583764?branch=rawhide

Log:
Patch more build scripts for DESTDIR handling

---
diff --git a/glibmm_generate-binding.patch b/glibmm_generate-binding.patch
deleted file mode 100644
index 2486c21..0000000
--- a/glibmm_generate-binding.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rupN --no-dereference glibmm-2.66.9/untracked/build_scripts/generate-binding.py glibmm-2.66.9-new/untracked/build_scripts/generate-binding.py
---- glibmm-2.66.9/untracked/build_scripts/generate-binding.py	2026-06-28 13:58:51.785579700 +0200
-+++ glibmm-2.66.9-new/untracked/build_scripts/generate-binding.py	2026-06-28 23:07:27.461020052 +0200
-@@ -91,7 +91,8 @@ def install_built_h_files():
-   # <built_h_dir> is an absolute path in the build directory or source directory.
-   # <install_subdir> is an installation directory, relative to {prefix}.
-   built_h_dir = sys.argv[2]
--  install_dir = os.path.join(os.getenv('MESON_INSTALL_DESTDIR_PREFIX'), sys.argv[3])
-+  buildroot = os.getenv('MESON_INSTALL_DESTDIR_PREFIX', "").removesuffix(os.getenv('MESON_INSTALL_PREFIX', ''))
-+  install_dir = buildroot + sys.argv[3]
- 
-   # Create the installation directory, if it does not exist.
-   os.makedirs(os.path.join(install_dir, 'private'), exist_ok=True)

diff --git a/glibmm_scripts-buildroot.patch b/glibmm_scripts-buildroot.patch
new file mode 100644
index 0000000..06d4cf0
--- /dev/null
+++ b/glibmm_scripts-buildroot.patch
@@ -0,0 +1,41 @@
+diff -rupN --no-dereference glibmm-2.66.9/untracked/build_scripts/generate-binding.py glibmm-2.66.9-new/untracked/build_scripts/generate-binding.py
+--- glibmm-2.66.9/untracked/build_scripts/generate-binding.py	2026-06-28 13:58:51.785579700 +0200
++++ glibmm-2.66.9-new/untracked/build_scripts/generate-binding.py	2026-06-29 08:02:54.534505066 +0200
+@@ -91,7 +91,8 @@ def install_built_h_files():
+   # <built_h_dir> is an absolute path in the build directory or source directory.
+   # <install_subdir> is an installation directory, relative to {prefix}.
+   built_h_dir = sys.argv[2]
+-  install_dir = os.path.join(os.getenv('MESON_INSTALL_DESTDIR_PREFIX'), sys.argv[3])
++  buildroot = os.getenv('MESON_INSTALL_DESTDIR_PREFIX', "").removesuffix(os.getenv('MESON_INSTALL_PREFIX', ''))
++  install_dir = buildroot + sys.argv[3]
+ 
+   # Create the installation directory, if it does not exist.
+   os.makedirs(os.path.join(install_dir, 'private'), exist_ok=True)
+diff -rupN glibmm-2.66.9/tools/build_scripts/handle-built-files.py glibmm-2.66.9-new/tools/build_scripts/handle-built-files.py
+--- glibmm-2.66.9/tools/build_scripts/handle-built-files.py	2026-06-28 13:00:16.000000000 +0200
++++ glibmm-2.66.9-new/tools/build_scripts/handle-built-files.py	2026-06-29 08:04:06.339325808 +0200
+@@ -94,7 +94,8 @@ def install_built_h_files():
+   # <built_h_dir> is an absolute path in the build directory or source directory.
+   # <install_subdir> is an installation directory, relative to {prefix}.
+   built_h_dir = sys.argv[2]
+-  install_dir_root = os.path.join(os.getenv('MESON_INSTALL_DESTDIR_PREFIX'), sys.argv[3])
++  buildroot = os.getenv('MESON_INSTALL_DESTDIR_PREFIX', "").removesuffix(os.getenv('MESON_INSTALL_PREFIX', ''))
++  install_dir_root = buildroot + sys.argv[3]
+ 
+   quiet = bool(os.getenv('MESON_INSTALL_QUIET'))
+   for file in sys.argv[4:]:
+diff -rupN glibmm-2.66.9/untracked/build_scripts/doc-reference.py glibmm-2.66.9-new/untracked/build_scripts/doc-reference.py
+--- glibmm-2.66.9/untracked/build_scripts/doc-reference.py	2026-06-28 13:58:51.785332000 +0200
++++ glibmm-2.66.9-new/untracked/build_scripts/doc-reference.py	2026-06-29 08:05:02.751983624 +0200
+@@ -89,8 +89,9 @@ def install_doc():
+   # <devhelpfile> is a relative or absolute path in the build directory.
+   # <htmlrefdir> and <devhelpdir> are installation directories, relative to {prefix}.
+   devhelpfile = sys.argv[3]
+-  destdir_devhelpdir = os.path.join(os.getenv('MESON_INSTALL_DESTDIR_PREFIX'), sys.argv[4])
+-  destdir_htmlrefdir = os.path.join(os.getenv('MESON_INSTALL_DESTDIR_PREFIX'), sys.argv[5])
++  buildroot = os.getenv('MESON_INSTALL_DESTDIR_PREFIX', "").removesuffix(os.getenv('MESON_INSTALL_PREFIX', ''))
++  destdir_devhelpdir = buildroot + sys.argv[4]
++  destdir_htmlrefdir = buildroot + sys.argv[5]
+   prefix_htmlrefdir = os.path.join(os.getenv('MESON_INSTALL_PREFIX'), sys.argv[5])
+   build_dir = os.path.dirname(devhelpfile)
+ 

diff --git a/mingw-glibmm24.spec b/mingw-glibmm24.spec
index d2495fb..a680020 100644
--- a/mingw-glibmm24.spec
+++ b/mingw-glibmm24.spec
@@ -13,8 +13,8 @@ URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz
 # Export Glib::Threads::wrap symbols (#2017676)
 Patch0:         glibmm_export-symbols.patch
-# Fix DESTDIR handling by generate-binding.py
-Patch1:         glibmm_generate-binding.patch
+# Fix DESTDIR handling in install scripts
+Patch1:         glibmm_scripts-buildroot.patch
 
 BuildArch:      noarch