Hi all, I've been wanting to get qtox running (since utox is rather unstable).
Attached to this email are two new ports: databases/sqlcipher - Allows you to encrypt sqlite databases net/qtox - qtox client for the tox framework I'm also including a diff for net/toxcore to upgrade it from 0.2.3 to 0.2.12. I've tested all 3 and they appear to work just great. I'd like to propose that net/utox might be removed from the tree. It's alpha and pretty unstable (sometimes it makes the cpu fan race and I've had to kill -9 it sometimes) Note: net/qtox relies on databases/sqlcipher to compile and run. It also relies on the newer net/toxcore. I'm not sure about net/toxic client as I don't use it. Let me know if anything needs changing or fixing. Thanks, Tom
qtox.tgz
Description: Binary data
sqlcipher.tgz
Description: Binary data
Index: Makefile =================================================================== RCS file: /cvs/ports/net/toxcore/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 24 Nov 2019 23:05:10 -0000 1.7 +++ Makefile 1 Jan 2021 14:22:53 -0000 @@ -2,8 +2,7 @@ COMMENT = Tox client library -V = 0.2.3 -REVISION = 3 +V = 0.2.12 DISTNAME = toxcore-$V GH_ACCOUNT = TokTok Index: distinfo =================================================================== RCS file: /cvs/ports/net/toxcore/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 26 Jun 2018 20:34:04 -0000 1.2 +++ distinfo 1 Jan 2021 14:22:53 -0000 @@ -1,2 +1,2 @@ -SHA256 (toxcore-0.2.3.tar.gz) = IsUvKGxG0/gC7baXi88qU/gwE2Pit0V4RhNCejO6OjQ= -SIZE (toxcore-0.2.3.tar.gz) = 471336 +SHA256 (toxcore-0.2.12.tar.gz) = MK4yY8m2jTvvBveZup16Z+P61EcDBiXw/6S7ImhCKLA= +SIZE (toxcore-0.2.12.tar.gz) = 504832 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/net/toxcore/patches/patch-CMakeLists_txt,v retrieving revision 1.4 diff -u -p -r1.4 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 24 Nov 2019 23:05:10 -0000 1.4 +++ patches/patch-CMakeLists_txt 1 Jan 2021 14:22:53 -0000 @@ -6,23 +6,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 201 Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -171,7 +171,7 @@ if(NOT MSVC) - # Comma at end of enum is supported everywhere we run. - add_cxxflag("-Wno-c++98-compat-pedantic") - # TODO(iphydf): Stop using flexible array members. -- add_cxxflag("-Wno-c99-extensions") -+ #add_cxxflag("-Wno-c99-extensions") - # We're C-compatible, so use C style casts. - add_cxxflag("-Wno-old-style-cast") - -@@ -463,24 +463,11 @@ if(ANDROID_CPU_FEATURES) - endif() +@@ -394,16 +394,7 @@ endif() + option(AUTOTEST "Enable autotests (mainly for CI)" OFF) function(auto_test target) -- if(NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) +- if(AUTOTEST AND NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) - add_executable(auto_${target}_test ${CPUFEATURES} - auto_tests/${target}_test.c) -- target_link_modules(auto_${target}_test toxcore) +- target_link_modules(auto_${target}_test toxcore misc_tools) - if(NOT ARGV1 STREQUAL "DONT_RUN") - add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test) - set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}") @@ -32,28 +23,4 @@ Index: CMakeLists.txt + message (WARNING "Test ${target} not built because it breaks the build with base-gcc and NO_TEST is set") endfunction() - if(BUILD_TOXAV) - add_definitions(-D__STDC_LIMIT_MACROS=1) -- add_executable(auto_monolith_test ${CPUFEATURES} -- auto_tests/monolith_test.cc) -- target_link_libraries(auto_monolith_test ${toxcore_LINK_MODULES}) -- add_test(NAME monolith COMMAND ${CROSSCOMPILING_EMULATOR} auto_monolith_test) - endif() - auto_test(TCP) -@@ -593,15 +580,3 @@ if(NOT WIN32 - set_source_files_properties(testing/av_test.c PROPERTIES LANGUAGE CXX) - endif() - endif() -- --add_executable(DHT_test ${CPUFEATURES} -- testing/DHT_test.c) --target_link_modules(DHT_test toxcore) -- --add_executable(Messenger_test ${CPUFEATURES} -- testing/Messenger_test.c) --target_link_modules(Messenger_test toxcore) -- --add_executable(random_testing ${CPUFEATURES} -- testing/random_testing.cc) --target_link_modules(random_testing toxcore) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/toxcore/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 29 Apr 2018 11:14:09 -0000 1.1.1.1 +++ pkg/PLIST 1 Jan 2021 14:22:53 -0000 @@ -1,9 +1,10 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/29 11:14:09 landry Exp $ +@bin bin/DHT_bootstrap @bin bin/tox-bootstrapd include/tox/ include/tox/tox.h include/tox/toxav.h include/tox/toxencryptsave.h -lib/libtoxcore.a +@static-lib lib/libtoxcore.a @lib lib/libtoxcore.so.${LIBtoxcore_VERSION} lib/pkgconfig/toxcore.pc