log4cxx: add version 1.3.0

swebb2066 · Oct 22, 2024 · 01473ae · 01473ae
1 parent 774bb1b
commit 01473ae
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/recipes/log4cxx/all/conandata.yml b/recipes/log4cxx/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.3.0":
+    url: "https://archive.apache.org/dist/logging/log4cxx/1.3.0/apache-log4cxx-1.3.0.tar.gz"
+    sha256: "801520fe8b664df2216c5194524a03efb234326f24347e778c27e4f59f913c42"
   "1.2.0":
     url: "https://archive.apache.org/dist/logging/log4cxx/1.2.0/apache-log4cxx-1.2.0.tar.gz"
     sha256: "09f4748aa5675ef5c0770bedbf5e00488668933c5a935a43ac5b85be2436c48a"
@@ -12,6 +15,10 @@ sources:
     url: "https://archive.apache.org/dist/logging/log4cxx/0.12.1/apache-log4cxx-0.12.1.tar.gz"
     sha256: "7bea5cb477f0e31c838f0e1f4f498cc3b30c2eae74703ddda923e7e8c2268d22"
 patches:
+  "1.3.0":
+    - patch_file: "patches/1.3.0-0001-find-apr.patch"
+      patch_description: "use cci's package name"
+      patch_type: "conan"
   "1.2.0":
     - patch_file: "patches/1.2.0-0001-find-apr.patch"
       patch_description: "use cci's package name"

diff --git a/recipes/log4cxx/all/patches/1.3.0-0001-find-apr.patch b/recipes/log4cxx/all/patches/1.3.0-0001-find-apr.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7b1c0d5..e0c7d22 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,11 +58,13 @@ endif()
+
+ # Find Apache Runtime
+ option(APR_STATIC "Link to the APR static library" OFF)
+-find_package(APR REQUIRED)
++find_package(apr REQUIRED)
++set(APR_LIBRARIES apr::apr)
+
+ # Find Apache Runtime Utilities
+ option(APU_STATIC "Link to the APR-Util static library" OFF)
+-find_package(APR-Util REQUIRED)
++find_package(apr-util REQUIRED)
++set(APR_UTIL_LIBRARIES apr-util::apr-util)
+
+ find_package( Threads REQUIRED )
+