From 9b2791ccf3c61eef76229bc788548ff3ec81755937a444bc9b4f0cd27198b59f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 20 Apr 2010 15:42:58 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/Publishing/transfig?expand=0&rev=14 --- transfig.3.2.5a-libpng14.dif | 14 ++++++++++++++ transfig.changes | 5 +++++ transfig.spec | 1 + 3 files changed, 20 insertions(+) create mode 100644 transfig.3.2.5a-libpng14.dif diff --git a/transfig.3.2.5a-libpng14.dif b/transfig.3.2.5a-libpng14.dif new file mode 100644 index 0000000..beb71e5 --- /dev/null +++ b/transfig.3.2.5a-libpng14.dif @@ -0,0 +1,14 @@ +--- fig2dev/dev/readpng.c ++++ fig2dev/dev/readpng.c 2010-04-20 15:22:10.142924814 +0000 +@@ -127,7 +127,11 @@ read_png(file,filetype,pic,llx,lly) + + if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { + png_get_hIST(png_ptr, info_ptr, &histogram); ++#if (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && (PNG_LIBPNG_VER_MINOR > 4))) || defined(png_set_quantize) ++ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); ++#else + png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); ++#endif + } + } + if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { diff --git a/transfig.changes b/transfig.changes index f465d91..d3ceaec 100644 --- a/transfig.changes +++ b/transfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 20 17:24:01 CEST 2010 - werner@suse.de + +- Add compatibility switch for libpng 1.4 or higher + ------------------------------------------------------------------- Mon Apr 19 11:22:31 CEST 2010 - sndirsch@suse.de diff --git a/transfig.spec b/transfig.spec index 2551809..fcf5f61 100644 --- a/transfig.spec +++ b/transfig.spec @@ -37,6 +37,7 @@ Source: transfig.%{version}.tar.bz2 Patch0: transfig.3.2.5a.dif Patch1: transfig.3.2.5a-cups.dif Patch2: transfig.3.2.5-binderman.dif +Patch3: transfig.3.2.5a-libpng14.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" From 9072e53647779d74b20499d11c624d200bd595da2afcffd503a6ac5290d332f0 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Apr 2010 23:53:44 +0000 Subject: [PATCH 2/3] Accepting request 38368 from Publishing checked in (request 38368) OBS-URL: https://build.opensuse.org/request/show/38368 OBS-URL: https://build.opensuse.org/package/show/Publishing/transfig?expand=0&rev=15 --- transfig.3.2.5a-libpng14.dif | 14 -------------- transfig.changes | 5 ----- transfig.spec | 1 - 3 files changed, 20 deletions(-) delete mode 100644 transfig.3.2.5a-libpng14.dif diff --git a/transfig.3.2.5a-libpng14.dif b/transfig.3.2.5a-libpng14.dif deleted file mode 100644 index beb71e5..0000000 --- a/transfig.3.2.5a-libpng14.dif +++ /dev/null @@ -1,14 +0,0 @@ ---- fig2dev/dev/readpng.c -+++ fig2dev/dev/readpng.c 2010-04-20 15:22:10.142924814 +0000 -@@ -127,7 +127,11 @@ read_png(file,filetype,pic,llx,lly) - - if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { - png_get_hIST(png_ptr, info_ptr, &histogram); -+#if (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && (PNG_LIBPNG_VER_MINOR > 4))) || defined(png_set_quantize) -+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); -+#else - png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); -+#endif - } - } - if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { diff --git a/transfig.changes b/transfig.changes index d3ceaec..f465d91 100644 --- a/transfig.changes +++ b/transfig.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Apr 20 17:24:01 CEST 2010 - werner@suse.de - -- Add compatibility switch for libpng 1.4 or higher - ------------------------------------------------------------------- Mon Apr 19 11:22:31 CEST 2010 - sndirsch@suse.de diff --git a/transfig.spec b/transfig.spec index fcf5f61..2551809 100644 --- a/transfig.spec +++ b/transfig.spec @@ -37,7 +37,6 @@ Source: transfig.%{version}.tar.bz2 Patch0: transfig.3.2.5a.dif Patch1: transfig.3.2.5a-cups.dif Patch2: transfig.3.2.5-binderman.dif -Patch3: transfig.3.2.5a-libpng14.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" From f18320c41aed66294085430eb77a98081d939869d7cd2ee8749cfe707f0277a2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 28 Jun 2011 17:22:04 +0000 Subject: [PATCH 3/3] . OBS-URL: https://build.opensuse.org/package/show/Publishing/transfig?expand=0&rev=16 --- transfig.3.2.5a-libpng14.dif | 14 ++++++++++++++ transfig.changes | 10 ++++++++++ transfig.spec | 5 ++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 transfig.3.2.5a-libpng14.dif diff --git a/transfig.3.2.5a-libpng14.dif b/transfig.3.2.5a-libpng14.dif new file mode 100644 index 0000000..beb71e5 --- /dev/null +++ b/transfig.3.2.5a-libpng14.dif @@ -0,0 +1,14 @@ +--- fig2dev/dev/readpng.c ++++ fig2dev/dev/readpng.c 2010-04-20 15:22:10.142924814 +0000 +@@ -127,7 +127,11 @@ read_png(file,filetype,pic,llx,lly) + + if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { + png_get_hIST(png_ptr, info_ptr, &histogram); ++#if (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && (PNG_LIBPNG_VER_MINOR > 4))) || defined(png_set_quantize) ++ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); ++#else + png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); ++#endif + } + } + if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { diff --git a/transfig.changes b/transfig.changes index f465d91..9f8bd0a 100644 --- a/transfig.changes +++ b/transfig.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 28 19:21:37 CEST 2011 - werner@suse.de + +- Add URL due bnc#676463 + +------------------------------------------------------------------- +Tue Apr 20 17:24:01 CEST 2010 - werner@suse.de + +- Add compatibility switch for libpng 1.4 or higher + ------------------------------------------------------------------- Mon Apr 19 11:22:31 CEST 2010 - sndirsch@suse.de diff --git a/transfig.spec b/transfig.spec index 2551809..c83d457 100644 --- a/transfig.spec +++ b/transfig.spec @@ -25,18 +25,20 @@ BuildRequires: libpng12-compat-devel libpng12-devel %else BuildRequires: libpng-devel %endif +URL: http://www.xfig.org/ License: MIT License (or similar) Group: Productivity/Graphics/Convertors Provides: transfig.3.2.3d Requires: netpbm ghostscript-library ghostscript-fonts-std AutoReqProv: on Version: 3.2.5a -Release: 3 +Release: 4 Summary: Graphic Converter Source: transfig.%{version}.tar.bz2 Patch0: transfig.3.2.5a.dif Patch1: transfig.3.2.5a-cups.dif Patch2: transfig.3.2.5-binderman.dif +Patch3: transfig.3.2.5a-libpng14.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -75,6 +77,7 @@ Authors: %patch0 %patch1 %patch2 +%patch3 xmkmf -a -D_DATA='%{_data}' %build