Accepting request 74670 from M17N
- updated to 20110222:
* Did a lot of work to improve the accuracy in remove overlap.
* Fix various error messages.
* Remove some obsolete documentation.
* Technical fixes to stroking code.
* Add a miterlimit to stroking code.
* FontForge was using the wrong MIME type for svg files.
W3C has changed it and it's now "image/svg+xml" not
"image/svg-xml" or "image/svg".
* etc. on
http://fontforge.sourceforge.net/changelog.html
* libpng14.diff and fontforge.py27.diff kept but not needed yet
OBS-URL: https://build.opensuse.org/request/show/74670
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontforge?expand=0&rev=20
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
parent
02c7d8c398
commit
e866520393
11
docdir.patch
11
docdir.patch
@ -1,9 +1,10 @@
|
||||
diff -ru fontforge-20040808.orig/fontforge/uiutil.c fontforge-20040808/fontforge/uiutil.c
|
||||
--- fontforge-20040808.orig/fontforge/uiutil.c 2004-08-02 05:30:07.000000000 +0200
|
||||
+++ fontforge-20040808/fontforge/uiutil.c 2004-08-18 15:00:47.125256325 +0200
|
||||
@@ -307,6 +307,7 @@
|
||||
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 ( *file!='/' ) {
|
||||
if ( ! GFileIsAbsolute(file) ) {
|
||||
if ( helpdir==NULL || *helpdir=='\0' ) {
|
||||
+#define DOCDIR "/usr/share/doc/packages/fontforge/docs"
|
||||
#ifdef DOCDIR
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
---
|
||||
fontforge/scstylesui.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/fontforge/scstylesui.c
|
||||
+++ b/fontforge/scstylesui.c
|
||||
@@ -2795,7 +2795,7 @@
|
||||
label[k].text_is_1byte = true;
|
||||
label[k].text_in_resource = true;
|
||||
gcd[k].gd.label = &label[k];
|
||||
- gcd[k].gd.pos.x = 5; gcd[k].gd.pos.y = gcd[k-1].gd.pos.y+31;
|
||||
+ gcd[k].gd.pos.x = 5; gcd[k].gd.pos.y = 31;
|
||||
gcd[k].gd.flags = gg_visible | gg_enabled ;
|
||||
gcd[k++].creator = GLabelCreate;
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 16 14:38:39 CEST 2011 - pgajdos@suse.cz
|
||||
|
||||
- updated to 20110222:
|
||||
* Did a lot of work to improve the accuracy in remove overlap.
|
||||
* Fix various error messages.
|
||||
* Remove some obsolete documentation.
|
||||
* Technical fixes to stroking code.
|
||||
* Add a miterlimit to stroking code.
|
||||
* FontForge was using the wrong MIME type for svg files.
|
||||
W3C has changed it and it's now "image/svg+xml" not
|
||||
"image/svg-xml" or "image/svg".
|
||||
* etc. on
|
||||
http://fontforge.sourceforge.net/changelog.html
|
||||
* libpng14.diff and fontforge.py27.diff kept but not needed yet
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 6 08:54:57 UTC 2010 - coolo@novell.com
|
||||
|
||||
|
||||
@ -25,20 +25,22 @@ Group: Productivity/Graphics/Vector Editors
|
||||
AutoReqProv: on
|
||||
Obsoletes: PfaEdit
|
||||
Provides: PfaEdit
|
||||
Version: 20090923
|
||||
Version: 20110222
|
||||
Release: 4
|
||||
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-20090914.tar.bz2
|
||||
Source1: http://sourceforge.net/projects/fontforge/files/fontforge-docs/fontforge_htdocs-20110221.tar.bz2
|
||||
Source2: http://belnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_ja_htdocs-20060822.tar.bz2
|
||||
Source10: %{name}.desktop
|
||||
Source11: %name.png
|
||||
Patch0: docdir.patch
|
||||
Patch1: fontforge-array-fix.diff
|
||||
Patch2: fontforge-missing-closedir.diff
|
||||
Patch3: fontforge-20090622-fdleak.patch
|
||||
# libpng14.diff upstreamed from 20110222
|
||||
Patch4: libpng14.diff
|
||||
# fontforge.py27.diff upstreamed from 20110222
|
||||
Patch5: fontforge.py27.diff
|
||||
Patch6: libpng14-dynamic.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Summary: A Font Editor
|
||||
|
||||
@ -61,15 +63,23 @@ to develop applications that require these.
|
||||
%prep
|
||||
%setup -q -T -n fontforge-%{version} -b 0
|
||||
%patch0 -p 1 -b .docdir
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3
|
||||
%if %suse_version > 1120
|
||||
# change <= 1130 to <= 1140 as soon as factory will have suse_version > 1140
|
||||
%if %suse_version <= 1130
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%endif
|
||||
%if %suse_version > 1130
|
||||
# change the nonsense <= 1130 to <= 1140 as soon as factory will have suse_version > 1140
|
||||
%if %suse_version <= 1130
|
||||
%patch5 -p1
|
||||
%endif
|
||||
%endif
|
||||
%if %suse_version > 1120
|
||||
%patch6
|
||||
%endif
|
||||
mkdir docs
|
||||
tar jxvf %{S:1} -C docs
|
||||
tar jxvf %{S:2} -C docs
|
||||
@ -109,8 +119,6 @@ popd
|
||||
install -m 644 Adobe* $RPM_BUILD_ROOT/usr/share/fontforge
|
||||
install -d $RPM_BUILD_ROOT%_datadir/pixmaps
|
||||
install -m644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT%_datadir/pixmaps/%name.png
|
||||
# fix wrong locale name
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/locale/mal $RPM_BUILD_ROOT%{_datadir}/locale/ml
|
||||
%find_lang FontForge
|
||||
%suse_update_desktop_file -i %{name} VectorGraphics
|
||||
%{__rm} -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:43bbad49796a93dac3eac6f97e79d882b34fb0835ee3645c2408b402fdd01baa
|
||||
size 5492119
|
||||
3
fontforge_full-20110222.tar.bz2
Normal file
3
fontforge_full-20110222.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e
|
||||
size 5126031
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3f9e6ed8dfb9d1a67c1311289bbe6538b8f20439cbe8bb6e56de6c688ad5ab57
|
||||
size 2828545
|
||||
3
fontforge_htdocs-20110221.tar.bz2
Normal file
3
fontforge_htdocs-20110221.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec
|
||||
size 3129839
|
||||
42
libpng14-dynamic.diff
Normal file
42
libpng14-dynamic.diff
Normal file
@ -0,0 +1,42 @@
|
||||
--- gutils/gimagereadpng.c.old 2011-05-16 13:11:25.000000000 +0200
|
||||
+++ gutils/gimagereadpng.c 2011-05-16 13:19:32.000000000 +0200
|
||||
@@ -88,6 +88,7 @@ static int loadpng() {
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
+#if 0
|
||||
# if !defined(PNG_LIBPNG_VER_MAJOR) || (PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR<2)
|
||||
/* Early versions are called libpng. Later libpng10/libpng12/libpng14... */
|
||||
libpng = dlopen("libpng" SO_EXT,RTLD_LAZY);
|
||||
@@ -112,6 +113,9 @@ return( 0 );
|
||||
# endif
|
||||
}
|
||||
# endif
|
||||
+#endif
|
||||
+ libpng = dlopen("libpng14.so.14", RTLD_LAZY);
|
||||
+
|
||||
if ( libpng==NULL ) {
|
||||
fprintf(stderr,"libpng: %s\n", dlerror());
|
||||
return( 0 );
|
||||
pgajdos@laura:~/branch/devel/fontforge/fontforge-20110222/gutils> diff -up gimagewritepng.c{.old,}
|
||||
--- gutils/gimagewritepng.c.old 2011-05-16 13:20:47.000000000 +0200
|
||||
+++ gutils/gimagewritepng.c 2011-05-16 13:21:44.000000000 +0200
|
||||
@@ -72,6 +72,7 @@ static int loadpng() {
|
||||
fprintf(stderr,"%s\n", dlerror());
|
||||
return( 0 );
|
||||
}
|
||||
+#if 0
|
||||
# if !defined(PNG_LIBPNG_VER_MAJOR) || (PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR<2)
|
||||
/* Early versions are called libpng. Later libpng10/libpng12/libpng14... */
|
||||
libpng = dlopen("libpng" SO_EXT,RTLD_LAZY);
|
||||
@@ -96,6 +97,9 @@ return( 0 );
|
||||
# endif
|
||||
}
|
||||
# endif
|
||||
+#endif
|
||||
+ libpng = dlopen("libpng14.so.14", RTLD_LAZY);
|
||||
+
|
||||
if ( libpng==NULL ) {
|
||||
fprintf(stderr,"%s", dlerror());
|
||||
return( 0 );
|
||||
|
||||
Loading…
Reference in New Issue
Block a user