Attachment 191796 Details for Bug 226895 – updated patch, v2

[patch] updated patch, v2

gtk-vnc-072_2.diff (text/plain), 5.09 KB, created by Roman Bogorodskiy on 2018-03-25 06:53:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Bogorodskiy

Created: 2018-03-25 06:53:07 UTC

Size: 5.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 465451)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gtk-vnc
>-PORTVERSION=	0.7.1
>+PORTVERSION=	0.7.2
> CATEGORIES=	net gnome
> MASTER_SITES=	GNOME
> 
>@@ -12,19 +12,18 @@
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 
>-BUILD_DEPENDS=	vapigen:lang/vala
> LIB_DEPENDS=	libgnutls.so:security/gnutls \
> 		libgcrypt.so:security/libgcrypt \
> 		libgpg-error.so:security/libgpg-error \
> 		libsasl2.so:security/cyrus-sasl2
> 
>-USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build
> USES=		gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
>+USE_GNOME=	cairo gdkpixbuf2 intltool introspection:build
> USE_XORG=	x11
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-introspection \
>-		--disable-plugin --without-python
>+		--without-python
> INSTALL_TARGET=	install-strip
> 
> OPTIONS_DEFINE=	PULSEAUDIO
>@@ -31,7 +30,22 @@
> OPTIONS_DEFAULT=PULSEAUDIO
> OPTIONS_SUB=	yes
> 
>-PULSEAUDIO_DESC=	use PulseAudio for audio playback
>+FLAVORS=	default gtk2
>+gtk2_PKGNAMESUFFIX=	-gtk2
>+
>+.if ${FLAVOR:U} == gtk2
>+PLIST_SUB+=	LIBGTKVNCVER="1.0" VALA="@comment " LIBGTKVNCSOVER="0.0.1"
>+USE_GNOME+=	gtk20
>+LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2
>+CONFIGURE_ARGS+=	--with-gtk=2.0
>+.else
>+PLIST_SUB+=	LIBGTKVNCVER="2.0" VALA="" LIBGTKVNCSOVER="0.0.2"
>+BUILD_DEPENDS+=	vapigen:lang/vala
>+USE_GNOME+=	gtk30
>+CONFIGURE_ARGS+=	--with-gtk=3.0
>+.endif
>+
> PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
> PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 465451)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1495443004
>-SHA256 (gtk-vnc-0.7.1.tar.xz) = f34baa696615ef67666e8465b4d0ac563355e999a77d2cc42ad4625a24f7aab1
>-SIZE (gtk-vnc-0.7.1.tar.xz) = 444380
>+TIMESTAMP = 1521899384
>+SHA256 (gtk-vnc-0.7.2.tar.xz) = f893f32b1ef6d09dd23cda39b8a2567be7c2aebda58026288e1362f042e20808
>+SIZE (gtk-vnc-0.7.2.tar.xz) = 447088
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 465451)
>+++ pkg-plist	(working copy)
>@@ -1,9 +1,9 @@
> bin/gvnccapture
>-include/gtk-vnc-2.0/gtk-vnc.h
>-include/gtk-vnc-2.0/vncdisplay.h
>-include/gtk-vnc-2.0/vncdisplayenums.h
>-include/gtk-vnc-2.0/vncgrabsequence.h
>-include/gtk-vnc-2.0/vncimageframebuffer.h
>+include/gtk-vnc-%%LIBGTKVNCVER%%/gtk-vnc.h
>+include/gtk-vnc-%%LIBGTKVNCVER%%/vncdisplay.h
>+include/gtk-vnc-%%LIBGTKVNCVER%%/vncdisplayenums.h
>+include/gtk-vnc-%%LIBGTKVNCVER%%/vncgrabsequence.h
>+include/gtk-vnc-%%LIBGTKVNCVER%%/vncimageframebuffer.h
> include/gvnc-1.0/gvnc.h
> include/gvnc-1.0/vncaudio.h
> include/gvnc-1.0/vncaudioformat.h
>@@ -21,10 +21,10 @@
> %%PULSEAUDIO%%include/gvncpulse-1.0/vncaudiopulse.h
> lib/girepository-1.0/GVnc-1.0.typelib
> %%PULSEAUDIO%%lib/girepository-1.0/GVncPulse-1.0.typelib
>-lib/girepository-1.0/GtkVnc-2.0.typelib
>-lib/libgtk-vnc-2.0.so
>-lib/libgtk-vnc-2.0.so.0
>-lib/libgtk-vnc-2.0.so.0.0.2
>+lib/girepository-1.0/GtkVnc-%%LIBGTKVNCVER%%.typelib
>+lib/libgtk-vnc-%%LIBGTKVNCVER%%.so
>+lib/libgtk-vnc-%%LIBGTKVNCVER%%.so.0
>+lib/libgtk-vnc-%%LIBGTKVNCVER%%.so.%%LIBGTKVNCSOVER%%
> lib/libgvnc-1.0.so
> lib/libgvnc-1.0.so.0
> lib/libgvnc-1.0.so.0.0.1
>@@ -31,13 +31,13 @@
> %%PULSEAUDIO%%lib/libgvncpulse-1.0.so
> %%PULSEAUDIO%%lib/libgvncpulse-1.0.so.0
> %%PULSEAUDIO%%lib/libgvncpulse-1.0.so.0.0.1
>-libdata/pkgconfig/gtk-vnc-2.0.pc
>+libdata/pkgconfig/gtk-vnc-%%LIBGTKVNCVER%%.pc
> libdata/pkgconfig/gvnc-1.0.pc
> %%PULSEAUDIO%%libdata/pkgconfig/gvncpulse-1.0.pc
> man/man1/gvnccapture.1.gz
> share/gir-1.0/GVnc-1.0.gir
> %%PULSEAUDIO%%share/gir-1.0/GVncPulse-1.0.gir
>-share/gir-1.0/GtkVnc-2.0.gir
>+share/gir-1.0/GtkVnc-%%LIBGTKVNCVER%%.gir
> share/locale/bs/LC_MESSAGES/gtk-vnc.mo
> share/locale/ca/LC_MESSAGES/gtk-vnc.mo
> share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo
>@@ -55,6 +55,7 @@
> share/locale/gl/LC_MESSAGES/gtk-vnc.mo
> share/locale/guc/LC_MESSAGES/gtk-vnc.mo
> share/locale/he/LC_MESSAGES/gtk-vnc.mo
>+share/locale/hr/LC_MESSAGES/gtk-vnc.mo
> share/locale/hu/LC_MESSAGES/gtk-vnc.mo
> share/locale/id/LC_MESSAGES/gtk-vnc.mo
> share/locale/it/LC_MESSAGES/gtk-vnc.mo
>@@ -64,6 +65,7 @@
> share/locale/lv/LC_MESSAGES/gtk-vnc.mo
> share/locale/nb/LC_MESSAGES/gtk-vnc.mo
> share/locale/nds/LC_MESSAGES/gtk-vnc.mo
>+share/locale/nl/LC_MESSAGES/gtk-vnc.mo
> share/locale/oc/LC_MESSAGES/gtk-vnc.mo
> share/locale/pa/LC_MESSAGES/gtk-vnc.mo
> share/locale/pl/LC_MESSAGES/gtk-vnc.mo
>@@ -84,9 +86,9 @@
> 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
>-share/vala/vapi/gtk-vnc-2.0.deps
>-share/vala/vapi/gtk-vnc-2.0.vapi
>-share/vala/vapi/gvnc-1.0.deps
>-share/vala/vapi/gvnc-1.0.vapi
>-%%PULSEAUDIO%%share/vala/vapi/gvncpulse-1.0.deps
>-%%PULSEAUDIO%%share/vala/vapi/gvncpulse-1.0.vapi
>+%%VALA%%share/vala/vapi/gtk-vnc-2.0.deps
>+%%VALA%%share/vala/vapi/gtk-vnc-2.0.vapi
>+%%VALA%%share/vala/vapi/gvnc-1.0.deps
>+%%VALA%%share/vala/vapi/gvnc-1.0.vapi
>+%%VALA%%%%PULSEAUDIO%%share/vala/vapi/gvncpulse-1.0.deps
>+%%VALA%%%%PULSEAUDIO%%share/vala/vapi/gvncpulse-1.0.vapi

Actions: View | Diff

Attachments on bug 226895: 191788 | 191796