move config options of pdf2htmlEX deps to pdf2htmlEX-config profile

opendocument-app · Jul 8, 2024 · eb9c029 · eb9c029
1 parent c98abfd
commit eb9c029
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 189 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
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "21" %}
@@ -33,24 +35,3 @@ 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
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-21-armv8
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "21" %}
@@ -33,24 +35,3 @@ 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
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-21-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-21-x86
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "21" %}
@@ -33,24 +35,3 @@ 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
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
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "21" %}
@@ -33,24 +35,3 @@ 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
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "23" %}
@@ -33,24 +35,3 @@ 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
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "23" %}
@@ -33,24 +35,3 @@ 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
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "23" %}
@@ -33,24 +35,3 @@ 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
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
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "23" %}
@@ -33,24 +35,3 @@ 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
diff --git a/.github/config/ubuntu-22.04/conan/profiles/default b/.github/config/ubuntu-22.04/conan/profiles/default
@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 [settings]
 os=Linux
 arch=x86_64
@@ -9,24 +11,3 @@ compiler.libcxx=libstdc++11
 
 [conf]
 tools.build:compiler_executables={'c': 'clang-15', 'cpp': 'clang++-15'}
-
-[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
diff --git a/.github/config/ubuntu-22.04/conan/profiles/pdf2htmlEX-config b/.github/config/ubuntu-22.04/conan/profiles/pdf2htmlEX-config
@@ -0,0 +1,20 @@
+[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