From cea51f0960252c281cb15f94a7d130e49283650d181069c8c7993197e517c975 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 8 Apr 2010 10:33:18 +0000 Subject: [PATCH] Accepting request 37319 from M17N Copy from M17N/fontforge based on submit request 37319 from user coolo OBS-URL: https://build.opensuse.org/request/show/37319 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontforge?expand=0&rev=15 --- fontforge.changes | 11 ++++ fontforge.spec | 52 +++++++++--------- fontforge_full-20090622.tar.bz2 | 3 -- fontforge_full-20090923.tar.bz2 | 3 ++ fontforge_htdocs-20090622.tar.bz2 | 3 -- fontforge_htdocs-20090914.tar.bz2 | 3 ++ libpng14.diff | 90 +++++++++++++++++++++++++++++++ 7 files changed, 134 insertions(+), 31 deletions(-) delete mode 100644 fontforge_full-20090622.tar.bz2 create mode 100644 fontforge_full-20090923.tar.bz2 delete mode 100644 fontforge_htdocs-20090622.tar.bz2 create mode 100644 fontforge_htdocs-20090914.tar.bz2 create mode 100644 libpng14.diff diff --git a/fontforge.changes b/fontforge.changes index af31955..a4b8858 100644 --- a/fontforge.changes +++ b/fontforge.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Apr 8 08:12:59 UTC 2010 - coolo@novell.com + +- compile with libpng 1.4 + +------------------------------------------------------------------- +Mon Apr 5 12:00:54 UTC 2010 - toms@suse.de + +- Updated to 20090923 +- Enabled Python bindings + ------------------------------------------------------------------- Sat Oct 3 12:16:21 UTC 2009 - crrodriguez@opensuse.org diff --git a/fontforge.spec b/fontforge.spec index 3bb099a..42f6cd2 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,7 +1,7 @@ # -# spec file for package fontforge (Version 20090622) +# spec file for package fontforge (Version 20090923) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,17 +19,17 @@ Name: fontforge -BuildRequires: dos2unix freetype2-devel giflib-devel libpng-devel libtiff-devel libxml2-devel update-desktop-files xorg-x11-devel -License: BSD 3-clause (or similar) +BuildRequires: dos2unix freetype2-devel giflib-devel libpng-devel libtiff-devel libxml2-devel python-devel update-desktop-files xorg-x11-devel +License: BSD3c(or similar) Group: Productivity/Graphics/Vector Editors AutoReqProv: on Obsoletes: PfaEdit Provides: PfaEdit -Version: 20090622 -Release: 2 +Version: 20090923 +Release: 1 Url: http://fontforge.sourceforge.net/ Source0: http://dfn.dl.sourceforge.net/sourceforge/fontforge/fontforge_full-%{version}.tar.bz2 -Source1: http://surfnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_htdocs-%{version}.tar.bz2 +Source1: http://surfnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_htdocs-20090914.tar.bz2 Source2: http://belnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_ja_htdocs-20060822.tar.bz2 Source10: %{name}.desktop Source11: %name.png @@ -37,6 +37,7 @@ Patch0: docdir.patch Patch1: fontforge-array-fix.diff Patch2: fontforge-missing-closedir.diff Patch3: fontforge-20090622-fdleak.patch +Patch4: libpng14.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Font Editor @@ -46,15 +47,8 @@ create new fonts or modify old ones. It also converts font formats and can convert among PostScript (ASCII & binary Type 1, some Type 3s, and some Type 0s), TrueType, OpenType (Type2), and CID-keyed fonts. - - -Authors: --------- - George Williams - Scott Pakin - %package devel -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/Other Requires: %{name} = %{version} freetype2-devel @@ -63,22 +57,16 @@ Requires: %{name} = %{version} freetype2-devel This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - George Williams - Scott Pakin - %prep %setup -q -T -n fontforge-%{version} -b 0 %patch0 -p 1 -b .docdir %patch1 -p1 %patch2 -p1 %patch3 +%patch4 -p1 mkdir docs -tar jxvf $RPM_SOURCE_DIR/fontforge_htdocs-%{version}.tar.bz2 -C docs -tar jxvf $RPM_SOURCE_DIR/fontforge_ja_htdocs-20060822.tar.bz2 -C docs +tar jxvf %{S:1} -C docs +tar jxvf %{S:2} -C docs chmod 644 docs/quadraticspline.gif dos2unix docs/ja/*html docs/ja/nonBMP/index.html docs/corpchar.txt docs/Big5.txt tar zxvf docs/cidmaps.tgz @@ -90,9 +78,15 @@ find . -name CVS -type d | xargs rm -rf #libtoolize --force #autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure --disable-static --with-pic --with-multilayer +# --with-multilayer +%configure --disable-static --with-pic \ + --enable-pyextension %{__make} %{?jobs:-j%jobs} +pushd pyhook +python setup.py build +popd + %install # mkdir -p ${RPM_BUILD_ROOT}{%{_bindir},%{_libdir},%{_mandir}/man1,/usr/share/fontforge} # make -e bindir=$RPM_BUILD_ROOT/usr/bin \ @@ -115,6 +109,13 @@ mv $RPM_BUILD_ROOT%{_datadir}/locale/mal $RPM_BUILD_ROOT%{_datadir}/locale/ml %suse_update_desktop_file -i %{name} VectorGraphics %{__rm} -f %{buildroot}%{_libdir}/*.la +pushd pyhook +python setup.py install \ + --root=$RPM_BUILD_ROOT \ + --prefix=%{_prefix} \ + --record-rpm=%{name}-python.files +popd + %clean %{__rm} -rf %{buildroot} @@ -132,6 +133,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/locale/mal $RPM_BUILD_ROOT%{_datadir}/locale/ml %doc %{_mandir}/man1/*.1* /usr/share/applications/%{name}.desktop %_datadir/pixmaps/%name.png +%py_sitedir/* %files devel %defattr(-, root, root) diff --git a/fontforge_full-20090622.tar.bz2 b/fontforge_full-20090622.tar.bz2 deleted file mode 100644 index 0b5ae45..0000000 --- a/fontforge_full-20090622.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf0f1fd76f47646252853c1d86d119a9638a9a6be5c42d12e2f35b6b5c120d3f -size 5359385 diff --git a/fontforge_full-20090923.tar.bz2 b/fontforge_full-20090923.tar.bz2 new file mode 100644 index 0000000..e74e9ee --- /dev/null +++ b/fontforge_full-20090923.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43bbad49796a93dac3eac6f97e79d882b34fb0835ee3645c2408b402fdd01baa +size 5492119 diff --git a/fontforge_htdocs-20090622.tar.bz2 b/fontforge_htdocs-20090622.tar.bz2 deleted file mode 100644 index 6fdafc9..0000000 --- a/fontforge_htdocs-20090622.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44c7b8fdbf2472a15ceeda4d827557c04c7559f3bcd3ab2800eebcd293324763 -size 2764464 diff --git a/fontforge_htdocs-20090914.tar.bz2 b/fontforge_htdocs-20090914.tar.bz2 new file mode 100644 index 0000000..cd80d54 --- /dev/null +++ b/fontforge_htdocs-20090914.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f9e6ed8dfb9d1a67c1311289bbe6538b8f20439cbe8bb6e56de6c688ad5ab57 +size 2828545 diff --git a/libpng14.diff b/libpng14.diff new file mode 100644 index 0000000..a01605f --- /dev/null +++ b/libpng14.diff @@ -0,0 +1,90 @@ +Index: fontforge-20090923/gutils/gimagereadpng.c +=================================================================== +--- fontforge-20090923.orig/gutils/gimagereadpng.c 2009-02-22 18:26:06.000000000 +0100 ++++ fontforge-20090923/gutils/gimagereadpng.c 2010-04-08 09:54:52.000000000 +0200 +@@ -220,13 +220,13 @@ return( NULL ); + if ( (info_ptr->valid&PNG_INFO_tRNS) && info_ptr->num_trans>0 ) { + if ( info_ptr->color_type==PNG_COLOR_TYPE_RGB || info_ptr->color_type==PNG_COLOR_TYPE_RGB_ALPHA ) + base->trans = COLOR_CREATE( +- (info_ptr->trans_values.red>>8), +- (info_ptr->trans_values.green>>8), +- (info_ptr->trans_values.blue>>8)); ++ (info_ptr->trans_color.red>>8), ++ (info_ptr->trans_color.green>>8), ++ (info_ptr->trans_color.blue>>8)); + else if ( base->image_type == it_mono ) +- base->trans = info_ptr->trans[0]; ++ base->trans = info_ptr->trans_alpha[0]; + else +- base->clut->trans_index = base->trans = info_ptr->trans[0]; ++ base->clut->trans_index = base->trans = info_ptr->trans_alpha[0]; + } + + row_pointers = galloc(info_ptr->height*sizeof(png_bytep)); +Index: fontforge-20090923/gutils/gimagewritepng.c +=================================================================== +--- fontforge-20090923.orig/gutils/gimagewritepng.c 2009-02-22 18:26:06.000000000 +0100 ++++ fontforge-20090923/gutils/gimagewritepng.c 2010-04-08 10:03:02.000000000 +0200 +@@ -183,8 +183,8 @@ return(false); + if ( info_ptr->num_palette<=16 ) + _png_set_packing(png_ptr); + if ( base->trans!=-1 ) { +- info_ptr->trans = galloc(1); +- info_ptr->trans[0] = base->trans; ++ info_ptr->trans_alpha = galloc(1); ++ info_ptr->trans_alpha[0] = base->trans; + } + } else { + info_ptr->color_type = PNG_COLOR_TYPE_RGB; +@@ -192,9 +192,9 @@ return(false); + info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; + + if ( base->trans!=-1 ) { +- info_ptr->trans_values.red = COLOR_RED(base->trans); +- info_ptr->trans_values.green = COLOR_GREEN(base->trans); +- info_ptr->trans_values.blue = COLOR_BLUE(base->trans); ++ info_ptr->trans_color.red = COLOR_RED(base->trans); ++ info_ptr->trans_color.green = COLOR_GREEN(base->trans); ++ info_ptr->trans_color.blue = COLOR_BLUE(base->trans); + } + } + _png_write_info(png_ptr, info_ptr); +@@ -210,7 +210,7 @@ return(false); + + _png_write_end(png_ptr, info_ptr); + +- if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans); ++ if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha); + if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette); + _png_destroy_write_struct(&png_ptr, &info_ptr); + gfree(rows); +@@ -314,15 +314,15 @@ return(false); + if ( info_ptr->num_palette<=16 ) + png_set_packing(png_ptr); + if ( base->trans!=-1 ) { +- info_ptr->trans = galloc(1); +- info_ptr->trans[0] = base->trans; ++ info_ptr->trans_alpha = galloc(1); ++ info_ptr->trans_alpha[0] = base->trans; + } + } else { + info_ptr->color_type = PNG_COLOR_TYPE_RGB; + if ( base->trans!=-1 ) { +- info_ptr->trans_values.red = COLOR_RED(base->trans); +- info_ptr->trans_values.green = COLOR_GREEN(base->trans); +- info_ptr->trans_values.blue = COLOR_BLUE(base->trans); ++ info_ptr->trans_color.red = COLOR_RED(base->trans); ++ info_ptr->trans_color.green = COLOR_GREEN(base->trans); ++ info_ptr->trans_color.blue = COLOR_BLUE(base->trans); + } + } + png_write_info(png_ptr, info_ptr); +@@ -338,7 +338,7 @@ return(false); + + png_write_end(png_ptr, info_ptr); + +- if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans); ++ if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha); + if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette); + png_destroy_write_struct(&png_ptr, &info_ptr); + gfree(rows);