diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-08-13 13:14:36 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-13 13:14:36 +0000 |
| commit | f45a26339f26a4da01166c1969c5ea620f992883 (patch) | |
| tree | 4c6777fbd5c0cccbfa8a4a767193d04f5a73bb6b /packages | |
| parent | 2d68f48ddd27b13f73c64447ab46aa380222f010 (diff) | |
| parent | 4dce70dbb585c6751d6ad28d770994a76f172b28 (diff) | |
merge of 573b5d78b5e0b180193dc60cf7ef9d57cb7fd657
and e04b75b646ac55cc032131167fa27c9cb86945a2
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/meta/meta-e-x11.bb | 5 | ||||
| -rw-r--r-- | packages/mrxvt/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/mrxvt/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/mrxvt/files/fix-compile.patch | 25 | ||||
| -rw-r--r-- | packages/mrxvt/mrxvt_0.4.1.bb | 14 |
5 files changed, 42 insertions, 2 deletions
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 9e0a90ecbc..8c2729dabe 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" LICENSE = "MIT" PACKAGES = "task-enlightenment-x11" +PR = "r1" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ e##http://openzaurus.org/official/unstable/3.5.2/feed/e" @@ -10,8 +11,8 @@ ALLOW_EMPTY = 1 # # X # -DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo" -RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo" +DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig ttf-bitstream-vera" +RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo ttf-bitstream-vera" # # E diff --git a/packages/mrxvt/.mtn2git_empty b/packages/mrxvt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mrxvt/.mtn2git_empty diff --git a/packages/mrxvt/files/.mtn2git_empty b/packages/mrxvt/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mrxvt/files/.mtn2git_empty diff --git a/packages/mrxvt/files/fix-compile.patch b/packages/mrxvt/files/fix-compile.patch new file mode 100644 index 0000000000..25794dc5fd --- /dev/null +++ b/packages/mrxvt/files/fix-compile.patch @@ -0,0 +1,25 @@ + +# +# 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. + */ +-#ifdef __GNUC__ +-# define $tainted +-# define $untainted +-# define TAINTED $tainted +-# define UNTAINTED $untainted +-#else +-# define TAINTED +-# define UNTAINTED +-#endif ++#define TAINTED ++#define UNTAINTED + + + /* diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb new file mode 100644 index 0000000000..1efbf58d9d --- /dev/null +++ b/packages/mrxvt/mrxvt_0.4.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "MRXVT is a lightweight and powerful X terminal emulator based on aterm and rxvt" +HOMEPAGE = "http://materm.sourceforge.net" +AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>" +LICENSE = "GPL" +SECTION = "x11/apps" +DEPENDS = "x11 xext xpm 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" |