summaryrefslogtreecommitdiff
path: root/print/fontforge/files
diff options
context:
space:
mode:
Diffstat (limited to 'print/fontforge/files')
-rw-r--r--print/fontforge/files/patch-Makefile.dynamic.in35
-rw-r--r--print/fontforge/files/patch-fontforge-fontinfo.c19
-rw-r--r--print/fontforge/files/patch-fontforge-parsettf.c25
-rw-r--r--print/fontforge/files/patch-fontforge::Makefile.dynamic.in13
-rw-r--r--print/fontforge/files/patch-plugins-Makefile.in11
5 files changed, 34 insertions, 69 deletions
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index b8e4ccfc02b6..0cc2c8e8ad75 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -1,34 +1,31 @@
---- Makefile.dynamic.in.orig Thu Nov 17 05:56:25 2005
-+++ Makefile.dynamic.in Sun Dec 4 16:19:03 2005
-@@ -52,17 +52,17 @@
+--- Makefile.dynamic.in.orig Fri Apr 7 22:22:55 2006
++++ Makefile.dynamic.in Sun Apr 9 02:07:36 2006
+@@ -54,8 +54,8 @@
$(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
#cp .libs/*.so.*.* $(libdir)
$(LIBTOOL) --mode=finish $(libdir)
- mkdir -p $(libdir)/pkgconfig
- $(LIBTOOL) --mode=install $(INSTALL) -c fontforge.pc $(libdir)/pkgconfig
+ mkdir -p ${PREFIX}/libdata/pkgconfig
-+ ${BSD_INSTALL_DATA} -c fontforge.pc ${PREFIX}/libdata/pkgconfig
++ $(LIBTOOL) --mode=install $(INSTALL) -c fontforge.pc ${PREFIX}/libdata/pkgconfig
install_docs:
mkdir -p $(docdir)
- mkdir -p $(docdir)/flags $(docdir)/ja
- #explicit use of sh to make sure we don't invoke csh with different "if" syntax
- -sh -c "if test -d htdocs/ja >/dev/null ; then mkdir -p $(docdir)/ja ; fi"
-- -cp htdocs/*.{html,png,gif,pdf} $(docdir)
-- -cp htdocs/flags/* $(docdir)/flags
-- -cp htdocs/ja/* $(docdir)/ja
-+ ${BSD_INSTALL_DATA} htdocs/*.{html,png,gif,pdf} $(docdir)
-+ ${BSD_INSTALL_DATA} htdocs/flags/* $(docdir)/flags
-+ ${BSD_INSTALL_DATA} htdocs/ja/* $(docdir)/ja
-
- install_po:
- ( cd po ; make install )
-@@ -73,7 +73,7 @@
+@@ -75,7 +75,7 @@
mkdir -p $(mandir)/man1
mkdir -p $(sharedir)
$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/fontforge $(bindir)
-- -$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
+-# -$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
# -rm -f $(bindir)/pfaedit
# (cd $(bindir) ; ln -s fontforge pfaedit)
- # cp fontforge/pfaedit-*.ui $(sharedir)
+ # $(INSTALL_DATA) fontforge/pfaedit-*.ui $(sharedir)
+@@ -84,7 +84,7 @@
+ # if you are editing CID keyed files (and even then you can live without them
+ -$(INSTALL_DATA) $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
+ $(INSTALL_DATA) $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
+-# -$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
++ $(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
+ #explicit use of sh to make sure we don't invoke csh with different "if" syntax
+ sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
+ sh < systemspecific
diff --git a/print/fontforge/files/patch-fontforge-fontinfo.c b/print/fontforge/files/patch-fontforge-fontinfo.c
deleted file mode 100644
index 7d7d286e3382..000000000000
--- a/print/fontforge/files/patch-fontforge-fontinfo.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- fontforge/fontinfo.c.orig Wed Jan 11 20:00:54 2006
-+++ fontforge/fontinfo.c Tue Jan 24 12:55:39 2006
-@@ -5311,6 +5311,7 @@
- (sf->xuid!=NULL && uc_strcmp(txt,sf->xuid)==0) ||
- ttfuniqueidmatch(sf,d)) ) {
- char *buts[4];
-+ int ans;
- buts[0] = _("Change");
- buts[1] = _("Retain");
- #if defined(FONTFORGE_CONFIG_GDRAW)
-@@ -5319,7 +5320,7 @@
- buts[2] = GTK_STOCK_CANCEL;
- #endif
- buts[3] = NULL;
-- int ans = gwwv_ask(_("Change UniqueID?"),(const char **) buts,0,2,_("You have changed this font's name without changing the UniqueID (or XUID).\nThis is probably not a good idea, would you like me to\ngenerate a random new value?"));
-+ ans = gwwv_ask(_("Change UniqueID?"),(const char **) buts,0,2,_("You have changed this font's name without changing the UniqueID (or XUID).\nThis is probably not a good idea, would you like me to\ngenerate a random new value?"));
- if ( ans==2 ) {
- GDrawSetCursor(gw,ct_pointer);
- return(true);
diff --git a/print/fontforge/files/patch-fontforge-parsettf.c b/print/fontforge/files/patch-fontforge-parsettf.c
deleted file mode 100644
index 8b8e71bcde1c..000000000000
--- a/print/fontforge/files/patch-fontforge-parsettf.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- fontforge/parsettf.c.orig Sun Jan 15 00:40:17 2006
-+++ fontforge/parsettf.c Tue Jan 24 13:04:32 2006
-@@ -4277,18 +4277,19 @@
- if ( !info->onlystrikes &&
- info->glyphlocations_start!=0 && info->glyph_start!=0 &&
- info->cff_start!=0 ) {
-+ int choice;
- char *buts[4];
- buts[0] = _("TTF 'glyf'");
- buts[1] = _("OTF 'CFF '");
- buts[3] = NULL;
- #if defined(FONTFORGE_CONFIG_GDRAW)
- buts[2] = _("_Cancel");
-- int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
-+ choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
- #elif defined(FONTFORGE_CONFIG_GTK)
- buts[2] = GTK_STOCK_CANCEL;
-- int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
-+ choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
- #else
-- int choice = 0;
-+ choice = 0;
- #endif
- if ( choice==2 ) {
- setlocale(LC_NUMERIC,oldloc);
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index 414c65afbdb7..680d9f665289 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -1,7 +1,7 @@
---- fontforge/Makefile.dynamic.in.orig Fri Nov 11 11:41:01 2005
-+++ fontforge/Makefile.dynamic.in Sun Dec 4 16:59:47 2005
-@@ -45,16 +45,16 @@
- DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o
+--- fontforge/Makefile.dynamic.in.orig Tue Mar 14 09:30:39 2006
++++ fontforge/Makefile.dynamic.in Tue Mar 14 15:59:46 2006
+@@ -45,17 +45,17 @@
+ DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o namelist.o pua.o
ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
-_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
@@ -10,10 +10,11 @@
@CPPFLAGS@ '-DPREFIX="@prefix@"'
CFLAGS = @CFLAGS@ $(_CFLAGS)
+ #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles
LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
-- $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
+- $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
-DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
-+ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm -lintl
++ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm -lintl
+DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm -lintl
-all: fontforge
diff --git a/print/fontforge/files/patch-plugins-Makefile.in b/print/fontforge/files/patch-plugins-Makefile.in
new file mode 100644
index 000000000000..8ecdfd0fb44e
--- /dev/null
+++ b/print/fontforge/files/patch-plugins-Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/Makefile.in.orig Fri Nov 11 10:46:50 2005
++++ plugins/Makefile.in Wed Mar 1 10:40:02 2006
+@@ -28,7 +28,7 @@
+ CFLAGS = @CFLAGS@ $(_CFLAGS)
+
+ LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
+- $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
++ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -L/usr/local/lib -lm
+
+ PLUGINS = gb12345.la
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 10:53:08 +0000