summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-27 01:00:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:28 +0000
commit8eadaecfb14acb9172b129893397d7c0ce2f98ec (patch)
treee211e09f8c72c646c8f7962475d972f9cafb5656 /meta
parent594959eb1be372e2e1680970221cf6e5265be46d (diff)
downloadpoky-8eadaecfb14acb9172b129893397d7c0ce2f98ec.tar.gz
rxvt-unicode: fix for 9.20 and 9.21
* Add a rxvt-unicode.inc for rxvt-unicode_9.20.bb and rxvt-unicode_9.21.bb * Fix unknown-configure-option: WARNING: QA Issue: rxvt-unicode: configure was passed unrecognised options: --enable-menubar --enable-cursor-blink --enable-shared --disable-strings --enable-xgetdefault [unknown-configure-option] * Fix build-deps: (add a PACKAGECONFIG) WARNING: QA Issue: rxvt-unicode rdepends on startup-notification, but it isn't a build dependency? [build-deps] (From OE-Core rev: 3033c7dda12c448974c51e48a0813b642f19f35d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc58
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb61
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb61
3 files changed, 62 insertions, 118 deletions
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
new file mode 100644
index 0000000000..04a43c079e
--- /dev/null
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
@@ -0,0 +1,58 @@
1SECTION = "x11/utils"
2SUMMARY = "rxvt terminal clone supporting unicode"
3DESCRIPTION = "rxvt-unicode is a clone of the well known \
4terminal emulator rxvt, modified to store text in Unicode \
5(either UCS-2 or UCS-4) and to use locale-correct input and \
6output. It also supports mixing multiple fonts at the \
7same time, including Xft fonts."
8DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
9
10SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
11 file://xwc.patch \
12 file://rxvt.desktop \
13 file://rxvt.png"
14
15inherit autotools update-alternatives
16
17PROVIDES = "virtual/x-terminal-emulator"
18ALTERNATIVE_${PN} = "x-terminal-emulator"
19ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
20
21CFLAGS_append = " -fpermissive"
22
23EXTRA_OECONF = "--enable-xim \
24 --enable-utmp --enable-wtmp --enable-lastlog \
25 --with-term=rxvt --enable-keepscrolling \
26 --enable-xft --with-name=rxvt --enable-frills \
27 --enable-swapscreen --enable-transparency \
28 --with-codesets=eu --enable-pointer-blank \
29 --enable-text-blink --enable-rxvt-scroll \
30 --enable-combining --disable-perl \
31 --with-x=${STAGING_DIR_HOST}${prefix}"
32
33PACKAGECONFIG ??= ""
34PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification,"
35
36do_configure_prepend () {
37 if [ ! -e ${S}/acinclude.m4 ]; then
38 cp ${S}/aclocal.m4 ${S}/acinclude.m4
39 fi
40}
41
42do_compile_prepend () {
43 echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
44 echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
45 echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
46 echo '#define HAVE_XLOCALE 1' >> config.h
47}
48
49do_install_append () {
50 install -d ${D}/${datadir}
51 install -d ${D}/${datadir}/applications
52 install -d ${D}/${datadir}/pixmaps/
53
54 install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
55 install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
56}
57
58FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
index 3a1ea6633b..3480ec74bf 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
@@ -1,65 +1,8 @@
1SECTION = "x11/utils" 1require rxvt-unicode.inc
2SUMMARY = "rxvt terminal clone supporting unicode" 2
3DESCRIPTION = "rxvt-unicode is a clone of the well known \
4terminal emulator rxvt, modified to store text in Unicode \
5(either UCS-2 or UCS-4) and to use locale-correct input and \
6output. It also supports mixing multiple fonts at the \
7same time, including Xft fonts."
8LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432" 5 file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432"
11 6
12DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
13
14SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
15 file://xwc.patch \
16 file://rxvt.desktop \
17 file://rxvt.png"
18
19SRC_URI[md5sum] = "4a5b823f08d21036f94a6c51e94d025b" 7SRC_URI[md5sum] = "4a5b823f08d21036f94a6c51e94d025b"
20SRC_URI[sha256sum] = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e" 8SRC_URI[sha256sum] = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e"
21
22inherit autotools update-alternatives
23
24PROVIDES = "virtual/x-terminal-emulator"
25ALTERNATIVE_${PN} = "x-terminal-emulator"
26ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
27
28CFLAGS_append = " -fpermissive"
29
30EXTRA_OECONF = "--enable-menubar --enable-xim \
31 --enable-utmp --enable-wtmp --enable-lastlog \
32 --disable-strings --with-term=rxvt --enable-keepscrolling \
33 --enable-xft --with-name=rxvt --enable-frills \
34 --enable-swapscreen --enable-transparency \
35 --with-codesets=eu \
36 --enable-cursor-blink --enable-pointer-blank \
37 --enable-text-blink --enable-rxvt-scroll \
38 --enable-combining --enable-shared \
39 --enable-xgetdefault \
40 --disable-perl \
41 --with-x=${STAGING_DIR_HOST}${prefix}"
42
43do_configure_prepend () {
44 if [ ! -e ${S}/acinclude.m4 ]; then
45 cp ${S}/aclocal.m4 ${S}/acinclude.m4
46 fi
47}
48
49do_compile_prepend () {
50 echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
51 echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
52 echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
53 echo '#define HAVE_XLOCALE 1' >> config.h
54}
55
56do_install_append () {
57 install -d ${D}/${datadir}
58 install -d ${D}/${datadir}/applications
59 install -d ${D}/${datadir}/pixmaps/
60
61 install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
62 install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
63}
64
65FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
index 239fbeda4d..7049495e6d 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
@@ -1,65 +1,8 @@
1SECTION = "x11/utils" 1require rxvt-unicode.inc
2SUMMARY = "rxvt terminal clone supporting unicode" 2
3DESCRIPTION = "rxvt-unicode is a clone of the well known \
4terminal emulator rxvt, modified to store text in Unicode \
5(either UCS-2 or UCS-4) and to use locale-correct input and \
6output. It also supports mixing multiple fonts at the \
7same time, including Xft fonts."
8LICENSE = "GPLv3" 3LICENSE = "GPLv3"
9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
10 file://src/main.C;beginline=1;endline=31;md5=7dac0395806570856e037f98aba8513b" 5 file://src/main.C;beginline=1;endline=31;md5=7dac0395806570856e037f98aba8513b"
11 6
12DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
13
14SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
15 file://xwc.patch \
16 file://rxvt.desktop \
17 file://rxvt.png"
18
19SRC_URI[md5sum] = "a9a06c608258c5fd247c3725d8f44582" 7SRC_URI[md5sum] = "a9a06c608258c5fd247c3725d8f44582"
20SRC_URI[sha256sum] = "75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b" 8SRC_URI[sha256sum] = "75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b"
21
22inherit autotools update-alternatives
23
24PROVIDES = "virtual/x-terminal-emulator"
25ALTERNATIVE_${PN} = "x-terminal-emulator"
26ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
27
28CFLAGS_append = " -fpermissive"
29
30EXTRA_OECONF = "--enable-menubar --enable-xim \
31 --enable-utmp --enable-wtmp --enable-lastlog \
32 --disable-strings --with-term=rxvt --enable-keepscrolling \
33 --enable-xft --with-name=rxvt --enable-frills \
34 --enable-swapscreen --enable-transparency \
35 --with-codesets=eu \
36 --enable-cursor-blink --enable-pointer-blank \
37 --enable-text-blink --enable-rxvt-scroll \
38 --enable-combining --enable-shared \
39 --enable-xgetdefault \
40 --disable-perl \
41 --with-x=${STAGING_DIR_HOST}${prefix}"
42
43do_configure_prepend () {
44 if [ ! -e ${S}/acinclude.m4 ]; then
45 cp ${S}/aclocal.m4 ${S}/acinclude.m4
46 fi
47}
48
49do_compile_prepend () {
50 echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
51 echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
52 echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
53 echo '#define HAVE_XLOCALE 1' >> config.h
54}
55
56do_install_append () {
57 install -d ${D}/${datadir}
58 install -d ${D}/${datadir}/applications
59 install -d ${D}/${datadir}/pixmaps/
60
61 install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
62 install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
63}
64
65FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"