Update profile options

opendocument-app · Jun 17, 2024 · 7bfa00c · 7bfa00c
1 parent a578c97
commit 7bfa00c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-armv8
@@ -29,6 +29,10 @@ CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/b
 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
+
 [replace_requires]
 libjpeg/9e: libjpeg/9f
 libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/ubuntu-22.04/conan/profiles/default b/.github/config/ubuntu-22.04/conan/profiles/default
@@ -11,16 +11,7 @@ compiler.libcxx=libstdc++11
 tools.build:compiler_executables={'c': 'clang-15', 'cpp': 'clang++-15'}
 
 [options]
-*/*:shared=False
-cryptopp/[>8.6.9]:shared=False
-
-glib/*:with_elf=False
-glib/*:with_mount=False
-glib/*:with_selinux=False
-freetype/*:with_bzip2=False
-freetype/*:with_brotli=False
-poppler/*:with_tiff=False
-poppler/*:shared=False
+# gobject introspection not yet available for conan 2
 poppler/*:with_gobject_introspection=False
 
 [replace_requires]