Merge pull request #10 from opendocument-app/odr_package_versions

Suffix versions of patched packages with "-odr"

.github/workflows/build.yml

@@ -145,7 +145,7 @@ jobs:
         run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ matrix.config.ndk_version }}"
 
       - name: conan remote
-        run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+        run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan config
         run: conan config install .github/config/${{ matrix.config.build_machine }}/conan
 

.github/workflows/test.yml

@@ -87,7 +87,7 @@ jobs:
         run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
 
       - name: conan remote
-        run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+        run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan config
         run: conan config install .github/config/ubuntu-22.04/conan
 

recipes/cairo/config.yml

@@ -1,3 +1,3 @@
 versions:
-  "1.18.0":
+  "1.18.0-odr":
     folder: meson

recipes/cairo/meson/conandata.yml

@@ -1,7 +1,7 @@
 sources:
-  "1.18.0":
+  "1.18.0-odr":
     sha256: "abf8fba4d510086a492783c3e0828e90b32734738fd80906595617d229d02bab"
     url: "https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.18.0/cairo-1.18.0.tar.bz2"
 patches:
-  "1.18.0":
+  "1.18.0-odr":
     - patch_file: "patches/cairo-1.18.0-no-backtrace-symbols.patch"

recipes/cairo/meson/conanfile.py

@@ -104,11 +104,11 @@ def requirements(self):
         if self.options.with_freetype:
             self.requires("freetype/2.13.2", transitive_headers=True, transitive_libs=True)
         if self.options.with_fontconfig:
-            self.requires("fontconfig/2.15.0", transitive_headers=True, transitive_libs=True)
+            self.requires("fontconfig/2.15.0-odr", transitive_headers=True, transitive_libs=True)
         if self.options.with_png:
             self.requires("libpng/[>=1.6 <2]")
         if self.options.with_glib:
-            self.requires("glib/2.78.3")
+            self.requires("glib/2.78.3-odr")
         if self.settings.os in ["Linux", "FreeBSD"]:
             if self.options.with_xlib or self.options.with_xlib_xrender or self.options.with_xcb:
                 self.requires("xorg/system", transitive_headers=True, transitive_libs=True)

recipes/fontconfig/config.yml

@@ -1,3 +1,3 @@
 versions:
-  "2.15.0":
+  "2.15.0-odr":
     folder: meson

recipes/fontconfig/meson/conandata.yml

@@ -1,4 +1,4 @@
 sources:
-  "2.15.0":
+  "2.15.0-odr":
     url: "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.15.0.tar.xz"
     sha256: "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e"

recipes/fontforge/all/conanfile.py

@@ -72,7 +72,7 @@ def requirements(self):
         # self.requires("jbig/20160605")
         # self.requires("libdeflate/1.20")
 
-        self.requires("glib/2.78.3")
+        self.requires("glib/2.78.3-odr")
 
         if self.settings.os == "Android" and int(self.settings.os.get_safe("api_level")) < 23:
             self.requires("openlibm/0.8.3")

recipes/glib/all/conandata.yml

@@ -1,4 +1,4 @@
 sources:
-  "2.78.3":
+  "2.78.3-odr":
     url: "https://download.gnome.org/sources/glib/2.78/glib-2.78.3.tar.xz"
     sha256: "609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21"

recipes/glib/config.yml

@@ -1,3 +1,3 @@
 versions:
-  "2.78.3":
+  "2.78.3-odr":
     folder: all

recipes/pdf2htmlex/all/conanfile.py

@@ -25,12 +25,12 @@ class pdf2htmlEXConan(ConanFile):
     default_options = {"shared": False, "fPIC": True}
 
     def requirements(self):
-        self.requires("poppler/24.07.0", options={
+        self.requires("poppler/24.07.0-odr", options={
             "with_cairo": True,
             "with_glib": True,
             "shared": False,
         })
-        self.requires("cairo/1.18.0", options={
+        self.requires("cairo/1.18.0-odr", options={
             # Don't pull in xorg dependencies.
             "with_xlib": False,
             "with_xlib_xrender": False,
@@ -41,7 +41,7 @@ def requirements(self):
             "install_private_headers": True,
         })
 
-        self.requires("glib/2.78.3")
+        self.requires("glib/2.78.3-odr")
 
         # self.requires("libtiff/4.6.0")
         # # jbig and libdeflate are required by libtiff

recipes/poppler-data/all/conandata.yml

@@ -1,7 +1,7 @@
 sources:
-  "0.4.12":
+  "0.4.12-odr":
     url: "https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz"
     sha256: "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74"
 patches:
-  "0.4.12":
+  "0.4.12-odr":
     - patch_file: "patches/0001-cmake-use-GNUInstallDirs.patch"

recipes/poppler-data/config.yml

@@ -1,4 +1,4 @@
 versions:
-  "0.4.12":
+  "0.4.12-odr":
     folder: all
 

recipes/poppler/all/conandata.yml

@@ -1,9 +1,9 @@
 sources:
-  "24.07.0":
+  "24.07.0-odr":
     url: "https://poppler.freedesktop.org/poppler-24.07.0.tar.xz"
     sha256: "19eb4f49198e4ae3fd9e5a6cf24d0fc7e674e8802046a7de14baab1e40cc2f1d"
 patches:
-  "24.07.0":
+  "24.07.0-odr":
     - patch_file: "patches/24/0004-add-POPPLER_DATADIR-environment-variable.patch"
     - patch_file: "patches/24/0007-cmake-use_conan_qt.patch"
     - patch_file: "patches/24/CheckFileOffsetBits.patch"

recipes/poppler/all/conanfile.py

@@ -108,17 +108,17 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("poppler-data/0.4.12", transitive_headers=True, transitive_libs=True)
+        self.requires("poppler-data/0.4.12-odr", transitive_headers=True, transitive_libs=True)
         # https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-22.04.0/splash/SplashFTFont.h#L30
         self.requires("freetype/2.13.2", transitive_headers=True, transitive_libs=True)
         if self.options.get_safe("with_libiconv"):
             self.requires("libiconv/1.17")
         if self.options.fontconfiguration == "fontconfig":
-            self.requires("fontconfig/2.15.0")
+            self.requires("fontconfig/2.15.0-odr")
         if self.options.with_cairo:
-            self.requires("cairo/1.18.0")
+            self.requires("cairo/1.18.0-odr")
         if self.options.get_safe("with_glib"):
-            self.requires("glib/2.78.3")
+            self.requires("glib/2.78.3-odr")
         if self.options.get_safe("with_gobject_introspection"):
             self.requires("gobject-introspection/1.72.0")
         if self.options.with_qt:

recipes/poppler/config.yml

@@ -1,3 +1,3 @@
 versions:
-  "24.07.0":
+  "24.07.0-odr":
     folder: all