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 bcc369d..e42e0b6 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,17 +1,17 @@ -%global urlver 3.6 -%global mainver 3.6.2 +%global urlver 3.5 +%global mainver 3.5.99 -%global plugin_least_ver 3.6.0 +%global plugin_least_ver 3.5.99 -%dnl %global use_git 1 -%global gitdate 20250922 -%global githash bbdf30b67241dbf61dea651b636a07da5cc39049 +%global use_git 1 +%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 -%dnl %global alphatag .rcb +%global alphatag .rc1 %undefine _ld_strict_symbol_defs %undefine __brp_mangle_shebangs @@ -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++ @@ -75,7 +73,6 @@ 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) @@ -148,15 +145,7 @@ 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' - -# Don't check / try systemd-notify on buildroot -sed -i CMakeLists.txt -e '\@SYSTEMD_COMMAND@s|systemd-notify|true|' %build %set_build_flags @@ -173,9 +162,6 @@ 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 \ @@ -270,66 +256,6 @@ 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 - -* 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 - -* 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) - -* 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) - -* 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) - -* 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) - -* 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) - -* 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) - -* 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) - -* 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 93b0134..1667ca7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.2.tar.gz) = dd941127605cd771813c1349fcaf8c1ba16673a9e95a6124e3b3e6a30fab97816c14291ac2a76e191b411f025a6f4b03f9b3d9ef356ee580b208a3fa8b6e4f34 +SHA512 (cairo-dock-fedora-3.5.99-20250120gitd2fd789.tar.gz) = 9d02c38f0b07b1b49bafe3abc4ed790eaae69bc5b669e41aba1216473c732f7d63bad58e9cd6f54cfc536c5b6ae38137f5a2363b76205f528f4c6581ffd3509b