Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cairo-dock-3.5.1

Browse Source
This commit is contained in:
uglyside
2025-01-31 11:36:03 +03:00
parent e127297238
commit 456da775c3
7 changed files with 56 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/dock/cairo-dock-plugins/actions.py
+10 -17
View File
@@ -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>", '"webkit/webkit.h"')
cmaketools.configure(i)
def build():
cmaketools.make()
mesontools.build()
def install():
cmaketools.install()
mesontools.install()
util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch
-52
View File
@@ -1,52 +0,0 @@
From 402a2d7bb657be4ad4072f07612e008e846d5e97 Mon Sep 17 00:00:00 2001
From: Fabounet <fabounet03@gmail.com>
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 {
util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-gcc10-extern.patch
-13
View File
@@ -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;
util/dock/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1-time_h-confict.patch
-137
View File
@@ -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 <http://www.gnu.org/licenses/>.
*/
+#include "applet-time_h-struct.h"
#include <string.h>
#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 <http://www.gnu.org/licenses/>.
*/
+#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 <http://www.gnu.org/licenses/>.
*/
+#include "applet-time_h-struct.h"
#include <stdlib.h>
#include <string.h>
@@ -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 <http://www.gnu.org/licenses/>.
*/
+#include "applet-time_h-struct.h"
#include <stdlib.h>
#ifndef __FreeBSD__
#include <endian.h>
--- 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 <sys/types.h>
#include <alsa/asoundlib.h>
#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 <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __CD_APPLET_TIME_H_STRUCT__
+#define __CD_APPLET_TIME_H_STRUCT__
+
+#define _POSIX_C_SOURCE 200809L
+#include <time.h>
+
+#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 <http://www.gnu.org/licenses/>.
*/
+#include "applet-time_h-struct.h"
#include <stdlib.h>
#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 <sys/types.h>
#include <alsa/asoundlib.h>
#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 <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __CD_APPLET_TIME_H_STRUCT__
+#define __CD_APPLET_TIME_H_STRUCT__
+
+#define _POSIX_C_SOURCE 200809L
+#include <time.h>
+
+#endif
+
util/dock/cairo-dock-plugins/pspec.xml
+20 -14
View File
@@ -3,19 +3,20 @@
<PISI>
<Source>
<Name>cairo-dock-plugins</Name>
<Homepage>http://glx-dock.org/</Homepage>
<Homepage>https://github.com/Cairo-Dock/cairo-dock-plug-ins</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<License>GPLv3</License>
<IsA>library</IsA>
<Icon>cairo-dock-plugins</Icon>
<Summary>Plugins of Cairo-Dock project.</Summary>
<Description>More options and plugins for glx-dock to enhance functionality.</Description>
<Archive sha1sum="b205504e1013d87f378cfbd288ced177868b42bd" type="targz">https://launchpad.net/cairo-dock-plug-ins/3.4/3.4.1/+download/cairo-dock-plug-ins-3.4.1.tar.gz</Archive>
<Archive sha1sum="0cf4b670c398ed8af26163a1275ce96dccba57e2" type="targz">https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/3.5.1/cairo-dock-plug-ins-3.5.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>vte-devel</Dependency>
<Dependency>ruby-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
@@ -45,20 +46,19 @@
<Dependency>libXxf86vm-devel</Dependency>
<Dependency>lm_sensors-devel</Dependency>
<Dependency>libdbusmenu-gtk3</Dependency>
<Dependency>webkit2gtk-devel</Dependency>
<Dependency>libdbusmenu-devel</Dependency>
<Dependency>libxklavier-devel</Dependency>
<Dependency>libXinerama-devel</Dependency>
<Dependency>gnome-menus-devel</Dependency>
<Dependency>libindicator-devel</Dependency>
<Dependency>python-setuptools</Dependency>
<Dependency>python3-setuptools</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency versionFrom="3.4.1">cairo-dock-devel</Dependency>
<Dependency>ayatana-libappindicator-devel</Dependency>
<Dependency versionFrom="3.5.1">cairo-dock-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>cairo-dock-plugins-3.4.1-gcc10-extern.patch</Patch>
<Patch>cairo-dock-plugins-3.4.1-time_h-confict.patch</Patch>
<Patch>cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch</Patch>
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
@@ -88,15 +88,14 @@
<Dependency>libXxf86vm</Dependency>
<Dependency>libxklavier</Dependency>
<Dependency>gnome-menus</Dependency>
<Dependency>libindicator</Dependency>
<Dependency>libdbusmenu-gtk</Dependency>
<Dependency>pulseaudio-libs</Dependency>
<Dependency>libdbusmenu-gtk</Dependency>
<Dependency>libdbusmenu-glib</Dependency>
<Dependency>libdbusmenu-gtk3</Dependency>
<Dependency>ayatana-libappindicator</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share/cairo-dock</Path>
<Path fileType="data">/usr/share/vala/vapi/</Path>
<Path fileType="library">/usr/lib/libCDApplet.so*</Path>
<Path fileType="library">/usr/lib/ruby</Path>
<Path fileType="library">/usr/lib/python3*/site-packages</Path>
@@ -108,17 +107,24 @@
<Package>
<Name>cairo-dock-plugins-devel</Name>
<Summary>cairo-dock-plugins için geliştirme dosyaları</Summary>
<RuntimeDependencies>
<Dependency>glib2-devel</Dependency>
<Dependency release="current">cairo-dock-plugins</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/share/vala</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2025-01-31</Date>
<Version>3.5.1</Version>
<Comment>Version bump.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2023-10-04</Date>
<Version>3.4.1</Version>
util/dock/cairo-dock/actions.py
+14 -7
View File
@@ -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")
util/dock/cairo-dock/pspec.xml
+12 -4
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>cairo-dock</Name>
<Homepage>https://glx-dock.org/</Homepage>
<Homepage>https://github.com/Cairo-Dock/cairo-dock-core</Homepage>
<Packager>
<Name>Ali Cengiz Kurt</Name>
<Email>alicengizkurt@gmail.com</Email>
@@ -14,9 +14,11 @@
<IsA>app:gui</IsA>
<Summary>A pretty, light and convenient interface to your desktop, able to replace advantageously your system panel.</Summary>
<Description>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.</Description>
<Archive sha1sum="937766da2b4d26afa4b9fc8a5eaf4ec5c6502b91" type="targz">https://launchpad.net/cairo-dock-core/3.4/3.4.1/+download/cairo-dock-3.4.1.tar.gz</Archive>
<Archive sha1sum="56dbf99e12a7fc829bedf18917cea9dbe8a37f12" type="targz">https://github.com/Cairo-Dock/cairo-dock-core/archive/3.5.1/cairo-dock-core-3.5.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>python3</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>curl-devel</Dependency>
<Dependency>cairo-devel</Dependency>
@@ -69,7 +71,6 @@
<Path fileType="data">/usr/share/cairo-dock</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
<Path fileType="config">/etc</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
@@ -100,11 +101,18 @@
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="2">
<Date>2025-01-31</Date>
<Version>3.5.1</Version>
<Comment>Version bump.</Comment>
<Name>Ali Cengiz Kurt</Name>
<Email>alicengizkurt@gmail.com</Email>
</Update>
<Update release="1">
<Date>2022-05-31</Date>
<Version>3.4.1</Version>