From 2ecbbf07f462c64880bbe5167e277e76a329045b Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sat, 7 Apr 2007 17:30:26 +0000 Subject: [PATCH] Make gv read its config, bug 158322 Package-Manager: portage-2.1.2.3 --- app-text/gv/ChangeLog | 6 +- app-text/gv/Manifest | 28 +-- app-text/gv/files/digest-gv-3.6.2-r1 | 6 +- app-text/gv/files/gv-30_config.patch | 283 +++++++++++++++++++++++++++ app-text/gv/gv-3.6.2-r1.ebuild | 9 +- 5 files changed, 313 insertions(+), 19 deletions(-) create mode 100644 app-text/gv/files/gv-30_config.patch diff --git a/app-text/gv/ChangeLog b/app-text/gv/ChangeLog index 02ab2f3dd6c8..f8f6d96deef0 100644 --- a/app-text/gv/ChangeLog +++ b/app-text/gv/ChangeLog @@ -1,6 +1,10 @@ # 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.65 2007/04/07 17:14:33 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.66 2007/04/07 17:30:26 genstef Exp $ + + 07 Apr 2007; Stefan Schweizer + +files/gv-30_config.patch, gv-3.6.2-r1.ebuild: + Make gv read its config, bug 158322 07 Apr 2007; Stefan Schweizer gv-3.6.2-r1.ebuild: Add menu entry thanks to Pacho Ramos in diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest index 69333bc60bbf..05581b2ca65d 100644 --- a/app-text/gv/Manifest +++ b/app-text/gv/Manifest @@ -10,24 +10,28 @@ AUX gv-3.6.1-setenv.patch 378 RMD160 c616fb1b0b50f14e2b3783755cbc87ade85f5541 SH MD5 8d217b566c2eeae39312f35d950610bb files/gv-3.6.1-setenv.patch 378 RMD160 c616fb1b0b50f14e2b3783755cbc87ade85f5541 files/gv-3.6.1-setenv.patch 378 SHA256 6456009404d6c0d75f314901dece2c0ee33a0c45ab451c68aec1e31e9601ab68 files/gv-3.6.1-setenv.patch 378 +AUX gv-30_config.patch 9384 RMD160 a5a2c622fe4d65c74562500d3fbf26d86c285a78 SHA1 f04d6e7f5d5c6e71e7fb5f1583f27fc07ca95ab7 SHA256 1d2af3150b92c54df8caa95652733f452f02cfcba03b06c6d578e123c7f37470 +MD5 db7582a1d986bf49a2390cbced39be4b files/gv-30_config.patch 9384 +RMD160 a5a2c622fe4d65c74562500d3fbf26d86c285a78 files/gv-30_config.patch 9384 +SHA256 1d2af3150b92c54df8caa95652733f452f02cfcba03b06c6d578e123c7f37470 files/gv-30_config.patch 9384 AUX gv-update.patch 693 RMD160 04388132145a3b73eab5afc3505508568a3e136a SHA1 fbe4c59e14a67f808190ba753848381fc59a6c2e SHA256 c449358047440ecb5fee71547e7be32a8b43b951df289b0a67b747afa5e49174 MD5 79a091edcc1ecde57129169c8c51687e files/gv-update.patch 693 RMD160 04388132145a3b73eab5afc3505508568a3e136a files/gv-update.patch 693 SHA256 c449358047440ecb5fee71547e7be32a8b43b951df289b0a67b747afa5e49174 files/gv-update.patch 693 DIST gv-3.6.2.tar.gz 446040 RMD160 6479102493e3ebf5b2602a577c02a8b573a73cab SHA1 9753904c7c7c3c89b98c8e949a1579bfbd3b6af5 SHA256 778e79832dd374238a916d8f202f405775de38422477bd6c60bb1aa7845c82f9 -DIST gv_3.6.2-2.diff.gz 12425 RMD160 9289e3caab482de08f51c27cc4e535a9d667308f SHA1 72f31aee561630e40e83b0348145c54890c47d11 SHA256 14a08f3b7fae1e70eac706b8dddeec91fc8f6603aee8f68b1a7f7f7eeb37eecf -EBUILD gv-3.6.2-r1.ebuild 1553 RMD160 1caefc46c944e283cfedd46eddb90c2cce056ee3 SHA1 62150887d05e82f3133936f994de57efda8e770a SHA256 f42d2b2457f9e52a18f8bbd32e61f103174525a81eb74ccd7ceea9e0206c8529 -MD5 3368e8f6bef56d5fbafd473aa320aa97 gv-3.6.2-r1.ebuild 1553 -RMD160 1caefc46c944e283cfedd46eddb90c2cce056ee3 gv-3.6.2-r1.ebuild 1553 -SHA256 f42d2b2457f9e52a18f8bbd32e61f103174525a81eb74ccd7ceea9e0206c8529 gv-3.6.2-r1.ebuild 1553 -MISC ChangeLog 8663 RMD160 b659585a379c05e193c25adc671393c3e31ea9eb SHA1 b8cb78e7689bc4851444417342b3b1d52a58f180 SHA256 3106664dccac9c759271cff0ad24a9eaf310c5e5fda8ea05e71d691c5ca4683b -MD5 d6c7513979be98b98ee8fbb3e591f56a ChangeLog 8663 -RMD160 b659585a379c05e193c25adc671393c3e31ea9eb ChangeLog 8663 -SHA256 3106664dccac9c759271cff0ad24a9eaf310c5e5fda8ea05e71d691c5ca4683b ChangeLog 8663 +DIST gv_3.6.2-3.diff.gz 12464 RMD160 d1aef518f837501abc0151c681e13b9a07b7afc7 SHA1 ec8475b67a8fdd3b78d1e32e08afc3fda8d7ce17 SHA256 cc5c141ecaa3b2c68435d70347508747e2b6a61dec98193fb1f0e51ec01d2d5c +EBUILD gv-3.6.2-r1.ebuild 1627 RMD160 5fa6ca81d892c2520704120cf4d1b2d864cb92f1 SHA1 0a701f4ad6fd8d831882dce19f2611bd53e24497 SHA256 6bb5a278f2f493f9c663cd0d4f6c11c5fc0c04a265b241f94460872795391ddb +MD5 5a1dcb91804bfe083235a9d284dc7f72 gv-3.6.2-r1.ebuild 1627 +RMD160 5fa6ca81d892c2520704120cf4d1b2d864cb92f1 gv-3.6.2-r1.ebuild 1627 +SHA256 6bb5a278f2f493f9c663cd0d4f6c11c5fc0c04a265b241f94460872795391ddb gv-3.6.2-r1.ebuild 1627 +MISC ChangeLog 8804 RMD160 275c31768af5f63f96108b24651ca3d66cd4171b SHA1 21c4bf8c6cace6b6d761a8d3fd5c16f8af33e926 SHA256 6ebcb29900d8f9c984fe5537c0d72b9f21c5c482b9bcf30de4d4cd4352ef10a5 +MD5 59f33ff9d09f72a996b8e3947e3d12f3 ChangeLog 8804 +RMD160 275c31768af5f63f96108b24651ca3d66cd4171b ChangeLog 8804 +SHA256 6ebcb29900d8f9c984fe5537c0d72b9f21c5c482b9bcf30de4d4cd4352ef10a5 ChangeLog 8804 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161 -MD5 fe207876f2cc95ccf4ab657ef9561235 files/digest-gv-3.6.2-r1 458 -RMD160 98b0d6efe686e5fd46a2313ca64a62beeb740ea0 files/digest-gv-3.6.2-r1 458 -SHA256 3fdf4811564809b1aefc068ac2d46a8b4d730e84516c1cc7e032518c3cb03fe3 files/digest-gv-3.6.2-r1 458 +MD5 c4fa422c1f31f95adb742523f35b8910 files/digest-gv-3.6.2-r1 458 +RMD160 bd1ccc4a0a99c9bd61eb6dee09621fbda1f1a5aa files/digest-gv-3.6.2-r1 458 +SHA256 24c7310c393c097258e52c0a418411437fffe0713767294f9ac979f218bf1ccd files/digest-gv-3.6.2-r1 458 diff --git a/app-text/gv/files/digest-gv-3.6.2-r1 b/app-text/gv/files/digest-gv-3.6.2-r1 index ac51275af3b9..35a0945b3a18 100644 --- a/app-text/gv/files/digest-gv-3.6.2-r1 +++ b/app-text/gv/files/digest-gv-3.6.2-r1 @@ -1,6 +1,6 @@ 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 09d4dadd1e0cb6bd07dfc4764c781038 gv_3.6.2-2.diff.gz 12425 -RMD160 9289e3caab482de08f51c27cc4e535a9d667308f gv_3.6.2-2.diff.gz 12425 -SHA256 14a08f3b7fae1e70eac706b8dddeec91fc8f6603aee8f68b1a7f7f7eeb37eecf gv_3.6.2-2.diff.gz 12425 +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-30_config.patch b/app-text/gv/files/gv-30_config.patch new file mode 100644 index 000000000000..b98e8044b369 --- /dev/null +++ b/app-text/gv/files/gv-30_config.patch @@ -0,0 +1,283 @@ +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/gv-3.6.2-r1.ebuild b/app-text/gv/gv-3.6.2-r1.ebuild index 556aabf91ece..9676f52e5943 100644 --- a/app-text/gv/gv-3.6.2-r1.ebuild +++ b/app-text/gv/gv-3.6.2-r1.ebuild @@ -1,13 +1,14 @@ # 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.11 2007/04/07 17:14:33 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.2-r1.ebuild,v 1.12 2007/04/07 17:30:26 genstef 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/gv_3.6.2-2.diff.gz" + mirror://debian/pool/main/g/gv/${DPF}.diff.gz" LICENSE="GPL-2" SLOT="0" @@ -36,7 +37,9 @@ src_unpack() { epatch "${FILESDIR}"/gv-3.6.1-a0.patch epatch "${FILESDIR}"/gv-3.6.1-fixedmedia.patch epatch "${FILESDIR}"/gv-update.patch - epatch "${WORKDIR}"/gv_3.6.2-2.diff + 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:" \ -- 2.26.2