4 p.m.
commit 0505d825ef2199b9a72f8ef060e5bf2f26aab8a7
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Sun May 5 01:00:15 2024 +0900
Update to latest git (20240501git1f31686)
...ayland-manager-allocate-new-wl_output-inf.patch | 327 ---------------------
cairo-dock-core-pr21-export-symbols.patch | 22 ++
cairo-dock-freeworld.spec | 34 ++-
sources | 2 +-
4 files changed, 43 insertions(+), 342 deletions(-)
---
diff --git a/cairo-dock-core-pr21-export-symbols.patch
b/cairo-dock-core-pr21-export-symbols.patch
new file mode 100644
index 0000000..4939851
--- /dev/null
+++ b/cairo-dock-core-pr21-export-symbols.patch
@@ -0,0 +1,22 @@
+From c1c3c323874151bbb2f302ed36377cb74b3241aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kondor=20D=C3=A1niel?= <kondor.dani(a)gmail.com>
+Date: Sat, 4 May 2024 16:13:30 +0200
+Subject: [PATCH] build: ensure that symbols used by plugins are available
+
+---
+ src/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b126b637..83df531a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -41,6 +41,8 @@ link_directories(
+ add_executable (${PROJECT_NAME}
+ ${cairo_dock_SRCS} )
+
++set_target_properties (${PROJECT_NAME} PROPERTIES ENABLE_EXPORTS True)
++
+ # Link the executable to the librairies.
+ target_link_libraries (${PROJECT_NAME}
+ ${PACKAGE_LIBRARIES}
diff --git a/cairo-dock-freeworld.spec b/cairo-dock-freeworld.spec
index 82f44db..f2d38cb 100644
--- a/cairo-dock-freeworld.spec
+++ b/cairo-dock-freeworld.spec
@@ -1,11 +1,11 @@
%global urlver 3.5
-%global mainver 3.5.0
+%global mainver 3.5.99
-%global plugin_least_ver 3.5.0
+%global plugin_least_ver 3.5.99
-#%%global use_git 1
-%global gitdate 20210327
-%global githash 6c569e67a2a366e7634224a0133ede51755629cb
+%global use_git 1
+%global gitdate 20240501
+%global githash 1f316862d9d4d28e11283d67a79724ce94e93280
%global shorthash %(c=%{githash} ; echo ${c:0:7})
%global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
@@ -32,19 +32,21 @@ Summary: Light eye-candy fully themable animated dock
License: GPLv3+
URL: http://glx-dock.org/
%if 0%{?use_git} >= 1
-Source0: https://github.com/Cairo-Dock/cairo-dock-core/archive/%{githash}/cairo-do...
+Source0: https://github.com/Cairo-Dock/cairo-dock-core/archive/%{githash}/cairo-do...
%else
Source0: https://github.com/Cairo-Dock/cairo-dock-core/archive/%{version}/cairo-do...
%endif
Source1: cairo-dock-freeworld-oldchangelog
-# wayland-manager: allocate new wl_output information by checking id
-# https://bugzilla.redhat.com/show_bug.cgi?id=2000812
-# https://github.com/Cairo-Dock/cairo-dock-core/pull/12
-Patch1: 0001-LP1943052-wayland-manager-allocate-new-wl_output-inf.patch
+# https://github.com/Cairo-Dock/cairo-dock-core/issues/20
+# https://github.com/Cairo-Dock/cairo-dock-core/pull/21
+# Some symbols in cairo-dock binary is needed by libcd-Help.so
+Patch1: cairo-dock-core-pr21-export-symbols.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake
+BuildRequires: extra-cmake-modules
+BuildRequires: systemd-rpm-macros
%if 0%{?use_gcc_strict_sanitize}
BuildRequires: libasan
BuildRequires: libubsan
@@ -62,10 +64,12 @@ BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gthread-2.0)
+BuildRequires: pkgconfig(gtk-layer-shell-0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcomposite)
@@ -74,7 +78,7 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xtst)
-Requires: cairo-dock%{?_isa} = %{version}
+Requires: cairo-dock%{?_isa} >= %{mainver}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description
@@ -113,7 +117,7 @@ sed -i.stat \
po/CMakeLists.txt
# Modify version forcely
-sed -i CMakeLists.txt -e '\@set (VERSION @s|VERSION.*|VERSION
"%{version}")|'
+sed -i CMakeLists.txt -e '\@set (VERSION @s|VERSION.*|VERSION
"%{mainver}")|'
%build
%set_build_flags
@@ -134,8 +138,7 @@ rm -f CMakeCache.txt
%cmake \
-B . \
-DCMAKE_SKIP_RPATH:BOOL=ON \
- -Denable-egl-support:BOOL=OFF \
- . \
+ -Denable-egl-support:BOOL=ON \
%{nil}
make -C src/gldit %{?_smp_mflags}
@@ -185,6 +188,9 @@ install -cpm 644 \
%{_libdir}/%{name}/libgldi.so.3*
%changelog
+* Sat May 04 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> -
3.5.99^20240501git1f31686-1
+- Update to latest git (20240501git1f31686)
+
* Mon Feb 26 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.5.0-1
- Update to 3.5.0
diff --git a/sources b/sources
index c444c3f..79fc571 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cairo-dock-3.5.0.tar.gz) =
0b826d3e4fc2eb6c39eda7eba8d67ba67b8fa4587b5a4ca8a2d1f6a3e4c14a5fad325e478110b63e9a7d588445c0a665cbecc9804edccc13253b3d42152c3d48
+SHA512 (cairo-dock-3.5.99-20240501git1f31686.tar.gz) =
a65a47bdf91b66e631724c998b01b8ac1d2ba384095da0d0bb382d66ec040080af8ff58decb6a97ac9316755de0b89b2b55ca83bfe0b627587e22ca5eb050da6