cairo-dock-plugins: new package, cairo-dock: move to util/dock
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
diff -rupN cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt cairo-dock-plug-ins-3.4.1/CMakeLists.txt
|
||||
--- cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt 2015-03-12 09:43:57.171067365 +0100
|
||||
+++ cairo-dock-plug-ins-3.4.1/CMakeLists.txt 2015-03-12 09:46:20.717120675 +0100
|
||||
@@ -573,11 +573,11 @@ if (enable-mono-interface)
|
||||
if (NOT GMCS_EXECUTABLE OR NOT EXISTS ${GMCS_EXECUTABLE})
|
||||
message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.")
|
||||
else()
|
||||
- pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0)
|
||||
+ pkg_check_modules (MONO_PACKAGE dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0)
|
||||
if (NOT MONO_PACKAGE_FOUND)
|
||||
- message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.")
|
||||
- message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, ndesk-dbus-1.0 and ndesk-dbus-glib-1.0")
|
||||
- set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0")
|
||||
+ message (STATUS "Could not find dbus-sharp-2.0, dbus-sharp-glib-2.0 or glib-sharp-3.0; won't be built Mono interface.")
|
||||
+ message (WARNING "These modules are required to compile DBus applet with Mono interface: dbus-sharp-2.0, dbus-sharp-glib-2.0 and glib-sharp-3.0")
|
||||
+ set (MODULES_MISSING "${MODULES_MISSING} dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0")
|
||||
else()
|
||||
set (MONO_FOUND TRUE)
|
||||
set (with_mono yes)
|
||||
|
||||
diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt
|
||||
--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:52:56.491934965 +0100
|
||||
+++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:54:07.418777441 +0100
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
execute_process(COMMAND ${GMCS_EXECUTABLE}
|
||||
-target:library
|
||||
- -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0
|
||||
+ -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0
|
||||
-out:${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/ISubApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/IApplet.cs)
|
||||
### find how to register to GAC ...
|
||||
@@ -0,0 +1,13 @@
|
||||
--- 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;
|
||||
@@ -0,0 +1,137 @@
|
||||
--- 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
|
||||
+
|
||||
Reference in New Issue
Block a user