(#8378) - [pango] bump glib to 2.70.1

* - [pango] bump to 2.70.1 Signed-off-by: SSE4 <tomskside@gmail.com> * - don't link to CONAN_LIBS, it results in duplicated symbols due to the cairo-trace library being consumed Signed-off-by: SSE4 <tomskside@gmail.com> * - bump harfbuzz * - disable old minor 1.48.x Signed-off-by: SSE4 <tomskside@gmail.com> * bump more reqs * pango: Update Conan conventions Automatically created by bincrafters-conventions 0.31.0 Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com> Co-authored-by: bincrafters-user <bincrafters@gmail.com>
conan-io · Jan 20, 2022 · 145e4c3 · 145e4c3
1 parent 83ce8b6
commit 145e4c3
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 55 deletions.
diff --git a/recipes/pango/all/conandata.yml b/recipes/pango/all/conandata.yml
@@ -1,28 +1,28 @@
 sources:
-  "1.48.0":
-    sha256: "d76513ac89341883320bd5ea063ec7005e70d962deedc064c62d6f17f6769b88"
-    url: "https://github.com/GNOME/pango/archive/1.48.0.tar.gz"
-  "1.48.1":
-    sha256: "766ef4da466eb9a2a6d75278d769795a9c229fce5593d4e735039a05b155199c"
-    url: "https://github.com/GNOME/pango/archive/1.48.1.tar.gz"
-  "1.48.2":
-    url: "https://github.com/GNOME/pango/archive/1.48.2.tar.gz"
-    sha256: "19ea06742d9b8da590fed3c2bea018258609c18718a6deedd46cab957d3be9cf"
-  "1.48.3":
-    url: "https://github.com/GNOME/pango/archive/1.48.3.tar.gz"
-    sha256: "63318b75bdd510b11fc960dbcdff9bc8b744fb3e45583acbb3410ef36bacc054"
-  "1.48.4":
-    url: "https://github.com/GNOME/pango/archive/1.48.4.tar.gz"
-    sha256: "2c7e92f2430ae2ab91d6156488f41dfb0fd1ea787fbfb807dfe53a4f361a9d1a"
-  "1.48.5":
-    url: "https://github.com/GNOME/pango/archive/1.48.5.tar.gz"
-    sha256: "9eccf148a4ca4727ed7d31ea1a2b7c77e8a8a286fc87967fb216669939e86eee"
-  "1.48.6":
-    url: "https://github.com/GNOME/pango/archive/1.48.6.tar.gz"
-    sha256: "2ca6020ded58aee9bd10a8a547cad06204e28c36539598f2030cc672e5dfeab8"
-  "1.48.7":
-    url: "https://github.com/GNOME/pango/archive/1.48.7.tar.gz"
-    sha256: "8783c82927582437d3a224eb18ea90d195b7451ff2effdffba16039df5346170"
+#  "1.48.0":
+#    sha256: "d76513ac89341883320bd5ea063ec7005e70d962deedc064c62d6f17f6769b88"
+#    url: "https://github.com/GNOME/pango/archive/1.48.0.tar.gz"
+#  "1.48.1":
+#    sha256: "766ef4da466eb9a2a6d75278d769795a9c229fce5593d4e735039a05b155199c"
+#    url: "https://github.com/GNOME/pango/archive/1.48.1.tar.gz"
+#  "1.48.2":
+#    url: "https://github.com/GNOME/pango/archive/1.48.2.tar.gz"
+#    sha256: "19ea06742d9b8da590fed3c2bea018258609c18718a6deedd46cab957d3be9cf"
+##  "1.48.3":
+#    url: "https://github.com/GNOME/pango/archive/1.48.3.tar.gz"
+#    sha256: "63318b75bdd510b11fc960dbcdff9bc8b744fb3e45583acbb3410ef36bacc054"
+#  "1.48.4":
+#    url: "https://github.com/GNOME/pango/archive/1.48.4.tar.gz"
+#    sha256: "2c7e92f2430ae2ab91d6156488f41dfb0fd1ea787fbfb807dfe53a4f361a9d1a"
+#  "1.48.5":
+#    url: "https://github.com/GNOME/pango/archive/1.48.5.tar.gz"
+#    sha256: "9eccf148a4ca4727ed7d31ea1a2b7c77e8a8a286fc87967fb216669939e86eee"
+#  "1.48.6":
+#    url: "https://github.com/GNOME/pango/archive/1.48.6.tar.gz"
+#    sha256: "2ca6020ded58aee9bd10a8a547cad06204e28c36539598f2030cc672e5dfeab8"
+#  "1.48.7":
+#    url: "https://github.com/GNOME/pango/archive/1.48.7.tar.gz"
+#    sha256: "8783c82927582437d3a224eb18ea90d195b7451ff2effdffba16039df5346170"
   "1.48.9":
     url: "https://github.com/GNOME/pango/archive/1.48.9.tar.gz"
     sha256: "6c78162507debd3389dab9f045cfa0b03cb44c432fb21979d4acf45db1b93781"

diff --git a/recipes/pango/all/conanfile.py b/recipes/pango/all/conanfile.py
@@ -30,7 +30,7 @@ def _build_subfolder(self):
 
     @property
     def _is_msvc(self):
-        return self.settings.compiler == "Visual Studio"
+        return str(self.settings.compiler) in ["Visual Studio", "msvc"]
 
     def validate(self):
         if self.settings.compiler == "gcc" and tools.Version(self.settings.compiler.version) < "5":
@@ -61,27 +61,26 @@ def configure(self):
             raise ConanInvalidConfiguration("Xft requires freetype and fontconfig")
 
     def build_requirements(self):
-        self.build_requires("pkgconf/1.7.3")
-        self.build_requires("meson/0.57.1")
+        self.build_requires("pkgconf/1.7.4")
+        self.build_requires("meson/0.60.2")
 
     def requirements(self):
         if self.options.with_freetype:
-            self.requires("freetype/2.11.0")
+            self.requires("freetype/2.11.1")
 
         if self.options.with_fontconfig:
             self.requires("fontconfig/2.13.93")
         if self.options.with_xft:
             self.requires("xorg/system")
         if self.options.with_cairo:
             self.requires("cairo/1.17.4")
-        self.requires("harfbuzz/2.7.4")
-        self.requires("glib/2.70.0")
-        self.requires("fribidi/1.0.9")
+        self.requires("harfbuzz/3.2.0")
+        self.requires("glib/2.70.1")
+        self.requires("fribidi/1.0.10")
 
     def source(self):
-        tools.get(**self.conan_data["sources"][self.version])
-        extrated_dir = self.name + "-" + self.version
-        os.rename(extrated_dir, self._source_subfolder)
+        tools.get(**self.conan_data["sources"][self.version],
+                  strip_root=True, destination=self._source_subfolder)
 
     def _configure_meson(self):
         defs = dict()
@@ -112,7 +111,7 @@ def package(self):
         with tools.environment_append(VisualStudioBuildEnvironment(self).vars) if self._is_msvc else tools.no_op():
             meson = self._configure_meson()
             meson.install()
-        if self.settings.compiler == "Visual Studio":
+        if self._is_msvc:
             with tools.chdir(os.path.join(self.package_folder, "lib")):
                 for filename_old in glob.glob("*.a"):
                     filename_new = filename_old[3:-2] + ".lib"
@@ -124,7 +123,7 @@ def package(self):
     def package_info(self):
         self.cpp_info.components['pango_'].libs = ['pango-1.0']
         self.cpp_info.components['pango_'].names['pkg_config'] = 'pango'
-        if self.settings.os == "Linux":
+        if self.settings.os in ["Linux","FreeBSD"]:
             self.cpp_info.components['pango_'].system_libs.append("m")
         self.cpp_info.components['pango_'].requires.append('glib::glib-2.0')
         self.cpp_info.components['pango_'].requires.append('glib::gobject-2.0')

diff --git a/recipes/pango/all/test_package/CMakeLists.txt b/recipes/pango/all/test_package/CMakeLists.txt
@@ -1,9 +1,10 @@
 cmake_minimum_required(VERSION 3.1)
 project(test_package)
 
+find_package(pango)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
+target_link_libraries(${PROJECT_NAME} pango::pango)
diff --git a/recipes/pango/all/test_package/conanfile.py b/recipes/pango/all/test_package/conanfile.py
@@ -4,14 +4,14 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake", "pkg_config"
+    generators = "cmake", "pkg_config", "cmake_find_package_multi"
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self.settings):
+        if not tools.cross_building(self):
             bin_path = os.path.join("bin", "test_package")
             self.run(bin_path, run_environment=True)
diff --git a/recipes/pango/config.yml b/recipes/pango/config.yml
@@ -1,20 +1,20 @@
 versions:
-  "1.48.0":
-    folder: all
-  "1.48.1":
-    folder: all
-  "1.48.2":
-    folder: all
-  "1.48.3":
-    folder: all
-  "1.48.4":
-    folder: all
-  "1.48.5":
-    folder: all
-  "1.48.6":
-    folder: all
-  "1.48.7":
-    folder: all
+#  "1.48.0":
+#    folder: all
+#  "1.48.1":
+#    folder: all
+#  "1.48.2":
+#    folder: all
+#  "1.48.3":
+#    folder: all
+#  "1.48.4":
+#    folder: all
+#  "1.48.5":
+#    folder: all
+#  "1.48.6":
+#    folder: all
+#  "1.48.7":
+#    folder: all
   "1.48.9":
     folder: all
   "1.49.0":