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


diff --git a/Makefile.in b/Makefile.in
index 3083f4c..352673c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,7 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
+pkgdatadir = $(datadir)
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
-- 
2.27.0


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


diff --git a/configure b/configure
index b062979..8b22419 100755
--- a/configure
+++ b/configure
@@ -16723,7 +16723,7 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
+CPPUNIT_CONFIG=`$PKG_CONFIG cppunit --modversion`
 if test -n "$CPPUNIT_CONFIG"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
 $as_echo "$CPPUNIT_CONFIG" >&6; }
@@ -16741,9 +16741,9 @@ $as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; }
   if test "$CPPUNIT_CONFIG" = "no" ; then
     no_cppunit=yes
   else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
+    CPPUNIT_CFLAGS=`$PKG_CONFIG cppunit --cflags`
+    CPPUNIT_LIBS=`$PKG_CONFIG cppunit --libs`
+    cppunit_version=`$PKG_CONFIG cppunit --version`
 
     cppunit_major_version=`echo $cppunit_version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\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

