From be57ad62ba613c42927b4f8653c8c701ffd859f0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Dec 2025 16:14:14 +0900 Subject: [PATCH 01/10] update to the latest git --- cairo-dock-pr157-disabled-zoom-feature.patch | 78 -------------------- cairo-dock.spec | 12 ++- sources | 2 +- 3 files changed, 6 insertions(+), 86 deletions(-) delete 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 deleted file mode 100644 index 0ddaf33..0000000 --- a/cairo-dock-pr157-disabled-zoom-feature.patch +++ /dev/null @@ -1,78 +0,0 @@ -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 1cd4748..1ee4a42 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,11 +1,11 @@ %global urlver 3.6 -%global mainver 3.6.1 +%global mainver 3.6.91 %global plugin_least_ver 3.6.0 -%dnl %global use_git 1 -%global gitdate 20250922 -%global githash bbdf30b67241dbf61dea651b636a07da5cc39049 +%global use_git 1 +%global gitdate 20251205 +%global githash d472886dbb5f3bba049a13c9735462e84c6d5b58 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -18,7 +18,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 @@ -43,8 +43,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/pull/157 -Patch0: cairo-dock-pr157-disabled-zoom-feature.patch BuildRequires: gcc BuildRequires: gcc-c++ diff --git a/sources b/sources index 0658a92..c77dcff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.1.tar.gz) = 68b319d07a9a28984feec25543421f5d90e3e70c7044368f7a1d56525cb5736f4e00b3038851ad3c74474001535b6e1f9177c939c216988146cb1fce493201cd +SHA512 (cairo-dock-fedora-3.6.91-20251205gitd472886.tar.gz) = 992195a7914dd009266d34578cef5c02ac03d8494b13e2041d2967cb86d156480b02b84b0ec9571b8193bcac2320dc3da8f329f857eb73007290f0ddbe13c52e From 623955c80fb35befea1fa3a8683ab6d01c85a397 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 13 Dec 2025 23:47:18 +0900 Subject: [PATCH 02/10] update to the latest git --- cairo-dock-pr205-fix-use-after-free.patch | 81 +++++++++++++++++++++++ cairo-dock.spec | 8 ++- sources | 2 +- 3 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 cairo-dock-pr205-fix-use-after-free.patch diff --git a/cairo-dock-pr205-fix-use-after-free.patch b/cairo-dock-pr205-fix-use-after-free.patch new file mode 100644 index 0000000..7f174ad --- /dev/null +++ b/cairo-dock-pr205-fix-use-after-free.patch @@ -0,0 +1,81 @@ +From 812fe23af5e441ca3fa05fb975b180a859e32ce6 Mon Sep 17 00:00:00 2001 +From: Daniel Kondor +Date: Fri, 12 Dec 2025 20:32:49 +0100 +Subject: [PATCH] dock-manager: fix double free and memory leak + +Calling gldi_container_update_polling_screen_edge () will typically trigger the backend to query all root docks in s_pRootDockList. When freeing all docks at once, this can be a problem, as this list is not updated anymore. We can avoid this by freeing the list before the dock table. + +Also free a possible memory leak with not freeing pVisibilityData. +--- + src/gldit/cairo-dock-dock-manager.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/src/gldit/cairo-dock-dock-manager.c b/src/gldit/cairo-dock-dock-manager.c +index 60e9de4d..f685d498 100644 +--- a/src/gldit/cairo-dock-dock-manager.c ++++ b/src/gldit/cairo-dock-dock-manager.c +@@ -107,19 +107,19 @@ void cairo_dock_force_docks_above (void) + // UNLOAD // + static gboolean _free_one_dock (G_GNUC_UNUSED const gchar *cDockName, CairoDock *pDock, G_GNUC_UNUSED gpointer data) + { +- g_free (pDock->cDockName); +- pDock->cDockName = NULL; // to not remove it from the table/list + gldi_object_unref (GLDI_OBJECT(pDock)); + return TRUE; + } + void cairo_dock_reset_docks_table (void) + { ++ // need to free this first as calls from reset_object might end up accessing elements in it ++ // (specifically screen edge monitoring would re-check based on this whether to keep polling) ++ g_list_free (s_pRootDockList); ++ s_pRootDockList = NULL; ++ + s_bResetAll = TRUE; + g_hash_table_foreach_remove (s_hDocksTable, (GHRFunc) _free_one_dock, NULL); + g_pMainDock = NULL; +- +- g_list_free (s_pRootDockList); +- s_pRootDockList = NULL; + s_bResetAll = FALSE; + } + +@@ -1970,7 +1970,6 @@ static void reset_object (GldiObject *obj) + pIcon->pSubDock = NULL; + gldi_object_unref (GLDI_OBJECT(pIcon)); + } +- ///g_list_foreach (icons, (GFunc)gldi_object_unref, NULL); + g_list_free (icons); + + // if it's a sub-dock, ensure the main icon looses its sub-dock +@@ -1981,24 +1980,28 @@ static void reset_object (GldiObject *obj) + pPointedIcon->pSubDock = NULL; + } + +- // unregister it +- if (pDock->cDockName) ++ // unregister it (unless we are deleting the whole table when this is done at once in cairo_dock_reset_docks_table ()) ++ if (! s_bResetAll) + { + g_hash_table_remove (s_hDocksTable, pDock->cDockName); + s_pRootDockList = g_list_remove (s_pRootDockList, pDock); + } + +- // stop the mouse scrutation ++ // stop the mouse scrutation + dock visibility polling + if (pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP + || pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP_ANY + || pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE + || pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW) + { ++ // whether the visibility backend should be stopped for this dock ++ gboolean bStopVis = (pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP ++ || pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP_ANY); + /// this will ensure that screen edge polling will stop for this dock + pDock->iVisibility = CAIRO_DOCK_VISI_KEEP_ABOVE; + pDock->bAutoHide = FALSE; + pDock->bIsBelow = FALSE; + gldi_container_update_polling_screen_edge (); ++ if (bStopVis) gldi_dock_visibility_refresh (pDock); // will stop polling and free any data + } + + // free data diff --git a/cairo-dock.spec b/cairo-dock.spec index 1ee4a42..5196ed2 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,11 +1,11 @@ %global urlver 3.6 -%global mainver 3.6.91 +%global mainver 3.6.92 %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251205 -%global githash d472886dbb5f3bba049a13c9735462e84c6d5b58 +%global gitdate 20251213 +%global githash 8910ce062c6673e675db4775a63b14bb1d080bb5 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -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/205 +Patch0: cairo-dock-pr205-fix-use-after-free.patch BuildRequires: gcc BuildRequires: gcc-c++ diff --git a/sources b/sources index c77dcff..a20da33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.91-20251205gitd472886.tar.gz) = 992195a7914dd009266d34578cef5c02ac03d8494b13e2041d2967cb86d156480b02b84b0ec9571b8193bcac2320dc3da8f329f857eb73007290f0ddbe13c52e +SHA512 (cairo-dock-fedora-3.6.92-20251213git8910ce0.tar.gz) = 2d5acbfedc9b401ce96ed190309981e6255bde30aeef1822215d015f826cef7b0492783d18e0dedffa6218e763a32a178aa23e77f71f01362c57b461d6c76cf3 From bf5e860ea15132996f6a29e8be2869e23cc80bc5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 14 Dec 2025 14:47:07 +0900 Subject: [PATCH 03/10] update to the latest git --- cairo-dock-pr205-fix-use-after-free.patch | 81 ----------------------- cairo-dock.spec | 6 +- 2 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 cairo-dock-pr205-fix-use-after-free.patch diff --git a/cairo-dock-pr205-fix-use-after-free.patch b/cairo-dock-pr205-fix-use-after-free.patch deleted file mode 100644 index 7f174ad..0000000 --- a/cairo-dock-pr205-fix-use-after-free.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 812fe23af5e441ca3fa05fb975b180a859e32ce6 Mon Sep 17 00:00:00 2001 -From: Daniel Kondor -Date: Fri, 12 Dec 2025 20:32:49 +0100 -Subject: [PATCH] dock-manager: fix double free and memory leak - -Calling gldi_container_update_polling_screen_edge () will typically trigger the backend to query all root docks in s_pRootDockList. When freeing all docks at once, this can be a problem, as this list is not updated anymore. We can avoid this by freeing the list before the dock table. - -Also free a possible memory leak with not freeing pVisibilityData. ---- - src/gldit/cairo-dock-dock-manager.c | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/src/gldit/cairo-dock-dock-manager.c b/src/gldit/cairo-dock-dock-manager.c -index 60e9de4d..f685d498 100644 ---- a/src/gldit/cairo-dock-dock-manager.c -+++ b/src/gldit/cairo-dock-dock-manager.c -@@ -107,19 +107,19 @@ void cairo_dock_force_docks_above (void) - // UNLOAD // - static gboolean _free_one_dock (G_GNUC_UNUSED const gchar *cDockName, CairoDock *pDock, G_GNUC_UNUSED gpointer data) - { -- g_free (pDock->cDockName); -- pDock->cDockName = NULL; // to not remove it from the table/list - gldi_object_unref (GLDI_OBJECT(pDock)); - return TRUE; - } - void cairo_dock_reset_docks_table (void) - { -+ // need to free this first as calls from reset_object might end up accessing elements in it -+ // (specifically screen edge monitoring would re-check based on this whether to keep polling) -+ g_list_free (s_pRootDockList); -+ s_pRootDockList = NULL; -+ - s_bResetAll = TRUE; - g_hash_table_foreach_remove (s_hDocksTable, (GHRFunc) _free_one_dock, NULL); - g_pMainDock = NULL; -- -- g_list_free (s_pRootDockList); -- s_pRootDockList = NULL; - s_bResetAll = FALSE; - } - -@@ -1970,7 +1970,6 @@ static void reset_object (GldiObject *obj) - pIcon->pSubDock = NULL; - gldi_object_unref (GLDI_OBJECT(pIcon)); - } -- ///g_list_foreach (icons, (GFunc)gldi_object_unref, NULL); - g_list_free (icons); - - // if it's a sub-dock, ensure the main icon looses its sub-dock -@@ -1981,24 +1980,28 @@ static void reset_object (GldiObject *obj) - pPointedIcon->pSubDock = NULL; - } - -- // unregister it -- if (pDock->cDockName) -+ // unregister it (unless we are deleting the whole table when this is done at once in cairo_dock_reset_docks_table ()) -+ if (! s_bResetAll) - { - g_hash_table_remove (s_hDocksTable, pDock->cDockName); - s_pRootDockList = g_list_remove (s_pRootDockList, pDock); - } - -- // stop the mouse scrutation -+ // stop the mouse scrutation + dock visibility polling - if (pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP - || pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP_ANY - || pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE - || pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW) - { -+ // whether the visibility backend should be stopped for this dock -+ gboolean bStopVis = (pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP -+ || pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP_ANY); - /// this will ensure that screen edge polling will stop for this dock - pDock->iVisibility = CAIRO_DOCK_VISI_KEEP_ABOVE; - pDock->bAutoHide = FALSE; - pDock->bIsBelow = FALSE; - gldi_container_update_polling_screen_edge (); -+ if (bStopVis) gldi_dock_visibility_refresh (pDock); // will stop polling and free any data - } - - // free data diff --git a/cairo-dock.spec b/cairo-dock.spec index 5196ed2..6893a95 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251213 -%global githash 8910ce062c6673e675db4775a63b14bb1d080bb5 +%global gitdate 20251214 +%global githash ca1ff8a43c3f390726ac29d0902ce3281c220602 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -43,8 +43,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/pull/205 -Patch0: cairo-dock-pr205-fix-use-after-free.patch BuildRequires: gcc BuildRequires: gcc-c++ From a5cc9439e361e7c3aace38ec30190cfa90b5b433 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 14 Dec 2025 14:52:49 +0900 Subject: [PATCH 04/10] update source --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index a20da33..e77910e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.92-20251213git8910ce0.tar.gz) = 2d5acbfedc9b401ce96ed190309981e6255bde30aeef1822215d015f826cef7b0492783d18e0dedffa6218e763a32a178aa23e77f71f01362c57b461d6c76cf3 +SHA512 (cairo-dock-fedora-3.6.92-20251214gitca1ff8a.tar.gz) = c3fa4dd898a6d0111d28a954226efef06b5799b66dc7795830aaa9c2102c8c5b1e25c3c09eb4d85d4c5ca3b11ada18478dbcd39a4202eb0a34fb590c43d4d8f6 From 1ba15c4a2d92d3fba593df85ffc8c7ddb28bfed7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Dec 2025 15:11:25 +0900 Subject: [PATCH 05/10] update to the latest git --- cairo-dock.spec | 7 ++++--- sources | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 6893a95..630f90b 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,11 +1,11 @@ %global urlver 3.6 -%global mainver 3.6.92 +%global mainver 3.6.93 %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251214 -%global githash ca1ff8a43c3f390726ac29d0902ce3281c220602 +%global gitdate 20251217 +%global githash 99e1b5522066923194da612d52ef5ca87f5627ac %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -70,6 +70,7 @@ BuildRequires: pkgconfig(gtk-layer-shell-0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libevdev) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(systemd) diff --git a/sources b/sources index e77910e..2a797a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.92-20251214gitca1ff8a.tar.gz) = c3fa4dd898a6d0111d28a954226efef06b5799b66dc7795830aaa9c2102c8c5b1e25c3c09eb4d85d4c5ca3b11ada18478dbcd39a4202eb0a34fb590c43d4d8f6 +SHA512 (cairo-dock-fedora-3.6.93-20251217git99e1b55.tar.gz) = 2ce59a5140a9396c7b62caa85e4b71e80eb74b578c37add08fb79da23c1eeb15fe26eba6f2f8de4612636ad4731a54b2d033376bd8133ef5bf8a2918c24c34bb From dd96d7d172fd028445d3f2a7f3441255af7005b9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Dec 2025 23:23:04 +0900 Subject: [PATCH 06/10] update to the latest git --- cairo-dock.spec | 6 +++--- sources | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 630f90b..7d63fff 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,11 +1,11 @@ %global urlver 3.6 -%global mainver 3.6.93 +%global mainver 3.6.94 %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251217 -%global githash 99e1b5522066923194da612d52ef5ca87f5627ac +%global gitdate 20251221 +%global githash 2d4b9c9b10e639ee46b73b171101550666890220 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} diff --git a/sources b/sources index 2a797a2..76c4236 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.93-20251217git99e1b55.tar.gz) = 2ce59a5140a9396c7b62caa85e4b71e80eb74b578c37add08fb79da23c1eeb15fe26eba6f2f8de4612636ad4731a54b2d033376bd8133ef5bf8a2918c24c34bb +SHA512 (cairo-dock-fedora-3.6.94-20251221git2d4b9c9.tar.gz) = ff509deea8be67f3998fc8bfa0a0631023caed15a0f81fb9c2007dcff86a5e631c183693019d3a99adbea7e0cf075f61b7c07618e20500c59f11776b9ac564cb From f2bb25e4e8bb5aa353457df7c93dd04ea39d8a00 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 26 Dec 2025 11:48:15 +0900 Subject: [PATCH 07/10] update to the lastest git --- cairo-dock-create-fedora-tarball.sh | 13 +++++++++++-- cairo-dock.spec | 4 ++-- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/cairo-dock-create-fedora-tarball.sh b/cairo-dock-create-fedora-tarball.sh index 686e659..f3f1970 100644 --- a/cairo-dock-create-fedora-tarball.sh +++ b/cairo-dock-create-fedora-tarball.sh @@ -5,7 +5,6 @@ set -x umask 0022 -VERSION=${VERSION:-3.5.0} VERSION_PARENT=${VERSION%.[0-9]} @@ -18,7 +17,6 @@ GIT_URL=https://github.com/Cairo-Dock/${REPONAME}.git CURRENT_DIR=$(pwd) TMPDIR=$(mktemp -d /var/tmp/${REPONAME}-XXXXXX) -GITTAR_VERSION=${VERSION} FEDORA_TAR_VERSION=${VERSION} pushd $TMPDIR @@ -33,6 +31,12 @@ if [ "x${USE_GIT}" != "x" ] ; then GITDAME_B="$(date -d "${GITDATE}" '+%Y%m%d')" GITHASH="$(git log -1 | sed -n -e 's|^commit[ \t]||p')" SHORTHASH=$(echo ${GITHASH:0:7}) + + if [ "x${VERSION}" = "x" ] ; then + VERSION=$(cat CMakeLists.txt | sed -n -e 's|^.*set.*VERSION "||p' | sed -e 's|".*||') + fi + + cd .. cd .. @@ -42,6 +46,11 @@ else true fi +VERSION=${VERSION:-3.5.0} +if [ "x${GITTAR_VERSION}" = x ] ; then + GITTAR_VERSION=${VERSION} +fi + TARBALL_NAME=${TARNAME}-${FEDORA_TAR_VERSION}.tar.gz SOURCE_URL=${SOURCE_TOP_URL}/${GITTAR_VERSION}/${TARBALL_NAME} diff --git a/cairo-dock.spec b/cairo-dock.spec index 7d63fff..5594dd5 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251221 -%global githash 2d4b9c9b10e639ee46b73b171101550666890220 +%global gitdate 20251222 +%global githash 528820110a3c085ba1f6a421c4d1886a3bc86e2c %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} diff --git a/sources b/sources index 76c4236..043080c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.94-20251221git2d4b9c9.tar.gz) = ff509deea8be67f3998fc8bfa0a0631023caed15a0f81fb9c2007dcff86a5e631c183693019d3a99adbea7e0cf075f61b7c07618e20500c59f11776b9ac564cb +SHA512 (cairo-dock-fedora-3.6.94-20251222git5288201.tar.gz) = e4542af82175db8aba61aa97938567324405dfc39767f42cdac04690b0f8390fdf90ab2c253880ed65f3914b5f531a5d115e1b82823749f6e982cc453043bd38 From 758648b1190c2d84053075ab187815b012e8d8b0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 27 Dec 2025 21:49:31 +0900 Subject: [PATCH 08/10] update to the latest git --- cairo-dock-create-fedora-tarball.sh | 2 -- cairo-dock.spec | 6 +++--- sources | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cairo-dock-create-fedora-tarball.sh b/cairo-dock-create-fedora-tarball.sh index f3f1970..7865344 100644 --- a/cairo-dock-create-fedora-tarball.sh +++ b/cairo-dock-create-fedora-tarball.sh @@ -7,7 +7,6 @@ umask 0022 VERSION_PARENT=${VERSION%.[0-9]} - REPONAME=cairo-dock-core TARNAME=cairo-dock @@ -36,7 +35,6 @@ if [ "x${USE_GIT}" != "x" ] ; then VERSION=$(cat CMakeLists.txt | sed -n -e 's|^.*set.*VERSION "||p' | sed -e 's|".*||') fi - cd .. cd .. diff --git a/cairo-dock.spec b/cairo-dock.spec index 5594dd5..8803c4c 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,11 +1,11 @@ %global urlver 3.6 -%global mainver 3.6.94 +%global mainver 3.6.95 %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251222 -%global githash 528820110a3c085ba1f6a421c4d1886a3bc86e2c +%global gitdate 20251227 +%global githash 4fd7ce811c302a4d187a2d0b66ebb8f876efbc70 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} diff --git a/sources b/sources index 043080c..68baa7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.94-20251222git5288201.tar.gz) = e4542af82175db8aba61aa97938567324405dfc39767f42cdac04690b0f8390fdf90ab2c253880ed65f3914b5f531a5d115e1b82823749f6e982cc453043bd38 +SHA512 (cairo-dock-fedora-3.6.95-20251227git4fd7ce8.tar.gz) = c1a8d24b459bb95eea128ea071f494234c432f49ec5c83e6d357863e717181f1e9656413af2756e8db4c2ce700dc9a0685e3af9397674abb027c38349079f739 From 6a859baa3d41d315a3b19fb493efc938a4754e02 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 31 Dec 2025 14:23:48 +0900 Subject: [PATCH 09/10] update to the latest git --- cairo-dock.spec | 6 +++--- sources | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index 8803c4c..fb8ddbb 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,11 +1,11 @@ %global urlver 3.6 -%global mainver 3.6.95 +%global mainver 3.6.96 %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251227 -%global githash 4fd7ce811c302a4d187a2d0b66ebb8f876efbc70 +%global gitdate 20251231 +%global githash ce958a0894a8c4d33a1457cb84e32a55bdfbcbd1 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} diff --git a/sources b/sources index 68baa7c..f5cf514 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.95-20251227git4fd7ce8.tar.gz) = c1a8d24b459bb95eea128ea071f494234c432f49ec5c83e6d357863e717181f1e9656413af2756e8db4c2ce700dc9a0685e3af9397674abb027c38349079f739 +SHA512 (cairo-dock-fedora-3.6.96-20251231gitce958a0.tar.gz) = c98a4e8072dc3786f24dd10e0c9052a880281b2a759a2936745ff659cab372fb0990241c94b08d153a20ad4972e54527b281b42d09d6cf365bc50eb55b748d21 From 6cca033bd9bc252e71eb8153a106cc6e15cbbe40 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 12 Jan 2026 00:12:23 +0900 Subject: [PATCH 10/10] update to the latest git --- cairo-dock.spec | 6 +++--- sources | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cairo-dock.spec b/cairo-dock.spec index c809ee0..5cc9ab8 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,11 +1,11 @@ %global urlver 3.6 -%global mainver 3.6.96 +%global mainver 3.6.97 %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251231 -%global githash ce958a0894a8c4d33a1457cb84e32a55bdfbcbd1 +%global gitdate 20260111 +%global githash 9222e23530d14a09293aadd5b7eec0a09be06ed7 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} diff --git a/sources b/sources index f5cf514..e4c9b37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.96-20251231gitce958a0.tar.gz) = c98a4e8072dc3786f24dd10e0c9052a880281b2a759a2936745ff659cab372fb0990241c94b08d153a20ad4972e54527b281b42d09d6cf365bc50eb55b748d21 +SHA512 (cairo-dock-fedora-3.6.97-20260111git9222e23.tar.gz) = 58546998dc6c87c698816edd9801d7e224ef5044891df357f6d1bede93d343758e1f81eea1d4daa39061b18611f85dd03757a936f7f6cc1a4be5f08c12c98cd1