Mon Aug 20 11:34:59 2012 UTC ()
Update to 0.5.1

* Convert to use gtk2 and gtk3 (latest vinagre uses gtk3,
  and python binding requires gtk2)
* Set python option as deafult
* Add pulseaudio option (functionality is not tested)
* plugin option is broken like before

Changelog:

July 12, 2012: Release 0.5.1
============================

New features:

 o New API for connecting to a GSocketAddress * object
 o New API to allow specification of a hostname with
   a pre-opened file descriptor
 o Support for UNIX domain sockets in gvncviewer demo
 o More translations

Bug fixes:

 o Fix building with newer glibc-headers and -O0
 o Fix GIR building by linking against libgvnc
   from builddir
 o Fix deprecation warnings when building against
   glib >= 2.32
 o Switch to using mingw64 toolchain for Win32 builds
 o Fix introspection of key grab APIs
 o Ensure debugging works with GLib >= 2.32
 o Allow explicit control over pulseaudio building
 o Add check for Perl  Text::CSV when building from GIT
 o Fix POD syntax in gvnccapture man page
 o Reduce excessive stack usage in vncconnection.c

Dec 21, 2011: Release 0.5.0
===========================

New features:

 o QEMU audio extension support

Bug fixes:

 o Avoid deprecated GNUTLS functions
 o Allow access to VncConnection object inside VncDisplay
 o Don't override PKG_CONFIG_PATH when building GIR files
 o Death to all TABs
 o General code style/indentation cleanup
 o Fix memory leak in keymap code
 o Fix mapping of shift key in Windows

Nov 10, 2011: Release 0.4.4
===========================

New features:

 o Vala bindings

Bug fixes:

 o Missing OS-X keymapping for the letter 'A'
 o Update Turkish/Esperanto/Korean/Slovak translations
 o Mapping for Left Control / Alt keys
 o Fix leak of string list in grab sequence string
 o Fix introspection for vnc_display_get_pixbuf
 o Fix GTK3 build on Mingw32
 o Improved log messages for TLS auth subtypes

Feb 18, 2011: Release 0.4.3
===========================

New features:

 o None

Bug fixes:

 o Fix crash in pointer motion event handler
 o Fix crash in vnc_display_get_pixbuf
 o Fix crash in TLS cleanup code
 o Fix frambuffer boundary checks
 o Improve drawing performance with server side pixmap
 o Fix performance degradation due to leaked GSource
 o Fix setting of 'shared' connection flag
 o Make pointer warp boundary detection more robust
 o Adapt keymap code to build with GDK3 multiple displays
 o Remove use of gdk_drawable calls to fix GTK3

Code cleanup:

 o Remove need for Text::CSV perl module at build time

Nov  3, 2010: Release 0.4.2
===========================

New features:

 o OS-X VNC authentiction scheme
 o Add API to query library version

Bug fixes:

 o Disable extended key events if display keymap
   cannot be determined
 o Rewritten keymap code to work on non-Xorg
   servers and native OS-X/Win32 GTK backends.
 o Many more language translations
 o Strict bounds checking on all framebuffer updates
 o Fixed parameter for vnc-server-cut-text signal
 o Fixed build with latest GTK3 development snapshot

Code cleanup:

 o Switched over to GIO for socket connections
 o Removed all use of GNULIB now GIO handles all
   portability issues with sockets.
 o Mandate use of Cairo for all drawing, removing
   any use of GdkPixmap, GdkImage, GdkBitmap.

Jul 14, 2010: Release 0.4.1
===========================

Bug fixes:

 o Fix test suite execution
 o Ensure builds against GTK3 get a separate library soname,
   pkg-config file and include directory to allow parallel
   install with GTK2 builds.

Jul 11, 2010: Release 0.4.0
===========================

Bug fixes:

 o Fix protocol greeting so wireshark detects stream
 o Fix build with GSEAL
 o Try next DNS address after any connect failure
 o Plugin build with newer mozilla
 o Fix linkage to libgpg-error
 o Fix linker flags on solaris
 o Fix gcrypt threading callbacks
 o Fix multiple memory leaks
 o Remove use of PATH_MAX to fix Hurd

New features:

 o Refactored gvnc module to provide a full GObject
   for interacting with the RFB protcol.
 o Create a libgvnc.so for non-GTK related APIs for
   dealing with RFB protcol
 o Add gvnccapture command line tool for screenshot
   capture
 o Many updated translations


(ryoon)
diff -r1.21 -r1.22 pkgsrc/net/gtk-vnc/Makefile
diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/PLIST
diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/distinfo
diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/options.mk
diff -r1.14 -r1.15 pkgsrc/net/gtk-vnc/buildlink3.mk
diff -r1.1.1.1 -r0 pkgsrc/net/gtk-vnc/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/net/gtk-vnc/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/net/gtk-vnc/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/net/gtk-vnc/patches/patch-af
diff -r1.2 -r1.3 pkgsrc/net/gtk-vnc/patches/patch-ae

cvs diff -r1.21 -r1.22 pkgsrc/net/gtk-vnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/Makefile 2012/07/02 19:23:29 1.21
+++ pkgsrc/net/gtk-vnc/Makefile 2012/08/20 11:34:58 1.22
@@ -1,38 +1,60 @@ @@ -1,38 +1,60 @@
1# $NetBSD: Makefile,v 1.21 2012/07/02 19:23:29 drochner Exp $ 1# $NetBSD: Makefile,v 1.22 2012/08/20 11:34:58 ryoon Exp $
2# 2#
3 3
4DISTNAME= gtk-vnc-0.3.10 4DISTNAME= gtk-vnc-0.5.1
5PKGREVISION= 15 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-vnc/0.3/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-vnc/0.5/}
 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://live.gnome.org/gtk-vnc 10HOMEPAGE= http://live.gnome.org/gtk-vnc
11COMMENT= VNC viewer widget for GTK 11COMMENT= VNC viewer widget for GTK
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config msgfmt intltool 17USE_TOOLS+= gmake intltool msgfmt pkg-config
18 18
19PKGCONFIG_OVERRIDE+= gtk-vnc-1.0.pc.in 19PKGCONFIG_OVERRIDE+= gtk-vnc-1.0.pc.in
 20PKGCONFIG_OVERRIDE+= gtk-vnc-2.0.pc.in
 21PKGCONFIG_OVERRIDE+= gvnc-1.0.pc.in
 22PKGCONFIG_OVERRIDE+= gvncpulse-1.0.pc.in
20PY_PATCHPLIST= yes 23PY_PATCHPLIST= yes
21 24
22CONFIGURE_ARGS+= --with-coroutine=gthread 25CONFIGURE_ARGS+= --with-coroutine=gthread
23 26
24.include "options.mk" 27.include "options.mk"
25 28
 29# idea from arch linux PKGBUILD
 30CONFIGURE_SCRIPT= ../configure
 31BUILD_DIRS= gtk2-build gtk3-build
 32INSTALL_DIRS= gtk2-build gtk3-build
 33
 34pre-configure:
 35 ${RM} -rf ${WRKSRC}/gtk2-build ${WRKSRC}/gtk3-build
 36 ${MKDIR} ${WRKSRC}/gtk2-build ${WRKSRC}/gtk3-build
 37
 38do-configure:
 39 cd ${WRKSRC}/gtk2-build \
 40 && env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
 41 --with-gtk=2.0
 42 cd ${WRKSRC}/gtk3-build \
 43 && env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
 44 --with-gtk=3.0
 45
26#VIEW_REQUIRED=0.6.0 46#VIEW_REQUIRED=0.6.0
27#libview 47#libview
28 48
29.include "../../devel/glib2/buildlink3.mk" 49.include "../../devel/glib2/buildlink3.mk"
30.include "../../devel/zlib/buildlink3.mk" 50.include "../../devel/zlib/buildlink3.mk"
31# libview is only used for an example which is not installed 51# libview is only used for an example which is not installed
32#.include "../../devel/libview/buildlink3.mk" 52#.include "../../devel/libview/buildlink3.mk"
33BUILDLINK_API_DEPENDS.gnutls+= gnutls>=1.4.0 53BUILDLINK_API_DEPENDS.gnutls+= gnutls>=1.4.0
34.include "../../security/gnutls/buildlink3.mk" 54.include "../../security/gnutls/buildlink3.mk"
35.include "../../security/libgcrypt/buildlink3.mk" 55.include "../../security/libgcrypt/buildlink3.mk"
36BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 56BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.0
37.include "../../x11/gtk2/buildlink3.mk" 57.include "../../x11/gtk2/buildlink3.mk"
 58BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.0.0
 59.include "../../x11/gtk3/buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/PLIST (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/PLIST 2009/09/14 10:07:03 1.3
+++ pkgsrc/net/gtk-vnc/PLIST 2012/08/20 11:34:58 1.4
@@ -1,6 +1,73 @@ @@ -1,6 +1,73 @@
1@comment $NetBSD: PLIST,v 1.3 2009/09/14 10:07:03 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.4 2012/08/20 11:34:58 ryoon Exp $
 2bin/gvnccapture
 3include/gtk-vnc-1.0/gtk-vnc.h
2include/gtk-vnc-1.0/vncdisplay.h 4include/gtk-vnc-1.0/vncdisplay.h
3${PLIST.plugin}lib/netscape/plugins/gtk-vnc-plugin.so 5include/gtk-vnc-1.0/vncdisplayenums.h
 6include/gtk-vnc-1.0/vncgrabsequence.h
 7include/gtk-vnc-1.0/vncimageframebuffer.h
 8include/gtk-vnc-2.0/gtk-vnc.h
 9include/gtk-vnc-2.0/vncdisplay.h
 10include/gtk-vnc-2.0/vncdisplayenums.h
 11include/gtk-vnc-2.0/vncgrabsequence.h
 12include/gtk-vnc-2.0/vncimageframebuffer.h
 13include/gvnc-1.0/gvnc.h
 14include/gvnc-1.0/vncaudio.h
 15include/gvnc-1.0/vncaudioformat.h
 16include/gvnc-1.0/vncaudiosample.h
 17include/gvnc-1.0/vncbaseaudio.h
 18include/gvnc-1.0/vncbaseframebuffer.h
 19include/gvnc-1.0/vnccolormap.h
 20include/gvnc-1.0/vncconnection.h
 21include/gvnc-1.0/vncconnectionenums.h
 22include/gvnc-1.0/vnccursor.h
 23include/gvnc-1.0/vncframebuffer.h
 24include/gvnc-1.0/vncpixelformat.h
 25include/gvnc-1.0/vncutil.h
 26${PLIST.pulseaudio}include/gvncpulse-1.0/gvncpulse.h
 27${PLIST.pulseaudio}include/gvncpulse-1.0/vncaudiopulse.h
4lib/libgtk-vnc-1.0.la 28lib/libgtk-vnc-1.0.la
 29lib/libgtk-vnc-2.0.la
 30lib/libgvnc-1.0.la
 31${PLIST.pulseaudio}lib/libgvncpulse-1.0.la
5lib/pkgconfig/gtk-vnc-1.0.pc 32lib/pkgconfig/gtk-vnc-1.0.pc
 33lib/pkgconfig/gtk-vnc-2.0.pc
 34lib/pkgconfig/gvnc-1.0.pc
 35${PLIST.pulseaudio}lib/pkgconfig/gvncpulse-1.0.pc
6${PLIST.python}${PYSITELIB}/gtkvnc.la 36${PLIST.python}${PYSITELIB}/gtkvnc.la
 37man/man1/gvnccapture.1
 38share/locale/ca/LC_MESSAGES/gtk-vnc.mo
 39share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo
 40share/locale/cs/LC_MESSAGES/gtk-vnc.mo
 41share/locale/da/LC_MESSAGES/gtk-vnc.mo
 42share/locale/de/LC_MESSAGES/gtk-vnc.mo
 43share/locale/el/LC_MESSAGES/gtk-vnc.mo
 44share/locale/en_GB/LC_MESSAGES/gtk-vnc.mo
 45share/locale/eo/LC_MESSAGES/gtk-vnc.mo
 46share/locale/es/LC_MESSAGES/gtk-vnc.mo
 47share/locale/eu/LC_MESSAGES/gtk-vnc.mo
 48share/locale/fr/LC_MESSAGES/gtk-vnc.mo
 49share/locale/gl/LC_MESSAGES/gtk-vnc.mo
 50share/locale/hu/LC_MESSAGES/gtk-vnc.mo
 51share/locale/id/LC_MESSAGES/gtk-vnc.mo
 52share/locale/it/LC_MESSAGES/gtk-vnc.mo
 53share/locale/ja/LC_MESSAGES/gtk-vnc.mo
 54share/locale/ko/LC_MESSAGES/gtk-vnc.mo
 55share/locale/lt/LC_MESSAGES/gtk-vnc.mo
 56share/locale/lv/LC_MESSAGES/gtk-vnc.mo
 57share/locale/nb/LC_MESSAGES/gtk-vnc.mo
 58share/locale/nds/LC_MESSAGES/gtk-vnc.mo
 59share/locale/pa/LC_MESSAGES/gtk-vnc.mo
 60share/locale/pl/LC_MESSAGES/gtk-vnc.mo
 61share/locale/pt/LC_MESSAGES/gtk-vnc.mo
 62share/locale/pt_BR/LC_MESSAGES/gtk-vnc.mo
 63share/locale/ro/LC_MESSAGES/gtk-vnc.mo
 64share/locale/ru/LC_MESSAGES/gtk-vnc.mo
 65share/locale/sk/LC_MESSAGES/gtk-vnc.mo
 66share/locale/sl/LC_MESSAGES/gtk-vnc.mo
 67share/locale/sv/LC_MESSAGES/gtk-vnc.mo
 68share/locale/th/LC_MESSAGES/gtk-vnc.mo
 69share/locale/tr/LC_MESSAGES/gtk-vnc.mo
 70share/locale/uk/LC_MESSAGES/gtk-vnc.mo
 71share/locale/zh_CN/LC_MESSAGES/gtk-vnc.mo
 72share/locale/zh_HK/LC_MESSAGES/gtk-vnc.mo
 73share/locale/zh_TW/LC_MESSAGES/gtk-vnc.mo

cvs diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/distinfo 2009/10/26 11:02:21 1.3
+++ pkgsrc/net/gtk-vnc/distinfo 2012/08/20 11:34:58 1.4
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
1$NetBSD: distinfo,v 1.3 2009/10/26 11:02:21 drochner Exp $ 1$NetBSD: distinfo,v 1.4 2012/08/20 11:34:58 ryoon Exp $
2 2
3SHA1 (gtk-vnc-0.3.10.tar.gz) = 40dfa4f5c28dee13db72b9173ecbe9f182817cee 3SHA1 (gtk-vnc-0.5.1.tar.xz) = b3266137d9cdd8bca740b84adde33b98db81f3d1
4RMD160 (gtk-vnc-0.3.10.tar.gz) = 5269505a826eb0c9ba78f2426fc71d8c629be025 4RMD160 (gtk-vnc-0.5.1.tar.xz) = 9b21f59911c4aeea70bd3171066956c65ad59b8e
5Size (gtk-vnc-0.3.10.tar.gz) = 604228 bytes 5Size (gtk-vnc-0.5.1.tar.xz) = 413652 bytes
6SHA1 (patch-aa) = e59cd2080d9d88d4d689f10ed15738aa3309dcf3 6SHA1 (patch-ab) = f59d1260533ed8c8e2932f6af416d8e5a6088650
7SHA1 (patch-ab) = e4e34a1f664de13a1c27c3c53eeed5b62d9f988c 7SHA1 (patch-ac) = 7d0adf79172e12c18016bacf8b3f5787689e7a35
8SHA1 (patch-ac) = 623da8d775c1065de0c396d1cbc2cf840adb73f3 8SHA1 (patch-ad) = f0a977570e4839e2753bcc0bea836596fdb7ddf3
9SHA1 (patch-ad) = a25d9b04656b6a4c98d399c6c201e7cb0b862195 9SHA1 (patch-ae) = 75b082408787267888d0f9ba5a6fcf7f953de13f
10SHA1 (patch-ae) = f3d1fe46974f46d421a5ea0cc87a2908a96b679f 10SHA1 (patch-af) = 2944c204dadf701aa4e13d591e25842a9705863b
11SHA1 (patch-af) = 7f72b9e16fd82880ab61e74835a55f616fc1aacc 

cvs diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/options.mk (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/options.mk 2010/01/21 17:05:59 1.3
+++ pkgsrc/net/gtk-vnc/options.mk 2012/08/20 11:34:58 1.4
@@ -1,30 +1,39 @@ @@ -1,30 +1,39 @@
1# $NetBSD: options.mk,v 1.3 2010/01/21 17:05:59 drochner Exp $ 1# $NetBSD: options.mk,v 1.4 2012/08/20 11:34:58 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-vnc 3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-vnc
4PKG_SUPPORTED_OPTIONS= python plugin vnc-sasl 4PKG_SUPPORTED_OPTIONS= python plugin vnc-sasl pulseaudio
5PKG_SUGGESTED_OPTIONS= vnc-sasl 5PKG_SUGGESTED_OPTIONS= python vnc-sasl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS= python 9PLIST_VARS= python
10.if !empty(PKG_OPTIONS:Mpython) 10.if !empty(PKG_OPTIONS:Mpython)
11.include "../../lang/python/extension.mk" 11.include "../../lang/python/extension.mk"
12.include "../../x11/py-gtk2/buildlink3.mk" 12.include "../../x11/py-gtk2/buildlink3.mk"
13USE_TOOLS+= gmake 
14PLIST.python= yes 13PLIST.python= yes
 14CONFIGURE_ARGS+= --with-python
15.else 15.else
16CONFIGURE_ARGS+= --with-python=no 16CONFIGURE_ARGS+= --without-python
17.endif 17.endif
18 18
19PLIST_VARS+= plugin 19PLIST_VARS+= plugin
20.if !empty(PKG_OPTIONS:Mplugin) 20.if !empty(PKG_OPTIONS:Mplugin)
21.include "../../devel/xulrunner/buildlink3.mk" 21.include "../../devel/xulrunner/buildlink3.mk"
22CONFIGURE_ARGS+= --enable-plugin=yes 22CONFIGURE_ARGS+= --enable-plugin=yes
23PLIST.plugin= yes 23PLIST.plugin= yes
24.endif 24.endif
25 25
26.if !empty(PKG_OPTIONS:Mvnc-sasl) 26.if !empty(PKG_OPTIONS:Mvnc-sasl)
27.include "../../security/cyrus-sasl/buildlink3.mk" 27.include "../../security/cyrus-sasl/buildlink3.mk"
28.else 28.else
29CONFIGURE_ARGS+= --without-sasl 29CONFIGURE_ARGS+= --without-sasl
30.endif 30.endif
 31
 32PLIST_VARS+= pulseaudio
 33.if !empty(PKG_OPTIONS:Mpulseaudio)
 34.include "../../audio/pulseaudio/buildlink3.mk"
 35CONFIGURE_ARGS+= --with-pulseaudio
 36PLIST.pulseaudio= yes
 37.else
 38CONFIGURE_ARGS+= --without-pulseaudio
 39.endif

cvs diff -r1.14 -r1.15 pkgsrc/net/gtk-vnc/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/buildlink3.mk 2012/05/07 01:53:52 1.14
+++ pkgsrc/net/gtk-vnc/buildlink3.mk 2012/08/20 11:34:58 1.15
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.14 2012/05/07 01:53:52 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.15 2012/08/20 11:34:58 ryoon Exp $
2 2
3BUILDLINK_TREE+= gtk-vnc 3BUILDLINK_TREE+= gtk-vnc
4 4
5.if !defined(GTK_VNC_BUILDLINK3_MK) 5.if !defined(GTK_VNC_BUILDLINK3_MK)
6GTK_VNC_BUILDLINK3_MK:= 6GTK_VNC_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gtk-vnc+= gtk-vnc>=0.3.7 8BUILDLINK_API_DEPENDS.gtk-vnc+= gtk-vnc>=0.5.1
9BUILDLINK_ABI_DEPENDS.gtk-vnc+= gtk-vnc>=0.3.10nb11 9BUILDLINK_ABI_DEPENDS.gtk-vnc+= gtk-vnc>=0.5.1
10BUILDLINK_PKGSRCDIR.gtk-vnc?= ../../net/gtk-vnc 10BUILDLINK_PKGSRCDIR.gtk-vnc?= ../../net/gtk-vnc
11 11
12pkgbase := gtk-vnc 12pkgbase := gtk-vnc
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14.if !empty(PKG_BUILD_OPTIONS.gtk-vnc:Mvnc-sasl) 14.if !empty(PKG_BUILD_OPTIONS.gtk-vnc:Mvnc-sasl)
15.include "../../security/cyrus-sasl/buildlink3.mk" 15.include "../../security/cyrus-sasl/buildlink3.mk"
16.endif 16.endif
17 17
18.include "../../devel/glib2/buildlink3.mk" 18.include "../../devel/glib2/buildlink3.mk"
19.include "../../devel/zlib/buildlink3.mk" 19.include "../../devel/zlib/buildlink3.mk"
20.include "../../security/gnutls/buildlink3.mk" 20.include "../../security/gnutls/buildlink3.mk"
21.include "../../x11/gtk2/buildlink3.mk" 21.include "../../x11/gtk3/buildlink3.mk"
22.endif # GTK_VNC_BUILDLINK3_MK 22.endif # GTK_VNC_BUILDLINK3_MK
23 23
24BUILDLINK_TREE+= -gtk-vnc 24BUILDLINK_TREE+= -gtk-vnc

File Deleted: pkgsrc/net/gtk-vnc/patches/Attic/patch-aa

cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/gtk-vnc/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/patches/patch-ab 2009/04/06 10:17:32 1.1.1.1
+++ pkgsrc/net/gtk-vnc/patches/patch-ab 2012/08/20 11:34:59 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ab,v 1.1.1.1 2009/04/06 10:17:32 wiz Exp $ 1$NetBSD: patch-ab,v 1.2 2012/08/20 11:34:59 ryoon Exp $
2 2
3--- src/coroutine_ucontext.c.orig 2008-09-05 12:32:16.000000000 +0000 3--- src/coroutine_ucontext.c.orig 2012-07-12 08:37:05.000000000 +0000
4+++ src/coroutine_ucontext.c 4+++ src/coroutine_ucontext.c
5@@ -14,6 +14,10 @@ 5@@ -26,6 +26,10 @@
6 #include <stdlib.h> 6 #include <stdlib.h>
7 #include "coroutine.h" 7 #include "coroutine.h"
8  8
9+#ifndef MAP_ANONYMOUS 9+#ifndef MAP_ANONYMOUS
10+#define MAP_ANONYMOUS MAP_ANON 10+#define MAP_ANONYMOUS MAP_ANON
11+#endif 11+#endif
12+ 12+
13 int coroutine_release(struct coroutine *co) 13 int coroutine_release(struct coroutine *co)
14 { 14 {
15 return cc_release(&co->cc); 15 return cc_release(&co->cc);

cvs diff -r1.3 -r1.4 pkgsrc/net/gtk-vnc/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/patches/Attic/patch-ac 2009/10/26 11:02:21 1.3
+++ pkgsrc/net/gtk-vnc/patches/Attic/patch-ac 2012/08/20 11:34:59 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.3 2009/10/26 11:02:21 drochner Exp $ 1$NetBSD: patch-ac,v 1.4 2012/08/20 11:34:59 ryoon Exp $
2 2
3--- plugin/Makefile.in.orig 2009-10-20 20:32:54.000000000 +0200 3--- plugin/Makefile.in.orig 2012-07-12 08:37:47.000000000 +0000
4+++ plugin/Makefile.in 4+++ plugin/Makefile.in
5@@ -489,7 +489,7 @@ target_alias = @target_alias@ 5@@ -336,7 +336,7 @@ target_alias = @target_alias@
6 top_build_prefix = @top_build_prefix@ 6 top_build_prefix = @top_build_prefix@
7 top_builddir = @top_builddir@ 7 top_builddir = @top_builddir@
8 top_srcdir = @top_srcdir@ 8 top_srcdir = @top_srcdir@
9-@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/mozilla/plugins 9-@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/mozilla/plugins
10+@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/netscape/plugins 10+@ENABLE_PLUGIN_TRUE@plugindir = $(libdir)/netscape/plugins
11 @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = gtk-vnc-plugin.la 11 @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = gtk-vnc-plugin.la
12 @ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_SOURCES = \ 12 @ENABLE_PLUGIN_TRUE@gtk_vnc_plugin_la_SOURCES = \
13 @ENABLE_PLUGIN_TRUE@ gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c 13 @ENABLE_PLUGIN_TRUE@ gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c

cvs diff -r1.1 -r1.2 pkgsrc/net/gtk-vnc/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/patches/Attic/patch-ad 2009/09/14 10:07:04 1.1
+++ pkgsrc/net/gtk-vnc/patches/Attic/patch-ad 2012/08/20 11:34:59 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ad,v 1.1 2009/09/14 10:07:04 tnn Exp $ 1$NetBSD: patch-ad,v 1.2 2012/08/20 11:34:59 ryoon Exp $
2 2
3--- src/npupp.h.orig 2009-09-14 11:50:07.000000000 +0200 3--- src/npupp.h.orig 2012-08-18 14:28:53.000000000 +0000
4+++ src/npupp.h 4+++ src/npupp.h
5@@ -0,0 +1,1292 @@ 5@@ -0,0 +1,1292 @@
6+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 6+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
7+/* ***** BEGIN LICENSE BLOCK ***** 7+/* ***** BEGIN LICENSE BLOCK *****
8+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 8+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
9+ * 9+ *
10+ * The contents of this file are subject to the Netscape Public License 10+ * The contents of this file are subject to the Netscape Public License
11+ * Version 1.1 (the "License"); you may not use this file except in 11+ * Version 1.1 (the "License"); you may not use this file except in
12+ * compliance with the License. You may obtain a copy of the License at 12+ * compliance with the License. You may obtain a copy of the License at
13+ * http://www.mozilla.org/NPL/ 13+ * http://www.mozilla.org/NPL/
14+ * 14+ *
15+ * Software distributed under the License is distributed on an "AS IS" basis, 15+ * Software distributed under the License is distributed on an "AS IS" basis,
16+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 16+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

cvs diff -r1.1 -r1.2 pkgsrc/net/gtk-vnc/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/patches/Attic/patch-af 2009/09/14 10:07:04 1.1
+++ pkgsrc/net/gtk-vnc/patches/Attic/patch-af 2012/08/20 11:34:59 1.2
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1$NetBSD: patch-af,v 1.1 2009/09/14 10:07:04 tnn Exp $ 1$NetBSD: patch-af,v 1.2 2012/08/20 11:34:59 ryoon Exp $
2 2
3--- plugin/npunix.c.orig 2008-12-07 20:35:14.000000000 +0100 3--- plugin/npunix.c.orig 2012-07-12 08:37:05.000000000 +0000
4+++ plugin/npunix.c 4+++ plugin/npunix.c
5@@ -241,6 +241,7 @@ NPN_ForceRedraw(NPP instance) 5@@ -241,6 +241,7 @@ NPN_ForceRedraw(NPP instance)
6 CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance); 6 CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance);
7 } 7 }
8  8
9+#if 0 9+#if 0
10 void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled) 10 void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
11 { 11 {
12 CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate, 12 CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate,
13@@ -252,6 +253,7 @@ void NPN_PopPopupsEnabledState(NPP insta 13@@ -252,7 +253,7 @@ void NPN_PopPopupsEnabledState(NPP insta
14 CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate, 14 CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate,
15 instance); 15 instance);
16 } 16 }
 17-
17+#endif 18+#endif
18  19
19  20
20  21 /***********************************************************************
21@@ -488,8 +490,10 @@ NP_Initialize(NPNetscapeFuncs* nsTable,  22@@ -488,8 +489,10 @@ NP_Initialize(NPNetscapeFuncs* nsTable,
22 #endif 23 #endif
23 gNetscapeFuncs.getvalue = nsTable->getvalue; 24 gNetscapeFuncs.getvalue = nsTable->getvalue;
24 gNetscapeFuncs.setvalue = nsTable->setvalue; 25 gNetscapeFuncs.setvalue = nsTable->setvalue;
25+#if 0 26+#if 0
26 gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate; 27 gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate;
27 gNetscapeFuncs.poppopupsenabledstate = nsTable->poppopupsenabledstate; 28 gNetscapeFuncs.poppopupsenabledstate = nsTable->poppopupsenabledstate;
28+#endif 29+#endif
29  30
30 /* 31 /*
31 * Set up the plugin function table that Netscape will use to 32 * Set up the plugin function table that Netscape will use to

cvs diff -r1.2 -r1.3 pkgsrc/net/gtk-vnc/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/gtk-vnc/patches/patch-ae 2009/10/26 11:02:21 1.2
+++ pkgsrc/net/gtk-vnc/patches/patch-ae 2012/08/20 11:34:59 1.3
@@ -1,36 +1,22 @@ @@ -1,36 +1,22 @@
1$NetBSD: patch-ae,v 1.2 2009/10/26 11:02:21 drochner Exp $ 1$NetBSD: patch-ae,v 1.3 2012/08/20 11:34:59 ryoon Exp $
2 2
3--- configure.orig 2009-10-20 20:32:57.000000000 +0200 3--- configure.orig 2012-07-12 08:37:45.000000000 +0000
4+++ configure 4+++ configure
5@@ -27598,12 +27598,12 @@ if test -n "$PKG_CONFIG"; then 5@@ -15496,7 +15496,7 @@ fi
6 pkg_cv_NSPR_CFLAGS="$NSPR_CFLAGS" 6 HAVE_PULSEAUDIO=no
7 else 7 if test "x$with_pulseaudio" != "xno"; then
8 if test -n "$PKG_CONFIG" && \ 8 PULSEAUDIO_MODULES=libpulse-simple
9- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr >= \$NSPR_REQUIRED\"") >&5 9- if test "x$with_pulseaudio" == "xyes"; then
10- ($PKG_CONFIG --exists --print-errors "nspr >= $NSPR_REQUIRED") 2>&5 10+ if test "x$with_pulseaudio" = "xyes"; then
11+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$NSPR_REQUIRED\"") >&5 11
12+ ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $NSPR_REQUIRED") 2>&5 12 pkg_failed=no
13 ac_status=$? 13 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSEAUDIO" >&5
14 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 14@@ -17158,7 +17158,7 @@ fi
15 (exit $ac_status); }; then 15
16- pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_REQUIRED" 2>/dev/null` 16
17+ pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $NSPR_REQUIRED" 2>/dev/null` 17 if test "x$VAPIGEN" != "xno"; then
18 else 18- if test "x$enable_vala" == "xcheck" ; then
19 pkg_failed=yes 19+ if test "x$enable_vala" = "xcheck" ; then
20 fi 20 enable_vala=yes
21@@ -27616,12 +27616,12 @@ if test -n "$PKG_CONFIG"; then 21
22 pkg_cv_NSPR_LIBS="$NSPR_LIBS" 22 fi
23 else 
24 if test -n "$PKG_CONFIG" && \ 
25- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nspr >= \$NSPR_REQUIRED\"") >&5 
26- ($PKG_CONFIG --exists --print-errors "nspr >= $NSPR_REQUIRED") 2>&5 
27+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$NSPR_REQUIRED\"") >&5 
28+ ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $NSPR_REQUIRED") 2>&5 
29 ac_status=$? 
30 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 
31 (exit $ac_status); }; then 
32- pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_REQUIRED" 2>/dev/null` 
33+ pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $NSPR_REQUIRED" 2>/dev/null` 
34 else 
35 pkg_failed=yes 
36 fi