cairo-dock-plug-ins/trunk/cairo-dock-plugins-3.4.1-time_h-confict.patch

   1 --- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c.glibc    2016-12-11 16:10:41.656840262 +0900
   2 +++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c  2016-12-11 16:23:31.875117800 +0900
   3 @@ -17,6 +17,7 @@
   4  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   5  */
   6
   7 +#include "applet-time_h-struct.h"
   8  #include <string.h>
   9
  10  #include "applet-struct.h"
  11 --- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c.glibc      2016-12-11 16:10:41.657840257 +0900
  12 +++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c    2016-12-11 16:22:24.465443591 +0900
  13 @@ -17,6 +17,7 @@
  14  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  15  */
  16
  17 +#include "applet-time_h-struct.h"
  18  #include "stdlib.h"
  19
  20  #include "applet-struct.h"
  21 --- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c.glibc     2015-02-20 01:13:47.000000000 +0900
  22 +++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c   2016-12-11 16:24:08.991938415 +0900
  23 @@ -17,6 +17,7 @@
  24  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  25  */
  26
  27 +#include "applet-time_h-struct.h"
  28  #include <stdlib.h>
  29  #include <string.h>
  30
  31 @@ -66,4 +67,4 @@
  32
  33
  34         return GLDI_NOTIFICATION_LET_PASS;
  35 -}
  36 \ ファイル末尾に改行がありません
  37 +}
  38 --- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c.glibc     2015-02-20 01:13:47.000000000 +0900
  39 +++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c   2016-12-11 16:23:55.137005376 +0900
  40 @@ -19,6 +19,7 @@
  41  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  42  */
  43
  44 +#include "applet-time_h-struct.h"
  45  #include <stdlib.h>
  46  #ifndef __FreeBSD__
  47  #include <endian.h>
  48 --- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h.glibc    2016-12-11 16:10:41.657840257 +0900
  49 +++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h  2016-12-11 16:22:59.589273837 +0900
  50 @@ -21,6 +21,7 @@
  51  #ifndef __CD_APPLET_STRUCT__
  52  #define  __CD_APPLET_STRUCT__
  53
  54 +#include "applet-time_h-struct.h"
  55  #include <sys/types.h>
  56  #include <alsa/asoundlib.h>
  57  #define _STRUCT_TIMEVAL
  58 --- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h.glibc     2016-12-11 16:11:55.464483550 +0900
  59 +++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h   2016-12-11 16:19:52.003180440 +0900
  60 @@ -0,0 +1,27 @@
  61 +/**
  62 +* This file is a part of the Cairo-Dock project
  63 +*
  64 +* Copyright : (C) see the 'copyright' file.
  65 +* E-mail    : see the 'copyright' file.
  66 +*
  67 +* This program is free software; you can redistribute it and/or
  68 +* modify it under the terms of the GNU General Public License
  69 +* as published by the Free Software Foundation; either version 3
  70 +* of the License, or (at your option) any later version.
  71 +*
  72 +* This program is distributed in the hope that it will be useful,
  73 +* but WITHOUT ANY WARRANTY; without even the implied warranty of
  74 +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  75 +* GNU General Public License for more details.
  76 +* You should have received a copy of the GNU General Public License
  77 +* along with this program.  If not, see <http://www.gnu.org/licenses/>.
  78 +*/
  79 +
  80 +#ifndef __CD_APPLET_TIME_H_STRUCT__
  81 +#define  __CD_APPLET_TIME_H_STRUCT__
  82 +
  83 +#define _POSIX_C_SOURCE 200809L
  84 +#include <time.h>
  85 +
  86 +#endif
  87 +
  88 --- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c.glibc       2015-02-20 01:13:47.000000000 +0900
  89 +++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c     2016-12-11 16:20:44.168928323 +0900
  90 @@ -20,6 +20,7 @@
  91  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  92  */
  93
  94 +#include "applet-time_h-struct.h"
  95  #include <stdlib.h>
  96
  97  #include "applet-struct.h"
  98 --- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h.glibc        2015-02-20 01:13:47.000000000 +0900
  99 +++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h      2016-12-11 16:19:47.713201174 +0900
 100 @@ -20,6 +20,7 @@
 101  #ifndef __CD_APPLET_STRUCT__
 102  #define  __CD_APPLET_STRUCT__
 103
 104 +#include "applet-time_h-struct.h"
 105  #include <sys/types.h>
 106  #include <alsa/asoundlib.h>
 107  #define _STRUCT_TIMEVAL
 108 --- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900
 109 +++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h       2016-12-11 16:19:52.003180440 +0900
 110 @@ -0,0 +1,27 @@
 111 +/**
 112 +* This file is a part of the Cairo-Dock project
 113 +*
 114 +* Copyright : (C) see the 'copyright' file.
 115 +* E-mail    : see the 'copyright' file.
 116 +*
 117 +* This program is free software; you can redistribute it and/or
 118 +* modify it under the terms of the GNU General Public License
 119 +* as published by the Free Software Foundation; either version 3
 120 +* of the License, or (at your option) any later version.
 121 +*
 122 +* This program is distributed in the hope that it will be useful,
 123 +* but WITHOUT ANY WARRANTY; without even the implied warranty of
 124 +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 125 +* GNU General Public License for more details.
 126 +* You should have received a copy of the GNU General Public License
 127 +* along with this program.  If not, see <http://www.gnu.org/licenses/>.
 128 +*/
 129 +
 130 +#ifndef __CD_APPLET_TIME_H_STRUCT__
 131 +#define  __CD_APPLET_TIME_H_STRUCT__
 132 +
 133 +#define _POSIX_C_SOURCE 200809L
 134 +#include <time.h>
 135 +
 136 +#endif
 137 +