[oe-commits] org.oe.dev mrxvt: update to 0.5.2 - close #1964

[Cyril commit]

mrxvt: update to 0.5.2 - close #1964

Author: Cyril
Branch: org.openembedded.dev
Revision: d2b8acc44db488dead9f01ab4964940548281dea
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d2b8acc44db488dead9f01ab4964940548281dea
Files:
1
packages/mrxvt/mrxvt_0.4.1.bb
packages/mrxvt/mrxvt_0.5.2.bb
packages/mrxvt/files/fix-compile.patch
Diffs:

#
# mt diff -r214ab3b1bc85cb081bfcbbca93c7f0592175706f -rd2b8acc44db488dead9f01ab4964940548281dea
#
# 
# 
# rename "packages/mrxvt/mrxvt_0.4.1.bb"
#     to "packages/mrxvt/mrxvt_0.5.2.bb"
# 
# patch "packages/mrxvt/files/fix-compile.patch"
#  from [1da013fafc36b31fef4ea361b76cbeac12e2b301]
#    to [e458b84cc9b16f42a086fe60ecbd8c6a3ecdd68d]
# 
# patch "packages/mrxvt/mrxvt_0.5.2.bb"
#  from [1c1e82f028bbdb1ed1804f340ac195731b9aba84]
#    to [7f4afc31cb6946ac490fe671da5199354cb562cd]
# 
============================================================
--- packages/mrxvt/files/fix-compile.patch	1da013fafc36b31fef4ea361b76cbeac12e2b301
+++ packages/mrxvt/files/fix-compile.patch	e458b84cc9b16f42a086fe60ecbd8c6a3ecdd68d
@@ -1,19 +1,16 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- mrxvt-0.4.1/src/rxvt.h~fix-compile
-+++ mrxvt-0.4.1/src/rxvt.h
-@@ -387,15 +387,8 @@
- ** which in turn is unsafe without checking.
- ** Untainted defines the type of data that is safe.
- */
+Index: mrxvt-0.5.2/src/rxvt.h
+===================================================================
+--- mrxvt-0.5.2.orig/src/rxvt.h
++++ mrxvt-0.5.2/src/rxvt.h
+@@ -488,15 +488,8 @@ typedef char*	    XPointer;
+  * turn is unsafe without checking. Untainted defines the type of data that is
+  * safe.
+  */
 -#ifdef __GNUC__
 -# define $tainted
 -# define $untainted
--# define TAINTED	$tainted
--# define UNTAINTED	$untainted
+-# define TAINTED    $tainted
+-# define UNTAINTED  $untainted
 -#else
 -# define TAINTED
 -# define UNTAINTED
============================================================
--- packages/mrxvt/mrxvt_0.4.1.bb	1c1e82f028bbdb1ed1804f340ac195731b9aba84
+++ packages/mrxvt/mrxvt_0.5.2.bb	7f4afc31cb6946ac490fe671da5199354cb562cd
@@ -1,9 +1,10 @@ SECTION = "x11/applications"
 DESCRIPTION = "MRXVT is a lightweight and powerful X terminal emulator based on aterm and rxvt"
 HOMEPAGE = "http://materm.sourceforge.net"
 AUTHOR = "Jimmy Zhou <jimmyzhou at users.sf.net>"
 LICENSE = "GPL"
 SECTION = "x11/applications"
-DEPENDS = "virtual/libx11 libxext libxpm jpeg libpng"
+RDEPENDS = "freetype fontconfig libxft"
+DEPENDS = "freetype fontconfig libxft virtual/libx11"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \
@@ -11,4 +12,7 @@ inherit autotools
 
 inherit autotools
 
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+		--x-libraries=${STAGING_LIBDIR} \
+		--enable-everything \
+		--disable-debug"
-EXTRA_OECONF = "--enable-everything --disable-debug"