From 11f0f87e2502d02959bf3b9ee93cbd854cd63e5e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 21 Jul 2022 10:46:03 +0100
Subject: [PATCH] Rebase to Fedora Rawhide

  resolves: rhbz#2080168
---
 macros.mingw32          | 1 -
 macros.mingw64          | 1 -
 mingw-filesystem.spec   | 6 +++++-
 toolchain-mingw32.cmake | 3 ++-
 toolchain-mingw32.meson | 1 +
 toolchain-mingw64.cmake | 3 ++-
 toolchain-mingw64.meson | 1 +
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 647d868..6caf0a2 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -138,7 +138,6 @@
         -DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW32_CMAKE_ARGS} \\\
         "$@" $__mingw32_topdir
diff --git a/macros.mingw64 b/macros.mingw64
index cecbc56..bf28141 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -138,7 +138,6 @@
         -DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW64_CMAKE_ARGS} \\\
         "$@" $__mingw64_topdir
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 5a20c68..58a7266 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        136
+Version:        139
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -363,6 +363,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Jul 21 2022 Richard W.M. Jones <rjones@redhat.com> - 139-1
+- Rebase to Fedora Rawhide
+  resolves: rhbz#2080168
+
 * Fri May 06 2022 Richard W.M. Jones <rjones@redhat.com> - 136-1
 - Rebase to Fedora Rawhide
   resolves: rhbz#2080168
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 36297b5..a450d39 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -17,9 +17,10 @@ SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw)
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
+# for libraries, headers and packages in the target directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
 # Make sure Qt can be detected by CMake
 SET(QT_BINARY_DIR /usr/i686-w64-mingw32/bin /usr/bin)
diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index 99fe91a..563565c 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -10,6 +10,7 @@ strip = '/usr/bin/i686-w64-mingw32-strip'
 windres = '/usr/bin/i686-w64-mingw32-windres'
 dlltool = '/usr/bin/i686-w64-mingw32-dlltool'
 libgcrypt-config = '/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
+glib-mkenums = '/usr/i686-w64-mingw32/sys-root/mingw/bin/glib-mkenums'
 
 [properties]
 root = '/usr/i686-w64-mingw32/sys-root/mingw'
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
index 39b0d65..a1e278f 100644
--- a/toolchain-mingw64.cmake
+++ b/toolchain-mingw64.cmake
@@ -17,9 +17,10 @@ SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32/sys-root/mingw)
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
+# for libraries, headers and packages in the target directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
 # Make sure Qt can be detected by CMake
 SET(QT_BINARY_DIR /usr/x86_64-w64-mingw32/bin /usr/bin)
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 2f633aa..01d83ee 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -10,6 +10,7 @@ strip = '/usr/bin/x86_64-w64-mingw32-strip'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
 dlltool = '/usr/bin/x86_64-w64-mingw32-dlltool'
 libgcrypt-config = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
+glib-mkenums = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/glib-mkenums'
 
 [properties]
 root = '/usr/x86_64-w64-mingw32/sys-root/mingw'