From 1186e8c1a4d96b8f11ef864de9adeb3473f1a43565e06035e3ba25755e67ef9d Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 26 Oct 2021 14:36:28 +0000
Subject: [PATCH 1/2] - Update required cmake version

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=73
---
 gammaray.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gammaray.spec b/gammaray.spec
index cc261dc..4ba91d8 100644
--- a/gammaray.spec
+++ b/gammaray.spec
@@ -32,7 +32,7 @@ Source:         https://github.com/KDAB/GammaRay/releases/download/v%{version}/%
 Patch0:         Fix_icons_installation.patch
 # PATCH-FIX-UPSTREAM
 BuildRequires:  binutils-devel
-BuildRequires:  cmake >= 3.1
+BuildRequires:  cmake >= 3.4
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz-gnome

From c31a52138cb41d464165dea7ed8e53ad6e1a2f0850c30e23b0d18ca51a1dbbc3 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Tue, 28 Dec 2021 14:09:35 +0000
Subject: [PATCH 2/2] Accepting request 942943 from
 home:Vogtinator:branches:KDE:Extra

- Drop Fix_icons_installation.patch and package scaled icons

OBS-URL: https://build.opensuse.org/request/show/942943
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=74
---
 Fix_icons_installation.patch | 33 ---------------------------------
 gammaray.changes             |  5 +++++
 gammaray.spec                |  8 +++-----
 3 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 Fix_icons_installation.patch

diff --git a/Fix_icons_installation.patch b/Fix_icons_installation.patch
deleted file mode 100644
index f29949f..0000000
--- a/Fix_icons_installation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: gammaray-2.9.0/ui/resources/CMakeLists.txt
-===================================================================
---- gammaray-2.9.0.orig/ui/resources/CMakeLists.txt
-+++ gammaray-2.9.0/ui/resources/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # See https://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
- if(UNIX AND NOT APPLE AND GAMMARAY_BUILD_UI)
-   foreach(size 16 24 32 48 64 128 256 512)
--    foreach(scale 1 2 3)
-+    #foreach(scale 1 2 3)
-       set(scaled_size ${size}x${size})
-       set(source gammaray/GammaRay-${scaled_size}.png)
- 
--      if(${scale} GREATER 1)
--        set(scaled_size ${size}x${size}@${scale})
--        set(source gammaray/GammaRay-${scaled_size}x.png)
--      endif()
-+      #if(${scale} GREATER 1)
-+      #  set(scaled_size ${size}x${size}@${scale})
-+      #  set(source gammaray/GammaRay-${scaled_size}x.png)
-+      #endif()
- 
-       if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${source})
-         install(
-@@ -16,7 +16,7 @@ if(UNIX AND NOT APPLE AND GAMMARAY_BUILD
-           DESTINATION "${ICON_INSTALL_DIR}/hicolor/${scaled_size}/apps" RENAME GammaRay.png
-         )
-       endif()
--    endforeach()
-+    #endforeach()
-   endforeach()
- endif()
- 
diff --git a/gammaray.changes b/gammaray.changes
index ce6a016..f527274 100644
--- a/gammaray.changes
+++ b/gammaray.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 28 12:52:59 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Drop Fix_icons_installation.patch and package scaled icons
+
 -------------------------------------------------------------------
 Wed Oct 20 18:24:58 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/gammaray.spec b/gammaray.spec
index 4ba91d8..c223e69 100644
--- a/gammaray.spec
+++ b/gammaray.spec
@@ -28,9 +28,6 @@ License:        GPL-2.0-or-later
 Group:          Development/Tools/Debuggers
 URL:            https://www.kdab.com/gammaray
 Source:         https://github.com/KDAB/GammaRay/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM Fix_icons_installation.patch -- Don't try to install multiple copies in exotic subdirs
-Patch0:         Fix_icons_installation.patch
-# PATCH-FIX-UPSTREAM
 BuildRequires:  binutils-devel
 BuildRequires:  cmake >= 3.4
 BuildRequires:  doxygen
@@ -125,10 +122,11 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}
 %files
 %license LICENSE.*
 %doc CHANGES README.txt
-%dir %{_datadir}/icons/hicolor/512x512/
-%dir %{_datadir}/icons/hicolor/512x512/apps/
 %{_bindir}/gammaray
 %{_datadir}/applications/GammaRay.desktop
+# scaled directories are not owned by hicolor
+%dir %{_datadir}/icons/hicolor/*@*/
+%dir %{_datadir}/icons/hicolor/*@*/apps/
 %{_datadir}/icons/hicolor/*/apps/GammaRay.png
 %{_docdir}/%{name}/
 %{_libdir}/gammaray/