diff --git a/package/jimmy/zgv/gcc-3.3.patch b/package/jimmy/zgv/gcc-3.3.patch deleted file mode 100644 index 13dbd2b90..000000000 --- a/package/jimmy/zgv/gcc-3.3.patch +++ /dev/null @@ -1,47 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/jimmy/zgv/gcc-3.3.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/bdf2h.c.orig 2000-06-01 17:44:48.000000000 +0300 -+++ ./src/bdf2h.c 2003-10-19 09:26:48.000000000 +0300 -@@ -45,14 +45,14 @@ - */ - printf("#ifndef DEFINED_STRUCT_FONTINFO_TAG\n"); - printf("#define DEFINED_STRUCT_FONTINFO_TAG 1\n"); --printf("\ --struct fontinfo_tag -- { -- signed char *data; -- int table[96]; -- int yofs,fh,oy; -- }; --"); -+printf( -+"struct fontinfo_tag\n" -+" {\n" -+" signed char *data;\n" -+" int table[96];\n" -+" int yofs,fh,oy;\n" -+" };\n" -+); - printf("#endif\n\n"); - - /* generate font data */ diff --git a/package/jimmy/zgv/zgv.conf b/package/jimmy/zgv/zgv.conf index 98651f1a1..e8ec5a487 100644 --- a/package/jimmy/zgv/zgv.conf +++ b/package/jimmy/zgv/zgv.conf @@ -32,6 +32,7 @@ zgv_postmake() { premake="mkdir -p $root/$prefix/man/man1" makeopt="$makeopt PREFIX=$root/$prefix WARNOPTS=\"-Wall -I/usr/include/libpng\"" +makeopt="$makeopt RCFILE=$sysconfdir/zgv.conf" makeinstopt="PREFIX=$root/$prefix $makeinstopt" postmake=zgv_postmake postdoc="rm -f $docdir/{$pkg,$pkg-[0-9]}" diff --git a/package/jimmy/zgv/zgv.desc b/package/jimmy/zgv/zgv.desc index 793f68d6b..dde9c2853 100644 --- a/package/jimmy/zgv/zgv.desc +++ b/package/jimmy/zgv/zgv.desc @@ -27,8 +27,8 @@ [T] speed/quality tradeoff options), PNG (compliation option), PBM/PGM/PPM, [T] BMP,TGA, PCX and mrf formats, and is also a file manager for graphic [T] files with copy, move and delete. -[T] The ROCK-Linux package includes additional modes: 400x300, 512x384, -[T] 720x540 and 960x720 in 8, 16, 24 and 32bpp. +[T] The ROCK-Linux package includes the following additional modes: 400x300, +[T] 512x384, 720x540 and 960x720 at 8, 16, 24 and 32bpp. [A] Russell Marks [M] Dimitar Zhekov @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 5.7 +[V] 5.8 [P] X -----5---9 682.000 -[D] 4035674879 zgv-5.7.tar.gz ftp://sunsite.unc.edu/pub/Linux/apps/graphics/viewers/svga/ +[D] 701012126 zgv-5.8.tar.gz ftp://sunsite.unc.edu/pub/Linux/apps/graphics/viewers/svga/