From 98ab928e9895ac03838f736e5d9c8e9472298bdc Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Sun, 6 Nov 2011 06:39:07 +0000 Subject: Fix eps importing. Package-Manager: portage-2.1.10.32/cvs/Linux x86_64 --- media-gfx/xfig/ChangeLog | 8 +- media-gfx/xfig/Manifest | 14 +-- .../xfig/files/xfig-3.2.5b-fix-eps-reading.patch | 46 ++++++++++ media-gfx/xfig/xfig-3.2.5b-r2.ebuild | 99 ++++++++++++++++++++++ 4 files changed, 159 insertions(+), 8 deletions(-) create mode 100644 media-gfx/xfig/files/xfig-3.2.5b-fix-eps-reading.patch create mode 100644 media-gfx/xfig/xfig-3.2.5b-r2.ebuild (limited to 'media-gfx/xfig') diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog index 1ac03d95366f..0d91adc507fb 100644 --- a/media-gfx/xfig/ChangeLog +++ b/media-gfx/xfig/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/xfig # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.75 2011/08/02 05:48:12 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.76 2011/11/06 06:39:07 pva Exp $ + +*xfig-3.2.5b-r2 (06 Nov 2011) + + 06 Nov 2011; Peter Volkov +xfig-3.2.5b-r2.ebuild, + +files/xfig-3.2.5b-fix-eps-reading.patch: + Fix eps importing. 02 Aug 2011; Matt Turner xfig-3.2.5b-r1.ebuild: Renamed x11-libs/Xaw3d to x11-libs/libXaw3d. diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest index b7cd695b4071..d58f05d357e7 100644 --- a/media-gfx/xfig/Manifest +++ b/media-gfx/xfig/Manifest @@ -4,6 +4,7 @@ Hash: SHA256 AUX xfig-3.2.5b-CVE-2010-4262.patch 619 RMD160 12bdb2b859d2fe21f95a3c9fc3f74141191b3344 SHA1 4620fd44f6231038c3bb66fde33a793437fe82ca SHA256 694ea1b3bfd73272c861cb51a0180bfa8915166302636684e8b4561a8b1afb3b AUX xfig-3.2.5b-app-defaults.patch 601 RMD160 1f7b5998decfe729a266ac0e6a1219708cd9cc28 SHA1 ddb1afddb568aa8df602b55387fcf12080b67420 SHA256 e475edf793fb74ccf07c52d864c7d8e1f89fcc5c8204b69b60b1e7431d13311b AUX xfig-3.2.5b-figparserstack.patch 1787 RMD160 1885fdc4f9955a8658c8895f8df37beb7cc86d17 SHA1 55e9d2b4ee43965b9469015adbf213d8239f0064 SHA256 334ccd66978934defed3e060b324db1fd729fb2fc02e6606149a3ec28f12c71d +AUX xfig-3.2.5b-fix-eps-reading.patch 1700 RMD160 e50b3e88fa6d5753e26101005804ea7de39be1c0 SHA1 12a64ddaf65a73e23ef74f31483515a0e262768c SHA256 b261f311c937ae58e3398424e90607c88496f751b6342eae0a519af2a6eec82c AUX xfig-3.2.5b-libpng-1.5.patch 2524 RMD160 891a31f2286869aa6e8922bcc20bd6a7d8e474aa SHA1 83032eb61c8dc96d5fc509a1ce632528457d4598 SHA256 f3b17684e360fe3c0f0b9836e6d05ca5c707297e1f21e7898a83a56bb988dad5 AUX xfig-3.2.5b-mkstemp.patch 979 RMD160 1c49878335af15a0d40db55ac38112ddf9923f78 SHA1 8ac04a8ae496dceb988c8dff582a03036baa76d4 SHA256 0881185381976aaad5b62d54baf7df96981b41a54a74c24710971b175e9e520c AUX xfig-3.2.5b-network_images.patch 11918 RMD160 586d778f3de077bc5cc4c8a4ea174869078ab157 SHA1 331641aec1151f99995d4441204f77711aa140ee SHA256 08d983eea753008d3a2a9c7bebf0f9035e795ad3038dbbb05c2a512d86163695 @@ -14,14 +15,13 @@ AUX xfig-3.2.5b-urwfonts.patch 4921 RMD160 0f706460c4bbdfa3ad9c766423f72d74d1ca4 AUX xfig-3.2.5b-zoom-during-edit.patch 691 RMD160 8f12f1b632a57c74ab6d05a159dbcfe30f434f9e SHA1 6881b529345b655d5cf8b8087c3f7ae2de36e082 SHA256 922c8dd8d3949caca71be28043889db6359eb7ecd4509ce339f216df11b41e5b DIST xfig.3.2.5b.full.tar.gz 5821049 RMD160 aad4cfd808c116d34218e9890a898652e4f52ab6 SHA1 0730d7e6bc217c0de02682efb0078821512bb542 SHA256 5c01cf6d79f4de04e3d9efc9f3e4ea046e880d6610f210c8551bb0a713e985c2 EBUILD xfig-3.2.5b-r1.ebuild 2788 RMD160 a12fa5c04d3ec1b8bff462172a8a44ff61ca2e21 SHA1 78fde0250ceb540cfd9238c632353a23dac0a8a3 SHA256 0f2006e29d0c7cd2c9f5c04ac998cd01b8e6272952bf2af09ec75968bb079421 -MISC ChangeLog 11305 RMD160 45e5e80cb6f17a64116f41615daf2d7c80f5cd5c SHA1 540183cda09a4497380262f34a4ac6ca13dee260 SHA256 b934fbb2cea5129e0654fb5e8b0094013244290d495ac5e1ddbb98e8af0f3f5d +EBUILD xfig-3.2.5b-r2.ebuild 2899 RMD160 40e93daf58df36ca0ddf2dee3997210b389dc94c SHA1 301813fa44ed8b4da7dd9c4703d4f7d41a8a1a92 SHA256 86c5faf20a2410161d75ba27a95d5e5ecd30bd79481d7b65b923e26243a61a80 +MISC ChangeLog 11466 RMD160 49998666978a2e2b40e7108db55b248bbd606ae7 SHA1 edeead2938d49a30f9b02061e19c74e163d9bb34 SHA256 7f03fbecb0920c21d98afb5853d16e8d9ae64b35a9001952a0003e63c5570e72 MISC metadata.xml 228 RMD160 bcdd76c994501350b97e70c443e09ebf3172df41 SHA1 1a35ed2e9e695b6f228703fce8baf6c3a5ae71d0 SHA256 c1d5f02bf3a5a5a936093a7df8732f0d4ae6cda289d1f24f938651a98e2809cb -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk59owcACgkQfXuS5UK5QB0nFwP8ClCzhzx0yFidI2YWeOgopfXk -OwQ2OTryMOXpp7dYl35/vlOL1hpQCm5rvUJcG68/WzQbNG5p7JfGshF5Ro4UsQ/Z -5Icr1ac9hsL+Ro7SQMZLD8Wij8lLg/MXGN6fF0ttxcG0O+HIYxCM1mQ29WKwEuDx -I5CY0A7UYMjeGMxaqtQ= -=1VAn +iF4EAREIAAYFAk62Ku0ACgkQGrk+8vGYmweGegD/bY7N5wyvW0ELbPqgUEbUjOEu +F2H7e/aTRdMkdGm9ddcBAJmL+bexGIwmZIPobAaYiO7EB2ocXgOd0rAkF+sOv9Kb +=lH3N -----END PGP SIGNATURE----- diff --git a/media-gfx/xfig/files/xfig-3.2.5b-fix-eps-reading.patch b/media-gfx/xfig/files/xfig-3.2.5b-fix-eps-reading.patch new file mode 100644 index 000000000000..7601d20eae31 --- /dev/null +++ b/media-gfx/xfig/files/xfig-3.2.5b-fix-eps-reading.patch @@ -0,0 +1,46 @@ +diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c +--- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200 ++++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100 +@@ -252,12 +252,13 @@ + { + char buf[300]; + FILE *tmpfp, *pixfile, *gsfile; +- char *psnam, *driver; ++ char *driver; + int status, wid, ht, nbitmap, fd; + char tmpfile[PATH_MAX], + pixnam[PATH_MAX], + errnam[PATH_MAX], +- gscom[2 * PATH_MAX]; ++ gscom[2 * PATH_MAX], ++ psnam[PATH_MAX]; + + wid = urx - llx; + ht = ury - lly; +@@ -307,19 +308,14 @@ + /* for color, use pcx */ + driver = "pcx256"; + } +- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */ +- if (tmpfile[0] == '/') { +- psnam = strrchr(tmpfile, '/'); +- *psnam = 0; +- sprintf(gscom, "cd \"%s/\";", tmpfile); +- *psnam++ = '/'; /* Restore name for unlink() below */ +- } else { +- psnam = tmpfile; +- gscom[0] = '\0'; ++ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */ ++ if (!realpath(tmpfile, psnam)) { ++ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno)); ++ return False; + } +- sprintf(&gscom[strlen(gscom)], +- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1", +- appres.ghostscript, driver, wid, ht, pixnam, errnam); ++ sprintf(gscom, ++ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1", ++ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam); + if (appres.DEBUG) + fprintf(stderr,"calling: %s\n",gscom); + if ((gsfile = popen(gscom, "w")) == 0) { diff --git a/media-gfx/xfig/xfig-3.2.5b-r2.ebuild b/media-gfx/xfig/xfig-3.2.5b-r2.ebuild new file mode 100644 index 000000000000..85e6d4a04268 --- /dev/null +++ b/media-gfx/xfig/xfig-3.2.5b-r2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild,v 1.1 2011/11/06 06:39:07 pva Exp $ + +EAPI="2" +inherit eutils multilib + +MY_P=${PN}.${PV} + +DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window." +HOMEPAGE="http://www.xfig.org" +SRC_URI="mirror://sourceforge/mcj/${MY_P}.full.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="x11-libs/libXaw + x11-libs/libXp + x11-libs/libXaw3d + x11-libs/libXi + virtual/jpeg + media-libs/libpng + media-fonts/font-misc-misc + media-fonts/urw-fonts + >=media-gfx/transfig-3.2.5-r1 + media-libs/netpbm" +DEPEND="${RDEPEND} + x11-misc/imake + x11-proto/xproto + x11-proto/inputproto" + +S=${WORKDIR}/${MY_P} + +sed_Imakefile() { + # see Imakefile for details + vars2subs=( BINDIR=/usr/bin + PNGINC=-I/usr/include + JPEGLIBDIR="/usr/$(get_libdir)" + JPEGINC=-I/usr/include + XPMLIBDIR="/usr/$(get_libdir)" + XPMINC=-I/usr/include/X11 + "USEINLINE = -DUSE_INLINE" + XFIGLIBDIR=/usr/share/xfig + XFIGDOCDIR="/usr/share/doc/${PF}" + MANDIR="/usr/share/man/man\$\(MANSUFFIX\)" + "CC=$(tc-getCC)" ) + + for variable in "${vars2subs[@]}" ; do + varname=${variable%%=*} + varval=${variable##*=} + sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" + done + sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" "$@" + if has_version '>=x11-libs/libXaw3d-1.5e'; then + einfo "x11-libs/libXaw3d 1.5e and abover installed" + sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@" + fi +} + +src_prepare() { + # Permissions are really crazy here + chmod -R go+rX . + find . -type f -exec chmod a-x '{}' \; + epatch "${FILESDIR}/${P}-figparserstack.patch" #297379 + epatch "${FILESDIR}/${P}-spelling.patch" + epatch "${FILESDIR}/${P}-papersize_b1.patch" + epatch "${FILESDIR}/${P}-pdfimport_mediabox.patch" + epatch "${FILESDIR}/${P}-network_images.patch" + epatch "${FILESDIR}/${P}-app-defaults.patch" + epatch "${FILESDIR}/${P}-zoom-during-edit.patch" + epatch "${FILESDIR}/${P}-urwfonts.patch" + epatch "${FILESDIR}/${P}-mkstemp.patch" #264575 + epatch "${FILESDIR}/${P}-CVE-2010-4262.patch" #348344 + epatch "${FILESDIR}/${P}-libpng-1.5.patch" #356753 + #https://bugzilla.redhat.com/show_bug.cgi?id=657290 + epatch "${FILESDIR}/xfig-3.2.5b-fix-eps-reading.patch" + + sed_Imakefile Imakefile + sed -e "s:/usr/lib/X11/xfig:/usr/share/doc/${PF}:" \ + -i Doc/xfig.man -i Doc/xfig_man.html || die +} + +src_compile() { + xmkmf || die + emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \ + USRLIBDIR=/usr/$(get_libdir) || die +} + +src_install() { + emake -j1 DESTDIR="${D}" install.all || die + + insinto /usr/share/doc/${PF} + doins README FIGAPPS CHANGES LATEX.AND.XFIG + + doicon xfig.png + make_desktop_entry xfig Xfig xfig +} -- cgit v1.2.3-65-gdbad