sorry putridsoul66 for the double emacs, I've forgot to CC ports
(as always...)
On Mon, Mar 30, 2020 at 12:54:23PM +0530, putridsou...@gmail.com wrote:
> Update net/toxcore to latest version-0.2.11
> There was a complaint in the mailing-list
> about toxcore not being updated, I hope
> someone will tests this.
>
it does not bulid here, it fails with
Patching file CMakeLists.txt using Plan A...
Hunk #1 failed at 171.
Hunk #2 failed at 463.
No such line 592 in input file, ignoring
Hunk #3 failed at 580.
3 out of 3 hunks failed--saving rejects to CMakeLists.txt.rej
Have you forgotten to add the patch for the CMakeLists in the mail? :)
Here's an updated patch with CMakeLists fixed and updated plist.
It builds (on -current ~ week old) but I've not tested it with toxic
yet.
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 30 Mar 2020 08:12:01 -0000
@@ -2,8 +2,8 @@
COMMENT = Tox client library
-V = 0.2.3
-REVISION = 3
+V = 0.2.11
+REVISION = 11
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 30 Mar 2020 08:12:01 -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.11.tar.gz) = 8REoWwNtd0bOjRMhzwuJ7JO0+tiukHZ6JOUCMLvuJ+E=
+SIZE (toxcore-0.2.11.tar.gz) = 507476
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 30 Mar 2020 08:12:01 -0000
@@ -6,54 +6,44 @@ $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()
+@@ -381,16 +381,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}")
- set_property(TEST ${target} PROPERTY ENVIRONMENT
"LLVM_PROFILE_FILE=${target}.profraw")
- endif()
- endif()
-+ message (WARNING "Test ${target} not built because it breaks the build
with base-gcc and NO_TEST is set")
++ message (WARNING "Test ${target} not build 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()
+@@ -492,22 +483,3 @@ endif()
+ # :: Test programs
+ #
+
################################################################################
+-
+-option(BUILD_MISC_TESTS "Build additional tests" OFF)
+-if (BUILD_MISC_TESTS)
+- add_executable(DHT_test ${CPUFEATURES}
+- testing/DHT_test.c)
+- target_link_modules(DHT_test toxcore misc_tools)
-
--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 misc_tools)
-
--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 misc_tools)
-
--add_executable(random_testing ${CPUFEATURES}
-- testing/random_testing.cc)
--target_link_modules(random_testing toxcore)
+- add_executable(save-generator
+- other/fun/save-generator.c)
+- target_link_modules(save-generator toxcore misc_tools)
+-endif()
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 30 Mar 2020 08:12:01 -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
----- End forwarded message -----
--
/Omar Polo
