From b1b2687e8bd007e8b09ed6ff8a0bc01ab9d00248 Mon Sep 17 00:00:00 2001
From: Willer Moreira <willer.moreira@openbossa.org>
Date: Tue, 2 Feb 2010 15:59:17 -0400
Subject: [PATCH 096/118] aterm: include aterm.desktop

Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org>
Signed-off-by: Willer Moreira <willer.moreira@openbossa.org>
---
 .../aterm/aterm-1.0.1-display-security-issue.patch |   24 ++++++++++++++++++++
 recipes/aterm/aterm/aterm.desktop                  |   10 ++++++++
 recipes/aterm/aterm/fixing_install_no_strip.patch  |   13 ++++++++++
 recipes/aterm/aterm/setting_sh_default_shell.patch |   13 ++++++++++
 recipes/aterm/aterm_1.0.1.bb                       |   19 +++++++++++++++
 5 files changed, 79 insertions(+), 0 deletions(-)
 create mode 100644 recipes/aterm/aterm/aterm-1.0.1-display-security-issue.patch
 create mode 100644 recipes/aterm/aterm/aterm.desktop
 create mode 100644 recipes/aterm/aterm/fixing_install_no_strip.patch
 create mode 100644 recipes/aterm/aterm/setting_sh_default_shell.patch
 create mode 100644 recipes/aterm/aterm_1.0.1.bb

diff --git a/recipes/aterm/aterm/aterm-1.0.1-display-security-issue.patch b/recipes/aterm/aterm/aterm-1.0.1-display-security-issue.patch
new file mode 100644
index 0000000..e44c0b3
--- /dev/null
+++ b/recipes/aterm/aterm/aterm-1.0.1-display-security-issue.patch
@@ -0,0 +1,24 @@
+--- aterm-1.0.1/src/main.c	2007-08-01 16:08:29.000000000 +0200
++++ aterm-1.0.1.new/src/main.c	2008-05-03 14:06:52.000000000 +0200
+@@ -2057,10 +2057,6 @@
+  */
+     get_options(argc, argv);
+ 
+-	if( display_name == NULL )
+-    	if ((display_name = getenv("DISPLAY")) == NULL)
+-			display_name = ":0";
+-
+ #ifdef HAVE_AFTERSTEP
+ #ifdef MyArgs_IS_MACRO	
+     MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) );
+@@ -2102,7 +2098,9 @@
+ 	Xdisplay = XOpenDisplay(display_name);
+     
+ 	if (!Xdisplay) {
+-		print_error("can't open display %s", display_name);
++		print_error("can't open display %s", display_name?display_name:
++				getenv("DISPLAY")?getenv("DISPLAY"):
++				"as no -d given and DISPLAY not set");
+ 		exit(EXIT_FAILURE);
+     }
+   /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */
diff --git a/recipes/aterm/aterm/aterm.desktop b/recipes/aterm/aterm/aterm.desktop
new file mode 100644
index 0000000..f1bbf01
--- /dev/null
+++ b/recipes/aterm/aterm/aterm.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=aterm
+Comment=A terminal
+TryExec=aterm
+Exec=aterm
+Icon=xterm
+Type=Application
+Categories=GNOME;GTK;Utility;TerminalEmulator;
+StartupNotify=true
+
diff --git a/recipes/aterm/aterm/fixing_install_no_strip.patch b/recipes/aterm/aterm/fixing_install_no_strip.patch
new file mode 100644
index 0000000..1b0dbef
--- /dev/null
+++ b/recipes/aterm/aterm/fixing_install_no_strip.patch
@@ -0,0 +1,13 @@
+Index: aterm-1.0.1/autoconf/Make.common.in
+===================================================================
+--- aterm-1.0.1.orig/autoconf/Make.common.in
++++ aterm-1.0.1/autoconf/Make.common.in
+@@ -41,7 +41,7 @@ RMF = @RM@ -f
+ CP = @CP@
+ SED = @SED@
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL@ -s -m 755
++INSTALL_PROGRAM = @INSTALL@ -m 755
+ INSTALL_DATA = @INSTALL@ -m 644
+ 
+ # Flags & libs
diff --git a/recipes/aterm/aterm/setting_sh_default_shell.patch b/recipes/aterm/aterm/setting_sh_default_shell.patch
new file mode 100644
index 0000000..ae437ea
--- /dev/null
+++ b/recipes/aterm/aterm/setting_sh_default_shell.patch
@@ -0,0 +1,13 @@
+Index: aterm-1.0.1/src/rxvt.h
+===================================================================
+--- aterm-1.0.1.orig/src/rxvt.h
++++ aterm-1.0.1/src/rxvt.h
+@@ -564,7 +564,7 @@ typedef struct MwmHints {
+ # define OLD_WORD_SELECTION
+ #endif
+ 
+-#define DEFAULT_SHELL "/bin/bash"
++#define DEFAULT_SHELL "/bin/sh"
+ 
+ /* sort out conflicts in feature.h */
+ #ifdef KANJI
diff --git a/recipes/aterm/aterm_1.0.1.bb b/recipes/aterm/aterm_1.0.1.bb
new file mode 100644
index 0000000..44a849b
--- /dev/null
+++ b/recipes/aterm/aterm_1.0.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Aterm terminal emulator"
+HOMEPAGE = "http://aterm.sourceforge.net"
+SECTION = "x11/utils"
+LICENSE = "GPL"
+DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/aterm/aterm-${PV}.tar.bz2 \
+	   file://setting_sh_default_shell.patch;patch=1 \
+           file://aterm-1.0.1-display-security-issue.patch;patch=1 \
+           file://fixing_install_no_strip.patch;patch=1 \
+           file://aterm.desktop"
+
+inherit autotools
+
+do_install_append() {
+        install -d ${D}${datadir}/applications/
+        install -m 0644 ${WORKDIR}/aterm.desktop ${D}${datadir}/applications/
+}
-- 
1.6.3.3