Attachment 173027 Details for Bug 211356 – another svn diff to fix build failure when XWIDGETS option is chosen w/o GTK3

[patch] another svn diff to fix build failure when XWIDGETS option is chosen w/o GTK3

emacs-devel-25.1.r1,2.diff (text/plain), 1.29 KB, created by Joseph Mingrone on 2016-07-27 03:13:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2016-07-27 03:13:20 UTC

Size: 1.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 419158)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	emacs
>-PORTVERSION=	${EMACS_VER}
>-PORTREVISION=	1
>+DISTVERSION=	25.1-rc1
> PORTEPOCH=	2
> CATEGORIES=	editors ipv6
> MASTER_SITES=	GNU_ALPHA/emacs/pretest
>@@ -20,7 +19,9 @@
> 
> CONFLICTS=	emacs24-[0-9]* emacs-nox11-[0-9]*
> 
>-EMACS_VER=	25.0.95
>+EMACS_VER=	${PORTVERSION:R}
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${EMACS_VER}
>+
> GNU_CONFIGURE=	yes
> USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
> INFO_PATH=	${DATADIR_REL}/info
>@@ -208,7 +209,7 @@
> XWIDGETS_USE=		XORG=xcomposite
> XWIDGETS_CONFIGURE_WITH=xwidgets
> XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
>-XWIDGETS_IMPLIES=	X11
>+XWIDGETS_IMPLIES=	GTK3
> 
> .include <bsd.port.options.mk>
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 419158)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1465722255
>-SHA256 (emacs-25.0.95.tar.xz) = 1438c51268250344739c31752d9292fc51cab0d8384b9f574ecaf1bcd879bb2e
>-SIZE (emacs-25.0.95.tar.xz) = 42536908
>+TIMESTAMP = 1469588656
>+SHA256 (emacs-25.1-rc1.tar.xz) = c00c50e66474359d1e24baa2a0703bc64207caffc31d0808d8b4ffa4b3826133
>+SIZE (emacs-25.1-rc1.tar.xz) = 42309372

Actions: View | Diff

Attachments on bug 211356: 172960 | 172962 | 173027