Skip to content

Commit

Permalink
(conan-io#24707) drogon: add version 1.9.6, remove older versions
Browse files Browse the repository at this point in the history
  • Loading branch information
toge authored Aug 5, 2024
1 parent 14d12f2 commit af3488c
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 121 deletions.
50 changes: 10 additions & 40 deletions recipes/drogon/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.9.6":
url: "https://github.com/drogonframework/drogon/archive/v1.9.6.tar.gz"
sha256: "a81d0ea0e87b0214aa56f7fa7bb851011efe606af67891a0945825104505a08a"
"1.9.5":
url: "https://github.com/drogonframework/drogon/archive/v1.9.5.tar.gz"
sha256: "ec17882835abeb0672db29cb36ab0c5523f144d5d8ff177861b8f5865803eaae"
Expand All @@ -20,16 +23,14 @@ sources:
"1.8.7":
url: "https://github.com/drogonframework/drogon/archive/v1.8.7.tar.gz"
sha256: "d2d80d35becd69bf80d74bf09b69425193f1b7be3926bd44f3ac7b951e54465d"
"1.8.6":
url: "https://github.com/drogonframework/drogon/archive/v1.8.6.tar.gz"
sha256: "ff02979f28047e97e19e36d1f363b3052b8122975fa8a379305d746dfe5fb004"
"1.8.5":
url: "https://github.com/drogonframework/drogon/archive/v1.8.5.tar.gz"
sha256: "9469f99408c114bc1e89945a3a8dab4640ea6d8cb06e7d42f06c1dfda3f71d2a"
"1.8.4":
url: "https://github.com/drogonframework/drogon/archive/v1.8.4.tar.gz"
sha256: "6f2f59ead0f0c37b0aac4bc889cbaedf3c2540f3020e892596c72f0a4d887a18"
patches:
"1.9.6":
- patch_file: "patches/1.8.5-0001-remove-shared-libs.patch"
patch_description: "remove shared libs option"
patch_type: "conan"
- patch_file: "patches/1.9.6-0002-find-cci-packages.patch"
patch_description: "Fix jsoncpp cmake target name"
patch_type: "conan"
"1.9.5":
- patch_file: "patches/1.8.5-0001-remove-shared-libs.patch"
patch_description: "remove shared libs option"
Expand Down Expand Up @@ -79,34 +80,3 @@ patches:
- patch_file: "patches/1.8.6-0002-find-cci-packages.patch"
patch_description: "Fix jsoncpp cmake target name"
patch_type: "conan"
"1.8.6":
- patch_file: "patches/1.8.5-0001-remove-shared-libs.patch"
patch_description: "remove shared libs option"
patch_type: "conan"
- patch_file: "patches/1.8.6-0002-find-cci-packages.patch"
patch_description: "Fix jsoncpp cmake target name"
patch_type: "conan"
"1.8.5":
- patch_file: "patches/1.8.5-0001-remove-shared-libs.patch"
patch_description: "remove shared libs option"
patch_type: "conan"
- patch_file: "patches/1.8.5-0002-find-cci-packages.patch"
patch_description: "Fix jsoncpp cmake target name"
patch_type: "conan"
"1.8.4":
- patch_file: "patches/1.8.4-0001-remove-shared-libs.patch"
patch_description: "remove shared libs option"
patch_type: "conan"
- patch_file: "patches/1.8.4-0002-find-package-jsoncpp.patch"
patch_description: "Fix jsoncpp cmake target name"
patch_type: "conan"
- patch_file: "patches/1.8.4-0003-find-package-sqlite.patch"
patch_description: "Fix sqlite cmake target name"
patch_type: "conan"
- patch_file: "patches/1.8.4-0004-find-package-yaml-cpp.patch"
patch_description: "Fix yaml-cpp cmake target name"
patch_type: "conan"
- patch_file: "patches/1.8.2-0004-support-gcc13.patch"
patch_description: "Fix compilation error on gcc13 with C++17"
patch_type: "portability"
patch_source: "https://github.com/drogonframework/drogon/pull/1563/"
12 changes: 0 additions & 12 deletions recipes/drogon/all/patches/1.8.2-0004-support-gcc13.patch

This file was deleted.

12 changes: 0 additions & 12 deletions recipes/drogon/all/patches/1.8.4-0001-remove-shared-libs.patch

This file was deleted.

17 changes: 0 additions & 17 deletions recipes/drogon/all/patches/1.8.4-0002-find-package-jsoncpp.patch

This file was deleted.

13 changes: 0 additions & 13 deletions recipes/drogon/all/patches/1.8.4-0003-find-package-sqlite.patch

This file was deleted.

13 changes: 0 additions & 13 deletions recipes/drogon/all/patches/1.8.4-0004-find-package-yaml-cpp.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3e7fcf..d1032da 100755
index 11c96b2..441b2c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,9 +198,9 @@ else()
endif()
@@ -180,9 +180,9 @@ endif()


# jsoncpp
-find_package(Jsoncpp REQUIRED)
Expand All @@ -15,7 +15,7 @@ index e3e7fcf..d1032da 100755

# yamlcpp
if(BUILD_YAML_CONFIG)
@@ -212,7 +212,7 @@ if(BUILD_YAML_CONFIG)
@@ -194,7 +194,7 @@ if(BUILD_YAML_CONFIG)
message(STATUS "yaml-cpp not used")
else()
message(STATUS "yaml-cpp found ")
Expand All @@ -24,7 +24,7 @@ index e3e7fcf..d1032da 100755
target_compile_definitions(${PROJECT_NAME} PUBLIC HAS_YAML_CPP)
endif()
else()
@@ -442,7 +442,7 @@ if (BUILD_SQLITE)
@@ -432,7 +432,7 @@ if (BUILD_SQLITE)
find_package(SQLite3 QUIET)
find_package(unofficial-sqlite3 QUIET)
if (SQLite3_FOUND)
Expand All @@ -33,7 +33,7 @@ index e3e7fcf..d1032da 100755
set(DROGON_FOUND_SQLite3 TRUE)
elseif (unofficial-sqlite3_FOUND)
target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::sqlite3::sqlite3)
@@ -465,10 +465,10 @@ if (BUILD_SQLITE)
@@ -455,10 +455,10 @@ if (BUILD_SQLITE)
endif (BUILD_SQLITE)

if (BUILD_REDIS)
Expand All @@ -47,7 +47,7 @@ index e3e7fcf..d1032da 100755
set(DROGON_SOURCES
${DROGON_SOURCES}
nosql_lib/redis/src/RedisClientImpl.cc
@@ -488,10 +488,10 @@ if (BUILD_REDIS)
@@ -478,10 +478,10 @@ if (BUILD_REDIS)
nosql_lib/redis/src/SubscribeContext.h
nosql_lib/redis/src/RedisSubscriberImpl.h)

Expand All @@ -60,7 +60,7 @@ index e3e7fcf..d1032da 100755
set(DROGON_SOURCES
${DROGON_SOURCES}
lib/src/RedisClientSkipped.cc
@@ -500,7 +500,7 @@ if (NOT Hiredis_FOUND)
@@ -490,7 +490,7 @@ if (NOT Hiredis_FOUND)
set(private_headers
${private_headers}
lib/src/RedisClientManager.h)
Expand Down
8 changes: 2 additions & 6 deletions recipes/drogon/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.9.6":
folder: "all"
"1.9.5":
folder: "all"
"1.9.4":
Expand All @@ -13,9 +15,3 @@ versions:
folder: "all"
"1.8.7":
folder: "all"
"1.8.6":
folder: "all"
"1.8.5":
folder: "all"
"1.8.4":
folder: "all"

0 comments on commit af3488c

Please sign in to comment.