haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

sword: fix build with newer version of ICU

Browse Source
This commit is contained in:
Adrien Destugues
2020-08-03 22:28:46 +02:00
parent a452fdfe71
commit e8368cc778
1 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app-text/sword/patches/sword-1.8.1.patchset
View File

@@ -1,4 +1,4 @@
From 084171902d1eddf16f0941d8b07b508c2f56a35e Mon Sep 17 00:00:00 2001
From 06bda6bb4a16664543821d3f657180ef2e8339db Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 29 Dec 2018 12:30:33 +0100
Subject: fix path for the sword.conf file
@@ -18,10 +18,10 @@ index 3083f4c..352673c 100644
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
--
2.19.1
2.27.0
From c849ceac02a1009dea7bb12afd80fd4634d05bf4 Mon Sep 17 00:00:00 2001
From e944b5fd2fab0aba88117cf36b06b45f1da86f5e Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 25 Jan 2019 14:00:57 +0100
Subject: fix check for cppunit
@@ -54,5 +54,77 @@ index b062979..8b22419 100755
cppunit_major_version=`echo $cppunit_version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--
2.19.1
2.27.0
From 5d9945107a4bb6cbee8a70234f49090de2f3ee1e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Aug 2020 22:23:30 +0200
Subject: fix build with current ICU version
diff --git a/include/utf8transliterator.h b/include/utf8transliterator.h
index 130a519..e1ea668 100644
--- a/include/utf8transliterator.h
+++ b/include/utf8transliterator.h
@@ -45,6 +45,7 @@ SE_JAMO, SE_HAN, SE_KANJI
#include <defs.h>
#include <map>
+U_NAMESPACE_USE
SWORD_NAMESPACE_START
class SWModule;
diff --git a/src/modules/filters/scsuutf8.cpp b/src/modules/filters/scsuutf8.cpp
index 73e4a3f..feeba01 100644
--- a/src/modules/filters/scsuutf8.cpp
+++ b/src/modules/filters/scsuutf8.cpp
@@ -36,7 +36,7 @@
#endif
-
+U_NAMESPACE_USE
SWORD_NAMESPACE_START
diff --git a/src/modules/filters/utf8nfc.cpp b/src/modules/filters/utf8nfc.cpp
index 16a5c54..ff8cbfa 100644
--- a/src/modules/filters/utf8nfc.cpp
+++ b/src/modules/filters/utf8nfc.cpp
@@ -30,6 +30,7 @@
#include <utf8nfc.h>
#include <swbuf.h>
+U_NAMESPACE_USE
SWORD_NAMESPACE_START
UTF8NFC::UTF8NFC() {
diff --git a/src/modules/filters/utf8scsu.cpp b/src/modules/filters/utf8scsu.cpp
index bf5bd41..f50d9d6 100644
--- a/src/modules/filters/utf8scsu.cpp
+++ b/src/modules/filters/utf8scsu.cpp
@@ -25,6 +25,7 @@
#include <utf8scsu.h>
#include <swbuf.h>
+U_NAMESPACE_USE
SWORD_NAMESPACE_START
diff --git a/tests/tlitmgrtest.cpp b/tests/tlitmgrtest.cpp
index d7c0b1b..2144bc8 100644
--- a/tests/tlitmgrtest.cpp
+++ b/tests/tlitmgrtest.cpp
@@ -247,6 +247,8 @@
#include "unicode/ustream.h"
#include <iostream>
+U_NAMESPACE_USE
+
class SWCharString {
public:
inline SWCharString(const UnicodeString& str);
--
2.27.0