public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mingw-pangomm] rawhide: Add pangomm_scripts-buildroot.patch
@ 2026-08-09 19:36 Sandro Mani
  0 siblings, 0 replies; only message in thread
From: Sandro Mani @ 2026-08-09 19:36 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/mingw-pangomm
Branch : rawhide
Commit : c745ec3f83c2346b4b6a332cf3b7250e344a8c59
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-08-09T21:36:00+02:00
Stats  : +31/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/mingw-pangomm/c/c745ec3f83c2346b4b6a332cf3b7250e344a8c59?branch=rawhide

Log:
Add pangomm_scripts-buildroot.patch

---
diff --git a/mingw-pangomm.spec b/mingw-pangomm.spec
index 826211a..e972ab7 100644
--- a/mingw-pangomm.spec
+++ b/mingw-pangomm.spec
@@ -11,9 +11,10 @@ Summary:        MinGW Windows C++ interface for Pango
 
 License:        LGPL-2.0-or-later
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/%{release_version}/pangomm-%{version}.tar.xz
-
 BuildArch:      noarch
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/pangomm/%{release_version}/pangomm-%{version}.tar.xz
+# Fix DESTDIR handling in install scripts
+Patch0:         pangomm_scripts-buildroot.patch
 
 BuildRequires:  meson
 

diff --git a/pangomm_scripts-buildroot.patch b/pangomm_scripts-buildroot.patch
new file mode 100644
index 0000000..7769d7a
--- /dev/null
+++ b/pangomm_scripts-buildroot.patch
@@ -0,0 +1,28 @@
+diff -rupN --no-dereference pangomm-2.46.5/untracked/build_scripts/doc-reference.py pangomm-2.46.5-new/untracked/build_scripts/doc-reference.py
+--- pangomm-2.46.5/untracked/build_scripts/doc-reference.py	2026-06-25 14:58:51.556067500 +0200
++++ pangomm-2.46.5-new/untracked/build_scripts/doc-reference.py	2026-08-09 21:30:33.711535855 +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 -rupN --no-dereference pangomm-2.46.5/untracked/build_scripts/generate-binding.py pangomm-2.46.5-new/untracked/build_scripts/generate-binding.py
+--- pangomm-2.46.5/untracked/build_scripts/generate-binding.py	2026-06-25 14:58:51.556329000 +0200
++++ pangomm-2.46.5-new/untracked/build_scripts/generate-binding.py	2026-08-09 21:30:33.711183576 +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)

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-09 19:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-09 19:36 [rpms/mingw-pangomm] rawhide: Add pangomm_scripts-buildroot.patch Sandro Mani

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox