[packages/transfig] Version: 3.2.5e
jajcus
jajcus at pld-linux.org
Sat Oct 5 19:10:50 CEST 2013
commit 27d47767253f3aff032bfcf3516fc3b75e5869b8
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Sat Oct 5 18:59:54 2013 +0200
Version: 3.2.5e
Dropped patches which appear to be applied upstream
transfig-3.2.5d-MAXWIDTH.patch | 19 -----------------
transfig-3.2.5d-leadspace.patch | 19 -----------------
transfig-3.2.5d-libpng-1.5.patch | 39 ----------------------------------
transfig-3.2.5d-precision.patch | 45 ----------------------------------------
transfig.spec | 12 ++---------
5 files changed, 2 insertions(+), 132 deletions(-)
---
diff --git a/transfig.spec b/transfig.spec
index 414c238..23b8379 100644
--- a/transfig.spec
+++ b/transfig.spec
@@ -8,7 +8,7 @@ Summary(ru.UTF-8): Конвертор файлов .fig (формат прогр
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.5d
+Version: 3.2.5e
Release: 1
Epoch: 1
License: distributable
@@ -16,14 +16,10 @@ Group: X11/Applications/Graphics
#Source0Download: http://xfig.org/art15.html
# Source0: http://xfig.org/software/xfig/%{version}/%{name}.%{version}.tar.gz
Source0: http://downloads.sourceforge.net/mcj/%{name}.%{version}.tar.gz
-# Source0-md5: f9eac7f265668ecbfda6aaf7581989ad
+# Source0-md5: f547c67a93422c72039204f159f53ea9
Patch0: %{name}-config.patch
Patch1: %{name}-broken.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
@@ -92,10 +88,6 @@ TeX документів, які є портабельними (тобто, мо
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
xmkmf -a
diff --git a/transfig-3.2.5d-MAXWIDTH.patch b/transfig-3.2.5d-MAXWIDTH.patch
deleted file mode 100644
index 3ac1481..0000000
--- a/transfig-3.2.5d-MAXWIDTH.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 23_MAXWIDTH.dpatch by Roland Rosenfeld <roland at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Increasese MAXWIDTH of embedded images from 8K to 16K (Closes: #610466)
-
- at 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
-
diff --git a/transfig-3.2.5d-leadspace.patch b/transfig-3.2.5d-leadspace.patch
deleted file mode 100644
index d222cf6..0000000
--- a/transfig-3.2.5d-leadspace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_PIC_leadspace.dpatch by Roger Leigh <rleigh at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoid wrong leading spaces in PIC text (Closes: #611977).
-
- at 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) );
diff --git a/transfig-3.2.5d-libpng-1.5.patch b/transfig-3.2.5d-libpng-1.5.patch
deleted file mode 100644
index e6f15e4..0000000
--- a/transfig-3.2.5d-libpng-1.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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) {
diff --git a/transfig-3.2.5d-precision.patch b/transfig-3.2.5d-precision.patch
deleted file mode 100644
index 227f19c..0000000
--- a/transfig-3.2.5d-precision.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 24_PIC_precision.dpatch by Roger Leigh <rleigh at debian.org>
-##
-## 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)
-
- at 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();
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/transfig.git/commitdiff/5ccd30168d6159060256b3c9a8f7a3146dd393c3
More information about the pld-cvs-commit
mailing list