OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
OpenSDE Packages Database (without history before r20070)
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.
1074 Commits
49 Branches
0 Tags
34 MiB
Tree: 0d732b00bd
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '0d732b00bd'
${ noResults }
package-nopast/attic/gnomesword/glib-h-fix.patch

295 lines
9.5 KiB
Raw Normal View History

* relocated current package database to the trunk of the package sub-project git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20072 10447126-35f2-4685-b0cf-6dd780d3921f
18 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- T2-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # T2 SDE: package/.../gnomesword/glib-h-fix.patch
  5. # Copyright (C) 2004 - 2006 The T2 SDE Project
  6. # Copyright (C) 1998 - 2004 Clifford Wolf
  7. #
  8. # More information can be found in the files COPYING and README.
  9. #
  10. # This patch file is dual-licensed. It is available under the license the
  11. # patched project is licensed under, as long as it is an OpenSource license
  12. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  13. # of the GNU General Public License as published by the Free Software
  14. # Foundation; either version 2 of the License, or (at your option) any later
  15. # version.
  16. # --- T2-COPYRIGHT-NOTE-END ---
  18. diff -urN gnomesword2-2.0.0/src/backend/config.cc gnomesword2-2.0.0-my/src/backend/config.cc
  19. --- gnomesword2-2.0.0/src/backend/config.cc 2003-12-24 20:10:38.000000000 +0100
  20. +++ gnomesword2-2.0.0-my/src/backend/config.cc 2004-01-09 04:21:54.000000000 +0100
  21. @@ -44,7 +44,7 @@
  22. #include <sys/stat.h>
  24. #ifdef USE_GNOME2
  25. -#include <glib-2.0/glib.h>
  26. +#include <glib.h>
  27. #else
  28. #include <glib-1.2/glib.h>
  29. #endif
  30. diff -urN gnomesword2-2.0.0/src/backend/key.cc gnomesword2-2.0.0-my/src/backend/key.cc
  31. --- gnomesword2-2.0.0/src/backend/key.cc 2003-12-24 20:10:38.000000000 +0100
  32. +++ gnomesword2-2.0.0-my/src/backend/key.cc 2004-01-09 04:21:54.000000000 +0100
  33. @@ -32,7 +32,7 @@
  35. #include <swmodule.h>
  36. #ifdef USE_GNOME2
  37. -#include <glib-2.0/glib.h>
  38. +#include <glib.h>
  39. #else
  40. #include <glib-1.2/glib.h>
  41. #endif
  42. diff -urN gnomesword2-2.0.0/src/backend/sword.cpp gnomesword2-2.0.0-my/src/backend/sword.cpp
  43. --- gnomesword2-2.0.0/src/backend/sword.cpp 2003-12-24 20:10:38.000000000 +0100
  44. +++ gnomesword2-2.0.0-my/src/backend/sword.cpp 2004-01-09 04:21:54.000000000 +0100
  45. @@ -31,7 +31,7 @@
  46. #endif
  48. #ifdef USE_GNOME2
  49. -#include <glib-2.0/glib.h>
  50. +#include <glib.h>
  51. #else
  52. #include <glib-1.2/glib.h>
  53. #endif
  54. diff -urN gnomesword2-2.0.0/src/gnome2/toolbar_nav.c gnomesword2-2.0.0-my/src/gnome2/toolbar_nav.c
  55. --- gnomesword2-2.0.0/src/gnome2/toolbar_nav.c 2003-12-24 20:10:38.000000000 +0100
  56. +++ gnomesword2-2.0.0-my/src/gnome2/toolbar_nav.c 2004-01-09 04:21:55.000000000 +0100
  57. @@ -24,7 +24,7 @@
  58. #endif
  60. #include <gnome.h>
  61. -#include <gal-2.0/gal/widgets/e-unicode.h>
  62. +#include <gal/widgets/e-unicode.h>
  64. #include "gui/toolbar_nav.h"
  65. #include "gui/shortcutbar_main.h"
  66. diff -urN gnomesword2-2.0.0/src/main/bibletext.c gnomesword2-2.0.0-my/src/main/bibletext.c
  67. --- gnomesword2-2.0.0/src/main/bibletext.c 2003-12-24 20:10:38.000000000 +0100
  68. +++ gnomesword2-2.0.0-my/src/main/bibletext.c 2004-01-09 04:21:54.000000000 +0100
  69. @@ -24,7 +24,7 @@
  70. #endif
  72. #ifdef USE_GNOME2
  73. -#include <glib-2.0/glib.h>
  74. +#include <glib.h>
  75. #else
  76. #include <glib-1.2/glib.h>
  77. #endif
  78. diff -urN gnomesword2-2.0.0/src/main/commentary.c gnomesword2-2.0.0-my/src/main/commentary.c
  79. --- gnomesword2-2.0.0/src/main/commentary.c 2003-12-24 20:10:38.000000000 +0100
  80. +++ gnomesword2-2.0.0-my/src/main/commentary.c 2004-01-09 04:21:54.000000000 +0100
  81. @@ -24,7 +24,7 @@
  82. #endif
  84. #ifdef USE_GNOME2
  85. -#include <glib-2.0/glib.h>
  86. +#include <glib.h>
  87. #else
  88. #include <glib-1.2/glib.h>
  89. #endif
  90. diff -urN gnomesword2-2.0.0/src/main/configs.c gnomesword2-2.0.0-my/src/main/configs.c
  91. --- gnomesword2-2.0.0/src/main/configs.c 2003-12-24 20:10:38.000000000 +0100
  92. +++ gnomesword2-2.0.0-my/src/main/configs.c 2004-01-09 04:21:54.000000000 +0100
  93. @@ -24,7 +24,7 @@
  94. #endif
  96. #ifdef USE_GNOME2
  97. -#include <glib-2.0/glib.h>
  98. +#include <glib.h>
  99. #else
  100. #include <glib-1.2/glib.h>
  101. #endif
  102. diff -urN gnomesword2-2.0.0/src/main/configs.h gnomesword2-2.0.0-my/src/main/configs.h
  103. --- gnomesword2-2.0.0/src/main/configs.h 2003-12-24 20:10:38.000000000 +0100
  104. +++ gnomesword2-2.0.0-my/src/main/configs.h 2004-01-09 04:21:54.000000000 +0100
  105. @@ -26,7 +26,7 @@
  106. extern "C" {
  107. #endif
  108. #ifdef USE_GNOME2
  109. -#include <glib-2.0/glib.h>
  110. +#include <glib.h>
  111. #else
  112. #include <glib-1.2/glib.h>
  113. #endif
  114. diff -urN gnomesword2-2.0.0/src/main/dictlex.c gnomesword2-2.0.0-my/src/main/dictlex.c
  115. --- gnomesword2-2.0.0/src/main/dictlex.c 2003-12-24 20:10:38.000000000 +0100
  116. +++ gnomesword2-2.0.0-my/src/main/dictlex.c 2004-01-09 04:21:54.000000000 +0100
  117. @@ -24,7 +24,7 @@
  118. #endif
  120. #ifdef USE_GNOME2
  121. -#include <glib-2.0/glib.h>
  122. +#include <glib.h>
  123. #else
  124. #include <glib-1.2/glib.h>
  125. #endif
  126. diff -urN gnomesword2-2.0.0/src/main/gbs.c gnomesword2-2.0.0-my/src/main/gbs.c
  127. --- gnomesword2-2.0.0/src/main/gbs.c 2003-12-24 20:10:38.000000000 +0100
  128. +++ gnomesword2-2.0.0-my/src/main/gbs.c 2004-01-09 04:21:54.000000000 +0100
  129. @@ -28,7 +28,7 @@
  130. #endif
  132. #ifdef USE_GNOME2
  133. -#include <glib-2.0/glib.h>
  134. +#include <glib.h>
  135. #else
  136. #include <glib-1.2/glib.h>
  137. #endif
  138. diff -urN gnomesword2-2.0.0/src/main/key.c gnomesword2-2.0.0-my/src/main/key.c
  139. --- gnomesword2-2.0.0/src/main/key.c 2003-12-24 20:10:38.000000000 +0100
  140. +++ gnomesword2-2.0.0-my/src/main/key.c 2004-01-09 04:21:54.000000000 +0100
  141. @@ -23,7 +23,7 @@
  142. #include <config.h>
  143. #endif
  144. #ifdef USE_GNOME2
  145. -#include <glib-2.0/glib.h>
  146. +#include <glib.h>
  147. #else
  148. #include <glib-1.2/glib.h>
  149. #endif
  150. diff -urN gnomesword2-2.0.0/src/main/lists.c gnomesword2-2.0.0-my/src/main/lists.c
  151. --- gnomesword2-2.0.0/src/main/lists.c 2003-12-24 20:10:38.000000000 +0100
  152. +++ gnomesword2-2.0.0-my/src/main/lists.c 2004-01-09 04:21:54.000000000 +0100
  153. @@ -24,8 +24,8 @@
  154. #endif
  156. #ifdef USE_GNOME2
  157. -#include <glib-2.0/glib.h>
  158. -#include <gal-2.0/gal/widgets/e-unicode.h>
  159. +#include <glib.h>
  160. +#include <gal/widgets/e-unicode.h>
  161. #else
  162. #include <glib-1.2/glib.h>
  163. #endif
  164. diff -urN gnomesword2-2.0.0/src/main/lists.h gnomesword2-2.0.0-my/src/main/lists.h
  165. --- gnomesword2-2.0.0/src/main/lists.h 2003-12-24 20:10:38.000000000 +0100
  166. +++ gnomesword2-2.0.0-my/src/main/lists.h 2004-01-09 04:21:54.000000000 +0100
  167. @@ -27,7 +27,7 @@
  168. {
  169. #endif
  170. #ifdef USE_GNOME2
  171. -#include <glib-2.0/glib.h>
  172. +#include <glib.h>
  173. #else
  174. #include <glib-1.2/glib.h>
  175. #endif
  176. diff -urN gnomesword2-2.0.0/src/main/module.c gnomesword2-2.0.0-my/src/main/module.c
  177. --- gnomesword2-2.0.0/src/main/module.c 2003-12-24 20:10:38.000000000 +0100
  178. +++ gnomesword2-2.0.0-my/src/main/module.c 2004-01-09 04:21:54.000000000 +0100
  179. @@ -26,7 +26,7 @@
  182. #ifdef USE_GNOME2
  183. -#include <glib-2.0/glib.h>
  184. +#include <glib.h>
  185. #else
  186. #include <glib-1.2/glib.h>
  187. #endif
  188. diff -urN gnomesword2-2.0.0/src/main/percomm.c gnomesword2-2.0.0-my/src/main/percomm.c
  189. --- gnomesword2-2.0.0/src/main/percomm.c 2003-12-24 20:10:38.000000000 +0100
  190. +++ gnomesword2-2.0.0-my/src/main/percomm.c 2004-01-09 04:21:54.000000000 +0100
  191. @@ -25,7 +25,7 @@
  194. #ifdef USE_GNOME2
  195. -#include <glib-2.0/glib.h>
  196. +#include <glib.h>
  197. #else
  198. #include <glib-1.2/glib.h>
  199. #endif
  200. diff -urN gnomesword2-2.0.0/src/main/search.c gnomesword2-2.0.0-my/src/main/search.c
  201. --- gnomesword2-2.0.0/src/main/search.c 2003-12-24 20:10:38.000000000 +0100
  202. +++ gnomesword2-2.0.0-my/src/main/search.c 2004-01-09 04:21:54.000000000 +0100
  203. @@ -24,7 +24,7 @@
  204. #endif
  206. #ifdef USE_GNOME2
  207. -#include <glib-2.0/glib.h>
  208. +#include <glib.h>
  209. #else
  210. #include <glib-1.2/glib.h>
  211. #endif
  212. diff -urN gnomesword2-2.0.0/src/main/search.h gnomesword2-2.0.0-my/src/main/search.h
  213. --- gnomesword2-2.0.0/src/main/search.h 2003-12-24 20:10:38.000000000 +0100
  214. +++ gnomesword2-2.0.0-my/src/main/search.h 2004-01-09 04:21:54.000000000 +0100
  215. @@ -27,7 +27,7 @@
  216. #endif
  218. #ifdef USE_GNOME2
  219. -#include <glib-2.0/glib.h>
  220. +#include <glib.h>
  221. #else
  222. #include <glib-1.2/glib.h>
  223. #endif
  224. diff -urN gnomesword2-2.0.0/src/main/settings.c gnomesword2-2.0.0-my/src/main/settings.c
  225. --- gnomesword2-2.0.0/src/main/settings.c 2003-12-24 20:10:38.000000000 +0100
  226. +++ gnomesword2-2.0.0-my/src/main/settings.c 2004-01-09 04:21:54.000000000 +0100
  227. @@ -25,7 +25,7 @@
  228. #endif
  230. #ifdef USE_GNOME2
  231. -#include <glib-2.0/glib.h>
  232. +#include <glib.h>
  233. #else
  234. #include <glib-1.2/glib.h>
  235. #endif
  236. diff -urN gnomesword2-2.0.0/src/main/shortcutbar.c gnomesword2-2.0.0-my/src/main/shortcutbar.c
  237. --- gnomesword2-2.0.0/src/main/shortcutbar.c 2003-12-24 20:10:38.000000000 +0100
  238. +++ gnomesword2-2.0.0-my/src/main/shortcutbar.c 2004-01-09 04:21:54.000000000 +0100
  239. @@ -24,7 +24,7 @@
  240. #endif
  242. #ifdef USE_GNOME2
  243. -#include <glib-2.0/glib.h>
  244. +#include <glib.h>
  245. #else
  246. #include <glib-1.2/glib.h>
  247. #endif
  248. diff -urN gnomesword2-2.0.0/src/main/shortcutbar.h gnomesword2-2.0.0-my/src/main/shortcutbar.h
  249. --- gnomesword2-2.0.0/src/main/shortcutbar.h 2003-12-24 20:10:38.000000000 +0100
  250. +++ gnomesword2-2.0.0-my/src/main/shortcutbar.h 2004-01-09 04:21:54.000000000 +0100
  251. @@ -27,7 +27,7 @@
  252. #endif
  254. #ifdef USE_GNOME2
  255. -#include <glib-2.0/glib.h>
  256. +#include <glib.h>
  257. #else
  258. #include <glib-1.2/glib.h>
  259. #endif
  260. diff -urN gnomesword2-2.0.0/src/main/spell_pspell.c gnomesword2-2.0.0-my/src/main/spell_pspell.c
  261. --- gnomesword2-2.0.0/src/main/spell_pspell.c 2003-12-24 20:10:38.000000000 +0100
  262. +++ gnomesword2-2.0.0-my/src/main/spell_pspell.c 2004-01-09 04:21:54.000000000 +0100
  263. @@ -26,7 +26,7 @@
  264. #ifdef USE_PSPELL
  266. #ifdef USE_GNOME2
  267. -#include <glib-2.0/glib.h>
  268. +#include <glib.h>
  269. #else
  270. #include <glib-1.2/glib.h>
  271. #endif
  272. diff -urN gnomesword2-2.0.0/src/main/sword.c gnomesword2-2.0.0-my/src/main/sword.c
  273. --- gnomesword2-2.0.0/src/main/sword.c 2003-12-24 20:10:38.000000000 +0100
  274. +++ gnomesword2-2.0.0-my/src/main/sword.c 2004-01-09 04:21:54.000000000 +0100
  275. @@ -24,7 +24,7 @@
  276. #endif
  278. #ifdef USE_GNOME2
  279. -#include <glib-2.0/glib.h>
  280. +#include <glib.h>
  281. #else
  282. #include <glib-1.2/glib.h>
  283. #endif
  284. diff -urN gnomesword2-2.0.0/src/main/xml.c gnomesword2-2.0.0-my/src/main/xml.c
  285. --- gnomesword2-2.0.0/src/main/xml.c 2003-12-24 20:10:38.000000000 +0100
  286. +++ gnomesword2-2.0.0-my/src/main/xml.c 2004-01-09 04:21:54.000000000 +0100
  287. @@ -24,7 +24,7 @@
  288. #endif
  290. #ifdef USE_GNOME2
  291. -#include <glib-2.0/glib.h>
  292. +#include <glib.h>
  293. #else
  294. #include <glib-1.2/glib.h>
  295. #endif