schedule : Commit by patricia-gallardo with SHA 2a1b8d3d113866ba68e42a8702dc00206bddba2a on refs/heads/master

Author: turtlebrowser-bot

.conan/data/freetype/2.10.4/_/_/dl/pkg/f4924bd3b94e155cbf790d74ba3a3c29ccc81e89/conan_package.tgz

@@ -1,5 +1,6 @@
 from conans import ConanFile, CMake, tools
 import os
+import re
 import shutil
 import textwrap
 
@@ -8,8 +9,6 @@
 
 class FreetypeConan(ConanFile):
     name = "freetype"
-
-    _libtool_version = "23.0.17"  # check docs/version.txt, this is a different version mumber!
     description = "FreeType is a freely available software library to render fonts."
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://www.freetype.org"
@@ -107,7 +106,6 @@ def _configure_cmake(self):
         if self._cmake:
             return self._cmake
         self._cmake = CMake(self)
-        self._cmake.definitions["PROJECT_VERSION"] = self._libtool_version
         self._cmake.definitions["FT_WITH_ZLIB"] = self.options.with_zlib
         self._cmake.definitions["FT_WITH_PNG"] = self.options.with_png
         self._cmake.definitions["FT_WITH_BZIP2"] = self.options.with_bzip2
@@ -123,7 +121,7 @@ def build(self):
         cmake = self._configure_cmake()
         cmake.build()
 
-    def _make_freetype_config(self):
+    def _make_freetype_config(self, version):
         freetype_config_in = os.path.join(self._source_subfolder, "builds", "unix", "freetype-config.in")
         if not os.path.isdir(os.path.join(self.package_folder, "bin")):
             os.makedirs(os.path.join(self.package_folder, "bin"))
@@ -139,23 +137,37 @@ def _make_freetype_config(self):
         tools.replace_in_file(freetype_config, r"%ft_version%", r"$conan_ftversion")
         tools.replace_in_file(freetype_config, r"%LIBSSTATIC_CONFIG%", r"$conan_staticlibs")
         tools.replace_in_file(freetype_config, r"-lfreetype", libs)
-        tools.replace_in_file(freetype_config, r"export LC_ALL", """export LC_ALL
-BINDIR=$(dirname $0)
-conan_prefix=$(dirname $BINDIR)
-conan_exec_prefix=${{conan_prefix}}/bin
-conan_includedir=${{conan_prefix}}/include
-conan_libdir=${{conan_prefix}}/lib
-conan_ftversion={version}
-conan_staticlibs="{staticlibs}"
-""".format(version=self._libtool_version, staticlibs=staticlibs))
+        tools.replace_in_file(freetype_config, r"export LC_ALL", textwrap.dedent("""\
+            export LC_ALL
+            BINDIR=$(dirname $0)
+            conan_prefix=$(dirname $BINDIR)
+            conan_exec_prefix=${{conan_prefix}}/bin
+            conan_includedir=${{conan_prefix}}/include
+            conan_libdir=${{conan_prefix}}/lib
+            conan_ftversion={version}
+            conan_staticlibs="{staticlibs}"
+        """).format(version=version, staticlibs=staticlibs))
+
+    def _extract_libtool_version(self):
+        conf_raw = tools.load(os.path.join(self._source_subfolder, "builds", "unix", "configure.raw"))
+        return next(re.finditer(r"^version_info='([0-9:]+)'", conf_raw, flags=re.M)).group(1).replace(":", ".")
+
+    @property
+    def _libtool_version_txt(self):
+        return os.path.join(self.package_folder, "res", "freetype-libtool-version.txt")
 
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
-        self._make_freetype_config()
-        self.copy("FTL.TXT", dst="licenses", src=os.path.join(self._source_subfolder, "docs"))
-        self.copy("GPLv2.TXT", dst="licenses", src=os.path.join(self._source_subfolder, "docs"))
-        self.copy("LICENSE.TXT", dst="licenses", src=os.path.join(self._source_subfolder, "docs"))
+
+        libtool_version = self._extract_libtool_version()
+        tools.save(self._libtool_version_txt, libtool_version)
+        self._make_freetype_config(libtool_version)
+
+        self.copy("FTL.TXT", src=os.path.join(self._source_subfolder, "docs"), dst="licenses")
+        self.copy("GPLv2.TXT", src=os.path.join(self._source_subfolder, "docs"), dst="licenses")
+        self.copy("LICENSE.TXT", src=os.path.join(self._source_subfolder, "docs"), dst="licenses")
+
         tools.rmdir(os.path.join(self.package_folder, "lib", "cmake"))
         tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
         self._create_cmake_module_variables(
@@ -223,7 +235,6 @@ def package_info(self):
         freetype_config = os.path.join(self.package_folder, "bin", "freetype-config")
         self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
         self.env_info.FT2_CONFIG = freetype_config
-        self.user_info.LIBTOOL_VERSION = self._libtool_version
         self._chmod_plus_x(freetype_config)
         # cmake's FindFreetype.cmake module with imported target: Freetype::Freetype
         self.cpp_info.filenames["cmake_find_package"] = "Freetype"
@@ -234,3 +245,8 @@ def package_info(self):
         self.cpp_info.build_modules["cmake_find_package"] = [self._module_vars_rel_path]
         self.cpp_info.build_modules["cmake_find_package_multi"] = [self._module_target_rel_path]
         self.cpp_info.names["pkg_config"] = "freetype2"
+
+        libtool_version = tools.load(self._libtool_version_txt).strip()
+        self.user_info.LIBTOOL_VERSION = libtool_version
+        # FIXME: need to do override the pkg_config version (pkg_config_custom_content does not work)
+        # self.cpp_info.version["pkg_config"] = pkg_config_version

.conan/data/freetype/2.10.4/_/_/export/conanfile.py

@@ -1,4 +1,4 @@
-1632052422
+1632242888
 conandata.yml: 81a1c76362fe5e71bcc978c0e49ba7a9
-conanfile.py: 7ac40840159da4160bb2bf7eb22d6ba1
+conanfile.py: 0cf3a462d2c61aca271860f47202d11a
 export_source/CMakeLists.txt: ac606e6da954a6f18d4b49db940ee1a1

.conan/data/freetype/2.10.4/_/_/export/conanmanifest.txt

@@ -1 +1 @@
-{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "2fce0cc03a7a8520a000d249bccda902", "sha1": "61483c39864e093eb4e034afb4537541c93f5ca3"}, "conanfile.py": {"md5": "7ac40840159da4160bb2bf7eb22d6ba1", "sha1": "14ec24563aef573c86662642398390e2d1cc7265"}, "conan_export.tgz": {"md5": "eea3d1a2f04ae2da2996d9e0a48d22ad", "sha1": "9f35a22d7cb89a793576e600631de9c510f7aef7"}}}, "packages": {"f4924bd3b94e155cbf790d74ba3a3c29ccc81e89": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "59508f74037e5985f24af2a6570994f4", "sha1": "1d474551dd33ddae1f6276f1f34e52a3222cfebb"}, "conaninfo.txt": {"md5": "85e0ea576e675889c5446bfffa5664d3", "sha1": "1e41472355dda39464322c09d3de987fb92fd5ae"}, "conan_package.tgz": {"md5": "07f8e0024d539a2786d8674915b64e4d", "sha1": "fc91b338f1f1cbe0e5d1449a49ef2e5eb38df201"}}}}}
+{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "6d1b5309b47327327455af35493eb467", "sha1": "d989a8137e9ea72028466cd08a669499f4305e45"}, "conanfile.py": {"md5": "0cf3a462d2c61aca271860f47202d11a", "sha1": "934273136c8c65932d0b2a72be7c798e90879227"}, "conan_export.tgz": {"md5": "eea3d1a2f04ae2da2996d9e0a48d22ad", "sha1": "9f35a22d7cb89a793576e600631de9c510f7aef7"}}}, "packages": {"f4924bd3b94e155cbf790d74ba3a3c29ccc81e89": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "58132e3ad88dda552334b1d176f82304", "sha1": "0e568e05bbb30a0b6ee13a5e3ea021e489172dab"}, "conaninfo.txt": {"md5": "531aadb694328498cb46c0421b3cefaf", "sha1": "302c5a307d798c3652232aa40ac2b4854eb2b871"}, "conan_package.tgz": {"md5": "c3c84c4e0165f184a5e1ec1416d3caae", "sha1": "6bf22cff9197a2d9c69380626dddee7737eca2a5"}}}}}

.conan/data/freetype/2.10.4/_/_/metadata.json

@@ -16,7 +16,7 @@ conan_prefix=$(dirname $BINDIR)
 conan_exec_prefix=${conan_prefix}/bin
 conan_includedir=${conan_prefix}/include
 conan_libdir=${conan_prefix}/lib
-conan_ftversion=23.0.17
+conan_ftversion=23.4.17
 conan_staticlibs="-lfreetype"
 
 

.conan/data/freetype/2.10.4/_/_/package/f4924bd3b94e155cbf790d74ba3a3c29ccc81e89/bin/freetype-config

@@ -53,7 +53,7 @@
     zlib:shared=False
 
 [recipe_hash]
-    5f39ce560c4e2226babf571e8f4f6f32
+    6e66ba2a68a458a4cbb60077e45ee139
 
 [env]
 

.conan/data/freetype/2.10.4/_/_/package/f4924bd3b94e155cbf790d74ba3a3c29ccc81e89/conaninfo.txt

@@ -1,6 +1,6 @@
-1632053299
-bin/freetype-config: 5db4041ebd28c0840a4139385ba897de
-conaninfo.txt: 85e0ea576e675889c5446bfffa5664d3
+1632244393
+bin/freetype-config: 1d93f459e42428d8ece0b9077ae98ef2
+conaninfo.txt: 531aadb694328498cb46c0421b3cefaf
 include/freetype2/freetype/config/ftconfig.h: 28acbc49e36c82ae9ea2b76e453a5e4b
 include/freetype2/freetype/config/ftheader.h: 8e72e64894219c4ec3fca41f9b9bed55
 include/freetype2/freetype/config/ftmodule.h: e8dfd5b101eeec8ee3902fdf750f3999
@@ -56,7 +56,8 @@ include/freetype2/freetype/tttags.h: e6575cc01c0d7fb4fd7104bd58976d87
 include/freetype2/ft2build.h: bd3f0a22427fb3084a1c1433e59ac33e
 lib/cmake/conan-official-freetype-targets.cmake: 427f38bae7f4bbcb0ad89f18dcc62edd
 lib/cmake/conan-official-freetype-variables.cmake: c62479687b38c38c2665e2475e299546
-lib/libfreetype.a: 1cf911a7720365d2104bed1c522a8f95
+lib/libfreetype.a: a428d21482826dda7c8db5c65a280b53
 licenses/FTL.TXT: 9f37b4e6afa3fef9dba8932b16bd3f97
 licenses/GPLv2.TXT: 8ef380476f642c20ebf40fecb0add2ec
 licenses/LICENSE.TXT: 4af6221506f202774ef74f64932878a1
+res/freetype-libtool-version.txt: 2e36112f674447a46b44e57b20c18696

.conan/data/freetype/2.10.4/_/_/package/f4924bd3b94e155cbf790d74ba3a3c29ccc81e89/conanmanifest.txt

@@ -0,0 +1 @@
+23.4.17

.conan/data/freetype/2.10.4/_/_/package/f4924bd3b94e155cbf790d74ba3a3c29ccc81e89/lib/libfreetype.a

@@ -0,0 +1,4 @@
+sources:
+  2.70.0:
+    sha256: aadf815ed908d4cc14ac3976f325b986b4ab2b65ad85bc214ddf2e200648bd1c
+    url: https://gitlab.gnome.org/GNOME/glib/-/archive/2.70.0/glib-2.70.0.tar.gz