Fix Android Conan profiles. Got messed up after the merge

opendocument-app · Jun 21, 2024 · e48635a · e48635a
1 parent 1ca241b
commit e48635a
Show file tree

Hide file tree

Showing 13 changed files with 201 additions and 243 deletions.
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-21-armv7
@@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi
 CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
 LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
 STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
+[options]
+# gobject introspection not yet available for conan 2
+poppler/*:with_gobject_introspection=False
+
+# We are not using xorg functionality in cairo
+cairo/*:with_xlib=False
+cairo/*:with_xlib_xrender=False
+cairo/*:with_xcb=False
+cairo/*:with_symbol_lookup=False
+
+# Unused functionality in GLib
+glib/*:with_elf=False
+glib/*:with_mount=False
+glib/*:with_selinux=False
+
+# @TODO: These dependencies are currently problematic
+freetype/*:with_bzip2=False
+freetype/*:with_brotli=False
+poppler/*:with_tiff=False
+fontforge/*:with_tiff=False
+
+[replace_requires]
+libjpeg/9e: libjpeg/9f
+libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-21-armv8
@@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi
 CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
 LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
 STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
+[options]
+# gobject introspection not yet available for conan 2
+poppler/*:with_gobject_introspection=False
+
+# We are not using xorg functionality in cairo
+cairo/*:with_xlib=False
+cairo/*:with_xlib_xrender=False
+cairo/*:with_xcb=False
+cairo/*:with_symbol_lookup=False
+
+# Unused functionality in GLib
+glib/*:with_elf=False
+glib/*:with_mount=False
+glib/*:with_selinux=False
+
+# @TODO: These dependencies are currently problematic
+freetype/*:with_bzip2=False
+freetype/*:with_brotli=False
+poppler/*:with_tiff=False
+fontforge/*:with_tiff=False
+
+[replace_requires]
+libjpeg/9e: libjpeg/9f
+libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-21-x86
@@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi
 CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
 LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
 STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
+[options]
+# gobject introspection not yet available for conan 2
+poppler/*:with_gobject_introspection=False
+
+# We are not using xorg functionality in cairo
+cairo/*:with_xlib=False
+cairo/*:with_xlib_xrender=False
+cairo/*:with_xcb=False
+cairo/*:with_symbol_lookup=False
+
+# Unused functionality in GLib
+glib/*:with_elf=False
+glib/*:with_mount=False
+glib/*:with_selinux=False
+
+# @TODO: These dependencies are currently problematic
+freetype/*:with_bzip2=False
+freetype/*:with_brotli=False
+poppler/*:with_tiff=False
+fontforge/*:with_tiff=False
+
+[replace_requires]
+libjpeg/9e: libjpeg/9f
+libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-x86_64 b/.github/config/ubuntu-22.04/conan/profiles/android-21-x86_64
@@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi
 CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
 LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
 STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
+[options]
+# gobject introspection not yet available for conan 2
+poppler/*:with_gobject_introspection=False
+
+# We are not using xorg functionality in cairo
+cairo/*:with_xlib=False
+cairo/*:with_xlib_xrender=False
+cairo/*:with_xcb=False
+cairo/*:with_symbol_lookup=False
+
+# Unused functionality in GLib
+glib/*:with_elf=False
+glib/*:with_mount=False
+glib/*:with_selinux=False
+
+# @TODO: These dependencies are currently problematic
+freetype/*:with_bzip2=False
+freetype/*:with_brotli=False
+poppler/*:with_tiff=False
+fontforge/*:with_tiff=False
+
+[replace_requires]
+libjpeg/9e: libjpeg/9f
+libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7
@@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi
 CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
 LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
 STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
+[options]
+# gobject introspection not yet available for conan 2
+poppler/*:with_gobject_introspection=False
+
+# We are not using xorg functionality in cairo
+cairo/*:with_xlib=False
+cairo/*:with_xlib_xrender=False
+cairo/*:with_xcb=False
+cairo/*:with_symbol_lookup=False
+
+# Unused functionality in GLib
+glib/*:with_elf=False
+glib/*:with_mount=False
+glib/*:with_selinux=False
+
+# @TODO: These dependencies are currently problematic
+freetype/*:with_bzip2=False
+freetype/*:with_brotli=False
+poppler/*:with_tiff=False
+fontforge/*:with_tiff=False
+
+[replace_requires]
+libjpeg/9e: libjpeg/9f
+libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8
@@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi
 CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
 LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
 STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
+[options]
+# gobject introspection not yet available for conan 2
+poppler/*:with_gobject_introspection=False
+
+# We are not using xorg functionality in cairo
+cairo/*:with_xlib=False
+cairo/*:with_xlib_xrender=False
+cairo/*:with_xcb=False
+cairo/*:with_symbol_lookup=False
+
+# Unused functionality in GLib
+glib/*:with_elf=False
+glib/*:with_mount=False
+glib/*:with_selinux=False
+
+# @TODO: These dependencies are currently problematic
+freetype/*:with_bzip2=False
+freetype/*:with_brotli=False
+poppler/*:with_tiff=False
+fontforge/*:with_tiff=False
+
+[replace_requires]
+libjpeg/9e: libjpeg/9f
+libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86
@@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi
 CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
 LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
 STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
+[options]
+# gobject introspection not yet available for conan 2
+poppler/*:with_gobject_introspection=False
+
+# We are not using xorg functionality in cairo
+cairo/*:with_xlib=False
+cairo/*:with_xlib_xrender=False
+cairo/*:with_xcb=False
+cairo/*:with_symbol_lookup=False
+
+# Unused functionality in GLib
+glib/*:with_elf=False
+glib/*:with_mount=False
+glib/*:with_selinux=False
+
+# @TODO: These dependencies are currently problematic
+freetype/*:with_bzip2=False
+freetype/*:with_brotli=False
+poppler/*:with_tiff=False
+fontforge/*:with_tiff=False
+
+[replace_requires]
+libjpeg/9e: libjpeg/9f
+libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64
@@ -33,3 +33,28 @@ CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bi
 CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
 LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
 STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+
+[options]
+# gobject introspection not yet available for conan 2
+poppler/*:with_gobject_introspection=False
+
+# We are not using xorg functionality in cairo
+cairo/*:with_xlib=False
+cairo/*:with_xlib_xrender=False
+cairo/*:with_xcb=False
+cairo/*:with_symbol_lookup=False
+
+# Unused functionality in GLib
+glib/*:with_elf=False
+glib/*:with_mount=False
+glib/*:with_selinux=False
+
+# @TODO: These dependencies are currently problematic
+freetype/*:with_bzip2=False
+freetype/*:with_brotli=False
+poppler/*:with_tiff=False
+fontforge/*:with_tiff=False
+
+[replace_requires]
+libjpeg/9e: libjpeg/9f
+libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-armv7
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-armv8