Attachment 154642 Details for Bug 198721 – corrected patch after check by portlint

[patch] corrected patch after check by portlint

tigervnc-1.4.3.diff (text/plain), 4.75 KB, created by Georgy Lukyanchenko on 2015-03-21 22:05:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Georgy Lukyanchenko

Created: 2015-03-21 22:05:07 UTC

Size: 4.75 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 381867)
>+++ Makefile	(working copy)
>@@ -2,12 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	tigervnc
>-PORTVERSION=	1.3.1
>-PORTREVISION=	9
>+PORTVERSION=	1.4.3
> CATEGORIES=	net x11-servers
>-MASTER_SITES=	SF:tigervnc
>-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
>-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:tigervnc
> 
> MAINTAINER=	meta+ports@vmeta.jp
> COMMENT=	High-performance, platform-neutral implementation of VNC
>@@ -26,6 +22,10 @@
> 		tightvnc-[0-9]* \
> 		vnc-[0-9]*
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT?=	TigerVNC
>+GH_TAGNAME?=	v$(DISTVERSION)
>+GH_COMMIT?=	ac9622c
> USES=		cmake gmake libtool pkgconfig python
> USE_GL=		gl
> USE_AUTOTOOLS=	autoconf:env automake:env libtoolize:env
>Index: distinfo
>===================================================================
>--- distinfo	(revision 381867)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (tigervnc-1.3.1.tar.gz) = 628622316eefa5d4f348f00a280a513569bfae3eae6a20d72e2990654d12274e
>-SIZE (tigervnc-1.3.1.tar.gz) = 6888105
>+SHA256 (tigervnc-1.4.3.tar.gz) = 1ccdc7b5f522a70b4c58e85f95158e13bb49507d76e299f44160455bec77e961
>+SIZE (tigervnc-1.4.3.tar.gz) = 1372853
>Index: files/patch-hw-vnc-off-by-one-error
>===================================================================
>--- files/patch-hw-vnc-off-by-one-error	(revision 381867)
>+++ files/patch-hw-vnc-off-by-one-error	(working copy)
>@@ -1,65 +0,0 @@
>---- unix/xserver/hw/vnc/vncHooks.cc.orig	2013-07-01 12:41:24.000000000 +0000
>-+++ unix/xserver/hw/vnc/vncHooks.cc	2013-07-20 13:38:14.424240970 +0000
>-@@ -119,7 +119,7 @@
>- 
>- // screen functions
>- 
>--#if XORG < 112
>-+#if XORG <= 112
>- static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
>- #else
>- static Bool vncHooksCloseScreen(ScreenPtr pScreen);
>-@@ -140,7 +140,7 @@
>- 				  DeviceIntPtr pDev,
>- #endif
>- 				  ScreenPtr pScreen, CursorPtr cursor);
>--#if XORG < 112
>-+#if XORG <= 112
>- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
>-                                  pointer pReadmask);
>- #else
>-@@ -367,7 +367,7 @@
>- // CloseScreen - unwrap the screen functions and call the original CloseScreen
>- // function
>- 
>--#if XORG < 112
>-+#if XORG <= 112
>- static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
>- #else
>- static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
>-@@ -405,7 +405,7 @@
>- 
>-   DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
>- 
>--#if XORG < 112
>-+#if XORG <= 112
>-   return (*pScreen->CloseScreen)(i, pScreen);
>- #else
>-   return (*pScreen->CloseScreen)(pScreen);
>-@@ -574,7 +574,7 @@
>- // BlockHandler - ignore any changes during the block handler - it's likely
>- // these are just drawing the cursor.
>- 
>--#if XORG < 112
>-+#if XORG <= 112
>- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
>-                                  pointer pReadmask)
>- #else
>-@@ -582,7 +582,7 @@
>-                                  pointer pReadmask)
>- #endif
>- {
>--#if XORG < 112
>-+#if XORG <= 112
>-   SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
>- #else
>-   SCREEN_UNWRAP(pScreen_, BlockHandler);
>-@@ -590,7 +590,7 @@
>- 
>-   vncHooksScreen->desktop->ignoreHooks(true);
>- 
>--#if XORG < 112
>-+#if XORG <= 112
>-   (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
>- #else
>-   (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
>Index: files/patch-vncviewer-always-built
>===================================================================
>--- files/patch-vncviewer-always-built	(revision 381867)
>+++ files/patch-vncviewer-always-built	(working copy)
>@@ -1,19 +0,0 @@
>-Index: CMakeLists.txt
>-===================================================================
>---- CMakeLists.txt	(revision 5159)
>-+++ CMakeLists.txt	(working copy)
>-@@ -390,9 +390,12 @@
>-   add_subdirectory(po)
>- endif()
>- 
>--add_subdirectory(vncviewer)
>-+option(BUILD_VIEWER "Build TigerVNC viewer" ON)
>-+if(BUILD_VIEWER)
>-+  add_subdirectory(vncviewer)
>-+  add_subdirectory(media)
>-+endif()
>- 
>--add_subdirectory(media)
>- 
>- include(cmake/BuildPackages.cmake)
>- 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 381867)
>+++ pkg-plist	(working copy)
>@@ -17,6 +17,12 @@
> %%NLS%%share/locale/ru/LC_MESSAGES/tigervnc.mo
> %%NLS%%share/locale/sk/LC_MESSAGES/tigervnc.mo
> %%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo
>+%%NLS%%share/locale/es/LC_MESSAGES/tigervnc.mo
>+%%NLS%%share/locale/it/LC_MESSAGES/tigervnc.mo
>+%%NLS%%share/locale/nl/LC_MESSAGES/tigervnc.mo
>+%%NLS%%share/locale/pt_BR/LC_MESSAGES/tigervnc.mo
>+%%NLS%%share/locale/tr/LC_MESSAGES/tigervnc.mo
>+%%NLS%%share/locale/uk/LC_MESSAGES/tigervnc.mo
> %%PORTDOCS%%%%DOCSDIR%%/README.txt
> %%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
> %%VIEWER%%share/icons/hicolor/16x16/apps/tigervnc.png

Actions: View | Diff

Attachments on bug 198721: 154641 | 154642 | 154686 | 154690