fontconfig: Branch 'main' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Apr 30 11:50:56 UTC 2025
.gitlab-ci.yml | 6 ++----
.gitlab-ci/ci.template | 4 ----
.gitlab-ci/config.yml | 1 -
.gitlab-ci/other.yml | 2 --
Cargo.lock | 8 ++++----
fc-fontations/meson.build | 2 +-
fc-fontations/mod.rs | 7 +------
fc-fontations/names.rs | 7 +++----
meson.build | 1 +
9 files changed, 12 insertions(+), 26 deletions(-)
New commits:
commit 83f34e12745d32de51b28b3890b4545615894536
Merge: f25be57 dd49433
Author: Akira TAGOH <akira at tagoh.org>
Date: Wed Apr 30 11:50:53 2025 +0000
Merge branch 'meson180' into 'main'
[Fontations] Fix Rust edition, do not require extern crate
See merge request fontconfig/fontconfig!400
commit dd494336265d9fc7230bb039c9b6d8195985b8e4
Author: Dominik Röttsches <drott at chromium.org>
Date: Wed Apr 30 14:07:13 2025 +0300
[Fontations] Fix Rust edition, do not require extern crate
With the explanations in [1], fix resolution of Rust crate
dependencies by providing Meson with information that 2021 is the
Rust edition to use.
This fixes two issues: We no longer need the extern crate... lines
in fc-fontations/mod.rs, and this resolves dependency problems
when using meson 1.8.0 and bytemuck-derive depending on syn.
[1] https://github.com/mesonbuild/meson/issues/13753#issuecomment-2394010571
diff --git a/Cargo.lock b/Cargo.lock
index c4f1e3b..7fd4167 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
[[package]]
name = "bytemuck"
-version = "1.22.0"
+version = "1.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
+checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
dependencies = [
"bytemuck_derive",
]
@@ -97,9 +97,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.100"
+version = "2.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
dependencies = [
"proc-macro2",
"quote",
diff --git a/fc-fontations/meson.build b/fc-fontations/meson.build
index 34d4e5b..72651f3 100644
--- a/fc-fontations/meson.build
+++ b/fc-fontations/meson.build
@@ -27,7 +27,7 @@ if (fontations.enabled())
'--blocklist-type=(FcCharSet|FcLangSet)',
'--raw-line=#![allow(nonstandard_style,unused)]',
'--raw-line= ',
- '--raw-line=pub use FcCharSet; pub use FcLangSet;',
+ '--raw-line=pub use crate::FcCharSet; pub use crate::FcLangSet;',
],
c_args : ['-DBINDGEN_IGNORE_VISIBILITY=1'],
)
diff --git a/fc-fontations/mod.rs b/fc-fontations/mod.rs
index f219790..f039471 100644
--- a/fc-fontations/mod.rs
+++ b/fc-fontations/mod.rs
@@ -22,11 +22,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-extern crate fc_fontations_bindgen;
-extern crate font_types;
-extern crate read_fonts;
-extern crate skrifa;
-
mod names;
mod pattern_bindings;
@@ -195,7 +190,7 @@ fn build_patterns_for_font(
mod test {
use crate::add_patterns_to_fontset;
use fc_fontations_bindgen::{FcFontSetCreate, FcFontSetDestroy};
- use CString;
+ use std::ffi::CString;
#[test]
fn basic_pattern_construction() {
diff --git a/fc-fontations/names.rs b/fc-fontations/names.rs
index 1682e73..b4464b4 100644
--- a/fc-fontations/names.rs
+++ b/fc-fontations/names.rs
@@ -28,10 +28,9 @@ use fc_fontations_bindgen::fcint::{
FC_FAMILYLANG_OBJECT, FC_FAMILY_OBJECT, FC_INVALID_OBJECT, FC_POSTSCRIPT_NAME_OBJECT,
};
-use CString;
-use FcPatternBuilder;
-use FontRef;
-use PatternElement;
+use crate::{FcPatternBuilder, PatternElement};
+use read_fonts::FontRef;
+use std::ffi::CString;
use std::collections::HashSet;
diff --git a/meson.build b/meson.build
index 93e4347..bdbb440 100644
--- a/meson.build
+++ b/meson.build
@@ -4,6 +4,7 @@ project('fontconfig', 'c',
default_options: [
'c_std=c11,c99',
'buildtype=debugoptimized',
+ 'rust_std=2021',
]
)
commit c6a3d6185c11e49fded6689fc766169f38cf3ee1
Author: Dominik Röttsches <drott at chromium.org>
Date: Wed Apr 30 10:37:39 2025 +0300
Revert "ci: disable meson static fontations build tentatively"
This reverts commit 91b7fdf7954fbc32577c3d8fb1e4ed627cbac4da.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15a1f6c..eb33f76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,8 @@ variables:
# changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular
# fontconfig version
- FEDORA_TAG: '2025-04-30.1-f55ea04ce447'
- FREEBSD_TAG: '2025-04-30.1-2e18059bfc52'
+ FEDORA_TAG: '2025-04-30.1-1e6ed32d8678'
+ FREEBSD_TAG: '2025-04-30.1-b401dfb43b5f'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -458,8 +458,6 @@ build-meson static libxml2:
needs:
- fedora:rawhide at container-prep
build-meson static fontations:
- when: manual
- allow_failure: true
stage: build
extends:
- .build at template
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 34240c2..83d4af4 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -302,10 +302,6 @@ check-ci-script:
{% for build in build_patterns %}
build-{{build.name}}:
- {% if 'disable_build' in build and build.disable_build == 1 %}
- when: manual
- allow_failure: true
- {% endif %}
stage: build
extends:
- .build at template
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 15f37bc..08d7c27 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -42,7 +42,6 @@ build_patterns:
FC_BUILD_TYPE: static
FC_XML_BACKEND: libxml2
- name: "meson static fontations"
- disable_build: 1
variables:
FC_BUILDSYS: meson
FC_BUILD_TYPE: static
diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index a126258..14af564 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -98,8 +98,6 @@ meson macos test:
MESON_FONTATIONS_ARG: "-Dfontations=disabled"
meson macos test fontations:
- when: manual
- allow_failure: true
extends: ".meson macos test"
variables:
MESON_FONTATIONS_ARG: "-Dfontations=enabled"
More information about the Fontconfig
mailing list