CVS commit: pkgsrc/archivers/dar

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jun 22 18:28:02 UTC 2024

Modified Files:
        pkgsrc/archivers/dar: distinfo
Added Files:
        pkgsrc/archivers/dar/patches: patch-src_testing_test__truncate.cpp

Log Message:
dar: avoid ambiguity - std:deci/libdar:deci


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/archivers/dar/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/archivers/dar/patches/patch-src_testing_test__truncate.cpp

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

Modified files:

Index: pkgsrc/archivers/dar/distinfo
diff -u pkgsrc/archivers/dar/distinfo:1.34 pkgsrc/archivers/dar/distinfo:1.35
--- pkgsrc/archivers/dar/distinfo:1.34  Mon Oct  3 13:59:05 2022
+++ pkgsrc/archivers/dar/distinfo       Sat Jun 22 18:28:02 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2022/10/03 13:59:05 nros Exp $
+$NetBSD: distinfo,v 1.35 2024/06/22 18:28:02 adam Exp $
 
 BLAKE2s (dar-2.7.7.tar.gz) = 5516960811fd5c2b021cf48d9bb493d6c8cb8224a497f3ee36304058925997e3
 SHA512 (dar-2.7.7.tar.gz) = 984328cff1ed3338707858aced83a6a18e950581f02dd686a2a01668f6c374d0af2d98ba49068a61624641fcfbb139ae893d02e5b5f303b8b26d8e05fcb6a229
@@ -8,3 +8,4 @@ SHA1 (patch-doc_Makefile.in) = bc34aaaaa
 SHA1 (patch-doc_man_Makefile.in) = b3d0474581b480876e2e16d08f20c99559dd6e68
 SHA1 (patch-doc_mini-howto_Makefile.in) = ce9f9b4cd867d818ab7b8aa8bdf658038aea08b9
 SHA1 (patch-src_libdar_secu__string.hpp) = d07190e5330a1c05c91970aa4ed6f4a4f5ba344d
+SHA1 (patch-src_testing_test__truncate.cpp) = 53da28caf35627d1094dd2795ebf853973d9e288

Added files:

Index: pkgsrc/archivers/dar/patches/patch-src_testing_test__truncate.cpp
diff -u /dev/null pkgsrc/archivers/dar/patches/patch-src_testing_test__truncate.cpp:1.1
--- /dev/null   Sat Jun 22 18:28:02 2024
+++ pkgsrc/archivers/dar/patches/patch-src_testing_test__truncate.cpp   Sat Jun 22 18:28:02 2024
@@ -0,0 +1,56 @@
+$NetBSD: patch-src_testing_test__truncate.cpp,v 1.1 2024/06/22 18:28:02 adam Exp $
+
+Fix ambiguity.
+
+--- src/testing/test_truncate.cpp.orig 2024-06-22 15:10:31.634590256 +0000
++++ src/testing/test_truncate.cpp
+@@ -69,7 +69,7 @@ static void f1()
+ 
+     fic.write(message.c_str(), message.size());
+     fic.truncate(message.size()/2);
+-    cout << "file size = " << deci(fic.get_position()).human() << endl;
++    cout << "file size = " << libdar::deci(fic.get_position()).human() << endl;
+     fic.write(message.c_str(), message.size());
+     fic.skip(message.size()/3);
+     fic.truncate(message.size()/2);
+@@ -82,7 +82,7 @@ static void f1()
+ 
+     over.write(message.c_str(), message.size());
+     over.truncate(message.size()/2);
+-    cout << "file size = " << deci(over.get_position()).human() << endl;
++    cout << "file size = " << libdar::deci(over.get_position()).human() << endl;
+     over.write(message.c_str(), message.size());
+     over.skip(0);  // to flush data pending for writing
+     over.write(message.c_str(), message.size());
+@@ -107,13 +107,13 @@ static void f2()
+     U_I lu = 0;
+ 
+ //    mem.skip_to_eof();
+-    cout << "file size = " << deci(mem.get_position()).human() << endl;
++    cout << "file size = " << libdar::deci(mem.get_position()).human() << endl;
+     mem.write(message.c_str(), message.size());
+-    cout << "file size = " << deci(mem.get_position()).human() << endl;
++    cout << "file size = " << libdar::deci(mem.get_position()).human() << endl;
+     mem.truncate(5);
+-    cout << "file size = " << deci(mem.get_position()).human() << endl;
++    cout << "file size = " << libdar::deci(mem.get_position()).human() << endl;
+     mem.skip_to_eof();
+-    cout << "file size = " << deci(mem.get_position()).human() << endl;
++    cout << "file size = " << libdar::deci(mem.get_position()).human() << endl;
+     mem.skip(0);
+     lu = mem.read(buffer, 99);
+     buffer[lu] = '\0';
+@@ -121,10 +121,10 @@ static void f2()
+ 
+ static void f3()
+ {
+-    storage store(deci("5000000000").computer()); // 5 GByte of RAM
+-    cout << "storage size = " << deci(store.size()).human() << endl;
++    storage store(libdar::deci("5000000000").computer()); // 5 GByte of RAM
++    cout << "storage size = " << libdar::deci(store.size()).human() << endl;
+     store.truncate(10);
+-    cout << "storage size = " << deci(store.size()).human() << endl;
++    cout << "storage size = " << libdar::deci(store.size()).human() << endl;
+ }
+ 
+ static void f4()