diff --git a/util/dock/cairo-dock-plugins/actions.py b/util/dock/cairo-dock-plugins/actions.py index 1d78219fad..a7e02f2da1 100644 --- a/util/dock/cairo-dock-plugins/actions.py +++ b/util/dock/cairo-dock-plugins/actions.py @@ -2,28 +2,21 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt +from pisi.actionsapi import cmaketools, mesontools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get -from pisi.actionsapi import cmaketools -from pisi.actionsapi import shelltools - +i = ''.join([ + ' -DCMAKE_BUILD_TYPE=RelWithDebInfo', + ' -DCMAKE_INSTALL_PREFIX=/usr', + ' -Bbuild -G Ninja -L ' + ]) def setup(): - pisitools.dosed("Dbus/interfaces/python/PythonInstall.cmake.in", "\@ROOT_PREFIX\@", get.installDIR()) - pisitools.dosed("Dbus/interfaces/bash/BashInstall.cmake.in", "\@ROOT_PREFIX\@", get.installDIR()) - cmaketools.configure() - if not shelltools.isDirectory("weblets/src/webkit"): - shelltools.makedirs("weblets/src/webkit") - shelltools.sym("%s/weblets/src/webkit" % get.curDIR(), "weblets/src/webkit/webkit") - for file in shelltools.ls("/usr/include/webkit-1.0/webkit"): - shelltools.sym("/usr/include/webkit-1.0/webkit/%s" % file, "weblets/src/webkit/%s" % file) - pisitools.dosed("weblets/src/applet-struct.h", "", '"webkit/webkit.h"') + cmaketools.configure(i) def build(): - cmaketools.make() + mesontools.build() def install(): - cmaketools.install() \ No newline at end of file + mesontools.install() diff --git a/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch b/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch deleted file mode 100644 index 035143fd3d..0000000000 --- a/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 402a2d7bb657be4ad4072f07612e008e846d5e97 Mon Sep 17 00:00:00 2001 -From: Fabounet -Date: Sun, 22 May 2016 21:13:21 +0200 -Subject: [PATCH] [1581725] Updated the weather URL we retrieve data from - ---- - weather/src/applet-config.c | 2 +- - weather/src/applet-read-data.c | 3 --- - weather/src/applet-struct.h | 3 +++ - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/weather/src/applet-config.c b/weather/src/applet-config.c -index c9a33c2..0a27a8a 100755 ---- a/weather/src/applet-config.c -+++ b/weather/src/applet-config.c -@@ -174,7 +174,7 @@ static void _on_got_location_data (const gchar *cLocationData, GldiModuleInstanc - gldi_task_discard (myData.pGetLocationTask); - myData.pGetLocationTask = NULL; - } --#define CD_WEATHER_BASE_URL "http://xml.weather.com" -+ - static void _cd_weather_search_for_location (GtkEntry *pEntry, GldiModuleInstance *myApplet) - { - const gchar *cLocationName = gtk_entry_get_text (pEntry); -diff --git a/weather/src/applet-read-data.c b/weather/src/applet-read-data.c -index 0bbdce7..8ca8d21 100755 ---- a/weather/src/applet-read-data.c -+++ b/weather/src/applet-read-data.c -@@ -30,9 +30,6 @@ - #include "applet-load-icons.h" - #include "applet-read-data.h" - --#define CD_WEATHER_BASE_URL "http://xml.weather.com" -- -- - static xmlDocPtr _cd_weather_open_xml_buffer (const gchar *cData, xmlNodePtr *root_node, const gchar *cRootNodeName, GError **erreur) - { - if (cData == NULL || *cData == '\0') -diff --git a/weather/src/applet-struct.h b/weather/src/applet-struct.h -index e96191e..02ba3d0 100755 ---- a/weather/src/applet-struct.h -+++ b/weather/src/applet-struct.h -@@ -29,6 +29,9 @@ - - #define WEATHER_DEFAULT_NAME "weather" - -+#define CD_WEATHER_BASE_URL "http://wxdata.weather.com/wxdata" -+ -+ - #define _display(cValue) ((cValue) == NULL || *((gchar*)cValue) == 'N' ? "?" : (const gchar*)(cValue)) - - struct _AppletConfig { diff --git a/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-gcc10-extern.patch b/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-gcc10-extern.patch deleted file mode 100644 index b541dd54c9..0000000000 --- a/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-gcc10-extern.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- cairo-dock-plugins-3.4.1/dock-rendering/src/rendering-config.c.gcc10 2015-02-20 01:13:47.000000000 +0900 -+++ cairo-dock-plugins-3.4.1/dock-rendering/src/rendering-config.c 2020-01-23 18:10:47.301788756 +0900 -@@ -25,8 +25,8 @@ - #include "rendering-config.h" - #include "rendering-rainbow.h" - --extern int iVanishingPointY;double my_fRainbowColor[4]; --double my_fRainbowLineColor[4]; -+extern int iVanishingPointY;extern double my_fRainbowColor[4]; -+extern double my_fRainbowLineColor[4]; - - extern double my_fInclinationOnHorizon; - extern double my_fForegroundRatio; \ No newline at end of file diff --git a/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-time_h-confict.patch b/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-time_h-confict.patch deleted file mode 100644 index 6cf930e911..0000000000 --- a/util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-time_h-confict.patch +++ /dev/null @@ -1,137 +0,0 @@ ---- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c.glibc 2016-12-11 16:10:41.656840262 +0900 -+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c 2016-12-11 16:23:31.875117800 +0900 -@@ -17,6 +17,7 @@ - * along with this program. If not, see . - */ - -+#include "applet-time_h-struct.h" - #include - - #include "applet-struct.h" ---- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c.glibc 2016-12-11 16:10:41.657840257 +0900 -+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c 2016-12-11 16:22:24.465443591 +0900 -@@ -17,6 +17,7 @@ - * along with this program. If not, see . - */ - -+#include "applet-time_h-struct.h" - #include "stdlib.h" - - #include "applet-struct.h" ---- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c.glibc 2015-02-20 01:13:47.000000000 +0900 -+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c 2016-12-11 16:24:08.991938415 +0900 -@@ -17,6 +17,7 @@ - * along with this program. If not, see . - */ - -+#include "applet-time_h-struct.h" - #include - #include - -@@ -66,4 +67,4 @@ - - - return GLDI_NOTIFICATION_LET_PASS; --} -\ ファイル末尾に改行がありません -+} ---- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c.glibc 2015-02-20 01:13:47.000000000 +0900 -+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c 2016-12-11 16:23:55.137005376 +0900 -@@ -19,6 +19,7 @@ - * along with this program. If not, see . - */ - -+#include "applet-time_h-struct.h" - #include - #ifndef __FreeBSD__ - #include ---- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h.glibc 2016-12-11 16:10:41.657840257 +0900 -+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h 2016-12-11 16:22:59.589273837 +0900 -@@ -21,6 +21,7 @@ - #ifndef __CD_APPLET_STRUCT__ - #define __CD_APPLET_STRUCT__ - -+#include "applet-time_h-struct.h" - #include - #include - #define _STRUCT_TIMEVAL ---- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900 -+++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900 -@@ -0,0 +1,27 @@ -+/** -+* This file is a part of the Cairo-Dock project -+* -+* Copyright : (C) see the 'copyright' file. -+* E-mail : see the 'copyright' file. -+* -+* This program is free software; you can redistribute it and/or -+* modify it under the terms of the GNU General Public License -+* as published by the Free Software Foundation; either version 3 -+* of the License, or (at your option) any later version. -+* -+* This program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* You should have received a copy of the GNU General Public License -+* along with this program. If not, see . -+*/ -+ -+#ifndef __CD_APPLET_TIME_H_STRUCT__ -+#define __CD_APPLET_TIME_H_STRUCT__ -+ -+#define _POSIX_C_SOURCE 200809L -+#include -+ -+#endif -+ ---- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c.glibc 2015-02-20 01:13:47.000000000 +0900 -+++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c 2016-12-11 16:20:44.168928323 +0900 -@@ -20,6 +20,7 @@ - * along with this program. If not, see . - */ - -+#include "applet-time_h-struct.h" - #include - - #include "applet-struct.h" ---- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h.glibc 2015-02-20 01:13:47.000000000 +0900 -+++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h 2016-12-11 16:19:47.713201174 +0900 -@@ -20,6 +20,7 @@ - #ifndef __CD_APPLET_STRUCT__ - #define __CD_APPLET_STRUCT__ - -+#include "applet-time_h-struct.h" - #include - #include - #define _STRUCT_TIMEVAL ---- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900 -+++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900 -@@ -0,0 +1,27 @@ -+/** -+* This file is a part of the Cairo-Dock project -+* -+* Copyright : (C) see the 'copyright' file. -+* E-mail : see the 'copyright' file. -+* -+* This program is free software; you can redistribute it and/or -+* modify it under the terms of the GNU General Public License -+* as published by the Free Software Foundation; either version 3 -+* of the License, or (at your option) any later version. -+* -+* This program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* You should have received a copy of the GNU General Public License -+* along with this program. If not, see . -+*/ -+ -+#ifndef __CD_APPLET_TIME_H_STRUCT__ -+#define __CD_APPLET_TIME_H_STRUCT__ -+ -+#define _POSIX_C_SOURCE 200809L -+#include -+ -+#endif -+ diff --git a/util/dock/cairo-dock-plugins/pspec.xml b/util/dock/cairo-dock-plugins/pspec.xml index b498c0dbfc..c79924c762 100644 --- a/util/dock/cairo-dock-plugins/pspec.xml +++ b/util/dock/cairo-dock-plugins/pspec.xml @@ -3,19 +3,20 @@ cairo-dock-plugins - http://glx-dock.org/ + https://github.com/Cairo-Dock/cairo-dock-plug-ins PisiLinux Community admins@pisilinux.org - GPLv2 + GPLv3 library cairo-dock-plugins Plugins of Cairo-Dock project. More options and plugins for glx-dock to enhance functionality. - https://launchpad.net/cairo-dock-plug-ins/3.4/3.4.1/+download/cairo-dock-plug-ins-3.4.1.tar.gz + https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/3.5.1/cairo-dock-plug-ins-3.5.1.tar.gz cmake + ninja vte-devel ruby-devel gtk3-devel @@ -45,20 +46,19 @@ libXxf86vm-devel lm_sensors-devel libdbusmenu-gtk3 - webkit2gtk-devel libdbusmenu-devel libxklavier-devel libXinerama-devel gnome-menus-devel - libindicator-devel + python-setuptools + python3-setuptools libXcomposite-devel pulseaudio-libs-devel - cairo-dock-devel + ayatana-libappindicator-devel + cairo-dock-devel - cairo-dock-plugins-3.4.1-gcc10-extern.patch - cairo-dock-plugins-3.4.1-time_h-confict.patch - cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch + @@ -88,15 +88,14 @@ libXxf86vm libxklavier gnome-menus - libindicator - libdbusmenu-gtk pulseaudio-libs + libdbusmenu-gtk libdbusmenu-glib libdbusmenu-gtk3 + ayatana-libappindicator /usr/share/cairo-dock - /usr/share/vala/vapi/ /usr/lib/libCDApplet.so* /usr/lib/ruby /usr/lib/python3*/site-packages @@ -108,17 +107,24 @@ cairo-dock-plugins-devel - cairo-dock-plugins için geliştirme dosyaları glib2-devel cairo-dock-plugins - /usr/lib/pkgconfig + /usr/lib/pkgconfig + /usr/share/vala + + 2025-01-31 + 3.5.1 + Version bump. + Kamil Atlı + suvari@pisilinux.org + 2023-10-04 3.4.1 diff --git a/util/dock/cairo-dock/actions.py b/util/dock/cairo-dock/actions.py index 848bdb3dc7..8905e815a7 100644 --- a/util/dock/cairo-dock/actions.py +++ b/util/dock/cairo-dock/actions.py @@ -2,17 +2,24 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import pisitools -from pisi.actionsapi import cmaketools +from pisi.actionsapi import cmaketools, mesontools, pisitools + +i = ''.join([ + ' -DCMAKE_BUILD_TYPE=RelWithDebInfo', + ' -DCMAKE_INSTALL_PREFIX=/usr', + ' -Denable-desktop-manager=OFF', + ' -Bbuild -G Ninja -L ' + ]) def setup(): - cmaketools.configure() + cmaketools.configure(i) def build(): - cmaketools.make() + mesontools.build() def install(): - cmaketools.install() - pisitools.dodoc("ChangeLog", "INSTALL", "LICENSE", "LGPL-2", "copyright") + mesontools.install() + + pisitools.dodoc("LICENSE", "LGPL-2", "copyright") diff --git a/util/dock/cairo-dock/pspec.xml b/util/dock/cairo-dock/pspec.xml index d7946b2823..13d841a621 100644 --- a/util/dock/cairo-dock/pspec.xml +++ b/util/dock/cairo-dock/pspec.xml @@ -3,7 +3,7 @@ cairo-dock - https://glx-dock.org/ + https://github.com/Cairo-Dock/cairo-dock-core Ali Cengiz Kurt alicengizkurt@gmail.com @@ -14,9 +14,11 @@ app:gui A pretty, light and convenient interface to your desktop, able to replace advantageously your system panel. Cairo-Dock is a pretty, light and convenient interface to your desktop, able to replace advantageously your system panel! It features multi-docks, taskbar, launchers and a lot of useful applets. - https://launchpad.net/cairo-dock-core/3.4/3.4.1/+download/cairo-dock-3.4.1.tar.gz + https://github.com/Cairo-Dock/cairo-dock-core/archive/3.5.1/cairo-dock-core-3.5.1.tar.gz cmake + ninja + python3 gtk3-devel curl-devel cairo-devel @@ -69,7 +71,6 @@ /usr/share/cairo-dock /usr/share/applications /usr/share/pixmaps - /etc /usr/share/locale /usr/share/man /usr/share/doc @@ -100,11 +101,18 @@ /usr/include - /usr/lib/pkgconfig + /usr/lib/pkgconfig + + 2025-01-31 + 3.5.1 + Version bump. + Ali Cengiz Kurt + alicengizkurt@gmail.com + 2022-05-31 3.4.1