[packages/cxx-rust-cssparser] - updated to 1.1.0
witekfl
witekfl at pld-linux.org
Thu Oct 15 08:46:04 CEST 2026
commit 8ea32d8915ea24362959ebf1c344bd5885129bad
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Thu Oct 15 08:45:21 2026 +0200
- updated to 1.1.0
cxx-rust-cssparser.spec | 24 ++++++--------
no_underscores.patch | 21 ------------
use_corrosion_cxxbridge.patch | 74 -------------------------------------------
3 files changed, 10 insertions(+), 109 deletions(-)
---
diff --git a/cxx-rust-cssparser.spec b/cxx-rust-cssparser.spec
index 7f035a8..fd021b1 100644
--- a/cxx-rust-cssparser.spec
+++ b/cxx-rust-cssparser.spec
@@ -8,16 +8,14 @@
Summary: Library for parsing CSS
Summary(pl.UTF-8): Biblioteka do parsowania CSS
Name: cxx-rust-cssparser
-Version: 1.0.0
-Release: 2
+Version: 1.1.0
+Release: 1
License: LGPL
Group: Libraries
Source0: https://download.kde.org/stable/cxx-rust-cssparser/%{name}-%{version}.tar.xz
-# Source0-md5: 4302471a1d004501e8e1f5e8473befa0
+# Source0-md5: a9532e8d40f8fa1df59d54b3353082f9
Source1: %{name}-vendor-crates-%{version}.tar.xz
-# Source1-md5: 667d2488818fc2e04263e8da61936e80
-Patch0: use_corrosion_cxxbridge.patch
-Patch1: no_underscores.patch
+# Source1-md5: a958f230246ea2a3069562788fb08d13
URL: https://www.kde.org/
BuildRequires: cargo
BuildRequires: cmake >= 3.22
@@ -49,23 +47,21 @@ Header files for %{name} development.
Pliki nagłówkowe dla programistów używających %{name}.
%prep
-%setup -q -b1
-%patch -P0 -p1
-%patch -P1 -p1
+%setup -q -a1
# Use our offline registry
-export CARGO_HOME="$(pwd)/rust/.cargo"
+export CARGO_HOME="$(pwd)/.cargo"
mkdir -p "$CARGO_HOME"
-cat >rust/.cargo/config.toml <<EOF
+cat > .cargo/config.toml <<EOF
[source.crates-io]
replace-with = 'vendored-sources'
[source.vendored-sources]
-directory = '$PWD/rust/vendor'
+directory = '$PWD/vendor'
EOF
%build
-export CARGO_HOME="$(pwd)/rust/.cargo"
+export CARGO_HOME="$(pwd)/.cargo"
%cmake -B build \
-G Ninja \
%{!?with_tests:-DBUILD_TESTING=OFF} \
@@ -81,7 +77,7 @@ export CARGO_HOME="$(pwd)/rust/.cargo"
%install
rm -rf $RPM_BUILD_ROOT
-export CARGO_HOME="$(pwd)/rust/.cargo"
+export CARGO_HOME="$(pwd)/.cargo"
rm -rf $RPM_BUILD_ROOT
%ninja_install -C build
diff --git a/no_underscores.patch b/no_underscores.patch
deleted file mode 100644
index 5361268..0000000
--- a/no_underscores.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 17e12236d06b5c55d232856042ccc667a8a05955
-Author: Arjen Hiemstra <ahiemstra at heimr.nl>
-Date: Thu May 14 22:36:22 2026 +0200
-
- Correct the include path used by the non-corrosion cxxbridge
-
- The non-corrosion cxxbridge doesn't use underscores for the target name.
-
-diff --git a/rust/CMakeLists.txt b/rust/CMakeLists.txt
-index 8f9f3d5..d174d72 100644
---- a/rust/CMakeLists.txt
-+++ b/rust/CMakeLists.txt
-@@ -20,7 +20,7 @@ else()
- set(_bridge_include_dir ${CMAKE_CURRENT_BINARY_DIR}/corrosion_generated/cxxbridge)
- file(MAKE_DIRECTORY ${_bridge_include_dir}/cxx-rust-cssparser-impl-bridge)
- file(WRITE ${_bridge_include_dir}/cxx-rust-cssparser-impl-bridge/ffi.h
-- "#pragma once\n#include \"${_cxxbridge_dir}/cxx_rust_cssparser_impl/src/ffi.rs.h\"\n"
-+ "#pragma once\n#include \"${_cxxbridge_dir}/cxx-rust-cssparser-impl/src/ffi.rs.h\"\n"
- )
-
- target_include_directories(cxx_rust_cssparser_impl INTERFACE ${_bridge_include_dir})
diff --git a/use_corrosion_cxxbridge.patch b/use_corrosion_cxxbridge.patch
deleted file mode 100644
index 8ef2cc1..0000000
--- a/use_corrosion_cxxbridge.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-commit 566b92ac4746d4c59eab14112efdc31737b922c7
-Author: Arjen Hiemstra <ahiemstra at heimr.nl>
-Date: Thu May 14 22:35:52 2026 +0200
-
- Make an option for toggling using corrosion for bridge building
-
- Rather than only switching based on whether we're building a flatpak or
- not.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f91dbc6..536fb92 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +32,8 @@ if (BUILD_DOCS)
- include(ECMGenerateQDoc)
- endif()
-
-+option(USE_CORROSION_CXXBRIDGE "Use corrosion to build the CXX bridge" ON)
-+
- set(CMAKE_CXX_STANDARD 20)
- set(CMAKE_AUTOMOC FALSE)
- set(CMAKE_AUTORCC FALSE)
-diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index 16c46a0..a81165b 100644
---- a/cpp/CMakeLists.txt
-+++ b/cpp/CMakeLists.txt
-@@ -28,10 +28,10 @@ target_sources(cxx-rust-cssparser PUBLIC
- ${CMAKE_CURRENT_BINARY_DIR}/cssparser_export.h
- )
-
--if(DEFINED ENV{FLATPAK_ID})
-- target_link_libraries(cxx-rust-cssparser PRIVATE cxx_rust_cssparser_impl)
--else()
-+if (USE_CORROSION_CXXBRIDGE)
- target_link_libraries(cxx-rust-cssparser PRIVATE cxx-rust-cssparser-impl-bridge)
-+else()
-+ target_link_libraries(cxx-rust-cssparser PRIVATE cxx_rust_cssparser_impl)
- endif()
-
- target_include_directories(cxx-rust-cssparser PUBLIC
-diff --git a/rust/CMakeLists.txt b/rust/CMakeLists.txt
-index 594abb1..8f9f3d5 100644
---- a/rust/CMakeLists.txt
-+++ b/rust/CMakeLists.txt
-@@ -3,7 +3,14 @@
-
- corrosion_import_crate(MANIFEST_PATH Cargo.toml)
-
--if(DEFINED ENV{FLATPAK_ID})
-+if (USE_CORROSION_CXXBRIDGE)
-+ corrosion_add_cxxbridge(cxx-rust-cssparser-impl-bridge
-+ CRATE cxx_rust_cssparser_impl
-+ FILES ffi.rs
-+ )
-+
-+ set_target_properties(cxx-rust-cssparser-impl-bridge PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-+else()
- # Flatpak: use cxx_build output directly instead of corrosion_add_cxxbridge.
- string(SHA1 _cargo_path_hash ${CMAKE_CURRENT_SOURCE_DIR}/Cargo.toml)
- string(SUBSTRING "${_cargo_path_hash}" 0 5 _cargo_path_hash)
-@@ -17,13 +24,6 @@ if(DEFINED ENV{FLATPAK_ID})
- )
-
- target_include_directories(cxx_rust_cssparser_impl INTERFACE ${_bridge_include_dir})
--else()
-- corrosion_add_cxxbridge(cxx-rust-cssparser-impl-bridge
-- CRATE cxx_rust_cssparser_impl
-- FILES ffi.rs
-- )
--
-- set_target_properties(cxx-rust-cssparser-impl-bridge PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
- endif()
-
- if (BUILD_TESTING)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cxx-rust-cssparser.git/commitdiff/8ea32d8915ea24362959ebf1c344bd5885129bad
More information about the pld-cvs-commit
mailing list