From 2df6d1c24acfbed5a37166bc4bb9e030ae9e77b1 Mon Sep 17 00:00:00 2001
From: alarrosa <>
Date: Mar 06 2023 02:52:07 +0000
Subject: Update adwaita-qt to version 1.4.2 / rev 16 via SR 1068723


https://build.opensuse.org/request/show/1068723
by user alarrosa + dimstar_suse

---

diff --git a/.files b/.files
index fb4e1d9..63c2666 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 9f34fae..9d8f6cc 100644
--- a/.rev
+++ b/.rev
@@ -153,4 +153,20 @@
     <comment></comment>
     <requestid>1006648</requestid>
   </revision>
+  <revision rev="15" vrev="2">
+    <srcmd5>cd558b369d504bda180f6ee2f516134e</srcmd5>
+    <version>1.4.2</version>
+    <time>1677794557</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>1068632</requestid>
+  </revision>
+  <revision rev="16" vrev="3">
+    <srcmd5>18aa0dec47981696ca32aa65aa567c09</srcmd5>
+    <version>1.4.2</version>
+    <time>1677794674</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>1068723</requestid>
+  </revision>
 </revisionlist>
diff --git a/adwaita-qt.changes b/adwaita-qt.changes
index 367e289..31b8020 100644
--- a/adwaita-qt.changes
+++ b/adwaita-qt.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Mar  2 12:59:52 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
+
+- Use the qt6 %cmake macros when building the qt6 flavor which
+  uses the right compiler in SLE/Leap instead of gcc7 (which fails
+  to build since it doesn't support C++17 headers used by Qt6).
+
+-------------------------------------------------------------------
 Tue Sep 27 00:59:08 UTC 2022 - Luciano Santos <luc14n0@opensuse.org>
 
 - Update to version 1.4.2:
@@ -114,6 +121,8 @@ Mon Feb  3 13:22:05 UTC 2020 - Stasiek Michalski <stasiek@michalski.cc>
 
 - Update to 1.1.1
   * Stability fixes
+- Remove patch:
+  * adwaita-qt-upstream-fixes.patch
 
 -------------------------------------------------------------------
 Fri Oct  4 19:36:05 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index ed64040..cdf82c2 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2015 Bjørn Lie, Bryne, Norway.
 #
 # All modifications and additions to the file contributed by third parties
@@ -135,18 +135,30 @@ developing applications that use libadwaita-%{flavor}-%{sover}.
 %autosetup -p1 -n adwaita-qt-%{version}
 
 %build
-%cmake \
+
 %if 0%{?qt5}
+%cmake \
   -DUSE_QT6=false \
 %endif
 %if 0%{?qt6}
+%cmake_qt6 \
   -DUSE_QT6=true \
 %endif
 
+%if 0%{?qt6}
+%{qt6_build}
+%else
 %cmake_build
+%endif
 
 %install
+
+%if 0%{?qt6}
+%{qt6_install}
+%else
 %cmake_install
+%endif
+
 # qt6 does not have a pc file, so the generated pc we have is invalid, nuke it.
 rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc