Bug 185468

Summary: [PATCH] editors/emacs: Do not launch emacs from a terminal when X11 is set (r338450 regression)
Product: Ports & Packages Reporter: Raphael Kubo da Costa <rakuco>
Component: Individual Port(s)Assignee: Ashish SHUKLA <ashish>
Status: Closed FIXED    
Severity: Affects Only Me CC: ashish
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
emacs24-24.3_2,3.patch none

Description Raphael Kubo da Costa freebsd_committer freebsd_triage 2014-01-04 16:30:00 UTC 
Fix a regression introduced in r338450 that reversed the logic in the check for whether the X11 option is set or not: before, it checked for WITHOUT_X11 to set Terminal to true in the desktop file, whereas the code was now setting that _if_ X11 was set.

Port maintainer (ashish@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-04 16:30:09 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->ashish

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Raphael Kubo da Costa freebsd_committer freebsd_triage 2014-01-04 17:45:09 UTC 
ashish.is@lostca.se (Ashish SHUKLA) writes:

> Hi Raphael,
>
> Sorry I overlooked that change.
>
> Could you please check that attached diff works for you ?

Doh, apparently send-pr ate part of my patch :(

Yeah, it probably does -- I originally used ".if
empty(PORT_OPTIONS:MX11)", but your syntax should work as well.
Comment 3 Ashish SHUKLA freebsd_committer freebsd_triage 2014-01-04 18:18:22 UTC 
On Sat, 4 Jan 2014 17:50:01 GMT, Raphael Kubo da Costa <rakuco@FreeBSD.org> said:
>  ashish.is@lostca.se (Ashish SHUKLA) writes:

 
>> Hi Raphael,
>> 
>> Sorry I overlooked that change.
>> 
>> Could you please check that attached diff works for you ?

 
>  Doh, apparently send-pr ate part of my patch :(

 
>  Yeah, it probably does -- I originally used ".if
>  empty(PORT_OPTIONS:MX11)", but your syntax should work as well.


Thanks, I'll commit it.

Nice hostname, btw! :)

-- 
Ashish SHUKLA      | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
Sent from my Emacs
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-01-04 20:12:45 UTC 
Author: ashish
Date: Sat Jan  4 20:12:38 2014
New Revision: 338676
URL: http://svnweb.freebsd.org/changeset/ports/338676

Log:
  - Fix the logic in updating emacs.desktop file, from the regression introduced
    in r338450
  
  PR:		ports/185468
  Submitted by:	rakuco

Modified:
  head/editors/emacs-nox11/Makefile
  head/editors/emacs/Makefile

Modified: head/editors/emacs-nox11/Makefile
==============================================================================
--- head/editors/emacs-nox11/Makefile	Sat Jan  4 19:46:52 2014	(r338675)
+++ head/editors/emacs-nox11/Makefile	Sat Jan  4 20:12:38 2014	(r338676)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	-nox11
 
-PORTREVISION=	9
+PORTREVISION=	10
 
 OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
 		SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Sat Jan  4 19:46:52 2014	(r338675)
+++ head/editors/emacs/Makefile	Sat Jan  4 20:12:38 2014	(r338676)
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -214,7 +214,7 @@ BROKEN=	Emacs 24.X does not currently bu
 post-patch:
 	@${RM} -f ${WRKSRC}/info/*
 	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
-.if ${PORT_OPTIONS:MX11}
+.if !${PORT_OPTIONS:MX11}
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
 .endif
 
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 Ashish SHUKLA freebsd_committer freebsd_triage 2014-01-04 20:28:15 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!