Author: arekm Date: Fri Feb 10 10:32:23 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 3.2.5d + gentoo patches
---- Files affected: packages/transfig: transfig.spec (1.60 -> 1.61) , transfig-3.2.5c-maxfontsize.patch (NONE -> 1.1) (NEW), transfig-3.2.5d-MAXWIDTH.patch (NONE -> 1.1) (NEW), transfig-3.2.5d-leadspace.patch (NONE -> 1.1) (NEW), transfig-3.2.5d-libpng-1.5.patch (NONE -> 1.1) (NEW), transfig-3.2.5d-precision.patch (NONE -> 1.1) (NEW), transfig-badc.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/transfig/transfig.spec diff -u packages/transfig/transfig.spec:1.60 packages/transfig/transfig.spec:1.61 --- packages/transfig/transfig.spec:1.60 Tue Feb 7 23:08:00 2012 +++ packages/transfig/transfig.spec Fri Feb 10 11:32:18 2012 @@ -9,17 +9,22 @@ Summary(tr.UTF-8): fig dosyalarını başka biçimlere dönüştürür Summary(uk.UTF-8): Конвертор файлів .fig (формат програми xfig) в інші формати Name: transfig -Version: 3.2.5 -Release: 5 +Version: 3.2.5d +Release: 1 Epoch: 1 License: distributable Group: X11/Applications/Graphics #Source0Download: http://xfig.org/art15.html -Source0: http://xfig.org/software/xfig/%{version}/%{name}.%{version}.tar.gz -# Source0-md5: 3b2cffdd25529ae5877e305f29aae6d1 +# Source0: http://xfig.org/software/xfig/%{version}/%{name}.%{version}.tar.gz +Source0: http://downloads.sourceforge.net/mcj/%{name}.%{version}.tar.gz +# Source0-md5: f9eac7f265668ecbfda6aaf7581989ad Patch0: %{name}-config.patch Patch1: %{name}-broken.patch -Patch2: %{name}-badc.patch +Patch2: %{name}-3.2.5c-maxfontsize.patch +Patch3: %{name}-3.2.5d-precision.patch +Patch4: %{name}-3.2.5d-MAXWIDTH.patch +Patch5: %{name}-3.2.5d-libpng-1.5.patch +Patch6: %{name}-3.2.5d-leadspace.patch URL: http://xfig.org/ BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -88,6 +93,10 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build xmkmf -a @@ -143,6 +152,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.61 2012/02/10 10:32:18 arekm +- up to 3.2.5d + gentoo patches + Revision 1.60 2012/02/07 22:08:00 arekm - release 5 ================================================================ Index: packages/transfig/transfig-3.2.5c-maxfontsize.patch diff -u /dev/null packages/transfig/transfig-3.2.5c-maxfontsize.patch:1.1 --- /dev/null Fri Feb 10 11:32:23 2012 +++ packages/transfig/transfig-3.2.5c-maxfontsize.patch Fri Feb 10 11:32:18 2012 @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_maxfontsize.dpatch by Roland Rosenfeld <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: For fonts >=42pt use the given font size in TeX instead of +## DP: restricting this to 42pt. This allows to create posters using +## DP: \usepackage{type1cm}. See +## DP: http://linuxgazette.vlsm.org/issue96/artime.html and Bug#343139 + +@DPATCH@ +diff -urNad transfig~/LATEX.AND.XFIG transfig/LATEX.AND.XFIG +--- transfig~/LATEX.AND.XFIG ++++ transfig/LATEX.AND.XFIG +@@ -55,7 +55,7 @@ + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LaTeX Preamble %%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +-\documentstyle[12pt,bezier,amstex]{article} % include bezier curves ++\documentclass[12pt,bezier,amstex]{article} % include bezier curves + \renewcommand\baselinestretch{1.0} % single space + \pagestyle{empty} % no headers and page numbers + \oddsidemargin -10 true pt % Left margin on odd-numbered pages. +@@ -72,7 +72,9 @@ + \usepackage{epsfig} + + \usepackage{graphicx} % Graphics package +- ++ ++\usepackage{type1cm} % Necessary for fonts bigger than 42pt ++ + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Document Beginning %%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +diff -urNad transfig~/fig2dev/dev/texfonts.h transfig/fig2dev/dev/texfonts.h +--- transfig~/fig2dev/dev/texfonts.h ++++ transfig/fig2dev/dev/texfonts.h +@@ -86,6 +86,7 @@ + + #define TEXFONTSIZE(S) (texfontsizes[((S) <= MAXFONTSIZE) ? (int)(round(S))\ + : (MAXFONTSIZE-1)]) ++#define TEXFONTSIZE(S) (((S) <= MAXFONTSIZE) ? texfontsizes[(int)(round(S))] : (S)) + #define TEXFONTMAG(T) TEXFONTSIZE(T->size*(rigid_text(T) ? 1.0 : fontmag)) + + void setfigfont( F_text *text ); /* genepic.c */ ================================================================ Index: packages/transfig/transfig-3.2.5d-MAXWIDTH.patch diff -u /dev/null packages/transfig/transfig-3.2.5d-MAXWIDTH.patch:1.1 --- /dev/null Fri Feb 10 11:32:23 2012 +++ packages/transfig/transfig-3.2.5d-MAXWIDTH.patch Fri Feb 10 11:32:18 2012 @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_MAXWIDTH.dpatch by Roland Rosenfeld <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Increasese MAXWIDTH of embedded images from 8K to 16K (Closes: #610466) + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/psencode.c transfig/fig2dev/dev/psencode.c +--- transfig~/fig2dev/dev/psencode.c ++++ transfig/fig2dev/dev/psencode.c +@@ -18,7 +18,7 @@ + + #include "fig2dev.h" + +-#define MAXWIDTH 8192 ++#define MAXWIDTH 16384 + + #define put_string nc=strlen(s); for(i=0;i<nc;i++) (putc((s[i]),tfp)); Nbyte += nc + ================================================================ Index: packages/transfig/transfig-3.2.5d-leadspace.patch diff -u /dev/null packages/transfig/transfig-3.2.5d-leadspace.patch:1.1 --- /dev/null Fri Feb 10 11:32:23 2012 +++ packages/transfig/transfig-3.2.5d-leadspace.patch Fri Feb 10 11:32:18 2012 @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_PIC_leadspace.dpatch by Roger Leigh <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Avoid wrong leading spaces in PIC text (Closes: #611977). + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/genpic.c transfig/fig2dev/dev/genpic.c +--- transfig~/fig2dev/dev/genpic.c ++++ transfig/fig2dev/dev/genpic.c +@@ -443,7 +443,7 @@ + size = PICFONTMAG(t); + if (!OptNoUnps) { + unpsfont(t); +- fprintf(tfp, "\"\\s%d\\f%s ", size, PICFONT(t->font)); ++ fprintf(tfp, "\"\\s%d\\f%s", size, PICFONT(t->font)); + } else { + fprintf(tfp, ".ps\n.ps %d\n", size ); + fprintf(tfp, ".ft\n.ft %s\n", PICPSFONT(t) ); ================================================================ Index: packages/transfig/transfig-3.2.5d-libpng-1.5.patch diff -u /dev/null packages/transfig/transfig-3.2.5d-libpng-1.5.patch:1.1 --- /dev/null Fri Feb 10 11:32:23 2012 +++ packages/transfig/transfig-3.2.5d-libpng-1.5.patch Fri Feb 10 11:32:18 2012 @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/show_bug.cgi?id=356751 + +Index: transfig.3.2.5d/fig2dev/dev/readpng.c +=================================================================== +--- transfig.3.2.5d.orig/fig2dev/dev/readpng.c ++++ transfig.3.2.5d/fig2dev/dev/readpng.c +@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly) + } + + /* set long jump here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* if we get here there was a problem reading the file */ + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return 0; +@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly) + png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, + &interlace_type, &compression_type, &filter_type); + +- if (info_ptr->valid & PNG_INFO_gAMA) +- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); +- else +- png_set_gamma(png_ptr, 2.2, 0.45); ++ png_fixed_point gamma = 0.45; ++ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); ++ png_set_gamma(png_ptr, 2.2, gamma); + +- if (info_ptr->valid & PNG_INFO_bKGD) ++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { + /* set the background to the one supplied */ +- png_set_background(png_ptr, &info_ptr->background, ++ png_color_16p background; ++ png_get_bKGD(png_ptr,info_ptr,&background); ++ png_set_background(png_ptr, background, + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); ++ } + else { + /* blend the canvas background using the alpha channel */ + if (bgspec) { ================================================================ Index: packages/transfig/transfig-3.2.5d-precision.patch diff -u /dev/null packages/transfig/transfig-3.2.5d-precision.patch:1.1 --- /dev/null Fri Feb 10 11:32:23 2012 +++ packages/transfig/transfig-3.2.5d-precision.patch Fri Feb 10 11:32:18 2012 @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 24_PIC_precision.dpatch by Roger Leigh <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change the precision of PIC floating point output from %.2f to %.3f. +## DP: (Closes: #611948) + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/genpic.c transfig/fig2dev/dev/genpic.c +--- transfig~/fig2dev/dev/genpic.c ++++ transfig/fig2dev/dev/genpic.c +@@ -229,9 +229,9 @@ + + /* Should have a #define somewhere for the # of fill patterns */ + if (l->fill_style != UNFILLED) +- fprintf(tfp, " fill %.2f", ((double) l->fill_style ) / (double) BLACK_FILL); ++ fprintf(tfp, " fill %.3f", ((double) l->fill_style ) / (double) BLACK_FILL); + +- fprintf(tfp, " with .sw at (%.2f,%.2f) ", ++ fprintf(tfp, " with .sw at (%.3f,%.3f) ", + minx / ppi, convy(maxy / ppi)); + + width = (maxx - minx) / ppi; +@@ -239,10 +239,10 @@ + height = convy(maxy / ppi) - convy(miny / ppi); + if (height < 0.0) height = -height; + +- fprintf(tfp, "width %.2f height %.2f", width, height); ++ fprintf(tfp, "width %.3f height %.3f", width, height); + + if (OptArcBox && l->type == T_ARC_BOX) +- fprintf(tfp, " rad %.2f", l->radius/ppi); ++ fprintf(tfp, " rad %.3f", l->radius/ppi); + + AddThickness(); + +@@ -411,7 +411,7 @@ + 2 * e->radiuses.x/ppi, 2 * e->radiuses.y/ppi); + + if ( OptEllipseFill && e->fill_style != UNFILLED) +- fprintf(tfp, " fill %.2f", (double)e->fill_style / (double) BLACK_FILL); ++ fprintf(tfp, " fill %.3f", (double)e->fill_style / (double) BLACK_FILL); + + AddThickness(); + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/transfig/transfig.spec?r1=1.60&r2=1.61&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
