CVS commit: pkgsrc/filesystems/fuse-darling-dmg

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Mar 26 02:34:52 UTC 2020

Modified Files:
        pkgsrc/filesystems/fuse-darling-dmg: distinfo
Added Files:
        pkgsrc/filesystems/fuse-darling-dmg/patches:
            patch-src_HFSAttributeBTree.cpp patch-src_HFSCatalogBTree.cpp
            patch-src_unichar.cpp

Log Message:
Resolve fallout from ICU changes


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/fuse-darling-dmg/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_HFSAttributeBTree.cpp \
    pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_HFSCatalogBTree.cpp \
    pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_unichar.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/fuse-darling-dmg/distinfo
diff -u pkgsrc/filesystems/fuse-darling-dmg/distinfo:1.2 pkgsrc/filesystems/fuse-darling-dmg/distinfo:1.3
--- pkgsrc/filesystems/fuse-darling-dmg/distinfo:1.2    Thu Mar 23 17:06:50 2017
+++ pkgsrc/filesystems/fuse-darling-dmg/distinfo        Thu Mar 26 02:34:51 2020
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.2 2017/03/23 17:06:50 joerg Exp $
+$NetBSD: distinfo,v 1.3 2020/03/26 02:34:51 joerg Exp $
 
 SHA1 (fuse-darling-dmg-20160310-b7ce87bfe59c2ed758165c8650402f6d4c84d184.tar.gz) = c251fd01bcb843244ae8aa0f9a0d74cf9a6b4974
 RMD160 (fuse-darling-dmg-20160310-b7ce87bfe59c2ed758165c8650402f6d4c84d184.tar.gz) = de3f73bb4e9e66c1b6f98beb7e5e6b647be91147
 SHA512 (fuse-darling-dmg-20160310-b7ce87bfe59c2ed758165c8650402f6d4c84d184.tar.gz) = 
1476b9f0f4ff3094713bcdde82e0330f8db4ce6edf3fac900f349d0bf081fe54d3893845662497dd0ea06134ce8289cd0d2a0046593386fca5c604f69075ea4c
 Size (fuse-darling-dmg-20160310-b7ce87bfe59c2ed758165c8650402f6d4c84d184.tar.gz) = 50309 bytes
+SHA1 (patch-src_HFSAttributeBTree.cpp) = ce318ae1336d9335c111150c6779cca8a8ee055e
+SHA1 (patch-src_HFSCatalogBTree.cpp) = 407524f9c4d6eebc89abf465055d0b64853fba9b
 SHA1 (patch-src_be.h) = 9c6554c84ee3ed15cc1232b70cf87c23aa4c88fa
 SHA1 (patch-src_main-fuse.cpp) = a302b6467185f6f94731b07ed04792b6a5ef2801
+SHA1 (patch-src_unichar.cpp) = f84489f9de4f9f6456d2eed9985ca2cfa8865483

Added files:

Index: pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_HFSAttributeBTree.cpp
diff -u /dev/null pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_HFSAttributeBTree.cpp:1.1
--- /dev/null   Thu Mar 26 02:34:52 2020
+++ pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_HFSAttributeBTree.cpp Thu Mar 26 02:34:52 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_HFSAttributeBTree.cpp,v 1.1 2020/03/26 02:34:52 joerg Exp $
+
+--- src/HFSAttributeBTree.cpp.orig     2020-03-25 15:29:52.355921486 +0000
++++ src/HFSAttributeBTree.cpp
+@@ -4,6 +4,8 @@
+ #include <unicode/unistr.h>
+ #include "unichar.h"
+ 
++using icu_64::UnicodeString;
++
+ HFSAttributeBTree::HFSAttributeBTree(std::shared_ptr<HFSFork> fork, CacheZone* zone)
+ : HFSBTree(fork, zone, "Attribute")
+ {
Index: pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_HFSCatalogBTree.cpp
diff -u /dev/null pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_HFSCatalogBTree.cpp:1.1
--- /dev/null   Thu Mar 26 02:34:52 2020
+++ pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_HFSCatalogBTree.cpp   Thu Mar 26 02:34:52 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_HFSCatalogBTree.cpp,v 1.1 2020/03/26 02:34:52 joerg Exp $
+
+--- src/HFSCatalogBTree.cpp.orig       2020-03-25 15:29:11.522914079 +0000
++++ src/HFSCatalogBTree.cpp
+@@ -5,6 +5,8 @@
+ #include <cstring>
+ #include "unichar.h"
+ 
++using icu_64::UnicodeString;
++
+ static const int MAX_SYMLINKS = 50;
+ 
+ extern UConverter *g_utf16be;
Index: pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_unichar.cpp
diff -u /dev/null pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_unichar.cpp:1.1
--- /dev/null   Thu Mar 26 02:34:52 2020
+++ pkgsrc/filesystems/fuse-darling-dmg/patches/patch-src_unichar.cpp   Thu Mar 26 02:34:52 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_unichar.cpp,v 1.1 2020/03/26 02:34:52 joerg Exp $
+
+--- src/unichar.cpp.orig       2020-03-25 15:28:01.041787497 +0000
++++ src/unichar.cpp
+@@ -6,6 +6,8 @@
+ #include <cassert>
+ #include <iostream>
+ 
++using icu_64::UnicodeString;
++
+ UConverter *g_utf16be;
+ 
+ static void InitConverter() __attribute__((constructor));