/ogorman/finkinfo/gnome-python2-py23.patch

https://github.com/jrabbit/Fink-Experimental · Patch · 274 lines · 267 code · 7 blank · 0 comment · 0 complexity · b606d986889b6fd3cbcad2e9c3a1d95c MD5 · raw file 

    

  1. diff -urN gnome-python-2.0.0.orig/bonobo/bonobo-arg.c gnome-python-2.0.0/bonobo/bonobo-arg.c
    2. 

  2. --- gnome-python-2.0.0.orig/bonobo/bonobo-arg.c	Tue Feb 11 00:32:24 2003
    3. 

  3. +++ gnome-python-2.0.0/bonobo/bonobo-arg.c	Tue Jan 27 22:58:43 2004
    4. 

  4. @@ -1,5 +1,7 @@
    5. 

  5.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    6. 

  6. -
    7. 

  7. +#define NO_IMPORT_PYGOBJECT 1
    8. 

  8. +#define NO_IMPORT_PYGTK 1
    9. 

  9. +#define NO_IMPORT_PYORBIT 1
    10. 

  10.  #include <pygobject.h>
    11. 

  11.  #include <pyorbit.h>
    12. 

  12.  #include <bonobo/bonobo-types.h>
    13. 

  13. diff -urN gnome-python-2.0.0.orig/bonobo/bonobo.override gnome-python-2.0.0/bonobo/bonobo.override
    14. 

  14. --- gnome-python-2.0.0.orig/bonobo/bonobo.override	Tue Aug 12 22:58:35 2003
    15. 

  15. +++ gnome-python-2.0.0/bonobo/bonobo.override	Wed Jan 28 14:04:08 2004
    16. 

  16. @@ -3,7 +3,6 @@
    17. 

  17.  headers
    18. 

  18.  
    19. 

  19.  #include <Python.h>
    20. 

  20. -#define NO_IMPORT_PYGOBJECT
    21. 

  21.  #include <pygobject.h>
    22. 

  22.  #include <pyorbit.h>
    23. 

  23.  #include <libbonobo.h>
    24. 

  24. diff -urN gnome-python-2.0.0.orig/bonobo/bonobomodule.c gnome-python-2.0.0/bonobo/bonobomodule.c
    25. 

  25. --- gnome-python-2.0.0.orig/bonobo/bonobomodule.c	Sun Aug 24 22:34:32 2003
    26. 

  26. +++ gnome-python-2.0.0/bonobo/bonobomodule.c	Tue Jan 27 22:58:30 2004
    27. 

  27. @@ -1,4 +1,7 @@
    28. 

  28.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    29. 

  29. +#define NO_IMPORT_PYGOBJECT 1
    30. 

  30. +#define NO_IMPORT_PYGTK 1
    31. 

  31. +#define NO_IMPORT_PYORBIT 1
    32. 

  32.  #ifdef HAVE_CONFIG_H
    33. 

  33.  #  include "config.h"
    34. 

  34.  #endif
    35. 

  35. diff -urN gnome-python-2.0.0.orig/bonobo/bonoboui.override gnome-python-2.0.0/bonobo/bonoboui.override
    36. 

  36. --- gnome-python-2.0.0.orig/bonobo/bonoboui.override	Wed Jul 16 18:24:35 2003
    37. 

  37. +++ gnome-python-2.0.0/bonobo/bonoboui.override	Wed Jan 28 14:03:58 2004
    38. 

  38. @@ -2,7 +2,6 @@
    39. 

  39.  %%
    40. 

  40.  headers
    41. 

  41.  #include <Python.h>
    42. 

  42. -#define NO_IMPORT_PYGOBJECT
    43. 

  43.  #include <pygobject.h>
    44. 

  44.  #include <pyorbit.h>
    45. 

  45.  #include <bonobo.h>
    46. 

  46. diff -urN gnome-python-2.0.0.orig/bonobo/bonobouimodule.c gnome-python-2.0.0/bonobo/bonobouimodule.c
    47. 

  47. --- gnome-python-2.0.0.orig/bonobo/bonobouimodule.c	Sun Aug 24 22:34:43 2003
    48. 

  48. +++ gnome-python-2.0.0/bonobo/bonobouimodule.c	Wed Jan 28 20:48:45 2004
    49. 

  49. @@ -1,4 +1,7 @@
    50. 

  50.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    51. 

  51. +#define NO_IMPORT_PYGOBJECT 1
    52. 

  52. +/* #define NO_IMPORT_PYGTK 1 */
    53. 

  53. +#define NO_IMPORT_PYORBIT 1
    54. 

  54.  #ifdef HAVE_CONFIG_H
    55. 

  55.  #  include "config.h"
    56. 

  56.  #endif
    57. 

  57. diff -urN gnome-python-2.0.0.orig/configure gnome-python-2.0.0/configure
    58. 

  58. --- gnome-python-2.0.0.orig/configure	Mon Sep  1 19:55:41 2003
    59. 

  59. +++ gnome-python-2.0.0/configure	Tue Jan 27 22:12:03 2004
    60. 

  60. @@ -6833,7 +6833,7 @@
    61. 

  61.  	allow_undefined_flag='-undefined suppress'
    62. 

  62.  	;;
    63. 

  63.        *) # Darwin 1.3 on
    64. 

  64. -	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
    65. 

  65. +	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-undefined dynamic_lookup'
    66. 

  66.  	;;
    67. 

  67.        esac
    68. 

  68.        # FIXME: Relying on posixy $() will cause problems for
    69. 

  69. diff -urN gnome-python-2.0.0.orig/gconf/gconf-fixes.c gnome-python-2.0.0/gconf/gconf-fixes.c
    70. 

  70. --- gnome-python-2.0.0.orig/gconf/gconf-fixes.c	Sat Jan 19 20:55:11 2002
    71. 

  71. +++ gnome-python-2.0.0/gconf/gconf-fixes.c	Tue Jan 27 22:46:00 2004
    72. 

  72. @@ -18,7 +18,9 @@
    73. 

  73.   * 
    74. 

  74.   * Author: Johan Dahlin <jdahlin@telia.com>
    75. 

  75.   */
    76. 

  76. -
    77. 

  77. +#define NO_IMPORT_PYGOBJECT 1
    78. 

  78. +#define NO_IMPORT_PYGTK 1
    79. 

  79. +#define NO_IMPORT_PYORBIT 1
    80. 

  80.  #include <gconf/gconf-client.h>
    81. 

  81.  #include <gconf/gconf-value.h>
    82. 

  82.  
    83. 

  83. diff -urN gnome-python-2.0.0.orig/gconf/gconfmodule.c gnome-python-2.0.0/gconf/gconfmodule.c
    84. 

  84. --- gnome-python-2.0.0.orig/gconf/gconfmodule.c	Sun Aug 24 22:34:54 2003
    85. 

  85. +++ gnome-python-2.0.0/gconf/gconfmodule.c	Tue Jan 27 22:45:34 2004
    86. 

  86. @@ -1,5 +1,7 @@
    87. 

  87.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    88. 

  88. -
    89. 

  89. +#define NO_IMPORT_PYGOBJECT 1
    90. 

  90. +#define NO_IMPORT_PYGTK 1
    91. 

  91. +#define NO_IMPORT_PYORBIT 1
    92. 

  92.  #ifdef HAVE_CONFIG_H
    93. 

  93.  #include "config.h"
    94. 

  94.  #endif
    95. 

  95. Binary files gnome-python-2.0.0.orig/gnome/__init__.pyc and gnome-python-2.0.0/gnome/__init__.pyc differ
    96. 

  96. diff -urN gnome-python-2.0.0.orig/gnome/appletmodule.c gnome-python-2.0.0/gnome/appletmodule.c
    97. 

  97. --- gnome-python-2.0.0.orig/gnome/appletmodule.c	Sun Aug 24 22:35:13 2003
    98. 

  98. +++ gnome-python-2.0.0/gnome/appletmodule.c	Tue Jan 27 22:53:46 2004
    99. 

  99. @@ -1,5 +1,7 @@
    100. 

  100.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    101. 

  101. -
    102. 

  102. +#define NO_IMPORT_PYGOBJECT 1
    103. 

  103. +#define NO_IMPORT_PYGTK 1
    104. 

  104. +#define NO_IMPORT_PYORBIT 1
    105. 

  105.  #ifdef HAVE_CONFIG_H
    106. 

  106.  #include "config.h"
    107. 

  107.  #endif
    108. 

  108. diff -urN gnome-python-2.0.0.orig/gnome/canvasmodule.c gnome-python-2.0.0/gnome/canvasmodule.c
    109. 

  109. --- gnome-python-2.0.0.orig/gnome/canvasmodule.c	Sun Aug 24 22:35:27 2003
    110. 

  110. +++ gnome-python-2.0.0/gnome/canvasmodule.c	Tue Jan 27 22:51:39 2004
    111. 

  111. @@ -1,5 +1,7 @@
    112. 

  112.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    113. 

  113. -
    114. 

  114. +#define NO_IMPORT_PYGOBJECT 1
    115. 

  115. +#define NO_IMPORT_PYGTK 1
    116. 

  116. +#define NO_IMPORT_PYORBIT 1
    117. 

  117.  #ifdef HAVE_CONFIG_H
    118. 

  118.  #include "config.h"
    119. 

  119.  #endif
    120. 

  120. diff -urN gnome-python-2.0.0.orig/gnome/gnomemodule.c gnome-python-2.0.0/gnome/gnomemodule.c
    121. 

  121. --- gnome-python-2.0.0.orig/gnome/gnomemodule.c	Sun Aug 24 22:36:04 2003
    122. 

  122. +++ gnome-python-2.0.0/gnome/gnomemodule.c	Tue Jan 27 22:50:58 2004
    123. 

  123. @@ -1,5 +1,7 @@
    124. 

  124.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    125. 

  125. -
    126. 

  126. +#define NO_IMPORT_PYGOBJECT 1
    127. 

  127. +#define NO_IMPORT_PYGTK 1
    128. 

  128. +#define NO_IMPORT_PYORBIT 1
    129. 

  129.  #ifdef HAVE_CONFIG_H
    130. 

  130.  #include "config.h"
    131. 

  131.  #endif
    132. 

  132. diff -urN gnome-python-2.0.0.orig/gnome/nautilusmodule.c gnome-python-2.0.0/gnome/nautilusmodule.c
    133. 

  133. --- gnome-python-2.0.0.orig/gnome/nautilusmodule.c	Sun Aug 24 22:36:14 2003
    134. 

  134. +++ gnome-python-2.0.0/gnome/nautilusmodule.c	Tue Jan 27 22:54:01 2004
    135. 

  135. @@ -1,5 +1,7 @@
    136. 

  136.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    137. 

  137. -
    138. 

  138. +#define NO_IMPORT_PYGOBJECT 1
    139. 

  139. +#define NO_IMPORT_PYGTK 1
    140. 

  140. +#define NO_IMPORT_PYORBIT 1
    141. 

  141.  #ifdef HAVE_CONFIG_H
    142. 

  142.  #include "config.h"
    143. 

  143.  #endif
    144. 

  144. diff -urN gnome-python-2.0.0.orig/gnome/uimodule.c gnome-python-2.0.0/gnome/uimodule.c
    145. 

  145. --- gnome-python-2.0.0.orig/gnome/uimodule.c	Sun Aug 24 22:37:00 2003
    146. 

  146. +++ gnome-python-2.0.0/gnome/uimodule.c	Tue Jan 27 22:51:22 2004
    147. 

  147. @@ -1,5 +1,7 @@
    148. 

  148.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    149. 

  149. -
    150. 

  150. +#define NO_IMPORT_PYGOBJECT 1
    151. 

  151. +#define NO_IMPORT_PYGTK 1
    152. 

  152. +#define NO_IMPORT_PYORBIT 1
    153. 

  153.  #ifdef HAVE_CONFIG_H
    154. 

  154.  #include "config.h"
    155. 

  155.  #endif
    156. 

  156. diff -urN gnome-python-2.0.0.orig/gnome/vfs-dir-handle.c gnome-python-2.0.0/gnome/vfs-dir-handle.c
    157. 

  157. --- gnome-python-2.0.0.orig/gnome/vfs-dir-handle.c	Thu Jun  5 23:32:22 2003
    158. 

  158. +++ gnome-python-2.0.0/gnome/vfs-dir-handle.c	Tue Jan 27 22:52:15 2004
    159. 

  159. @@ -1,5 +1,7 @@
    160. 

  160.  /* -*- mode: C; c-basic-offset: 4 -*- */
    161. 

  161. -
    162. 

  162. +#define NO_IMPORT_PYGOBJECT 1
    163. 

  163. +#define NO_IMPORT_PYGTK 1
    164. 

  164. +#define NO_IMPORT_PYORBIT 1
    165. 

  165.  #include "pygnomevfs-private.h"
    166. 

  166.  
    167. 

  167.  PyObject *
    168. 

  168. diff -urN gnome-python-2.0.0.orig/gnome/vfs-file-info.c gnome-python-2.0.0/gnome/vfs-file-info.c
    169. 

  169. --- gnome-python-2.0.0.orig/gnome/vfs-file-info.c	Thu Jun  5 23:32:22 2003
    170. 

  170. +++ gnome-python-2.0.0/gnome/vfs-file-info.c	Tue Jan 27 22:52:48 2004
    171. 

  171. @@ -1,5 +1,7 @@
    172. 

  172.  /* -*- mode: C; c-basic-offset: 4 -*- */
    173. 

  173. -
    174. 

  174. +#define NO_IMPORT_PYGOBJECT 1
    175. 

  175. +#define NO_IMPORT_PYGTK 1
    176. 

  176. +#define NO_IMPORT_PYORBIT 1
    177. 

  177.  #include "pygnomevfs-private.h"
    178. 

  178.  
    179. 

  179.  PyObject *
    180. 

  180. diff -urN gnome-python-2.0.0.orig/gnome/vfs-handle.c gnome-python-2.0.0/gnome/vfs-handle.c
    181. 

  181. --- gnome-python-2.0.0.orig/gnome/vfs-handle.c	Thu Jun  5 23:32:22 2003
    182. 

  182. +++ gnome-python-2.0.0/gnome/vfs-handle.c	Tue Jan 27 22:52:58 2004
    183. 

  183. @@ -1,5 +1,7 @@
    184. 

  184.  /* -*- mode: C; c-basic-offset: 4 -*- */
    185. 

  185. -
    186. 

  186. +#define NO_IMPORT_PYGOBJECT 1
    187. 

  187. +#define NO_IMPORT_PYGTK 1
    188. 

  188. +#define NO_IMPORT_PYORBIT 1
    189. 

  189.  #include "pygnomevfs-private.h"
    190. 

  190.  
    191. 

  191.  PyObject *
    192. 

  192. diff -urN gnome-python-2.0.0.orig/gnome/vfs-uri.c gnome-python-2.0.0/gnome/vfs-uri.c
    193. 

  193. --- gnome-python-2.0.0.orig/gnome/vfs-uri.c	Thu Jun  5 23:32:22 2003
    194. 

  194. +++ gnome-python-2.0.0/gnome/vfs-uri.c	Tue Jan 27 22:53:14 2004
    195. 

  195. @@ -1,5 +1,7 @@
    196. 

  196.  /* -*- mode: C; c-basic-offset: 4 -*- */
    197. 

  197. -
    198. 

  198. +#define NO_IMPORT_PYGOBJECT 1
    199. 

  199. +#define NO_IMPORT_PYGTK 1
    200. 

  200. +#define NO_IMPORT_PYORBIT 1
    201. 

  201.  #include "pygnomevfs-private.h"
    202. 

  202.  
    203. 

  203.  PyObject *
    204. 

  204. diff -urN gnome-python-2.0.0.orig/gnome/zvtmodule.c gnome-python-2.0.0/gnome/zvtmodule.c
    205. 

  205. --- gnome-python-2.0.0.orig/gnome/zvtmodule.c	Sun Aug 24 22:37:12 2003
    206. 

  206. +++ gnome-python-2.0.0/gnome/zvtmodule.c	Tue Jan 27 22:53:33 2004
    207. 

  207. @@ -1,5 +1,7 @@
    208. 

  208.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    209. 

  209. -
    210. 

  210. +#define NO_IMPORT_PYGOBJECT 1
    211. 

  211. +#define NO_IMPORT_PYGTK 1
    212. 

  212. +#define NO_IMPORT_PYORBIT 1
    213. 

  213.  #ifdef HAVE_CONFIG_H
    214. 

  214.  #include "config.h"
    215. 

  215.  #endif
    216. 

  216. diff -urN gnome-python-2.0.0.orig/gnomeprint/art-gtype.c gnome-python-2.0.0/gnomeprint/art-gtype.c
    217. 

  217. --- gnome-python-2.0.0.orig/gnomeprint/art-gtype.c	Wed Jan 15 06:45:24 2003
    218. 

  218. +++ gnome-python-2.0.0/gnomeprint/art-gtype.c	Tue Jan 27 22:55:28 2004
    219. 

  219. @@ -1,4 +1,7 @@
    220. 

  220.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    221. 

  221. +#define NO_IMPORT_PYGOBJECT 1
    222. 

  222. +#define NO_IMPORT_PYGTK 1
    223. 

  223. +#define NO_IMPORT_PYORBIT 1
    224. 

  224.  #include <string.h>
    225. 

  225.  #include "art-gtype.h"
    226. 

  226.  
    227. 

  227. diff -urN gnome-python-2.0.0.orig/gnomeprint/printmodule.c gnome-python-2.0.0/gnomeprint/printmodule.c
    228. 

  228. --- gnome-python-2.0.0.orig/gnomeprint/printmodule.c	Sun Aug 24 22:36:29 2003
    229. 

  229. +++ gnome-python-2.0.0/gnomeprint/printmodule.c	Tue Jan 27 22:55:48 2004
    230. 

  230. @@ -1,5 +1,7 @@
    231. 

  231.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    232. 

  232. -
    233. 

  233. +#define NO_IMPORT_PYGOBJECT 1
    234. 

  234. +#define NO_IMPORT_PYGTK 1
    235. 

  235. +#define NO_IMPORT_PYORBIT 1
    236. 

  236.  #ifdef HAVE_CONFIG_H
    237. 

  237.  #include "config.h"
    238. 

  238.  #endif
    239. 

  239. diff -urN gnome-python-2.0.0.orig/gnomeprint/printuimodule.c gnome-python-2.0.0/gnomeprint/printuimodule.c
    240. 

  240. --- gnome-python-2.0.0.orig/gnomeprint/printuimodule.c	Sun Aug 24 22:36:37 2003
    241. 

  241. +++ gnome-python-2.0.0/gnomeprint/printuimodule.c	Tue Jan 27 22:55:59 2004
    242. 

  242. @@ -1,5 +1,7 @@
    243. 

  243.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    244. 

  244. -
    245. 

  245. +#define NO_IMPORT_PYGOBJECT 1
    246. 

  246. +#define NO_IMPORT_PYGTK 1
    247. 

  247. +#define NO_IMPORT_PYORBIT 1
    248. 

  248.  #ifdef HAVE_CONFIG_H
    249. 

  249.  #include "config.h"
    250. 

  250.  #endif
    251. 

  251. diff -urN gnome-python-2.0.0.orig/gtkhtml2/gtkhtml2module.c gnome-python-2.0.0/gtkhtml2/gtkhtml2module.c
    252. 

  252. --- gnome-python-2.0.0.orig/gtkhtml2/gtkhtml2module.c	Mon Sep  1 20:00:08 2003
    253. 

  253. +++ gnome-python-2.0.0/gtkhtml2/gtkhtml2module.c	Tue Jan 27 22:57:10 2004
    254. 

  254. @@ -1,5 +1,7 @@
    255. 

  255.  /* -*- Mode: C; c-basic-offset: 4 -*- */
    256. 

  256. -
    257. 

  257. +#define NO_IMPORT_PYGOBJECT 1
    258. 

  258. +#define NO_IMPORT_PYGTK 1
    259. 

  259. +#define NO_IMPORT_PYORBIT 1
    260. 

  260.  #ifdef HAVE_CONFIG_H
    261. 

  261.  #include "config.h"
    262. 

  262.  #endif
    263. 

  263. diff -urN gnome-python-2.0.0.orig/setup.py gnome-python-2.0.0/setup.py
    264. 

  264. --- gnome-python-2.0.0.orig/setup.py	Mon Sep  1 22:47:50 2003
    265. 

  265. +++ gnome-python-2.0.0/setup.py	Wed Jan 28 00:00:45 2004
    266. 

  266. @@ -40,7 +40,7 @@
    267. 

  267.  LIBGNOME_REQUIRED_VERSION           = '2.0.0'
    268. 

  268.  LIBGNOMEUI_REQUIRED_VERSION         = '2.0.0'
    269. 

  269.  LIBGNOMECANVAS_REQUIRED_VERSION     = '2.0.0'
    270. 

  270. -LIBGNOMEVFS_REQUIRED_VERSION        = '2.0.0'
    271. 

  271. +LIBGNOMEVFS_REQUIRED_VERSION        = '22.0.0'
    272. 

  272.  LIBZVT_REQUIRED_VERSION             = '2.0.0'
    273. 

  273.  GCONF_REQUIRED_VERSION              = '1.2.0'
    274. 

  274.  BONOBO_ACTIVATION_REQUIRED_VERSION  = '1.0.0'
    275.