From e9a6565802b0ccefdde0151f55607e8e462c4308 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 12 Aug 2009 13:52:19 +0000 Subject: [PATCH] Update to gtk-vnc-0.3.9. Several bugfixes and add support SASL authentication extension. --- x11/gtk-vnc/Makefile | 33 ++++++++++--------- x11/gtk-vnc/distinfo | 10 +++--- x11/gtk-vnc/patches/patch-configure | 14 ++++---- .../patches/patch-gnulib_tests_Makefile_in | 18 +++++----- x11/gtk-vnc/patches/patch-plugin_Makefile_in | 16 ++++----- x11/gtk-vnc/patches/patch-src_gvnc_c | 8 ++--- 6 files changed, 52 insertions(+), 47 deletions(-) diff --git a/x11/gtk-vnc/Makefile b/x11/gtk-vnc/Makefile index 01781cb91a5..49d42a1ab72 100644 --- a/x11/gtk-vnc/Makefile +++ b/x11/gtk-vnc/Makefile @@ -1,17 +1,19 @@ -# $OpenBSD: Makefile,v 1.11 2009/08/11 08:42:08 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2009/08/12 13:52:19 ajacoutot Exp $ COMMENT-main= VNC viewer widget for GTK COMMENT-plugin= gtk-vnc browser plugin -V= 0.3.8 -DISTNAME= gtk-vnc-${V} -PKGNAME-main= ${DISTNAME}p1 -PKGNAME-plugin= gtk-vnc-plugin-${V}p0 +GNOME_PROJECT= gtk-vnc +GNOME_VERSION= 0.3.9 + +PKGNAME-main= ${DISTNAME} +PKGNAME-plugin= gtk-vnc-plugin-${GNOME_VERSION} + +SHARED_LIBS += gtk-vnc-1.0 1.1 # .0.1 -SHARED_LIBS += gtk-vnc-1.0 1.0 # .0.1 CATEGORIES= x11 net -HOMEPAGE= http://gtk-vnc.sourceforge.net/ +HOMEPAGE= http://live.gnome.org/gtk-vnc # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes @@ -19,10 +21,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk-vnc/} - MODULES= devel/gettext \ - lang/python + lang/python \ + x11/gnome WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ @@ -39,17 +40,19 @@ FLAVOR?= BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::x11/py-gtk2 -LIB_DEPENDS= gnutls.>=13::security/gnutls +LIB_DEPENDS= gnutls.>=13::security/gnutls \ + sasl2.>=2::security/cyrus-sasl2 LIB_DEPENDS-plugin= ${LIB_DEPENDS} \ gtk-vnc-1.0::${BASE_PKGPATH} -USE_GMAKE= Yes -USE_LIBTOOL= Yes USE_X11= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --with-examples \ - --with-python +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --with-examples \ + --with-python \ + --with-sasl \ + --without-libview CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gtk-vnc/distinfo b/x11/gtk-vnc/distinfo index 0fd09b68e70..f32e9e1bb2d 100644 --- a/x11/gtk-vnc/distinfo +++ b/x11/gtk-vnc/distinfo @@ -1,5 +1,5 @@ -MD5 (gtk-vnc-0.3.8.tar.gz) = coaaGmPslyvcp60SiY8miQ== -RMD160 (gtk-vnc-0.3.8.tar.gz) = 0P5Gz2+6TmgWXpGlT5Nz7/PXeTI= -SHA1 (gtk-vnc-0.3.8.tar.gz) = WLcpUE34zooEO/v2NR11HoyLigk= -SHA256 (gtk-vnc-0.3.8.tar.gz) = RJ93DHpwOc6ssoZBwQFChTT9hgdE5nUAlG+No7PegPU= -SIZE (gtk-vnc-0.3.8.tar.gz) = 610526 +MD5 (gtk-vnc-0.3.9.tar.bz2) = GMv1Czk/6le2kZh+XqYiWQ== +RMD160 (gtk-vnc-0.3.9.tar.bz2) = 4YkU92IaO5MGMPES2dqEGKlZ+JY= +SHA1 (gtk-vnc-0.3.9.tar.bz2) = 0wfDrzbOsGgHrNL96HkOKS7AwHE= +SHA256 (gtk-vnc-0.3.9.tar.bz2) = q4TMwE0VxPtECaaJ+a/W5x6knw//cE3RCmSL3OEbVuk= +SIZE (gtk-vnc-0.3.9.tar.bz2) = 460629 diff --git a/x11/gtk-vnc/patches/patch-configure b/x11/gtk-vnc/patches/patch-configure index 2d9ef101ef2..02725eb23d9 100644 --- a/x11/gtk-vnc/patches/patch-configure +++ b/x11/gtk-vnc/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2008/12/11 12:36:31 jasper Exp $ ---- configure.orig Sun Dec 7 20:35:38 2008 -+++ configure Wed Dec 10 23:19:36 2008 -@@ -2590,7 +2590,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +$OpenBSD: patch-configure,v 1.4 2009/08/12 13:52:19 ajacoutot Exp $ +--- configure.orig Tue Aug 11 14:24:30 2009 ++++ configure Wed Aug 12 15:23:54 2009 +@@ -2697,7 +2697,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10,11 +10,11 @@ $OpenBSD: patch-configure,v 1.3 2008/12/11 12:36:31 jasper Exp $ for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -@@ -20656,7 +20656,6 @@ openbsd*) - *) need_version=no ;; +@@ -21965,7 +21965,6 @@ openbsd*) + *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in diff --git a/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in b/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in index 2d6a59bb659..6d0816c41d8 100644 --- a/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in +++ b/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in @@ -1,24 +1,26 @@ -$OpenBSD: patch-gnulib_tests_Makefile_in,v 1.1 2008/12/11 12:36:31 jasper Exp $ +$OpenBSD: patch-gnulib_tests_Makefile_in,v 1.2 2009/08/12 13:52:19 ajacoutot Exp $ Don't bother running these two useless (and failing) tests. ---- gnulib/tests/Makefile.in.orig Wed Dec 10 23:41:52 2008 -+++ gnulib/tests/Makefile.in Wed Dec 10 23:42:16 2008 -@@ -51,7 +51,6 @@ TESTS = test-alloca-opt$(EXEEXT) test-arpa_inet$(EXEEX +--- gnulib/tests/Makefile.in.orig Wed Aug 12 15:22:44 2009 ++++ gnulib/tests/Makefile.in Wed Aug 12 15:23:43 2009 +@@ -51,7 +51,7 @@ TESTS = test-alloca-opt$(EXEEXT) test-arpa_inet$(EXEEX test-stdbool$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \ test-stdlib$(EXEEXT) test-sys_socket$(EXEEXT) \ test-unistd$(EXEEXT) test-vasnprintf$(EXEEXT) \ -- test-vc-list-files-git.sh test-vc-list-files-cvs.sh \ - test-wchar$(EXEEXT) +- test-vc-list-files-git.sh test-wchar$(EXEEXT) ++ test-wchar$(EXEEXT) noinst_PROGRAMS = check_PROGRAMS = test-alloca-opt$(EXEEXT) test-arpa_inet$(EXEEXT) \ -@@ -577,8 +576,7 @@ EXTRA_DIST = test-alloca-opt.c test-arpa_inet.c test-e + test-errno$(EXEEXT) test-getaddrinfo$(EXEEXT) \ +@@ -586,8 +586,8 @@ EXTRA_DIST = test-alloca-opt.c test-arpa_inet.c test-e test-getaddrinfo.c intprops.h test-netinet_in.c \ test-snprintf.c test-stdbool.c test-stdint.c test-stdio.c \ test-stdlib.c test-sys_socket.c test-unistd.c \ - test-vasnprintf.c test-vc-list-files-git.sh \ - test-vc-list-files-cvs.sh test-wchar.c -+ test-vasnprintf.c test-wchar.c ++ test-vasnprintf.c \ ++ test-wchar.c BUILT_SOURCES = SUFFIXES = MOSTLYCLEANFILES = core *.stackdump diff --git a/x11/gtk-vnc/patches/patch-plugin_Makefile_in b/x11/gtk-vnc/patches/patch-plugin_Makefile_in index 6d64b7dc364..685877ccbd2 100644 --- a/x11/gtk-vnc/patches/patch-plugin_Makefile_in +++ b/x11/gtk-vnc/patches/patch-plugin_Makefile_in @@ -1,8 +1,8 @@ -$OpenBSD: patch-plugin_Makefile_in,v 1.3 2008/12/11 12:36:31 jasper Exp $ ---- plugin/Makefile.in.orig Sun Dec 7 20:44:34 2008 -+++ plugin/Makefile.in Wed Dec 10 23:19:36 2008 -@@ -465,7 +465,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ +$OpenBSD: patch-plugin_Makefile_in,v 1.4 2009/08/12 13:52:19 ajacoutot Exp $ +--- plugin/Makefile.in.orig Tue Aug 11 14:24:27 2009 ++++ plugin/Makefile.in Wed Aug 12 15:23:54 2009 +@@ -475,7 +475,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/mozilla/plugins @@ -10,7 +10,7 @@ $OpenBSD: patch-plugin_Makefile_in,v 1.3 2008/12/11 12:36:31 jasper Exp $ @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = gtk-vnc-plugin.la @ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_SOURCES = \ @ENABLE_PLUGIN_TRUE@ gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c -@@ -518,12 +518,12 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) +@@ -528,12 +528,12 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -26,7 +26,7 @@ $OpenBSD: patch-plugin_Makefile_in,v 1.3 2008/12/11 12:36:31 jasper Exp $ else :; fi; \ done -@@ -531,8 +531,8 @@ uninstall-pluginLTLIBRARIES: +@@ -541,8 +541,8 @@ uninstall-pluginLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ @@ -37,7 +37,7 @@ $OpenBSD: patch-plugin_Makefile_in,v 1.3 2008/12/11 12:36:31 jasper Exp $ done clean-pluginLTLIBRARIES: -@@ -682,7 +682,7 @@ check: check-am +@@ -692,7 +692,7 @@ check: check-am @ENABLE_PLUGIN_FALSE@all-local: all-am: Makefile $(LTLIBRARIES) all-local installdirs: diff --git a/x11/gtk-vnc/patches/patch-src_gvnc_c b/x11/gtk-vnc/patches/patch-src_gvnc_c index 115af6e6886..fbd85d46a36 100644 --- a/x11/gtk-vnc/patches/patch-src_gvnc_c +++ b/x11/gtk-vnc/patches/patch-src_gvnc_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_gvnc_c,v 1.2 2008/12/11 12:36:31 jasper Exp $ ---- src/gvnc.c.orig Sun Dec 7 20:35:14 2008 -+++ src/gvnc.c Wed Dec 10 23:19:36 2008 -@@ -188,6 +188,10 @@ struct gvnc +$OpenBSD: patch-src_gvnc_c,v 1.3 2009/08/12 13:52:19 ajacoutot Exp $ +--- src/gvnc.c.orig Mon Jul 6 21:26:40 2009 ++++ src/gvnc.c Wed Aug 12 15:23:54 2009 +@@ -203,6 +203,10 @@ struct gvnc #define nibhi(a) (((a) >> 4) & 0x0F) #define niblo(a) ((a) & 0x0F)