diff options
Diffstat (limited to 'net/gtk-vnc/files')
-rw-r--r-- | net/gtk-vnc/files/patch-configure | 427 | ||||
-rw-r--r-- | net/gtk-vnc/files/patch-src_Makefile.in | 206 | ||||
-rw-r--r-- | net/gtk-vnc/files/patch-src_continuation.h | 6 | ||||
-rw-r--r-- | net/gtk-vnc/files/patch-src_coroutine_ucontext.c | 6 | ||||
-rw-r--r-- | net/gtk-vnc/files/patch-src_gvnc.c | 11 | ||||
-rw-r--r-- | net/gtk-vnc/files/patch-src_gvnc.h | 22 |
6 files changed, 639 insertions, 39 deletions
diff --git a/net/gtk-vnc/files/patch-configure b/net/gtk-vnc/files/patch-configure new file mode 100644 index 000000000..eb14a6abc --- /dev/null +++ b/net/gtk-vnc/files/patch-configure @@ -0,0 +1,427 @@ +--- configure.orig 2013-12-15 11:12:43.000000000 +0100 ++++ configure 2013-12-15 11:18:53.000000000 +0100 +@@ -620,14 +620,16 @@ + WITH_VALA_FALSE + WITH_VALA_TRUE + VAPIGEN +-G_IR_SCANNER_SYMBOL_PREFIX_FALSE +-G_IR_SCANNER_SYMBOL_PREFIX_TRUE +-WITH_GOBJECT_INTROSPECTION_FALSE +-WITH_GOBJECT_INTROSPECTION_TRUE +-G_IR_COMPILER +-G_IR_SCANNER +-GOBJECT_INTROSPECTION_LIBS +-GOBJECT_INTROSPECTION_CFLAGS ++HAVE_INTROSPECTION_FALSE ++HAVE_INTROSPECTION_TRUE ++INTROSPECTION_MAKEFILE ++INTROSPECTION_LIBS ++INTROSPECTION_CFLAGS ++INTROSPECTION_TYPELIBDIR ++INTROSPECTION_GIRDIR ++INTROSPECTION_GENERATE ++INTROSPECTION_COMPILER ++INTROSPECTION_SCANNER + ENABLE_PLUGIN_FALSE + ENABLE_PLUGIN_TRUE + WITH_EXAMPLES_FALSE +@@ -915,9 +917,7 @@ + FIREFOX_PLUGIN_CFLAGS + FIREFOX_PLUGIN_LIBS + MOZILLA_PLUGIN_CFLAGS +-MOZILLA_PLUGIN_LIBS +-GOBJECT_INTROSPECTION_CFLAGS +-GOBJECT_INTROSPECTION_LIBS' ++MOZILLA_PLUGIN_LIBS' + + + # Initialize some variables set by options. +@@ -1555,7 +1555,8 @@ + --enable-iso-c Try to warn if code is not ISO C + --enable-plugin=no/yes enable browser plugin default=no + --disable-rebuilds disable all source autogeneration rules +- --enable-introspection enable GObject introspection ++ --enable-introspection=[no/auto/yes] ++ Enable introspection for this build + --enable-vala enable Vala binding generation + + Optional Packages: +@@ -1624,11 +1625,6 @@ + C compiler flags for MOZILLA_PLUGIN, overriding pkg-config + MOZILLA_PLUGIN_LIBS + linker flags for MOZILLA_PLUGIN, overriding pkg-config +- GOBJECT_INTROSPECTION_CFLAGS +- C compiler flags for GOBJECT_INTROSPECTION, overriding +- pkg-config +- GOBJECT_INTROSPECTION_LIBS +- linker flags for GOBJECT_INTROSPECTION, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -15735,286 +15731,98 @@ + fi + + +-# Check whether --enable-introspection was given. +-if test "${enable_introspection+set}" = set; then : +- enableval=$enable_introspection; +-else +- enable_introspection=check +-fi +- +- +-has_symbol_prefix=no +-if test "x$enable_introspection" != "xno" ; then +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5 +-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; } +- +-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_DESIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_DESIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- + +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes ++ # Check whether --enable-introspection was given. ++if test "${enable_introspection+set}" = set; then : ++ enableval=$enable_introspection; + else +- _pkg_short_errors_supported=no ++ enable_introspection=auto + fi +- if test $_pkg_short_errors_supported = yes; then +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>&1` +- else +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5 +- + + +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5 +-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 ++$as_echo_n "checking for gobject-introspection... " >&6; } + +-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5 ++ case $enable_introspection in #( ++ no) : ++ found_introspection="no (disabled, use --enable-introspection to enable)" ++ ;; #( ++ yes) : ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1` +- else +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5 +- +- +- if test "x$enable_introspection" = "xcheck"; then +- enable_introspection=no +- else +- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5 +- fi +- +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +- if test "x$enable_introspection" = "xcheck"; then +- enable_introspection=no +- else +- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5 +- fi +- ++ : + else +- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS +- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- enable_introspection=yes +- has_symbol_prefix=no +- ++ as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 + fi +- +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5 +-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; } +- +-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5 ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.4\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null` ++ found_introspection=yes + else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried ++ as_fn_error $? "You need to have gobject-introspection >= 0.9.4 installed to build gtk-vnc" "$LINENO" 5 + fi +-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5 ++ ;; #( ++ auto) : ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.4\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null` ++ found_introspection=yes + else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried ++ found_introspection=no + fi ++ enable_introspection=$found_introspection ++ ;; #( ++ *) : ++ as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 ++$as_echo "$found_introspection" >&6; } + ++ INTROSPECTION_SCANNER= ++ INTROSPECTION_COMPILER= ++ INTROSPECTION_GENERATE= ++ INTROSPECTION_GIRDIR= ++ INTROSPECTION_TYPELIBDIR= ++ if test "x$found_introspection" = "xyes"; then ++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` ++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` ++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` ++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection ++ fi + + +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1` +- else +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5 +- + +- if test "x$enable_introspection" = "xcheck"; then +- enable_introspection=no +- else +- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5 +- fi + +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + +- if test "x$enable_introspection" = "xcheck"; then +- enable_introspection=no +- else +- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5 +- fi + +-else +- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS +- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } + +- enable_introspection=yes +- has_symbol_prefix=no + +-fi + ++ if test "x$found_introspection" = "xyes"; then ++ HAVE_INTROSPECTION_TRUE= ++ HAVE_INTROSPECTION_FALSE='#' + else +- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS +- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- enable_introspection=yes +- has_symbol_prefix=yes +- ++ HAVE_INTROSPECTION_TRUE='#' ++ HAVE_INTROSPECTION_FALSE= + fi + +- if test "x$enable_introspection" = "xyes" ; then +- +-$as_echo "#define WITH_GOBJECT_INTROSPECTION 1" >>confdefs.h +- +- +- +- G_IR_SCANNER=$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0) + +- G_IR_COMPILER=$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0) +- +- fi +-fi +- if test "x$enable_introspection" = "xyes"; then +- WITH_GOBJECT_INTROSPECTION_TRUE= +- WITH_GOBJECT_INTROSPECTION_FALSE='#' +-else +- WITH_GOBJECT_INTROSPECTION_TRUE='#' +- WITH_GOBJECT_INTROSPECTION_FALSE= +-fi +- +- if test "x$has_symbol_prefix" = "xyes"; then +- G_IR_SCANNER_SYMBOL_PREFIX_TRUE= +- G_IR_SCANNER_SYMBOL_PREFIX_FALSE='#' +-else +- G_IR_SCANNER_SYMBOL_PREFIX_TRUE='#' +- G_IR_SCANNER_SYMBOL_PREFIX_FALSE= +-fi + + + if test "x$with_gtk" = "x3.0"; then +@@ -16030,7 +15838,7 @@ + enable_vala="$default_vala" + fi + +-if test "x$enable_introspection" = "xyes" ; then ++if test "x$found_introspection" = "xyes" ; then + if test "x$enable_vala" != "xno" ; then + # Extract the first word of "vapigen", so it can be a program name with args. + set dummy vapigen; ac_word=$2 +@@ -16264,12 +16072,8 @@ + as_fn_error $? "conditional \"ENABLE_PLUGIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${WITH_GOBJECT_INTROSPECTION_TRUE}" && test -z "${WITH_GOBJECT_INTROSPECTION_FALSE}"; then +- as_fn_error $? "conditional \"WITH_GOBJECT_INTROSPECTION\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${G_IR_SCANNER_SYMBOL_PREFIX_TRUE}" && test -z "${G_IR_SCANNER_SYMBOL_PREFIX_FALSE}"; then +- as_fn_error $? "conditional \"G_IR_SCANNER_SYMBOL_PREFIX\" was never defined. ++if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_VALA_TRUE}" && test -z "${WITH_VALA_FALSE}"; then diff --git a/net/gtk-vnc/files/patch-src_Makefile.in b/net/gtk-vnc/files/patch-src_Makefile.in new file mode 100644 index 000000000..a87c4399b --- /dev/null +++ b/net/gtk-vnc/files/patch-src_Makefile.in @@ -0,0 +1,206 @@ +--- src/Makefile.in.orig 2013-12-15 11:10:12.000000000 +0100 ++++ src/Makefile.in 2013-12-15 11:07:30.000000000 +0100 +@@ -95,10 +95,13 @@ + @WITH_PYTHON_TRUE@am__append_11 = vnc.defs vncmodule.defs.c + @WITH_PYTHON_TRUE@am__append_12 = vnc.override + @WITH_PYTHON_FALSE@am__append_13 = vnc.override vncmodule.c +-@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_14 = \ +-@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_14 = \ ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c + +-@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_15 = $(gir_DATA) $(typelibs_DATA) ++@HAVE_INTROSPECTION_TRUE@am__append_15 = GVnc-1.0.gir ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_16 = GtkVnc-1.0.gir ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@am__append_17 = GtkVnc-2.0.gir ++@HAVE_INTROSPECTION_TRUE@am__append_18 = $(gir_DATA) $(typelibs_DATA) + subdir = src + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/mkinstalldirs \ +@@ -355,8 +358,6 @@ + GNUTLS_LIBS = @GNUTLS_LIBS@ + GNUTLS_REQUIRED = @GNUTLS_REQUIRED@ + GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +-GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@ +-GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@ + GOBJECT_LIBS = @GOBJECT_LIBS@ + GOBJECT_REQUIRED = @GOBJECT_REQUIRED@ + GREP = @GREP@ +@@ -367,8 +368,6 @@ + GTK_LIBS = @GTK_LIBS@ + GTK_REQUIRED = @GTK_REQUIRED@ + GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ +-G_IR_COMPILER = @G_IR_COMPILER@ +-G_IR_SCANNER = @G_IR_SCANNER@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -380,6 +379,14 @@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ ++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ ++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ ++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ ++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ ++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ ++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ ++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +@@ -613,7 +620,7 @@ + vncconnectionenums.h vncconnectionenums.c + + CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \ +- $(am__append_15) ++ $(am__append_18) + @WITH_PYTHON_TRUE@pyexec_LTLIBRARIES = gtkvnc.la + @WITH_PYTHON_TRUE@gtkvnc_la_LIBADD = libgtk-vnc-$(GTK_VNC_API_VERSION).la @PYGTK_LIBS@ + @WITH_PYTHON_TRUE@gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @PYTHON_INCLUDES@ \ +@@ -624,31 +631,62 @@ + @WITH_PYTHON_TRUE@nodist_gtkvnc_la_SOURCES = vncmodule.defs.c + @WITH_PYTHON_TRUE@CODEGENDIR = $(shell pkg-config --variable=codegendir pygtk-2.0) + @WITH_PYTHON_TRUE@DEFSDIR = $(shell pkg-config --variable=defsdir pygtk-2.0) +-@WITH_GOBJECT_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c +- +-@WITH_GOBJECT_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = $(srcdir)/vnccairoframebuffer.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(am__append_14) +-@G_IR_SCANNER_SYMBOL_PREFIX_FALSE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --strip-prefix=Vnc +-@G_IR_SCANNER_SYMBOL_PREFIX_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --symbol-prefix=vnc --identifier-prefix=Vnc +-@WITH_GOBJECT_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 +-@WITH_GOBJECT_INTROSPECTION_TRUE@gir_DATA = GVnc-1.0.gir GtkVnc-$(GTK_VNC_API_VERSION).gir +-@WITH_GOBJECT_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0 +-@WITH_GOBJECT_INTROSPECTION_TRUE@typelibs_DATA = GVnc-1.0.typelib GtkVnc-$(GTK_VNC_API_VERSION).typelib ++INTROSPECTION_GIRS = $(am__append_15) $(am__append_16) \ ++ $(am__append_17) ++INTROSPECTION_SCANNER_ARGS = --symbol-prefix=vnc \ ++ --identifier-prefix=Vnc \ ++ --add-include-path=$(top_srcdir) \ ++ --add-include-path=$(srcdir) \ ++ --add-include-path=$(builddir) ++ ++INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) \ ++ --includedir=$(srcdir) ++ ++@HAVE_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \ ++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c ++ ++@HAVE_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.h \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \ ++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \ ++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \ ++@HAVE_INTROSPECTION_TRUE@ $(am__append_14) ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_INCLUDES = GObject-2.0 ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_PACKAGES = gobject-2.0 ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_EXPORT_PACKAGES = gvnc-1.0 ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_LIBS = libgvnc-1.0.la ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_FILES = $(GVNC_INTROSPECTION_SRCS) ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_SCANNERFLAGS = --c-include="gvnc.h" ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_INCLUDES = GObject-2.0 GVnc-1.0 ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION) ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GTK_VNC_API_VERSION) ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS) ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS) ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h" ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_INCLUDES = GObject-2.0 GVnc-1.0 ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION) ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GKT_VNC_API_VERSION) ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS) ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS) ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h" ++@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 ++@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) ++@HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0 ++@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +@@ -1452,50 +1490,12 @@ + @WITH_PYTHON_TRUE@ --register $(DEFSDIR)/gtk-types.defs \ + @WITH_PYTHON_TRUE@ --override $(srcdir)/vnc.override vnc.defs > $@ + +-@WITH_GOBJECT_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la $(G_IR_SCANNER) Makefile.am +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GVnc \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion 1.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgvnc-1.0.la \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gvnc.h" \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gvnc-1.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GVNC_INTROSPECTION_SRCS) +- +-@WITH_GOBJECT_INTROSPECTION_TRUE@GtkVnc-$(GTK_VNC_API_VERSION).gir: GVnc-1.0.gir libgtk-vnc-$(GTK_VNC_API_VERSION).la $(G_IR_SCANNER) Makefile.am +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GtkVnc \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion $(GTK_VNC_API_VERSION) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include Gtk-$(GTK_API_VERSION) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GVnc-1.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgtk-vnc-$(GTK_VNC_API_VERSION).la \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gtk-vnc.h" \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gtk-vnc-$(GTK_VNC_API_VERSION) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GTK_VNC_INTROSPECTION_SRCS) +- +-@WITH_GOBJECT_INTROSPECTION_TRUE@%.typelib: %.gir +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)$(G_IR_COMPILER) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(builddir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(girdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -o $@ $< ++-include $(INTROSPECTION_MAKEFILE) ++ ++@HAVE_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la ++ ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc-1.0.gir: libgtk-vnc-$(GTK_VNC_API_VERSION).la ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc-2.0.gir: libgtk-vnc-2.0.la + + -include $(top_srcdir)/git.mk + diff --git a/net/gtk-vnc/files/patch-src_continuation.h b/net/gtk-vnc/files/patch-src_continuation.h index 549af869b..6b4878259 100644 --- a/net/gtk-vnc/files/patch-src_continuation.h +++ b/net/gtk-vnc/files/patch-src_continuation.h @@ -1,6 +1,6 @@ ---- src/continuation.h.orig 2007-12-16 13:58:18.000000000 -0500 -+++ src/continuation.h 2007-12-16 13:58:39.000000000 -0500 -@@ -11,6 +11,7 @@ +--- src/continuation.h.orig 2011-02-18 16:29:10.000000000 +0000 ++++ src/continuation.h 2011-02-20 17:50:37.000000000 +0000 +@@ -21,6 +21,7 @@ #ifndef _CONTINUATION_H_ #define _CONTINUATION_H_ diff --git a/net/gtk-vnc/files/patch-src_coroutine_ucontext.c b/net/gtk-vnc/files/patch-src_coroutine_ucontext.c index 7a52f6e10..e50fb8576 100644 --- a/net/gtk-vnc/files/patch-src_coroutine_ucontext.c +++ b/net/gtk-vnc/files/patch-src_coroutine_ucontext.c @@ -1,6 +1,6 @@ ---- src/coroutine_ucontext.c.orig 2007-12-16 13:59:13.000000000 -0500 -+++ src/coroutine_ucontext.c 2007-12-16 13:59:21.000000000 -0500 -@@ -48,7 +48,7 @@ int coroutine_init(struct coroutine *co) +--- src/coroutine_ucontext.c.orig 2011-02-18 16:29:10.000000000 +0000 ++++ src/coroutine_ucontext.c 2011-02-20 17:51:14.000000000 +0000 +@@ -60,7 +60,7 @@ int coroutine_init(struct coroutine *co) co->cc.stack_size = co->stack_size; co->cc.stack = mmap(0, co->stack_size, PROT_READ | PROT_WRITE, diff --git a/net/gtk-vnc/files/patch-src_gvnc.c b/net/gtk-vnc/files/patch-src_gvnc.c deleted file mode 100644 index dcf479f23..000000000 --- a/net/gtk-vnc/files/patch-src_gvnc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gvnc.c.orig 2012-03-17 12:30:12.000000000 -0500 -+++ src/gvnc.c 2012-03-17 12:31:37.000000000 -0500 -@@ -3543,7 +3543,7 @@ - gvnc->minor = 8; - } - -- snprintf(version, 12, "RFB %03d.%03d\n", gvnc->major, gvnc->minor); -+ snprintf(version, 13, "RFB %03d.%03d\n", gvnc->major, gvnc->minor); - gvnc_write(gvnc, version, 12); - gvnc_flush(gvnc); - GVNC_DEBUG("Using version: %d.%d", gvnc->major, gvnc->minor); diff --git a/net/gtk-vnc/files/patch-src_gvnc.h b/net/gtk-vnc/files/patch-src_gvnc.h deleted file mode 100644 index 150b05330..000000000 --- a/net/gtk-vnc/files/patch-src_gvnc.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/gvnc.h.orig 2008-03-24 11:39:20.000000000 -0400 -+++ src/gvnc.h 2008-03-24 11:40:22.000000000 -0400 -@@ -3,6 +3,19 @@ - - #include <glib.h> - #include <stdint.h> -+#ifdef __FreeBSD__ -+#include <sys/endian.h> -+ -+#define __BYTE_ORDER _BYTE_ORDER -+#define __LITTLE_ENDIAN _LITTLE_ENDIAN -+#define __BIG_ENDIAN _BIG_ENDIAN -+ -+#define bswap_16 bswap16 -+#define bswap_32 bswap32 -+#define bswap_64 bswap64 -+#else -+#include <endian.h> -+#endif - - struct gvnc; - |