Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions ports/licensepp/0001-use-old-pem-pack.patch

This file was deleted.

26 changes: 0 additions & 26 deletions ports/licensepp/0002-fix-compilation-macos.patch

This file was deleted.

15 changes: 8 additions & 7 deletions ports/licensepp/add-stdint.diff
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
diff --git a/license++/license.h b/license++/license.h
index 677529e..0c50876 100644
--- a/license++/license.h
+++ b/license++/license.h
@@ -11,6 +11,7 @@
#ifndef License_h
#define License_h
diff --git a/include/license++/license.h b/include/license++/license.h
index eab392d..67b405e 100644
--- a/include/license++/license.h
+++ b/include/license++/license.h
@@ -9,7 +9,7 @@

#ifndef LICENSEPP_License_h
#define LICENSEPP_License_h
-
+#include <stdint.h>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It makes me very sad that this isn't landed yet but it's submitted as abumq/licensepp#48

#include <string>

Expand Down
22 changes: 22 additions & 0 deletions ports/licensepp/devendoring.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8581813..46e1565 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ include_directories (${CRYPTOPP_INCLUDE_DIRS})

# Ripe (static)
set(RIPE_USE_STATIC_LIBS OFF)
-find_package(Ripe REQUIRED)
+find_package(unofficial-ripe REQUIRED)

include_directories (${EXTERNAL_INCLUDE_DIR})

@@ -87,7 +87,7 @@ target_include_directories (licensepp-lib PUBLIC

target_link_libraries (licensepp-lib
${CRYPTOPP_LIBRARIES}
- ${RIPE_LIBRARY}
+ unofficial::ripe::ripe
)

set_target_properties (licensepp-lib PROPERTIES OUTPUT_NAME "licensepp")
7 changes: 3 additions & 4 deletions ports/licensepp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO amrayn/licensepp
REF e9501da1470a3bd29254975577d806612a3d3e3c
SHA512 6f70904d1214036af3891dc54f71ea2052acd8f60c277dbd2a5f3190ce4610771f36108d4d5a123c0e7312aded410d652460018d74586fc4f41b05fabb6100bd
REF v${VERSION}
SHA512 a27b8e669cff2ce06dfb0b2b6f961406e4c488f4a55fc086754274c719632d53942d88192010b6af8cc46784aee6a7b5c40780792e9d6f0d51ec3da76576f259
HEAD_REF master
PATCHES
0001-use-old-pem-pack.patch
0002-fix-compilation-macos.patch
add-stdint.diff
remove-werror.diff
devendoring.patch
)

file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake")
Expand Down
8 changes: 4 additions & 4 deletions ports/licensepp/remove-werror.diff
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6cce99..eae797a 100644
index 8581813..52b147f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ if (APPLE)
@@ -37,7 +37,7 @@ if (APPLE)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall -Werror")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O3 -Wall -Werror -Wno-return-stack-address")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O3 -Wall -Wno-return-stack-address")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes! That's a scary warning to disable. But not actually in the patch :/

endif()

# Check for cryptopp (static)
4 changes: 2 additions & 2 deletions ports/licensepp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "licensepp",
"version-date": "2020-11-24",
"port-version": 1,
"version": "1.2.0",
"description": "Cross platform software licensing library",
"homepage": "https://github.com/amrayn/licensepp",
"supports": "!uwp",
"dependencies": [
"abumq-ripe",
{
"name": "cryptopp",
"features": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5873,8 +5873,8 @@
"port-version": 0
},
"licensepp": {
"baseline": "2020-11-24",
"port-version": 1
"baseline": "1.2.0",
"port-version": 0
},
"lief": {
"baseline": "0.17.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/licensepp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9c3329fd4912f6aa0dbc29ef6b45a041d03f3384",
"version": "1.2.0",
"port-version": 0
},
{
"git-tree": "7e3b09b2c84eae8d6c99e8b92b39be6022210f0a",
"version-date": "2020-11-24",
Expand Down
Loading