Accepting request 942949 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/942949
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gammaray?expand=0&rev=21

Fix_icons_installation.patch

@@ -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()
- 

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>
 

gammaray.spec

@@ -28,11 +28,8 @@ 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.1
+BuildRequires:  cmake >= 3.4
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz-gnome
@@ -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/