Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

nsync: update to 1.27.0

Browse Source 
Rebase a patch
This commit is contained in:
Biswapriyo Nath 2024-05-16 16:20:28 +00:00
parent 1b28c8a4b0
commit c1d23d6819
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mingw-w64-nsync/0001-nsync-mingw-w64.patch
View File

@ -1,6 +1,5 @@
diff -urN -x '*.orig' nsync-1.20.2.orig/CMakeLists.txt nsync-1.20.2/CMakeLists.txt --- a/CMakeLists.txt
--- nsync-1.20.2.orig/CMakeLists.txt 2019-01-04 05:29:33.000000000 +0800 +++ b/CMakeLists.txt
+++ nsync-1.20.2/CMakeLists.txt 2019-03-03 17:41:18.480996400 +0800
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
set (NSYNC_OS_CPP_SRC set (NSYNC_OS_CPP_SRC
# Avoid use of the C++11 version of per_thread_waiter. It behaves # Avoid use of the C++11 version of per_thread_waiter. It behaves
@ -10,8 +9,8 @@ diff -urN -x '*.orig' nsync-1.20.2.orig/CMakeLists.txt nsync-1.20.2/CMakeLists.t
"platform/c++11/src/yield.cc" "platform/c++11/src/yield.cc"
"platform/c++11/src/time_rep_timespec.cc" "platform/c++11/src/time_rep_timespec.cc"
"platform/c++11/src/nsync_panic.cc" "platform/c++11/src/nsync_panic.cc"
@@ -80,7 +80,7 @@ @@ -88,7 +88,7 @@
# https://cmake.org/cmake/help/v3.1/policy/CMP0054.html endif ()
# Pick the include directory for the operating system. # Pick the include directory for the operating system.
-if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") -if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX")
@ -19,7 +18,7 @@ diff -urN -x '*.orig' nsync-1.20.2.orig/CMakeLists.txt nsync-1.20.2/CMakeLists.t
include_directories ("${PROJECT_SOURCE_DIR}/platform/win32") include_directories ("${PROJECT_SOURCE_DIR}/platform/win32")
set (NSYNC_CPP_FLAGS "/TP") set (NSYNC_CPP_FLAGS "/TP")
@@ -204,6 +204,9 @@ @@ -206,6 +206,9 @@
set (NSYNC_TEST_OS_SRC set (NSYNC_TEST_OS_SRC
"platform/posix/src/start_thread.c" "platform/posix/src/start_thread.c"
) )
@ -29,7 +28,7 @@ diff -urN -x '*.orig' nsync-1.20.2.orig/CMakeLists.txt nsync-1.20.2/CMakeLists.t
endif () endif ()
# Pick the include directory for the architecture. # Pick the include directory for the architecture.
@@ -296,9 +299,9 @@ @@ -298,9 +301,9 @@
"testing/smprintf.c" "testing/smprintf.c"
"testing/testing.c" "testing/testing.c"
"testing/time_extra.c" "testing/time_extra.c"
@ -41,7 +40,7 @@ diff -urN -x '*.orig' nsync-1.20.2.orig/CMakeLists.txt nsync-1.20.2/CMakeLists.t
set_target_properties (nsync_test PROPERTIES set_target_properties (nsync_test PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR}) SOVERSION ${PROJECT_VERSION_MAJOR})
@@ -320,7 +323,8 @@ @@ -322,7 +325,8 @@
) )
endforeach (t) endforeach (t)
@ -51,7 +50,7 @@ diff -urN -x '*.orig' nsync-1.20.2.orig/CMakeLists.txt nsync-1.20.2/CMakeLists.t
set_target_properties (nsync_test_cpp PROPERTIES set_target_properties (nsync_test_cpp PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR}) SOVERSION ${PROJECT_VERSION_MAJOR})
@@ -398,11 +402,13 @@ @@ -400,11 +404,13 @@
set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON)
@ -67,7 +66,7 @@ diff -urN -x '*.orig' nsync-1.20.2.orig/CMakeLists.txt nsync-1.20.2/CMakeLists.t
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
@@ -427,3 +433,11 @@ @@ -429,3 +435,11 @@
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT Development) COMPONENT Development)
endforeach () endforeach ()

6
mingw-w64-nsync/PKGBUILD
View File

@ -3,7 +3,7 @@
_realname=nsync _realname=nsync
pkgbase=mingw-w64-${_realname} pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.26.0 pkgver=1.27.0
pkgrel=1 pkgrel=1
pkgdesc="C library that exports various synchronization primitives (mingw-w64)" pkgdesc="C library that exports various synchronization primitives (mingw-w64)"
arch=('any') arch=('any')
@ -18,8 +18,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
source=(${_realname}-${pkgver}.tar.gz::https://github.com/google/nsync/archive/${pkgver}.tar.gz source=(${_realname}-${pkgver}.tar.gz::https://github.com/google/nsync/archive/${pkgver}.tar.gz
0001-nsync-mingw-w64.patch 0001-nsync-mingw-w64.patch
0002-nsync-clang-fixes.patch) 0002-nsync-clang-fixes.patch)
sha256sums=('80fc1e605bb3cf5f272811ece39c4fb6761ffcb9b30563301845cc9ff381eb8b' sha256sums=('e8e552a358f4a28e844207a7c5cb51767e4aeb0b29e22d23ac2a09924130f761'
'fd06418e181f91d395693c60671caa291bfc7a034c9f7bd21551bdc76a9afd1b' 'c043de7a5116e60717b47d369a2c92859c3fc438e798581700c42277683f652f'
'3c33925b71e13845a1fd6fdc5000cdcb94fedfc54f835ab3caedcf725fe5dffa') '3c33925b71e13845a1fd6fdc5000cdcb94fedfc54f835ab3caedcf725fe5dffa')
# Helper macros to help make tasks easier # # Helper macros to help make tasks easier #