conan-public: fixes for latest Android NDK (#74)

recipes/cjson/conanfile.py

@@ -1,7 +1,9 @@
 from conans import ConanFile, tools, CMake, python_requires
 import os
+import sys
+import fileinput
 
-class MinizConan(ConanFile):
+class CjsonConan(ConanFile):
     name = 'cjson'
     exports = 'VERSION'
     version = open(os.path.join('.', 'VERSION'), 'r').read().rstrip()
@@ -33,6 +35,12 @@ def source(self):
         git.clone(self.url)
         git.checkout(self.branch)
 
+        # Modern Android NDK requires modern CMake policies
+        for line in fileinput.input([os.path.join(folder, "CMakeLists.txt")], inplace=True):
+            if line.strip().startswith('cmake_minimum_required'):
+                line = 'cmake_minimum_required(VERSION 3.6)\n'
+            sys.stdout.write(line)
+
     def build(self):
         if self.settings.arch == 'universal':
             self.lipo_create(self, self.build_folder)

recipes/freerdp/conanfile.py

@@ -28,7 +28,7 @@ def build_requirements(self):
         self.build_requires('openssl/1.1.1l@devolutions/stable')
         self.build_requires('winpr/3.0.0@devolutions/stable')
         self.build_requires('mbedtls/3.5.1@devolutions/stable')
-        self.build_requires('zlib/1.3@devolutions/stable')
+        self.build_requires('zlib/1.3.1@devolutions/stable')
         self.build_requires('cjson/1.7.15@devolutions/stable')
 
     def source(self):

recipes/libfido2/conanfile.py

@@ -30,7 +30,7 @@ class LibFIDO2Conan(ConanFile):
 
     def build_requirements(self):
         super().build_requirements()
-        self.build_requires('zlib/1.3@devolutions/stable')
+        self.build_requires('zlib/1.3.1@devolutions/stable')
         self.build_requires('libcbor/0.10.2@devolutions/stable')
         self.build_requires('libressl/3.8.2@devolutions/stable')
 

recipes/libjpeg/conanfile.py

@@ -1,5 +1,7 @@
 from conans import ConanFile, tools, python_requires, CMake
 import os
+import sys
+import fileinput
 
 class JpegConan(ConanFile):
     name = 'libjpeg'
@@ -31,6 +33,12 @@ def source(self):
         git = tools.Git(folder=folder)
         git.clone(self.url, branch=self.branch)
 
+        # Modern Android NDK requires modern CMake policies
+        for line in fileinput.input([os.path.join(folder, "CMakeLists.txt")], inplace=True):
+            if line.strip().startswith('cmake_minimum_required'):
+                line = 'cmake_minimum_required(VERSION 3.6)\n'
+            sys.stdout.write(line)
+
     def build(self):
         if self.settings.arch == 'universal':
             self.lipo_create(self, self.build_folder)

recipes/libpng/conanfile.py

@@ -1,5 +1,7 @@
 from conans import ConanFile, CMake, tools, python_requires
 import os
+import sys
+import fileinput
 
 class TemplateConan(ConanFile):
     name = 'libpng'
@@ -24,7 +26,7 @@ class TemplateConan(ConanFile):
 
     def build_requirements(self):
         super().build_requirements()
-        self.build_requires('zlib/1.3@devolutions/stable')
+        self.build_requires('zlib/1.3.1@devolutions/stable')
 
     def source(self):
         if self.settings.arch == 'universal':
@@ -41,6 +43,14 @@ def source(self):
             "arm/filter_neon.S",
             "#arm/filter_neon.S")
 
+        # Modern Android NDK requires modern CMake policies
+        for line in fileinput.input([os.path.join(folder, "CMakeLists.txt")], inplace=True):
+            if line.strip().startswith('cmake_minimum_required'):
+                line = 'cmake_minimum_required(VERSION 3.6)\n'
+            if line.strip().startswith('cmake_policy'):
+                line = 'cmake_policy(VERSION 3.6)\n'
+            sys.stdout.write(line)
+
     def build(self):
         if self.settings.arch == 'universal':
             self.lipo_create(self, self.build_folder)

recipes/libudev-zero/patches/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.6)
 
 set(CMAKE_C_STANDARD 99)
 

recipes/openssh/conanfile.py

@@ -25,7 +25,7 @@ class OpenSSHConan(ConanFile):
 
     def build_requirements(self):
         super().build_requirements()
-        self.build_requires('zlib/1.3@devolutions/stable')
+        self.build_requires('zlib/1.3.1@devolutions/stable')
         self.build_requires('libcbor/0.10.2@devolutions/stable')
         self.build_requires('libressl/3.8.2@devolutions/stable')
         self.build_requires('libfido2/1.14.0@devolutions/stable')

recipes/pcre2/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.6)
 
 project(cmake_wrapper)
 

recipes/pcre2/conanfile.py

@@ -36,7 +36,7 @@ class PCREConan(ConanFile):
     _source_subfolder = 'source_subfolder'
     _build_subfolder = 'build_subfolder'
 
-    requires = 'zlib/1.3@devolutions/stable'
+    requires = 'zlib/1.3.1@devolutions/stable'
 
     def source(self):
         if self.settings.arch == 'universal':

recipes/winpr/conanfile.py

@@ -25,7 +25,7 @@ class WinprConan(ConanFile):
     def build_requirements(self):
         super().build_requirements()
         self.build_requires('mbedtls/3.5.1@devolutions/stable')
-        self.build_requires('zlib/1.3@devolutions/stable')
+        self.build_requires('zlib/1.3.1@devolutions/stable')
 
     def source(self):
         if self.settings.arch == 'universal':

recipes/zlib/VERSION

@@ -1 +1 @@
-1.3
+1.3.1