diff options
| author | Cyril Romain <cyril.romain@gmail.com> | 2007-03-11 13:21:29 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-11 13:21:29 +0000 |
| commit | 6945d90028cdae79dedbb494a000b3d2338312c6 (patch) | |
| tree | 66083e324f0662053acdc8558bd08a233568456c | |
| parent | 280023fc2f212189c91320b649385bf70a987c8b (diff) | |
mrxvt: update to 0.5.2 - close #1964
| -rw-r--r-- | packages/mrxvt/files/fix-compile.patch | 23 | ||||
| -rw-r--r-- | packages/mrxvt/mrxvt_0.5.2.bb (renamed from packages/mrxvt/mrxvt_0.4.1.bb) | 8 |
2 files changed, 16 insertions, 15 deletions
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.5.2.bb index 8991295902..4a5b71f0c9 100644 --- a/packages/mrxvt/mrxvt_0.4.1.bb +++ b/packages/mrxvt/mrxvt_0.5.2.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://materm.sourceforge.net" AUTHOR = "Jimmy Zhou <jimmyzhou@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 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ inherit autotools -EXTRA_OECONF = "--enable-everything --disable-debug" +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-everything \ + --disable-debug" |