From f992e27421eb3a5d85188da9b01baf80a1c51dac Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 15 Jan 2011 00:11:38 +0100
Subject: [PATCH] rxvt-unicode: update to 9.10.

---
 .../rxvt-unicode/files/rxvt-unicode.desktop   |  10 +++++
 srcpkgs/rxvt-unicode/files/rxvt-unicode.png   | Bin 0 -> 1513 bytes
 .../rxvt-unicode-9.06-glibc-2.10.patch        |  42 ------------------
 srcpkgs/rxvt-unicode/template                 |  23 ++++++++--
 4 files changed, 29 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/rxvt-unicode/files/rxvt-unicode.desktop
 create mode 100644 srcpkgs/rxvt-unicode/files/rxvt-unicode.png
 delete mode 100644 srcpkgs/rxvt-unicode/patches/rxvt-unicode-9.06-glibc-2.10.patch

diff --git a/srcpkgs/rxvt-unicode/files/rxvt-unicode.desktop b/srcpkgs/rxvt-unicode/files/rxvt-unicode.desktop
new file mode 100644
index 00000000000..436e8d119ed
--- /dev/null
+++ b/srcpkgs/rxvt-unicode/files/rxvt-unicode.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=rxvt-unicode
+Comment=An Unicode capable rxvt clone
+Exec=urxvt
+Icon=rxvt-unicode
+Terminal=false
+Type=Application
+Categories=Application;System;TerminalEmulator;
diff --git a/srcpkgs/rxvt-unicode/files/rxvt-unicode.png b/srcpkgs/rxvt-unicode/files/rxvt-unicode.png
new file mode 100644
index 0000000000000000000000000000000000000000..0738a7840938bc90adc38c7ef33841e54f64252c
GIT binary patch
literal 1513
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
ZkNF&vVC3@un?VIRgQu&X%Q~loCIA&Q$E*MV

literal 0
HcmV?d00001

diff --git a/srcpkgs/rxvt-unicode/patches/rxvt-unicode-9.06-glibc-2.10.patch b/srcpkgs/rxvt-unicode/patches/rxvt-unicode-9.06-glibc-2.10.patch
deleted file mode 100644
index c4c25dbb30c..00000000000
--- a/srcpkgs/rxvt-unicode/patches/rxvt-unicode-9.06-glibc-2.10.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/background.C.orig	2009-04-25 01:12:46.000000000 +0200
-+++ src/background.C	2009-04-25 01:19:21.000000000 +0200
-@@ -261,7 +261,7 @@
-   unsigned int w = 0, h = 0;
-   unsigned int n;
-   unsigned long new_flags = (flags & (~geometryFlags));
--  char *p;
-+  const char *p;
- #  define MAXLEN_GEOM		256 /* could be longer than regular geometry string */
- 
-   if (geom == NULL)
-@@ -677,7 +677,7 @@
-       if (!target->asimman)
-         target->asimman = create_generic_imageman (target->rs[Rs_path]);
- 
--      if (char *f = strchr (file, ';'))
-+      if (char *f = (char *) strchr (file, ';'))
-         {
-           size_t len = f - file;
-           f = (char *)malloc (len + 1);
---- src/command.C.orig	2009-04-25 01:20:29.000000000 +0200
-+++ src/command.C	2009-04-25 01:21:20.000000000 +0200
-@@ -3336,7 +3336,7 @@
-           }
-         else
-           {
--            char *eq = strchr (str, '='); // constness lost, but verified to be ok
-+            char *eq = (char *) strchr (str, '='); // constness lost, but verified to be ok
- 
-             if (eq)
-               {
---- src/misc.C.orig	2009-04-25 01:41:05.000000000 +0200
-+++ src/misc.C	2009-04-25 01:41:37.000000000 +0200
-@@ -170,7 +170,7 @@
- char *
- rxvt_basename (const char *str) NOTHROW
- {
--  char *base = strrchr (str, '/');
-+  char *base = (char *) strrchr (str, '/');
- 
-   return (char *) (base ? base + 1 : str);
- }
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index ae1c512d483..bd9bcd713a2 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -1,25 +1,30 @@
 # Template build file for 'rxvt-unicode'.
 pkgname=rxvt-unicode
-version=9.06
-revision=2
+version=9.10
 distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2"
 build_style=gnu_configure
-configure_args="--enable-everything"
+configure_args="--with-terminfo=/usr/share/terminfo --enable-256-color
+--enable-font-styles --enable-xim --enable-keepscrolling --enable-pixbuf
+--enable-selectionscrolling --enable-smart-resize --enable-transparency
+--enable-utmp --enable-wtmp --enable-lastlog --disable-frills"
 short_desc="rxvt clone supporting Xft fonts and Unicode"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=8ef9359c01059efd330626c6cd7b082be9bf10587f2b9fe84caa43a84aa576d1
+checksum=1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a
 long_desc="
  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."
 
+Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run fontconfig
 Add_dependency run freetype
 Add_dependency run libX11
 Add_dependency run libXft
 Add_dependency run libXrender
+Add_dependency run gdk-pixbuf
+Add_dependency run glib
 Add_dependency full perl		">=0"
 
 Add_dependency build pkg-config
@@ -29,3 +34,13 @@ Add_dependency build freetype-devel
 Add_dependency build libX11-devel
 Add_dependency build libXft-devel
 Add_dependency build libXrender-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build glib-devel
+
+post_install()
+{
+	install -D -m644 ${FILESDIR}/${pkgname}.desktop \
+		${DESTDIR}/usr/share/applications/${pkgname}.desktop
+	install -D -m644 ${FILESDIR}/${pkgname}.png \
+		${DESTDIR}/usr/share/pixmaps/${pkgname}.png
+}