From b1037bdb13cfab1a866971d09462ace5cad56259 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sun, 17 Nov 2019 09:41:16 +0100 Subject: 20191117.1 global branch merge. Signed-off-by: Matteo Bernardini --- .../cairo-dock-plugins-3.4.1-time_h-confict.patch | 137 +++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch (limited to 'desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch') diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch new file mode 100644 index 0000000000..0a2ea720d1 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch @@ -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 . + */ + ++#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 ++ -- cgit v1.2.3