add rxvt-unicode 4.8

BKrev: 41fb5f35UCKj6RrmPHvncXSLjTpUKw

diff --git a/packages/rxvt-unicode/files/xwc.patch b/packages/rxvt-unicode/files/xwc.patch
index 2db7650..7cf5965 100644 (file)
--- a/packages/rxvt-unicode/files/xwc.patch
+++ b/packages/rxvt-unicode/files/xwc.patch
@@ -1,17 +1,20 @@
---- ../rxvt-unicode-cvs-r0/rxvt-unicode/src/screen.C   2004-12-15 00:53:23 +00:00
-+++ rxvt-unicode/src/screen.C  2004-12-24 02:28:38 +00:00
-@@ -3067,9 +3067,8 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- rxvt-unicode-4.8/src/screen.C~xwc.c
++++ rxvt-unicode-4.8/src/screen.C
+@@ -3058,7 +3058,7 @@
    else
      rxvt_warn ("can't get primary selection, ignoring.\n");
  
 -#if 0
 +#ifdef HAVE_XWC
    XTextProperty ct;
--
+ 
    if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
-     {
-       set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
-@@ -3641,9 +3640,11 @@
+@@ -3632,9 +3632,11 @@
          }
        else
  #endif

diff --git a/packages/rxvt-unicode/rxvt-unicode-3.7/gcc34.patch b/packages/rxvt-unicode/rxvt-unicode-3.7/gcc34.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/rxvt-unicode/rxvt-unicode-4.1/signedchar.patch b/packages/rxvt-unicode/rxvt-unicode-4.1/signedchar.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/rxvt-unicode/rxvt-unicode-4.1/xwc.patch b/packages/rxvt-unicode/rxvt-unicode-4.1/xwc.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/rxvt-unicode/rxvt-unicode_3.1.bb b/packages/rxvt-unicode/rxvt-unicode_3.1.bb
deleted file mode 100644 (file)
index 130f273..0000000
--- a/packages/rxvt-unicode/rxvt-unicode_3.1.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
-DESCRIPTION = "rxvt-unicode is a clone of the well known \
-terminal emulator rxvt, modified to store text in Unicode \
-(either UCS-2 or UCS-4) and to use locale-correct input and \
-output. It also supports mixing multiple fonts at the \
-same time, including Xft fonts."
-PR = "r1"
-LICENSE = "GPL"
-SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-       file://xim.patch;patch=1 \
-       file://xwc.patch;patch=1"
-
-inherit autotools update-alternatives
-
-PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_NAME = "x-terminal-emulator"
-ALTERNATIVE_PATH = "${bindir}/rxvt"
-
-CFLAGS_append = " -fpermissive"
-
-EXTRA_OECONF = "--disable-menubar --disable-xim \
-               --enable-utmp --enable-wtmp --enable-lastlog \
-               --disable-strings --with-term=rxvt --enable-keepscrolling \
-               --enable-xft --with-name=rxvt --enable-frills \
-               --enable-swapscreen --enable-transparency \
-               --with-codesets=eu,jp \
-               --enable-cursor-blink --enable-pointer-blank \
-               --enable-text-blink --enable-plain-scroll \
-               --enable-combining --enable-shared \
-               --with-x=${STAGING_LIBDIR}/.."
-EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
-               'XLIB=-L${STAGING_LIBDIR} -lX11'"
-
-do_configure () {
-       mv autoconf/configure.in . || true
-       rm autoconf/libtool.m4
-       libtoolize --force
-       autotools_do_configure
-       echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
-       echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
-       echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
-       echo '#define HAVE_XLOCALE 1' >> config.h
-}
-
-do_compile () {
-       if test -e ${S}/${HOST_SYS}-libtool; then
-               LIBTOOL=${S}/${HOST_SYS}-libtool
-       else
-               LIBTOOL=${S}/libtool
-       fi
-       # docs need "yodl" and I have no idea what that is
-       oe_runmake -C src "LIBTOOL=$LIBTOOL"
-}

diff --git a/packages/rxvt-unicode/rxvt-unicode_3.7.bb b/packages/rxvt-unicode/rxvt-unicode_3.7.bb
deleted file mode 100644 (file)
index 9091d58..0000000
--- a/packages/rxvt-unicode/rxvt-unicode_3.7.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
-DESCRIPTION = "rxvt-unicode is a clone of the well known \
-terminal emulator rxvt, modified to store text in Unicode \
-(either UCS-2 or UCS-4) and to use locale-correct input and \
-output. It also supports mixing multiple fonts at the \
-same time, including Xft fonts."
-PR = "r2"
-LICENSE = "GPL"
-SRC_URI = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
-          file://xwc.patch;patch=1 \
-          file://signedchar.patch;patch=1 \
-          file://gcc34.patch;patch=1"
-
-inherit autotools update-alternatives
-
-PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_NAME = "x-terminal-emulator"
-ALTERNATIVE_PATH = "${bindir}/rxvt"
-
-CFLAGS_append = " -fpermissive"
-
-EXTRA_OECONF = "--disable-menubar --disable-xim \
-               --enable-utmp --enable-wtmp --enable-lastlog \
-               --disable-strings --with-term=rxvt --enable-keepscrolling \
-               --enable-xft --with-name=rxvt --enable-frills \
-               --enable-swapscreen --enable-transparency \
-               --with-codesets=eu,jp \
-               --enable-cursor-blink --enable-pointer-blank \
-               --enable-text-blink --enable-plain-scroll \
-               --enable-combining --enable-shared \
-               --with-x=${STAGING_LIBDIR}/.."
-EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
-               'XLIB=-L${STAGING_LIBDIR} -lX11'"
-
-do_configure () {
-       mv autoconf/configure.in . || true
-       rm autoconf/libtool.m4
-       libtoolize --force
-       autotools_do_configure
-       echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
-       echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
-       echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
-       echo '#define HAVE_XLOCALE 1' >> config.h
-}
-
-do_compile () {
-       if test -e ${S}/${HOST_SYS}-libtool; then
-               LIBTOOL=${S}/${HOST_SYS}-libtool
-       else
-               LIBTOOL=${S}/libtool
-       fi
-       # docs need "yodl" and I have no idea what that is
-       oe_runmake -C src "LIBTOOL=$LIBTOOL"
-}

diff --git a/packages/rxvt-unicode/rxvt-unicode_4.1.bb b/packages/rxvt-unicode/rxvt-unicode_4.1.bb
deleted file mode 100644 (file)
index 5870ecf..0000000
--- a/packages/rxvt-unicode/rxvt-unicode_4.1.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
-DESCRIPTION = "rxvt-unicode is a clone of the well known \
-terminal emulator rxvt, modified to store text in Unicode \
-(either UCS-2 or UCS-4) and to use locale-correct input and \
-output. It also supports mixing multiple fonts at the \
-same time, including Xft fonts."
-PR = "r1"
-LICENSE = "GPL"
-SRC_URI = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
-          file://xwc.patch;patch=1 \
-          file://signedchar.patch;patch=1"
-
-inherit autotools update-alternatives
-
-PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_NAME = "x-terminal-emulator"
-ALTERNATIVE_PATH = "${bindir}/rxvt"
-
-CFLAGS_append = " -fpermissive"
-
-EXTRA_OECONF = "--enable-menubar --enable-xim \
-               --enable-utmp --enable-wtmp --enable-lastlog \
-               --disable-strings --with-term=rxvt --enable-keepscrolling \
-               --enable-xft --with-name=rxvt --enable-frills \
-               --enable-swapscreen --enable-transparency \
-               --with-codesets=eu,jp \
-               --enable-cursor-blink --enable-pointer-blank \
-               --enable-text-blink --enable-plain-scroll \
-               --enable-combining --enable-shared \
-               --enable-xgetdefault \
-               --with-x=${STAGING_LIBDIR}/.."
-EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
-               'XLIB=-L${STAGING_LIBDIR} -lX11'"
-
-do_configure () {
-       mv autoconf/configure.in . || true
-       rm autoconf/libtool.m4
-       libtoolize --force
-       autotools_do_configure
-       echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
-       echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
-       echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
-       echo '#define HAVE_XLOCALE 1' >> config.h
-}
-
-do_compile () {
-       if test -e ${S}/${HOST_SYS}-libtool; then
-               LIBTOOL=${S}/${HOST_SYS}-libtool
-       else
-               LIBTOOL=${S}/libtool
-       fi
-       # docs need "yodl" and I have no idea what that is
-       oe_runmake -C src "LIBTOOL=$LIBTOOL"
-}

diff --git a/packages/rxvt-unicode/rxvt-unicode_4.7.bb b/packages/rxvt-unicode/rxvt-unicode_4.7.bb
deleted file mode 100644 (file)
index 335448c..0000000
--- a/packages/rxvt-unicode/rxvt-unicode_4.7.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
-DESCRIPTION = "rxvt-unicode is a clone of the well known \
-terminal emulator rxvt, modified to store text in Unicode \
-(either UCS-2 or UCS-4) and to use locale-correct input and \
-output. It also supports mixing multiple fonts at the \
-same time, including Xft fonts."
-PR = "r2"
-LICENSE = "GPL"
-SRC_URI = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
-          file://xwc.patch;patch=1 \
-          file://signedchar.patch;patch=1"
-
-inherit autotools update-alternatives
-
-PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_NAME = "x-terminal-emulator"
-ALTERNATIVE_PATH = "${bindir}/rxvt"
-
-CFLAGS_append = " -fpermissive"
-
-EXTRA_OECONF = "--enable-menubar --enable-xim \
-               --enable-utmp --enable-wtmp --enable-lastlog \
-               --disable-strings --with-term=rxvt --enable-keepscrolling \
-               --enable-xft --with-name=rxvt --enable-frills \
-               --enable-swapscreen --enable-transparency \
-               --with-codesets=eu \
-               --enable-cursor-blink --enable-pointer-blank \
-               --enable-text-blink --enable-plain-scroll \
-               --enable-combining --enable-shared \
-               --enable-xgetdefault \
-               --with-x=${STAGING_LIBDIR}/.."
-EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
-               'XLIB=-L${STAGING_LIBDIR} -lX11'"
-
-do_configure () {
-       mv autoconf/configure.in . || true
-       rm autoconf/libtool.m4
-       libtoolize --force
-       autotools_do_configure
-       echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
-       echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
-       echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
-       echo '#define HAVE_XLOCALE 1' >> config.h
-}
-
-do_compile () {
-       if test -e ${S}/${HOST_SYS}-libtool; then
-               LIBTOOL=${S}/${HOST_SYS}-libtool
-       else
-               LIBTOOL=${S}/libtool
-       fi
-       # docs need "yodl" and I have no idea what that is
-       oe_runmake -C src "LIBTOOL=$LIBTOOL"
-}

diff --git a/packages/rxvt-unicode/rxvt-unicode-3.1/xim.patch b/packages/rxvt-unicode/rxvt-unicode_4.8.bb
similarity index 100%
rename from packages/rxvt-unicode/rxvt-unicode-3.1/xim.patch
rename to packages/rxvt-unicode/rxvt-unicode_4.8.bb