Hello community, here is the log from the commit of package fontforge for openSUSE:Factory checked in at 2014-03-18 13:46:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontforge (Old) and /work/SRC/openSUSE:Factory/.fontforge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontforge" Changes: -------- --- /work/SRC/openSUSE:Factory/fontforge/fontforge.changes 2014-03-10 12:31:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fontforge.new/fontforge.changes 2014-03-18 13:46:13.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 17 07:21:51 UTC 2014 - [email protected] + +- fixed linking against libpng (1.5, 1.6) [bnc#867041] + * added fontforge-libpng.diff + * removed libpng14-dynamic.diff +- spec file cleanup + * call spec-cleaner + * fontforge-20090622-fdleak.patch renamed to fontforge-fdleak.patch + * docdir.patch renamed to fontforge-docdir.patch + +------------------------------------------------------------------- Old: ---- docdir.patch fontforge-20090622-fdleak.patch libpng14-dynamic.diff New: ---- fontforge-docdir.patch fontforge-fdleak.patch fontforge-libpng.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontforge.spec ++++++ --- /var/tmp/diff_new_pack.miUTti/_old 2014-03-18 13:46:14.000000000 +0100 +++ /var/tmp/diff_new_pack.miUTti/_new 2014-03-18 13:46:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fontforge # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,27 +16,26 @@ # +%define src_version %{version}-b Name: fontforge Version: 20120731 Release: 0 -%define src_version %{version}-b Summary: A Font Editor License: BSD-3-Clause Group: Productivity/Graphics/Vector Editors Url: http://fontforge.org/ - Source0: http://downloads.sourceforge.net/%{name}/%{name}_full-%{src_version}.tar.bz2 Source1: http://downloads.sourceforge.net/%{name}/%{name}_htdocs-%{src_version}.tar.bz2 # PATCH-FIX-OPENSUSE -- set path to documentation -Patch0: docdir.patch -Patch1: fontforge-20090622-fdleak.patch -Patch2: libpng14-dynamic.diff +Patch0: fontforge-docdir.patch +Patch1: fontforge-fdleak.patch +# workaround, this should be resolved upstream (use pkg-config) bnc#867041 +Patch2: fontforge-libpng.diff # PATCH-FIX-OPENSUSE fontforge-python-module-name.diff -- change python module name according to naming policy Patch3: fontforge-python-module-name.diff Patch4: fontforge-fixgiflib.patch # PATCH-FIX-UPSTREAM http://sourceforge.net/p/fontforge/git/ci/9ae25e0 Patch5: fontforge-arraysubscript.patch - BuildRequires: cairo-devel BuildRequires: fdupes BuildRequires: freetype2-devel @@ -44,9 +43,6 @@ BuildRequires: giflib-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -%if 0%{?suse_version} > 1210 -BuildRequires: libspiro-devel -%endif BuildRequires: libtiff-devel BuildRequires: libuninameslist-devel BuildRequires: libxml2-devel @@ -60,6 +56,9 @@ Obsoletes: PfaEdit < 20110222 Provides: PfaEdit = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1210 +BuildRequires: libspiro-devel +%endif %description FontForge allows editing of outline and bitmap fonts. With it, you can @@ -99,15 +98,12 @@ %setup -q -T -n fontforge-%{src_version} -b 0 %patch0 -p 1 -b .docdir %patch1 -%if 0%{?suse_version} > 1120 %patch2 -%endif %patch3 %if 0%{?suse_version} > 1230 %patch4 -p1 %endif %patch5 -p1 - mkdir docs tar -jxvf %{SOURCE1} -C docs chmod 644 docs/quadraticspline.gif @@ -119,6 +115,8 @@ sed -i 's/\r$//' docs/{Big5.txt,corpchar.txt} %build +# workaround, this should be resolved upstream (use pkg-config) bnc#867041 +pkg-config --exists 'libpng >= 1.7.0' && echo 'Libpng was updated to 1.7, fontforge-libpng.patch will probably need to be adapted.' && exit 1 export CFLAGS="%{optflags} -fno-strict-aliasing" %configure \ --disable-static \ @@ -126,35 +124,30 @@ --with-regular-link make %{?_smp_mflags} - pushd pyhook python setup.py build popd %install -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install %{?_smp_mflags} # symlink for old FontForge name - PfaEdit pushd %{buildroot}%{_bindir} ln -s fontforge pfaedit popd # install CMaps to be able to edit CID-keyed fonts: # install -m 644 Adobe* %{buildroot}%{_datadir}/fontforge - # desktop file and icon install -Dm 644 Packaging/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dm 644 Packaging/icons/48x48/apps/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %suse_update_desktop_file -i %{name} VectorGraphics - %find_lang FontForge -rm -f %{buildroot}%{_libdir}/*.la - +find %{buildroot} -type f -name "*.la" -delete -print pushd pyhook python setup.py install \ --root=%{buildroot} \ --prefix=%{_prefix} \ --record-rpm=%{name}-python.files popd - %fdupes -s %{buildroot}%{_datadir}/%{name} %post -p /sbin/ldconfig @@ -170,7 +163,7 @@ %{_mandir}/man1/*.1* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%py_sitedir/* +%{py_sitedir}/* %files doc %defattr(-,root,root) ++++++ fontforge-docdir.patch ++++++ Index: fontforge-20110222/fontforge/uiutil.c =================================================================== --- fontforge-20110222.orig/fontforge/uiutil.c +++ fontforge-20110222/fontforge/uiutil.c @@ -315,6 +315,7 @@ return; fullspec[0] = 0; if ( ! GFileIsAbsolute(file) ) { if ( helpdir==NULL || *helpdir=='\0' ) { +#define DOCDIR "/usr/share/doc/packages/fontforge/docs" #ifdef DOCDIR strcpy(fullspec,DOCDIR "/"); #elif defined(SHAREDIR) ++++++ fontforge-fdleak.patch ++++++ Index: fontforge/sfd.c =================================================================== --- fontforge/sfd.c.orig 2009-05-13 00:23:57.000000000 +0200 +++ fontforge/sfd.c 2009-10-03 13:58:14.893617000 +0200 @@ -4983,6 +4983,7 @@ return( 0 ); } } } + closedir(dir); } SFDFixupBitmapRefs( bdf ); return( 1 ); ++++++ fontforge-libpng.diff ++++++ Index: configure =================================================================== --- configure.orig 2012-08-02 17:09:08.000000000 +0200 +++ configure 2014-03-14 14:27:30.539876212 +0100 @@ -14074,6 +14074,12 @@ if test "$ac_cv_lib_png14_png_create_read_struct" = "yes"; then STATIC_LIBS="$STATIC_LIBS -lpng14 -lz" fi + if test "$ac_cv_lib_png15_png_create_read_struct" = "yes"; then + STATIC_LIBS="$STATIC_LIBS -lpng15 -lz" + fi + if test "$ac_cv_lib_png16_png_create_read_struct" = "yes"; then + STATIC_LIBS="$STATIC_LIBS -lpng16 -lz" + fi if test "$ac_cv_lib_tiff_TIFFOpen" = "yes"; then STATIC_LIBS="$STATIC_LIBS -ltiff" fi @@ -14178,6 +14184,16 @@ $as_echo "#define _STATIC_LIBPNG 1" >>confdefs.h fi + if test "$ac_cv_lib_png15_png_create_read_struct" = "yes"; then + STATIC_LIBS="$STATIC_LIBS -lpng15 -lz" + $as_echo "#define _STATIC_LIBPNG 1" >>confdefs.h + + fi + if test "$ac_cv_lib_png16_png_create_read_struct" = "yes"; then + STATIC_LIBS="$STATIC_LIBS -lpng16 -lz" + $as_echo "#define _STATIC_LIBPNG 1" >>confdefs.h + + fi if test "$ac_cv_lib_tiff_TIFFOpen" = "yes"; then STATIC_LIBS="$STATIC_LIBS -ltiff" $as_echo "#define _STATIC_LIBTIFF 1" >>confdefs.h -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
