From 6945d90028cdae79dedbb494a000b3d2338312c6 Mon Sep 17 00:00:00 2001 From: Cyril Romain Date: Sun, 11 Mar 2007 13:21:29 +0000 Subject: mrxvt: update to 0.5.2 - close #1964 --- packages/mrxvt/files/fix-compile.patch | 23 ++++++++++------------- packages/mrxvt/mrxvt_0.4.1.bb | 14 -------------- packages/mrxvt/mrxvt_0.5.2.bb | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 packages/mrxvt/mrxvt_0.4.1.bb create mode 100644 packages/mrxvt/mrxvt_0.5.2.bb diff --git a/packages/mrxvt/files/fix-compile.patch b/packages/mrxvt/files/fix-compile.patch index 25794dc5fd..c849ffd35e 100644 --- a/packages/mrxvt/files/fix-compile.patch +++ b/packages/mrxvt/files/fix-compile.patch @@ -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 diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb deleted file mode 100644 index 8991295902..0000000000 --- a/packages/mrxvt/mrxvt_0.4.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "MRXVT is a lightweight and powerful X terminal emulator based on aterm and rxvt" -HOMEPAGE = "http://materm.sourceforge.net" -AUTHOR = "Jimmy Zhou " -LICENSE = "GPL" -SECTION = "x11/applications" -DEPENDS = "virtual/libx11 libxext libxpm jpeg libpng" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ - file://fix-compile.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--enable-everything --disable-debug" diff --git a/packages/mrxvt/mrxvt_0.5.2.bb b/packages/mrxvt/mrxvt_0.5.2.bb new file mode 100644 index 0000000000..4a5b71f0c9 --- /dev/null +++ b/packages/mrxvt/mrxvt_0.5.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "MRXVT is a lightweight and powerful X terminal emulator based on aterm and rxvt" +HOMEPAGE = "http://materm.sourceforge.net" +AUTHOR = "Jimmy Zhou " +LICENSE = "GPL" +SECTION = "x11/applications" +RDEPENDS = "freetype fontconfig libxft" +DEPENDS = "freetype fontconfig libxft virtual/libx11" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ + file://fix-compile.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-everything \ + --disable-debug" -- cgit v1.2.3