From 1df9154c53b032eaac03c4e7c2e10304336668f8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Mar 2024 11:45:50 +0900 Subject: [PATCH 01/41] SPDX migration --- License-analysis.txt | 38 ++++++++++++++++++++++++++++++++++++++ cairo-dock-plug-ins.spec | 8 ++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 License-analysis.txt diff --git a/License-analysis.txt b/License-analysis.txt new file mode 100644 index 0000000..dde651a --- /dev/null +++ b/License-analysis.txt @@ -0,0 +1,38 @@ +GPL-3.0-or-later +(base) + +GPL-2.1-or-later +Dbus/demos/demo_bash/demo_bash +Dbus/demos/demo_bash/demo_bash.sh +Dbus/demos/demo_mono/demo_mono.cs +Dbus/demos/demo_python/demo_python +Dbus/demos/demo_vala/demo_vala.vala +Dbus/interfaces/mono/CDApplet.cs +Dbus/interfaces/vala/CDApplet.vala +Dbus/interfaces/vala/src/CDApplet.c +Doncky/data/nvidia-config +Network-Monitor/data/access-point +Network-Monitor/data/wifi +System-Monitor/data/nvidia-config +netspeed/data/netspeed +systray/src/gtk3/fixedtip.c +systray/src/gtk3/fixedtip.h +systray/src/gtk3/main.c +systray/src/gtk3/main.h +systray/src/gtk3/na-tray.c + +LGPL-2.1-only OR LGPL-3.0-only +MeMenu/src/about-me-menu-item.c unused +MeMenu/src/about-me-menu-item.h unused + +LGPL-2.1-or-later +Global-Menu/src/MwmUtil.h +systray/src/gtk3/na-tray-child.c +systray/src/gtk3/na-tray-child.h +systray/src/gtk3/na-tray-manager.c +systray/src/gtk3/na-tray-manager.h +systray/src/gtk3/na-tray.h +systray/src/gtk3/testtray.c + +copyright says: +GPL-2.0-only icons https://github.com/mk-pmb/ubuntu-icon-theme-humanity diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 0c49985..ebd136c 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 3 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -23,7 +23,8 @@ Version: %{mainver}%{?use_git:^%{gitdate}git%{shorthash}} Release: %{baserelease}%{?dist} Summary: Plug-ins files for Cairo-Dock -License: GPLv3+ +# SPDX confirmed +License: GPL-3.0-or-later AND GPL-2.1-or-later AND LGPL-2.1-or-later AND GPL-2.0-only URL: http://glx-dock.org/ #Source0: http://launchpad.net/cairo-dock-plug-ins/%%{urlver}/%%{mainver}/+download/cairo-dock-plugins-%%{mainver}.tar.gz # Some contents removed: see https://bugzilla.redhat.com/show_bug.cgi?id=1178912 @@ -418,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Fri Mar 15 2024 Mamoru TASAKA - 3.5.0-3 +- SPDX migration + * Fri Mar 08 2024 Mamoru TASAKA - 3.5.0-2 - vala: regenerate C source from vala source properly and reenable -Werror=incompatible-pointer-types From 6194bf0f6a660917df26f4f600653ad1e945114f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 27 Mar 2024 21:10:47 +0900 Subject: [PATCH 02/41] Fix invalid SPDX tag --- License-analysis.txt | 2 +- cairo-dock-plug-ins.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/License-analysis.txt b/License-analysis.txt index dde651a..8e45ce0 100644 --- a/License-analysis.txt +++ b/License-analysis.txt @@ -1,7 +1,7 @@ GPL-3.0-or-later (base) -GPL-2.1-or-later +GPL-2.0-or-later Dbus/demos/demo_bash/demo_bash Dbus/demos/demo_bash/demo_bash.sh Dbus/demos/demo_mono/demo_mono.cs diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index ebd136c..7f902dd 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 3 +%global baserelease 4 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -24,7 +24,7 @@ Release: %{baserelease}%{?dist} Summary: Plug-ins files for Cairo-Dock # SPDX confirmed -License: GPL-3.0-or-later AND GPL-2.1-or-later AND LGPL-2.1-or-later AND GPL-2.0-only +License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-only URL: http://glx-dock.org/ #Source0: http://launchpad.net/cairo-dock-plug-ins/%%{urlver}/%%{mainver}/+download/cairo-dock-plugins-%%{mainver}.tar.gz # Some contents removed: see https://bugzilla.redhat.com/show_bug.cgi?id=1178912 @@ -419,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Wed Mar 27 2024 Mamoru TASAKA - 3.5.0-4 +- Fix invalid SPDX tag + * Fri Mar 15 2024 Mamoru TASAKA - 3.5.0-3 - SPDX migration From 212673a2a002a0ed28df1545e966d7debb42abf2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 4 May 2024 22:50:55 +0900 Subject: [PATCH 03/41] Update to the latest git (20240501git9901f7d) --- cairo-dock-plug-ins.spec | 37 +++++-------------- ...s-3.4.1-python-pep632-distutils-port.patch | 22 ----------- ...ted-C-source-from-vala-source-proper.patch | 27 -------------- sources | 2 +- 4 files changed, 10 insertions(+), 78 deletions(-) delete mode 100644 cairo-dock-plugins-3.4.1-python-pep632-distutils-port.patch delete mode 100644 cairo-dock-plugins-pr16--vala-move-generated-C-source-from-vala-source-proper.patch diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 7f902dd..bde728a 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,15 +1,15 @@ %global urlver 3.5 -%global mainver 3.5.0 +%global mainver 3.5.99 -%global core_least_ver 3.5.0 +%global core_least_ver 3.5.99 -#%%global use_git 1 -%global gitdate 20210730 -%global githash f24f7699e69b0e25e5e7674c4841dcefc4e6b61d +%global use_git 1 +%global gitdate 20240501 +%global githash 9901f7d9d59657363580b75766f7d5e7f23b6388 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 4 +%global baserelease 1 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -33,14 +33,9 @@ Source0: cairo-dock-plugins-fedora-%{tarballver}.tar.gz Source1: cairo-dock-plug-ins-create-fedora-tarball.sh # Port to WebKit2 Patch11: cairo-dock-plugins-3.4.1-port-WebKit2.patch -# PEP632: switch from distutils to setuptools -Patch12: cairo-dock-plugins-3.4.1-python-pep632-distutils-port.patch # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version # Use webkit2gtk-4.1 for F-39+ Patch13: cairo-dock-plugins-3.4.1-port-WebKit2_gtk41.patch -# https://github.com/Cairo-Dock/cairo-dock-plug-ins/pull/16 -# vala: move generated C source from vala source properly -Patch14: cairo-dock-plugins-pr16--vala-move-generated-C-source-from-vala-source-proper.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -69,11 +64,7 @@ BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(vte-2.91) # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version # Use webkit2gtk-4.1 for F-39+ -%if 0%{?fedora} >= 39 BuildRequires: pkgconfig(webkit2gtk-4.1) -%else -BuildRequires: pkgconfig(webkit2gtk-4.0) -%endif BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zeitgeist-2.0) @@ -204,9 +195,7 @@ binding for Cairo-Dock. %prep %setup -q -n cairo-dock-plugins-%{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %patch -P11 -p1 -b .wk2 -%patch -P12 -p1 -b .pep632 %patch -P13 -p1 -b .wk2_gtk41 -%patch -P14 -p1 -b .vala ## permission # %%_fixperms cannot fix permissions completely here @@ -251,18 +240,7 @@ sed -i.py2 CMakeLists.txt -e 's|python2)|python2-nono)|' env LANG=C grep -rl /usr/bin/env . | \ xargs sed -i -e 's|/usr/bin/env[ \t]*python$|/usr/bin/python3|' -# Quick-and-dirty workaround for libetpan 1.9.4 change using pkgconfig -mkdir TMPBINDIR -cat > TMPBINDIR/libetpan-config <= 1 @@ -419,6 +397,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Sat May 04 2024 Mamoru TASAKA - 3.5.99^20240501git9901f7d-1 +- Update to the latest git (20240501git9901f7d) + * Wed Mar 27 2024 Mamoru TASAKA - 3.5.0-4 - Fix invalid SPDX tag diff --git a/cairo-dock-plugins-3.4.1-python-pep632-distutils-port.patch b/cairo-dock-plugins-3.4.1-python-pep632-distutils-port.patch deleted file mode 100644 index f7761d8..0000000 --- a/cairo-dock-plugins-3.4.1-python-pep632-distutils-port.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- cairo-dock-plugins-gitf24f769/Dbus/interfaces/bash/setup.py.orig 2021-07-30 22:29:55.000000000 +0900 -+++ cairo-dock-plugins-gitf24f769/Dbus/interfaces/bash/setup.py 2023-01-03 18:54:57.725397471 +0900 -@@ -13,7 +13,7 @@ - # GNU General Public License for more details. - # http://www.gnu.org/licenses/licenses.html#GPL - --from distutils.core import setup -+from setuptools import setup - setup(name='CDBashApplet', - version='1.0', - license='GPL-3', ---- cairo-dock-plugins-gitf24f769/Dbus/interfaces/python/setup.py.orig 2021-07-30 22:29:55.000000000 +0900 -+++ cairo-dock-plugins-gitf24f769/Dbus/interfaces/python/setup.py 2023-01-03 18:55:05.840402277 +0900 -@@ -13,7 +13,7 @@ - # GNU General Public License for more details. - # http://www.gnu.org/licenses/licenses.html#GPL - --from distutils.core import setup -+from setuptools import setup - setup(name='CDApplet', - version='1.0', - license='GPL-3', diff --git a/cairo-dock-plugins-pr16--vala-move-generated-C-source-from-vala-source-proper.patch b/cairo-dock-plugins-pr16--vala-move-generated-C-source-from-vala-source-proper.patch deleted file mode 100644 index e468436..0000000 --- a/cairo-dock-plugins-pr16--vala-move-generated-C-source-from-vala-source-proper.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f771b2233d4c5157238b78b4d4e344815dd93ff4 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Fri, 8 Mar 2024 16:10:48 +0900 -Subject: [PATCH] vala: move generated C source from vala source properly - -valac generates C source from vala source and outputs the result -on the same directory as vala source. -But cmake working directory may be different -from the vala source directory. So to move generated source properly, -specify the origination directory for mv command explicitly. ---- - Dbus/interfaces/vala/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Dbus/interfaces/vala/CMakeLists.txt b/Dbus/interfaces/vala/CMakeLists.txt -index d3047694e..f3d7d5fd2 100644 ---- a/Dbus/interfaces/vala/CMakeLists.txt -+++ b/Dbus/interfaces/vala/CMakeLists.txt -@@ -26,7 +26,7 @@ if ("${VALAC_FOUND}" STREQUAL "TRUE") - -o ${CDAPPLET}.c - ${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.vala) - # it seems that valac can only produce the output c file into the current directory... -- execute_process(COMMAND mv ${CDAPPLET}.c ${VALA_DIR}/src/${CDAPPLET}.c) -+ execute_process(COMMAND mv ${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.c ${VALA_DIR}/src/${CDAPPLET}.c) - - # valac is a bad boy, it messes up the signal names. - execute_process(COMMAND diff --git a/sources b/sources index 4735dca..06726f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.0.tar.gz) = 0346b9715151b62907214533570213db17f3c3b49fe2c0b1c76f62eb0a28a5942d0f22bf5d7c6c22a2d1f9b2d0178d1461984291ca5aefc57f3ae58606fca60c +SHA512 (cairo-dock-plugins-fedora-3.5.99-20240501git9901f7d.tar.gz) = a2bce06714f450e82e8bb29954389cd75c054f2e95122f5d48ef00a9a4c1644be058b599f391169c3ca77e62e9a8eca20bf576653df907e192a88fa6ca6a2ac8 From 332f65123246772851c7d071c64e5f98028946c0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 13:15:13 +0200 Subject: [PATCH 04/41] Rebuilt for Python 3.13 --- cairo-dock-plug-ins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index bde728a..7e41d25 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.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 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -397,6 +397,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Fri Jun 07 2024 Python Maint - 3.5.99^20240501git9901f7d-2 +- Rebuilt for Python 3.13 + * Sat May 04 2024 Mamoru TASAKA - 3.5.99^20240501git9901f7d-1 - Update to the latest git (20240501git9901f7d) From e32a678d17400a3b5992a7365078c945b4775fad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:52:03 +0000 Subject: [PATCH 05/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cairo-dock-plug-ins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 7e41d25..e69fa93 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 3 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -397,6 +397,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.5.99^20240501git9901f7d-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 3.5.99^20240501git9901f7d-2 - Rebuilt for Python 3.13 From 70d0d4f72c368a30f339f856266880582923b2f6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 16 Aug 2024 13:46:37 +0900 Subject: [PATCH 06/41] Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available Require gdk-pixbuf2-modules-extra if available --- cairo-dock-plug-ins.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index e69fa93..941e7e3 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 3 +%global baserelease 4 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -94,6 +94,9 @@ This package is a meta package for Cairo-Dock plugins. Summary: Base files for Cairo-Dock plugins Requires: cairo-dock-core%{?_isa} >= %{core_least_ver} Requires: %{name}-common = %{version}-%{release} +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra +%endif %description base This package contains plug-ins files for Cairo-Dock. @@ -397,6 +400,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Fri Aug 16 2024 Mamoru TASAKA - 3.5.99^20240501git9901f7d-4 +- Require gdk-pixbuf2-modules-extra if available + * Wed Jul 17 2024 Fedora Release Engineering - 3.5.99^20240501git9901f7d-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f93eacc198e4ba78bcaf5127b961c065f7bb5285 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 22 Sep 2024 17:17:13 +0900 Subject: [PATCH 07/41] BR: ayatana-indicator3-0.4 for Messaging-Menu support --- cairo-dock-plug-ins.spec | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 941e7e3..26c2d27 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -9,7 +9,7 @@ %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 4 +%global baserelease 5 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -18,9 +18,18 @@ %undefine _strict_symbol_defs_build +########################################## +%global flagrel %{nil} +%global use_gcc_strict_sanitize 0 + +%if 0%{?use_gcc_strict_sanitize} >= 1 +%global flagrel %{flagrel}.san +%endif +########################################## + Name: cairo-dock-plug-ins Version: %{mainver}%{?use_git:^%{gitdate}git%{shorthash}} -Release: %{baserelease}%{?dist} +Release: %{baserelease}%{?dist}%{flagrel} Summary: Plug-ins files for Cairo-Dock # SPDX confirmed @@ -46,6 +55,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) # Plug-ins +BuildRequires: pkgconfig(ayatana-indicator3-0.4) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(dbusmenu-glib-0.4) BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) @@ -244,6 +254,14 @@ env LANG=C grep -rl /usr/bin/env . | \ xargs sed -i -e 's|/usr/bin/env[ \t]*python$|/usr/bin/python3|' %build +%set_build_flags + +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export CXX="${CXX} -fsanitize=address -fsanitize=undefined" +export LDFLAGS="${LDFLAGS} -pthread" +%endif + rm -f CMakeCache.txt %cmake -B. \ %if 0%{?build_unstable} >= 1 @@ -400,6 +418,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Sun Sep 22 2024 Mamoru TASAKA - 3.5.99^20240501git9901f7d-5 +- BR: ayatana-indicator3-0.4 for Messaging-Menu support + * Fri Aug 16 2024 Mamoru TASAKA - 3.5.99^20240501git9901f7d-4 - Require gdk-pixbuf2-modules-extra if available From 7b5b6f863de435be4698e9346905d41c325ac02d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Oct 2024 07:07:07 +0900 Subject: [PATCH 08/41] Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) Update to the latest git (20241007git019f49f) --- cairo-dock-plug-ins.spec | 20 +++++++++++--------- sources | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 26c2d27..d5e5f0c 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,12 +4,12 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20240501 -%global githash 9901f7d9d59657363580b75766f7d5e7f23b6388 +%global gitdate 20241007 +%global githash 019f49fa9e3db780823ed7aea08493eafd52d7f3 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 5 +%global baserelease 1 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -245,7 +245,7 @@ sed -i.installdir \ CMakeLists.txt # Modify version forcely -sed -i CMakeLists.txt -e '\@set (VERSION @s|VERSION.*|VERSION "%{mainver}")|' +sed -i CMakeLists.txt -e '\@set (\(CORE_REQUIRED_\|\)VERSION @s|VERSION.*|VERSION "%{mainver}")|' # Kill python2 explicitly sed -i.py2 CMakeLists.txt -e 's|python2)|python2-nono)|' @@ -399,11 +399,10 @@ popd %{_datadir}/cairo-dock/plug-ins/*weblet* %files -n cairo-dock-python3 -%{python3_sitelib}/CairoDock.py* -%{python3_sitelib}/CDApplet.py* -%{python3_sitelib}/CDBashApplet.py* -%{python3_sitelib}/*.egg-info -%{python3_sitelib}/__pycache__/ +%{python3_sitearch}/CairoDock.py* +%{python3_sitearch}/CDApplet.py* +%{python3_sitearch}/CDBashApplet.py* +%{python3_sitearch}/__pycache__/ %files -n cairo-dock-ruby %{ruby_vendorlib}/CDApplet.rb @@ -418,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Sun Oct 06 2024 Mamoru TASAKA - 3.5.99^20241007git019f49f-1 +- Update to the latest git (20241007git019f49f) + * Sun Sep 22 2024 Mamoru TASAKA - 3.5.99^20240501git9901f7d-5 - BR: ayatana-indicator3-0.4 for Messaging-Menu support diff --git a/sources b/sources index 06726f4..1628211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20240501git9901f7d.tar.gz) = a2bce06714f450e82e8bb29954389cd75c054f2e95122f5d48ef00a9a4c1644be058b599f391169c3ca77e62e9a8eca20bf576653df907e192a88fa6ca6a2ac8 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20241007git019f49f.tar.gz) = 2c1383b932c274f73e0011de290e016390af4a3ef4124c77c1d59e064f3e3ea40cd264df4585956ff0d581b9f1bfed01310cfe42b50fed11900190eb1d9e25f1 From f970a0cddb64334f6ff0f31ab8ab06c955273a44 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Oct 2024 08:02:22 +0900 Subject: [PATCH 09/41] python subpackage is now arch-dependent --- cairo-dock-plug-ins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index d5e5f0c..453c85d 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -93,7 +93,7 @@ Requires: %{name}-base%{?_isa} = %{version}-%{release} Requires: %{name}-dbus%{?_isa} = %{version}-%{release} # cairo-dock-launcher-API-daemon is written in python, # so for now make this depending on python -Requires: cairo-dock-python3 = %{version}-%{release} +Requires: cairo-dock-python3%{?_isa} = %{version}-%{release} # Require xdg-utils for logout by default Requires: xdg-utils @@ -170,7 +170,7 @@ Requires: cairo-dock-core >= %{core_least_ver} Requires: %{name}-dbus = %{version}-%{release} Requires: python3-gobject Requires: python3-dbus -BuildArch: noarch +Obsoletes: cairo-dock-python3 < 3.5.99^20241007git019f49f-1 %description -n cairo-dock-python3 This package contains Python3 binding files for Cairo-Dock From bc38f9be3923311fa2f363cf284c28d947f4332d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 12 Oct 2024 12:58:01 +0900 Subject: [PATCH 10/41] keep line number when modifying source --- cairo-dock-plug-ins-create-fedora-tarball.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cairo-dock-plug-ins-create-fedora-tarball.sh b/cairo-dock-plug-ins-create-fedora-tarball.sh index 559b696..517ce56 100644 --- a/cairo-dock-plug-ins-create-fedora-tarball.sh +++ b/cairo-dock-plug-ins-create-fedora-tarball.sh @@ -60,8 +60,12 @@ sed -i -e '\@SCOOBY_DO@,\@endif@d' -e '\@with_scooby_do@d' CMakeLists.txt pushd desklet-rendering rm -f data/starcraft2.png sed -i -e '\@starcraft2@d' data/CMakeLists.txt -sed -i -e '\@_register_desklet_decorations.*none@i REMOVE_TO_HERE' src/rendering-desklet-decorations.c -sed -i -e '\@_register_desklet_decorations.*futuristic@,\@REMOVE_TO_HERE@d' src/rendering-desklet-decorations.c +sed -i src/rendering-desklet-decorations.c -e '\@_register_desklet_decorations.*none@i REMOVE_TO_HERE' +sed -i src/rendering-desklet-decorations.c \ + -e '\@_register_desklet_decorations.*futuristic@,\@REMOVE_TO_HERE@s@^@REMOVE_HERE@' +sed -i src/rendering-desklet-decorations.c -e '\@_register_desklet_decorations.*futuristic@d' +sed -i src/rendering-desklet-decorations.c \ + -e '\@REMOVE_HERE@s@^.*$@@' popd cp -p ./weather/data/themes/Classic/na.png ./weather/data/broken.png From 080fec0e1edeb085db2bdc9f52a8c7c958c86525 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 24 Oct 2024 09:37:16 +0900 Subject: [PATCH 11/41] Update to the latest git (20241024gitd965212) --- cairo-dock-plug-ins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 453c85d..d6cd925 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,8 +4,8 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241007 -%global githash 019f49fa9e3db780823ed7aea08493eafd52d7f3 +%global gitdate 20241024 +%global githash d9652122e6b563bd0cfb2759a31e0e90d6b7307e %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Thu Oct 24 2024 Mamoru TASAKA - 3.5.99^20241024gitd965212-1 +- Update to the latest git (20241024gitd965212) + * Sun Oct 06 2024 Mamoru TASAKA - 3.5.99^20241007git019f49f-1 - Update to the latest git (20241007git019f49f) diff --git a/sources b/sources index 1628211..af65ca1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20241007git019f49f.tar.gz) = 2c1383b932c274f73e0011de290e016390af4a3ef4124c77c1d59e064f3e3ea40cd264df4585956ff0d581b9f1bfed01310cfe42b50fed11900190eb1d9e25f1 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20241024gitd965212.tar.gz) = 16fe40cc18aa2932e28f5112db8108892443c1667f59006dbcfe753baa520d37e1199c7b5f2abe24de47a282fc01c460a1144e559da53eaaf0984c50965d5c62 From 09ba42b28d277462e477f934387aa030de327f4b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 19 Nov 2024 15:54:26 +0900 Subject: [PATCH 12/41] Update to the latest git (3.5.99-20241117gite9d3fcd) --- cairo-dock-plug-ins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index d6cd925..316af7e 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,8 +4,8 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241024 -%global githash d9652122e6b563bd0cfb2759a31e0e90d6b7307e +%global gitdate 20241117 +%global githash e9d3fcdab6158390ef8a3e6acb5ec3b12ccb9cac %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Tue Nov 19 2024 Mamoru TASAKA - 3.5.99^20241117gite9d3fcd-1 +- Update to the latest git (3.5.99-20241117gite9d3fcd) + * Thu Oct 24 2024 Mamoru TASAKA - 3.5.99^20241024gitd965212-1 - Update to the latest git (20241024gitd965212) diff --git a/sources b/sources index af65ca1..e0dae8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20241024gitd965212.tar.gz) = 16fe40cc18aa2932e28f5112db8108892443c1667f59006dbcfe753baa520d37e1199c7b5f2abe24de47a282fc01c460a1144e559da53eaaf0984c50965d5c62 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20241117gite9d3fcd.tar.gz) = f463f47225978be16bc2e5a18a68a6b656e272569d2832a02a4b3c30ad2ec8ad06335bc9a0977f76cdd987c50c761a25cd6cdd45eafa33afdfc7dae10646d171 From 89b831ee0b551bd1c8578fa8e1a9d963bccfaa85 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 8 Dec 2024 16:35:09 +0900 Subject: [PATCH 13/41] Update to the latest git (20241207gitce518e9) --- cairo-dock-plug-ins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 316af7e..e8eb39d 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,8 +4,8 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241117 -%global githash e9d3fcdab6158390ef8a3e6acb5ec3b12ccb9cac +%global gitdate 20241207 +%global githash ce518e9ed0f8a54be850e0a8fe55e274885b014e %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Sun Dec 08 2024 Mamoru TASAKA - 3.5.99^20241207gitce518e9-1 +- Update to the latest git (20241207gitce518e9) + * Tue Nov 19 2024 Mamoru TASAKA - 3.5.99^20241117gite9d3fcd-1 - Update to the latest git (3.5.99-20241117gite9d3fcd) diff --git a/sources b/sources index e0dae8c..1d3c901 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20241117gite9d3fcd.tar.gz) = f463f47225978be16bc2e5a18a68a6b656e272569d2832a02a4b3c30ad2ec8ad06335bc9a0977f76cdd987c50c761a25cd6cdd45eafa33afdfc7dae10646d171 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20241207gitce518e9.tar.gz) = d78a85f2872c03319c2630c537e6aadc441f4d3087c866c767b3be6d383fc74588f5296c1298072a2418d193f59696fbd20556f2e07161d694885eaacf98de36 From 441e2d9828e285bf19901e949eac135511ad7f95 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 17 Dec 2024 21:44:11 +0900 Subject: [PATCH 14/41] Update to the latest git (20241217gitf8ad97e) --- cairo-dock-plug-ins.spec | 14 +++++++++++--- sources | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index e8eb39d..66559e4 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,12 +4,14 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241207 -%global githash ce518e9ed0f8a54be850e0a8fe55e274885b014e +%global gitdate 20241217 +%global githash f8ad97e8ec67b25e07a6dedae8a57634e04b5da6 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} + %global baserelease 1 +%global alphatag .beta6 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -29,7 +31,7 @@ Name: cairo-dock-plug-ins Version: %{mainver}%{?use_git:^%{gitdate}git%{shorthash}} -Release: %{baserelease}%{?dist}%{flagrel} +Release: %{baserelease}%{?alphatag}%{?dist}%{flagrel} Summary: Plug-ins files for Cairo-Dock # SPDX confirmed @@ -417,6 +419,12 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Tue Dec 17 2024 Mamoru TASAKA - 3.5.99^20241217gitf8ad97e-1.beta6 +- Update to the latest git (20241217gitf8ad97e) + +* Mon Dec 16 2024 Mamoru TASAKA - 3.5.99^20241216gitce0764f-1.beta6 +- Update to the latest git (20241216gitce0764f) + * Sun Dec 08 2024 Mamoru TASAKA - 3.5.99^20241207gitce518e9-1 - Update to the latest git (20241207gitce518e9) diff --git a/sources b/sources index 1d3c901..a12706a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20241207gitce518e9.tar.gz) = d78a85f2872c03319c2630c537e6aadc441f4d3087c866c767b3be6d383fc74588f5296c1298072a2418d193f59696fbd20556f2e07161d694885eaacf98de36 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20241217gitf8ad97e.tar.gz) = af04f19d581ae09fd7303eb71cb86a0f051682bfa5f90f1f7d7fee2af5c42a8b1f88da0b60e1e690ebad4f584cd210376bafb34c0dcaca6642f7dcf65a0c1a9c From ec37db85c1957d4c89c87e790c6bbb7fe0395696 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:12:03 +0000 Subject: [PATCH 15/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cairo-dock-plug-ins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 66559e4..628fa89 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .beta6 @@ -419,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.5.99^20241217gitf8ad97e-2.beta6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Dec 17 2024 Mamoru TASAKA - 3.5.99^20241217gitf8ad97e-1.beta6 - Update to the latest git (20241217gitf8ad97e) From a183aa0a34d99c3e15c35dc3ba7993c8dcb49cbe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 19 Jan 2025 16:48:41 +0900 Subject: [PATCH 16/41] Update to the latest git (20250118git18ad738) --- cairo-dock-plug-ins.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 628fa89..5cbbe80 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,14 +4,14 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20241217 -%global githash f8ad97e8ec67b25e07a6dedae8a57634e04b5da6 +%global gitdate 20250118 +%global githash 18ad7382d751709c7028bf039e864c8a10b31f07 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 -%global alphatag .beta6 +%global baserelease 1 +%global alphatag .beta7 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -419,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Sun Jan 19 2025 Mamoru TASAKA - 3.5.99^20250118git18ad738-1.beta7 +- Update to the latest git (20250118git18ad738) + * Thu Jan 16 2025 Fedora Release Engineering - 3.5.99^20241217gitf8ad97e-2.beta6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index a12706a..83acd71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20241217gitf8ad97e.tar.gz) = af04f19d581ae09fd7303eb71cb86a0f051682bfa5f90f1f7d7fee2af5c42a8b1f88da0b60e1e690ebad4f584cd210376bafb34c0dcaca6642f7dcf65a0c1a9c +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250118git18ad738.tar.gz) = d8abe87340c45ae631573b65f6275b01cbff7e01e1f83b30ff115507de951457980ff834eebcc6d52c9eb31a8d6028951a3f995ddb26ae1aa727b165b529a73e From 837e03f68d38cfba64b60e9114da951c4d49eb9d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 30 Jan 2025 16:12:08 +0900 Subject: [PATCH 17/41] 20250120git9cc48a3 --- cairo-dock-plug-ins.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 5cbbe80..9f4f743 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,14 +4,14 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250118 -%global githash 18ad7382d751709c7028bf039e864c8a10b31f07 +%global gitdate 20250120 +%global githash 9cc48a380476388cec399eaa2ec289ea41faa1a7 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .beta7 +%global alphatag .rc1 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -419,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Thu Jan 30 2025 Mamoru TASAKA - 3.5.99^20250120git9cc48a3-1.rc1 +- Update to the latest git (20250120git9cc48a3) + * Sun Jan 19 2025 Mamoru TASAKA - 3.5.99^20250118git18ad738-1.beta7 - Update to the latest git (20250118git18ad738) diff --git a/sources b/sources index 83acd71..1f54541 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250118git18ad738.tar.gz) = d8abe87340c45ae631573b65f6275b01cbff7e01e1f83b30ff115507de951457980ff834eebcc6d52c9eb31a8d6028951a3f995ddb26ae1aa727b165b529a73e +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250120git9cc48a3.tar.gz) = de152fef67fbb86bbd92ba4518e498872656b4e55d822d06baea06c42f3d6e085c20e5db8665f5809fcc6323b053475acdaf5161b639645ca6bcc0cfdaecb861 From 66494a46911be934c7323aee23f9bac7a4f437fe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Feb 2025 14:39:16 +0900 Subject: [PATCH 18/41] update to the latest git --- cairo-dock-plug-ins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 9f4f743..29b4023 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,8 +4,8 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250120 -%global githash 9cc48a380476388cec399eaa2ec289ea41faa1a7 +%global gitdate 20250211 +%global githash 4793755c6d4b014dbe4d0f09ca67f62c0811fa57 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -419,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Thu Feb 13 2025 Mamoru TASAKA - 3.5.99^20250211git4793755-1.rc1 +- Update to the latest git (20250211git4793755) + * Thu Jan 30 2025 Mamoru TASAKA - 3.5.99^20250120git9cc48a3-1.rc1 - Update to the latest git (20250120git9cc48a3) diff --git a/sources b/sources index 1f54541..7326465 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250120git9cc48a3.tar.gz) = de152fef67fbb86bbd92ba4518e498872656b4e55d822d06baea06c42f3d6e085c20e5db8665f5809fcc6323b053475acdaf5161b639645ca6bcc0cfdaecb861 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250211git4793755.tar.gz) = 5ee9bf08899c55a404296579ddb0e35710d58d01c5022f05bd30560c0296a3c2d461c2db13da68ac605c096aa5cc221b2ae149fabb62c61b1d5902552fcdd3ff From 259639b411a657150e0e752e978f627d216adcc9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Feb 2025 14:27:30 +0900 Subject: [PATCH 19/41] update to the latest git --- cairo-dock-plug-ins.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 29b4023..db4f390 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,14 +4,14 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250211 -%global githash 4793755c6d4b014dbe4d0f09ca67f62c0811fa57 +%global gitdate 20250214 +%global githash 2fabf995462603ec40db60c25d664817fc0fb756 %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 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -419,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Fri Feb 14 2025 Mamoru TASAKA - 3.5.99^20250214git2fabf99-1.rc2 +- Update to the latest git (20250214git2fabf99) + * Thu Feb 13 2025 Mamoru TASAKA - 3.5.99^20250211git4793755-1.rc1 - Update to the latest git (20250211git4793755) diff --git a/sources b/sources index 7326465..e6d6489 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250211git4793755.tar.gz) = 5ee9bf08899c55a404296579ddb0e35710d58d01c5022f05bd30560c0296a3c2d461c2db13da68ac605c096aa5cc221b2ae149fabb62c61b1d5902552fcdd3ff +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250214git2fabf99.tar.gz) = 4e48b5f914c24b898d5ee688db06db13e155b000fadea4289703f919d05242613a90aa38d510015c7d9e03f35cb4af4129aafc827c2f7e05c9af1dc6f8764fc7 From c35705ed507ce2d793ab9273fd418e7855d4dc87 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 16 Feb 2025 17:00:24 +0900 Subject: [PATCH 20/41] Add BR: json-c for weather module --- cairo-dock-plug-ins.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index db4f390..6fb9324 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .rc2 @@ -64,6 +64,7 @@ BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(gnome-vfs-2.0) BuildRequires: pkgconfig(indicator3-0.4) +BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libgnome-menu-3.0) BuildRequires: pkgconfig(libgnomeui-2.0) @@ -419,6 +420,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Sun Feb 16 2025 Mamoru TASAKA - 3.5.99^20250214git2fabf99-2.rc2 +- Add BR: json-c for weather module + * Fri Feb 14 2025 Mamoru TASAKA - 3.5.99^20250214git2fabf99-1.rc2 - Update to the latest git (20250214git2fabf99) From a7fa7ebf16595f5be19b3d269c2f78e59325570e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 18 Feb 2025 22:20:19 +0900 Subject: [PATCH 21/41] update to the latest git --- cairo-dock-plug-ins.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 6fb9324..b85c313 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,13 +4,13 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250214 -%global githash 2fabf995462603ec40db60c25d664817fc0fb756 +%global gitdate 20250218 +%global githash d591880a3912419fe320e46a075f1fa1cb75e7ad %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 1 %global alphatag .rc2 @@ -420,6 +420,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Tue Feb 18 2025 Mamoru TASAKA - 3.5.99^20250218gitd591880-1.rc2 +- Update to the latest git (20250218gitd591880) + * Sun Feb 16 2025 Mamoru TASAKA - 3.5.99^20250214git2fabf99-2.rc2 - Add BR: json-c for weather module diff --git a/sources b/sources index e6d6489..4995630 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250214git2fabf99.tar.gz) = 4e48b5f914c24b898d5ee688db06db13e155b000fadea4289703f919d05242613a90aa38d510015c7d9e03f35cb4af4129aafc827c2f7e05c9af1dc6f8764fc7 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250218gitd591880.tar.gz) = f9576ea930452418b2bc62aebc121e76f00fdbdc574e9a89248dfcbbac43446e28f95d8f0a978b5827cef77d3132fb13b742c043c87d97bbd32b6b7b34248456 From 2126b954785d8f0bf7882dca17a1738342b1c28d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Mar 2025 11:21:52 +0900 Subject: [PATCH 22/41] Use recent compiler standard --- cairo-dock-plug-ins.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index b85c313..0ab1ec9 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .rc2 @@ -256,6 +256,9 @@ sed -i.py2 CMakeLists.txt -e 's|python2)|python2-nono)|' env LANG=C grep -rl /usr/bin/env . | \ xargs sed -i -e 's|/usr/bin/env[ \t]*python$|/usr/bin/python3|' +# Use recent standard +sed -i.std CMakeLists.txt -e 's|-std=gnu99 ||' + %build %set_build_flags @@ -420,6 +423,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Fri Mar 14 2025 Mamoru TASAKA - 3.5.99^20250218gitd591880-2.rc2 +- Use recent compiler standard + * Tue Feb 18 2025 Mamoru TASAKA - 3.5.99^20250218gitd591880-1.rc2 - Update to the latest git (20250218gitd591880) From 47451b91486395764f327d20f84d947c8416be17 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 17 Apr 2025 11:34:23 +0900 Subject: [PATCH 23/41] Update %cmake macro usage (to prepare for cmake 4 and related changes) --- cairo-dock-plug-ins.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 0ab1ec9..e7e2230 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 3 %global alphatag .rc2 @@ -269,7 +269,7 @@ export LDFLAGS="${LDFLAGS} -pthread" %endif rm -f CMakeCache.txt -%cmake -B. \ +%cmake \ %if 0%{?build_unstable} >= 1 -Denable-disks=TRUE \ -Denable-doncky=TRUE \ @@ -279,13 +279,11 @@ rm -f CMakeCache.txt -Denable-scooby-do=TRUE \ %endif %endif - . -%make_build +%cmake_build %install -%make_install \ - INSTALL="install -p" +%cmake_install # Collect documents rm -rf documents licenses documents-dbus @@ -423,6 +421,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Thu Apr 17 2025 Mamoru TASAKA - 3.5.99^20250218gitd591880-3.rc2 +- Update %%cmake macro usage (to prepare for cmake 4 and related changes) + * Fri Mar 14 2025 Mamoru TASAKA - 3.5.99^20250218gitd591880-2.rc2 - Use recent compiler standard From ec6f0816742e5d3c1f998f841c62c8b5a1f6af60 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 4 May 2025 22:52:28 +0900 Subject: [PATCH 24/41] update to the latest git --- cairo-dock-plug-ins.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index e7e2230..4b0b4a2 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,13 +4,13 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250218 -%global githash d591880a3912419fe320e46a075f1fa1cb75e7ad +%global gitdate 20250502 +%global githash d41b3c27f01cd78af76a264b7d39394456188d54 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 3 +%global baserelease 1 %global alphatag .rc2 @@ -421,6 +421,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Sun May 04 2025 Mamoru TASAKA - 3.5.99^20250502gitd41b3c2-1.rc2 +- Update to the latest git (20250502gitd41b3c2) + * Thu Apr 17 2025 Mamoru TASAKA - 3.5.99^20250218gitd591880-3.rc2 - Update %%cmake macro usage (to prepare for cmake 4 and related changes) diff --git a/sources b/sources index 4995630..6208b0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250218gitd591880.tar.gz) = f9576ea930452418b2bc62aebc121e76f00fdbdc574e9a89248dfcbbac43446e28f95d8f0a978b5827cef77d3132fb13b742c043c87d97bbd32b6b7b34248456 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250502gitd41b3c2.tar.gz) = 6c7333dd672e01a372ca26e7997449e99d6c807e05363e32523030bce5529a52bfe01d399346e8be6150d6389bb9e824f8c937df1085892e4bb8532b0b632f35 From 55a54f497603d9535524b32ffb196f45c1d9ff38 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 00:19:20 +0200 Subject: [PATCH 25/41] Rebuilt for Python 3.14 --- cairo-dock-plug-ins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 4b0b4a2..10d15a7 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .rc2 @@ -421,6 +421,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Mon Jun 02 2025 Python Maint - 3.5.99^20250502gitd41b3c2-2.rc2 +- Rebuilt for Python 3.14 + * Sun May 04 2025 Mamoru TASAKA - 3.5.99^20250502gitd41b3c2-1.rc2 - Update to the latest git (20250502gitd41b3c2) From ba7a84f6819f24c6701cfeb2397b90c24453d0eb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 19 Jun 2025 14:39:00 +0900 Subject: [PATCH 26/41] Update to the latest git (20250616gitd333ad8) --- cairo-dock-plug-ins.spec | 29 +++++++++++++++++------------ sources | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 10d15a7..74c18e6 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,17 +4,18 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250502 -%global githash d41b3c27f01cd78af76a264b7d39394456188d54 +%global gitdate 20250616 +%global githash d333ad8195631073cd4550d4b359fe2581e6355b %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 1 %global alphatag .rc2 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") +%global dbus_datadir %{_datadir}/cairo-dock/plug-ins/Dbus %global build_unstable 1 @@ -181,7 +182,7 @@ This package contains Python3 binding files for Cairo-Dock %package -n cairo-dock-ruby Summary: Ruby binding for Cairo-Dock Requires: cairo-dock-core >= %{core_least_ver} -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-dbus = %{version}-%{release} Requires: ruby(release) Requires: rubygem(ruby-dbus) Requires: rubygem(parseconfig) @@ -386,9 +387,10 @@ popd %files dbus %doc documents-dbus/* %{_libdir}/cairo-dock/*Dbus* -%{_datadir}/cairo-dock/plug-ins/Dbus/ -# The following is for cairo-dock-vala-devel -%exclude %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h +%dir %{dbus_datadir} +%{dbus_datadir}/CDBashApplet.sh +%{dbus_datadir}/Dbus.conf +%{dbus_datadir}/icon.svg %files xfce %{_libdir}/cairo-dock/*xfce* @@ -403,13 +405,13 @@ popd %{_datadir}/cairo-dock/plug-ins/*weblet* %files -n cairo-dock-python3 -%{python3_sitearch}/CairoDock.py* -%{python3_sitearch}/CDApplet.py* -%{python3_sitearch}/CDBashApplet.py* -%{python3_sitearch}/__pycache__/ +%{dbus_datadir}/CairoDock.py* +%{dbus_datadir}/CDApplet.py* +%{dbus_datadir}/CDBashApplet.py* +%{dbus_datadir}/__pycache__/ %files -n cairo-dock-ruby -%{ruby_vendorlib}/CDApplet.rb +%{dbus_datadir}/CDApplet.rb %files -n cairo-dock-vala %{_libdir}/libCDApplet.so.1* @@ -421,6 +423,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Thu Jun 19 2025 Mamoru TASAKA - 3.5.99^20250616gitd333ad8-1.rc2 +- Update to the latest git (20250616gitd333ad8) + * Mon Jun 02 2025 Python Maint - 3.5.99^20250502gitd41b3c2-2.rc2 - Rebuilt for Python 3.14 diff --git a/sources b/sources index 6208b0d..c97a1f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250502gitd41b3c2.tar.gz) = 6c7333dd672e01a372ca26e7997449e99d6c807e05363e32523030bce5529a52bfe01d399346e8be6150d6389bb9e824f8c937df1085892e4bb8532b0b632f35 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250616gitd333ad8.tar.gz) = e3fee54e438b6840e94d08aad2fe2d77f64534eb00d6cf054a8e7071a20dbbbe84e75361ed12723c0be118f9d7460760685ad05d53a8b53ef3d0c79f638e362e From 364e85a00c9c6877f036007ad3c7f664815026c0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Jun 2025 17:25:33 +0900 Subject: [PATCH 27/41] Update to the latest git (20250623git64bcb0f) --- cairo-dock-plug-ins.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 74c18e6..c80671b 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,14 +4,14 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250616 -%global githash d333ad8195631073cd4550d4b359fe2581e6355b +%global gitdate 20250623 +%global githash 64bcb0f928edc860c4307e2080a2b0a8a03188e6 %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 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -423,6 +423,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Mon Jun 30 2025 Mamoru TASAKA - 3.5.99^20250623git64bcb0f-1.rc3 +- Update to the latest git (20250623git64bcb0f) + * Thu Jun 19 2025 Mamoru TASAKA - 3.5.99^20250616gitd333ad8-1.rc2 - Update to the latest git (20250616gitd333ad8) diff --git a/sources b/sources index c97a1f0..f1d6c78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250616gitd333ad8.tar.gz) = e3fee54e438b6840e94d08aad2fe2d77f64534eb00d6cf054a8e7071a20dbbbe84e75361ed12723c0be118f9d7460760685ad05d53a8b53ef3d0c79f638e362e +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250623git64bcb0f.tar.gz) = 441584640ea2bf38849a3e6915e00181f877e196df80cc793944fa0b37a7469d76d3774244aae2c8f46a000b94abd9b9f3cb17a79de0263d0fa08988651709b6 From 9a09f5e1befeb7c13c6a42bdc868581663fb7791 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Jul 2025 16:57:25 +0900 Subject: [PATCH 28/41] Update to the latest git (20250714gita426778) --- cairo-dock-plug-ins.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index c80671b..32af629 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,14 +4,14 @@ %global core_least_ver 3.5.99 %global use_git 1 -%global gitdate 20250623 -%global githash 64bcb0f928edc860c4307e2080a2b0a8a03188e6 +%global gitdate 20250714 +%global githash a4267783cd3a9aa79e14c4a6c729eb04c0665ec2 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc3 +%global alphatag .rc4 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -423,6 +423,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Mon Jul 14 2025 Mamoru TASAKA - 3.5.99^20250714gita426778-1.rc4 +- Update to the latest git (20250714gita426778) + * Mon Jun 30 2025 Mamoru TASAKA - 3.5.99^20250623git64bcb0f-1.rc3 - Update to the latest git (20250623git64bcb0f) diff --git a/sources b/sources index f1d6c78..22a9293 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250623git64bcb0f.tar.gz) = 441584640ea2bf38849a3e6915e00181f877e196df80cc793944fa0b37a7469d76d3774244aae2c8f46a000b94abd9b9f3cb17a79de0263d0fa08988651709b6 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250714gita426778.tar.gz) = 94aac0053c50176c9f490e37baf04f090ecc60f50f903daf2f23e312728efc6a09abbb11cda100fed84cf5b99e1522ff78cc5ed2f4d2abbc3cac0d5929498137 From bad1912f94a71814989da47355b1698c39a7a781 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:02:37 +0000 Subject: [PATCH 29/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cairo-dock-plug-ins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 32af629..56fc640 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .rc4 @@ -423,6 +423,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.5.99^20250714gita426778-2.rc4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 14 2025 Mamoru TASAKA - 3.5.99^20250714gita426778-1.rc4 - Update to the latest git (20250714gita426778) From cef03d3875e2a8fa8d2fa7ab81b7d233dce4ae9b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 29 Jul 2025 15:33:18 +0900 Subject: [PATCH 30/41] raise core_least_ver --- cairo-dock-plug-ins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 56fc640..d9e5a51 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,7 +1,7 @@ %global urlver 3.5 %global mainver 3.5.99 -%global core_least_ver 3.5.99 +%global core_least_ver 3.5.99^20250716git033945c %global use_git 1 %global gitdate 20250714 From e71ed456e528e562c51dd9fcbdfbbe6abcf7fb29 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 29 Jul 2025 16:27:15 +0900 Subject: [PATCH 31/41] Update to the latest git (20250729giteb8fa4c) --- cairo-dock-plug-ins.spec | 16 +++++++++------- sources | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index d9e5a51..ef53b92 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,18 +1,17 @@ %global urlver 3.5 %global mainver 3.5.99 -%global core_least_ver 3.5.99^20250716git033945c +%global core_least_ver 3.5.99^20250729gitc86686d %global use_git 1 -%global gitdate 20250714 -%global githash a4267783cd3a9aa79e14c4a6c729eb04c0665ec2 +%global gitdate 20250729 +%global githash eb8fa4c93cf411fa0e68f2918aeb4ab3f7a3d28d %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 -%global alphatag .rc4 - +%global baserelease 1 +%global alphatag .rc5 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") %global dbus_datadir %{_datadir}/cairo-dock/plug-ins/Dbus @@ -53,7 +52,7 @@ BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: gettext -BuildRequires: pkgconfig(gldi) = %{core_least_ver} +BuildRequires: pkgconfig(gldi) >= %{mainver} BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -423,6 +422,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Tue Jul 29 2025 Mamoru TASAKA - 3.5.99^20250729giteb8fa4c-1.rc5 +- Update to the latest git (20250729giteb8fa4c) + * Wed Jul 23 2025 Fedora Release Engineering - 3.5.99^20250714gita426778-2.rc4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 22a9293..fe0e350 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250714gita426778.tar.gz) = 94aac0053c50176c9f490e37baf04f090ecc60f50f903daf2f23e312728efc6a09abbb11cda100fed84cf5b99e1522ff78cc5ed2f4d2abbc3cac0d5929498137 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250729giteb8fa4c.tar.gz) = d342f93a46c5016212dd089545886f130c7ebedbc9d232123f00db3d2e514098a6a2f7f64d6c198a01f5a5342c0317f25e76c6a04bed7e329469619d0f01861b From 5efc170cee5683415c75565e571658544a202eb0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 12 Aug 2025 16:13:18 +0900 Subject: [PATCH 32/41] Update to the latest git (20250810git987890d) --- cairo-dock-plug-ins.spec | 20 +++-- cairo-dock-plugins-3.4.1-port-WebKit2.patch | 77 ------------------- ...ock-plugins-3.4.1-port-WebKit2_gtk41.patch | 17 ---- sources | 2 +- 4 files changed, 10 insertions(+), 106 deletions(-) delete mode 100644 cairo-dock-plugins-3.4.1-port-WebKit2.patch delete mode 100644 cairo-dock-plugins-3.4.1-port-WebKit2_gtk41.patch diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index ef53b92..5daf83b 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,17 +1,17 @@ %global urlver 3.5 %global mainver 3.5.99 -%global core_least_ver 3.5.99^20250729gitc86686d +%global core_least_ver 3.5.99^20250812gitba992c4 %global use_git 1 -%global gitdate 20250729 -%global githash eb8fa4c93cf411fa0e68f2918aeb4ab3f7a3d28d +%global gitdate 20250810 +%global githash 987890ddac525c4a6424ec669b389492ed8fb4a4 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc5 +%global alphatag .rc6 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") %global dbus_datadir %{_datadir}/cairo-dock/plug-ins/Dbus @@ -42,11 +42,6 @@ URL: http://glx-dock.org/ Source0: cairo-dock-plugins-fedora-%{tarballver}.tar.gz # Source0 is created from Source1 Source1: cairo-dock-plug-ins-create-fedora-tarball.sh -# Port to WebKit2 -Patch11: cairo-dock-plugins-3.4.1-port-WebKit2.patch -# https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version -# Use webkit2gtk-4.1 for F-39+ -Patch13: cairo-dock-plugins-3.4.1-port-WebKit2_gtk41.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -55,6 +50,7 @@ BuildRequires: gettext BuildRequires: pkgconfig(gldi) >= %{mainver} BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) +BuildRequires: cairo-dock-devel >= %{core_least_ver} # Plug-ins BuildRequires: pkgconfig(ayatana-indicator3-0.4) @@ -210,8 +206,6 @@ binding for Cairo-Dock. %prep %setup -q -n cairo-dock-plugins-%{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%patch -P11 -p1 -b .wk2 -%patch -P13 -p1 -b .wk2_gtk41 ## permission # %%_fixperms cannot fix permissions completely here @@ -275,6 +269,7 @@ rm -f CMakeCache.txt -Denable-doncky=TRUE \ -Denable-global-menu=TRUE \ -Denable-network-monitor=TRUE \ + -Denable-weblets=TRUE \ %if 0 -Denable-scooby-do=TRUE \ %endif @@ -422,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Tue Aug 12 2025 Mamoru TASAKA - 3.5.99^20250810git987890d-1.rc6 +- Update to the latest git (20250810git987890d) + * Tue Jul 29 2025 Mamoru TASAKA - 3.5.99^20250729giteb8fa4c-1.rc5 - Update to the latest git (20250729giteb8fa4c) diff --git a/cairo-dock-plugins-3.4.1-port-WebKit2.patch b/cairo-dock-plugins-3.4.1-port-WebKit2.patch deleted file mode 100644 index bec6e5f..0000000 --- a/cairo-dock-plugins-3.4.1-port-WebKit2.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- cairo-dock-plugins-3.4.1/CMakeLists.txt.wk2 2017-04-01 03:09:09.171381809 +0900 -+++ cairo-dock-plugins-3.4.1/CMakeLists.txt 2017-04-01 03:09:09.172381805 +0900 -@@ -1391,7 +1391,7 @@ - set (with_weblets no) - enable_if_not_defined (enable-weblets) - if (enable-weblets) -- set (WEBKIT_MODULE webkitgtk-3.0) -+ set (WEBKIT_MODULE webkit2gtk-4.0) - pkg_check_modules (WEBKIT ${WEBKIT_MODULE}) - if (NOT WEBKIT_FOUND) - message (STATUS "Could not find ${WEBKIT_MODULE}; Cairo-Dock won't be built with Weblets applet.") ---- cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h.wk2 2015-02-20 01:13:47.000000000 +0900 -+++ cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h 2017-04-01 03:09:09.172381805 +0900 -@@ -28,7 +28,7 @@ - #include "config.h" - #endif - --#include -+#include - - //\___________ structure containing the applet's configuration parameters. - struct _AppletConfig { ---- cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c.wk2 2015-02-20 01:13:47.000000000 +0900 -+++ cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c 2017-04-01 03:14:59.380001735 +0900 -@@ -62,13 +62,19 @@ - return gldi_dialog_new (&attr); - } - --/* Will be called when loading of the page is finished*/ --void load_finished_cb(WebKitWebView *pWebKitView, WebKitWebFrame* widget -+/* Will be called when loading of the page is changed*/ -+void load_changed_cb(WebKitWebView *pWebKitView, WebKitLoadEvent load_event - , GldiModuleInstance *myApplet) - { -- cd_debug ("weblets : (re)load finished\n"); -- // update scrollbars status -- show_hide_scrollbars(myApplet); -+ switch (load_event) { -+ case WEBKIT_LOAD_FINISHED: -+ cd_debug ("weblets : (re)load finished\n"); -+ // update scrollbars status -+ show_hide_scrollbars(myApplet); -+ break; -+ default: -+ break; -+ } - } - - /* Build the embedded widget */ -@@ -80,8 +86,8 @@ - myData.pWebKitView = WEBKIT_WEB_VIEW (webkit_web_view_new ()); - gtk_container_add (GTK_CONTAINER (myData.pGtkMozEmbed), GTK_WIDGET (myData.pWebKitView)); - g_signal_connect(G_OBJECT(myData.pWebKitView), -- "load_finished", -- G_CALLBACK (load_finished_cb), -+ "load-changed", -+ G_CALLBACK (load_changed_cb), - myApplet); - gtk_widget_show_all (myData.pGtkMozEmbed); - -@@ -120,10 +126,14 @@ - } - } - -- webkit_web_view_open(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com"); -+ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com"); - } - /* available since rev. 30985, from fev. 2008 */ -- webkit_web_view_set_transparent(myData.pWebKitView, myConfig.bIsTransparent); -+ { -+ GdkRGBA rgba = {0}; -+ if (myConfig.bIsTransparent) rgba.alpha = 0.5; -+ webkit_web_view_set_background_color(myData.pWebKitView, &rgba); -+ } - - return TRUE; - } diff --git a/cairo-dock-plugins-3.4.1-port-WebKit2_gtk41.patch b/cairo-dock-plugins-3.4.1-port-WebKit2_gtk41.patch deleted file mode 100644 index 6277246..0000000 --- a/cairo-dock-plugins-3.4.1-port-WebKit2_gtk41.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- cairo-dock-plugins-3.4.1/CMakeLists.txt.wk2gtk41 2023-05-07 14:45:32.239862573 +0900 -+++ cairo-dock-plugins-3.4.1/CMakeLists.txt 2023-05-07 15:18:05.558277847 +0900 -@@ -1401,9 +1401,13 @@ message (STATUS "> Weblets:") - set (with_weblets no) - enable_if_not_defined (enable-weblets) - if (enable-weblets) -- set (WEBKIT_MODULE webkit2gtk-4.0) -+ set (WEBKIT_MODULE webkit2gtk-4.1) - pkg_check_modules (WEBKIT ${WEBKIT_MODULE}) - if (NOT WEBKIT_FOUND) -+ set (WEBKIT_MODULE webkit2gtk-4.0) -+ pkg_check_modules (WEBKIT ${WEBKIT_MODULE}) -+ endif() -+ if (NOT WEBKIT_FOUND) - message (STATUS "Could not find ${WEBKIT_MODULE}; Cairo-Dock won't be built with Weblets applet.") - message (WARNING "This module is required to compile Weblets applet: ${WEBKIT_MODULE}") - set (MODULES_MISSING "${MODULES_MISSING} ${WEBKIT_MODULE}") diff --git a/sources b/sources index fe0e350..3480149 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250729giteb8fa4c.tar.gz) = d342f93a46c5016212dd089545886f130c7ebedbc9d232123f00db3d2e514098a6a2f7f64d6c198a01f5a5342c0317f25e76c6a04bed7e329469619d0f01861b +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250810git987890d.tar.gz) = ae17e56c8e9c9f960b3bad477e707f261523f8e4bc0def519c954036b30c5b80b9b843e431a411eb6990ce95ff9cb9ceddd28bce2ed87c7627a34d8f1b827d05 From 8f08ccff0829492a5414a1373dc34e07ff6da22d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:41:00 +0200 Subject: [PATCH 33/41] Rebuilt for Python 3.14.0rc2 bytecode --- cairo-dock-plug-ins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 5daf83b..38a69d2 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .rc6 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Fri Aug 15 2025 Python Maint - 3.5.99^20250810git987890d-2.rc6 +- Rebuilt for Python 3.14.0rc2 bytecode + * Tue Aug 12 2025 Mamoru TASAKA - 3.5.99^20250810git987890d-1.rc6 - Update to the latest git (20250810git987890d) From 75916e386ee07eb1ac59e9d0a224f25127532b52 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Aug 2025 22:47:45 +0900 Subject: [PATCH 34/41] Update to the latest git (20250822gitcb4e816) --- cairo-dock-plug-ins.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 38a69d2..614b038 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,17 +1,17 @@ %global urlver 3.5 %global mainver 3.5.99 -%global core_least_ver 3.5.99^20250812gitba992c4 +%global core_least_ver 3.5.99^20250822gitf3de00e %global use_git 1 -%global gitdate 20250810 -%global githash 987890ddac525c4a6424ec669b389492ed8fb4a4 +%global gitdate 20250822 +%global githash cb4e816c84f4a631e390a1c95835765c9f16ac00 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 -%global alphatag .rc6 +%global baserelease 1 +%global alphatag .rc7 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") %global dbus_datadir %{_datadir}/cairo-dock/plug-ins/Dbus @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Sun Aug 24 2025 Mamoru TASAKA - 3.5.99^20250822gitcb4e816-1.rc7 +- Update to the latest git (20250822gitcb4e816) + * Fri Aug 15 2025 Python Maint - 3.5.99^20250810git987890d-2.rc6 - Rebuilt for Python 3.14.0rc2 bytecode diff --git a/sources b/sources index 3480149..7902646 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250810git987890d.tar.gz) = ae17e56c8e9c9f960b3bad477e707f261523f8e4bc0def519c954036b30c5b80b9b843e431a411eb6990ce95ff9cb9ceddd28bce2ed87c7627a34d8f1b827d05 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250822gitcb4e816.tar.gz) = 541bd307b13fd9942d7c133201228fc78de4d4347371b8de30255714b1f40105bf0f81ffc04b74e6d1f8f7b02e8cf38315e9ac16c55f3d6071886b8ed963ba78 From 7a470d628d33cd38a0f0ee8a6c722ea8726ebee7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 8 Sep 2025 22:10:57 +0900 Subject: [PATCH 35/41] Update to the latest git (20250908gitac4c5fc) --- cairo-dock-plug-ins.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 614b038..686c5f7 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,17 +1,17 @@ %global urlver 3.5 %global mainver 3.5.99 -%global core_least_ver 3.5.99^20250822gitf3de00e +%global core_least_ver 3.5.99^20250907git2cd4d36 %global use_git 1 -%global gitdate 20250822 -%global githash cb4e816c84f4a631e390a1c95835765c9f16ac00 +%global gitdate 20250908 +%global githash ac4c5fc5921a152c8d8d6c62859bf77f5efee25e %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} %global baserelease 1 -%global alphatag .rc7 +%global alphatag .rc9 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") %global dbus_datadir %{_datadir}/cairo-dock/plug-ins/Dbus @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Mon Sep 08 2025 Mamoru TASAKA - 3.5.99^20250908gitac4c5fc-1.rc9 +- Update to the latest git (20250908gitac4c5fc) + * Sun Aug 24 2025 Mamoru TASAKA - 3.5.99^20250822gitcb4e816-1.rc7 - Update to the latest git (20250822gitcb4e816) diff --git a/sources b/sources index 7902646..2efab8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250822gitcb4e816.tar.gz) = 541bd307b13fd9942d7c133201228fc78de4d4347371b8de30255714b1f40105bf0f81ffc04b74e6d1f8f7b02e8cf38315e9ac16c55f3d6071886b8ed963ba78 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250908gitac4c5fc.tar.gz) = 419cecfcfec5d9e90666c07e0ec52d9bec60764e60f5de87f052d87963818b34ca895324899625035441e6bf30f4caf4b059b4662e87ef18dbe1356b79f5d97e From 71ee023d82b844dab2cf10d14bcca77c95a5c1f5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 17 Sep 2025 23:51:28 +0900 Subject: [PATCH 36/41] update to the latest git --- cairo-dock-plug-ins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 686c5f7..fe6715e 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,8 +4,8 @@ %global core_least_ver 3.5.99^20250907git2cd4d36 %global use_git 1 -%global gitdate 20250908 -%global githash ac4c5fc5921a152c8d8d6c62859bf77f5efee25e +%global gitdate 20250909 +%global githash 097b1197d2364565554d0bc36462dea37e31c857 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Wed Sep 17 2025 Mamoru TASAKA - 3.5.99^20250909git097b119-1.rc9 +- Update to the latest git (20250909git097b119) + * Mon Sep 08 2025 Mamoru TASAKA - 3.5.99^20250908gitac4c5fc-1.rc9 - Update to the latest git (20250908gitac4c5fc) diff --git a/sources b/sources index 2efab8e..b832e59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250908gitac4c5fc.tar.gz) = 419cecfcfec5d9e90666c07e0ec52d9bec60764e60f5de87f052d87963818b34ca895324899625035441e6bf30f4caf4b059b4662e87ef18dbe1356b79f5d97e +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250909git097b119.tar.gz) = dea4efe03f40b2d2379a400fb3b7f86f20115f9401166c684649b95b78fc6b68bde7c2542fc55cdc6735c3bd4a95395442847abd83a1e5a8cb34e6f403ded4a8 From 998627493ff28ed8d868d3ad73f9a3e7a898d950 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:10:23 +0200 Subject: [PATCH 37/41] Rebuilt for Python 3.14.0rc3 bytecode --- cairo-dock-plug-ins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index fe6715e..1102fea 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -10,7 +10,7 @@ %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 1 +%global baserelease 2 %global alphatag .rc9 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Fri Sep 19 2025 Python Maint - 3.5.99^20250909git097b119-2.rc9 +- Rebuilt for Python 3.14.0rc3 bytecode + * Wed Sep 17 2025 Mamoru TASAKA - 3.5.99^20250909git097b119-1.rc9 - Update to the latest git (20250909git097b119) From f731e4b04c6fd8ea7114cb060938f0dec82db31b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 25 Sep 2025 10:51:20 +0900 Subject: [PATCH 38/41] update to the latest git --- cairo-dock-plug-ins.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 1102fea..ffd9a23 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -4,13 +4,13 @@ %global core_least_ver 3.5.99^20250907git2cd4d36 %global use_git 1 -%global gitdate 20250909 -%global githash 097b1197d2364565554d0bc36462dea37e31c857 +%global gitdate 20250922 +%global githash f45372c1fbce5dc9a34a991ff6e2485d39603279 %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} -%global baserelease 2 +%global baserelease 1 %global alphatag .rc9 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") @@ -417,6 +417,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Wed Sep 24 2025 Mamoru TASAKA - 3.5.99^20250922gitf45372c-1.rc9 +- Update to the latest git (20250922gitf45372c) + * Fri Sep 19 2025 Python Maint - 3.5.99^20250909git097b119-2.rc9 - Rebuilt for Python 3.14.0rc3 bytecode diff --git a/sources b/sources index b832e59..026b2be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250909git097b119.tar.gz) = dea4efe03f40b2d2379a400fb3b7f86f20115f9401166c684649b95b78fc6b68bde7c2542fc55cdc6735c3bd4a95395442847abd83a1e5a8cb34e6f403ded4a8 +SHA512 (cairo-dock-plugins-fedora-3.5.99-20250922gitf45372c.tar.gz) = 8bda9c78ee6d7dce02a1222eeca35060d42555fc01c67977d9c720bc700401763c2c8e60d5610ca1e9958c5ea82cfdf760d86634030521a613b4978223c74874 From 25e0231258d233d94852835db17e36ceb304492e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Oct 2025 17:39:45 +0900 Subject: [PATCH 39/41] 3.6.0 --- cairo-dock-plug-ins.spec | 15 ++++++++++----- sources | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index ffd9a23..3d2594f 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,9 +1,9 @@ -%global urlver 3.5 -%global mainver 3.5.99 +%global urlver 3.6 +%global mainver 3.6.0 -%global core_least_ver 3.5.99^20250907git2cd4d36 +%global core_least_ver 3.6.0 -%global use_git 1 +%dnl %global use_git 1 %global gitdate 20250922 %global githash f45372c1fbce5dc9a34a991ff6e2485d39603279 %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 .rc9 +%dnl %global alphatag .rc9 %global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']") %global dbus_datadir %{_datadir}/cairo-dock/plug-ins/Dbus @@ -242,7 +242,9 @@ sed -i.installdir \ CMakeLists.txt # Modify version forcely +%if 0%{?use_git} sed -i CMakeLists.txt -e '\@set (\(CORE_REQUIRED_\|\)VERSION @s|VERSION.*|VERSION "%{mainver}")|' +%endif # Kill python2 explicitly sed -i.py2 CMakeLists.txt -e 's|python2)|python2-nono)|' @@ -417,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Wed Oct 01 2025 Mamoru TASAKA - 3.6.0-1 +- 3.6.0 + * Wed Sep 24 2025 Mamoru TASAKA - 3.5.99^20250922gitf45372c-1.rc9 - Update to the latest git (20250922gitf45372c) diff --git a/sources b/sources index 026b2be..2e3f3d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.5.99-20250922gitf45372c.tar.gz) = 8bda9c78ee6d7dce02a1222eeca35060d42555fc01c67977d9c720bc700401763c2c8e60d5610ca1e9958c5ea82cfdf760d86634030521a613b4978223c74874 +SHA512 (cairo-dock-plugins-fedora-3.6.0.tar.gz) = b4690b173818daaa8dfd9819d5e66b21401d1cb905dc3403f54014d618065654612f18631350b3cd66894818e71612aac6a97a295da3472a6624e9f1ecc9ee60 From 542f068745d9d14fbea3fa6abcc1acb455d065c5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 4 Nov 2025 16:49:25 +0900 Subject: [PATCH 40/41] 3.6.1 --- cairo-dock-plug-ins.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 3d2594f..2944dff 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,5 +1,5 @@ %global urlver 3.6 -%global mainver 3.6.0 +%global mainver 3.6.1 %global core_least_ver 3.6.0 @@ -419,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Tue Nov 04 2025 Mamoru TASAKA - 3.6.1-1 +- 3.6.1 + * Wed Oct 01 2025 Mamoru TASAKA - 3.6.0-1 - 3.6.0 diff --git a/sources b/sources index 2e3f3d3..05f06f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.6.0.tar.gz) = b4690b173818daaa8dfd9819d5e66b21401d1cb905dc3403f54014d618065654612f18631350b3cd66894818e71612aac6a97a295da3472a6624e9f1ecc9ee60 +SHA512 (cairo-dock-plugins-fedora-3.6.1.tar.gz) = b81fc8c6bbcdfc9ce298df9a6d86bad262e1a8a94f29739754a0c4437f756388d4f118fa706d4d3ceb45d7c6b0c8f38ce977ed803924c3ecab993264d270f3a3 From 8b2bca707232d127a5dc9328bdfd99a1b4281c26 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Dec 2025 17:49:21 +0900 Subject: [PATCH 41/41] 3.6.2 --- cairo-dock-plug-ins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 2944dff..459d1ee 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -1,5 +1,5 @@ %global urlver 3.6 -%global mainver 3.6.1 +%global mainver 3.6.2 %global core_least_ver 3.6.0 @@ -47,7 +47,7 @@ BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: gettext -BuildRequires: pkgconfig(gldi) >= %{mainver} +BuildRequires: pkgconfig(gldi) >= %{core_least_ver} BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: cairo-dock-devel >= %{core_least_ver} @@ -419,6 +419,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %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 05f06f0..bd0de08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-plugins-fedora-3.6.1.tar.gz) = b81fc8c6bbcdfc9ce298df9a6d86bad262e1a8a94f29739754a0c4437f756388d4f118fa706d4d3ceb45d7c6b0c8f38ce977ed803924c3ecab993264d270f3a3 +SHA512 (cairo-dock-plugins-fedora-3.6.2.tar.gz) = e8463af3efff540d953fd324a3a24840b355de7b0bf8c70478fc557d2a6469aab4241100096817721aa3136e305362d80e344a6ebd5f6107d70b93a9f4c5f9b4