From fc633f3d1bdb7324b5b3b18f76843d4873442357 Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 11 Dec 2008 12:36:31 +0000 Subject: [PATCH] - update gtk-vnc to 0.3.8 * switches to cairo instead of gtkglext - bump major ok ajacoutot@ --- x11/gtk-vnc/Makefile | 25 +++++++++---------- x11/gtk-vnc/distinfo | 10 ++++---- x11/gtk-vnc/patches/patch-configure | 10 ++++---- .../patches/patch-gnulib_tests_Makefile_in | 24 ++++++++++++++++++ x11/gtk-vnc/patches/patch-plugin_Makefile_in | 14 +++++------ .../patches/patch-src_coroutine_ucontext_c | 8 +++--- x11/gtk-vnc/patches/patch-src_gvnc_c | 8 +++--- x11/gtk-vnc/pkg/PLIST-plugin | 4 ++- 8 files changed, 64 insertions(+), 39 deletions(-) create mode 100644 x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in diff --git a/x11/gtk-vnc/Makefile b/x11/gtk-vnc/Makefile index 30132b67858..7709b5b33f4 100644 --- a/x11/gtk-vnc/Makefile +++ b/x11/gtk-vnc/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.6 2008/11/21 19:31:54 jasper Exp $ +# $OpenBSD: Makefile,v 1.7 2008/12/11 12:36:31 jasper Exp $ COMMENT-main= VNC viewer widget for GTK COMMENT-plugin= gtk-vnc browser plugin -V= 0.3.6 +V= 0.3.8 DISTNAME= gtk-vnc-${V} -PKGNAME-main= ${DISTNAME}p2 -PKGNAME-plugin= gtk-vnc-plugin-${V}p1 +PKGNAME-main= ${DISTNAME} +PKGNAME-plugin= gtk-vnc-plugin-${V} -SHARED_LIBS += gtk-vnc-1.0 0.0 # .0.1 +SHARED_LIBS += gtk-vnc-1.0 1.0 # .0.1 CATEGORIES= x11 net HOMEPAGE= http://gtk-vnc.sourceforge.net/ @@ -24,12 +24,12 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk-vnc/} MODULES= devel/gettext \ lang/python -WANTLIB= GL GLU ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ - Xext Xfixes Xi Xinerama Xmu Xrandr Xrender Xt atk-1.0 \ - cairo expat fontconfig freetype gcrypt gdk-x11-2.0 \ - gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ - gpg-error gthread-2.0 gtk-x11-2.0 m pango-1.0 \ - pangocairo-1.0 pangoft2-1.0 pangox-1.0 pcre pixman-1 png z +WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ + freetype gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \ + glib-2.0 glitz gmodule-2.0 gobject-2.0 gpg-error gthread-2.0 \ + gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ + pcre pixman-1 png tasn1 z WANTLIB-main= ${WANTLIB} c pthread MULTI_PACKAGES= -main @@ -38,8 +38,7 @@ FLAVOR?= BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::x11/py-gtk2 -LIB_DEPENDS= gnutls.>=13::security/gnutls \ - gdkglext-x11-1.0,gtkglext-x11-1.0::x11/gtkglext +LIB_DEPENDS= gnutls.>=13::security/gnutls LIB_DEPENDS-plugin= ${LIB_DEPENDS} \ gtk-vnc-1.0::${BASE_PKGPATH} diff --git a/x11/gtk-vnc/distinfo b/x11/gtk-vnc/distinfo index a71f2c79e65..0fd09b68e70 100644 --- a/x11/gtk-vnc/distinfo +++ b/x11/gtk-vnc/distinfo @@ -1,5 +1,5 @@ -MD5 (gtk-vnc-0.3.6.tar.gz) = ZGUN/0hQ4coxWKMojA5shg== -RMD160 (gtk-vnc-0.3.6.tar.gz) = a5Mi6Wfwcgpast02ilitUuIPPcY= -SHA1 (gtk-vnc-0.3.6.tar.gz) = A+0CGToYTJv+iuKR1jGVCQqN2G8= -SHA256 (gtk-vnc-0.3.6.tar.gz) = q+Anwt713FB2oc41GODViwoBh5NdpOBjWmR1pgiU6cg= -SIZE (gtk-vnc-0.3.6.tar.gz) = 433381 +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 diff --git a/x11/gtk-vnc/patches/patch-configure b/x11/gtk-vnc/patches/patch-configure index 5b344ca1a03..2d9ef101ef2 100644 --- a/x11/gtk-vnc/patches/patch-configure +++ b/x11/gtk-vnc/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.2 2008/11/21 19:31:54 jasper Exp $ ---- configure.orig Tue May 6 04:54:32 2008 -+++ configure Fri Nov 21 20:28:40 2008 -@@ -2384,7 +2384,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +$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 do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.2 2008/11/21 19:31:54 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 #( -@@ -9989,7 +9989,6 @@ openbsd*) +@@ -20656,7 +20656,6 @@ openbsd*) *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' diff --git a/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in b/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in new file mode 100644 index 00000000000..2d6a59bb659 --- /dev/null +++ b/x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in @@ -0,0 +1,24 @@ +$OpenBSD: patch-gnulib_tests_Makefile_in,v 1.1 2008/12/11 12:36:31 jasper 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 + 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) + 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-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 + 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 967ba39e8f9..6d64b7dc364 100644 --- a/x11/gtk-vnc/patches/patch-plugin_Makefile_in +++ b/x11/gtk-vnc/patches/patch-plugin_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-plugin_Makefile_in,v 1.2 2008/07/13 17:16:25 jasper Exp $ ---- plugin/Makefile.in.orig Mon May 5 22:54:31 2008 -+++ plugin/Makefile.in Sat Jul 12 14:17:21 2008 -@@ -232,7 +232,7 @@ target_os = @target_os@ +$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@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -10,7 +10,7 @@ $OpenBSD: patch-plugin_Makefile_in,v 1.2 2008/07/13 17:16:25 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 -@@ -285,12 +285,12 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) +@@ -518,12 +518,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.2 2008/07/13 17:16:25 jasper Exp $ else :; fi; \ done -@@ -298,8 +298,8 @@ uninstall-pluginLTLIBRARIES: +@@ -531,8 +531,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.2 2008/07/13 17:16:25 jasper Exp $ done clean-pluginLTLIBRARIES: -@@ -449,7 +449,7 @@ check: check-am +@@ -682,7 +682,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_coroutine_ucontext_c b/x11/gtk-vnc/patches/patch-src_coroutine_ucontext_c index a4cff4c82d8..8775d53db1c 100644 --- a/x11/gtk-vnc/patches/patch-src_coroutine_ucontext_c +++ b/x11/gtk-vnc/patches/patch-src_coroutine_ucontext_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_coroutine_ucontext_c,v 1.1.1.1 2008/05/10 08:35:31 jasper Exp $ ---- src/coroutine_ucontext.c.orig Mon Feb 11 19:17:53 2008 -+++ src/coroutine_ucontext.c Mon Feb 11 19:18:03 2008 -@@ -48,7 +48,7 @@ int coroutine_init(struct coroutine *co) +$OpenBSD: patch-src_coroutine_ucontext_c,v 1.2 2008/12/11 12:36:31 jasper Exp $ +--- src/coroutine_ucontext.c.orig Sun Dec 7 20:35:14 2008 ++++ src/coroutine_ucontext.c Wed Dec 10 23:19:36 2008 +@@ -60,7 +60,7 @@ int coroutine_init(struct coroutine *co) co->cc.stack_size = co->stack_size; co->cc.stack = mmap(0, co->stack_size, PROT_READ | PROT_WRITE, diff --git a/x11/gtk-vnc/patches/patch-src_gvnc_c b/x11/gtk-vnc/patches/patch-src_gvnc_c index 3537a2b1155..115af6e6886 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.1.1.1 2008/05/10 08:35:31 jasper Exp $ ---- src/gvnc.c.orig Fri May 9 23:53:22 2008 -+++ src/gvnc.c Fri May 9 23:54:48 2008 -@@ -169,6 +169,10 @@ struct gvnc +$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 #define nibhi(a) (((a) >> 4) & 0x0F) #define niblo(a) ((a) & 0x0F) diff --git a/x11/gtk-vnc/pkg/PLIST-plugin b/x11/gtk-vnc/pkg/PLIST-plugin index f9511e40bcc..2214bd02f21 100644 --- a/x11/gtk-vnc/pkg/PLIST-plugin +++ b/x11/gtk-vnc/pkg/PLIST-plugin @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST-plugin,v 1.2 2008/07/13 17:16:25 jasper Exp $ +@comment $OpenBSD: PLIST-plugin,v 1.3 2008/12/11 12:36:31 jasper Exp $ lib/mozilla-plugins/ +@comment lib/mozilla-plugins/gtk-vnc-plugin.a +@comment lib/mozilla-plugins/gtk-vnc-plugin.la lib/mozilla-plugins/gtk-vnc-plugin.so share/examples/gtk-vnc/ share/examples/gtk-vnc/README.plugin