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