summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2016-04-18 15:29:50 +0000
committerjperkin <jperkin@pkgsrc.org>2016-04-18 15:29:50 +0000
commitc55800e16471d677322edade55bca2b67d16bda8 (patch)
tree2dc2f844de636ceb40c0236ae7a8a2f365861f75 /editors
parent77d979cae7098d33fbee0732f84c7f204ede71a9 (diff)
downloadpkgsrc-c55800e16471d677322edade55bca2b67d16bda8.tar.gz
Avoid FS define on SunOS.
Diffstat (limited to 'editors')
-rw-r--r--editors/abiword/distinfo3
-rw-r--r--editors/abiword/patches/patch-src_text_fmt_xp_fv__FrameEdit.h15
2 files changed, 17 insertions, 1 deletions
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 4dd979b70fd..0d857b78e9b 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2016/02/12 23:42:15 jperkin Exp $
+$NetBSD: distinfo,v 1.70 2016/04/18 15:29:50 jperkin Exp $
SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
@@ -25,5 +25,6 @@ SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd8
SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d
SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
+SHA1 (patch-src_text_fmt_xp_fv__FrameEdit.h) = 684310bf9aece4ce72d004dfae9a4b4b6ca69570
SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = d07eaf64446efc83c24e02e5969e0921451269a8
SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.h) = 59837727c060bc8f8f14478c3a0245b877c2d29a
diff --git a/editors/abiword/patches/patch-src_text_fmt_xp_fv__FrameEdit.h b/editors/abiword/patches/patch-src_text_fmt_xp_fv__FrameEdit.h
new file mode 100644
index 00000000000..9100e110433
--- /dev/null
+++ b/editors/abiword/patches/patch-src_text_fmt_xp_fv__FrameEdit.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_text_fmt_xp_fv__FrameEdit.h,v 1.1 2016/04/18 15:29:50 jperkin Exp $
+
+Avoid FS define on SunOS.
+
+--- src/text/fmt/xp/fv_FrameEdit.h.orig 2013-04-07 13:53:03.000000000 +0000
++++ src/text/fmt/xp/fv_FrameEdit.h
+@@ -71,7 +71,7 @@ public:
+ void deleteFrame(fl_FrameLayout * pFL = NULL);
+ void setDragType(UT_sint32 x,UT_sint32 y, bool bDrawFrame);
+ bool getFrameStrings(UT_sint32 x, UT_sint32 y,
+- fv_FrameStrings &FS,
++ fv_FrameStrings &FString,
+ fl_BlockLayout ** pCloseBL,
+ fp_Page ** pPage);
+ fl_FrameLayout * getFrameLayout(void) const