Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pango: migrate to Conan v2 #20795

Merged
merged 27 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7128e4e
pango: Support Conan V2
jwillikers May 22, 2023
8c18230
Fix configure
jwillikers May 22, 2023
0f8289f
Fix incorrect attempt to modify option with_xft from auto to True
jwillikers May 22, 2023
ae4d715
Revert "Fix incorrect attempt to modify option with_xft from auto to …
jwillikers May 22, 2023
de433e6
Remove the auto value as an option
jwillikers May 22, 2023
b941ce3
Merge branch 'master' into pango-conan-v2
jwillikers Jun 24, 2023
f8d08f8
Fix options configuration in configure method for Conan V2
jwillikers Jun 24, 2023
d966522
Fix option checking
jwillikers Jun 24, 2023
697f6bf
Bump glib
jwillikers Jun 24, 2023
bd00a8e
Revert "Fix option checking"
jwillikers Jun 24, 2023
ce69549
Configure default options in the config_options method
jwillikers Jun 24, 2023
3bbe03d
Use self.info.options
jwillikers Jun 24, 2023
50f1583
Bump glib
jwillikers Jun 29, 2023
e6d0ebf
Merge branch 'master' into pango-conan-v2
jwillikers Oct 15, 2023
5829403
bump deps
mayeut Oct 28, 2023
608c452
Merge branch 'master' into pango-v2
mayeut Oct 28, 2023
84d664c
fix transitive_headers
mayeut Oct 28, 2023
8460090
bump libxft
mayeut Oct 28, 2023
0460bfb
Merge branch 'master' into pango-v2
mayeut Oct 28, 2023
ac4dfe7
Merge remote-tracking branch 'upstream/master' into pango-v2
mayeut Oct 31, 2023
631dbaa
bump cairo
mayeut Oct 31, 2023
9ebce29
Merge branch 'master' into pango-v2
mayeut Dec 1, 2023
10b52b1
bump deps
mayeut Dec 1, 2023
7fefd57
Merge branch 'master' into pango-v2
mayeut Dec 2, 2023
31b4843
remove package_id & configure shared
mayeut Dec 3, 2023
3d5e25a
add versions 1.50.14 & 1.51.0
mayeut Dec 12, 2023
39c0ba2
Merge branch 'master' into pango-v2
mayeut Dec 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions recipes/pango/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
sources:
"1.48.9":
url: "https://github.com/GNOME/pango/archive/1.48.9.tar.gz"
sha256: "6c78162507debd3389dab9f045cfa0b03cb44c432fb21979d4acf45db1b93781"
"1.49.3":
url: "https://github.com/GNOME/pango/archive/1.49.3.tar.gz"
sha256: "2bba081ba680b900a1285d7c9699c0058bf93c3c6b25acaa77214708fb7cb19b"
"1.50.7":
url: "https://github.com/GNOME/pango/archive/1.50.7.tar.gz"
sha256: "4964dc5f1a17464de3c1b91c16a0153429e2f73e81cfdea3229a6370b9ab8e5a"
"1.50.8":
url: "https://download.gnome.org/sources/pango/1.50/pango-1.50.8.tar.xz"
sha256: "cf626f59dd146c023174c4034920e9667f1d25ac2c1569516d63136c311255fa"
"1.51.0":
url: "https://download.gnome.org/sources/pango/1.51/pango-1.51.0.tar.xz"
sha256: "74efc109ae6f903bbe6af77eaa2ac6094b8ee245a2e23f132a7a8f0862d1a9f5"
"1.50.14":
url: "https://download.gnome.org/sources/pango/1.50/pango-1.50.14.tar.xz"
sha256: "1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8"
"1.50.10":
url: "https://download.gnome.org/sources/pango/1.50/pango-1.50.10.tar.xz"
sha256: "7e5d2f1e40854d24a9a2c4d093bafe75dcdbeccdf1de43e4437332eabed64966"
"1.50.8":
url: "https://download.gnome.org/sources/pango/1.50/pango-1.50.8.tar.xz"
sha256: "cf626f59dd146c023174c4034920e9667f1d25ac2c1569516d63136c311255fa"
"1.50.7":
url: "https://github.com/GNOME/pango/archive/1.50.7.tar.gz"
sha256: "4964dc5f1a17464de3c1b91c16a0153429e2f73e81cfdea3229a6370b9ab8e5a"
"1.49.3":
url: "https://github.com/GNOME/pango/archive/1.49.3.tar.gz"
sha256: "2bba081ba680b900a1285d7c9699c0058bf93c3c6b25acaa77214708fb7cb19b"
"1.48.9":
url: "https://github.com/GNOME/pango/archive/1.48.9.tar.gz"
sha256: "6c78162507debd3389dab9f045cfa0b03cb44c432fb21979d4acf45db1b93781"
317 changes: 180 additions & 137 deletions recipes/pango/all/conanfile.py

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions recipes/pango/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
cmake_minimum_required(VERSION 3.1)
project(test_package)
cmake_minimum_required(VERSION 3.15)
project(test_package LANGUAGES CXX)

find_package(pango)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()
find_package(pango REQUIRED CONFIG)

add_executable(${PROJECT_NAME} test_package.cpp)
target_link_libraries(${PROJECT_NAME} pango::pango)
target_link_libraries(${PROJECT_NAME} PRIVATE pango::pango)
21 changes: 15 additions & 6 deletions recipes/pango/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
from conans import ConanFile, CMake, tools
from conan import ConanFile
from conan.tools.build import can_run
from conan.tools.cmake import cmake_layout, CMake
import os


class TestPackageConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
generators = "cmake", "pkg_config", "cmake_find_package_multi"
settings = "os", "arch", "compiler", "build_type"
generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
test_type = "explicit"

def requirements(self):
self.requires(self.tested_reference_str)

def layout(self):
cmake_layout(self)

def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()

def test(self):
if not tools.cross_building(self):
bin_path = os.path.join("bin", "test_package")
self.run(bin_path, run_environment=True)
if can_run(self):
bin_path = os.path.join(self.cpp.build.bindir, "test_package")
self.run(bin_path, env="conanrun")
2 changes: 1 addition & 1 deletion recipes/pango/all/test_package/test_package.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

int main()
{
std::cout << "pango version: " << pango_version_string() << std::endl;
std::cout << "pango version: " << pango_version_string() << "\n";
return 0;
}
8 changes: 8 additions & 0 deletions recipes/pango/all/test_v1_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
cmake_minimum_required(VERSION 3.15)
project(test_package)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup(TARGETS)

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/
${CMAKE_CURRENT_BINARY_DIR}/test_package/)
18 changes: 18 additions & 0 deletions recipes/pango/all/test_v1_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
from conans import ConanFile, CMake
from conan.tools.build import cross_building
import os


class TestPackageV1Conan(ConanFile):
settings = "os", "arch", "compiler", "build_type"
generators = "cmake", "cmake_find_package_multi"

def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()

def test(self):
if not cross_building(self):
bin_path = os.path.join("bin", "test_package")
self.run(bin_path, run_environment=True)
12 changes: 8 additions & 4 deletions recipes/pango/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
versions:
"1.48.9":
"1.51.0":
folder: all
"1.49.3":
"1.50.14":
folder: all
"1.50.7":
"1.50.10":
folder: all
"1.50.8":
folder: all
"1.50.10":
"1.50.7":
folder: all
"1.49.3":
folder: all
"1.48.9":
folder: all