From dec72baef7129468932f07dc3d6cf70c5b92ad44 Mon Sep 17 00:00:00 2001 From: tnut Date: Fri, 26 Feb 2010 23:31:27 +0100 Subject: rxvt-unicode dans test --- extra/rxvt-unicode/.footprint | 42 ----------------------- extra/rxvt-unicode/.md5sum | 5 --- extra/rxvt-unicode/Pkgfile | 57 -------------------------------- extra/rxvt-unicode/font-width-fix.patch | 26 --------------- extra/rxvt-unicode/gcc4.4.patch | 23 ------------- extra/rxvt-unicode/rxvt-unicode.desktop | 9 ----- extra/rxvt-unicode/rxvt-unicode.png | Bin 1513 -> 0 bytes test/rxvt-unicode/.footprint | 42 +++++++++++++++++++++++ test/rxvt-unicode/.md5sum | 5 +++ test/rxvt-unicode/Pkgfile | 57 ++++++++++++++++++++++++++++++++ test/rxvt-unicode/font-width-fix.patch | 26 +++++++++++++++ test/rxvt-unicode/gcc4.4.patch | 23 +++++++++++++ test/rxvt-unicode/rxvt-unicode.desktop | 9 +++++ test/rxvt-unicode/rxvt-unicode.png | Bin 0 -> 1513 bytes 14 files changed, 162 insertions(+), 162 deletions(-) delete mode 100644 extra/rxvt-unicode/.footprint delete mode 100644 extra/rxvt-unicode/.md5sum delete mode 100644 extra/rxvt-unicode/Pkgfile delete mode 100644 extra/rxvt-unicode/font-width-fix.patch delete mode 100644 extra/rxvt-unicode/gcc4.4.patch delete mode 100644 extra/rxvt-unicode/rxvt-unicode.desktop delete mode 100644 extra/rxvt-unicode/rxvt-unicode.png create mode 100644 test/rxvt-unicode/.footprint create mode 100644 test/rxvt-unicode/.md5sum create mode 100644 test/rxvt-unicode/Pkgfile create mode 100644 test/rxvt-unicode/font-width-fix.patch create mode 100644 test/rxvt-unicode/gcc4.4.patch create mode 100644 test/rxvt-unicode/rxvt-unicode.desktop create mode 100644 test/rxvt-unicode/rxvt-unicode.png diff --git a/extra/rxvt-unicode/.footprint b/extra/rxvt-unicode/.footprint deleted file mode 100644 index f4c14ca0f..000000000 --- a/extra/rxvt-unicode/.footprint +++ /dev/null @@ -1,42 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/urxvt --rwxr-xr-x root/root usr/bin/urxvt-tabbed --rwxr-xr-x root/root usr/bin/urxvtc --rwxr-xr-x root/root usr/bin/urxvtd -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/urxvt/ -drwxr-xr-x root/root usr/lib/urxvt/perl/ --rw-r--r-- root/root usr/lib/urxvt/perl/block-graphics-to-ascii --rw-r--r-- root/root usr/lib/urxvt/perl/digital-clock --rw-r--r-- root/root usr/lib/urxvt/perl/example-refresh-hooks --rw-r--r-- root/root usr/lib/urxvt/perl/kuake --rw-r--r-- root/root usr/lib/urxvt/perl/macosx-clipboard --rw-r--r-- root/root usr/lib/urxvt/perl/matcher --rw-r--r-- root/root usr/lib/urxvt/perl/option-popup --rw-r--r-- root/root usr/lib/urxvt/perl/overlay-osc --rw-r--r-- root/root usr/lib/urxvt/perl/readline --rw-r--r-- root/root usr/lib/urxvt/perl/remote-clipboard --rw-r--r-- root/root usr/lib/urxvt/perl/searchable-scrollback --rw-r--r-- root/root usr/lib/urxvt/perl/selection --rw-r--r-- root/root usr/lib/urxvt/perl/selection-autotransform --rw-r--r-- root/root usr/lib/urxvt/perl/selection-pastebin --rw-r--r-- root/root usr/lib/urxvt/perl/selection-popup --rw-r--r-- root/root usr/lib/urxvt/perl/tabbed --rw-r--r-- root/root usr/lib/urxvt/perl/urxvt-popup --rw-r--r-- root/root usr/lib/urxvt/perl/xim-onthespot --rw-r--r-- root/root usr/lib/urxvt/urxvt.pm -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/applications/ --rw-r--r-- root/root usr/share/applications/rxvt-unicode.desktop -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/urxvt.1.gz --rw-r--r-- root/root usr/share/man/man1/urxvtc.1.gz --rw-r--r-- root/root usr/share/man/man1/urxvtd.1.gz -drwxr-xr-x root/root usr/share/man/man3/ --rw-r--r-- root/root usr/share/man/man3/urxvtperl.3.gz -drwxr-xr-x root/root usr/share/man/man7/ --rw-r--r-- root/root usr/share/man/man7/urxvt.7.gz -drwxr-xr-x root/root usr/share/pixmaps/ --rw-r--r-- root/root usr/share/pixmaps/rxvt-unicode.png diff --git a/extra/rxvt-unicode/.md5sum b/extra/rxvt-unicode/.md5sum deleted file mode 100644 index 5c84aa833..000000000 --- a/extra/rxvt-unicode/.md5sum +++ /dev/null @@ -1,5 +0,0 @@ -df0c3a8b6bb0578d1b91e4081c47881c font-width-fix.patch -9ef634386594969e106f0858a2e6df8c gcc4.4.patch -4cb9330e99fc0b0b05cebf3581557dd8 rxvt-unicode-9.06.tar.bz2 -ef2dfa44a86cae36a60f45559d8ad783 rxvt-unicode.desktop -84328cada91751df07324d95f8be4d1b rxvt-unicode.png diff --git a/extra/rxvt-unicode/Pkgfile b/extra/rxvt-unicode/Pkgfile deleted file mode 100644 index 811717734..000000000 --- a/extra/rxvt-unicode/Pkgfile +++ /dev/null @@ -1,57 +0,0 @@ -# Description: Clone d'un terminal rxvt (urxvt) avec support 256 couileurs -# URL:http://software.schmorp.de/pkg/rxvt-unicode.html -# Maintainer: NuTyX packager team -# Packager: lesibel at free dot fr -# Depends on: xorg-libxft - -name=rxvt-unicode -version=9.06 -release=1 -source=(http://dist.schmorp.de/$name/$name-$version.tar.bz2 \ - rxvt-unicode.desktop \ - rxvt-unicode.png \ - font-width-fix.patch \ - gcc4.4.patch) - -build() { - cd $name-$version - # Add 256 color support - patch -p1 -i doc/urxvt-8.2-256color.patch || return 1 - - # Fix font width bug fix - patch -p0 -i ../font-width-fix.patch || return 1 - - # Port to compile with GCC4.4 - patch -p0 -i ../gcc4.4.patch - - ./configure --prefix=/usr \ - --with-terminfo=/usr/share/terminfo \ - --with-term=rxvt-256color \ - --enable-smart-resize \ - --enable-font-styles \ - --enable-xim \ - --enable-keepscrolling \ - --enable-selectionscrolling \ - --enable-xpm-background \ - --enable-transparency \ - --enable-utmp \ - --enable-wtmp \ - --enable-lastlog - - make - make DESTDIR=$PKG install - -# install -d $PKG/usr/share/terminfo -# export TERMINFO=$PKG/usr/share/terminfo -# make DESTDIR=$PKG install - - # install the tabbing wrapper - sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed - install -D -m755 doc/rxvt-tabbed $PKG/usr/bin/urxvt-tabbed - - # install freedesktop menu and icon ( icon from cvs checkout ) - install -D -m644 ../rxvt-unicode.desktop \ - $PKG/usr/share/applications/rxvt-unicode.desktop - install -Dm644 ../rxvt-unicode.png \ - $PKG/usr/share/pixmaps/rxvt-unicode.png -} diff --git a/extra/rxvt-unicode/font-width-fix.patch b/extra/rxvt-unicode/font-width-fix.patch deleted file mode 100644 index 811d9e615..000000000 --- a/extra/rxvt-unicode/font-width-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/rxvtfont.C.bukind 2007-11-30 14:36:33.000000000 +0600 -+++ src/rxvtfont.C 2007-11-30 14:39:29.000000000 +0600 -@@ -1171,12 +1171,21 @@ - XGlyphInfo g; - XftTextExtents16 (disp, f, &ch, 1, &g); - -+/* -+ * bukind: don't use g.width as a width of a character! -+ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial -+ - g.width -= g.x; - - int wcw = WCWIDTH (ch); - if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; - - if (width < g.width ) width = g.width; -+ */ -+ int wcw = WCWIDTH (ch); -+ if (wcw > 1) g.xOff = g.xOff / wcw; -+ if (width < g.xOff) width = g.xOff; -+ - if (height < g.height ) height = g.height; - if (glheight < g.height - g.y) glheight = g.height - g.y; - } - - diff --git a/extra/rxvt-unicode/gcc4.4.patch b/extra/rxvt-unicode/gcc4.4.patch deleted file mode 100644 index 06be6c4ba..000000000 --- a/extra/rxvt-unicode/gcc4.4.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/command.C.old 2009-05-28 15:21:04.457772957 +0200 -+++ src/command.C 2009-05-28 15:18:52.684597530 +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.old 2009-05-28 15:21:16.400270603 +0200 -+++ src/misc.C 2009-05-28 15:21:51.697108339 +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/extra/rxvt-unicode/rxvt-unicode.desktop b/extra/rxvt-unicode/rxvt-unicode.desktop deleted file mode 100644 index c6169949f..000000000 --- a/extra/rxvt-unicode/rxvt-unicode.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=rxvt-unicode -Comment=An Unicode capable rxvt clone -Exec=urxvt -Icon=rxvt-unicode -Terminal=false -Type=Application -Categories=System;TerminalEmulator; diff --git a/extra/rxvt-unicode/rxvt-unicode.png b/extra/rxvt-unicode/rxvt-unicode.png deleted file mode 100644 index 0738a7840..000000000 Binary files a/extra/rxvt-unicode/rxvt-unicode.png and /dev/null differ diff --git a/test/rxvt-unicode/.footprint b/test/rxvt-unicode/.footprint new file mode 100644 index 000000000..f4c14ca0f --- /dev/null +++ b/test/rxvt-unicode/.footprint @@ -0,0 +1,42 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/urxvt +-rwxr-xr-x root/root usr/bin/urxvt-tabbed +-rwxr-xr-x root/root usr/bin/urxvtc +-rwxr-xr-x root/root usr/bin/urxvtd +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/urxvt/ +drwxr-xr-x root/root usr/lib/urxvt/perl/ +-rw-r--r-- root/root usr/lib/urxvt/perl/block-graphics-to-ascii +-rw-r--r-- root/root usr/lib/urxvt/perl/digital-clock +-rw-r--r-- root/root usr/lib/urxvt/perl/example-refresh-hooks +-rw-r--r-- root/root usr/lib/urxvt/perl/kuake +-rw-r--r-- root/root usr/lib/urxvt/perl/macosx-clipboard +-rw-r--r-- root/root usr/lib/urxvt/perl/matcher +-rw-r--r-- root/root usr/lib/urxvt/perl/option-popup +-rw-r--r-- root/root usr/lib/urxvt/perl/overlay-osc +-rw-r--r-- root/root usr/lib/urxvt/perl/readline +-rw-r--r-- root/root usr/lib/urxvt/perl/remote-clipboard +-rw-r--r-- root/root usr/lib/urxvt/perl/searchable-scrollback +-rw-r--r-- root/root usr/lib/urxvt/perl/selection +-rw-r--r-- root/root usr/lib/urxvt/perl/selection-autotransform +-rw-r--r-- root/root usr/lib/urxvt/perl/selection-pastebin +-rw-r--r-- root/root usr/lib/urxvt/perl/selection-popup +-rw-r--r-- root/root usr/lib/urxvt/perl/tabbed +-rw-r--r-- root/root usr/lib/urxvt/perl/urxvt-popup +-rw-r--r-- root/root usr/lib/urxvt/perl/xim-onthespot +-rw-r--r-- root/root usr/lib/urxvt/urxvt.pm +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/rxvt-unicode.desktop +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/urxvt.1.gz +-rw-r--r-- root/root usr/share/man/man1/urxvtc.1.gz +-rw-r--r-- root/root usr/share/man/man1/urxvtd.1.gz +drwxr-xr-x root/root usr/share/man/man3/ +-rw-r--r-- root/root usr/share/man/man3/urxvtperl.3.gz +drwxr-xr-x root/root usr/share/man/man7/ +-rw-r--r-- root/root usr/share/man/man7/urxvt.7.gz +drwxr-xr-x root/root usr/share/pixmaps/ +-rw-r--r-- root/root usr/share/pixmaps/rxvt-unicode.png diff --git a/test/rxvt-unicode/.md5sum b/test/rxvt-unicode/.md5sum new file mode 100644 index 000000000..5c84aa833 --- /dev/null +++ b/test/rxvt-unicode/.md5sum @@ -0,0 +1,5 @@ +df0c3a8b6bb0578d1b91e4081c47881c font-width-fix.patch +9ef634386594969e106f0858a2e6df8c gcc4.4.patch +4cb9330e99fc0b0b05cebf3581557dd8 rxvt-unicode-9.06.tar.bz2 +ef2dfa44a86cae36a60f45559d8ad783 rxvt-unicode.desktop +84328cada91751df07324d95f8be4d1b rxvt-unicode.png diff --git a/test/rxvt-unicode/Pkgfile b/test/rxvt-unicode/Pkgfile new file mode 100644 index 000000000..811717734 --- /dev/null +++ b/test/rxvt-unicode/Pkgfile @@ -0,0 +1,57 @@ +# Description: Clone d'un terminal rxvt (urxvt) avec support 256 couileurs +# URL:http://software.schmorp.de/pkg/rxvt-unicode.html +# Maintainer: NuTyX packager team +# Packager: lesibel at free dot fr +# Depends on: xorg-libxft + +name=rxvt-unicode +version=9.06 +release=1 +source=(http://dist.schmorp.de/$name/$name-$version.tar.bz2 \ + rxvt-unicode.desktop \ + rxvt-unicode.png \ + font-width-fix.patch \ + gcc4.4.patch) + +build() { + cd $name-$version + # Add 256 color support + patch -p1 -i doc/urxvt-8.2-256color.patch || return 1 + + # Fix font width bug fix + patch -p0 -i ../font-width-fix.patch || return 1 + + # Port to compile with GCC4.4 + patch -p0 -i ../gcc4.4.patch + + ./configure --prefix=/usr \ + --with-terminfo=/usr/share/terminfo \ + --with-term=rxvt-256color \ + --enable-smart-resize \ + --enable-font-styles \ + --enable-xim \ + --enable-keepscrolling \ + --enable-selectionscrolling \ + --enable-xpm-background \ + --enable-transparency \ + --enable-utmp \ + --enable-wtmp \ + --enable-lastlog + + make + make DESTDIR=$PKG install + +# install -d $PKG/usr/share/terminfo +# export TERMINFO=$PKG/usr/share/terminfo +# make DESTDIR=$PKG install + + # install the tabbing wrapper + sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed + install -D -m755 doc/rxvt-tabbed $PKG/usr/bin/urxvt-tabbed + + # install freedesktop menu and icon ( icon from cvs checkout ) + install -D -m644 ../rxvt-unicode.desktop \ + $PKG/usr/share/applications/rxvt-unicode.desktop + install -Dm644 ../rxvt-unicode.png \ + $PKG/usr/share/pixmaps/rxvt-unicode.png +} diff --git a/test/rxvt-unicode/font-width-fix.patch b/test/rxvt-unicode/font-width-fix.patch new file mode 100644 index 000000000..811d9e615 --- /dev/null +++ b/test/rxvt-unicode/font-width-fix.patch @@ -0,0 +1,26 @@ +--- src/rxvtfont.C.bukind 2007-11-30 14:36:33.000000000 +0600 ++++ src/rxvtfont.C 2007-11-30 14:39:29.000000000 +0600 +@@ -1171,12 +1171,21 @@ + XGlyphInfo g; + XftTextExtents16 (disp, f, &ch, 1, &g); + ++/* ++ * bukind: don't use g.width as a width of a character! ++ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial ++ + g.width -= g.x; + + int wcw = WCWIDTH (ch); + if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; + + if (width < g.width ) width = g.width; ++ */ ++ int wcw = WCWIDTH (ch); ++ if (wcw > 1) g.xOff = g.xOff / wcw; ++ if (width < g.xOff) width = g.xOff; ++ + if (height < g.height ) height = g.height; + if (glheight < g.height - g.y) glheight = g.height - g.y; + } + + diff --git a/test/rxvt-unicode/gcc4.4.patch b/test/rxvt-unicode/gcc4.4.patch new file mode 100644 index 000000000..06be6c4ba --- /dev/null +++ b/test/rxvt-unicode/gcc4.4.patch @@ -0,0 +1,23 @@ +--- src/command.C.old 2009-05-28 15:21:04.457772957 +0200 ++++ src/command.C 2009-05-28 15:18:52.684597530 +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.old 2009-05-28 15:21:16.400270603 +0200 ++++ src/misc.C 2009-05-28 15:21:51.697108339 +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/test/rxvt-unicode/rxvt-unicode.desktop b/test/rxvt-unicode/rxvt-unicode.desktop new file mode 100644 index 000000000..c6169949f --- /dev/null +++ b/test/rxvt-unicode/rxvt-unicode.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=rxvt-unicode +Comment=An Unicode capable rxvt clone +Exec=urxvt +Icon=rxvt-unicode +Terminal=false +Type=Application +Categories=System;TerminalEmulator; diff --git a/test/rxvt-unicode/rxvt-unicode.png b/test/rxvt-unicode/rxvt-unicode.png new file mode 100644 index 000000000..0738a7840 Binary files /dev/null and b/test/rxvt-unicode/rxvt-unicode.png differ -- cgit v1.2.3-54-g00ecf