[packages/cairo-dock] - removing old patches, BRs

[mrozowik]

commit 419d9e1472407e24c8eff1591e64b6f5a1d714a3
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Sat Jul 26 07:41:31 2025 +0000

    - removing old patches, BRs

 cairo-dock-desktop.patch      | 22 ----------------------
 cairo-dock-format.patch       | 11 -----------
 cairo-dock-install-dirs.patch | 26 ++++++++++++++++++++++++++
 cairo-dock.spec               |  9 +++++----
 4 files changed, 31 insertions(+), 37 deletions(-)
---
diff --git a/cairo-dock.spec b/cairo-dock.spec
index e794eee..48f324b 100644
--- a/cairo-dock.spec
+++ b/cairo-dock.spec
@@ -9,9 +9,8 @@ Group:		Applications
 #Source0:	https://github.com/Cairo-Dock/cairo-dock-core/archive/2.2.0-4/cairo-dock-core-2.2.0-4.tar.gz
 Source0:	https://github.com/Cairo-Dock/cairo-dock-core/archive/refs/tags/%{version}.tar.gz
 # Source0-md5:	1d3f517e38cf565afd45c496e2ebd808
-Patch0:		install_dirs.patch
-Patch1:		%{name}-format.patch
-URL:		http://glx-dock.org/
+Patch0:		%{name}-install-dirs.patch
+URL:		https://glx-dock.org/
 BuildRequires:	cairo-devel
 BuildRequires:	cmake >= 2.6
 BuildRequires:	curl-devel
@@ -26,8 +25,10 @@ BuildRequires:	librsvg-devel >= 2.0
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	wayland-devel >= 1.0.0
 BuildRequires:	xorg-lib-libXcomposite-devel
 BuildRequires:	xorg-lib-libXinerama-devel
+BuildRequires:	xorg-lib-libXrandr-devel >= 1.3
 BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,7 +66,7 @@ Header files for cairo-dock plugins development.
 Pliki nagłówkowe do tworzenia wtyczek cairo-docka.
 
 %prep
-%setup -q -n cairo-dock-core-%{version}
+%setup -q -n %{name}-core-%{version}
 %patch -P0 -p1
 
 %build
diff --git a/cairo-dock-desktop.patch b/cairo-dock-desktop.patch
deleted file mode 100644
index 06f7c99..0000000
--- a/cairo-dock-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cairo-dock-core-2.2.0-4/data/cairo-dock.desktop.orig	2023-02-06 21:19:30.557326105 +0100
-+++ cairo-dock-core-2.2.0-4/data/cairo-dock.desktop	2023-02-06 21:20:11.763769537 +0100
-@@ -3,7 +3,7 @@
- Encoding=UTF-8
- Type=Application
- Exec=cairo-dock -o
--Icon=cairo-dock.svg
-+Icon=cairo-dock
- Terminal=false
- 
- Comment=Cairo-Dock with OpenGL (hardware acceleration)
---- cairo-dock-core-2.2.0-4/data/cairo-dock-cairo.desktop.orig	2010-10-02 01:26:58.000000000 +0200
-+++ cairo-dock-core-2.2.0-4/data/cairo-dock-cairo.desktop	2023-02-06 21:41:59.493351625 +0100
-@@ -3,7 +3,7 @@
- Encoding=UTF-8
- Type=Application
- Exec=cairo-dock -c
--Icon=cairo-dock.svg
-+Icon=cairo-dock
- Terminal=false
- 
- Comment=A light and eye-candy dock and desklets for your desktop.
diff --git a/cairo-dock-format.patch b/cairo-dock-format.patch
deleted file mode 100644
index 10523ee..0000000
--- a/cairo-dock-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cairo-dock-core-2.2.0-4/src/gldit/cairo-dock-log.c.orig	2010-10-02 01:26:58.000000000 +0200
-+++ cairo-dock-core-2.2.0-4/src/gldit/cairo-dock-log.c	2023-02-06 21:24:04.665841132 +0100
-@@ -75,7 +75,7 @@ void cd_log_location(const GLogLevelFlag
- 
-   if (loglevel > s_gLogLevel)
-     return;
--  g_print(_cd_log_level_to_string(loglevel));
-+  g_print("%s", _cd_log_level_to_string(loglevel));
-   g_print("\033[0;37m(%s:%s:%d) \033[%cm \n  ", file, func, line, s_iLogColor);
-   va_start(args, format);
-   g_logv(G_LOG_DOMAIN, loglevel, format, args);
diff --git a/cairo-dock-install-dirs.patch b/cairo-dock-install-dirs.patch
new file mode 100644
index 0000000..2328ccf
--- /dev/null
+++ b/cairo-dock-install-dirs.patch
@@ -0,0 +1,26 @@
+--- cairo-dock-core-3.5.2/CMakeLists.txt~	2025-03-08 14:02:51.000000000 +0000
++++ cairo-dock-core-3.5.2/CMakeLists.txt	2025-07-24 21:05:48.020979229 +0000
+@@ -67,19 +67,13 @@
+ 
+ set (prefix ${CMAKE_INSTALL_PREFIX})  # /usr/local
+ set (exec_prefix ${prefix})
+-set (datadir "${prefix}/${CMAKE_INSTALL_DATAROOTDIR}")  # (...)/share
++set (datadir "${CMAKE_INSTALL_DATAROOTDIR}")  # (...)/share
+ set (pkgdatadir "${datadir}/${CMAKE_PROJECT_NAME}")  # (...)/cairo-dock
+-set (mandir "${prefix}/${CMAKE_INSTALL_MANDIR}")  # (...)/man
++set (mandir "${CMAKE_INSTALL_MANDIR}")  # (...)/man
+ 
+-if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND (force-lib64 OR "${FORCE_LIB64}" STREQUAL "yes"))  # 64bits and force install in lib64
+-	set (libdir "${prefix}/lib64")
+-elseif (NOT "${LIB_SUFFIX}" STREQUAL "")
+-	set (libdir "${prefix}/lib${LIB_SUFFIX}")  # (...)/libXX ## some distro use ${LIB_SUFFIX}
+-else()
+-	set (libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}")  # (...)/lib or (...)/lib64 or custom ## GNU Install dir
+-endif()
++set (libdir "${CMAKE_INSTALL_LIBDIR}")  # (...)/lib or (...)/lib64 or custom ## GNU Install dir
+ 
+-set (includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")  # (...)/include
++set (includedir "${CMAKE_INSTALL_INCLUDEDIR}")  # (...)/include
+ set (bindir "${prefix}/${CMAKE_INSTALL_BINDIR}")  # (...)/bin
+ 
+ set (pluginsdir "${libdir}/cairo-dock")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cairo-dock.git/commitdiff/419d9e1472407e24c8eff1591e64b6f5a1d714a3