commit mingw64-cross-cmake for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mingw64-cross-cmake for
openSUSE:Factory checked in at 2023-08-28 17:14:17
Comparing /work/SRC/openSUSE:Factory/mingw64-cross-cmake (Old)
and /work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.1766 (New)
Package is "mingw64-cross-cmake"
Mon Aug 28 17:14:17 2023 rev:6 rq:1106036 version:1.1.5
Changes:
--- /work/SRC/openSUSE:Factory/mingw64-cross-cmake/mingw64-cross-cmake.changes
2023-07-25 11:51:13.885497510 +0200
+++
/work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.1766/mingw64-cross-cmake.changes
2023-08-28 17:14:23.790886803 +0200
@@ -1,0 +2,9 @@
+Sat Aug 26 09:48:12 UTC 2023 - Ralf Habacker
+
+- Update to version 1.1.5
+ * Ignore the '--' parameter when calling the mingw64-cmake
+macro from the command line (boo#1214641).
+ * Add support for using '..' as source directory when calling
+the mingw64-cmake macro (boo#1214642)
+
+---
Other differences:
--
++ mingw64-cross-cmake.spec ++
--- /var/tmp/diff_new_pack.mJEerL/_old 2023-08-28 17:14:24.978929466 +0200
+++ /var/tmp/diff_new_pack.mJEerL/_new 2023-08-28 17:14:24.986929753 +0200
@@ -17,7 +17,7 @@
Name: mingw64-cross-cmake
-Version:1.1.4
+Version:1.1.5
Release:0
Summary:Cross build support for CMake
License:BSD-3-Clause
++ macros.mingw64-cmake ++
--- /var/tmp/diff_new_pack.mJEerL/_old 2023-08-28 17:14:25.018930902 +0200
+++ /var/tmp/diff_new_pack.mJEerL/_new 2023-08-28 17:14:25.022931046 +0200
@@ -23,10 +23,15 @@
%_mingw64_cmake %{_mingw64_env} ; \
opts="" \
while (( "$#" )); do \
-if test "$1" == "-S"; then \
+if test "$1" == "--"; then \
+shift \
+elif test "$1" == "-S"; then \
shift \
sdir=$1 \
shift \
+elif test "$1" == ".."; then \
+shift \
+sdir=$(pwd)/.. \
elif test "$1" == "-B"; then \
shift \
bdir=$1 \
commit mingw64-cross-cmake for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mingw64-cross-cmake for
openSUSE:Factory checked in at 2023-07-25 11:50:03
Comparing /work/SRC/openSUSE:Factory/mingw64-cross-cmake (Old)
and /work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.1467 (New)
Package is "mingw64-cross-cmake"
Tue Jul 25 11:50:03 2023 rev:5 rq:1099723 version:1.1.4
Changes:
--- /work/SRC/openSUSE:Factory/mingw64-cross-cmake/mingw64-cross-cmake.changes
2023-07-12 17:28:52.471135448 +0200
+++
/work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.1467/mingw64-cross-cmake.changes
2023-07-25 11:51:13.885497510 +0200
@@ -2 +2,8 @@
-Wed Jul 12 12:41:54 UTC 2023 - Imnotgivingmy nametoamachine
+Thu Jul 20 08:16:41 UTC 2023 - Ralf Habacker
+
+- Update to version 1.1.4
+ * Fix problem not adding version to mingw64(cmake:xxx) provides
+for Qt6 packages (boo#1213043)
+
+---
+Wed Jul 12 13:10:52 UTC 2023 - Imnotgivingmy nametoamachine
Other differences:
--
++ mingw64-cross-cmake.spec ++
--- /var/tmp/diff_new_pack.6f74cU/_old 2023-07-25 11:51:16.089510414 +0200
+++ /var/tmp/diff_new_pack.6f74cU/_new 2023-07-25 11:51:16.097510461 +0200
@@ -15,8 +15,9 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: mingw64-cross-cmake
-Version:1.1.3
+Version:1.1.4
Release:0
Summary:Cross build support for CMake
License:BSD-3-Clause
++ mingw64-cmake.prov ++
--- /var/tmp/diff_new_pack.6f74cU/_old 2023-07-25 11:51:16.149510765 +0200
+++ /var/tmp/diff_new_pack.6f74cU/_new 2023-07-25 11:51:16.153510789 +0200
@@ -57,11 +57,16 @@
return result
def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase):
-versionFile = ("%s/%s-config-version.cmake" if lowercase else
"%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)
+# Qt >= 6.2.2 defines 'PACKAGE_VERSION' in *ConfigVersionImpl.cmake
+versionFile = f"{modulePath}/{cmakeModule}ConfigVersionImpl.cmake" if
"Qt6" in f"{cmakeModule}" else ""
try:
f = open(versionFile, 'r')
except:
-return None
+versionFile = ("%s/%s-config-version.cmake" if lowercase else
"%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)
+try:
+f = open(versionFile, 'r')
+except:
+return None
for line in f:
line = line.strip()
commit mingw64-cross-cmake for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mingw64-cross-cmake for
openSUSE:Factory checked in at 2023-07-12 17:28:16
Comparing /work/SRC/openSUSE:Factory/mingw64-cross-cmake (Old)
and /work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.8922 (New)
Package is "mingw64-cross-cmake"
Wed Jul 12 17:28:16 2023 rev:4 rq:1098365 version:1.1.3
Changes:
--- /work/SRC/openSUSE:Factory/mingw64-cross-cmake/mingw64-cross-cmake.changes
2023-06-26 18:17:26.134828008 +0200
+++
/work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.8922/mingw64-cross-cmake.changes
2023-07-12 17:28:52.471135448 +0200
@@ -1,0 +2,8 @@
+Wed Jul 12 12:41:54 UTC 2023 - Imnotgivingmy nametoamachine
+
+- Update to version 1.1.3
+ * Fixed /usr/bin/mingw64-cmake link being broken in tumbleweed
+due to this distro using a different path for the libexec folder.
+(see https://bugzilla.opensuse.org/show_bug.cgi?id=1213235)
+
+---
Other differences:
--
++ mingw64-cross-cmake.spec ++
--- /var/tmp/diff_new_pack.DmXXrM/_old 2023-07-12 17:28:52.967138882 +0200
+++ /var/tmp/diff_new_pack.DmXXrM/_new 2023-07-12 17:28:52.971138909 +0200
@@ -16,7 +16,7 @@
#
Name: mingw64-cross-cmake
-Version:1.1.2
+Version:1.1.3
Release:0
Summary:Cross build support for CMake
License:BSD-3-Clause
@@ -53,7 +53,7 @@
mkdir -p %{buildroot}%{_rpmmacrodir}
cp %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.mingw64-cmake
mkdir -p %{buildroot}%{_bindir}
-ln -s ../lib/mingw64-scripts %{buildroot}%{_bindir}/mingw64-cmake
+ln -s %{_libexecdir}/mingw64-scripts %{buildroot}%{_bindir}/mingw64-cmake
# cmake support
install -m 0755 %{SOURCE2} %{buildroot}%{_rpmconfigdir}
commit mingw64-cross-cmake for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mingw64-cross-cmake for
openSUSE:Factory checked in at 2023-06-26 18:17:15
Comparing /work/SRC/openSUSE:Factory/mingw64-cross-cmake (Old)
and /work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.15902 (New)
Package is "mingw64-cross-cmake"
Mon Jun 26 18:17:15 2023 rev:3 rq:1095447 version:1.1.2
Changes:
--- /work/SRC/openSUSE:Factory/mingw64-cross-cmake/mingw64-cross-cmake.changes
2023-06-21 22:39:23.362201526 +0200
+++
/work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.15902/mingw64-cross-cmake.changes
2023-06-26 18:17:26.134828008 +0200
@@ -1,0 +2,8 @@
+Mon Jun 26 12:08:56 UTC 2023 - Ralf Habacker
+
+- Update to version 1.1.2
+ * Fixed problems with parsing arguments - it turned out that the
+previously used for loop did not work in some environments
+(see https://gitlab.freedesktop.org/dbus/dbus/-/issues/464).
+
+---
Other differences:
--
++ mingw64-cross-cmake.spec ++
--- /var/tmp/diff_new_pack.okOu05/_old 2023-06-26 18:17:26.762830798 +0200
+++ /var/tmp/diff_new_pack.okOu05/_new 2023-06-26 18:17:26.766830815 +0200
@@ -16,7 +16,7 @@
#
Name: mingw64-cross-cmake
-Version:1.1.1
+Version:1.1.2
Release:0
Summary:Cross build support for CMake
License:BSD-3-Clause
++ macros.mingw64-cmake ++
--- /var/tmp/diff_new_pack.okOu05/_old 2023-06-26 18:17:26.802830976 +0200
+++ /var/tmp/diff_new_pack.okOu05/_new 2023-06-26 18:17:26.802830976 +0200
@@ -22,17 +22,18 @@
#
%_mingw64_cmake %{_mingw64_env} ; \
opts="" \
-for i in "$@"; do \
-if test "$i" == "-S"; then \
+while (( "$#" )); do \
+if test "$1" == "-S"; then \
shift \
-sdir=$i \
+sdir=$1 \
shift \
-elif test "$i" == "-B"; then \
+elif test "$1" == "-B"; then \
shift \
-bdir=$i \
+bdir=$1 \
shift \
else \
-opts="$opts $i" \
+opts="$opts $1" \
+shift \
fi \
done \
if test -z "$bdir"; then \
commit mingw64-cross-cmake for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mingw64-cross-cmake for
openSUSE:Factory checked in at 2023-06-21 22:38:35
Comparing /work/SRC/openSUSE:Factory/mingw64-cross-cmake (Old)
and /work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.15902 (New)
Package is "mingw64-cross-cmake"
Wed Jun 21 22:38:35 2023 rev:2 rq:1093534 version:1.1.1
Changes:
--- /work/SRC/openSUSE:Factory/mingw64-cross-cmake/mingw64-cross-cmake.changes
2023-04-04 21:26:26.915246247 +0200
+++
/work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.15902/mingw64-cross-cmake.changes
2023-06-21 22:39:23.362201526 +0200
@@ -1,0 +2,18 @@
+Wed Jun 14 14:39:59 UTC 2023 - Ralf Habacker
+
+- Update to version 1.1.1
+ * The use of the parametric rpm macro was abandoned because it has
+too many limitations. With rpm >= 4.17 it would be possible to
+disable option processing (see
+https://rpm-software-management.github.io/rpm/manual/macros.html),
+but this is not possible with Leap, which uses rpm 4.14.
+
+---
+Mon Jun 12 10:00:25 UTC 2023 - Ralf Habacker
+
+- Update to version 1.1.0
+ * Add mingw64-cmake.lua as placeholder for future Lua functions
+ * %_mingw64_cmake: enabled support for selecting a custom build and
+ source directory by using the cmake options -S/-B (boo#1212238)
+
+---
New:
mingw64-cmake.lua
Other differences:
--
++ mingw64-cross-cmake.spec ++
--- /var/tmp/diff_new_pack.yXmL8J/_old 2023-06-21 22:39:24.406207810 +0200
+++ /var/tmp/diff_new_pack.yXmL8J/_new 2023-06-21 22:39:24.414207858 +0200
@@ -16,7 +16,7 @@
#
Name: mingw64-cross-cmake
-Version:1.0.0
+Version:1.1.1
Release:0
Summary:Cross build support for CMake
License:BSD-3-Clause
@@ -25,6 +25,7 @@
Source1:macros.mingw64-cmake
Source2:mingw64-cmake.prov
Source3:mingw64_cmake.attr
+Source4:mingw64-cmake.lua
BuildRequires: mingw64-filesystem
Requires: cmake >= 3.10
Requires: mingw64-filesystem
@@ -59,8 +60,13 @@
mkdir -p %{buildroot}%{_fileattrsdir}
install -m 0644 %{SOURCE3} %{buildroot}%{_fileattrsdir}
+# lua macros
+mkdir -p %{buildroot}%{_rpmluadir}
+install -m 0644 %{SOURCE4} %{buildroot}%{_rpmluadir}
+
%files
%defattr(-,root,root)
+%{_rpmluadir}
%{_rpmmacrodir}
%{_bindir}/mingw64-cmake
%{_rpmconfigdir}/mingw64-cmake.prov
++ macros.mingw64-cmake ++
--- /var/tmp/diff_new_pack.yXmL8J/_old 2023-06-21 22:39:24.450208074 +0200
+++ /var/tmp/diff_new_pack.yXmL8J/_new 2023-06-21 22:39:24.454208098 +0200
@@ -5,10 +5,45 @@
#
%__cmake_generator %{lua: if rpm.expand("%__builder") == rpm.expand("%__make")
then print("-G'Unix Makefiles'") else print("-GNinja") end}
+#
+# macro for configuring a cross build with cmake
+#
+# To override the builtin source and build path defaults
+#
+#source path: $(pwd)/%__srcdir
+#build path: $(pwd)/%__builddir
+#
+# add the following to the macro parameter list
+#
+# -S
+# -B
+#
+# for other options see cmake -h
+#
%_mingw64_cmake %{_mingw64_env} ; \
-mkdir -p %__builddir \
-cd %__builddir \
-%__cmake $OLDPWD/%__sourcedir \\\
+opts="" \
+for i in "$@"; do \
+if test "$i" == "-S"; then \
+shift \
+sdir=$i \
+shift \
+elif test "$i" == "-B"; then \
+shift \
+bdir=$i \
+shift \
+else \
+opts="$opts $i" \
+fi \
+done \
+if test -z "$bdir"; then \
+bdir=$(pwd)/%__builddir \
+fi \
+mkdir -p $bdir \
+cd $bdir \
+if test -z "$sdir"; then \
+sdir=$OLDPWD/%__sourcedir \
+fi \
+%__cmake -S $sdir -B $bdir $opts \\\
%__cmake_generator \\\
-DCMAKE_SYSTEM_NAME="Windows" \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
@@ -45,5 +80,4 @@
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %**
\
cd $OLDPWD
-(No newline at EOF)
++ mingw64-cmake.lua ++
-- placeholder for future addings
--
-- To use functions from this file in a rpm macro you can use
--
--rpm --define '%foo %{lua: require "mingw64-cmake"; myfunc() }' --eval
'%foo'
--
(No newline at EOF)
