diff options
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/gv/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/gv/files/digest-gv-3.6.2-r1 | 6 | ||||
| -rw-r--r-- | app-text/gv/files/gv-3.6.1-fixedmedia.patch | 24 | ||||
| -rw-r--r-- | app-text/gv/files/gv-30_config.patch | 283 | ||||
| -rw-r--r-- | app-text/gv/files/gv-update.patch | 24 | ||||
| -rw-r--r-- | app-text/gv/gv-3.6.2-r1.ebuild | 56 |
6 files changed, 6 insertions, 394 deletions
diff --git a/app-text/gv/ChangeLog b/app-text/gv/ChangeLog index 7cd65eb566c5..5cb5f6f94e26 100644 --- a/app-text/gv/ChangeLog +++ b/app-text/gv/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/gv # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.74 2007/10/18 13:21:14 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.75 2007/11/18 20:45:11 genstef Exp $ + + 18 Nov 2007; Stefan Schweizer <genstef@gentoo.org> + -files/gv-3.6.1-fixedmedia.patch, -files/gv-30_config.patch, + -files/gv-update.patch, -gv-3.6.2-r1.ebuild: + old 18 Oct 2007; Christoph Mende <angelos@gentoo.org> gv-3.6.3.ebuild: Stable on amd64 wrt bug #187109 diff --git a/app-text/gv/files/digest-gv-3.6.2-r1 b/app-text/gv/files/digest-gv-3.6.2-r1 deleted file mode 100644 index 35a0945b3a18..000000000000 --- a/app-text/gv/files/digest-gv-3.6.2-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 dcdb2205cf0c61394419e015c7548df1 gv-3.6.2.tar.gz 446040 -RMD160 6479102493e3ebf5b2602a577c02a8b573a73cab gv-3.6.2.tar.gz 446040 -SHA256 778e79832dd374238a916d8f202f405775de38422477bd6c60bb1aa7845c82f9 gv-3.6.2.tar.gz 446040 -MD5 0bbdac99315ffd8d704e3a90435a9f51 gv_3.6.2-3.diff.gz 12464 -RMD160 d1aef518f837501abc0151c681e13b9a07b7afc7 gv_3.6.2-3.diff.gz 12464 -SHA256 cc5c141ecaa3b2c68435d70347508747e2b6a61dec98193fb1f0e51ec01d2d5c gv_3.6.2-3.diff.gz 12464 diff --git a/app-text/gv/files/gv-3.6.1-fixedmedia.patch b/app-text/gv/files/gv-3.6.1-fixedmedia.patch deleted file mode 100644 index 31902eecbc97..000000000000 --- a/app-text/gv/files/gv-3.6.1-fixedmedia.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru gv-3.6.1/src/Makefile.am src.orig/Makefile.am ---- src/Makefile.am 2006-04-13 16:24:11.000000000 -0700 -+++ src.orig/Makefile.am 2006-04-13 16:25:49.000000000 -0700 -@@ -195,7 +195,7 @@ - @echo "GV.gsX11AlphaDevice: -sDEVICE=x11 -dTextAlphaBits=4 -dGraphicsAlphaBits=2 -dMaxBitmap=10000000 -dNOPLATFONTS" >> $(srcdir)/gv_intern_res_unix.dat - @echo "GV.gsSafer: True" >> $(srcdir)/gv_intern_res_unix.dat - @echo "GV.gsQuiet: True" >> $(srcdir)/gv_intern_res_unix.dat -- @echo "GV.gsArguments:" >> $(srcdir)/gv_intern_res_unix.dat -+ @echo "GV.gsArguments: -dFIXEDMEDIA" >> $(srcdir)/gv_intern_res_unix.dat - @echo "GV.uncompressCommand: gzip -d -c %s > %s" >> $(srcdir)/gv_intern_res_unix.dat - @echo "GV.printCommand: $(PRINT_COMMAND)" >> $(srcdir)/gv_intern_res_unix.dat - -diff -ru gv-3.6.1/src/Makefile.in src.orig/Makefile.in ---- src/Makefile.in 2006-04-13 16:25:04.000000000 -0700 -+++ src.orig/Makefile.in 2006-04-13 16:25:49.000000000 -0700 -@@ -769,7 +769,7 @@ - @echo "GV.gsX11AlphaDevice: -sDEVICE=x11 -dTextAlphaBits=4 -dGraphicsAlphaBits=2 -dMaxBitmap=10000000 -dNOPLATFONTS" >> $(srcdir)/gv_intern_res_unix.dat - @echo "GV.gsSafer: True" >> $(srcdir)/gv_intern_res_unix.dat - @echo "GV.gsQuiet: True" >> $(srcdir)/gv_intern_res_unix.dat -- @echo "GV.gsArguments:" >> $(srcdir)/gv_intern_res_unix.dat -+ @echo "GV.gsArguments: -dFIXEDMEDIA" >> $(srcdir)/gv_intern_res_unix.dat - @echo "GV.uncompressCommand: gzip -d -c %s > %s" >> $(srcdir)/gv_intern_res_unix.dat - @echo "GV.printCommand: $(PRINT_COMMAND)" >> $(srcdir)/gv_intern_res_unix.dat - diff --git a/app-text/gv/files/gv-30_config.patch b/app-text/gv/files/gv-30_config.patch deleted file mode 100644 index b98e8044b369..000000000000 --- a/app-text/gv/files/gv-30_config.patch +++ /dev/null @@ -1,283 +0,0 @@ -Index: gv-3.6.2/src/main.c -=================================================================== ---- gv-3.6.2.orig/src/main.c 2006-10-16 20:55:40.280698642 +0200 -+++ gv-3.6.2/src/main.c 2006-10-16 21:05:42.041789721 +0200 -@@ -592,10 +592,8 @@ - /*### getting resources ############################################*/ - - { -- XrmDatabase db; - INFMESSAGE(getting resources) -- db = resource_buildDatabase(gv_display,gv_class,gv_name,&argc,argv); -- XrmCombineDatabase(db,&gv_database,False); -+ resource_updateDatabase(gv_display,gv_class,gv_name,&gv_database,&argc,argv); - } - - /*### initializing widget set and creating application shell #########################*/ -Index: gv-3.6.2/src/resource.c -=================================================================== ---- gv-3.6.2.orig/src/resource.c 2005-08-10 13:33:21.000000000 +0200 -+++ gv-3.6.2/src/resource.c 2006-10-16 21:23:11.885580469 +0200 -@@ -110,13 +110,14 @@ - } - - /*####################################################### -- resource_buildDatabase -+ resource_updateDatabase - #######################################################*/ - --XrmDatabase resource_buildDatabase(display,app_class,app_name,argcP,argv) -+void resource_updateDatabase(display,app_class,app_name,dbp,argcP,argv) - Display *display; - char *app_class; - char *app_name; -+ XrmDatabase *dbp; - int *argcP; - char **argv; - { -@@ -126,8 +127,7 @@ - char *spartan_filename; - char tmp[GV_MAX_FILENAME_LENGTH]; - -- -- BEGINMESSAGE(resource_buildDatabase) -+ BEGINMESSAGE(resource_updateDatabase) - - /* ### class resources ################# */ - INFMESSAGE(merging class resources into database) -@@ -146,6 +146,8 @@ - XrmCombineFileDatabase(rpath,&db,True); - resource_system_file = rpath; - } -+ XrmCombineDatabase(db,dbp,False); -+ db = NULL; - - /* ### user resources ################# */ - INFMESSAGE(checking for user resources) -@@ -166,6 +168,9 @@ - resource_user_file = GV_XtNewString(tmp); - } - -+ XrmCombineDatabase(db,dbp,True); -+ db = *dbp; -+ - /* ### command line resources ################# */ - - /* -@@ -177,35 +182,35 @@ - - if (antialias_p) - { -- resource_putResource (&db, app_name, ".antialias", "True"); -+ resource_putResource (dbp, app_name, ".antialias", "True"); - } - if (noantialias_p) - { -- resource_putResource (&db, app_name, ".antialias", "False"); -+ resource_putResource (dbp, app_name, ".antialias", "False"); - } - if (safer_p) - { -- resource_putResource (&db, app_name, ".gsSafer", "True"); -+ resource_putResource (dbp, app_name, ".gsSafer", "True"); - } - if (nosafer_p) - { -- resource_putResource (&db, app_name, ".gsSafer", "False"); -+ resource_putResource (dbp, app_name, ".gsSafer", "False"); - } - if (pixmap_p) - { -- resource_putResource (&db, app_name, ".useBackingPixmap", "True"); -+ resource_putResource (dbp, app_name, ".useBackingPixmap", "True"); - } - if (nopixmap_p) - { -- resource_putResource (&db, app_name, ".useBackingPixmap", "False"); -+ resource_putResource (dbp, app_name, ".useBackingPixmap", "False"); - } - if (color_p) - { -- resource_putResource (&db, app_name, "*Ghostview.palette", "Color"); -+ resource_putResource (dbp, app_name, "*Ghostview.palette", "Color"); - } - if (grayscale_p) - { -- resource_putResource (&db, app_name, "*Ghostview.palette", "Grayscale"); -+ resource_putResource (dbp, app_name, "*Ghostview.palette", "Grayscale"); - } - if (spartan_p) - { -@@ -214,109 +219,109 @@ - spartan_filename[0] = '\0'; - strcat(spartan_filename, GV_LIBDIR); - strcat(spartan_filename, "/gv_spartan.dat"); -- resource_putResource (&db, app_name, ".style", spartan_filename); -+ resource_putResource (dbp, app_name, ".style", spartan_filename); - GV_XtFree (spartan_filename); - } - if (quiet_p) - { -- resource_putResource (&db, app_name, ".gsQuiet", "True"); -+ resource_putResource (dbp, app_name, ".gsQuiet", "True"); - } - if (monochrome_p) - { -- resource_putResource (&db, app_name, "*Ghostview.palette", "Monochrome"); -+ resource_putResource (dbp, app_name, "*Ghostview.palette", "Monochrome"); - } - if (noquiet_p) - { -- resource_putResource (&db, app_name, ".gsQuiet", "False"); -+ resource_putResource (dbp, app_name, ".gsQuiet", "False"); - } - if (media_p) - { -- resource_putResource (&db, app_name, ".pageMedia", media_value); -+ resource_putResource (dbp, app_name, ".pageMedia", media_value); - } - if (orientation_p) - { -- resource_putResource (&db, app_name, ".orientation", orientation_value); -+ resource_putResource (dbp, app_name, ".orientation", orientation_value); - } - if (page_p) - { -- resource_putResource (&db, app_name, ".page", page_value); -+ resource_putResource (dbp, app_name, ".page", page_value); - } - - if (center_p) - { -- resource_putResource (&db, app_name, ".autoCenter", "True"); -+ resource_putResource (dbp, app_name, ".autoCenter", "True"); - } - if (nocenter_p) - { -- resource_putResource (&db, app_name, ".autoCenter", "False"); -+ resource_putResource (dbp, app_name, ".autoCenter", "False"); - } - if (scale_p) - { -- resource_putResource (&db, app_name, ".scale", scale_value); -+ resource_putResource (dbp, app_name, ".scale", scale_value); - } - if (magstep_p) - { -- resource_putResource (&db, app_name, ".scale", magstep_value); -+ resource_putResource (dbp, app_name, ".scale", magstep_value); - } - if (scalebase_p) - { -- resource_putResource (&db, app_name, ".scaleBase", scalebase_value); -+ resource_putResource (dbp, app_name, ".scaleBase", scalebase_value); - } - if (resize_p) - { -- resource_putResource (&db, app_name, ".autoResize", "True"); -+ resource_putResource (dbp, app_name, ".autoResize", "True"); - } - if (noresize_p) - { -- resource_putResource (&db, app_name, ".autoResize", "False"); -+ resource_putResource (dbp, app_name, ".autoResize", "False"); - } - if (swap_p) - { -- resource_putResource (&db, app_name, ".swapLandscape", "True"); -+ resource_putResource (dbp, app_name, ".swapLandscape", "True"); - } - if (noswap_p) - { -- resource_putResource (&db, app_name, ".swapLandscape", "False"); -+ resource_putResource (dbp, app_name, ".swapLandscape", "False"); - } - if (dsc_p) - { -- resource_putResource (&db, app_name, ".respectDSC", "True"); -+ resource_putResource (dbp, app_name, ".respectDSC", "True"); - } - if (nodsc_p) - { -- resource_putResource (&db, app_name, ".respectDSC", "False"); -+ resource_putResource (dbp, app_name, ".respectDSC", "False"); - } - if (eof_p) - { -- resource_putResource (&db, app_name, ".ignoreEOF", "True"); -+ resource_putResource (dbp, app_name, ".ignoreEOF", "True"); - } - if (noeof_p) - { -- resource_putResource (&db, app_name, ".ignoreEOF", "False"); -+ resource_putResource (dbp, app_name, ".ignoreEOF", "False"); - } - if (watch_p) - { -- resource_putResource (&db, app_name, ".watchFile", "True"); -+ resource_putResource (dbp, app_name, ".watchFile", "True"); - } - if (nowatch_p) - { -- resource_putResource (&db, app_name, ".watchFile", "False"); -+ resource_putResource (dbp, app_name, ".watchFile", "False"); - } - if (ad_p) - { -- resource_putResource (&db, app_name, ".ad", ad_value); -+ resource_putResource (dbp, app_name, ".ad", ad_value); - } - if (style_p) - { -- resource_putResource (&db, app_name, ".style", style_value); -+ resource_putResource (dbp, app_name, ".style", style_value); - } - if (arguments_p) - { -- resource_putResource (&db, app_name, ".arguments", arguments_value); -+ resource_putResource (dbp, app_name, ".arguments", arguments_value); - } - - INFMESSAGE(parsing command line) -- XrmParseCommand(&db,options,XtNumber(options),app_name,argcP,argv); -+ XrmParseCommand(dbp,options,XtNumber(options),app_name,argcP,argv); - - /* ### style resources ######################## */ - INFMESSAGE(checking for style resources) -@@ -354,7 +359,7 @@ - */ - - INFSMESSAGE(merging style resource file into database,s) -- t = resource_mergeFileIntoDatabase(&db,s); -+ t = resource_mergeFileIntoDatabase(dbp,s); - if (!t) { - fprintf(stderr,"%s: Style file '%s' not found - ignored\n",app_name,s); - s=NULL; -@@ -384,8 +389,7 @@ - if (t) GV_XtFree(t); - } - -- ENDMESSAGE(resource_buildDatabase) -- return(db); -+ ENDMESSAGE(resource_updateDatabase) - } - - /*####################################################### -Index: gv-3.6.2/src/resource.h -=================================================================== ---- gv-3.6.2.orig/src/resource.h 2004-12-06 13:52:10.000000000 +0100 -+++ gv-3.6.2/src/resource.h 2006-10-16 21:24:43.243115805 +0200 -@@ -38,11 +38,12 @@ - #endif - ); - --extern XrmDatabase resource_buildDatabase ( -+extern void resource_updateDatabase ( - #if NeedFunctionPrototypes - Display *, - char *, - char *, -+ XrmDatabase *, - int *, - char ** - #endif diff --git a/app-text/gv/files/gv-update.patch b/app-text/gv/files/gv-update.patch deleted file mode 100644 index b58b705129d5..000000000000 --- a/app-text/gv/files/gv-update.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fixes bug "pdf problems with gv" (Bug #13200). -http://savannah.gnu.org/bugs/index.php?func=detailitem&item_id=13200 - -by Markus Steinborn <msteinbo@uni-paderborn.de>, - Student of Computer Science - University of Paderborn. - -Index: src/callbacks.c -=================================================================== ---- src/callbacks.c (Revision 25) -+++ src/callbacks.c (Revision 26) -@@ -357,7 +357,11 @@ - - BEGINMESSAGE(cb_checkFile) - changed = check_file(((int)client_data)); -- if (changed==1) show_page(current_page,NULL); -+ if (changed==1) -+ { -+ cb_stopInterpreter(page,NULL,NULL); -+ show_page(current_page,NULL); -+ } - ENDMESSAGE(cb_checkFile) - } - diff --git a/app-text/gv/gv-3.6.2-r1.ebuild b/app-text/gv/gv-3.6.2-r1.ebuild deleted file mode 100644 index a6c7d69d05f7..000000000000 --- a/app-text/gv/gv-3.6.2-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.2-r1.ebuild,v 1.13 2007/07/22 10:21:01 omp Exp $ - -inherit eutils - -DPF="gv_3.6.2-3" -DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript" -HOMEPAGE="http://www.gnu.org/software/gv/" -SRC_URI="mirror://gnu/gv/${P}.tar.gz - mirror://debian/pool/main/g/gv/${DPF}.diff.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - x11-libs/Xaw3d - virtual/ghostscript" -DEPEND="${RDEPEND} - x11-libs/libXt" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/gv-3.6.1-setenv.patch - epatch "${FILESDIR}"/gv-3.6.1-a0.patch - epatch "${FILESDIR}"/gv-3.6.1-fixedmedia.patch - epatch "${FILESDIR}"/gv-update.patch - epatch "${FILESDIR}"/gv-30_config.patch - # apply debian patches - epatch "${WORKDIR}"/${DPF}.diff - epatch ${P}/debian/patches/{*-*,*_*} - # Make font render nicely even with gs-8, bug 135354 - sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" \ - src/{gv_{class,user,system}.ad,Makefile.{am,in}} -} - -src_compile() { - econf --enable-scrollbar-code || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - doicon src/gv_icon.xbm - make_desktop_entry gv "GhostView" /usr/share/pixmaps/gv_icon.xbm "Application;Graphics;Viewer;" - dodoc AUTHORS ChangeLog INSTALL README TODO -} |