cairo-dock-plugins-3.4.1-time_h-confict.patch 5.1 KB

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