cairo-dock-plugins: rebuild against libical.so.3

[ci skip]
2018-12-26 17:43:20 +01:00 · 2018-12-26 17:43:20 +01:00 · 276be997d5
commit 276be997d5
parent a617407a78
3 changed files with 139 additions and 57 deletions
--- a/srcpkgs/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch
+++ b/srcpkgs/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 <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
+
--- a/srcpkgs/cairo-dock-plugins/patches/fix-timeval-redef.patch
+++ b/srcpkgs/cairo-dock-plugins/patches/fix-timeval-redef.patch
@ -1,56 +0,0 @@
--- alsaMixer/src/applet-struct.h.orig	2017-04-28 15:38:01.448075750 +0200
-+++ alsaMixer/src/applet-struct.h	2017-04-28 15:38:10.281059992 +0200
-@@ -23,6 +23,8 @@
- #include <sys/types.h>
- #include <alsa/asoundlib.h>
- #define _STRUCT_TIMEVAL
-+#define __timeval_defined 1
-+#define __timespec_defined 1
- #include <cairo-dock.h>
- 
- #ifdef INDICATOR_SOUNDMENU_WITH_IND3
--- alsaMixer/src/applet-notifications.c.orig	2017-04-28 15:48:09.445991115 +0200
-+++ alsaMixer/src/applet-notifications.c	2017-04-28 15:48:21.549969521 +0200
-@@ -17,6 +17,7 @@
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-+#define __timespec_defined 1
- #include <glib/gi18n.h>
- 
- #include "applet-struct.h"
-
--- alsaMixer/src/applet-draw.c.orig	2017-04-28 15:51:33.625626869 +0200
-+++ alsaMixer/src/applet-draw.c	2017-04-28 15:51:15.744658767 +0200
-@@ -19,6 +19,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
-+#define __timespec_defined 1
- #include <glib/gi18n.h>
- 
- #include "applet-struct.h"
-
--- alsaMixer/src/applet-backend-alsamixer.c.orig	2017-04-28 15:56:14.587125649 +0200
-+++ alsaMixer/src/applet-backend-alsamixer.c	2017-04-28 15:55:56.683157588 +0200
-@@ -20,6 +20,7 @@
- #include <stdlib.h>
- #include <math.h>
- #include <string.h>
-+#define __timespec_defined 1
- #include <glib/gi18n.h>
- 
- #include "applet-struct.h"
-
--- Sound-Effects/src/applet-struct.h.orig	2017-04-28 16:00:52.732629452 +0200
-+++ Sound-Effects/src/applet-struct.h	2017-04-28 16:00:36.919657661 +0200
-@@ -24,6 +24,8 @@
- #include <sys/types.h>
- #include <alsa/asoundlib.h>
- #define _STRUCT_TIMEVAL
-+#define __timeval_defined 1
-+#define __timespec_defined 1
- #include <cairo-dock.h>
- 
- //\___________ structure containing the applet's configuration parameters.
-
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=8
+revision=9
 build_style=cmake
 hostmakedepends="pkg-config"
 # XXX libetpan, libdbusmenu, etc
@ -19,6 +19,7 @@ checksum=e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+="-D_GNU_SOURCE" ;;
 esac
+patch_args="-Np1"

 cairo-dock-plugins-python2_package() {
 	depends="python ${sourcepkg}>=${version}_${revision}"