Backport fix for a parser error that affects bootstrap

epel9
Adam Williamson 7 years ago
parent 8cb22a6ec7
commit 5d00043ee6

@ -0,0 +1,27 @@
From 139e86e32506dbd8c301b1241f9b79aeed9cb696 Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Wed, 4 Oct 2017 15:20:18 -0700
Subject: [PATCH] Fix custom property interpolation (#2384)
Interpolation that included the full property name (such as --#{foo})
was crashing the parser.
Closes #2383
---
lib/sass/scss/rx.rb | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/sass/scss/rx.rb b/lib/sass/scss/rx.rb
index 2c48a77f..16963d1e 100644
--- a/lib/sass/scss/rx.rb
+++ b/lib/sass/scss/rx.rb
@@ -127,7 +127,7 @@
OPTIONAL = /!#{W}optional/i
IDENT_START = /-|#{NMSTART}/
- IDENT_HYPHEN_INTERP = /-(#\{)/
+ IDENT_HYPHEN_INTERP = /-+(#\{)/
STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|#{ESCAPE})*)\"/
STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|#{ESCAPE})*)\'/
STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/

@ -3,12 +3,15 @@
Name: rubygem-%{gem_name}
Version: 3.4.25
Release: 3%{?dist}
Release: 4%{?dist}
Summary: A powerful but elegant CSS compiler that makes CSS fun again
Group: Development/Languages
License: MIT
URL: http://sass-lang.com/
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# Backported fix for a bug that affects bootstrap
# https://github.com/sass/ruby-sass/commit/139e86e32506dbd8c301b1241f9b79aeed9cb696
Patch0: rubygem-sass-3.4.25-interpolation-crash.patch
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: rubygem(minitest)
@ -37,6 +40,7 @@ Documentation for %{name}.
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
%patch0 -p1
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
@ -107,6 +111,9 @@ popd
%{gem_instdir}/test
%changelog
* Mon May 28 2018 Adam Williamson <awilliam@redhat.com> - 3.4.25-4
- Backport fix for a parser error that affects bootstrap
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.25-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Loading…
Cancel
Save