dvdauthor-0.7.1-glibc220.patch 3.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163
  1. From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
  3. Date: Sat, 19 Jul 2014 21:06:58 +0300
  4. Subject: [PATCH] compat.h needs stuff from config.h so include it there
  5. This was brought up by dvdvml.* not including it and thus causing a
  6. build failure on Fedora (22) devel. While at it, uninclude config.h
  7. from files where it was included just for compat.h reasons.
  8. ---
  9. src/compat.h | 2 ++
  10. src/conffile.c | 1 -
  11. src/dvdauthor.c | 2 --
  12. src/dvdcompile.c | 2 --
  13. src/dvdpgc.c | 1 -
  14. src/dvdunauthor.c | 2 --
  15. src/dvduncompile.c | 1 -
  16. src/dvdvob.c | 2 --
  17. src/readxml.c | 2 --
  18. src/spuunmux.c | 1 -
  19. src/subgen-encode.c | 2 --
  20. 11 files changed, 2 insertions(+), 16 deletions(-)
  21. diff --git a/src/compat.h b/src/compat.h
  22. index 126dcd7..93de081 100644
  23. --- a/src/compat.h
  24. +++ b/src/compat.h
  25. @@ -1,6 +1,8 @@
  26. // basic headers
  27. #define _GNU_SOURCE /* really just for strndup */
  28. +#include "config.h"
  29. +
  30. #ifdef HAVE_STDBOOL_H
  31. # include <stdbool.h>
  32. #else
  33. diff --git a/src/conffile.c b/src/conffile.c
  34. index cab661a..36ded07 100644
  35. --- a/src/conffile.c
  36. +++ b/src/conffile.c
  37. @@ -21,7 +21,6 @@
  38. * MA 02110-1301 USA.
  39. */
  40. -#include "config.h"
  41. #include "compat.h"
  42. #include <errno.h>
  43. #include "conffile.h"
  44. diff --git a/src/dvdauthor.c b/src/dvdauthor.c
  45. index d591d68..4860258 100644
  46. --- a/src/dvdauthor.c
  47. +++ b/src/dvdauthor.c
  48. @@ -20,8 +20,6 @@
  49. * MA 02110-1301 USA.
  50. */
  51. -#include "config.h"
  52. -
  53. #include "compat.h"
  54. #include <sys/types.h>
  55. diff --git a/src/dvdcompile.c b/src/dvdcompile.c
  56. index fd232b6..47f13e5 100644
  57. --- a/src/dvdcompile.c
  58. +++ b/src/dvdcompile.c
  59. @@ -20,8 +20,6 @@
  60. * MA 02110-1301 USA.
  61. */
  62. -#include "config.h"
  63. -
  64. #include "compat.h"
  65. #include <assert.h>
  66. diff --git a/src/dvdpgc.c b/src/dvdpgc.c
  67. index e0adc61..cf6eb04 100644
  68. --- a/src/dvdpgc.c
  69. +++ b/src/dvdpgc.c
  70. @@ -20,7 +20,6 @@
  71. * MA 02110-1301 USA.
  72. */
  73. -#include "config.h"
  74. #include "compat.h"
  75. #include <errno.h>
  76. #include <assert.h>
  77. diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c
  78. index ccd422f..f988cdf 100644
  79. --- a/src/dvdunauthor.c
  80. +++ b/src/dvdunauthor.c
  81. @@ -23,8 +23,6 @@
  82. * MA 02110-1301 USA.
  83. */
  84. -#include "config.h"
  85. -
  86. #include "compat.h"
  87. #include <ctype.h>
  88. diff --git a/src/dvduncompile.c b/src/dvduncompile.c
  89. index 0c5eaf1..a064011 100644
  90. --- a/src/dvduncompile.c
  91. +++ b/src/dvduncompile.c
  92. @@ -22,7 +22,6 @@
  93. * MA 02110-1301 USA.
  94. */
  95. -#include "config.h"
  96. #include "compat.h"
  97. #include <stdio.h>
  98. diff --git a/src/dvdvob.c b/src/dvdvob.c
  99. index 2d7e2b8..2146689 100644
  100. --- a/src/dvdvob.c
  101. +++ b/src/dvdvob.c
  102. @@ -20,8 +20,6 @@
  103. * MA 02110-1301 USA.
  104. */
  105. -#include "config.h"
  106. -
  107. #include "compat.h"
  108. #include <assert.h>
  109. diff --git a/src/readxml.c b/src/readxml.c
  110. index 61ff0a1..3b83f07 100644
  111. --- a/src/readxml.c
  112. +++ b/src/readxml.c
  113. @@ -20,8 +20,6 @@
  114. * MA 02110-1301 USA.
  115. */
  116. -#include "config.h"
  117. -
  118. #include "compat.h"
  119. #include <assert.h>
  120. diff --git a/src/spuunmux.c b/src/spuunmux.c
  121. index 1981e41..94fcb10 100644
  122. --- a/src/spuunmux.c
  123. +++ b/src/spuunmux.c
  124. @@ -31,7 +31,6 @@
  125. * MA 02110-1301 USA.
  126. */
  127. -#include "config.h"
  128. #include "compat.h"
  129. #include <fcntl.h>
  130. diff --git a/src/subgen-encode.c b/src/subgen-encode.c
  131. index 53ed4b2..962e902 100644
  132. --- a/src/subgen-encode.c
  133. +++ b/src/subgen-encode.c
  134. @@ -21,8 +21,6 @@
  135. * MA 02110-1301 USA.
  136. */
  137. -#include "config.h"
  138. -
  139. #include "compat.h"
  140. #include <assert.h>