cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gtk-vnc-0.4.0.

Browse Source
This commit is contained in:
ajacoutot 2010-07-12 09:31:51 +00:00
parent cbade10fd4
commit 7cc23beb5c
8 changed files with 89 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
x11/gtk-vnc/Makefile
View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.15 2010/04/04 10:50:21 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2010/07/12 09:31:51 ajacoutot Exp $
COMMENT-main= VNC viewer widget for GTK
COMMENT-plugin= gtk-vnc browser plugin
GNOME_PROJECT= gtk-vnc
GNOME_VERSION= 0.3.10
GNOME_VERSION= 0.4.0
PKGNAME-main= ${DISTNAME}p0
PKGNAME-plugin= gtk-vnc-plugin-${GNOME_VERSION}p0
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 2.0 # .0.1
SHARED_LIBS += gvnc-1.0 0.0 # 0.1
CATEGORIES= x11 net
@ -30,9 +31,10 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
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 pthread-stubs xcb ffi
pcre pixman-1 png tasn1 z pthread-stubs xcb xcb-render \
xcb-render-util
WANTLIB-main= ${WANTLIB} c pthread
WANTLIB-main= ${WANTLIB} c ffi pthread gnutls.>=13 sasl2.>=2
MULTI_PACKAGES= -main
PSEUDO_FLAVORS= no_plugin
@ -40,10 +42,11 @@ FLAVOR?=
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ::x11/py-gtk2
LIB_DEPENDS= gnutls.>=13::security/gnutls \
sasl2.>=2::security/cyrus-sasl2
LIB_DEPENDS= ::security/gnutls \
::security/cyrus-sasl2
LIB_DEPENDS-plugin= ${LIB_DEPENDS} \
gtk-vnc-1.0::${BASE_PKGPATH}
::${BASE_PKGPATH}
WANTLIB-plugin= ${WANTLIB} gvnc-1.0 gtk-vnc-1.0 gnutls sasl2
USE_X11= Yes
@ -52,7 +55,8 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-examples \
--with-python \
--with-sasl \
--without-libview
--without-libview \
--disable-introspection
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

10
x11/gtk-vnc/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gtk-vnc-0.3.10.tar.bz2) = mqnYMLIZJVyNZ1PvVYApMg==
RMD160 (gtk-vnc-0.3.10.tar.bz2) = xAwoERhusTrfzmqR188SKkOyf+A=
SHA1 (gtk-vnc-0.3.10.tar.bz2) = Rnge1qbpWn3aIjCE/u0HzS4mebU=
SHA256 (gtk-vnc-0.3.10.tar.bz2) = PZLbRjQc3T8vjoTHoT0uLUcRZ7Mzz8g40mjSzoUT3SI=
SIZE (gtk-vnc-0.3.10.tar.bz2) = 495399
MD5 (gtk-vnc-0.4.0.tar.bz2) = 84zpmvkIBjfJFbG2CBVbow==
RMD160 (gtk-vnc-0.4.0.tar.bz2) = 9zGaVeP03hmjX9Wmsw7GJZQrlp4=
SHA1 (gtk-vnc-0.4.0.tar.bz2) = i3thRJ4+xNfUhJDUO8c97RovRtM=
SHA256 (gtk-vnc-0.4.0.tar.bz2) = IqHmfrfTLzPYsyIpWVwCIx+sNW55ajuyQg6nI7bZREc=
SIZE (gtk-vnc-0.4.0.tar.bz2) = 535694

23
x11/gtk-vnc/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2009/10/21 15:20:23 jasper Exp $
--- configure.orig Tue Oct 20 20:32:57 2009
+++ configure Wed Oct 21 14:00:07 2009
@@ -2593,7 +2593,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
$OpenBSD: patch-configure,v 1.6 2010/07/12 09:31:51 ajacoutot Exp $
--- configure.orig Sun Jul 11 21:10:45 2010
+++ configure Mon Jul 12 09:03:38 2010
@@ -2787,7 +2787,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.5 2009/10/21 15:20:23 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 #(
@@ -21906,7 +21906,6 @@ openbsd*)
@@ -10575,7 +10575,6 @@ openbsd*)
*) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@ -18,3 +18,16 @@ $OpenBSD: patch-configure,v 1.5 2009/10/21 15:20:23 jasper Exp $
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
case $host_os in
@@ -26121,6 +26120,12 @@ case "$host" in
NO_UNDEFINED_LDFLAGS="-no-undefined"
;;
+ *-*-openbsd*)
+ NO_UNDEFINED_FLAGS=""
+ VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+ `ld --help 2>&1 | grep -- --version-script >/dev/null` || \
+ VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+ ;;
*)
NO_UNDEFINED_FLAGS="-Wl,--no-undefined"
VERSION_SCRIPT_FLAGS=-Wl,--version-script=

10
x11/gtk-vnc/patches/patch-gnulib_tests_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-gnulib_tests_Makefile_in,v 1.3 2009/10/21 15:20:23 jasper Exp $
$OpenBSD: patch-gnulib_tests_Makefile_in,v 1.4 2010/07/12 09:31:51 ajacoutot Exp $
Don't bother running these two useless (and failing) tests.
--- gnulib/tests/Makefile.in.orig Tue Oct 20 20:32:54 2009
+++ gnulib/tests/Makefile.in Wed Oct 21 14:00:07 2009
@@ -50,7 +50,7 @@ TESTS = test-alloca-opt$(EXEEXT) test-arpa_inet$(EXEEX
--- gnulib/tests/Makefile.in.orig Sun Jul 11 21:10:47 2010
+++ gnulib/tests/Makefile.in Mon Jul 12 08:26:38 2010
@@ -52,7 +52,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) \
@ -13,7 +13,7 @@ Don't bother running these two useless (and failing) tests.
noinst_PROGRAMS =
check_PROGRAMS = test-alloca-opt$(EXEEXT) test-arpa_inet$(EXEEXT) \
test-errno$(EXEEXT) test-getaddrinfo$(EXEEXT) \
@@ -600,8 +600,8 @@ EXTRA_DIST = test-alloca-opt.c test-arpa_inet.c test-e
@@ -674,8 +674,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 \

52
x11/gtk-vnc/patches/patch-plugin_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-plugin_Makefile_in,v 1.5 2009/10/21 15:20:23 jasper Exp $
--- plugin/Makefile.in.orig Tue Oct 20 20:32:54 2009
+++ plugin/Makefile.in Wed Oct 21 17:11:43 2009
@@ -489,7 +489,7 @@ target_alias = @target_alias@
$OpenBSD: patch-plugin_Makefile_in,v 1.6 2010/07/12 09:31:51 ajacoutot Exp $
--- plugin/Makefile.in.orig Sun Jul 11 21:10:47 2010
+++ plugin/Makefile.in Mon Jul 12 08:28:12 2010
@@ -544,7 +544,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -10,43 +10,27 @@ $OpenBSD: patch-plugin_Makefile_in,v 1.5 2009/10/21 15:20:23 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
@@ -503,7 +503,7 @@ top_srcdir = @top_srcdir@
@ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_CFLAGS = \
@ENABLE_PLUGIN_TRUE@ -I$(top_srcdir)/src @GTK_CFLAGS@ \
-@ENABLE_PLUGIN_TRUE@ @FIREFOX_PLUGIN_CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@
+@ENABLE_PLUGIN_TRUE@ @FIREFOX_PLUGIN_CFLAGS@ @WARNING_CFLAGS@
@ENABLE_PLUGIN_TRUE@EXTRA_DIST = README
@ENABLE_PLUGIN_TRUE@CLEANFILES = gtk-vnc-plugin.so
@@ -542,12 +542,12 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -598,7 +598,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4
$(am__aclocal_m4_deps):
install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+ test -z "$(plugindir)" || $(MKDIR_P) "$(plugindir)"
@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(plugindir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(plugindir)/$$f"; \
@@ -606,8 +606,8 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
else :; fi; \
done
done; \
test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(plugindir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(plugindir)"; \
}
@@ -555,8 +555,8 @@ uninstall-pluginLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(plugindir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(plugindir)/$$p"; \
done
clean-pluginLTLIBRARIES:
@@ -706,7 +706,7 @@ check: check-am
uninstall-pluginLTLIBRARIES:
@@ -781,7 +781,7 @@ check: check-am
@ENABLE_PLUGIN_FALSE@all-local:
all-am: Makefile $(LTLIBRARIES) all-local
installdirs:

12
x11/gtk-vnc/patches/patch-src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2010/06/25 17:18:21 steven Exp $
--- src/Makefile.in.orig Fri Jun 25 19:11:26 2010
+++ src/Makefile.in Fri Jun 25 19:11:38 2010
@@ -532,7 +532,7 @@ libgtk_vnc_1_0_la_CFLAGS = @GTK_CFLAGS@ @GNUTLS_CFLAGS
-DG_LOG_DOMAIN=\"gtk-vnc\" \
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib
-libgtk_vnc_1_0_la_LDFLAGS = -Wl, @LD_VERSION_SCRIPT_SUPPORT@ \
+libgtk_vnc_1_0_la_LDFLAGS = -Wl,@LD_VERSION_SCRIPT_SUPPORT@ \
-version-info 0:1:0 -no-undefined
gtk_vnc_includedir = $(includedir)/gtk-vnc-1.0/

14
x11/gtk-vnc/patches/patch-src_gvnc_c
View File

@ -1,14 +0,0 @@
$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)
+#if defined(__OpenBSD__)
+#define AI_ADDRCONFIG 0
+#endif
+
/* Main loop helper functions */
static gboolean g_io_wait_helper(GIOChannel *channel G_GNUC_UNUSED,
GIOCondition cond,

29
x11/gtk-vnc/pkg/PLIST-main
View File

@ -1,15 +1,35 @@
@comment $OpenBSD: PLIST-main,v 1.3 2009/10/21 15:20:23 jasper Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2010/07/12 09:31:51 ajacoutot Exp $
@pkgpath ${BASE_PKGPATH}
@bin bin/gvnccapture
@bin bin/gvncviewer
include/gtk-vnc-1.0/
include/gtk-vnc-1.0/vncdisplay.h
include/gtk-vnc-1.0/vncdisplayenums.h
include/gtk-vnc-1.0/vncgrabsequence.h
include/gtk-vnc-1.0/vncimageframebuffer.h
include/gvnc-1.0/
include/gvnc-1.0/vncbaseframebuffer.h
include/gvnc-1.0/vnccolormap.h
include/gvnc-1.0/vncconnection.h
include/gvnc-1.0/vncconnectionenums.h
include/gvnc-1.0/vnccursor.h
include/gvnc-1.0/vncframebuffer.h
include/gvnc-1.0/vncpixelformat.h
include/gvnc-1.0/vncutil.h
lib/libgtk-vnc-1.0.a
lib/libgtk-vnc-1.0.la
@lib lib/libgtk-vnc-1.0.so.${LIBgtk-vnc-1.0_VERSION}
lib/libgvnc-1.0.a
lib/libgvnc-1.0.la
@lib lib/libgvnc-1.0.so.${LIBgvnc-1.0_VERSION}
lib/pkgconfig/gtk-vnc-1.0.pc
lib/pkgconfig/gvnc-1.0.pc
lib/python${MODPY_VERSION}/site-packages/gtkvnc.a
lib/python${MODPY_VERSION}/site-packages/gtkvnc.la
lib/python${MODPY_VERSION}/site-packages/gtkvnc.so
@man man/man1/gvnccapture.1
share/locale/ca/LC_MESSAGES/gtk-vnc.mo
share/locale/da/LC_MESSAGES/gtk-vnc.mo
share/locale/de/LC_MESSAGES/gtk-vnc.mo
share/locale/el/LC_MESSAGES/gtk-vnc.mo
share/locale/en_GB/LC_MESSAGES/gtk-vnc.mo
@ -19,7 +39,14 @@ share/locale/fr/LC_MESSAGES/gtk-vnc.mo
share/locale/gl/LC_MESSAGES/gtk-vnc.mo
share/locale/hu/LC_MESSAGES/gtk-vnc.mo
share/locale/it/LC_MESSAGES/gtk-vnc.mo
share/locale/ja/LC_MESSAGES/gtk-vnc.mo
share/locale/pa/LC_MESSAGES/gtk-vnc.mo
share/locale/pl/LC_MESSAGES/gtk-vnc.mo
share/locale/pt/LC_MESSAGES/gtk-vnc.mo
share/locale/pt_BR/LC_MESSAGES/gtk-vnc.mo
share/locale/ru/LC_MESSAGES/gtk-vnc.mo
share/locale/sl/LC_MESSAGES/gtk-vnc.mo
share/locale/sv/LC_MESSAGES/gtk-vnc.mo
share/locale/zh_CN/LC_MESSAGES/gtk-vnc.mo
share/locale/zh_HK/LC_MESSAGES/gtk-vnc.mo
share/locale/zh_TW/LC_MESSAGES/gtk-vnc.mo