From 597aa45a9c40a11d29c630c76933893252a8f170 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:28:24 +0900 Subject: [PATCH 01/53] use baserelease --- cairo-dock.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 63c3e2b..2cc5f88 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global mainrel 18 +%global baserelease 18 %undefine _ld_strict_symbol_defs @@ -26,7 +26,7 @@ Name: cairo-dock Version: 3.4.1 -Release: %{mainrel}%{?use_git:.D%{gitdate}git%{shorthash}}%{?dist}%{flagrel}.3 +Release: %{baserelease}%{?use_git:.D%{gitdate}git%{shorthash}}%{?dist}%{flagrel} Summary: Light eye-candy fully themable animated dock License: GPLv3+ From d5053e5d732c48f1939cdc17a8ee70c5283126a9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 29 May 2023 08:50:16 +0900 Subject: [PATCH 02/53] Pass -r option to xargs because new rpm creates empty directory --- cairo-dock.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 2cc5f88..8798386 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 18 +%global baserelease 19 %undefine _ld_strict_symbol_defs @@ -125,7 +125,7 @@ files for developing applications that use %{name}. # %%_fixperms cannot fix permissions completely here for dir in */ do - find $dir -type f | xargs chmod 0644 + find $dir -type f | xargs -r chmod 0644 done chmod 0644 [A-Z]* chmod 0755 */ @@ -248,6 +248,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Mon May 29 2023 Mamoru TASAKA - 3.4.1-19.D20210327git6c569e6 +- Pass -r option to xargs because new rpm creates empty directory + * Wed Jan 18 2023 Fedora Release Engineering - 3.4.1-18.D20210327git6c569e6.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f9888090a2d01b2f6a1460f226ca36aa15b4fb99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:09:31 +0000 Subject: [PATCH 03/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cairo-dock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 8798386..da85102 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 19 +%global baserelease 20 %undefine _ld_strict_symbol_defs @@ -248,6 +248,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.4.1-20.D20210327git6c569e6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon May 29 2023 Mamoru TASAKA - 3.4.1-19.D20210327git6c569e6 - Pass -r option to xargs because new rpm creates empty directory From ce1d5d01848bfe3fa2c0b9aad78f5a3e24857ba2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:57:49 +0000 Subject: [PATCH 04/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cairo-dock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index da85102..c657aea 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 20 +%global baserelease 21 %undefine _ld_strict_symbol_defs @@ -248,6 +248,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.4.1-21.D20210327git6c569e6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 3.4.1-20.D20210327git6c569e6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 051ad8afe850c75d7bf32c0826b717c240421c36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 01:07:21 +0000 Subject: [PATCH 05/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cairo-dock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index c657aea..067c7d9 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 21 +%global baserelease 22 %undefine _ld_strict_symbol_defs @@ -248,6 +248,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 3.4.1-22.D20210327git6c569e6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.4.1-21.D20210327git6c569e6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d20a934463f4fdbe8fdeb41483b351b1f6be48a7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 26 Feb 2024 20:58:23 +0900 Subject: [PATCH 06/53] Update to 3.5.0 --- .gitignore | 6 +----- cairo-dock-create-fedora-tarball.sh | 2 +- cairo-dock.spec | 17 ++++++++++------- sources | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 15db666..8907d15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -cairo-dock-sources-svn1527_trunk.tar.bz2 -/cairo-dock-fedora-3.4.0.tar.gz -/cairo-dock-fedora-3.4.1.tar.gz -/cairo-dock-fedora-3.4.1-20201103git0836f5d.tar.gz -/cairo-dock-fedora-3.4.1-20210327git6c569e6.tar.gz +/cairo-dock-fedora-*.tar.gz diff --git a/cairo-dock-create-fedora-tarball.sh b/cairo-dock-create-fedora-tarball.sh index 9fe70da..7dc7828 100644 --- a/cairo-dock-create-fedora-tarball.sh +++ b/cairo-dock-create-fedora-tarball.sh @@ -5,7 +5,7 @@ set -x umask 0022 -VERSION=${VERSION:-3.4.0} +VERSION=${VERSION:-3.5.0} VERSION_PARENT=${VERSION%.[0-9]} diff --git a/cairo-dock.spec b/cairo-dock.spec index 067c7d9..a50e99a 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,15 +1,15 @@ -%global urlver 3.4 -%global mainver 3.4.1 +%global urlver 3.5 +%global mainver 3.5.0 -%global plugin_least_ver 3.4.1 +%global plugin_least_ver 3.5.0 -%global use_git 1 +#%%global use_git 0 %global gitdate 20210327 %global githash 6c569e67a2a366e7634224a0133ede51755629cb %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 22 +%global baserelease 1 %undefine _ld_strict_symbol_defs @@ -25,8 +25,8 @@ ########################################## Name: cairo-dock -Version: 3.4.1 -Release: %{baserelease}%{?use_git:.D%{gitdate}git%{shorthash}}%{?dist}%{flagrel} +Version: %{mainver}%{?use_git:^%{gitdate}git%{shorthash}} +Release: %{baserelease}%{?dist}%{flagrel} Summary: Light eye-candy fully themable animated dock License: GPLv3+ @@ -248,6 +248,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Mon Feb 26 2024 Mamoru TASAKA - 3.5.0-1 +- Update to 3.5.0 + * Tue Jan 23 2024 Fedora Release Engineering - 3.4.1-22.D20210327git6c569e6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 516b2f0..0fc88b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.4.1-20210327git6c569e6.tar.gz) = 605c0c8bcf0ef0725c6ab1458856e70d6148f1aad351aae6d74bcc9d4beba7ae2da1d53cc743d4d2e587c68d14896981e4cbe7281c9fcc75ed2b3777e698df47 +SHA512 (cairo-dock-fedora-3.5.0.tar.gz) = 24101fba7f5b9078be60c00314429e32347c693f7d38b61ecac1090fd4b8c315964ff0299d3d4798031178aa574885313d9565f030d0bd5e2a8d744f93a417ed From 2549f2fe5f734cccc25aec9b3990df3914b17a7b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 1 Mar 2024 16:41:40 +0900 Subject: [PATCH 07/53] SPDX confirmation --- cairo-dock.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index a50e99a..20c555a 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %undefine _ld_strict_symbol_defs @@ -29,7 +29,11 @@ Version: %{mainver}%{?use_git:^%{gitdate}git%{shorthash}} Release: %{baserelease}%{?dist}%{flagrel} Summary: Light eye-candy fully themable animated dock -License: GPLv3+ +# Overall: GPL-3.0-or-later +# data/scripts/cairo-dock-package-theme.sh GPL-2.0-or-later +# src/gldit/gtk3imagemenuitem.c LGPL-3.0-or-later +# SPDX confirmed +License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-3.0-or-later URL: http://glx-dock.org/ # Source0: http://launchpad.net/cairo-dock-core/%%{urlver}/%%{mainver}/+download/cairo-dock-%%{mainver}.tar.gz # Modified due to some may-be-patent-infringement issue @@ -248,6 +252,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Fri Mar 01 2024 Mamoru TASAKA - 3.5.0-2 +- SPDX confirmation + * Mon Feb 26 2024 Mamoru TASAKA - 3.5.0-1 - Update to 3.5.0 From d3c61565f5ed8330598f40fbecb1b1bed7c6dd3b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 4 May 2024 22:49:19 +0900 Subject: [PATCH 08/53] Update to latest git (20240501git1f31686) --- ...d-manager-allocate-new-wl_output-inf.patch | 327 ------------------ ...ore-issue20-rdynamic-for-main-symbol.patch | 15 + cairo-dock.spec | 32 +- sources | 2 +- 4 files changed, 36 insertions(+), 340 deletions(-) delete mode 100644 0001-LP1943052-wayland-manager-allocate-new-wl_output-inf.patch create mode 100644 cairo-dock-core-issue20-rdynamic-for-main-symbol.patch diff --git a/0001-LP1943052-wayland-manager-allocate-new-wl_output-inf.patch b/0001-LP1943052-wayland-manager-allocate-new-wl_output-inf.patch deleted file mode 100644 index 36dfff3..0000000 --- a/0001-LP1943052-wayland-manager-allocate-new-wl_output-inf.patch +++ /dev/null @@ -1,327 +0,0 @@ -From 275fa02a15ebdb75b07c100de9395392f9543300 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Mon, 20 Sep 2021 16:22:40 +0900 -Subject: [PATCH] [LP1943052] wayland-manager: allocate new wl_output - information by checking id - -With KDE Plasma Wayland session, after calling wl_output_add_listener() -and waiting for wl_output information with wl_display_roundtrip(), -wl_output::mode info is returned before wl_output::geometry info. - -Current cairo-dock-wayland-manager logic expects the opposite order, and -on KDE session this causes cairo-dock segfault. - -To avoid this, when collecting wl_output information, we should also check -"id" member of global registry object associated with that wl_output info, -check if the "id" is already the duplicates of the old infos. - -Then if the "id" is new one, then allocate the new buffer to register new -wl_output information beforehand, then call wl_display_roundtrip() to gain -wl_output::geometry or wl_output::output information. ---- - src/gldit/cairo-dock-desktop-manager.h | 13 +- - src/implementations/cairo-dock-X-utilities.c | 20 +-- - .../cairo-dock-wayland-manager.c | 134 +++++++++++++++--- - 3 files changed, 139 insertions(+), 28 deletions(-) - -diff --git a/src/gldit/cairo-dock-desktop-manager.h b/src/gldit/cairo-dock-desktop-manager.h -index b8ecb0d0..2774913b 100644 ---- a/src/gldit/cairo-dock-desktop-manager.h -+++ b/src/gldit/cairo-dock-desktop-manager.h -@@ -59,10 +59,21 @@ typedef enum { - NB_NOTIFICATIONS_DESKTOP - } CairoDesktopNotifications; - -+typedef struct GldiWlOutput { -+ struct wl_output *output; -+ uint32_t id, ver; -+} GldiWlOutput; -+ -+typedef struct GldiScreenInfo { -+ int x, y; -+ int width, height; -+ GldiWlOutput wloutput; // wl_registry object identifier (in wayland session) -+} GldiScreenInfo; -+ - // data - struct _GldiDesktopGeometry { - int iNbScreens; -- GtkAllocation *pScreens; // liste of all screen devices. -+ GldiScreenInfo *pScreens; // liste of all screen devices. - GtkAllocation Xscreen; // logical screen, possibly made of several screen devices. - int iNbDesktops; - int iNbViewportX, iNbViewportY; -diff --git a/src/implementations/cairo-dock-X-utilities.c b/src/implementations/cairo-dock-X-utilities.c -index 26217dab..9d39e017 100644 ---- a/src/implementations/cairo-dock-X-utilities.c -+++ b/src/implementations/cairo-dock-X-utilities.c -@@ -89,7 +89,7 @@ static Atom s_aUtf8String; - static Atom s_aString; - static unsigned char error_code = Success; - --static GtkAllocation *_get_screens_geometry (int *pNbScreens); -+static GldiScreenInfo *_get_screens_geometry (int *pNbScreens); - - static gboolean cairo_dock_support_X_extension (void); - -@@ -185,14 +185,14 @@ unsigned char cairo_dock_get_X_error_code (void) - return error_code; - } - --static GtkAllocation *_get_screens_geometry (int *pNbScreens) -+static GldiScreenInfo *_get_screens_geometry (int *pNbScreens) - { -- GtkAllocation *pScreens = NULL; -- GtkAllocation *pScreen; -+ GldiScreenInfo *pScreens = NULL; -+ GldiScreenInfo *pScreen; - int iNbScreens = 0; - /*Unit Tests - iNbScreens = 2; -- pScreens = g_new0 (GtkAllocation, iNbScreens); -+ pScreens = g_new0 (GldiScreenInfo, iNbScreens); - pScreens[0].x = 0; - pScreens[0].y = 0; - pScreens[0].width = 1000; -@@ -213,7 +213,7 @@ static GtkAllocation *_get_screens_geometry (int *pNbScreens) - { - int n = res->ncrtc; - cd_debug (" number of screen(s): %d", n); -- pScreens = g_new0 (GtkAllocation, n); -+ pScreens = g_new0 (GldiScreenInfo, n); - int i; - for (i = 0; i < n; i++) - { -@@ -256,7 +256,7 @@ static GtkAllocation *_get_screens_geometry (int *pNbScreens) - if (scr != NULL) - { - cd_debug (" number of screen(s): %d", n); -- pScreens = g_new0 (GtkAllocation, n); -+ pScreens = g_new0 (GldiScreenInfo, n); - int i; - for (i = 0; i < n; i++) - { -@@ -286,7 +286,7 @@ static GtkAllocation *_get_screens_geometry (int *pNbScreens) - #endif - - iNbScreens = 1; -- pScreens = g_new0 (GtkAllocation, iNbScreens); -+ pScreens = g_new0 (GldiScreenInfo, iNbScreens); - pScreen = &pScreens[0]; - pScreen->x = 0; - pScreen->y = 0; -@@ -335,7 +335,7 @@ gboolean cairo_dock_update_screen_geometry (void) - } - - // get the size and position of each screen (they could have changed even though the X screen has not changed, for instance if you swap 2 screens). -- GtkAllocation *pScreens = g_desktopGeometry.pScreens; -+ GldiScreenInfo *pScreens = g_desktopGeometry.pScreens; - int iNbScreens = g_desktopGeometry.iNbScreens; - g_desktopGeometry.pScreens = _get_screens_geometry (&g_desktopGeometry.iNbScreens); - -@@ -347,7 +347,7 @@ gboolean cairo_dock_update_screen_geometry (void) - int i; - for (i = 0; i < MIN (iNbScreens, g_desktopGeometry.iNbScreens); i ++) - { -- if (memcmp (&pScreens[i], &g_desktopGeometry.pScreens[i], sizeof (GtkAllocation)) != 0) -+ if (memcmp (&pScreens[i], &g_desktopGeometry.pScreens[i], sizeof (GldiScreenInfo)) != 0) - { - bNewSize = TRUE; - break; -diff --git a/src/implementations/cairo-dock-wayland-manager.c b/src/implementations/cairo-dock-wayland-manager.c -index 9ce8d505..f9732133 100644 ---- a/src/implementations/cairo-dock-wayland-manager.c -+++ b/src/implementations/cairo-dock-wayland-manager.c -@@ -73,31 +73,97 @@ struct desktop - }; - static gboolean s_bInitializing = TRUE; // each time a callback is called on startup, it will set this to TRUE, and we'll make a roundtrip to the server until no callback is called. - --static void _output_geometry_cb (G_GNUC_UNUSED void *data, G_GNUC_UNUSED struct wl_output *wl_output, -+static int get_position_gldi_screeninfo_by_id (GldiScreenInfo *array_screens, int iNbScreens, uint32_t obj_id) -+{ -+ int i_screen; -+ GldiScreenInfo *p_screen = array_screens; -+ for (i_screen = 0; i_screen < iNbScreens; i_screen++) -+ { -+ if (p_screen->wloutput.id == obj_id) -+ { -+ return i_screen; -+ } -+ p_screen++; -+ } -+ -+ return -1; -+} -+ -+static GldiScreenInfo *append_gldi_screeninfo(GldiScreenInfo **ref_array_screens, int *ref_iNbScreens) -+{ -+ int iNbScreens_old = *ref_iNbScreens; -+ int iNbScreens_new = iNbScreens_old + 1; -+ GldiScreenInfo *p_new_screeninfo; -+ -+ if (!*ref_array_screens) -+ *ref_array_screens = g_new(GldiScreenInfo, 1); -+ else -+ *ref_array_screens = g_realloc(*ref_array_screens, iNbScreens_new * sizeof (**ref_array_screens)); -+ if (!*ref_array_screens) abort(); -+ -+ p_new_screeninfo = *ref_array_screens + (iNbScreens_new - 1); -+ *ref_iNbScreens = iNbScreens_new; -+ -+ return p_new_screeninfo; -+} -+ -+static void remove_gldi_screeninfo_by_id(GldiScreenInfo **ref_array_screens, int *ref_iNbScreens, uint32_t obj_id) -+{ -+ int iNbScreens_old = *ref_iNbScreens; -+ int pos_screen; -+ GldiScreenInfo *p_screen; -+ -+ if (iNbScreens_old <= 1) return; // Keep at least one information for now -+ -+ pos_screen = get_position_gldi_screeninfo_by_id(*ref_array_screens, *ref_iNbScreens, obj_id); -+ if (pos_screen < 0) return; -+ -+ p_screen = *ref_array_screens + pos_screen; -+#ifdef WL_OUTPUT_RELEASE_SINCE_VERSION -+ if (p_screen->wloutput.id >= WL_OUTPUT_RELEASE_SINCE_VERSION) -+ { -+ wl_output_release(p_screen->wloutput.output); -+ } else -+#endif -+ { -+ wl_output_destroy(p_screen->wloutput.output); -+ } -+ -+ if (iNbScreens_old > pos_screen + 1) -+ { -+ memmove( -+ p_screen, p_screen + 1, -+ (iNbScreens_old - pos_screen - 1) * sizeof (**ref_array_screens) -+ ); -+ } -+ -+ (*ref_iNbScreens)--; -+} -+ -+static void _output_geometry_cb (void *data, G_GNUC_UNUSED struct wl_output *wl_output, - int32_t x, int32_t y, - G_GNUC_UNUSED int32_t physical_width, G_GNUC_UNUSED int32_t physical_height, - G_GNUC_UNUSED int32_t subpixel, G_GNUC_UNUSED const char *make, G_GNUC_UNUSED const char *model, G_GNUC_UNUSED int32_t output_transform) - { -+ GldiScreenInfo *p_screeninfo = (GldiScreenInfo *)data; - cd_debug ("Geometry: %d;%d", x, y); -- g_desktopGeometry.iNbScreens ++; -- if (!g_desktopGeometry.pScreens) -- g_desktopGeometry.pScreens = g_new0 (GtkAllocation, 1); -- else -- g_desktopGeometry.pScreens = g_realloc (g_desktopGeometry.pScreens, g_desktopGeometry.iNbScreens * sizeof(GtkAllocation)); -+ cd_debug ("id: %u", (unsigned int)p_screeninfo->wloutput.id); - -- g_desktopGeometry.pScreens[g_desktopGeometry.iNbScreens-1].x = x; -- g_desktopGeometry.pScreens[g_desktopGeometry.iNbScreens-1].y = y; -+ p_screeninfo->x = x; -+ p_screeninfo->y = y; - s_bInitializing = TRUE; - } - --static void _output_mode_cb (G_GNUC_UNUSED void *data, G_GNUC_UNUSED struct wl_output *wl_output, -+static void _output_mode_cb (void *data, G_GNUC_UNUSED struct wl_output *wl_output, - uint32_t flags, int32_t width, int32_t height, G_GNUC_UNUSED int32_t refresh) - { -+ GldiScreenInfo *p_screeninfo = (GldiScreenInfo *)data; - cd_debug ("Output mode: %dx%d, %d", width, height, flags); -+ cd_debug ("id: %u", (unsigned int)p_screeninfo->wloutput.id); - if (flags & WL_OUTPUT_MODE_CURRENT) // not the current one -> don't bother - { -- g_desktopGeometry.pScreens[g_desktopGeometry.iNbScreens-1].width = width; -- g_desktopGeometry.pScreens[g_desktopGeometry.iNbScreens-1].height = height; -+ p_screeninfo->width = width; -+ p_screeninfo->height = height; - g_desktopGeometry.Xscreen.width = width; - g_desktopGeometry.Xscreen.height = height; - } -@@ -124,14 +190,29 @@ static void _output_scale_cb (G_GNUC_UNUSED void *data, G_GNUC_UNUSED struct wl_ - - static const struct wl_output_listener output_listener = { - _output_geometry_cb, -- _output_mode_cb, -+ _output_mode_cb -+#ifdef WL_OUTPUT_SCALE_SINCE_VERSION -+ , - _output_done_cb, - _output_scale_cb -+#endif - }; - --static void _registry_global_cb (G_GNUC_UNUSED void *data, struct wl_registry *registry, uint32_t id, const char *interface, G_GNUC_UNUSED uint32_t version) -+static void _registry_global_cb (G_GNUC_UNUSED void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version) - { -- cd_debug ("got a new global object, instance of %s, id=%d", interface, id); -+ cd_debug ("got a new global object, instance of %s, id=%d, version=%u", interface, id, version); -+ uint32_t wl_output_version = -+#if defined(WL_OUTPUT_RELEASE_SINCE_VERSION) -+ WL_OUTPUT_RELEASE_SINCE_VERSION; -+#elif defined(WL_OUTPUT_SCALE_SINCE_VERSION) -+ WL_OUTPUT_SCALE_SINCE_VERSION; -+#else -+ 1; -+#endif -+ // server side may not support newer version, in such case suppress the version to use -+ if (wl_output_version > version) -+ wl_output_version = version; -+ - if (!strcmp (interface, "wl_shell")) - { - // this is the global that should give us info and signals about the desktop, but currently it's pretty useless ... -@@ -142,10 +223,26 @@ static void _registry_global_cb (G_GNUC_UNUSED void *data, struct wl_registry *r - struct wl_output *output = wl_registry_bind (registry, - id, - &wl_output_interface, -- 1); -+ wl_output_version); -+ -+ GldiScreenInfo *p_screeninfo = NULL; -+ int screen_num = get_position_gldi_screeninfo_by_id(g_desktopGeometry.pScreens, g_desktopGeometry.iNbScreens, id); -+ if (screen_num >= 0) -+ p_screeninfo = g_desktopGeometry.pScreens + screen_num; -+ else -+ p_screeninfo = append_gldi_screeninfo(&g_desktopGeometry.pScreens, &g_desktopGeometry.iNbScreens); -+ -+ { -+ // register new wl_output -+ GldiWlOutput *p_wloutput = &p_screeninfo->wloutput; -+ p_wloutput->output = output; -+ p_wloutput->id = id; -+ p_wloutput->ver = wl_output_version; -+ } -+ - wl_output_add_listener (output, - &output_listener, -- NULL); -+ p_screeninfo); - } - s_bInitializing = TRUE; - } -@@ -153,7 +250,7 @@ static void _registry_global_cb (G_GNUC_UNUSED void *data, struct wl_registry *r - static void _registry_global_remove_cb (G_GNUC_UNUSED void *data, G_GNUC_UNUSED struct wl_registry *registry, uint32_t id) - { - cd_debug ("got a global object has disappeared: id=%d", id); -- /// TODO: find it and destroy it... -+ remove_gldi_screeninfo_by_id(&g_desktopGeometry.pScreens, &g_desktopGeometry.iNbScreens, id); - - /// TODO: and if it was a wl_output for instance, update the desktop geometry... - -@@ -171,6 +268,9 @@ static void init (void) - s_pDisplay = wl_display_connect (NULL); - - g_desktopGeometry.iNbDesktops = g_desktopGeometry.iNbViewportX = g_desktopGeometry.iNbViewportY = 1; -+ // Explicitly initialize below for readability -+ g_desktopGeometry.pScreens = NULL; -+ g_desktopGeometry.iNbScreens = 0; - - - struct wl_registry *registry = wl_display_get_registry (s_pDisplay); --- -2.31.1 - diff --git a/cairo-dock-core-issue20-rdynamic-for-main-symbol.patch b/cairo-dock-core-issue20-rdynamic-for-main-symbol.patch new file mode 100644 index 0000000..dea78f2 --- /dev/null +++ b/cairo-dock-core-issue20-rdynamic-for-main-symbol.patch @@ -0,0 +1,15 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e0cb247f..dd09bfb2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -47,6 +47,10 @@ target_link_libraries (${PROJECT_NAME} + gldi + ${LIBINTL_LIBRARIES}) + ++target_link_options (${PROJECT_NAME} ++ PRIVATE ++ "-rdynamic") ++ + # install the program once it is built. + install( + TARGETS ${PACKAGE} diff --git a/cairo-dock.spec b/cairo-dock.spec index 20c555a..df27ee4 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,15 +1,15 @@ %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 0 -%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}} -%global baserelease 2 +%global baserelease 1 %undefine _ld_strict_symbol_defs @@ -42,14 +42,15 @@ Source0: cairo-dock-fedora-%{tarballver}.tar.gz Source1: cairo-dock-create-fedora-tarball.sh # And some legal explanation Source2: LEGAL.fedora.cairo-dock -# 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 +# Some symbols in cairo-dock binary is needed by libcd-Help.so +Patch1: cairo-dock-core-issue20-rdynamic-for-main-symbol.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 @@ -67,10 +68,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) @@ -123,7 +126,7 @@ The %{name}-devel package contains libraries, build data, and header files for developing applications that use %{name}. %prep -%autosetup -n %{name}-%{version}%{?use_git:-%{gitdate}git%{shorthash}} -p1 +%autosetup -n %{name}-%{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -p1 ## permission # %%_fixperms cannot fix permissions completely here @@ -143,7 +146,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 @@ -244,6 +247,8 @@ popd %{_libdir}/%{name}/libcd-Help.so %{_datadir}/%{name}/plug-ins/Help/ +%{_userunitdir}/%{name}.service + %{_mandir}/man1/%{name}.1* %files devel @@ -252,6 +257,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sat May 04 2024 Mamoru TASAKA - 3.5.99^20240501git1f31686-1 +- Update to latest git (20240501git1f31686) + * Fri Mar 01 2024 Mamoru TASAKA - 3.5.0-2 - SPDX confirmation diff --git a/sources b/sources index 0fc88b2..538ccc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.0.tar.gz) = 24101fba7f5b9078be60c00314429e32347c693f7d38b61ecac1090fd4b8c315964ff0299d3d4798031178aa574885313d9565f030d0bd5e2a8d744f93a417ed +SHA512 (cairo-dock-fedora-3.5.99-20240501git1f31686.tar.gz) = 233ae4e305d5965184f2f129fa4c3f503a713e5db1b60ad86d705b6bfcb2a4e4fd492d789a400433f7cad406847fbee20eef6656041a27145ab3030cdbba79ca From cca444fd40e5c3ad921f7496d44e292830d49672 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 5 May 2024 14:08:37 +0900 Subject: [PATCH 09/53] Update to the latest git (20240505git13fb151) Enable Wayfire IPC support --- ...ck-core-issue20-rdynamic-for-main-symbol.patch | 15 --------------- cairo-dock.spec | 12 +++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 cairo-dock-core-issue20-rdynamic-for-main-symbol.patch diff --git a/cairo-dock-core-issue20-rdynamic-for-main-symbol.patch b/cairo-dock-core-issue20-rdynamic-for-main-symbol.patch deleted file mode 100644 index dea78f2..0000000 --- a/cairo-dock-core-issue20-rdynamic-for-main-symbol.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e0cb247f..dd09bfb2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -47,6 +47,10 @@ target_link_libraries (${PROJECT_NAME} - gldi - ${LIBINTL_LIBRARIES}) - -+target_link_options (${PROJECT_NAME} -+ PRIVATE -+ "-rdynamic") -+ - # install the program once it is built. - install( - TARGETS ${PACKAGE} diff --git a/cairo-dock.spec b/cairo-dock.spec index df27ee4..29159fb 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20240501 -%global githash 1f316862d9d4d28e11283d67a79724ce94e93280 +%global gitdate 20240505 +%global githash 13fb1516bc269debe7d7dfc1c67aae7acde27423 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -42,9 +42,6 @@ Source0: cairo-dock-fedora-%{tarballver}.tar.gz Source1: cairo-dock-create-fedora-tarball.sh # And some legal explanation Source2: LEGAL.fedora.cairo-dock -# https://github.com/Cairo-Dock/cairo-dock-core/issues/20 -# Some symbols in cairo-dock binary is needed by libcd-Help.so -Patch1: cairo-dock-core-issue20-rdynamic-for-main-symbol.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -73,6 +70,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(nlohmann_json) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(x11) @@ -257,6 +255,10 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun May 05 2024 Mamoru TASAKA - 3.5.99^20240505git13fb151-1 +- Update to the latest git (20240505git13fb151) +- Enable Wayfire IPC support + * Sat May 04 2024 Mamoru TASAKA - 3.5.99^20240501git1f31686-1 - Update to latest git (20240501git1f31686) diff --git a/sources b/sources index 538ccc4..8b5f6a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20240501git1f31686.tar.gz) = 233ae4e305d5965184f2f129fa4c3f503a713e5db1b60ad86d705b6bfcb2a4e4fd492d789a400433f7cad406847fbee20eef6656041a27145ab3030cdbba79ca +SHA512 (cairo-dock-fedora-3.5.99-20240505git13fb151.tar.gz) = 31072dedc3c88d9abea204a9ce1ee4e5b17f9d983f39776e0ffd330e56ee5bbcf70c3cf0f0b1f7bf26a2e16b2275224925ed2b39bd6c4aaf828422d0e17cfed7 From ad129ac3a655cd0d06da638df54a10e5321fd9e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:51:53 +0000 Subject: [PATCH 10/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cairo-dock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 29159fb..97eead2 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %undefine _ld_strict_symbol_defs @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.5.99^20240505git13fb151-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun May 05 2024 Mamoru TASAKA - 3.5.99^20240505git13fb151-1 - Update to the latest git (20240505git13fb151) - Enable Wayfire IPC support From 5792eb6b3b942b5bf186213276aead83f06a9f27 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 7 Aug 2024 16:46:57 +0900 Subject: [PATCH 11/53] Update to the latest git (20240805git23c0be5) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 97eead2..0060d7b 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,12 +4,12 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20240505 -%global githash 13fb1516bc269debe7d7dfc1c67aae7acde27423 +%global gitdate 20240805 +%global githash 23c0be5409ce2bc121956b567e5bd7db1d6c7a0b %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 1 %undefine _ld_strict_symbol_defs @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Wed Aug 07 2024 Mamoru TASAKA - 3.5.99^20240805git23c0be5-1 +- Update to the latest git (20240805git23c0be5) + * Wed Jul 17 2024 Fedora Release Engineering - 3.5.99^20240505git13fb151-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 8b5f6a6..850a668 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20240505git13fb151.tar.gz) = 31072dedc3c88d9abea204a9ce1ee4e5b17f9d983f39776e0ffd330e56ee5bbcf70c3cf0f0b1f7bf26a2e16b2275224925ed2b39bd6c4aaf828422d0e17cfed7 +SHA512 (cairo-dock-fedora-3.5.99-20240805git23c0be5.tar.gz) = 249cc4d88cfc079f6586dfb8dd91bb0fc5683d6ca65d5cf4de0480e25633a2aedfc9014ad6f1137d7e18a616fca3fdae749f9e42a14ff1e0afd05bde07432085 From 0bd51dbc02328eff428c427a4a973a5f0bd345b1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 22 Aug 2024 22:38:37 +0900 Subject: [PATCH 12/53] Update to the latest git (20240822gitb196136) Update to the latest git (20240822gitb196136) Update to the latest git (20240822gitb196136) Update to the latest git (20240822gitb196136) --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 0060d7b..f2d20e9 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20240805 -%global githash 23c0be5409ce2bc121956b567e5bd7db1d6c7a0b +%global gitdate 20240822 +%global githash b196136c5e339353f3a36dad8218a00b1d1f234a %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Thu Aug 22 2024 Mamoru TASAKA - 3.5.99^20240822gitb196136-1 +- Update to the latest git (20240822gitb196136) + * Wed Aug 07 2024 Mamoru TASAKA - 3.5.99^20240805git23c0be5-1 - Update to the latest git (20240805git23c0be5) diff --git a/sources b/sources index 850a668..e38aff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20240805git23c0be5.tar.gz) = 249cc4d88cfc079f6586dfb8dd91bb0fc5683d6ca65d5cf4de0480e25633a2aedfc9014ad6f1137d7e18a616fca3fdae749f9e42a14ff1e0afd05bde07432085 +SHA512 (cairo-dock-fedora-3.5.99-20240822gitb196136.tar.gz) = 97f162ab730a7d151bfd050632a24013719959ef1626619cc4d49a163912e500b3162b14abb82d5697fc0615b4ee8782ef6fdbba61e7e3a9b8aaaab889e25a8d From a178948725a986a5010bd048731e6782c0b5845f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 18 Sep 2024 15:50:09 +0900 Subject: [PATCH 13/53] Update to the latest git (20240915git1458bc8) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index f2d20e9..e413162 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20240822 -%global githash b196136c5e339353f3a36dad8218a00b1d1f234a +%global gitdate 20240915 +%global githash 1458bc865640cce4c1e89ab312cd2c57dd721673 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -17,7 +17,7 @@ ########################################## %global flagrel %{nil} -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %if 0%{?use_gcc_strict_sanitize} >= 1 %global flagrel %{flagrel}.san @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Wed Sep 18 2024 Mamoru TASAKA - 3.5.99^20240915git1458bc8-1 +- Update to the latest git (20240915git1458bc8) + * Thu Aug 22 2024 Mamoru TASAKA - 3.5.99^20240822gitb196136-1 - Update to the latest git (20240822gitb196136) diff --git a/sources b/sources index e38aff4..3c29db5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20240822gitb196136.tar.gz) = 97f162ab730a7d151bfd050632a24013719959ef1626619cc4d49a163912e500b3162b14abb82d5697fc0615b4ee8782ef6fdbba61e7e3a9b8aaaab889e25a8d +SHA512 (cairo-dock-fedora-3.5.99-20240915git1458bc8.tar.gz) = 959db60f32857fbb940cecfd32165c73efef7f89ca5a080c5d6933191e529959e064ff654281913a8bd9d04368d872730ac1d80e8434612fd93747a7ce488b25 From 25904465734b9f1446a3c3e8d1f2af0d061c1de0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 18 Sep 2024 15:51:42 +0900 Subject: [PATCH 14/53] kill sanitizer --- cairo-dock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index e413162..f647b0c 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -17,7 +17,7 @@ ########################################## %global flagrel %{nil} -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %if 0%{?use_gcc_strict_sanitize} >= 1 %global flagrel %{flagrel}.san From d900528feb277390cba929caf55d1456c7a830e3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 23 Sep 2024 16:32:31 +0900 Subject: [PATCH 15/53] Update to the latest git (20240923gitd7e4090) --- cairo-dock.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index f647b0c..580f2f8 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20240915 -%global githash 1458bc865640cce4c1e89ab312cd2c57dd721673 +%global gitdate 20240923 +%global githash d7e4090e59f4897c361d768af8c3e335ef40b1e7 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun Sep 22 2024 Mamoru TASAKA - 3.5.99^20240923gitd7e4090-1 +- Update to the latest git (20240923gitd7e4090) + * Wed Sep 18 2024 Mamoru TASAKA - 3.5.99^20240915git1458bc8-1 - Update to the latest git (20240915git1458bc8) From 25f3c231af6f6183da5c9484291bfbf501cc3f6a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 23 Sep 2024 16:42:21 +0900 Subject: [PATCH 16/53] keep line number for modifying source for fedora --- cairo-dock-create-fedora-tarball.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cairo-dock-create-fedora-tarball.sh b/cairo-dock-create-fedora-tarball.sh index 7dc7828..5ace048 100644 --- a/cairo-dock-create-fedora-tarball.sh +++ b/cairo-dock-create-fedora-tarball.sh @@ -59,7 +59,7 @@ set +x echo -n -e "Modifying source \t" count=0 -sed -i -e '\@AVOID_PATENT_CRAP@d' src/gldit/gldi-config.h.in +sed -i -e '\@AVOID_PATENT_CRAP@s@^.*$@@' src/gldit/gldi-config.h.in grep -rIl AVOID_PATENT_CRAP src/ | while read f do count=$((count + 1)) @@ -69,17 +69,19 @@ do do if ( echo "$line" | grep -q "#ifndef.*AVOID_PATENT_CRAP" ) ; then flag=10 - continue + line="" fi if [[ ( $flag == 10 ) && ( $(echo "$line" | grep -q "#else" ; echo $? ) == 0 ) ]] ; then flag=5 - continue + line="" fi if [[ ( $flag == 5 ) && ( $(echo "$line" | grep -q "#endif" ; echo $? ) == 0 ) ]] ; then flag=1 - continue + line="" + fi + if [ $flag == 10 ] ; then + line="" fi - [ $flag == 10 ] && continue echo "$line" >> $f done rm -f $f.orig From 357f41586ddaafaae3f2e70fd67fe45d9d2157dd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 26 Sep 2024 11:58:36 +0900 Subject: [PATCH 17/53] Update to the latest git (20240926git7b3ac7f) --- cairo-dock.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 580f2f8..1a2acd5 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20240923 -%global githash d7e4090e59f4897c361d768af8c3e335ef40b1e7 +%global gitdate 20240926 +%global githash 7b3ac7fa3e367174c80e758856e19e8c0435995e %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -255,8 +255,8 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog -* Sun Sep 22 2024 Mamoru TASAKA - 3.5.99^20240923gitd7e4090-1 -- Update to the latest git (20240923gitd7e4090) +* Thu Sep 26 2024 Mamoru TASAKA - 3.5.99^20240926git7b3ac7f-1 +- Update to the latest git (20240926git7b3ac7f) * Wed Sep 18 2024 Mamoru TASAKA - 3.5.99^20240915git1458bc8-1 - Update to the latest git (20240915git1458bc8) diff --git a/sources b/sources index 3c29db5..591b312 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20240915git1458bc8.tar.gz) = 959db60f32857fbb940cecfd32165c73efef7f89ca5a080c5d6933191e529959e064ff654281913a8bd9d04368d872730ac1d80e8434612fd93747a7ce488b25 +SHA512 (cairo-dock-fedora-3.5.99-20240926git7b3ac7f.tar.gz) = 012d20c3f53cee7a6ac401974efd6b2ca2c748582da2916b872dc5129d62b63aae2627f7dc9e3b6ef55ad10c0524a269733309fc557ddf27680f85cdc2a19244 From 3b13ad5992b94da50b945a10fdb2b65fa6c4ded8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Oct 2024 07:06:23 +0900 Subject: [PATCH 18/53] Update to the latest git (20241007git70394cf) Update to the latest git (20241007git70394cf) Update to the latest git (20241007git70394cf) Update to the latest git (20241007git70394cf) --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 1a2acd5..549e711 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20240926 -%global githash 7b3ac7fa3e367174c80e758856e19e8c0435995e +%global gitdate 20241007 +%global githash 70394cf8eaa412756ad46dc354a16567c0a68965 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun Oct 06 2024 Mamoru TASAKA - 3.5.99^20241007git70394cf-1 +- Update to the latest git (20241007git70394cf) + * Thu Sep 26 2024 Mamoru TASAKA - 3.5.99^20240926git7b3ac7f-1 - Update to the latest git (20240926git7b3ac7f) diff --git a/sources b/sources index 591b312..ac561c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20240926git7b3ac7f.tar.gz) = 012d20c3f53cee7a6ac401974efd6b2ca2c748582da2916b872dc5129d62b63aae2627f7dc9e3b6ef55ad10c0524a269733309fc557ddf27680f85cdc2a19244 +SHA512 (cairo-dock-fedora-3.5.99-20241007git70394cf.tar.gz) = cf58224fc0bb658ec1db23620dc3429ec46244f32180ea4e0d71670e0b01e1da98bf564a26b30a7de1d40ebe2ccb6c3020a6d2968f160143bdb429ad3f40b666 From 3fd8daae51b80fee12a9b342d6900373bcbe70a5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Oct 2024 08:26:49 +0900 Subject: [PATCH 19/53] again update --- cairo-dock.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 549e711..4ad8d3a 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -5,7 +5,7 @@ %global use_git 1 %global gitdate 20241007 -%global githash 70394cf8eaa412756ad46dc354a16567c0a68965 +%global githash 2149e52be177f4a28652453331d92d6ce7fc3174 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -25,7 +25,7 @@ ########################################## Name: cairo-dock -Version: %{mainver}%{?use_git:^%{gitdate}git%{shorthash}} +Version: %{mainver}%{?use_git:^%{gitdate}.1git%{shorthash}} Release: %{baserelease}%{?dist}%{flagrel} Summary: Light eye-candy fully themable animated dock @@ -255,8 +255,8 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog -* Sun Oct 06 2024 Mamoru TASAKA - 3.5.99^20241007git70394cf-1 -- Update to the latest git (20241007git70394cf) +* Sun Oct 06 2024 Mamoru TASAKA - 3.5.99^20241007.1git2149e52-1 +- Update to the latest git (20241007git2149e52) * Thu Sep 26 2024 Mamoru TASAKA - 3.5.99^20240926git7b3ac7f-1 - Update to the latest git (20240926git7b3ac7f) From fd4cd8b5475a5439ee9bf645249d5b1a2182af85 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Oct 2024 08:29:03 +0900 Subject: [PATCH 20/53] again update --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ac561c2..0fdea14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20241007git70394cf.tar.gz) = cf58224fc0bb658ec1db23620dc3429ec46244f32180ea4e0d71670e0b01e1da98bf564a26b30a7de1d40ebe2ccb6c3020a6d2968f160143bdb429ad3f40b666 +SHA512 (cairo-dock-fedora-3.5.99-20241007git2149e52.tar.gz) = 4836e47ce5dc23d9eeb97b6ec89d07b025062f66e87c61c87e0fcd5cc0f416008f0a9450c9679508e5653ebd8515d11f0402e9346572509947c92206d23999ff From 27f1da0ed7c0fc601e0b841e58ad3366ca1b7eb5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Oct 2024 14:59:28 +0900 Subject: [PATCH 21/53] Update to the latest git (20241013git0324720) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 4ad8d3a..8ce0138 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241007 -%global githash 2149e52be177f4a28652453331d92d6ce7fc3174 +%global gitdate 20241013 +%global githash 032472070e3a5bf1a8aa8167e2219da25c7ab6fd %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -25,7 +25,7 @@ ########################################## Name: cairo-dock -Version: %{mainver}%{?use_git:^%{gitdate}.1git%{shorthash}} +Version: %{mainver}%{?use_git:^%{gitdate}git%{shorthash}} Release: %{baserelease}%{?dist}%{flagrel} Summary: Light eye-candy fully themable animated dock @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Mon Oct 14 2024 Mamoru TASAKA - 3.5.99^20241013git0324720-1 +- Update to the latest git (20241013git0324720) + * Sun Oct 06 2024 Mamoru TASAKA - 3.5.99^20241007.1git2149e52-1 - Update to the latest git (20241007git2149e52) diff --git a/sources b/sources index 0fdea14..a6cf97a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20241007git2149e52.tar.gz) = 4836e47ce5dc23d9eeb97b6ec89d07b025062f66e87c61c87e0fcd5cc0f416008f0a9450c9679508e5653ebd8515d11f0402e9346572509947c92206d23999ff +SHA512 (cairo-dock-fedora-3.5.99-20241013git0324720.tar.gz) = ef98de162df01f60909c6813255d965be44008c958322b554590e29e858e0c3ae7c70dcd41c23da9adfe9fb006095afd193087c2b3cff1e7e0217704fdc9dbd3 From c987c51512f8485a814e6816959fb0ec8bd1f9dc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 20 Oct 2024 21:34:21 +0900 Subject: [PATCH 22/53] Update to the latest git (20241016gitea5d37e) --- cairo-dock.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 8ce0138..a9747ee 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241013 -%global githash 032472070e3a5bf1a8aa8167e2219da25c7ab6fd +%global gitdate 20241016 +%global githash ea5d37eaedd2e44e4c2f6e7dd652eeebf80ec34b %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun Oct 20 2024 Mamoru TASAKA - 3.5.99^20241016gitea5d37e-1 +- Update to the latest git (20241016gitea5d37e) + * Mon Oct 14 2024 Mamoru TASAKA - 3.5.99^20241013git0324720-1 - Update to the latest git (20241013git0324720) From 666521e37e857aa9abe95860af87dec692742a78 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 24 Oct 2024 09:15:56 +0900 Subject: [PATCH 23/53] limit depth to 1 --- cairo-dock-create-fedora-tarball.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cairo-dock-create-fedora-tarball.sh b/cairo-dock-create-fedora-tarball.sh index 5ace048..686e659 100644 --- a/cairo-dock-create-fedora-tarball.sh +++ b/cairo-dock-create-fedora-tarball.sh @@ -29,9 +29,9 @@ if [ "x${USE_GIT}" != "x" ] ; then git clone --depth 1 ${GIT_URL} cd ${REPONAME} - GITDATE=$(git log | sed -n -e 's|^Date:[ \t]*||p' | sed -e 's| \([+-][0-9][0-9]*\)$| UTC\1|') + GITDATE=$(git log -1 | sed -n -e 's|^Date:[ \t]*||p' | sed -e 's| \([+-][0-9][0-9]*\)$| UTC\1|') GITDAME_B="$(date -d "${GITDATE}" '+%Y%m%d')" - GITHASH="$(git log | sed -n -e 's|^commit[ \t]||p')" + GITHASH="$(git log -1 | sed -n -e 's|^commit[ \t]||p')" SHORTHASH=$(echo ${GITHASH:0:7}) cd .. cd .. From 00c1a9d72a2850ecc3492f7b896cea36993f8562 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 24 Oct 2024 09:33:46 +0900 Subject: [PATCH 24/53] Update to the latest git (20241024git9f9421e) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index a9747ee..52592c6 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,13 +4,13 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241016 -%global githash ea5d37eaedd2e44e4c2f6e7dd652eeebf80ec34b +%global gitdate 20241024 +%global githash 9f9421ee507515d5fe7241d28957be8772ee1161 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 1 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Thu Oct 24 2024 Mamoru TASAKA - 3.5.99^20241024git9f9421e-1 +- Update to the latest git (20241024git9f9421e) + * Sun Oct 20 2024 Mamoru TASAKA - 3.5.99^20241016gitea5d37e-1 - Update to the latest git (20241016gitea5d37e) diff --git a/sources b/sources index a6cf97a..54357ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20241013git0324720.tar.gz) = ef98de162df01f60909c6813255d965be44008c958322b554590e29e858e0c3ae7c70dcd41c23da9adfe9fb006095afd193087c2b3cff1e7e0217704fdc9dbd3 +SHA512 (cairo-dock-fedora-3.5.99-20241024git9f9421e.tar.gz) = 7a12d4ad588e6c09a10ceba207c4c1185375b78dd72a94b7a439d95ec342209f087a486a4c74a2c808fedbc2cc3d022d43aec86bc01b520802691039d195cddc From 0792ce0a3e62047fbe0f9915284cff3a553a713a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 19 Nov 2024 15:54:04 +0900 Subject: [PATCH 25/53] Update to the latest git (20241118git575a251) --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 52592c6..bfa1c63 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241024 -%global githash 9f9421ee507515d5fe7241d28957be8772ee1161 +%global gitdate 20241118 +%global githash 575a2519b2e5733f325148bdce92b97288a4c09a %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -255,6 +255,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Tue Nov 19 2024 Mamoru TASAKA - 3.5.99^20241118git575a251-1 +- Update to the latest git (20241118git575a251) + * Thu Oct 24 2024 Mamoru TASAKA - 3.5.99^20241024git9f9421e-1 - Update to the latest git (20241024git9f9421e) diff --git a/sources b/sources index 54357ff..de1c886 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20241024git9f9421e.tar.gz) = 7a12d4ad588e6c09a10ceba207c4c1185375b78dd72a94b7a439d95ec342209f087a486a4c74a2c808fedbc2cc3d022d43aec86bc01b520802691039d195cddc +SHA512 (cairo-dock-fedora-3.5.99-20241118git575a251.tar.gz) = 4318bae7549dce3035d7260fafe3d26557b221021d4b68f755f1042272e9ebd6c62b535fda140946976e3354ccf83a373cf9a8f966611a573559690eacb821f8 From dc58fc07e2ca35d98c0f358b4965972e0c5f4a4f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 8 Dec 2024 16:34:06 +0900 Subject: [PATCH 26/53] Update to the latest git (20241207gitea4bd97) --- cairo-dock.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index bfa1c63..a8c7699 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,13 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241118 -%global githash 575a2519b2e5733f325148bdce92b97288a4c09a +%global gitdate 20241207 +%global githash ea4bd9735da0e6fa199c9b99e58b76e296c6448c %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 +%global alphatag .beta5 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -26,7 +27,7 @@ Name: cairo-dock Version: %{mainver}%{?use_git:^%{gitdate}git%{shorthash}} -Release: %{baserelease}%{?dist}%{flagrel} +Release: %{baserelease}%{?alphatag}%{?dist}%{flagrel} Summary: Light eye-candy fully themable animated dock # Overall: GPL-3.0-or-later @@ -255,6 +256,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun Dec 08 2024 Mamoru TASAKA - 3.5.99^20241207gitea4bd97-1.beta5 +- Update to the latest git (20241207gitea4bd97) + * Tue Nov 19 2024 Mamoru TASAKA - 3.5.99^20241118git575a251-1 - Update to the latest git (20241118git575a251) diff --git a/sources b/sources index de1c886..bfc35a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20241118git575a251.tar.gz) = 4318bae7549dce3035d7260fafe3d26557b221021d4b68f755f1042272e9ebd6c62b535fda140946976e3354ccf83a373cf9a8f966611a573559690eacb821f8 +SHA512 (cairo-dock-fedora-3.5.99-20241207gitea4bd97.tar.gz) = 74d3215b20cd16d7297f471c4bb84431445b5372b0cf13b9596058712ac526c32868f175f0922488840cd3413a97166e37a0da247940346600fc272d3794fe98 From 0402e8bfb9cc34ee08e6f0cbb2f1280bcc36f8c8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 17 Dec 2024 21:43:53 +0900 Subject: [PATCH 27/53] Update to the latest git (20241216git4f36d13) --- cairo-dock.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index a8c7699..120d010 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241207 -%global githash ea4bd9735da0e6fa199c9b99e58b76e296c6448c +%global gitdate 20241216 +%global githash 4f36d13797c2ca508376c15d462cf644e71f69fb %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .beta5 +%global alphatag .beta6 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -68,10 +68,10 @@ BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk-layer-shell-0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(nlohmann_json) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(x11) @@ -256,6 +256,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Mon Dec 16 2024 Mamoru TASAKA - 3.5.99^20241216git4f36d13-1.beta6 +- Update to the latest git (20241216git4f36d13) + * Sun Dec 08 2024 Mamoru TASAKA - 3.5.99^20241207gitea4bd97-1.beta5 - Update to the latest git (20241207gitea4bd97) diff --git a/sources b/sources index bfc35a2..92066b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20241207gitea4bd97.tar.gz) = 74d3215b20cd16d7297f471c4bb84431445b5372b0cf13b9596058712ac526c32868f175f0922488840cd3413a97166e37a0da247940346600fc272d3794fe98 +SHA512 (cairo-dock-fedora-3.5.99-20241216git4f36d13.tar.gz) = 77763936ad2c2a329834a248b3ea5db61199600f6ecfedbcefadfc8f4c9bdabd8e9e7b652dd89321cfb614ca93e6cdc8ebffe7fc3eaa730427cda91ffc2728c1 From cd179e286c0a4a65bb8deb53bb2e39e5c6288764 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 29 Dec 2024 15:20:03 +0900 Subject: [PATCH 28/53] Update to the latest git (20241218gitf852640) --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 120d010..ecbc121 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241216 -%global githash 4f36d13797c2ca508376c15d462cf644e71f69fb +%global gitdate 20241218 +%global githash f8526402586820d05eefa18d4c8ca5e6d017c5e7 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -256,6 +256,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun Dec 29 2024 Mamoru TASAKA - 3.5.99^20241218gitf852640-1.beta6 +- Update to the latest git (20241218gitf852640) + * Mon Dec 16 2024 Mamoru TASAKA - 3.5.99^20241216git4f36d13-1.beta6 - Update to the latest git (20241216git4f36d13) diff --git a/sources b/sources index 92066b6..5c3633a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20241216git4f36d13.tar.gz) = 77763936ad2c2a329834a248b3ea5db61199600f6ecfedbcefadfc8f4c9bdabd8e9e7b652dd89321cfb614ca93e6cdc8ebffe7fc3eaa730427cda91ffc2728c1 +SHA512 (cairo-dock-fedora-3.5.99-20241218gitf852640.tar.gz) = 4a2bb327640d9c4635028550d9a289ea612784432ce26289bb266e802606b189129cd4898d2b3b797789d0e992b413a30901f2a6eef2fade86deafe98a085d35 From 39eb463a8740dfbada970cc9d032f582dac4222c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:11:52 +0000 Subject: [PATCH 29/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cairo-dock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index ecbc121..0ef9838 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .beta6 %undefine _ld_strict_symbol_defs @@ -256,6 +256,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.5.99^20241218gitf852640-2.beta6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Dec 29 2024 Mamoru TASAKA - 3.5.99^20241218gitf852640-1.beta6 - Update to the latest git (20241218gitf852640) From c636402b942e4dc8f2f3a65d307bafcd105c1a99 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 19 Jan 2025 16:48:02 +0900 Subject: [PATCH 30/53] Update to the latest git (20250118gitb0f5d5c) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 0ef9838..bd62b62 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,13 +4,13 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241218 -%global githash f8526402586820d05eefa18d4c8ca5e6d017c5e7 +%global gitdate 20250118 +%global githash b0f5d5c6d56f77e360d21aa8d95f91621a2f08ba %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 1 %global alphatag .beta6 %undefine _ld_strict_symbol_defs @@ -256,6 +256,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun Jan 19 2025 Mamoru TASAKA - 3.5.99^20250118gitb0f5d5c-1.beta6 +- Update to the latest git (20250118gitb0f5d5c) + * Thu Jan 16 2025 Fedora Release Engineering - 3.5.99^20241218gitf852640-2.beta6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 5c3633a..5a0328f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20241218gitf852640.tar.gz) = 4a2bb327640d9c4635028550d9a289ea612784432ce26289bb266e802606b189129cd4898d2b3b797789d0e992b413a30901f2a6eef2fade86deafe98a085d35 +SHA512 (cairo-dock-fedora-3.5.99-20250118gitb0f5d5c.tar.gz) = 30c1a4edabeb9797a379abedb2d8656e37bb214cc3785cd298a6d48135e61b2ce293b1f499191b7245331378628a28f871f065d12bec4d280cea2030df9639d0 From 84bcc20f2aa2b58f1ac6709cffebd90844a20e6d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 30 Jan 2025 16:11:24 +0900 Subject: [PATCH 31/53] 20250120gitd2fd789 --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index bd62b62..e42e0b6 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250118 -%global githash b0f5d5c6d56f77e360d21aa8d95f91621a2f08ba +%global gitdate 20250120 +%global githash d2fd78961932a22af70219d7e223aa17c055e406 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .beta6 +%global alphatag .rc1 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -256,6 +256,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Thu Jan 30 2025 Mamoru TASAKA - 3.5.99^20250120gitd2fd789-1.rc1 +- Update to the latest git (20250120gitd2fd789) + * Sun Jan 19 2025 Mamoru TASAKA - 3.5.99^20250118gitb0f5d5c-1.beta6 - Update to the latest git (20250118gitb0f5d5c) diff --git a/sources b/sources index 5a0328f..1667ca7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250118gitb0f5d5c.tar.gz) = 30c1a4edabeb9797a379abedb2d8656e37bb214cc3785cd298a6d48135e61b2ce293b1f499191b7245331378628a28f871f065d12bec4d280cea2030df9639d0 +SHA512 (cairo-dock-fedora-3.5.99-20250120gitd2fd789.tar.gz) = 9d02c38f0b07b1b49bafe3abc4ed790eaae69bc5b669e41aba1216473c732f7d63bad58e9cd6f54cfc536c5b6ae38137f5a2363b76205f528f4c6581ffd3509b From 9807b166b9e6215c6a4aa63dee4d00954c892145 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Feb 2025 14:38:30 +0900 Subject: [PATCH 32/53] update to the latest git --- cairo-dock.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index e42e0b6..9fc5348 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250120 -%global githash d2fd78961932a22af70219d7e223aa17c055e406 +%global gitdate 20250211 +%global githash 443d8da7de72d85fe6401c47788f67ab37d97b16 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -73,6 +73,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) @@ -256,6 +257,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Thu Feb 13 2025 Mamoru TASAKA - 3.5.99^20250211git443d8da-1.rc1 +- Update to the latest git (20250211git443d8da) + * Thu Jan 30 2025 Mamoru TASAKA - 3.5.99^20250120gitd2fd789-1.rc1 - Update to the latest git (20250120gitd2fd789) diff --git a/sources b/sources index 1667ca7..6415875 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250120gitd2fd789.tar.gz) = 9d02c38f0b07b1b49bafe3abc4ed790eaae69bc5b669e41aba1216473c732f7d63bad58e9cd6f54cfc536c5b6ae38137f5a2363b76205f528f4c6581ffd3509b +SHA512 (cairo-dock-fedora-3.5.99-20250211git443d8da.tar.gz) = 01e7f19f49d73c322e4061d628913866b396e4307f8595b66693c0c6feea2c15ca556b1aaee3325f6fec0ea05677dbc162c7da2432fa89613f96697845c4810a From 2b3aebac06b076edd6cff3e41d2246907b462a34 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Feb 2025 14:26:39 +0900 Subject: [PATCH 33/53] update to the latest git --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 9fc5348..9658bef 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250211 -%global githash 443d8da7de72d85fe6401c47788f67ab37d97b16 +%global gitdate 20250214 +%global githash ddcff9ea6cfee0556909f1a48a968c5c649e68ce %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc1 +%global alphatag .rc2 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -257,6 +257,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Fri Feb 14 2025 Mamoru TASAKA - 3.5.99^20250214gitddcff9e-1.rc2 +- Update to the latest git (20250214gitddcff9e) + * Thu Feb 13 2025 Mamoru TASAKA - 3.5.99^20250211git443d8da-1.rc1 - Update to the latest git (20250211git443d8da) diff --git a/sources b/sources index 6415875..1d27651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250211git443d8da.tar.gz) = 01e7f19f49d73c322e4061d628913866b396e4307f8595b66693c0c6feea2c15ca556b1aaee3325f6fec0ea05677dbc162c7da2432fa89613f96697845c4810a +SHA512 (cairo-dock-fedora-3.5.99-20250214gitddcff9e.tar.gz) = 1987a0430e17fde4bd83b6b35f4d3e5796f22cdf358ef20f0ce188c8f65e973ef177a99a96d3c006dc8251ed8ea0c44adedcefb96ef566efcbb31aed6c5a23e9 From 9c1ff8bbe0f0de236260911b6139990e381d305d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 18 Feb 2025 22:20:34 +0900 Subject: [PATCH 34/53] update to the latest git --- cairo-dock.spec | 10 ++++++++-- sources | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 9658bef..54b1d46 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250214 -%global githash ddcff9ea6cfee0556909f1a48a968c5c649e68ce +%global gitdate 20250218 +%global githash 77bc3883bad11c765c273790384ce1c3ee92e4b7 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -148,6 +148,9 @@ sed -i.stat \ # Modify version forcely sed -i CMakeLists.txt -e '\@set (VERSION @s|VERSION.*|VERSION "%{mainver}")|' +# Don't set rpath +sed -i CMakeLists.txt -e '\@APPEND.*CMAKE_INSTALL_RPATH@d' + %build %set_build_flags @@ -257,6 +260,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Tue Feb 18 2025 Mamoru TASAKA - 3.5.99^20250218git77bc388-1.rc2 +- Update to the latest git (20250218git77bc388) + * Fri Feb 14 2025 Mamoru TASAKA - 3.5.99^20250214gitddcff9e-1.rc2 - Update to the latest git (20250214gitddcff9e) diff --git a/sources b/sources index 1d27651..c69e7dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250214gitddcff9e.tar.gz) = 1987a0430e17fde4bd83b6b35f4d3e5796f22cdf358ef20f0ce188c8f65e973ef177a99a96d3c006dc8251ed8ea0c44adedcefb96ef566efcbb31aed6c5a23e9 +SHA512 (cairo-dock-fedora-3.5.99-20250218git77bc388.tar.gz) = 1a68916cbf6f48e4cfebc075b74aa8d79789af1d6825e06a100b974be8900133c7f31af20482b5d864d46b08e215a388d8f471453ac17e386813bb44da592b70 From d5ddf3189488dd34c03c3abf4a98fe2504dbd5d8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 2 Mar 2025 23:11:35 +0900 Subject: [PATCH 35/53] update to the latest git --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 54b1d46..66f6af7 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250218 -%global githash 77bc3883bad11c765c273790384ce1c3ee92e4b7 +%global gitdate 20250223 +%global githash e2c28d13ac1940fbe4a5439cb9433b69008b21be %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -260,6 +260,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun Mar 02 2025 Mamoru TASAKA - 3.5.99^20250223gite2c28d1-1.rc2 +- Update to the latest git (20250223gite2c28d1) + * Tue Feb 18 2025 Mamoru TASAKA - 3.5.99^20250218git77bc388-1.rc2 - Update to the latest git (20250218git77bc388) diff --git a/sources b/sources index c69e7dd..d4bddf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250218git77bc388.tar.gz) = 1a68916cbf6f48e4cfebc075b74aa8d79789af1d6825e06a100b974be8900133c7f31af20482b5d864d46b08e215a388d8f471453ac17e386813bb44da592b70 +SHA512 (cairo-dock-fedora-3.5.99-20250223gite2c28d1.tar.gz) = 0908926a02c8d02894f8e3dc2d39386e596f9e654ddf2fbc5530bfb6af35209946e9ac47c90d28f84ce88ba1820313126ffa994d80d075dfdbe629e009aae297 From aa1412ae55d88564c80dd8b1731b3b3de2618d60 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Mar 2025 14:11:15 +0900 Subject: [PATCH 36/53] Update to the latest git (20250309gita77d61b) --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 66f6af7..80f602b 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250223 -%global githash e2c28d13ac1940fbe4a5439cb9433b69008b21be +%global gitdate 20250309 +%global githash a77d61b70fb060d2dbd9b7615d90a77295b36600 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -260,6 +260,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Thu Mar 13 2025 Mamoru TASAKA - 3.5.99^20250309gita77d61b-1.rc2 +- Update to the latest git (20250309gita77d61b) + * Sun Mar 02 2025 Mamoru TASAKA - 3.5.99^20250223gite2c28d1-1.rc2 - Update to the latest git (20250223gite2c28d1) diff --git a/sources b/sources index d4bddf4..f19b78a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250223gite2c28d1.tar.gz) = 0908926a02c8d02894f8e3dc2d39386e596f9e654ddf2fbc5530bfb6af35209946e9ac47c90d28f84ce88ba1820313126ffa994d80d075dfdbe629e009aae297 +SHA512 (cairo-dock-fedora-3.5.99-20250309gita77d61b.tar.gz) = 8e39fdc947420f147477f6e362bcb55d5db77c985cc0936698b7a7e73170d574cb745580bb76977500527ea7540f12fdbb5af0a688658f8cf65c81902bfd4ab4 From a25f2da55ed169966540a43f4e2f38f7f87587f5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 19 Jun 2025 14:38:01 +0900 Subject: [PATCH 37/53] Update to the latest git (20250618git89864a0) --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 80f602b..d78c3b3 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250309 -%global githash a77d61b70fb060d2dbd9b7615d90a77295b36600 +%global gitdate 20250618 +%global githash 89864a00fbf1db036d6609867def488915ba490d %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -260,6 +260,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Thu Jun 19 2025 Mamoru TASAKA - 3.5.99^20250618git89864a0-1.rc2 +- Update to the latest git (20250618git89864a0) + * Thu Mar 13 2025 Mamoru TASAKA - 3.5.99^20250309gita77d61b-1.rc2 - Update to the latest git (20250309gita77d61b) diff --git a/sources b/sources index f19b78a..ee0662f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250309gita77d61b.tar.gz) = 8e39fdc947420f147477f6e362bcb55d5db77c985cc0936698b7a7e73170d574cb745580bb76977500527ea7540f12fdbb5af0a688658f8cf65c81902bfd4ab4 +SHA512 (cairo-dock-fedora-3.5.99-20250618git89864a0.tar.gz) = 2ab8dd85aed5aa74af086edc4ce0d2c8e1f350cc957311bb68c98f5a27688280130cb9887447ea5f4049e4ad0f706a6deb2789bab5da0756c65b8bfba7d0e40e From 7bdaf1673971561c576d023961cbb774791137a3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 19 Jun 2025 15:03:23 +0900 Subject: [PATCH 38/53] don't try systemd-notify on buildroot --- cairo-dock.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cairo-dock.spec b/cairo-dock.spec index d78c3b3..4c10973 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -151,6 +151,9 @@ sed -i CMakeLists.txt -e '\@set (VERSION @s|VERSION.*|VERSION "%{mainver}")|' # Don't set rpath sed -i CMakeLists.txt -e '\@APPEND.*CMAKE_INSTALL_RPATH@d' +# Don't check / try systemd-notify on buildroot +sed -i CMakeLists.txt -e '\@SYSTEMD_COMMAND@s|systemd-notify|true|' + %build %set_build_flags From 0bd2de7f09498220e7dbb7ece03919dd6b444be2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Jun 2025 17:24:49 +0900 Subject: [PATCH 39/53] Update to the latest git (20250623git6b5d476) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 4c10973..c80d1bf 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250618 -%global githash 89864a00fbf1db036d6609867def488915ba490d +%global gitdate 20250623 +%global githash 6b5d47663683ccc5169251d21d03c98ed5dae020 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc2 +%global alphatag .rc3 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Mon Jun 30 2025 Mamoru TASAKA - 3.5.99^20250623git6b5d476-1.rc3 +- Update to the latest git (20250623git6b5d476) + * Thu Jun 19 2025 Mamoru TASAKA - 3.5.99^20250618git89864a0-1.rc2 - Update to the latest git (20250618git89864a0) diff --git a/sources b/sources index ee0662f..bad2a1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250618git89864a0.tar.gz) = 2ab8dd85aed5aa74af086edc4ce0d2c8e1f350cc957311bb68c98f5a27688280130cb9887447ea5f4049e4ad0f706a6deb2789bab5da0756c65b8bfba7d0e40e +SHA512 (cairo-dock-fedora-3.5.99-20250623git6b5d476.tar.gz) = 39a2142637876d02def44f3931371f2ef129ec313d5e77eb45e9f6a5883d0a81de798f21aab08afc6fc36ed9890e42b7d3a20c05fda890b08fa2c7c66cf4fd3d From a8798f4fa04f7307a943cf27e1fc95b9b35b5880 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Jul 2025 16:56:01 +0900 Subject: [PATCH 40/53] Update to the latest git (20250714gite852048) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index c80d1bf..65be6a6 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250623 -%global githash 6b5d47663683ccc5169251d21d03c98ed5dae020 +%global gitdate 20250714 +%global githash e852048b22efc746c095f4fad19e0973fb836a3d %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc3 +%global alphatag .rc6 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Mon Jul 14 2025 Mamoru TASAKA - 3.5.99^20250714gite852048-1.rc6 +- Update to the latest git (20250714gite852048) + * Mon Jun 30 2025 Mamoru TASAKA - 3.5.99^20250623git6b5d476-1.rc3 - Update to the latest git (20250623git6b5d476) diff --git a/sources b/sources index bad2a1a..201f659 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250623git6b5d476.tar.gz) = 39a2142637876d02def44f3931371f2ef129ec313d5e77eb45e9f6a5883d0a81de798f21aab08afc6fc36ed9890e42b7d3a20c05fda890b08fa2c7c66cf4fd3d +SHA512 (cairo-dock-fedora-3.5.99-20250714gite852048.tar.gz) = e1a5d45fe11afe8394114396b1e2445bd4150c3dd58d4b7f22f32b5b25dbf5cd3bff4c0af7b482510836c41b92d108c2ee657e1fe2c1557e4a0ac195e7863037 From 6d224c4c7c2e494e6447c59937c23b7002c2f77d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:02:31 +0000 Subject: [PATCH 41/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cairo-dock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 65be6a6..0469120 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .rc6 %undefine _ld_strict_symbol_defs @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.5.99^20250714gite852048-2.rc6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 14 2025 Mamoru TASAKA - 3.5.99^20250714gite852048-1.rc6 - Update to the latest git (20250714gite852048) From afef5626191bb52e4499a70b8372ef878dd1f80a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 25 Jul 2025 14:58:15 +0900 Subject: [PATCH 42/53] Update to the latest git (20250716git033945c) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 0469120..c3b96a8 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,13 +4,13 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250714 -%global githash e852048b22efc746c095f4fad19e0973fb836a3d +%global gitdate 20250716 +%global githash 033945cc4ec48746f5df80fc3ccab0595e410d85 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 1 %global alphatag .rc6 %undefine _ld_strict_symbol_defs @@ -266,6 +266,9 @@ popd * Wed Jul 23 2025 Fedora Release Engineering - 3.5.99^20250714gite852048-2.rc6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Wed Jul 23 2025 Mamoru TASAKA - 3.5.99^20250716git033945c-1.rc6 +- Update to the latest git (20250716git033945c) + * Mon Jul 14 2025 Mamoru TASAKA - 3.5.99^20250714gite852048-1.rc6 - Update to the latest git (20250714gite852048) diff --git a/sources b/sources index 201f659..65ec12d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250714gite852048.tar.gz) = e1a5d45fe11afe8394114396b1e2445bd4150c3dd58d4b7f22f32b5b25dbf5cd3bff4c0af7b482510836c41b92d108c2ee657e1fe2c1557e4a0ac195e7863037 +SHA512 (cairo-dock-fedora-3.5.99-20250716git033945c.tar.gz) = f472142adc8e84656a31a832996c228d5e3378d2b2decade87d814bb51b40dabfec0589c3e6b37eb5e9ffe2abaaba68910c3ffdb9b202da01574a88749f3c408 From 018ee0c7b0ee676f95223a7bdad6f6900536f5d8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 29 Jul 2025 16:26:58 +0900 Subject: [PATCH 43/53] Update to the latest git (20250729gitc86686d) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index c3b96a8..4cdc9e8 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250716 -%global githash 033945cc4ec48746f5df80fc3ccab0595e410d85 +%global gitdate 20250729 +%global githash c86686d16925052015ae45b5677ca611aa8ec13c %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc6 +%global alphatag .rc7 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Tue Jul 29 2025 Mamoru TASAKA - 3.5.99^20250729gitc86686d-1.rc7 +- Update to the latest git (20250729gitc86686d) + * Wed Jul 23 2025 Fedora Release Engineering - 3.5.99^20250714gite852048-2.rc6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 65ec12d..b348b15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250716git033945c.tar.gz) = f472142adc8e84656a31a832996c228d5e3378d2b2decade87d814bb51b40dabfec0589c3e6b37eb5e9ffe2abaaba68910c3ffdb9b202da01574a88749f3c408 +SHA512 (cairo-dock-fedora-3.5.99-20250729gitc86686d.tar.gz) = 2d73137e537ebc6956d072504ac601d063a49430728f059e6081105409057177194198be4e142b2f7541d9658df1fa6f4c5ef424a91d2e8bf71821158286165a From e8aaed4da172b90f53570ab3ee781cd1b92a1b6c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 12 Aug 2025 16:06:21 +0900 Subject: [PATCH 44/53] Update to the latest git (20250812gitba992c4) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 4cdc9e8..85c9012 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250729 -%global githash c86686d16925052015ae45b5677ca611aa8ec13c +%global gitdate 20250812 +%global githash ba992c49d8db5750af0d03131e08b3ffa4dfff21 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc7 +%global alphatag .rc8 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Tue Aug 12 2025 Mamoru TASAKA - 3.5.99^20250812gitba992c4-1.rc8 +- Update to the latest git (20250812gitba992c4) + * Tue Jul 29 2025 Mamoru TASAKA - 3.5.99^20250729gitc86686d-1.rc7 - Update to the latest git (20250729gitc86686d) diff --git a/sources b/sources index b348b15..6281161 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250729gitc86686d.tar.gz) = 2d73137e537ebc6956d072504ac601d063a49430728f059e6081105409057177194198be4e142b2f7541d9658df1fa6f4c5ef424a91d2e8bf71821158286165a +SHA512 (cairo-dock-fedora-3.5.99-20250812gitba992c4.tar.gz) = c4da7d4222255c883b75b040a20c24c4ad111e22ed2502dd302debebc03a1ee0b92382a87189ce840d9ca96abb06710eaec12db436a82b2ebfb27584c7e77706 From 5085fdfc00f35448ad6ba64c07fddf90ed88ec2a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Aug 2025 22:47:03 +0900 Subject: [PATCH 45/53] Update to the latest git (20250822gitf3de00e) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 85c9012..b9caaf6 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250812 -%global githash ba992c49d8db5750af0d03131e08b3ffa4dfff21 +%global gitdate 20250822 +%global githash f3de00e03ec30effab1698d79fc0cc9c012d5e8d %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc8 +%global alphatag .rc9 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Sun Aug 24 2025 Mamoru TASAKA - 3.5.99^20250822gitf3de00e-1.rc9 +- Update to the latest git (20250822gitf3de00e) + * Tue Aug 12 2025 Mamoru TASAKA - 3.5.99^20250812gitba992c4-1.rc8 - Update to the latest git (20250812gitba992c4) diff --git a/sources b/sources index 6281161..9d751e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250812gitba992c4.tar.gz) = c4da7d4222255c883b75b040a20c24c4ad111e22ed2502dd302debebc03a1ee0b92382a87189ce840d9ca96abb06710eaec12db436a82b2ebfb27584c7e77706 +SHA512 (cairo-dock-fedora-3.5.99-20250822gitf3de00e.tar.gz) = d745f7537f3c3502a60e1022461e8ebf76a99a21726c871667fae7abf350bbd31a21893391d340f2182bca5e9b04b654d682417107ebf78b66b6a9dd4471bc34 From 77599823c803ab04a1072aa9d71570d0f55870df Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 1 Sep 2025 17:19:57 +0900 Subject: [PATCH 46/53] update to the latest git --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index b9caaf6..bf09b8f 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250822 -%global githash f3de00e03ec30effab1698d79fc0cc9c012d5e8d +%global gitdate 20250901 +%global githash 8460fe252b36a2d0e06f95a7fd0b1e0095b88c43 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Mon Sep 01 2025 Mamoru TASAKA - 3.5.99^20250901git8460fe2-1.rc9 +- Update to the latest git (20250901git8460fe2) + * Sun Aug 24 2025 Mamoru TASAKA - 3.5.99^20250822gitf3de00e-1.rc9 - Update to the latest git (20250822gitf3de00e) diff --git a/sources b/sources index 9d751e0..e9c485e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250822gitf3de00e.tar.gz) = d745f7537f3c3502a60e1022461e8ebf76a99a21726c871667fae7abf350bbd31a21893391d340f2182bca5e9b04b654d682417107ebf78b66b6a9dd4471bc34 +SHA512 (cairo-dock-fedora-3.5.99-20250901git8460fe2.tar.gz) = e362519e8e948c17d9df51afd7b9972f96eb488141d23f35a50b253aad06d5fe9df4a332932423da4f6d6bec07a4eae8612a11e24ec49e71e76391a9809dc392 From 761745f4b88bfbe36737e9a03f77d1feab0b6c2b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 8 Sep 2025 22:10:15 +0900 Subject: [PATCH 47/53] Update to the latest git (20250907git2cd4d36) --- cairo-dock.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index bf09b8f..c0251e1 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,14 +4,14 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250901 -%global githash 8460fe252b36a2d0e06f95a7fd0b1e0095b88c43 +%global gitdate 20250907 +%global githash 2cd4d366047cacd66b3e1a3067bc34e1c315bde0 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc9 +%global alphatag .rcb %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Mon Sep 08 2025 Mamoru TASAKA - 3.5.99^20250907git2cd4d36-1.rcb +- Update to the latest git (20250907git2cd4d36) + * Mon Sep 01 2025 Mamoru TASAKA - 3.5.99^20250901git8460fe2-1.rc9 - Update to the latest git (20250901git8460fe2) diff --git a/sources b/sources index e9c485e..57bfd1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250901git8460fe2.tar.gz) = e362519e8e948c17d9df51afd7b9972f96eb488141d23f35a50b253aad06d5fe9df4a332932423da4f6d6bec07a4eae8612a11e24ec49e71e76391a9809dc392 +SHA512 (cairo-dock-fedora-3.5.99-20250907git2cd4d36.tar.gz) = 603bdb5b6d0c86894980d1696738b0ab2b84637b18f56b1b153ee6a579914b0ba62e9f50c23ef11a9f37e34b8529824d039e8a5f53e261a7990ab53f59cc7580 From 8e75dec9ec5fda72af55657d5475dfa62cbb8e38 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 25 Sep 2025 10:46:26 +0900 Subject: [PATCH 48/53] update to the latest git --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index c0251e1..367d498 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250907 -%global githash 2cd4d366047cacd66b3e1a3067bc34e1c315bde0 +%global gitdate 20250922 +%global githash bbdf30b67241dbf61dea651b636a07da5cc39049 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -263,6 +263,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Wed Sep 24 2025 Mamoru TASAKA - 3.5.99^20250922gitbbdf30b-1.rcb +- Update to the latest git (20250922gitbbdf30b) + * Mon Sep 08 2025 Mamoru TASAKA - 3.5.99^20250907git2cd4d36-1.rcb - Update to the latest git (20250907git2cd4d36) diff --git a/sources b/sources index 57bfd1a..172daab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250907git2cd4d36.tar.gz) = 603bdb5b6d0c86894980d1696738b0ab2b84637b18f56b1b153ee6a579914b0ba62e9f50c23ef11a9f37e34b8529824d039e8a5f53e261a7990ab53f59cc7580 +SHA512 (cairo-dock-fedora-3.5.99-20250922gitbbdf30b.tar.gz) = e9dbcd8df608270e2d3aeaede2f69778e2210d4b28e7b153cb058c4d7a3fcb0f0b5bb835bbe9a8fef225495deca516131be1bea8188017029899fcca5137033a From 51c75f128036adc167d7bfdc733b7c7a5f50c996 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Oct 2025 17:38:14 +0900 Subject: [PATCH 49/53] 3.6.0 --- cairo-dock.spec | 13 +++++++++---- sources | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 367d498..385aacf 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,9 +1,9 @@ -%global urlver 3.5 -%global mainver 3.5.99 +%global urlver 3.6 +%global mainver 3.6.0 %global plugin_least_ver 3.5.99 -%global use_git 1 +%dnl %global use_git 1 %global gitdate 20250922 %global githash bbdf30b67241dbf61dea651b636a07da5cc39049 %global shorthash %(c=%{githash} ; echo ${c:0:7}) @@ -11,7 +11,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rcb +%dnl %global alphatag .rcb %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -146,7 +146,9 @@ sed -i.stat \ po/CMakeLists.txt # Modify version forcely +%if 0%{?use_git} sed -i CMakeLists.txt -e '\@set (VERSION @s|VERSION.*|VERSION "%{mainver}")|' +%endif # Don't set rpath sed -i CMakeLists.txt -e '\@APPEND.*CMAKE_INSTALL_RPATH@d' @@ -263,6 +265,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Wed Oct 01 2025 Mamoru TASAKA - 3.6.0-1 +- 3.6.0 + * Wed Sep 24 2025 Mamoru TASAKA - 3.5.99^20250922gitbbdf30b-1.rcb - Update to the latest git (20250922gitbbdf30b) diff --git a/sources b/sources index 172daab..8d1de55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.5.99-20250922gitbbdf30b.tar.gz) = e9dbcd8df608270e2d3aeaede2f69778e2210d4b28e7b153cb058c4d7a3fcb0f0b5bb835bbe9a8fef225495deca516131be1bea8188017029899fcca5137033a +SHA512 (cairo-dock-fedora-3.6.0.tar.gz) = df8f1a9197db8caee0684bcac8f61f936c360a56e92a3f8b1dd8fc612595bbf13af63f478af6dd9811b2080623cdb84a8b3c0b0a6ef02b6b440c9f746e45973b From a6a67c59e7374f165336bccafd62ec6ed2ac4687 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Oct 2025 17:45:12 +0900 Subject: [PATCH 50/53] fix plug-ins requirement --- cairo-dock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 385aacf..9515045 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,7 +1,7 @@ %global urlver 3.6 %global mainver 3.6.0 -%global plugin_least_ver 3.5.99 +%global plugin_least_ver 3.6.0 %dnl %global use_git 1 %global gitdate 20250922 From f2ab26136892c22b2cc2f1070f01a89796017394 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Oct 2025 14:10:17 +0900 Subject: [PATCH 51/53] Upstream patch for warning for disabling zoom effect --- cairo-dock-pr157-disabled-zoom-feature.patch | 78 ++++++++++++++++++++ cairo-dock.spec | 10 ++- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 cairo-dock-pr157-disabled-zoom-feature.patch diff --git a/cairo-dock-pr157-disabled-zoom-feature.patch b/cairo-dock-pr157-disabled-zoom-feature.patch new file mode 100644 index 0000000..0ddaf33 --- /dev/null +++ b/cairo-dock-pr157-disabled-zoom-feature.patch @@ -0,0 +1,78 @@ +From 4d2034db650a64315e9663f5ee89cad84692c693 Mon Sep 17 00:00:00 2001 +From: Daniel Kondor +Date: Wed, 15 Oct 2025 18:13:22 +0200 +Subject: [PATCH] gui-factory: add a warning about disabled zoom feature + +If Cairo-Dock is compiled with `-DAVOID_PATENT_CRAP`, the Zoom feature will be disabled. Adjust the settings GUI to disable the relevant settings and display a warning. +--- + src/gldit/cairo-dock-gui-factory.c | 33 ++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +diff --git a/src/gldit/cairo-dock-gui-factory.c b/src/gldit/cairo-dock-gui-factory.c +index fcd639bc..7e846e2e 100644 +--- a/src/gldit/cairo-dock-gui-factory.c ++++ b/src/gldit/cairo-dock-gui-factory.c +@@ -51,6 +51,7 @@ + #include "cairo-dock-desktop-manager.h" + #include "cairo-dock-separator-manager.h" // GLDI_OBJECT_IS_SEPARATOR_ICON + #include "cairo-dock-menu.h" // gldi_menu_item_new_full2 ++#include "cairo-dock-file-manager.h" // cairo_dock_fm_launch_uri + #include "cairo-dock-gui-factory.h" + + #define CAIRO_DOCK_ICON_MARGIN 6 +@@ -1838,6 +1839,11 @@ const gchar *cairo_dock_parse_key_comment (gchar *cKeyComment, char *iElementTyp + return cUsefulComment; + } + ++static gboolean _open_btn_url (GtkLinkButton *pURL, G_GNUC_UNUSED gpointer data) ++{ ++ return cairo_dock_fm_launch_uri (gtk_link_button_get_uri (pURL)); ++} ++ + GtkWidget *cairo_dock_build_group_widget (GKeyFile *pKeyFile, const gchar *cGroupName, const gchar *cGettextDomain, GtkWidget *pMainWindow, GSList **pWidgetList, GPtrArray *pDataGarbage, const gchar *cOriginalConfFilePath) + { + g_return_val_if_fail (pKeyFile != NULL && cGroupName != NULL, NULL); +@@ -3087,9 +3093,15 @@ GtkWidget *cairo_dock_build_group_widget (GKeyFile *pKeyFile, const gchar *cGrou + } + + GtkWidget *pExternFrame; ++ gboolean bDisabled = FALSE; + if (iElementType == CAIRO_DOCK_WIDGET_FRAME) + { + pExternFrame = gtk_frame_new (NULL); ++#ifndef AVOID_PATENT_CRAP ++ // do nothing, bDisabled already set to FALSE ++#else ++ bDisabled = !g_strcmp0 (cValue, "Zoom effect"); ++#endif + gtk_container_set_border_width (GTK_CONTAINER (pExternFrame), CAIRO_DOCK_GUI_MARGIN); + gtk_frame_set_shadow_type (GTK_FRAME (pExternFrame), GTK_SHADOW_OUT); + gtk_frame_set_label_widget (GTK_FRAME (pExternFrame), (pLabelContainer != NULL ? pLabelContainer : pLabel)); +@@ -3116,8 +3128,25 @@ GtkWidget *cairo_dock_build_group_widget (GKeyFile *pKeyFile, const gchar *cGrou + 0); + + pFrameVBox = gtk_box_new (GTK_ORIENTATION_VERTICAL, CAIRO_DOCK_GUI_MARGIN); +- gtk_container_add (GTK_CONTAINER (pFrame), +- pFrameVBox); ++ if (bDisabled) { ++ gtk_widget_set_sensitive (pFrameVBox, FALSE); ++ ++ GtkWidget *pBoxV = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++ GtkWidget *pBoxH = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++ GtkWidget *pImg = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_MENU); ++ GtkWidget *pLbl = gtk_label_new (_("Cairo-Dock has been built with the icon zoom effect disabled. See here for more info: ")); ++ GtkWidget *pURL = gtk_link_button_new ("https://github.com/Cairo-Dock/cairo-dock-core/issues/156"); ++ // note: we use our own handler to open URLs so that we can use systemd to launch the browser if needed ++ g_signal_connect (G_OBJECT (pURL), "activate-link", G_CALLBACK (_open_btn_url), NULL); ++ ++ gtk_box_pack_start (GTK_BOX (pBoxH), pImg, FALSE, FALSE, 20); ++ gtk_box_pack_start (GTK_BOX (pBoxH), pLbl, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (pBoxH), pURL, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (pBoxV), pBoxH, FALSE, FALSE, 5); ++ gtk_box_pack_start (GTK_BOX (pBoxV), pFrameVBox, FALSE, FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (pFrame), pBoxV); ++ } ++ else gtk_container_add (GTK_CONTAINER (pFrame), pFrameVBox); + + if (pAuthorizedValuesList[0] == NULL || *pAuthorizedValuesList[0] == '\0') + g_free (cValue); diff --git a/cairo-dock.spec b/cairo-dock.spec index 9515045..e2d58a8 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %dnl %global alphatag .rcb %undefine _ld_strict_symbol_defs @@ -43,6 +43,8 @@ Source0: cairo-dock-fedora-%{tarballver}.tar.gz Source1: cairo-dock-create-fedora-tarball.sh # And some legal explanation Source2: LEGAL.fedora.cairo-dock +# https://github.com/Cairo-Dock/cairo-dock-core/pull/157 +Patch0: cairo-dock-pr157-disabled-zoom-feature.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -171,6 +173,9 @@ export CXXFLAGS="$(echo $CXXFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t] export LDFLAGS="$(echo $LDFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')" %endif +# PATCH157 needs this: remove this when patch is included in tarball +export CFLAGS="$CFLAGS -DAVOID_PATENT_CRAP=1" + rm -f CMakeCache.txt %cmake \ -DCMAKE_SKIP_RPATH:BOOL=ON \ @@ -265,6 +270,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Fri Oct 17 2025 Mamoru TASAKA - 3.6.0-2 +- Upstream patch for warning for disabling zoom effect + * Wed Oct 01 2025 Mamoru TASAKA - 3.6.0-1 - 3.6.0 From 83ecd1a3273c4f9d11d769719ea198821ffd0bbb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 4 Nov 2025 16:48:28 +0900 Subject: [PATCH 52/53] 3.6.1 --- cairo-dock.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index e2d58a8..1cd4748 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,5 +1,5 @@ %global urlver 3.6 -%global mainver 3.6.0 +%global mainver 3.6.1 %global plugin_least_ver 3.6.0 @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 1 %dnl %global alphatag .rcb %undefine _ld_strict_symbol_defs @@ -270,6 +270,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Tue Nov 04 2025 Mamoru TASAKA - 3.6.1-1 +- 3.6.1 + * Fri Oct 17 2025 Mamoru TASAKA - 3.6.0-2 - Upstream patch for warning for disabling zoom effect diff --git a/sources b/sources index 8d1de55..0658a92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.0.tar.gz) = df8f1a9197db8caee0684bcac8f61f936c360a56e92a3f8b1dd8fc612595bbf13af63f478af6dd9811b2080623cdb84a8b3c0b0a6ef02b6b440c9f746e45973b +SHA512 (cairo-dock-fedora-3.6.1.tar.gz) = 68b319d07a9a28984feec25543421f5d90e3e70c7044368f7a1d56525cb5736f4e00b3038851ad3c74474001535b6e1f9177c939c216988146cb1fce493201cd From 730c3436c16c24875427311d4e81482e374b3fd3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Dec 2025 17:49:09 +0900 Subject: [PATCH 53/53] 3.6.2 --- cairo-dock.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 1cd4748..bcc369d 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,5 +1,5 @@ %global urlver 3.6 -%global mainver 3.6.1 +%global mainver 3.6.2 %global plugin_least_ver 3.6.0 @@ -270,6 +270,9 @@ popd %{_libdir}/pkgconfig/gldi.pc %changelog +* Tue Dec 23 2025 Mamoru TASAKA - 3.6.2-1 +- 3.6.2 + * Tue Nov 04 2025 Mamoru TASAKA - 3.6.1-1 - 3.6.1 diff --git a/sources b/sources index 0658a92..93b0134 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.1.tar.gz) = 68b319d07a9a28984feec25543421f5d90e3e70c7044368f7a1d56525cb5736f4e00b3038851ad3c74474001535b6e1f9177c939c216988146cb1fce493201cd +SHA512 (cairo-dock-fedora-3.6.2.tar.gz) = dd941127605cd771813c1349fcaf8c1ba16673a9e95a6124e3b3e6a30fab97816c14291ac2a76e191b411f025a6f4b03f9b3d9ef356ee580b208a3fa8b6e4f34