Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/halibut/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 12 Jul 2019 20:49:58 -0000 1.4
+++ Makefile 30 Jan 2021 05:25:59 -0000
@@ -3,7 +3,7 @@
COMMENT = yet another free document preparation system
DISTNAME = halibut-1.2
-REVISION = 0
+REVISION = 1
CATEGORIES = textproc
HOMEPAGE = https://www.chiark.greenend.org.uk/~sgtatham/halibut/
MASTER_SITES = ${HOMEPAGE}${DISTNAME}/
Index: patches/patch-bk_paper_c
===================================================================
RCS file: patches/patch-bk_paper_c
diff -N patches/patch-bk_paper_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bk_paper_c 30 Jan 2021 05:25:59 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix for -fno-common
+From Debian:
+https://sources.debian.org/data/main/h/halibut/1.2-3/debian/patches/gcc-no-common.patch
+
+Index: bk_paper.c
+--- bk_paper.c.orig
++++ bk_paper.c
+@@ -174,6 +174,8 @@ static word *prepare_contents_title(word *first, wchar
+ word *second);
+ static void fold_into_page(page_data *dest, page_data *src, int right_shift);
+
++font_info *all_fonts;
++
+ static int fonts_ok(wchar_t *string, ...)
+ {
+ font_data *font;
Index: patches/patch-paper_h
===================================================================
RCS file: patches/patch-paper_h
diff -N patches/patch-paper_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-paper_h 30 Jan 2021 05:25:59 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix for -fno-common
+From Debian:
+https://sources.debian.org/data/main/h/halibut/1.2-3/debian/patches/gcc-no-common.patch
+
+Index: paper.h
+--- paper.h.orig
++++ paper.h
+@@ -78,7 +78,7 @@ struct ligature_Tag {
+ * metrics are read in.
+ */
+
+-font_info *all_fonts;
++extern font_info *all_fonts;
+
+ struct font_info_Tag {
+ font_info *next;
Hello ports --
Attached is a diff to fix textproc/halibut with -fno-common.
It is taken from Debian:
https://sources.debian.org/data/main/h/halibut/1.2-3/debian/patches/gcc-no-common.patch
OK?
~Brian
No comments:
Post a Comment