Attachment 192097 Details for Bug 227200 – Patch to add suport for GTK2

[patch] Patch to add suport for GTK2

putty-0.70_1.gtk2_gtk3.diff (text/plain), 2.01 KB, created by Miroslav Lachman on 2018-04-02 10:49:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Lachman

Created: 2018-04-02 10:49:09 UTC

Size: 2.01 KB

patch

obsolete

>diff -r -u putty.orig/Makefile putty/Makefile
>--- putty.orig/Makefile	2018-04-02 12:34:16.011034000 +0200
>+++ putty/Makefile	2018-04-02 12:35:54.233164000 +0200
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	putty
> PORTVERSION=	0.70
>+PORTREVISION=	1
> CATEGORIES=	security ipv6
> MASTER_SITES=	http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
> 		ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
>@@ -23,7 +24,8 @@
> PLIST_FILES=	bin/plink bin/pscp bin/psftp bin/puttygen
> PLIST_FILES+=	man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man1/puttygen.1.gz
> 
>-OPTIONS_DEFINE=	GTK3
>+OPTIONS_RADIO=		TOOLKIT
>+OPTIONS_RADIO_TOOLKIT=	GTK2 GTK3
> OPTIONS_DEFAULT=GSSAPI_BASE GTK3
> OPTIONS_SINGLE=	GSSAPI_SELECT
> OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \
>@@ -36,14 +38,20 @@
> CFLAGS+=	-DBSD_PTYS -DOMIT_UTMP -DIPV6
> LDFLAGS+=	-Wl,--as-needed
> 
>-.if ${PORT_OPTIONS:MGTK3} && !defined(WITHOUT_X11)
>-USE_GNOME=	cairo gdkpixbuf2 gtk30
>+.if (${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}) && !defined(WITHOUT_X11)
> USE_XORG=	x11
>+.if ${PORT_OPTIONS:MGTK2}
>+USE_GNOME=	cairo gdkpixbuf2 gtk20
>+MAKE_ARGS+=	PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-2.0 x11 --cflags"
>+.endif
>+.if ${PORT_OPTIONS:MGTK3}
>+USE_GNOME=	cairo gdkpixbuf2 gtk30
>+MAKE_ARGS+=	PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-3.0 x11 --cflags"
>+.endif
> 
> PLIST_FILES+=	bin/pageant bin/pterm bin/putty bin/puttytel
> PLIST_FILES+=	man/man1/pageant.1.gz man/man1/pterm.1.gz man/man1/putty.1.gz man/man1/puttytel.1.gz
> PLIST_FILES+=	share/pixmaps/putty.ico
>-MAKE_ARGS+=	PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-3.0 x11 --cflags"
> DESKTOP_ENTRIES="PuTTY" \
> 		"${COMMENT}" \
> 		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
>@@ -91,9 +99,11 @@
> 			      s,make,${MAKE_CMD},'\
> 		${WRKSRC}/${MAKEFILE}
> 
>-post-install-GTK3-on:
>+post-install:
>+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
> 	${INSTALL_DATA} ${WRKSRC}/../windows/putty.ico \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/
>+.endif
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 227200: 192097 | 192098 | 192099 | 192100