* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fontforge/files/
@ 2016-11-13 1:29 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2016-11-13 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 2a1d3b576aa34dbb58823e5ea82eeb93cabc7267
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 01:29:05 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 01:29:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1d3b57
media-gfx/fontforge: remove obsolete patches
Package-Manager: portage-2.3.2_p5
.../files/fontforge-20110222-libz.so-linkage.patch | 66 ----------------------
.../files/fontforge-20110222-lxkbui.patch | 13 -----
.../fontforge-20110222-remove-useless-extern.patch | 11 ----
media-gfx/fontforge/files/fontforge-desktop.patch | 16 ------
media-gfx/fontforge/files/fontforge-py27.diff | 11 ----
5 files changed, 117 deletions(-)
diff --git a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch
deleted file mode 100644
index 7e01e8a..00000000
--- a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=367425
-
-diff -ruN fontforge-20110222~/fontforge/parsepdf.c fontforge-20110222/fontforge/parsepdf.c
---- fontforge-20110222~/fontforge/parsepdf.c 2011-02-15 05:37:39.000000000 +0200
-+++ fontforge-20110222/fontforge/parsepdf.c 2011-05-17 22:19:56.000000000 +0300
-@@ -759,7 +759,11 @@
- if ( zlib!=NULL )
- return( true );
-
-- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) {
-+ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL
-+#ifdef SO_1_EXT
-+ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL
-+#endif
-+ ) {
- LogError( "%s", dlerror());
- return( false );
- }
-diff -ruN fontforge-20110222~/fontforge/svg.c fontforge-20110222/fontforge/svg.c
---- fontforge-20110222~/fontforge/svg.c 2011-02-18 23:33:27.000000000 +0200
-+++ fontforge-20110222/fontforge/svg.c 2011-05-17 22:19:56.000000000 +0300
-@@ -1153,7 +1153,11 @@
- if ( xmltested )
- return( libxml!=NULL );
-
-- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY);
-+ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY)
-+#ifdef SO_1_EXT
-+ || dlopen("libz" SO_1_EXT,RTLD_LAZY)
-+#endif
-+ ;
-
- libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);
- # ifdef SO_2_EXT
-diff -ruN fontforge-20110222~/fontforge/ufo.c fontforge-20110222/fontforge/ufo.c
---- fontforge-20110222~/fontforge/ufo.c 2011-02-17 02:20:37.000000000 +0200
-+++ fontforge-20110222/fontforge/ufo.c 2011-05-17 22:19:56.000000000 +0300
-@@ -929,7 +929,11 @@
- if ( xmltested )
- return( libxml!=NULL );
-
-- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY);
-+ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY)
-+#ifdef SO_1_EXT
-+ || dlopen("libz" SO_1_EXT,RTLD_LAZY)
-+#endif
-+ ;
-
- libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);
- # ifdef SO_2_EXT
-diff -ruN fontforge-20110222~/fontforge/woff.c fontforge-20110222/fontforge/woff.c
---- fontforge-20110222~/fontforge/woff.c 2011-02-15 05:37:40.000000000 +0200
-+++ fontforge-20110222/fontforge/woff.c 2011-05-17 22:19:56.000000000 +0300
-@@ -76,7 +76,11 @@
- if ( zlib!=NULL )
- return( true );
-
-- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) {
-+ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL
-+#ifdef SO_1_EXT
-+ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL
-+#endif
-+ ) {
- LogError( "%s", dlerror());
- return( false );
- }
diff --git a/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch
deleted file mode 100644
index b344bc9..00000000
--- a/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'configure.in'
---- a/configure.in
-+++ b/configure.in
-@@ -36,7 +36,7 @@
- dnl /usr/share/doc/XFree86-doc-4.2.0/Xi/lib.PS
-
- AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 )
-- AC_CHECK_LIB(xkbui, XkbQueryExtension, X_11LIB="$X_11LIB -lxkbui" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm )
-+ AC_CHECK_LIB(X11, XkbQueryExtension, ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm )
- fi
-
- gww_define_caps_for_alt="dontknow"
-
diff --git a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
deleted file mode 100644
index f7e7152..00000000
--- a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur fontforge-20110222.orig/gutils/gimagereadrgb.c fontforge-20110222/gutils/gimagereadrgb.c
---- fontforge-20110222.orig/gutils/gimagereadrgb.c 2013-05-05 18:03:18.884623199 +0000
-+++ fontforge-20110222/gutils/gimagereadrgb.c 2013-05-05 18:03:35.452624126 +0000
-@@ -86,7 +86,6 @@
-
- static void find_scanline(FILE *fp,struct sgiheader *header,int cur,
- unsigned long *starttab,unsigned char **ptrtab) {
-- extern int fgetc(FILE *);
- int (*getthingamy)(FILE *) = header->bpc==1?fgetc:getshort;
- int ch,i,cnt,val;
- unsigned char *pt;
diff --git a/media-gfx/fontforge/files/fontforge-desktop.patch b/media-gfx/fontforge/files/fontforge-desktop.patch
deleted file mode 100644
index ba8ac10..00000000
--- a/media-gfx/fontforge/files/fontforge-desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Packaging/fontforge.desktop b/Packaging/fontforge.desktop
-index a66b28b..18e049c 100644
---- a/Packaging/fontforge.desktop
-+++ b/Packaging/fontforge.desktop
-@@ -8,9 +8,8 @@ Comment[ru]=Редактор шрифтов
- Comment[fr]=Un constructeur des polices
- Comment[zh_TW]=FontForge 描邊字型編輯器
- Exec=fontforge
--Icon=fontforge.png
-+Icon=fontforge
- Terminal=false
- Type=Application
--Categories=Application;Graphics;
--Encoding=UTF-8
-+Categories=Graphics;
- MimeType=application/vnd.font-fontforge-sfd;application/x-font-ttf;application/x-font-otf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-tex;
diff --git a/media-gfx/fontforge/files/fontforge-py27.diff b/media-gfx/fontforge/files/fontforge-py27.diff
deleted file mode 100644
index 24f98e1..00000000
--- a/media-gfx/fontforge/files/fontforge-py27.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- fontforge/ffpython.h 2010/02/04 17:42:36 1.8
-+++ fontforge/ffpython.h 2010/09/12 08:30:00 1.9
-@@ -62,7 +62,7 @@
- #define PyMODINIT_FUNC void
- #endif
-
--#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 5)
-+#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 7)
- #define PyBytesObject PyStringObject
- #define PyBytes_Type PyString_Type
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fontforge/files/
@ 2017-11-13 14:35 Guilherme Amadio
0 siblings, 0 replies; 3+ messages in thread
From: Guilherme Amadio @ 2017-11-13 14:35 UTC (permalink / raw
To: gentoo-commits
commit: f9e728df5a2594c4b46a69d1011e406b93e6d62a
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Nov 12 20:49:37 2017 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 14:34:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e728df
media-gfx/fontforge: remove unused patch
.../fontforge/files/fontforge-dummy-spiro.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/media-gfx/fontforge/files/fontforge-dummy-spiro.patch b/media-gfx/fontforge/files/fontforge-dummy-spiro.patch
deleted file mode 100644
index d2e73d5b179..00000000000
--- a/media-gfx/fontforge/files/fontforge-dummy-spiro.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 63def02823e631cd73b763541a87d7c480be799e Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Mon, 14 Mar 2016 12:25:45 +0800
-Subject: [PATCH] Spiros: Add dummy _SpiroCP2SplineSet when compiling without
- Spiros.
-
----
- fontforge/spiro.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/fontforge/spiro.c b/fontforge/spiro.c
-index 629339a..bb2f36f 100644
---- a/fontforge/spiro.c
-+++ b/fontforge/spiro.c
-@@ -35,6 +35,10 @@
-
- static int has_spiro = false;
-
-+static SplineSet *_SpiroCP2SplineSet(spiro_cp *spiros) {
-+ return NULL;
-+}
-+
- SplineSet *SpiroCP2SplineSet(spiro_cp *spiros) {
- return( NULL );
- }
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fontforge/files/
@ 2020-06-16 19:17 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2020-06-16 19:17 UTC (permalink / raw
To: gentoo-commits
commit: f714019dd391d401a39a7cdbc39dedc708e40712
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jun 16 18:25:17 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 19:16:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f714019d
media-gfx/fontforge: remove unused patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16274
media-gfx/fontforge/files/CVE-2020-5395.patch | 78 ---------------------------
1 file changed, 78 deletions(-)
diff --git a/media-gfx/fontforge/files/CVE-2020-5395.patch b/media-gfx/fontforge/files/CVE-2020-5395.patch
deleted file mode 100644
index 51b52450376..00000000000
--- a/media-gfx/fontforge/files/CVE-2020-5395.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 048a91e2682c1a8936ae34dbc7bd70291ec05410 Mon Sep 17 00:00:00 2001
-From: Skef Iterum <unknown>
-Date: Mon, 6 Jan 2020 03:05:06 -0800
-Subject: [PATCH] Fix for #4084 Use-after-free (heap) in the
- SFD_GetFontMetaData() function Fix for #4086 NULL pointer dereference in the
- SFDGetSpiros() function Fix for #4088 NULL pointer dereference in the
- SFD_AssignLookups() function Add empty sf->fontname string if it isn't set,
- fixing #4089 #4090 and many other potential issues (many downstream calls
- to strlen() on the value).
-
----
- fontforge/sfd.c | 19 ++++++++++++++-----
- fontforge/sfd1.c | 2 +-
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/fontforge/sfd.c b/fontforge/sfd.c
-index 731be201e0..e8ca39ba83 100644
---- a/fontforge/sfd.c
-+++ b/fontforge/sfd.c
-@@ -4032,13 +4032,16 @@ static void SFDGetSpiros(FILE *sfd,SplineSet *cur) {
- while ( fscanf(sfd,"%lg %lg %c", &cp.x, &cp.y, &cp.ty )==3 ) {
- if ( cur!=NULL ) {
- if ( cur->spiro_cnt>=cur->spiro_max )
-- cur->spiros = realloc(cur->spiros,(cur->spiro_max+=10)*sizeof(spiro_cp));
-+ cur->spiros = realloc(cur->spiros,
-+ (cur->spiro_max+=10)*sizeof(spiro_cp));
- cur->spiros[cur->spiro_cnt++] = cp;
- }
- }
-- if ( cur!=NULL && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
-+ if ( cur!=NULL && cur->spiro_cnt>0
-+ && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
- if ( cur->spiro_cnt>=cur->spiro_max )
-- cur->spiros = realloc(cur->spiros,(cur->spiro_max+=1)*sizeof(spiro_cp));
-+ cur->spiros = realloc(cur->spiros,
-+ (cur->spiro_max+=1)*sizeof(spiro_cp));
- memset(&cur->spiros[cur->spiro_cnt],0,sizeof(spiro_cp));
- cur->spiros[cur->spiro_cnt++].ty = SPIRO_END;
- }
-@@ -7992,10 +7995,12 @@ bool SFD_GetFontMetaData( FILE *sfd,
- else if ( strmatch(tok,"LayerCount:")==0 )
- {
- d->had_layer_cnt = true;
-- getint(sfd,&sf->layer_cnt);
-- if ( sf->layer_cnt>2 ) {
-+ int layer_cnt_tmp;
-+ getint(sfd,&layer_cnt_tmp);
-+ if ( layer_cnt_tmp>2 ) {
- sf->layers = realloc(sf->layers,sf->layer_cnt*sizeof(LayerInfo));
- memset(sf->layers+2,0,(sf->layer_cnt-2)*sizeof(LayerInfo));
-+ sf->layer_cnt = layer_cnt_tmp;
- }
- }
- else if ( strmatch(tok,"Layer:")==0 )
-@@ -8948,6 +8953,10 @@ exit( 1 );
- }
- }
-
-+ // Many downstream functions assume this isn't NULL (use strlen, etc.)
-+ if ( sf->fontname==NULL)
-+ sf->fontname = copy("");
-+
- if ( fromdir )
- sf = SFD_FigureDirType(sf,tok,dirname,enc,remap,had_layer_cnt);
- else if ( sf->subfontcnt!=0 ) {
-diff --git a/fontforge/sfd1.c b/fontforge/sfd1.c
-index cf931059d0..b42f832678 100644
---- a/fontforge/sfd1.c
-+++ b/fontforge/sfd1.c
-@@ -674,7 +674,7 @@ void SFD_AssignLookups(SplineFont1 *sf) {
-
- /* Fix up some gunk from really old versions of the sfd format */
- SFDCleanupAnchorClasses(&sf->sf);
-- if ( sf->sf.uni_interp==ui_unset )
-+ if ( sf->sf.uni_interp==ui_unset && sf->sf.map!=NULL )
- sf->sf.uni_interp = interp_from_encoding(sf->sf.map->enc,ui_none);
-
- /* Fixup for an old bug */
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-16 19:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-13 1:29 [gentoo-commits] repo/gentoo:master commit in: media-gfx/fontforge/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2017-11-13 14:35 Guilherme Amadio
2020-06-16 19:17 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox