Skip to content

Commit af3488c

Browse files
authored
(conan-io#24707) drogon: add version 1.9.6, remove older versions
1 parent 14d12f2 commit af3488c

8 files changed

+20
-121
lines changed

recipes/drogon/all/conandata.yml

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
sources:
2+
"1.9.6":
3+
url: "https://github.com/drogonframework/drogon/archive/v1.9.6.tar.gz"
4+
sha256: "a81d0ea0e87b0214aa56f7fa7bb851011efe606af67891a0945825104505a08a"
25
"1.9.5":
36
url: "https://github.com/drogonframework/drogon/archive/v1.9.5.tar.gz"
47
sha256: "ec17882835abeb0672db29cb36ab0c5523f144d5d8ff177861b8f5865803eaae"
@@ -20,16 +23,14 @@ sources:
2023
"1.8.7":
2124
url: "https://github.com/drogonframework/drogon/archive/v1.8.7.tar.gz"
2225
sha256: "d2d80d35becd69bf80d74bf09b69425193f1b7be3926bd44f3ac7b951e54465d"
23-
"1.8.6":
24-
url: "https://github.com/drogonframework/drogon/archive/v1.8.6.tar.gz"
25-
sha256: "ff02979f28047e97e19e36d1f363b3052b8122975fa8a379305d746dfe5fb004"
26-
"1.8.5":
27-
url: "https://github.com/drogonframework/drogon/archive/v1.8.5.tar.gz"
28-
sha256: "9469f99408c114bc1e89945a3a8dab4640ea6d8cb06e7d42f06c1dfda3f71d2a"
29-
"1.8.4":
30-
url: "https://github.com/drogonframework/drogon/archive/v1.8.4.tar.gz"
31-
sha256: "6f2f59ead0f0c37b0aac4bc889cbaedf3c2540f3020e892596c72f0a4d887a18"
3226
patches:
27+
"1.9.6":
28+
- patch_file: "patches/1.8.5-0001-remove-shared-libs.patch"
29+
patch_description: "remove shared libs option"
30+
patch_type: "conan"
31+
- patch_file: "patches/1.9.6-0002-find-cci-packages.patch"
32+
patch_description: "Fix jsoncpp cmake target name"
33+
patch_type: "conan"
3334
"1.9.5":
3435
- patch_file: "patches/1.8.5-0001-remove-shared-libs.patch"
3536
patch_description: "remove shared libs option"
@@ -79,34 +80,3 @@ patches:
7980
- patch_file: "patches/1.8.6-0002-find-cci-packages.patch"
8081
patch_description: "Fix jsoncpp cmake target name"
8182
patch_type: "conan"
82-
"1.8.6":
83-
- patch_file: "patches/1.8.5-0001-remove-shared-libs.patch"
84-
patch_description: "remove shared libs option"
85-
patch_type: "conan"
86-
- patch_file: "patches/1.8.6-0002-find-cci-packages.patch"
87-
patch_description: "Fix jsoncpp cmake target name"
88-
patch_type: "conan"
89-
"1.8.5":
90-
- patch_file: "patches/1.8.5-0001-remove-shared-libs.patch"
91-
patch_description: "remove shared libs option"
92-
patch_type: "conan"
93-
- patch_file: "patches/1.8.5-0002-find-cci-packages.patch"
94-
patch_description: "Fix jsoncpp cmake target name"
95-
patch_type: "conan"
96-
"1.8.4":
97-
- patch_file: "patches/1.8.4-0001-remove-shared-libs.patch"
98-
patch_description: "remove shared libs option"
99-
patch_type: "conan"
100-
- patch_file: "patches/1.8.4-0002-find-package-jsoncpp.patch"
101-
patch_description: "Fix jsoncpp cmake target name"
102-
patch_type: "conan"
103-
- patch_file: "patches/1.8.4-0003-find-package-sqlite.patch"
104-
patch_description: "Fix sqlite cmake target name"
105-
patch_type: "conan"
106-
- patch_file: "patches/1.8.4-0004-find-package-yaml-cpp.patch"
107-
patch_description: "Fix yaml-cpp cmake target name"
108-
patch_type: "conan"
109-
- patch_file: "patches/1.8.2-0004-support-gcc13.patch"
110-
patch_description: "Fix compilation error on gcc13 with C++17"
111-
patch_type: "portability"
112-
patch_source: "https://github.com/drogonframework/drogon/pull/1563/"

recipes/drogon/all/patches/1.8.2-0004-support-gcc13.patch

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

recipes/drogon/all/patches/1.8.4-0001-remove-shared-libs.patch

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

recipes/drogon/all/patches/1.8.4-0002-find-package-jsoncpp.patch

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

recipes/drogon/all/patches/1.8.4-0003-find-package-sqlite.patch

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

recipes/drogon/all/patches/1.8.4-0004-find-package-yaml-cpp.patch

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

recipes/drogon/all/patches/1.8.5-0002-find-cci-packages.patch renamed to recipes/drogon/all/patches/1.9.6-0002-find-cci-packages.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index e3e7fcf..d1032da 100755
2+
index 11c96b2..441b2c2 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -198,9 +198,9 @@ else()
6-
endif()
5+
@@ -180,9 +180,9 @@ endif()
6+
77

88
# jsoncpp
99
-find_package(Jsoncpp REQUIRED)
@@ -15,7 +15,7 @@ index e3e7fcf..d1032da 100755
1515

1616
# yamlcpp
1717
if(BUILD_YAML_CONFIG)
18-
@@ -212,7 +212,7 @@ if(BUILD_YAML_CONFIG)
18+
@@ -194,7 +194,7 @@ if(BUILD_YAML_CONFIG)
1919
message(STATUS "yaml-cpp not used")
2020
else()
2121
message(STATUS "yaml-cpp found ")
@@ -24,7 +24,7 @@ index e3e7fcf..d1032da 100755
2424
target_compile_definitions(${PROJECT_NAME} PUBLIC HAS_YAML_CPP)
2525
endif()
2626
else()
27-
@@ -442,7 +442,7 @@ if (BUILD_SQLITE)
27+
@@ -432,7 +432,7 @@ if (BUILD_SQLITE)
2828
find_package(SQLite3 QUIET)
2929
find_package(unofficial-sqlite3 QUIET)
3030
if (SQLite3_FOUND)
@@ -33,7 +33,7 @@ index e3e7fcf..d1032da 100755
3333
set(DROGON_FOUND_SQLite3 TRUE)
3434
elseif (unofficial-sqlite3_FOUND)
3535
target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::sqlite3::sqlite3)
36-
@@ -465,10 +465,10 @@ if (BUILD_SQLITE)
36+
@@ -455,10 +455,10 @@ if (BUILD_SQLITE)
3737
endif (BUILD_SQLITE)
3838

3939
if (BUILD_REDIS)
@@ -47,7 +47,7 @@ index e3e7fcf..d1032da 100755
4747
set(DROGON_SOURCES
4848
${DROGON_SOURCES}
4949
nosql_lib/redis/src/RedisClientImpl.cc
50-
@@ -488,10 +488,10 @@ if (BUILD_REDIS)
50+
@@ -478,10 +478,10 @@ if (BUILD_REDIS)
5151
nosql_lib/redis/src/SubscribeContext.h
5252
nosql_lib/redis/src/RedisSubscriberImpl.h)
5353

@@ -60,7 +60,7 @@ index e3e7fcf..d1032da 100755
6060
set(DROGON_SOURCES
6161
${DROGON_SOURCES}
6262
lib/src/RedisClientSkipped.cc
63-
@@ -500,7 +500,7 @@ if (NOT Hiredis_FOUND)
63+
@@ -490,7 +490,7 @@ if (NOT Hiredis_FOUND)
6464
set(private_headers
6565
${private_headers}
6666
lib/src/RedisClientManager.h)

recipes/drogon/config.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"1.9.6":
3+
folder: "all"
24
"1.9.5":
35
folder: "all"
46
"1.9.4":
@@ -13,9 +15,3 @@ versions:
1315
folder: "all"
1416
"1.8.7":
1517
folder: "all"
16-
"1.8.6":
17-
folder: "all"
18-
"1.8.5":
19-
folder: "all"
20-
"1.8.4":
21-
folder: "all"

0 commit comments

Comments
 (0)