diff --git a/cairo-dock-create-fedora-tarball.sh b/cairo-dock-create-fedora-tarball.sh index 686e659..7865344 100644 --- a/cairo-dock-create-fedora-tarball.sh +++ b/cairo-dock-create-fedora-tarball.sh @@ -5,10 +5,8 @@ set -x umask 0022 -VERSION=${VERSION:-3.5.0} VERSION_PARENT=${VERSION%.[0-9]} - REPONAME=cairo-dock-core TARNAME=cairo-dock @@ -18,7 +16,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 +30,11 @@ 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 +44,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-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..5cc9ab8 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -1,11 +1,11 @@ %global urlver 3.6 -%global mainver 3.6.2 +%global mainver 3.6.97 %global plugin_least_ver 3.6.0 -%dnl %global use_git 1 -%global gitdate 20250922 -%global githash bbdf30b67241dbf61dea651b636a07da5cc39049 +%global use_git 1 +%global gitdate 20260111 +%global githash 9222e23530d14a09293aadd5b7eec0a09be06ed7 %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++ @@ -72,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 93b0134..e4c9b37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.2.tar.gz) = dd941127605cd771813c1349fcaf8c1ba16673a9e95a6124e3b3e6a30fab97816c14291ac2a76e191b411f025a6f4b03f9b3d9ef356ee580b208a3fa8b6e4f34 +SHA512 (cairo-dock-fedora-3.6.97-20260111git9222e23.tar.gz) = 58546998dc6c87c698816edd9801d7e224ef5044891df357f6d1bede93d343758e1f81eea1d4daa39061b18611f85dd03757a936f7f6cc1a4be5f08c12c98cd1