/packages/devel/eggdbus/patches/eggdbus-0.6-binding_tool-0.2.patch

http://github.com/OpenELEC/OpenELEC.tv · Patch · 317 lines · 305 code · 12 blank · 0 comment · 0 complexity · 4f85a197586516ceed7adfcc558727c3 MD5 · raw file

  1. diff -Naur eggdbus-0.6/configure eggdbus-0.6.patch/configure
  2. --- eggdbus-0.6/configure 2009-07-05 01:07:00.000000000 +0200
  3. +++ eggdbus-0.6.patch/configure 2009-11-14 22:17:59.828231573 +0100
  4. @@ -805,6 +805,8 @@
  5. MAN_PAGES_ENABLED_FALSE
  6. MAN_PAGES_ENABLED_TRUE
  7. XSLTPROC
  8. +EGGDBUS_GLIB_GENMARSHAL
  9. +EGGDBUS_BINDING_TOOL
  10. OTOOL64
  11. OTOOL
  12. LIPO
  13. @@ -927,6 +929,8 @@
  14. enable_ansi
  15. enable_verbose_mode
  16. enable_man_pages
  17. +with_eggdbus_binding_tool
  18. +with_eggdbus_glib_genmarshal
  19. with_html_dir
  20. enable_gtk_doc
  21. '
  22. @@ -1597,6 +1601,10 @@
  23. --with-pic try to use only PIC/non-PIC objects [default=use
  24. both]
  25. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  26. + --with-eggdbus-binding-tool=filename
  27. + Use external eggdbus-binding-tool program
  28. + --with-eggdbus-glib-genmarshal=filename
  29. + Use external eggdbus-glib-genmarshal program
  30. --with-html-dir=PATH path to installed docs
  31. Some influential environment variables:
  32. @@ -6563,13 +6571,13 @@
  33. else
  34. lt_cv_nm_interface="BSD nm"
  35. echo "int some_variable = 0;" > conftest.$ac_ext
  36. - (eval echo "\"\$as_me:6566: $ac_compile\"" >&5)
  37. + (eval echo "\"\$as_me:6574: $ac_compile\"" >&5)
  38. (eval "$ac_compile" 2>conftest.err)
  39. cat conftest.err >&5
  40. - (eval echo "\"\$as_me:6569: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  41. + (eval echo "\"\$as_me:6577: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  42. (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  43. cat conftest.err >&5
  44. - (eval echo "\"\$as_me:6572: output\"" >&5)
  45. + (eval echo "\"\$as_me:6580: output\"" >&5)
  46. cat conftest.out >&5
  47. if $GREP 'External.*some_variable' conftest.out > /dev/null; then
  48. lt_cv_nm_interface="MS dumpbin"
  49. @@ -7774,7 +7782,7 @@
  50. ;;
  51. *-*-irix6*)
  52. # Find out which ABI we are using.
  53. - echo '#line 7777 "configure"' > conftest.$ac_ext
  54. + echo '#line 7785 "configure"' > conftest.$ac_ext
  55. if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  56. (eval $ac_compile) 2>&5
  57. ac_status=$?
  58. @@ -9212,11 +9220,11 @@
  59. -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  60. -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  61. -e 's:$: $lt_compiler_flag:'`
  62. - (eval echo "\"\$as_me:9215: $lt_compile\"" >&5)
  63. + (eval echo "\"\$as_me:9223: $lt_compile\"" >&5)
  64. (eval "$lt_compile" 2>conftest.err)
  65. ac_status=$?
  66. cat conftest.err >&5
  67. - echo "$as_me:9219: \$? = $ac_status" >&5
  68. + echo "$as_me:9227: \$? = $ac_status" >&5
  69. if (exit $ac_status) && test -s "$ac_outfile"; then
  70. # The compiler can only warn and ignore the option if not recognized
  71. # So say no if there are warnings other than the usual output.
  72. @@ -9551,11 +9559,11 @@
  73. -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  74. -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  75. -e 's:$: $lt_compiler_flag:'`
  76. - (eval echo "\"\$as_me:9554: $lt_compile\"" >&5)
  77. + (eval echo "\"\$as_me:9562: $lt_compile\"" >&5)
  78. (eval "$lt_compile" 2>conftest.err)
  79. ac_status=$?
  80. cat conftest.err >&5
  81. - echo "$as_me:9558: \$? = $ac_status" >&5
  82. + echo "$as_me:9566: \$? = $ac_status" >&5
  83. if (exit $ac_status) && test -s "$ac_outfile"; then
  84. # The compiler can only warn and ignore the option if not recognized
  85. # So say no if there are warnings other than the usual output.
  86. @@ -9656,11 +9664,11 @@
  87. -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  88. -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  89. -e 's:$: $lt_compiler_flag:'`
  90. - (eval echo "\"\$as_me:9659: $lt_compile\"" >&5)
  91. + (eval echo "\"\$as_me:9667: $lt_compile\"" >&5)
  92. (eval "$lt_compile" 2>out/conftest.err)
  93. ac_status=$?
  94. cat out/conftest.err >&5
  95. - echo "$as_me:9663: \$? = $ac_status" >&5
  96. + echo "$as_me:9671: \$? = $ac_status" >&5
  97. if (exit $ac_status) && test -s out/conftest2.$ac_objext
  98. then
  99. # The compiler can only warn and ignore the option if not recognized
  100. @@ -9711,11 +9719,11 @@
  101. -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  102. -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  103. -e 's:$: $lt_compiler_flag:'`
  104. - (eval echo "\"\$as_me:9714: $lt_compile\"" >&5)
  105. + (eval echo "\"\$as_me:9722: $lt_compile\"" >&5)
  106. (eval "$lt_compile" 2>out/conftest.err)
  107. ac_status=$?
  108. cat out/conftest.err >&5
  109. - echo "$as_me:9718: \$? = $ac_status" >&5
  110. + echo "$as_me:9726: \$? = $ac_status" >&5
  111. if (exit $ac_status) && test -s out/conftest2.$ac_objext
  112. then
  113. # The compiler can only warn and ignore the option if not recognized
  114. @@ -12514,7 +12522,7 @@
  115. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  116. lt_status=$lt_dlunknown
  117. cat > conftest.$ac_ext <<_LT_EOF
  118. -#line 12517 "configure"
  119. +#line 12525 "configure"
  120. #include "confdefs.h"
  121. #if HAVE_DLFCN_H
  122. @@ -12610,7 +12618,7 @@
  123. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  124. lt_status=$lt_dlunknown
  125. cat > conftest.$ac_ext <<_LT_EOF
  126. -#line 12613 "configure"
  127. +#line 12621 "configure"
  128. #include "confdefs.h"
  129. #if HAVE_DLFCN_H
  130. @@ -13391,6 +13399,26 @@
  131. fi
  132. +
  133. +# Check whether --with-eggdbus-binding-tool was given.
  134. +if test "${with_eggdbus_binding_tool+set}" = set; then
  135. + withval=$with_eggdbus_binding_tool; EGGDBUS_BINDING_TOOL=$withval
  136. +else
  137. + EGGDBUS_BINDING_TOOL=\$\(top_builddir\)/src/eggdbus/eggdbus-binding-tool
  138. +fi
  139. +
  140. +
  141. +
  142. +
  143. +# Check whether --with-eggdbus-glib-genmarshal was given.
  144. +if test "${with_eggdbus_glib_genmarshal+set}" = set; then
  145. + withval=$with_eggdbus_glib_genmarshal; EGGDBUS_GLIB_GENMARSHAL=$withval
  146. +else
  147. + EGGDBUS_GLIB_GENMARSHAL=\$\(top_builddir\)/src/eggdbus/eggdbus-glib-genmarshal
  148. +fi
  149. +
  150. +
  151. +
  152. if test "${enable_man_page}" != no; then
  153. # Extract the first word of "xsltproc", so it can be a program name with args.
  154. set dummy xsltproc; ac_word=$2
  155. diff -Naur eggdbus-0.6/configure.ac eggdbus-0.6.patch/configure.ac
  156. --- eggdbus-0.6/configure.ac 2009-06-19 23:39:32.000000000 +0200
  157. +++ eggdbus-0.6.patch/configure.ac 2009-11-14 22:17:37.796265674 +0100
  158. @@ -21,6 +21,16 @@
  159. AC_ARG_ENABLE(verbose-mode, [ --enable-verbose-mode support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
  160. AC_ARG_ENABLE(man-pages, [ --enable-man-pages build manual pages],enable_man_pages=$enableval,enable_man_pages=yes)
  161. +AC_ARG_WITH(eggdbus-binding-tool,
  162. + AS_HELP_STRING([--with-eggdbus-binding-tool=[filename]],[Use external eggdbus-binding-tool program]),
  163. + [EGGDBUS_BINDING_TOOL=$withval],[EGGDBUS_BINDING_TOOL=\$\(top_builddir\)/src/eggdbus/eggdbus-binding-tool])
  164. +AC_SUBST(EGGDBUS_BINDING_TOOL)
  165. +
  166. +AC_ARG_WITH(eggdbus-glib-genmarshal,
  167. + AS_HELP_STRING([--with-eggdbus-glib-genmarshal=[filename]],[Use external eggdbus-glib-genmarshal program]),
  168. + [EGGDBUS_GLIB_GENMARSHAL=$withval],[EGGDBUS_GLIB_GENMARSHAL=\$\(top_builddir\)/src/eggdbus/eggdbus-glib-genmarshal])
  169. +AC_SUBST(EGGDBUS_GLIB_GENMARSHAL)
  170. +
  171. if test "${enable_man_page}" != no; then
  172. dnl
  173. dnl Check for xsltproc
  174. diff -Naur eggdbus-0.6/docs/eggdbus/Makefile.in eggdbus-0.6.patch/docs/eggdbus/Makefile.in
  175. --- eggdbus-0.6/docs/eggdbus/Makefile.in 2009-09-16 17:46:57.000000000 +0200
  176. +++ eggdbus-0.6.patch/docs/eggdbus/Makefile.in 2009-11-14 22:18:01.847355855 +0100
  177. @@ -117,6 +117,8 @@
  178. ECHO_C = @ECHO_C@
  179. ECHO_N = @ECHO_N@
  180. ECHO_T = @ECHO_T@
  181. +EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
  182. +EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
  183. EGREP = @EGREP@
  184. EXEEXT = @EXEEXT@
  185. FGREP = @FGREP@
  186. diff -Naur eggdbus-0.6/docs/Makefile.in eggdbus-0.6.patch/docs/Makefile.in
  187. --- eggdbus-0.6/docs/Makefile.in 2009-07-05 01:06:58.000000000 +0200
  188. +++ eggdbus-0.6.patch/docs/Makefile.in 2009-11-14 22:18:01.759355998 +0100
  189. @@ -111,6 +111,8 @@
  190. ECHO_C = @ECHO_C@
  191. ECHO_N = @ECHO_N@
  192. ECHO_T = @ECHO_T@
  193. +EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
  194. +EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
  195. EGREP = @EGREP@
  196. EXEEXT = @EXEEXT@
  197. FGREP = @FGREP@
  198. diff -Naur eggdbus-0.6/docs/man/Makefile.in eggdbus-0.6.patch/docs/man/Makefile.in
  199. --- eggdbus-0.6/docs/man/Makefile.in 2009-07-05 01:06:58.000000000 +0200
  200. +++ eggdbus-0.6.patch/docs/man/Makefile.in 2009-11-14 22:18:01.930355603 +0100
  201. @@ -95,6 +95,8 @@
  202. ECHO_C = @ECHO_C@
  203. ECHO_N = @ECHO_N@
  204. ECHO_T = @ECHO_T@
  205. +EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
  206. +EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
  207. EGREP = @EGREP@
  208. EXEEXT = @EXEEXT@
  209. FGREP = @FGREP@
  210. diff -Naur eggdbus-0.6/docs/tests/Makefile.in eggdbus-0.6.patch/docs/tests/Makefile.in
  211. --- eggdbus-0.6/docs/tests/Makefile.in 2009-09-16 17:46:53.000000000 +0200
  212. +++ eggdbus-0.6.patch/docs/tests/Makefile.in 2009-11-14 22:18:02.032356129 +0100
  213. @@ -117,6 +117,8 @@
  214. ECHO_C = @ECHO_C@
  215. ECHO_N = @ECHO_N@
  216. ECHO_T = @ECHO_T@
  217. +EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
  218. +EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
  219. EGREP = @EGREP@
  220. EXEEXT = @EXEEXT@
  221. FGREP = @FGREP@
  222. diff -Naur eggdbus-0.6/Makefile.in eggdbus-0.6.patch/Makefile.in
  223. --- eggdbus-0.6/Makefile.in 2009-07-05 01:06:59.000000000 +0200
  224. +++ eggdbus-0.6.patch/Makefile.in 2009-11-14 22:18:02.772356388 +0100
  225. @@ -150,6 +150,8 @@
  226. ECHO_C = @ECHO_C@
  227. ECHO_N = @ECHO_N@
  228. ECHO_T = @ECHO_T@
  229. +EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
  230. +EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
  231. EGREP = @EGREP@
  232. EXEEXT = @EXEEXT@
  233. FGREP = @FGREP@
  234. diff -Naur eggdbus-0.6/src/eggdbus/Makefile.am eggdbus-0.6.patch/src/eggdbus/Makefile.am
  235. --- eggdbus-0.6/src/eggdbus/Makefile.am 2009-02-06 21:46:49.000000000 +0100
  236. +++ eggdbus-0.6.patch/src/eggdbus/Makefile.am 2009-11-14 22:17:37.797358224 +0100
  237. @@ -130,7 +130,7 @@
  238. $(NULL)
  239. eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
  240. - EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
  241. + EGG_DBUS_GENMARSHAL=$(EGGDBUS_GLIB_GENMARSHAL) $(EGGDBUS_BINDING_TOOL) \
  242. --namespace EggDBus \
  243. --dbus-namespace org.freedesktop.DBus \
  244. --interfaces-only \
  245. diff -Naur eggdbus-0.6/src/eggdbus/Makefile.in eggdbus-0.6.patch/src/eggdbus/Makefile.in
  246. --- eggdbus-0.6/src/eggdbus/Makefile.in 2009-07-05 01:06:59.000000000 +0200
  247. +++ eggdbus-0.6.patch/src/eggdbus/Makefile.in 2009-11-14 22:18:02.469356300 +0100
  248. @@ -206,6 +206,8 @@
  249. ECHO_C = @ECHO_C@
  250. ECHO_N = @ECHO_N@
  251. ECHO_T = @ECHO_T@
  252. +EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
  253. +EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
  254. EGREP = @EGREP@
  255. EXEEXT = @EXEEXT@
  256. FGREP = @FGREP@
  257. @@ -1370,7 +1372,7 @@
  258. eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
  259. - EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
  260. + EGG_DBUS_GENMARSHAL=$(EGGDBUS_GLIB_GENMARSHAL) $(EGGDBUS_BINDING_TOOL) \
  261. --namespace EggDBus \
  262. --dbus-namespace org.freedesktop.DBus \
  263. --interfaces-only \
  264. diff -Naur eggdbus-0.6/src/Makefile.in eggdbus-0.6.patch/src/Makefile.in
  265. --- eggdbus-0.6/src/Makefile.in 2009-07-05 01:06:58.000000000 +0200
  266. +++ eggdbus-0.6.patch/src/Makefile.in 2009-11-14 22:18:02.094355991 +0100
  267. @@ -110,6 +110,8 @@
  268. ECHO_C = @ECHO_C@
  269. ECHO_N = @ECHO_N@
  270. ECHO_T = @ECHO_T@
  271. +EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
  272. +EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
  273. EGREP = @EGREP@
  274. EXEEXT = @EXEEXT@
  275. FGREP = @FGREP@
  276. diff -Naur eggdbus-0.6/src/tests/Makefile.am eggdbus-0.6.patch/src/tests/Makefile.am
  277. --- eggdbus-0.6/src/tests/Makefile.am 2009-02-03 22:09:01.000000000 +0100
  278. +++ eggdbus-0.6.patch/src/tests/Makefile.am 2009-11-14 22:17:37.798364518 +0100
  279. @@ -25,7 +25,7 @@
  280. $(NULL)
  281. test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml
  282. - EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
  283. + EGG_DBUS_GENMARSHAL=$(EGGDBUS_GLIB_GENMARSHAL) $(EGGDBUS_BINDING_TOOL) \
  284. --namespace "Test" \
  285. --dbus-namespace "com.example" \
  286. --include-header testtypes.h \
  287. diff -Naur eggdbus-0.6/src/tests/Makefile.in eggdbus-0.6.patch/src/tests/Makefile.in
  288. --- eggdbus-0.6/src/tests/Makefile.in 2009-07-05 01:06:59.000000000 +0200
  289. +++ eggdbus-0.6.patch/src/tests/Makefile.in 2009-11-14 22:18:02.694356123 +0100
  290. @@ -140,6 +140,8 @@
  291. ECHO_C = @ECHO_C@
  292. ECHO_N = @ECHO_N@
  293. ECHO_T = @ECHO_T@
  294. +EGGDBUS_BINDING_TOOL = @EGGDBUS_BINDING_TOOL@
  295. +EGGDBUS_GLIB_GENMARSHAL = @EGGDBUS_GLIB_GENMARSHAL@
  296. EGREP = @EGREP@
  297. EXEEXT = @EXEEXT@
  298. FGREP = @FGREP@
  299. @@ -839,7 +841,7 @@
  300. test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml
  301. - EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
  302. + EGG_DBUS_GENMARSHAL=$(EGGDBUS_GLIB_GENMARSHAL) $(EGGDBUS_BINDING_TOOL) \
  303. --namespace "Test" \
  304. --dbus-namespace "com.example" \
  305. --include-header testtypes.h \