Skip to content

Commit acbbfad

Browse files
authored
[licensepp] update to 1.2.0 (#48065)
1 parent 019994b commit acbbfad

9 files changed

Lines changed: 46 additions & 74 deletions

ports/licensepp/0001-use-old-pem-pack.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

ports/licensepp/0002-fix-compilation-macos.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

ports/licensepp/add-stdint.diff

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
diff --git a/license++/license.h b/license++/license.h
2-
index 677529e..0c50876 100644
3-
--- a/license++/license.h
4-
+++ b/license++/license.h
5-
@@ -11,6 +11,7 @@
6-
#ifndef License_h
7-
#define License_h
1+
diff --git a/include/license++/license.h b/include/license++/license.h
2+
index eab392d..67b405e 100644
3+
--- a/include/license++/license.h
4+
+++ b/include/license++/license.h
5+
@@ -9,7 +9,7 @@
86

7+
#ifndef LICENSEPP_License_h
8+
#define LICENSEPP_License_h
9+
-
910
+#include <stdint.h>
1011
#include <string>
1112

ports/licensepp/devendoring.patch

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 8581813..46e1565 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -48,7 +48,7 @@ include_directories (${CRYPTOPP_INCLUDE_DIRS})
6+
7+
# Ripe (static)
8+
set(RIPE_USE_STATIC_LIBS OFF)
9+
-find_package(Ripe REQUIRED)
10+
+find_package(unofficial-ripe REQUIRED)
11+
12+
include_directories (${EXTERNAL_INCLUDE_DIR})
13+
14+
@@ -87,7 +87,7 @@ target_include_directories (licensepp-lib PUBLIC
15+
16+
target_link_libraries (licensepp-lib
17+
${CRYPTOPP_LIBRARIES}
18+
- ${RIPE_LIBRARY}
19+
+ unofficial::ripe::ripe
20+
)
21+
22+
set_target_properties (licensepp-lib PROPERTIES OUTPUT_NAME "licensepp")

ports/licensepp/portfile.cmake

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
33
vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO amrayn/licensepp
6-
REF e9501da1470a3bd29254975577d806612a3d3e3c
7-
SHA512 6f70904d1214036af3891dc54f71ea2052acd8f60c277dbd2a5f3190ce4610771f36108d4d5a123c0e7312aded410d652460018d74586fc4f41b05fabb6100bd
6+
REF v${VERSION}
7+
SHA512 a27b8e669cff2ce06dfb0b2b6f961406e4c488f4a55fc086754274c719632d53942d88192010b6af8cc46784aee6a7b5c40780792e9d6f0d51ec3da76576f259
88
HEAD_REF master
99
PATCHES
10-
0001-use-old-pem-pack.patch
11-
0002-fix-compilation-macos.patch
1210
add-stdint.diff
1311
remove-werror.diff
12+
devendoring.patch
1413
)
1514

1615
file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake")

ports/licensepp/remove-werror.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index b6cce99..eae797a 100644
2+
index 8581813..52b147f 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -36,7 +36,7 @@ if (APPLE)
5+
@@ -37,7 +37,7 @@ if (APPLE)
66
endif()
77

88
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
9-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall -Werror")
10-
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")
9+
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O3 -Wall -Werror -Wno-return-stack-address")
10+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O3 -Wall -Wno-return-stack-address")
1111
endif()
1212

1313
# Check for cryptopp (static)

ports/licensepp/vcpkg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "licensepp",
3-
"version-date": "2020-11-24",
4-
"port-version": 1,
3+
"version": "1.2.0",
54
"description": "Cross platform software licensing library",
65
"homepage": "https://github.com/amrayn/licensepp",
76
"supports": "!uwp",
87
"dependencies": [
8+
"abumq-ripe",
99
{
1010
"name": "cryptopp",
1111
"features": [

versions/baseline.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5873,8 +5873,8 @@
58735873
"port-version": 0
58745874
},
58755875
"licensepp": {
5876-
"baseline": "2020-11-24",
5877-
"port-version": 1
5876+
"baseline": "1.2.0",
5877+
"port-version": 0
58785878
},
58795879
"lief": {
58805880
"baseline": "0.17.1",

versions/l-/licensepp.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "9c3329fd4912f6aa0dbc29ef6b45a041d03f3384",
5+
"version": "1.2.0",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "7e3b09b2c84eae8d6c99e8b92b39be6022210f0a",
510
"version-date": "2020-11-24",

0 commit comments

Comments
 (0)