OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2199 Commits
1 Branch
0 Tags
34 MiB
Tree: 10c212cab9
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '10c212cab9'
${ noResults }
rocklinux/package/jsaw/gnomesword/glib-h-fix.patch

297 lines
9.6 KiB
Raw Normal View History

Juergen Sawinski: updated jsaw/gnomesword (2.0.0), jsaw/sword, jsaw/ginac (1.1.5), jsaw/root (3.10.2) and jsaw/bibletime (1.4) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2359 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
21 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/jsaw/gnomesword/glib-h-fix.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  20. diff -urN gnomesword2-2.0.0/src/backend/config.cc gnomesword2-2.0.0-my/src/backend/config.cc
  21. --- gnomesword2-2.0.0/src/backend/config.cc 2003-12-24 20:10:38.000000000 +0100
  22. +++ gnomesword2-2.0.0-my/src/backend/config.cc 2004-01-09 04:21:54.000000000 +0100
  23. @@ -44,7 +44,7 @@
  24. #include <sys/stat.h>
  26. #ifdef USE_GNOME2
  27. -#include <glib-2.0/glib.h>
  28. +#include <glib.h>
  29. #else
  30. #include <glib-1.2/glib.h>
  31. #endif
  32. diff -urN gnomesword2-2.0.0/src/backend/key.cc gnomesword2-2.0.0-my/src/backend/key.cc
  33. --- gnomesword2-2.0.0/src/backend/key.cc 2003-12-24 20:10:38.000000000 +0100
  34. +++ gnomesword2-2.0.0-my/src/backend/key.cc 2004-01-09 04:21:54.000000000 +0100
  35. @@ -32,7 +32,7 @@
  37. #include <swmodule.h>
  38. #ifdef USE_GNOME2
  39. -#include <glib-2.0/glib.h>
  40. +#include <glib.h>
  41. #else
  42. #include <glib-1.2/glib.h>
  43. #endif
  44. diff -urN gnomesword2-2.0.0/src/backend/sword.cpp gnomesword2-2.0.0-my/src/backend/sword.cpp
  45. --- gnomesword2-2.0.0/src/backend/sword.cpp 2003-12-24 20:10:38.000000000 +0100
  46. +++ gnomesword2-2.0.0-my/src/backend/sword.cpp 2004-01-09 04:21:54.000000000 +0100
  47. @@ -31,7 +31,7 @@
  48. #endif
  50. #ifdef USE_GNOME2
  51. -#include <glib-2.0/glib.h>
  52. +#include <glib.h>
  53. #else
  54. #include <glib-1.2/glib.h>
  55. #endif
  56. diff -urN gnomesword2-2.0.0/src/gnome2/toolbar_nav.c gnomesword2-2.0.0-my/src/gnome2/toolbar_nav.c
  57. --- gnomesword2-2.0.0/src/gnome2/toolbar_nav.c 2003-12-24 20:10:38.000000000 +0100
  58. +++ gnomesword2-2.0.0-my/src/gnome2/toolbar_nav.c 2004-01-09 04:21:55.000000000 +0100
  59. @@ -24,7 +24,7 @@
  60. #endif
  62. #include <gnome.h>
  63. -#include <gal-2.0/gal/widgets/e-unicode.h>
  64. +#include <gal/widgets/e-unicode.h>
  66. #include "gui/toolbar_nav.h"
  67. #include "gui/shortcutbar_main.h"
  68. diff -urN gnomesword2-2.0.0/src/main/bibletext.c gnomesword2-2.0.0-my/src/main/bibletext.c
  69. --- gnomesword2-2.0.0/src/main/bibletext.c 2003-12-24 20:10:38.000000000 +0100
  70. +++ gnomesword2-2.0.0-my/src/main/bibletext.c 2004-01-09 04:21:54.000000000 +0100
  71. @@ -24,7 +24,7 @@
  72. #endif
  74. #ifdef USE_GNOME2
  75. -#include <glib-2.0/glib.h>
  76. +#include <glib.h>
  77. #else
  78. #include <glib-1.2/glib.h>
  79. #endif
  80. diff -urN gnomesword2-2.0.0/src/main/commentary.c gnomesword2-2.0.0-my/src/main/commentary.c
  81. --- gnomesword2-2.0.0/src/main/commentary.c 2003-12-24 20:10:38.000000000 +0100
  82. +++ gnomesword2-2.0.0-my/src/main/commentary.c 2004-01-09 04:21:54.000000000 +0100
  83. @@ -24,7 +24,7 @@
  84. #endif
  86. #ifdef USE_GNOME2
  87. -#include <glib-2.0/glib.h>
  88. +#include <glib.h>
  89. #else
  90. #include <glib-1.2/glib.h>
  91. #endif
  92. diff -urN gnomesword2-2.0.0/src/main/configs.c gnomesword2-2.0.0-my/src/main/configs.c
  93. --- gnomesword2-2.0.0/src/main/configs.c 2003-12-24 20:10:38.000000000 +0100
  94. +++ gnomesword2-2.0.0-my/src/main/configs.c 2004-01-09 04:21:54.000000000 +0100
  95. @@ -24,7 +24,7 @@
  96. #endif
  98. #ifdef USE_GNOME2
  99. -#include <glib-2.0/glib.h>
  100. +#include <glib.h>
  101. #else
  102. #include <glib-1.2/glib.h>
  103. #endif
  104. diff -urN gnomesword2-2.0.0/src/main/configs.h gnomesword2-2.0.0-my/src/main/configs.h
  105. --- gnomesword2-2.0.0/src/main/configs.h 2003-12-24 20:10:38.000000000 +0100
  106. +++ gnomesword2-2.0.0-my/src/main/configs.h 2004-01-09 04:21:54.000000000 +0100
  107. @@ -26,7 +26,7 @@
  108. extern "C" {
  109. #endif
  110. #ifdef USE_GNOME2
  111. -#include <glib-2.0/glib.h>
  112. +#include <glib.h>
  113. #else
  114. #include <glib-1.2/glib.h>
  115. #endif
  116. diff -urN gnomesword2-2.0.0/src/main/dictlex.c gnomesword2-2.0.0-my/src/main/dictlex.c
  117. --- gnomesword2-2.0.0/src/main/dictlex.c 2003-12-24 20:10:38.000000000 +0100
  118. +++ gnomesword2-2.0.0-my/src/main/dictlex.c 2004-01-09 04:21:54.000000000 +0100
  119. @@ -24,7 +24,7 @@
  120. #endif
  122. #ifdef USE_GNOME2
  123. -#include <glib-2.0/glib.h>
  124. +#include <glib.h>
  125. #else
  126. #include <glib-1.2/glib.h>
  127. #endif
  128. diff -urN gnomesword2-2.0.0/src/main/gbs.c gnomesword2-2.0.0-my/src/main/gbs.c
  129. --- gnomesword2-2.0.0/src/main/gbs.c 2003-12-24 20:10:38.000000000 +0100
  130. +++ gnomesword2-2.0.0-my/src/main/gbs.c 2004-01-09 04:21:54.000000000 +0100
  131. @@ -28,7 +28,7 @@
  132. #endif
  134. #ifdef USE_GNOME2
  135. -#include <glib-2.0/glib.h>
  136. +#include <glib.h>
  137. #else
  138. #include <glib-1.2/glib.h>
  139. #endif
  140. diff -urN gnomesword2-2.0.0/src/main/key.c gnomesword2-2.0.0-my/src/main/key.c
  141. --- gnomesword2-2.0.0/src/main/key.c 2003-12-24 20:10:38.000000000 +0100
  142. +++ gnomesword2-2.0.0-my/src/main/key.c 2004-01-09 04:21:54.000000000 +0100
  143. @@ -23,7 +23,7 @@
  144. #include <config.h>
  145. #endif
  146. #ifdef USE_GNOME2
  147. -#include <glib-2.0/glib.h>
  148. +#include <glib.h>
  149. #else
  150. #include <glib-1.2/glib.h>
  151. #endif
  152. diff -urN gnomesword2-2.0.0/src/main/lists.c gnomesword2-2.0.0-my/src/main/lists.c
  153. --- gnomesword2-2.0.0/src/main/lists.c 2003-12-24 20:10:38.000000000 +0100
  154. +++ gnomesword2-2.0.0-my/src/main/lists.c 2004-01-09 04:21:54.000000000 +0100
  155. @@ -24,8 +24,8 @@
  156. #endif
  158. #ifdef USE_GNOME2
  159. -#include <glib-2.0/glib.h>
  160. -#include <gal-2.0/gal/widgets/e-unicode.h>
  161. +#include <glib.h>
  162. +#include <gal/widgets/e-unicode.h>
  163. #else
  164. #include <glib-1.2/glib.h>
  165. #endif
  166. diff -urN gnomesword2-2.0.0/src/main/lists.h gnomesword2-2.0.0-my/src/main/lists.h
  167. --- gnomesword2-2.0.0/src/main/lists.h 2003-12-24 20:10:38.000000000 +0100
  168. +++ gnomesword2-2.0.0-my/src/main/lists.h 2004-01-09 04:21:54.000000000 +0100
  169. @@ -27,7 +27,7 @@
  170. {
  171. #endif
  172. #ifdef USE_GNOME2
  173. -#include <glib-2.0/glib.h>
  174. +#include <glib.h>
  175. #else
  176. #include <glib-1.2/glib.h>
  177. #endif
  178. diff -urN gnomesword2-2.0.0/src/main/module.c gnomesword2-2.0.0-my/src/main/module.c
  179. --- gnomesword2-2.0.0/src/main/module.c 2003-12-24 20:10:38.000000000 +0100
  180. +++ gnomesword2-2.0.0-my/src/main/module.c 2004-01-09 04:21:54.000000000 +0100
  181. @@ -26,7 +26,7 @@
  184. #ifdef USE_GNOME2
  185. -#include <glib-2.0/glib.h>
  186. +#include <glib.h>
  187. #else
  188. #include <glib-1.2/glib.h>
  189. #endif
  190. diff -urN gnomesword2-2.0.0/src/main/percomm.c gnomesword2-2.0.0-my/src/main/percomm.c
  191. --- gnomesword2-2.0.0/src/main/percomm.c 2003-12-24 20:10:38.000000000 +0100
  192. +++ gnomesword2-2.0.0-my/src/main/percomm.c 2004-01-09 04:21:54.000000000 +0100
  193. @@ -25,7 +25,7 @@
  196. #ifdef USE_GNOME2
  197. -#include <glib-2.0/glib.h>
  198. +#include <glib.h>
  199. #else
  200. #include <glib-1.2/glib.h>
  201. #endif
  202. diff -urN gnomesword2-2.0.0/src/main/search.c gnomesword2-2.0.0-my/src/main/search.c
  203. --- gnomesword2-2.0.0/src/main/search.c 2003-12-24 20:10:38.000000000 +0100
  204. +++ gnomesword2-2.0.0-my/src/main/search.c 2004-01-09 04:21:54.000000000 +0100
  205. @@ -24,7 +24,7 @@
  206. #endif
  208. #ifdef USE_GNOME2
  209. -#include <glib-2.0/glib.h>
  210. +#include <glib.h>
  211. #else
  212. #include <glib-1.2/glib.h>
  213. #endif
  214. diff -urN gnomesword2-2.0.0/src/main/search.h gnomesword2-2.0.0-my/src/main/search.h
  215. --- gnomesword2-2.0.0/src/main/search.h 2003-12-24 20:10:38.000000000 +0100
  216. +++ gnomesword2-2.0.0-my/src/main/search.h 2004-01-09 04:21:54.000000000 +0100
  217. @@ -27,7 +27,7 @@
  218. #endif
  220. #ifdef USE_GNOME2
  221. -#include <glib-2.0/glib.h>
  222. +#include <glib.h>
  223. #else
  224. #include <glib-1.2/glib.h>
  225. #endif
  226. diff -urN gnomesword2-2.0.0/src/main/settings.c gnomesword2-2.0.0-my/src/main/settings.c
  227. --- gnomesword2-2.0.0/src/main/settings.c 2003-12-24 20:10:38.000000000 +0100
  228. +++ gnomesword2-2.0.0-my/src/main/settings.c 2004-01-09 04:21:54.000000000 +0100
  229. @@ -25,7 +25,7 @@
  230. #endif
  232. #ifdef USE_GNOME2
  233. -#include <glib-2.0/glib.h>
  234. +#include <glib.h>
  235. #else
  236. #include <glib-1.2/glib.h>
  237. #endif
  238. diff -urN gnomesword2-2.0.0/src/main/shortcutbar.c gnomesword2-2.0.0-my/src/main/shortcutbar.c
  239. --- gnomesword2-2.0.0/src/main/shortcutbar.c 2003-12-24 20:10:38.000000000 +0100
  240. +++ gnomesword2-2.0.0-my/src/main/shortcutbar.c 2004-01-09 04:21:54.000000000 +0100
  241. @@ -24,7 +24,7 @@
  242. #endif
  244. #ifdef USE_GNOME2
  245. -#include <glib-2.0/glib.h>
  246. +#include <glib.h>
  247. #else
  248. #include <glib-1.2/glib.h>
  249. #endif
  250. diff -urN gnomesword2-2.0.0/src/main/shortcutbar.h gnomesword2-2.0.0-my/src/main/shortcutbar.h
  251. --- gnomesword2-2.0.0/src/main/shortcutbar.h 2003-12-24 20:10:38.000000000 +0100
  252. +++ gnomesword2-2.0.0-my/src/main/shortcutbar.h 2004-01-09 04:21:54.000000000 +0100
  253. @@ -27,7 +27,7 @@
  254. #endif
  256. #ifdef USE_GNOME2
  257. -#include <glib-2.0/glib.h>
  258. +#include <glib.h>
  259. #else
  260. #include <glib-1.2/glib.h>
  261. #endif
  262. diff -urN gnomesword2-2.0.0/src/main/spell_pspell.c gnomesword2-2.0.0-my/src/main/spell_pspell.c
  263. --- gnomesword2-2.0.0/src/main/spell_pspell.c 2003-12-24 20:10:38.000000000 +0100
  264. +++ gnomesword2-2.0.0-my/src/main/spell_pspell.c 2004-01-09 04:21:54.000000000 +0100
  265. @@ -26,7 +26,7 @@
  266. #ifdef USE_PSPELL
  268. #ifdef USE_GNOME2
  269. -#include <glib-2.0/glib.h>
  270. +#include <glib.h>
  271. #else
  272. #include <glib-1.2/glib.h>
  273. #endif
  274. diff -urN gnomesword2-2.0.0/src/main/sword.c gnomesword2-2.0.0-my/src/main/sword.c
  275. --- gnomesword2-2.0.0/src/main/sword.c 2003-12-24 20:10:38.000000000 +0100
  276. +++ gnomesword2-2.0.0-my/src/main/sword.c 2004-01-09 04:21:54.000000000 +0100
  277. @@ -24,7 +24,7 @@
  278. #endif
  280. #ifdef USE_GNOME2
  281. -#include <glib-2.0/glib.h>
  282. +#include <glib.h>
  283. #else
  284. #include <glib-1.2/glib.h>
  285. #endif
  286. diff -urN gnomesword2-2.0.0/src/main/xml.c gnomesword2-2.0.0-my/src/main/xml.c
  287. --- gnomesword2-2.0.0/src/main/xml.c 2003-12-24 20:10:38.000000000 +0100
  288. +++ gnomesword2-2.0.0-my/src/main/xml.c 2004-01-09 04:21:54.000000000 +0100
  289. @@ -24,7 +24,7 @@
  290. #endif
  292. #ifdef USE_GNOME2
  293. -#include <glib-2.0/glib.h>
  294. +#include <glib.h>
  295. #else
  296. #include <glib-1.2/glib.h>
  297. #endif