diff -Nru gtk-vnc-0.7.1/aclocal.m4 gtk-vnc-0.7.2/aclocal.m4 --- gtk-vnc-0.7.1/aclocal.m4 2017-05-19 14:40:38.000000000 +0000 +++ gtk-vnc-0.7.2/aclocal.m4 2018-03-23 13:27:25.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -119,6 +119,51 @@ AC_SUBST($1)dnl ]) +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +dnl +dnl Copied from intlmacosx.m4 in gettext, GPL. +dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +glib_DEFUN([glib_gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + # GLIB_WITH_NLS #----------------- glib_DEFUN([GLIB_WITH_NLS], @@ -132,6 +177,8 @@ XGETTEXT=: INTLLIBS= + glib_gt_INTL_MACOSX + AC_CHECK_HEADER(libintl.h, [gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -215,7 +262,7 @@ fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -587,16 +634,18 @@ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ]) -dnl Autoconf macros for libgcrypt -dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. -dnl -dnl This file is free software; as a special exception the author gives -dnl unlimited permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl -dnl This file is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# libgcrypt.m4 - Autoconf macros to detect libgcrypt +# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Last-changed: 2014-10-02 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, @@ -609,19 +658,37 @@ dnl this features allows to prevent build against newer versions of libgcrypt dnl with a changed API. dnl +dnl If a prefix option is not used, the config script is first +dnl searched in $SYSROOT/bin and then along $PATH. If the used +dnl config script does not match the host specification the script +dnl is added to the gpg_config_script_warn variable. +dnl AC_DEFUN([AM_PATH_LIBGCRYPT], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_WITH(libgcrypt-prefix, AC_HELP_STRING([--with-libgcrypt-prefix=PFX], [prefix where LIBGCRYPT is installed (optional)]), libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config + if test x"${LIBGCRYPT_CONFIG}" = x ; then + if test x"${libgcrypt_config_prefix}" != x ; then + LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config" + else + case "${SYSROOT}" in + /*) + if test -x "${SYSROOT}/bin/libgcrypt-config" ; then + LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config" + fi + ;; + '') + ;; + *) + AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) + ;; + esac fi fi - AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) + AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) tmp=ifelse([$1], ,1:1.2.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` @@ -697,8 +764,9 @@ *** built for $libgcrypt_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. +*** to specify a matching config script or use \$SYSROOT. ***]]) + gpg_config_script_warn="$gpg_config_script_warn libgcrypt" fi fi else @@ -743,9 +811,9 @@ AC_SUBST([USE_NLS]) ]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 11 (pkg-config-0.29.1) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -1019,7 +1087,75 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1034,7 +1170,7 @@ [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -1050,14 +1186,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1109,7 +1245,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1140,7 +1276,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1331,7 +1467,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1407,7 +1543,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1604,7 +1740,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1625,7 +1761,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1647,7 +1783,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1682,7 +1818,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1732,7 +1868,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1771,7 +1907,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1800,7 +1936,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1847,7 +1983,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1880,8 +2016,9 @@ [ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). + dnl FIXME: Remove the need to hard-code Python versions here. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -2082,7 +2219,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2101,7 +2238,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2182,7 +2319,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2242,7 +2379,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2270,7 +2407,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2289,7 +2426,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru gtk-vnc-0.7.1/AUTHORS gtk-vnc-0.7.2/AUTHORS --- gtk-vnc-0.7.1/AUTHORS 2017-05-19 14:41:44.000000000 +0000 +++ gtk-vnc-0.7.2/AUTHORS 2018-03-23 13:28:32.000000000 +0000 @@ -36,6 +36,7 @@ Daniel Korostil Daniel Nylander Daniel P. Berrange +Daniel P. Berrangé Doug Goldstein Emilio Pozuelo Monfort Enrico Nicoletto @@ -78,7 +79,9 @@ Michal Novotny Michal Suchanek Muhammet Kara +Nathan Follens Nils-Christoph Fiedler +Olivier Fourdan Pavel Grunt Pavlos Tournaris Pedro Albuquerque @@ -108,6 +111,7 @@ Zeeshan Ali (Khattak) anthony@rhesus anthony@squirrel +gogo Мирослав Николић ...send patches to get your name here... diff -Nru gtk-vnc-0.7.1/build-aux/compile gtk-vnc-0.7.2/build-aux/compile --- gtk-vnc-0.7.1/build-aux/compile 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/build-aux/compile 2018-03-23 13:27:27.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru gtk-vnc-0.7.1/build-aux/config.guess gtk-vnc-0.7.2/build-aux/config.guess --- gtk-vnc-0.7.1/build-aux/config.guess 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/build-aux/config.guess 2018-03-23 13:27:27.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2015-01-01' +timestamp='2017-08-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,19 +168,29 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -197,6 +207,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +224,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -223,6 +240,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +256,12 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; + *:Redox:*:*) + echo ${UNAME_MACHINE}-unknown-redox + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,42 +278,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -359,16 +386,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -393,7 +420,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -618,13 +645,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -663,11 +690,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -680,12 +707,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -790,14 +817,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -813,10 +840,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -879,7 +907,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -902,7 +930,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -933,6 +961,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -945,6 +976,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -970,6 +1004,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1002,6 +1039,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1021,7 +1061,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1100,7 +1140,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1249,6 +1289,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1262,16 +1305,23 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1286,7 +1336,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1295,15 +1345,18 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1317,7 +1370,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1359,7 +1412,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1370,23 +1423,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff -Nru gtk-vnc-0.7.1/build-aux/config.sub gtk-vnc-0.7.2/build-aux/config.sub --- gtk-vnc-0.7.1/build-aux/config.sub 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/build-aux/config.sub 2018-03-23 13:27:27.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2015-01-01' +timestamp='2017-04-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,8 +116,8 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -255,15 +254,16 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ + | e2k | epiphany \ | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -301,11 +301,12 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -314,6 +315,7 @@ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ + | wasm32 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -376,17 +378,18 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -427,13 +430,15 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -442,6 +447,7 @@ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -518,6 +524,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -638,6 +647,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -933,6 +950,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1017,7 +1037,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1027,7 +1047,7 @@ ;; ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1228,6 +1248,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1373,18 +1396,18 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1393,7 +1416,8 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1525,6 +1549,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1620,6 +1646,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff -Nru gtk-vnc-0.7.1/build-aux/depcomp gtk-vnc-0.7.2/build-aux/depcomp --- gtk-vnc-0.7.1/build-aux/depcomp 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/build-aux/depcomp 2018-03-23 13:27:27.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru gtk-vnc-0.7.1/build-aux/install-sh gtk-vnc-0.7.2/build-aux/install-sh --- gtk-vnc-0.7.1/build-aux/install-sh 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/build-aux/install-sh 2018-03-23 13:27:27.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2016-01-11.22; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -496,6 +496,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru gtk-vnc-0.7.1/build-aux/missing gtk-vnc-0.7.2/build-aux/missing --- gtk-vnc-0.7.1/build-aux/missing 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/build-aux/missing 2018-03-23 13:27:27.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru gtk-vnc-0.7.1/build-aux/test-driver gtk-vnc-0.7.2/build-aux/test-driver --- gtk-vnc-0.7.1/build-aux/test-driver 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/build-aux/test-driver 2018-03-23 13:27:27.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -143,6 +143,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru gtk-vnc-0.7.1/ChangeLog gtk-vnc-0.7.2/ChangeLog --- gtk-vnc-0.7.1/ChangeLog 2017-05-19 14:41:44.000000000 +0000 +++ gtk-vnc-0.7.2/ChangeLog 2018-03-23 13:28:32.000000000 +0000 @@ -1,3 +1,112 @@ +2018-03-23 Daniel P. Berrangé + + Update NEWS for 0.7.2 release + + rpm: disable python binding build on Fedora and future RHEL + The python binding only works for GTK2 and Python2, both of which are + slowly going away. It is still possible to access the library from + any Python using GObject introspection dynamic binding. + + Explicitly deprecate python binding prior to deletion + The python binding only works with Python 2 and GTK 2, neither of which + should be used long term. Applications should switch to GObject + Introspection which works with Python 3 and GTK 3. + + rpm: Cleanup TLS priority setting for newer distros + + rpm: Rename sub-package from gtk-vnc-python to python2-gtk-vnc + + rpm: Fix BR on python-devel to use python2-devel + This has been available from RHEL >= 6 + + rpm: remove obsolete %clean section + RPM handles this automatically since RHEL >= 6 + + rpm: remove obsolete Group tags + This is not required since RHEL >= 6 or equivalently new Fedora. + + rpm: Remove obsolete BuildRoot tag + + Update links to wiki site + +2018-03-21 Daniel P. Berrangé + + Add description to the doap file + + Set programming language for doap file + + Switch doap category to 'core' as 'desktop' is not permitted any longer + + Remove Jonh from maintainers list, since he is no longer active. + +2018-03-13 gogo + + Add Croatian translation + +2018-03-13 Nathan Follens + + Add Dutch translation + +2018-03-13 Olivier Fourdan + + Use scancode instead of keycode names + When running on Xwayland, the keycode mapping property is not available, + which causes unknown keycode mapping errors and the keyboard doesn't + work. + + Check for a known scancode (“XK_Page_Up”) which differs to distinguish + between “xfree86” and “evdev” when the there is no keycode name. + +2018-01-31 Daniel P. Berrangé + + Explicitly track whether x509 creds have been set + If we want to use the system trust DB, we can't rely on cred_x509_cacert + field being non-NULL. We must explicitly record whether the client app + has set the x509 credentials. We allow cacert to be missing if we are + built against a new enough GNUTLS. + + Add debug logs wrt credential gathering + + Don't short-circuit request for TLS credentials + Although newer GNUTLS has a default system trust fallback for CA + certificates, we must still request certificates from the client app. If + we do not, then the VNC client will never be given the opportunity to + provide custom certs to override the system trust database. + + Add debug message when getting a desktop resize request + +2017-08-08 Daniel P. Berrange + + Fix license of the keymap conversion code + The vncdisplaykeymap.c file was mistakenly declared as + LGPL v2-only when first created. Since then it has been + almost completely rewritten. After the previous commit + removing the special Tab key handling, the remaining + logic was all written by my own or Red Hat copyright. + So changing the license to LGPLv2-or-later under that + basis. + + Remove uneccessarily generic handling of shifted tab key + + Remove obsolete copyright notice + The copyright notice referred to a table mapping scan codes that + was taken from QEMU source. This table was, however, deleted in + + commit e0910397d6ba1eca3d968c98a2105c1a7ead7fd7 + Author: Daniel P. Berrange + Date: Fri Jul 9 19:30:54 2010 +0100 + + Rewrite keymap code to work on more platforms + + so the code that the copyright statement referenced no longer + exists. + +2017-07-13 Peter Korsgaard + + vncdisplay: on_initialized: send the led state notification encoding + So servers supporting this encoding will actually notify us and the + vnc-led-state signal will fire. + 2017-05-19 Daniel P. Berrange Bump to 0.7.1 for new release diff -Nru gtk-vnc-0.7.1/config.h.in gtk-vnc-0.7.2/config.h.in --- gtk-vnc-0.7.1/config.h.in 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/config.h.in 2018-03-23 13:27:26.000000000 +0000 @@ -16,6 +16,14 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT diff -Nru gtk-vnc-0.7.1/configure gtk-vnc-0.7.2/configure --- gtk-vnc-0.7.1/configure 2017-05-19 14:40:38.000000000 +0000 +++ gtk-vnc-0.7.2/configure 2018-03-23 13:27:25.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gtk-vnc 0.7.1. +# Generated by GNU Autoconf 2.69 for gtk-vnc 0.7.2. # # Report bugs to . # @@ -591,10 +591,10 @@ # Identity of this package. PACKAGE_NAME='gtk-vnc' PACKAGE_TARNAME='gtk-vnc' -PACKAGE_VERSION='0.7.1' -PACKAGE_STRING='gtk-vnc 0.7.1' +PACKAGE_VERSION='0.7.2' +PACKAGE_STRING='gtk-vnc 0.7.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-vnc' -PACKAGE_URL='http://live.gnome.org/gtk-vnc/' +PACKAGE_URL='https://wiki.gnome.org/Projects/gtk-vnc' ac_unique_file="src/vncconnection.c" # Factoring default headers for most tests. @@ -729,6 +729,7 @@ CATOBJEXT CATALOGS MSGFMT_OPTS +INTL_MACOSX_LIBS ALL_LINGUAS INTLTOOL_PERL GMSGFMT @@ -1495,7 +1496,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gtk-vnc 0.7.1 to adapt to many kinds of systems. +\`configure' configures gtk-vnc 0.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1565,7 +1566,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtk-vnc 0.7.1:";; + short | recursive ) echo "Configuration of gtk-vnc 0.7.2:";; esac cat <<\_ACEOF @@ -1676,7 +1677,7 @@ it to find libraries and programs with nonstandard names/locations. Report bugs to . -gtk-vnc home page: . +gtk-vnc home page: . _ACEOF ac_status=$? fi @@ -1739,7 +1740,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtk-vnc configure 0.7.1 +gtk-vnc configure 0.7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2108,7 +2109,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtk-vnc $as_me 0.7.1, which was +It was created by gtk-vnc $as_me 0.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2975,7 +2976,7 @@ # Define the identity of the package. PACKAGE='gtk-vnc' - VERSION='0.7.1' + VERSION='0.7.2' cat >>confdefs.h <<_ACEOF @@ -13524,6 +13525,82 @@ XGETTEXT=: INTLLIBS= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFLocaleCopyCurrent(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyCurrent=yes +else + gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" @@ -13864,7 +13941,7 @@ fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -16429,15 +16506,28 @@ libgcrypt_config_prefix="" fi - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config + if test x"${LIBGCRYPT_CONFIG}" = x ; then + if test x"${libgcrypt_config_prefix}" != x ; then + LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config" + else + case "${SYSROOT}" in + /*) + if test -x "${SYSROOT}/bin/libgcrypt-config" ; then + LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config" + fi + ;; + '') + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5 +$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;} + ;; + esac fi fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}libgcrypt-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}libgcrypt-config; ac_word=$2 + # Extract the first word of "libgcrypt-config", so it can be a program name with args. +set dummy libgcrypt-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_LIBGCRYPT_CONFIG+:} false; then : @@ -16463,6 +16553,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no" ;; esac fi @@ -16476,63 +16567,6 @@ fi -fi -if test -z "$ac_cv_path_LIBGCRYPT_CONFIG"; then - ac_pt_LIBGCRYPT_CONFIG=$LIBGCRYPT_CONFIG - # Extract the first word of "libgcrypt-config", so it can be a program name with args. -set dummy libgcrypt-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_LIBGCRYPT_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_LIBGCRYPT_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$ac_pt_LIBGCRYPT_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_LIBGCRYPT_CONFIG=$ac_cv_path_ac_pt_LIBGCRYPT_CONFIG -if test -n "$ac_pt_LIBGCRYPT_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LIBGCRYPT_CONFIG" >&5 -$as_echo "$ac_pt_LIBGCRYPT_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_LIBGCRYPT_CONFIG" = x; then - LIBGCRYPT_CONFIG="no" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIBGCRYPT_CONFIG=$ac_pt_LIBGCRYPT_CONFIG - fi -else - LIBGCRYPT_CONFIG="$ac_cv_path_LIBGCRYPT_CONFIG" -fi - tmp=$GCRYPT_REQUIRED if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` @@ -16614,7 +16648,7 @@ *** built for $libgcrypt_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. +*** to specify a matching config script or use \$SYSROOT. ***" >&5 $as_echo "$as_me: WARNING: *** @@ -16622,8 +16656,9 @@ *** built for $libgcrypt_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. +*** to specify a matching config script or use \$SYSROOT. ***" >&2;} + gpg_config_script_warn="$gpg_config_script_warn libgcrypt" fi fi else @@ -17133,7 +17168,7 @@ # Find any Python interpreter. if test -z "$PYTHON"; then - for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 + for ac_prog in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -18327,7 +18362,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtk-vnc $as_me 0.7.1, which was +This file was extended by gtk-vnc $as_me 0.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18392,13 +18427,13 @@ $config_commands Report bugs to . -gtk-vnc home page: ." +gtk-vnc home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gtk-vnc config.status 0.7.1 +gtk-vnc config.status 0.7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20175,3 +20210,11 @@ GTK+ version................: ${GTK_API_VERSION} TLS priority................: ${with_tls_priority} " + +if test ${WITH_PYTHON} = "yes" ; then + echo "WARNING:" + echo "WARNING: The python2 binding will be deleted in the next release." + echo "WARNING: Please use the GObject Introspection dynamic bindings." + echo "WARNING:" + echo +fi diff -Nru gtk-vnc-0.7.1/configure.ac gtk-vnc-0.7.2/configure.ac --- gtk-vnc-0.7.1/configure.ac 2017-05-19 14:38:59.000000000 +0000 +++ gtk-vnc-0.7.2/configure.ac 2018-03-23 13:08:48.000000000 +0000 @@ -2,7 +2,7 @@ AC_PREREQ(2.63) -AC_INIT([gtk-vnc],[0.7.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-vnc],[gtk-vnc],[http://live.gnome.org/gtk-vnc/]) +AC_INIT([gtk-vnc],[0.7.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-vnc],[gtk-vnc],[https://wiki.gnome.org/Projects/gtk-vnc]) AC_CONFIG_SRCDIR([src/vncconnection.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) @@ -468,3 +468,11 @@ GTK+ version................: ${GTK_API_VERSION} TLS priority................: ${with_tls_priority} " + +if test ${WITH_PYTHON} = "yes" ; then + echo "WARNING:" + echo "WARNING: The python2 binding will be deleted in the next release." + echo "WARNING: Please use the GObject Introspection dynamic bindings." + echo "WARNING:" + echo +fi diff -Nru gtk-vnc-0.7.1/debian/changelog gtk-vnc-0.7.2/debian/changelog --- gtk-vnc-0.7.1/debian/changelog 2017-08-01 14:57:04.000000000 +0000 +++ gtk-vnc-0.7.2/debian/changelog 2018-03-27 18:19:31.000000000 +0000 @@ -1,3 +1,14 @@ +gtk-vnc (0.7.2-1) unstable; urgency=medium + + * New upstream version 0.7.2 + * [268c8ce] gbp.conf: use id-length to correlate git commits to changelog + entries + * [222b710] Bump standards version + * [4a63e15] Drop debug packages + * [f4213bf] d/watch: Use https + + -- Guido Günther Tue, 27 Mar 2018 20:19:31 +0200 + gtk-vnc (0.7.1-1) unstable; urgency=medium * [a223999] New upstream version 0.7.1 diff -Nru gtk-vnc-0.7.1/debian/control gtk-vnc-0.7.2/debian/control --- gtk-vnc-0.7.1/debian/control 2017-02-10 09:13:26.000000000 +0000 +++ gtk-vnc-0.7.2/debian/control 2018-03-27 18:18:59.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian Libvirt Maintainers Uploaders: Guido Günther , -Standards-Version: 3.9.8 +Standards-Version: 4.1.3 Build-Depends: debhelper (>= 10), dh-autoreconf, @@ -55,30 +55,6 @@ . This package contains the shared library. -Package: libgvnc-1.0-0-dbg -Architecture: any -Multi-Arch: same -Section: debug -Depends: - libgvnc-1.0-0 (=${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Breaks: - libgtk-vnc-1.0-0-dbg (<< 0.4.3-2), -Replaces: - libgtk-vnc-1.0-0-dbg (<< 0.4.3-2), -Priority: extra -Description: VNC GObject wrapper (debugging symbols) - It is built using coroutines, allowing it to be completely asynchronous while - remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the - VeNCrypt authentication extension providing SSL/TLS encryption with x509 - certificate authentication. - . - The core library is written in C and a binding for Python using PyGTK is - available. The networking layer supports connections over both IPv4 and IPv6. - . - This package contains the debugging symbols for libgvnc. - Package: libgvnc-1.0-dev Architecture: any Section: libdevel @@ -122,26 +98,6 @@ . This package contains the shared library built for GTK+2. -Package: libgtk-vnc-1.0-0-dbg -Architecture: any -Multi-Arch: same -Section: debug -Depends: - libgtk-vnc-1.0-0 (=${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Priority: extra -Description: VNC viewer widget for GTK+2 (debugging symbols) - It is built using coroutines, allowing it to be completely asynchronous while - remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the - VeNCrypt authentication extension providing SSL/TLS encryption with x509 - certificate authentication. - . - The core library is written in C and a binding for Python using PyGTK is - available. The networking layer supports connections over both IPv4 and IPv6. - . - This package contains the debugging symbols for libgtk-vnc-1.0. - Package: libgtk-vnc-1.0-dev Architecture: any Section: libdevel @@ -181,26 +137,6 @@ . This package contains the shared library built for GTK+3. -Package: libgtk-vnc-2.0-0-dbg -Architecture: any -Multi-Arch: same -Section: debug -Depends: - libgtk-vnc-2.0-0 (=${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Priority: extra -Description: VNC viewer widget for GTK+3 (debugging symbols) - It is built using coroutines, allowing it to be completely asynchronous while - remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the - VeNCrypt authentication extension providing SSL/TLS encryption with x509 - certificate authentication. - . - The core library is written in C and a binding for Python using PyGTK is - available. The networking layer supports connections over both IPv4 and IPv6. - . - This package contains the debugging symbols for libgtk-vnc-2.0. - Package: libgtk-vnc-2.0-dev Architecture: any Section: libdevel diff -Nru gtk-vnc-0.7.1/debian/gbp.conf gtk-vnc-0.7.2/debian/gbp.conf --- gtk-vnc-0.7.1/debian/gbp.conf 2016-09-09 13:19:41.000000000 +0000 +++ gtk-vnc-0.7.2/debian/gbp.conf 2018-03-27 18:18:59.000000000 +0000 @@ -2,5 +2,8 @@ upstream-branch=upstream/latest debian-branch=debian/sid +[dch] +id-length = 7 + [pq] patch-numbers = False diff -Nru gtk-vnc-0.7.1/debian/rules gtk-vnc-0.7.2/debian/rules --- gtk-vnc-0.7.1/debian/rules 2017-02-10 09:13:26.000000000 +0000 +++ gtk-vnc-0.7.2/debian/rules 2018-03-27 18:18:59.000000000 +0000 @@ -49,9 +49,9 @@ --sourcedir=debian/gtk2 override_dh_strip: - dh_strip -plibgvnc-1.0-0 --dbg-package=libgvnc-1.0-0-dbg - dh_strip -plibgtk-vnc-1.0-0 --dbg-package=libgtk-vnc-1.0-0-dbg - dh_strip -plibgtk-vnc-2.0-0 --dbg-package=libgtk-vnc-2.0-0-dbg + dh_strip -plibgvnc-1.0-0 + dh_strip -plibgtk-vnc-1.0-0 + dh_strip -plibgtk-vnc-2.0-0 dh_strip -pgvncviewer -ppython-gtk-vnc override_dh_python2: diff -Nru gtk-vnc-0.7.1/debian/watch gtk-vnc-0.7.2/debian/watch --- gtk-vnc-0.7.1/debian/watch 2017-02-10 09:13:26.000000000 +0000 +++ gtk-vnc-0.7.2/debian/watch 2018-03-27 18:19:16.000000000 +0000 @@ -1,3 +1,3 @@ version=4 -http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/([\d\.]+)/ \ +https://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/([\d\.]+)/ \ gtk-vnc-([\d\.]+)\.tar\.xz diff -Nru gtk-vnc-0.7.1/examples/Makefile.in gtk-vnc-0.7.2/examples/Makefile.in --- gtk-vnc-0.7.1/examples/Makefile.in 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/examples/Makefile.in 2018-03-23 13:27:27.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -258,6 +258,7 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ diff -Nru gtk-vnc-0.7.1/gtk-vnc.spec gtk-vnc-0.7.2/gtk-vnc.spec --- gtk-vnc-0.7.1/gtk-vnc.spec 2017-05-19 14:41:19.000000000 +0000 +++ gtk-vnc-0.7.2/gtk-vnc.spec 2018-03-23 13:28:09.000000000 +0000 @@ -1,6 +1,6 @@ # -*- rpm-spec -*- -# This spec file assumes you are building for Fedora 20 or newer, +# This spec file assumes you are building for Fedora 26 or newer, # or for RHEL 6 or newer. It may need some tweaks for other distros. %global with_gir 0 @@ -18,29 +18,30 @@ %global with_vala 1 %endif -%if 0%{?fedora} >= 25 +%global with_python 1 +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global with_python 0 +%endif + +%if 0%{?fedora} || 0%{?rhel} >= 8 %global tls_priority "@LIBVIRT,SYSTEM" %else - %if 0%{?fedora} >= 21 - %global tls_priority "@SYSTEM" - %else - %global tls_priority "NORMAL" - %endif + %global tls_priority "NORMAL" %endif Summary: A GTK2 widget for VNC clients Name: gtk-vnc -Version: 0.7.1 +Version: 0.7.2 Release: 1%{?dist}%{?extra_release} License: LGPLv2+ -Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: https://wiki.gnome.org/Projects/gtk-vnc Requires: gvnc = %{version}-%{release} BuildRequires: gtk2-devel >= 2.14 -BuildRequires: pygtk2-devel python-devel zlib-devel -BuildRequires: gnutls-devel libgcrypt-devel cyrus-sasl-devel intltool +%if %{with_python} +BuildRequires: pygtk2-devel python2-devel +%endif +BuildRequires: gnutls-devel libgcrypt-devel cyrus-sasl-devel zlib-devel intltool %if %{with_gir} BuildRequires: gobject-introspection-devel %endif @@ -59,7 +60,6 @@ %package devel Summary: Development files to build GTK2 applications with gtk-vnc -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: gtk2-devel @@ -70,20 +70,25 @@ Libraries, includes, etc. to compile with the gtk-vnc library -%package python +%if %{with_python} +%package -n python2-gtk-vnc +%{?python_provide:%python_provide python2-gtk-vnc} +# Remove before F30 +Provides: %{name}-python = %{version}-%{release} +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} Summary: Python bindings for the gtk-vnc library -Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%description python +%description -n python2-gtk-vnc gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines allowing it to be completely asynchronous while remaining single threaded. A module allowing use of the GTK-VNC widget from python +%endif %package -n gvnc Summary: A GObject for VNC connections -Group: Development/Libraries %description -n gvnc gvnc is a GObject for managing a VNC connection. It provides all the @@ -92,7 +97,6 @@ %package -n gvnc-devel Summary: Libraries, includes, etc. to compile with the gvnc library -Group: Development/Libraries Requires: gvnc = %{version}-%{release} Requires: pkgconfig @@ -105,7 +109,6 @@ %package -n gvncpulse Summary: A Pulse Audio bridge for VNC connections -Group: Development/Libraries Requires: gvnc = %{version}-%{release} %description -n gvncpulse @@ -115,7 +118,6 @@ %package -n gvncpulse-devel Summary: Libraries, includes, etc. to compile with the gvncpulse library -Group: Development/Libraries Requires: gvncpulse = %{version}-%{release} Requires: pkgconfig @@ -128,7 +130,6 @@ %package -n gvnc-tools Summary: Command line VNC tools -Group: Applications/Internet Requires: gvnc = %{version}-%{release} %description -n gvnc-tools @@ -139,7 +140,6 @@ %if %{with_gtk3} %package -n gtk-vnc2 Summary: A GTK3 widget for VNC clients -Group: Applications/Internet Requires: gvnc = %{version}-%{release} %description -n gtk-vnc2 @@ -148,7 +148,6 @@ %package -n gtk-vnc2-devel Summary: Development files to build GTK3 applications with gtk-vnc -Group: Development/Libraries Requires: gtk-vnc2 = %{version}-%{release} Requires: pkgconfig Requires: gtk3-devel @@ -173,8 +172,14 @@ %define gir_arg --enable-introspection=no %endif +%if %{with_python} +%define py_arg --with-python +%else +%define py_arg --without-python +%endif + cd gtk-vnc-%{version} -%configure --with-gtk=2.0 %{gir_arg} \ +%configure --with-gtk=2.0 %{gir_arg} %{py_arg} \ --with-tls-priority=%{tls_priority} %__make %{?_smp_mflags} V=1 chmod -x examples/*.pl examples/*.js examples/*.py @@ -182,7 +187,8 @@ %if %{with_gtk3} cd gtk-vnc2-%{version} -%configure --with-gtk=3.0 %{gir_arg} \ + +%configure --with-gtk=3.0 %{gir_arg} %{py_arg} \ --with-tls-priority=%{tls_priority} %__make %{?_smp_mflags} V=1 chmod -x examples/*.pl examples/*.js examples/*.py @@ -208,9 +214,6 @@ %find_lang %{name} -%clean -rm -fr %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -247,10 +250,12 @@ %{_datadir}/gir-1.0/GtkVnc-1.0.gir %endif -%files python +%if %{with_python} +%files -n python2-gtk-vnc %defattr(-, root, root) %doc gtk-vnc-%{version}/examples/gvncviewer-bindings.py %{_libdir}/python*/site-packages/gtkvnc.so +%endif %files -n gvnc -f %{name}.lang %defattr(-, root, root) diff -Nru gtk-vnc-0.7.1/gtk-vnc.spec.in gtk-vnc-0.7.2/gtk-vnc.spec.in --- gtk-vnc-0.7.1/gtk-vnc.spec.in 2017-05-04 15:51:07.000000000 +0000 +++ gtk-vnc-0.7.2/gtk-vnc.spec.in 2018-03-23 13:08:48.000000000 +0000 @@ -1,6 +1,6 @@ # -*- rpm-spec -*- -# This spec file assumes you are building for Fedora 20 or newer, +# This spec file assumes you are building for Fedora 26 or newer, # or for RHEL 6 or newer. It may need some tweaks for other distros. %global with_gir 0 @@ -18,14 +18,15 @@ %global with_vala 1 %endif -%if 0%{?fedora} >= 25 +%global with_python 1 +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global with_python 0 +%endif + +%if 0%{?fedora} || 0%{?rhel} >= 8 %global tls_priority "@LIBVIRT,SYSTEM" %else - %if 0%{?fedora} >= 21 - %global tls_priority "@SYSTEM" - %else - %global tls_priority "NORMAL" - %endif + %global tls_priority "NORMAL" %endif Summary: A GTK2 widget for VNC clients @@ -33,14 +34,14 @@ Version: @VERSION@ Release: 1%{?dist}%{?extra_release} License: LGPLv2+ -Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: https://wiki.gnome.org/Projects/gtk-vnc Requires: gvnc = %{version}-%{release} BuildRequires: gtk2-devel >= 2.14 -BuildRequires: pygtk2-devel python-devel zlib-devel -BuildRequires: gnutls-devel libgcrypt-devel cyrus-sasl-devel intltool +%if %{with_python} +BuildRequires: pygtk2-devel python2-devel +%endif +BuildRequires: gnutls-devel libgcrypt-devel cyrus-sasl-devel zlib-devel intltool %if %{with_gir} BuildRequires: gobject-introspection-devel %endif @@ -59,7 +60,6 @@ %package devel Summary: Development files to build GTK2 applications with gtk-vnc -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: gtk2-devel @@ -70,20 +70,25 @@ Libraries, includes, etc. to compile with the gtk-vnc library -%package python +%if %{with_python} +%package -n python2-gtk-vnc +%{?python_provide:%python_provide python2-gtk-vnc} +# Remove before F30 +Provides: %{name}-python = %{version}-%{release} +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} Summary: Python bindings for the gtk-vnc library -Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%description python +%description -n python2-gtk-vnc gtk-vnc is a VNC viewer widget for GTK2. It is built using coroutines allowing it to be completely asynchronous while remaining single threaded. A module allowing use of the GTK-VNC widget from python +%endif %package -n gvnc Summary: A GObject for VNC connections -Group: Development/Libraries %description -n gvnc gvnc is a GObject for managing a VNC connection. It provides all the @@ -92,7 +97,6 @@ %package -n gvnc-devel Summary: Libraries, includes, etc. to compile with the gvnc library -Group: Development/Libraries Requires: gvnc = %{version}-%{release} Requires: pkgconfig @@ -105,7 +109,6 @@ %package -n gvncpulse Summary: A Pulse Audio bridge for VNC connections -Group: Development/Libraries Requires: gvnc = %{version}-%{release} %description -n gvncpulse @@ -115,7 +118,6 @@ %package -n gvncpulse-devel Summary: Libraries, includes, etc. to compile with the gvncpulse library -Group: Development/Libraries Requires: gvncpulse = %{version}-%{release} Requires: pkgconfig @@ -128,7 +130,6 @@ %package -n gvnc-tools Summary: Command line VNC tools -Group: Applications/Internet Requires: gvnc = %{version}-%{release} %description -n gvnc-tools @@ -139,7 +140,6 @@ %if %{with_gtk3} %package -n gtk-vnc2 Summary: A GTK3 widget for VNC clients -Group: Applications/Internet Requires: gvnc = %{version}-%{release} %description -n gtk-vnc2 @@ -148,7 +148,6 @@ %package -n gtk-vnc2-devel Summary: Development files to build GTK3 applications with gtk-vnc -Group: Development/Libraries Requires: gtk-vnc2 = %{version}-%{release} Requires: pkgconfig Requires: gtk3-devel @@ -173,8 +172,14 @@ %define gir_arg --enable-introspection=no %endif +%if %{with_python} +%define py_arg --with-python +%else +%define py_arg --without-python +%endif + cd gtk-vnc-%{version} -%configure --with-gtk=2.0 %{gir_arg} \ +%configure --with-gtk=2.0 %{gir_arg} %{py_arg} \ --with-tls-priority=%{tls_priority} %__make %{?_smp_mflags} V=1 chmod -x examples/*.pl examples/*.js examples/*.py @@ -182,7 +187,8 @@ %if %{with_gtk3} cd gtk-vnc2-%{version} -%configure --with-gtk=3.0 %{gir_arg} \ + +%configure --with-gtk=3.0 %{gir_arg} %{py_arg} \ --with-tls-priority=%{tls_priority} %__make %{?_smp_mflags} V=1 chmod -x examples/*.pl examples/*.js examples/*.py @@ -208,9 +214,6 @@ %find_lang %{name} -%clean -rm -fr %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -247,10 +250,12 @@ %{_datadir}/gir-1.0/GtkVnc-1.0.gir %endif -%files python +%if %{with_python} +%files -n python2-gtk-vnc %defattr(-, root, root) %doc gtk-vnc-%{version}/examples/gvncviewer-bindings.py %{_libdir}/python*/site-packages/gtkvnc.so +%endif %files -n gvnc -f %{name}.lang %defattr(-, root, root) diff -Nru gtk-vnc-0.7.1/INSTALL gtk-vnc-0.7.2/INSTALL --- gtk-vnc-0.7.1/INSTALL 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/INSTALL 2018-03-23 13:27:27.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,97 +12,96 @@ Basic Installation ================== - Briefly, the shell command `./configure && make && make install' + Briefly, the shell command './configure && make && make install' should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type `make install' to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type `make installcheck' to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide `make + 8. Some packages, particularly those that use Automake, provide 'make distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: ./configure CC=c99 CFLAGS=-g LIBS=-lposix @@ -113,21 +112,21 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU `make', it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -136,105 +135,104 @@ This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, `make install +affected directory. For example, 'make install prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure +execution of 'make' will be. For these packages, running './configure --enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure +overridden with 'make V=1'; while running './configure --disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. +overridden with 'make V=0'. Particular systems ================== - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try +parse its '' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try ./configure CC="cc" @@ -242,26 +240,26 @@ ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -270,101 +268,101 @@ OS KERNEL-OS - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the "host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -`configure' Invocation +'configure' Invocation ====================== - `configure' recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help=short' -`--help=recursive' +'--help=short' +'--help=recursive' Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. + +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -`--cache-file=FILE' +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. -`--no-create' -`-n' +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. diff -Nru gtk-vnc-0.7.1/Makefile.in gtk-vnc-0.7.2/Makefile.in --- gtk-vnc-0.7.1/Makefile.in 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/Makefile.in 2018-03-23 13:27:27.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -323,6 +323,7 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ diff -Nru gtk-vnc-0.7.1/mingw-gtk-vnc.spec.in gtk-vnc-0.7.2/mingw-gtk-vnc.spec.in --- gtk-vnc-0.7.1/mingw-gtk-vnc.spec.in 2017-02-22 11:20:10.000000000 +0000 +++ gtk-vnc-0.7.2/mingw-gtk-vnc.spec.in 2018-03-23 11:25:44.000000000 +0000 @@ -6,9 +6,8 @@ Summary: MinGW Windows port of VNC client GTK widget License: LGPLv2+ -Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/0.5/gtk-vnc-%{version}.tar.xz -URL: http://live.gnome.org/gtk-vnc +URL: https://wiki.gnome.org/Projects/gtk-vnc BuildArch: noarch @@ -49,11 +48,9 @@ %package -n mingw32-gvnc-tools Summary: Command line VNC tools -Group: Applications/Internet %package -n mingw32-gtk-vnc2 Summary: A GTK3 widget for VNC clients -Group: Development/Libraries Requires: pkgconfig %description @@ -88,11 +85,9 @@ %package -n mingw64-gvnc-tools Summary: Command line VNC tools -Group: Applications/Internet %package -n mingw64-gtk-vnc2 Summary: A GTK3 widget for VNC clients -Group: Development/Libraries Requires: pkgconfig %description diff -Nru gtk-vnc-0.7.1/NEWS gtk-vnc-0.7.2/NEWS --- gtk-vnc-0.7.1/NEWS 2017-05-19 14:38:50.000000000 +0000 +++ gtk-vnc-0.7.2/NEWS 2018-03-23 13:08:48.000000000 +0000 @@ -1,6 +1,19 @@ GTK VNC News ============ +Mar 23, 2018: Release 0.7.2 +=========================== + + o Deprecated the manual python2 binding in favour of GObject + introspection. It will be deleted in the next release. + o Emit led state notification on connect + o Fix incorrect copyright notices + o Simplify shifted-tab key handling + o Don't short circuit TLS credential request + o Improve check for keymap under XWayland + o Update doap description of project + o Modernize RPM specfile + May 19, 2017: Release 0.7.1 =========================== diff -Nru gtk-vnc-0.7.1/po/hr.po gtk-vnc-0.7.2/po/hr.po --- gtk-vnc-0.7.1/po/hr.po 1970-01-01 00:00:00.000000000 +0000 +++ gtk-vnc-0.7.2/po/hr.po 2018-03-21 10:25:01.000000000 +0000 @@ -0,0 +1,33 @@ +# Croatian translation for gtk-vnc. +# Copyright (C) 2018 gtk-vnc's COPYRIGHT HOLDER +# This file is distributed under the same license as the gtk-vnc package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: gtk-vnc master\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-" +"vnc&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2018-03-13 19:31+0000\n" +"PO-Revision-Date: 2018-03-13 20:35+0100\n" +"Language-Team: Croatian \n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Last-Translator: \n" +"X-Generator: Poedit 2.0.6\n" + +#: ../src/vncdisplay.c:182 +msgid "Enables debug output" +msgstr "Omogućuje ispis otklanjanja greške" + +#: ../src/vncdisplay.c:3252 +msgid "GTK-VNC Options:" +msgstr "GTK-VNC mogućnosti:" + +#: ../src/vncdisplay.c:3252 +msgid "Show GTK-VNC Options" +msgstr "Prikaži GTK-VNC mogućnosti" diff -Nru gtk-vnc-0.7.1/po/LINGUAS gtk-vnc-0.7.2/po/LINGUAS --- gtk-vnc-0.7.1/po/LINGUAS 2017-05-04 15:51:07.000000000 +0000 +++ gtk-vnc-0.7.2/po/LINGUAS 2018-03-21 10:25:01.000000000 +0000 @@ -16,6 +16,7 @@ gl guc he +hr hu id it @@ -25,6 +26,7 @@ lv nb nds +nl oc pa pl diff -Nru gtk-vnc-0.7.1/po/nl.po gtk-vnc-0.7.2/po/nl.po --- gtk-vnc-0.7.1/po/nl.po 1970-01-01 00:00:00.000000000 +0000 +++ gtk-vnc-0.7.2/po/nl.po 2018-03-21 10:25:01.000000000 +0000 @@ -0,0 +1,32 @@ +# Dutch translation for gtk-vnc. +# Copyright (C) 2015 gtk-vnc's COPYRIGHT HOLDER +# This file is distributed under the same license as the gtk-vnc package. +# Nathan Follens , 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: gtk-vnc master\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-" +"vnc&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2017-07-13 16:10+0000\n" +"PO-Revision-Date: 2015-05-26 21:17+0100\n" +"Last-Translator: Nathan Follens \n" +"Language-Team: Dutch \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" + +#: ../src/vncdisplay.c:182 +msgid "Enables debug output" +msgstr "Schakelt debug-uitvoer in" + +#: ../src/vncdisplay.c:3242 +msgid "GTK-VNC Options:" +msgstr "GTK-VNC-opties:" + +#: ../src/vncdisplay.c:3242 +msgid "Show GTK-VNC Options" +msgstr "Toon GTK-VNC-opties" diff -Nru gtk-vnc-0.7.1/src/Makefile.in gtk-vnc-0.7.2/src/Makefile.in --- gtk-vnc-0.7.1/src/Makefile.in 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/src/Makefile.in 2018-03-23 13:27:27.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -636,6 +636,7 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ diff -Nru gtk-vnc-0.7.1/src/vncconnection.c gtk-vnc-0.7.2/src/vncconnection.c --- gtk-vnc-0.7.1/src/vncconnection.c 2017-04-12 15:46:18.000000000 +0000 +++ gtk-vnc-0.7.2/src/vncconnection.c 2018-03-13 09:10:21.000000000 +0000 @@ -217,6 +217,7 @@ char *cred_x509_cacrl; char *cred_x509_cert; char *cred_x509_key; + gboolean set_cred_x509; gboolean want_cred_username; gboolean want_cred_password; gboolean want_cred_x509; @@ -2964,6 +2965,8 @@ VncConnectionPrivate *priv = conn->priv; struct signal_data sigdata; + VNC_DEBUG("Desktop resize w=%d h=%d", width, height); + if (priv->coroutine_stop) return; @@ -3528,16 +3531,8 @@ return FALSE; if (priv->want_cred_password && !priv->cred_password) return FALSE; - /* - * For x509 we require a minimum of the CA cert - * if using GNUTLS < 3.0. With newer GNUTLS we'll - * fallback to the system trust, so don't need to - * explicitly check for a CA cert. - */ -#if GNUTLS_VERSION_NUMBER < 0x030000 - if (priv->want_cred_x509 && !priv->cred_x509_cacert) + if (priv->want_cred_x509 && !priv->set_cred_x509) return FALSE; -#endif return TRUE; } @@ -3545,6 +3540,8 @@ { VncConnectionPrivate *priv = conn->priv; + VNC_DEBUG("Checking if credentials are needed"); + if (priv->coroutine_stop) return FALSE; @@ -3562,16 +3559,19 @@ g_value_init(&username, VNC_TYPE_CONNECTION_CREDENTIAL); g_value_set_enum(&username, VNC_CONNECTION_CREDENTIAL_USERNAME); authCred = g_value_array_append(authCred, &username); + VNC_DEBUG("Want a username"); } if (priv->want_cred_password) { g_value_init(&password, VNC_TYPE_CONNECTION_CREDENTIAL); g_value_set_enum(&password, VNC_CONNECTION_CREDENTIAL_PASSWORD); authCred = g_value_array_append(authCred, &password); + VNC_DEBUG("Want a password"); } if (priv->want_cred_x509) { g_value_init(&clientname, VNC_TYPE_CONNECTION_CREDENTIAL); g_value_set_enum(&clientname, VNC_CONNECTION_CREDENTIAL_CLIENTNAME); authCred = g_value_array_append(authCred, &clientname); + VNC_DEBUG("Want a TLS clientname"); } sigdata.params.authCred = authCred; @@ -3585,6 +3585,8 @@ VNC_DEBUG("Waiting for missing credentials"); g_condition_wait(vnc_connection_has_credentials, conn); VNC_DEBUG("Got all credentials"); + } else { + VNC_DEBUG("No credentials required"); } return !vnc_connection_has_error(conn); } @@ -5123,6 +5125,7 @@ priv->cred_password = NULL; } + priv->set_cred_x509 = FALSE; if (priv->cred_x509_cacert) { g_free(priv->cred_x509_cacert); priv->cred_x509_cacert = NULL; @@ -5839,6 +5842,7 @@ { VncConnectionPrivate *priv = conn->priv; char *sysdir = g_strdup_printf("%s/pki", SYSCONFDIR); + int ret; #ifndef WIN32 struct passwd *pw; @@ -5853,9 +5857,19 @@ for (int i = 0 ; i < sizeof(dirs)/sizeof(dirs[0]) ; i++) VNC_DEBUG("Searching for certs in %s", dirs[i]); - if (vnc_connection_best_path(&priv->cred_x509_cacert, "CA", "cacert.pem", - dirs, sizeof(dirs)/sizeof(dirs[0])) < 0) + ret = vnc_connection_best_path(&priv->cred_x509_cacert, "CA", "cacert.pem", + dirs, sizeof(dirs)/sizeof(dirs[0])); + /* With modern GNUTLS we can just allow the global GNUTLS trust database + * to be used to validate CA certificates if no specific cert is set + */ + if (ret < 0) { +#if GNUTLS_VERSION_NUMBER < 0x030000 + VNC_DEBUG("No CA certificate provided and no global fallback"); return FALSE; +#else + VNC_DEBUG("No CA certificate provided, using GNUTLS global trust"); +#endif + } /* Don't mind failures of CRL */ vnc_connection_best_path(&priv->cred_x509_cacrl, "CA", "cacrl.pem", @@ -5868,6 +5882,8 @@ vnc_connection_best_path(&priv->cred_x509_cert, name, "clientcert.pem", dirs, sizeof(dirs)/sizeof(dirs[0])); + priv->set_cred_x509 = TRUE; + return TRUE; } diff -Nru gtk-vnc-0.7.1/src/vncdisplay.c gtk-vnc-0.7.2/src/vncdisplay.c --- gtk-vnc-0.7.1/src/vncdisplay.c 2017-02-22 11:20:10.000000000 +0000 +++ gtk-vnc-0.7.2/src/vncdisplay.c 2018-03-13 09:10:21.000000000 +0000 @@ -968,6 +968,14 @@ } +/* Compatability code to allow build on Gtk2 and Gtk3 */ +#ifndef GDK_Tab +#define GDK_Tab GDK_KEY_Tab +#endif +#ifndef GDK_ISO_Left_Tab +#define GDK_ISO_Left_Tab GDK_KEY_ISO_Left_Tab +#endif + static gboolean key_event(GtkWidget *widget, GdkEventKey *key) { VncDisplayPrivate *priv = VNC_DISPLAY(widget)->priv; @@ -997,7 +1005,13 @@ } #endif - keyval = vnc_display_keyval_from_keycode(key->hardware_keycode, keyval); + /* VNC servers don't want to get an ISO_Left_Tab. + * They need the Tab key and will apply the + * Shift modifier themselves + */ + if (keyval == GDK_ISO_Left_Tab) { + keyval = GDK_Tab; + } /* * Some VNC suckiness with key state & modifiers in particular @@ -1684,6 +1698,7 @@ gint32 encodings[] = { VNC_CONNECTION_ENCODING_TIGHT_JPEG5, VNC_CONNECTION_ENCODING_TIGHT, VNC_CONNECTION_ENCODING_EXT_KEY_EVENT, + VNC_CONNECTION_ENCODING_LED_STATE, VNC_CONNECTION_ENCODING_DESKTOP_RESIZE, VNC_CONNECTION_ENCODING_WMVi, VNC_CONNECTION_ENCODING_AUDIO, @@ -2135,8 +2150,6 @@ g_slist_free (priv->preferable_auths); g_slist_free (priv->preferable_vencrypt_subauths); - vnc_display_keyval_free_entries(); - G_OBJECT_CLASS (vnc_display_parent_class)->finalize (obj); } @@ -2506,8 +2519,6 @@ gtk_widget_set_can_focus (widget, TRUE); - vnc_display_keyval_set_entries(); - gtk_widget_add_events(widget, GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | diff -Nru gtk-vnc-0.7.1/src/vncdisplaykeymap.c gtk-vnc-0.7.2/src/vncdisplaykeymap.c --- gtk-vnc-0.7.1/src/vncdisplaykeymap.c 2017-04-06 16:09:35.000000000 +0000 +++ gtk-vnc-0.7.2/src/vncdisplaykeymap.c 2018-03-13 09:10:47.000000000 +0000 @@ -1,11 +1,22 @@ /* - * Copyright (C) 2008 Anthony Liguori + * GTK VNC Widget + * * Copyright (C) 2009-2010 Daniel P. Berrange + * Copyright (C) 2017 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.0 of the License, or (at your option) any later version. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 2 as - * published by the Free Software Foundation. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include @@ -17,46 +28,6 @@ #include "vncdisplaykeymap.h" #include "vncutil.h" -/* - * This table is taken from QEMU x_keymap.c, under the terms: - * - * Copyright (c) 2003 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - - -/* Compatability code to allow build on Gtk2 and Gtk3 */ -#ifndef GDK_Tab -#define GDK_Tab GDK_KEY_Tab -#endif - -/* keycode translation for sending ISO_Left_Send - * to vncserver - */ -static struct { - GdkKeymapKey *keys; - gint n_keys; - guint keyval; -} untranslated_keys[] = {{NULL, 0, GDK_Tab}}; - -static unsigned int ref_count_for_untranslated_keys = 0; #ifdef GDK_WINDOWING_WAYLAND #include @@ -202,11 +173,13 @@ VNC_DEBUG("Using xquartz keycode mapping"); *maplen = G_N_ELEMENTS(keymap_xorgxquartz2rfb); return keymap_xorgxquartz2rfb; - } else if (keycodes && STRPREFIX(keycodes, "evdev")) { + } else if ((keycodes && STRPREFIX(keycodes, "evdev")) || + (XKeysymToKeycode(xdisplay, XK_Page_Up) == 0x70)) { VNC_DEBUG("Using evdev keycode mapping"); *maplen = G_N_ELEMENTS(keymap_xorgevdev2rfb); return keymap_xorgevdev2rfb; - } else if (keycodes && STRPREFIX(keycodes, "xfree86")) { + } else if ((keycodes && STRPREFIX(keycodes, "xfree86")) || + (XKeysymToKeycode(xdisplay, XK_Page_Up) == 0x63)) { VNC_DEBUG("Using xfree86 keycode mapping"); *maplen = G_N_ELEMENTS(keymap_xorgkbd2rfb); return keymap_xorgkbd2rfb; @@ -281,46 +254,6 @@ return keycode_map[keycode]; } -/* Set the keymap entries */ -void vnc_display_keyval_set_entries(void) -{ - size_t i; - if (ref_count_for_untranslated_keys == 0) - for (i = 0; i < G_N_ELEMENTS(untranslated_keys); i++) - gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), - untranslated_keys[i].keyval, - &untranslated_keys[i].keys, - &untranslated_keys[i].n_keys); - ref_count_for_untranslated_keys++; -} - -/* Free the keymap entries */ -void vnc_display_keyval_free_entries(void) -{ - size_t i; - - if (ref_count_for_untranslated_keys == 0) - return; - - ref_count_for_untranslated_keys--; - if (ref_count_for_untranslated_keys == 0) - for (i = 0; i < G_N_ELEMENTS(untranslated_keys); i++) - g_free(untranslated_keys[i].keys); - -} - -/* Get the keyval from the keycode without the level. */ -guint vnc_display_keyval_from_keycode(guint keycode, guint keyval) -{ - size_t i; - for (i = 0; i < G_N_ELEMENTS(untranslated_keys); i++) { - if (keycode == untranslated_keys[i].keys[0].keycode) { - return untranslated_keys[i].keyval; - } - } - - return keyval; -} /* * Local variables: * c-indent-level: 4 diff -Nru gtk-vnc-0.7.1/src/vncdisplaykeymap.h gtk-vnc-0.7.2/src/vncdisplaykeymap.h --- gtk-vnc-0.7.1/src/vncdisplaykeymap.h 2017-02-22 11:20:10.000000000 +0000 +++ gtk-vnc-0.7.2/src/vncdisplaykeymap.h 2018-03-13 09:10:21.000000000 +0000 @@ -28,9 +28,6 @@ guint16 vnc_display_keymap_gdk2rfb(const guint16 *keycode_map, size_t keycode_maplen, guint16 keycode); -void vnc_display_keyval_set_entries(void); -void vnc_display_keyval_free_entries(void); -guint vnc_display_keyval_from_keycode(guint keycode, guint keyval); #endif /* VNC_DISPLAY_KEYMAP_H */ /* diff -Nru gtk-vnc-0.7.1/src/vncmarshal.c gtk-vnc-0.7.2/src/vncmarshal.c --- gtk-vnc-0.7.1/src/vncmarshal.c 2017-05-19 14:41:20.000000000 +0000 +++ gtk-vnc-0.7.2/src/vncmarshal.c 2018-03-23 13:28:10.000000000 +0000 @@ -1,7 +1,6 @@ #include "vncmarshal.h" - -#include - +/* This file is generated by glib-genmarshal, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */ +#include #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) @@ -49,7 +48,6 @@ #define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ - /* VOID:INT,INT (../../src/vncmarshal.txt:1) */ void g_cclosure_user_marshal_VOID__INT_INT (GClosure *closure, @@ -59,13 +57,13 @@ gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, - gint arg_1, - gint arg_2, - gpointer data2); - GMarshalFunc_VOID__INT_INT callback; - GCClosure *cc = (GCClosure*) closure; + typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, + gint arg1, + gint arg2, + gpointer data2); + GCClosure *cc = (GCClosure *) closure; gpointer data1, data2; + GMarshalFunc_VOID__INT_INT callback; g_return_if_fail (n_param_values == 3); @@ -96,15 +94,15 @@ gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__INT_INT_INT_INT) (gpointer data1, - gint arg_1, - gint arg_2, - gint arg_3, - gint arg_4, - gpointer data2); - GMarshalFunc_VOID__INT_INT_INT_INT callback; - GCClosure *cc = (GCClosure*) closure; + typedef void (*GMarshalFunc_VOID__INT_INT_INT_INT) (gpointer data1, + gint arg1, + gint arg2, + gint arg3, + gint arg4, + gpointer data2); + GCClosure *cc = (GCClosure *) closure; gpointer data1, data2; + GMarshalFunc_VOID__INT_INT_INT_INT callback; g_return_if_fail (n_param_values == 5); @@ -137,13 +135,13 @@ gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__UINT_BOXED) (gpointer data1, - guint arg_1, - gpointer arg_2, - gpointer data2); - GMarshalFunc_VOID__UINT_BOXED callback; - GCClosure *cc = (GCClosure*) closure; + typedef void (*GMarshalFunc_VOID__UINT_BOXED) (gpointer data1, + guint arg1, + gpointer arg2, + gpointer data2); + GCClosure *cc = (GCClosure *) closure; gpointer data1, data2; + GMarshalFunc_VOID__UINT_BOXED callback; g_return_if_fail (n_param_values == 3); diff -Nru gtk-vnc-0.7.1/src/vncmarshal.h gtk-vnc-0.7.2/src/vncmarshal.h --- gtk-vnc-0.7.1/src/vncmarshal.h 2017-05-19 14:41:20.000000000 +0000 +++ gtk-vnc-0.7.2/src/vncmarshal.h 2018-03-23 13:28:10.000000000 +0000 @@ -1,36 +1,39 @@ +/* This file is generated by glib-genmarshal, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */ +#ifndef __G_CCLOSURE_USER_MARSHAL_MARSHAL_H__ +#define __G_CCLOSURE_USER_MARSHAL_MARSHAL_H__ -#ifndef __g_cclosure_user_marshal_MARSHAL_H__ -#define __g_cclosure_user_marshal_MARSHAL_H__ - -#include +#include G_BEGIN_DECLS /* VOID:INT,INT (../../src/vncmarshal.txt:1) */ -extern void g_cclosure_user_marshal_VOID__INT_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); +extern +void g_cclosure_user_marshal_VOID__INT_INT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); /* VOID:INT,INT,INT,INT (../../src/vncmarshal.txt:2) */ -extern void g_cclosure_user_marshal_VOID__INT_INT_INT_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); +extern +void g_cclosure_user_marshal_VOID__INT_INT_INT_INT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); /* VOID:UINT,BOXED (../../src/vncmarshal.txt:3) */ -extern void g_cclosure_user_marshal_VOID__UINT_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); +extern +void g_cclosure_user_marshal_VOID__UINT_BOXED (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); -G_END_DECLS -#endif /* __g_cclosure_user_marshal_MARSHAL_H__ */ +G_END_DECLS +#endif /* __G_CCLOSURE_USER_MARSHAL_MARSHAL_H__ */ diff -Nru gtk-vnc-0.7.1/tools/Makefile.in gtk-vnc-0.7.2/tools/Makefile.in --- gtk-vnc-0.7.1/tools/Makefile.in 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/tools/Makefile.in 2018-03-23 13:27:27.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -285,6 +285,7 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ diff -Nru gtk-vnc-0.7.1/vapi/Makefile.in gtk-vnc-0.7.2/vapi/Makefile.in --- gtk-vnc-0.7.1/vapi/Makefile.in 2017-05-19 14:40:39.000000000 +0000 +++ gtk-vnc-0.7.2/vapi/Makefile.in 2018-03-23 13:27:27.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -233,6 +233,7 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@