Attachment 182933 Details for Bug 219566 – patch2

[patch] patch2

patch-tigervnc-1.8.0-portlint.txt (text/plain), 2.98 KB, created by Koichiro Iwao on 2017-05-26 13:58:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koichiro Iwao

Created: 2017-05-26 13:58:37 UTC

Size: 2.98 KB

patch

obsolete

>diff --git net/tigervnc/Makefile net/tigervnc/Makefile
>index d6b7564..45fdcbe 100644
>--- net/tigervnc/Makefile
>+++ net/tigervnc/Makefile
>@@ -17,6 +17,9 @@ BUILD_DEPENDS=	${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dr
> 		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util \
> 		${LOCALBASE}/include/FL/Fl.H:x11-toolkits/fltk \
> 		bash:shells/bash
>+LIB_DEPENDS=	libunwind.so:devel/libunwind \
>+		libxshmfence.so:x11/libxshmfence \
>+		libfontconfig.so:x11-fonts/fontconfig
> # almost equivalent to x11-servers/xorg-server's
> RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
> 		xkbcomp:x11/xkbcomp
>@@ -38,10 +41,6 @@ USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto
> 		xdmcp xext xextproto xfont xkbfile xorg-macros xproto xrandr xrender \
> 		xtrans xtst
> 
>-LIB_DEPENDS=	libunwind.so:devel/libunwind \
>-		libxshmfence.so:x11/libxshmfence \
>-		libfontconfig.so:x11-fonts/fontconfig
>-
> CFLAGS+=	-fPIC
> 
> OPTIONS_DEFINE=		GNUTLS NLS PAM VIEWER DOCS
>diff --git net/tigervnc/files/patch-CMakeLists.txt net/tigervnc/files/patch-CMakeLists.txt
>index c85cb06..a12ec80 100644
>--- net/tigervnc/files/patch-CMakeLists.txt
>+++ net/tigervnc/files/patch-CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2013-07-21 16:21:37.028241067 +0000
>-+++ CMakeLists.txt	2013-07-21 16:21:59.310260222 +0000
>-@@ -26,7 +26,7 @@
>+--- CMakeLists.txt.orig	2017-05-16 13:53:28 UTC
>++++ CMakeLists.txt
>+@@ -29,7 +29,7 @@ set(RCVERSION 1,8,0,0)
>  # Installation paths
>  set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
>  set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
>diff --git net/tigervnc/files/patch-cmake_BuildPackages.cmake net/tigervnc/files/patch-cmake_BuildPackages.cmake
>index 5da0133..36427ee 100644
>--- net/tigervnc/files/patch-cmake_BuildPackages.cmake
>+++ net/tigervnc/files/patch-cmake_BuildPackages.cmake
>@@ -1,10 +1,10 @@
>---- cmake/BuildPackages.cmake.orig	2012-05-28 00:21:51.000000000 +0900
>-+++ cmake/BuildPackages.cmake	2012-05-28 00:22:15.000000000 +0900
>-@@ -86,5 +86,5 @@
>+--- cmake/BuildPackages.cmake.orig	2017-05-16 13:53:28 UTC
>++++ cmake/BuildPackages.cmake
>+@@ -86,5 +86,5 @@ endif() #UNIX
>  # Common
>  #
>  
>--install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION doc)
>--install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION doc)
>+-install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${DOC_DIR})
>+-install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${DOC_DIR})
> +install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION share/doc/tigervnc)
> +install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/tigervnc)
>diff --git net/tigervnc/files/patch-unix_vncserver net/tigervnc/files/patch-unix_vncserver
>index 2ce761c..ed51354 100644
>--- net/tigervnc/files/patch-unix_vncserver
>+++ net/tigervnc/files/patch-unix_vncserver
>@@ -1,6 +1,4 @@
>-diff --git unix/vncserver unix/vncserver
>-index 2ef436a7..dac27520 100755
>---- unix/vncserver
>+--- unix/vncserver.orig	2017-05-16 13:53:28 UTC
> +++ unix/vncserver
> @@ -532,7 +532,7 @@ sub CheckDisplayNumber
>

Actions: View | Diff

Attachments on bug 219566: 182925 | 182933