diff --git a/onig-696-compat.diff b/onig-696-compat.diff new file mode 100644 index 0000000..118b988 --- /dev/null +++ b/onig-696-compat.diff @@ -0,0 +1,43 @@ +--- a/src/flags.rs ++++ b/src/flags.rs +@@ -69,9 +69,6 @@ bitflags! { + /// `?` + const SYNTAX_OPERATOR_QMARK_ZERO_ONE + = (onig_sys::ONIG_SYN_OP_QMARK_ZERO_ONE as u64); +- /// ?P +- const SYNTAX_OPERATOR_QMARK_CAPITAL_P_NAME +- = (onig_sys::ONIG_SYN_OP2_QMARK_CAPITAL_P_NAME as u64); + /// `{lower,upper}` + const SYNTAX_OPERATOR_BRACE_INTERVAL + = (onig_sys::ONIG_SYN_OP_BRACE_INTERVAL as u64); +--- a/src/syntax.rs ++++ b/src/syntax.rs +@@ -33,10 +33,6 @@ pub struct Syntax { + } + + impl Syntax { +- /// Python syntax +- pub fn python() -> &'static Syntax { +- unsafe { transmute(&onig_sys::OnigSyntaxPython) } +- } + /// Plain text syntax + pub fn asis() -> &'static Syntax { + unsafe { transmute(&onig_sys::OnigSyntaxASIS) } +@@ -206,17 +202,3 @@ impl Syntax { + &self.raw as *const onig_sys::OnigSyntaxType as *mut onig_sys::OnigSyntaxType + } + } +- +-#[cfg(test)] +-mod test { +- use super::*; +- +- #[test] +- fn round_trip_bits() { +- let mut syn = Syntax::python().clone(); +- syn.enable_operators(SyntaxOperator::SYNTAX_OPERATOR_ESC_X_BRACE_HEX8); +- assert_ne!(Syntax::python().raw, syn.raw); +- syn.disable_operators(SyntaxOperator::SYNTAX_OPERATOR_ESC_X_BRACE_HEX8); +- assert_eq!(Syntax::python().raw, syn.raw); +- } +-} diff --git a/rust-onig.spec b/rust-onig.spec index d82d2e4..cce3882 100644 --- a/rust-onig.spec +++ b/rust-onig.spec @@ -14,6 +14,8 @@ URL: https://crates.io/crates/onig Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: onig-fix-metadata-auto.diff +# Restore compatibility with oniguruma 6.9.6 +Patch: onig-696-compat.diff ExclusiveArch: %{rust_arches}