diff --git a/libsass-python-pr344-sass-365.patch b/libsass-python-pr344-sass-365.patch new file mode 100644 index 0000000..e87c910 --- /dev/null +++ b/libsass-python-pr344-sass-365.patch @@ -0,0 +1,37 @@ +From ad69f6e023a6d8fdde4428b7a497b60fb5515215 Mon Sep 17 00:00:00 2001 +From: Anthony Sottile +Date: Thu, 20 May 2021 18:10:53 -0700 +Subject: [PATCH] update libsass to 3.6.5 + +--- + libsass | 2 +- + sasstests.py | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/sasstests.py b/sasstests.py +index 79b5837d..6aaf5539 100644 +--- a/sasstests.py ++++ b/sasstests.py +@@ -785,8 +785,8 @@ def test_build_one(self): + 'names': [], + 'mappings': ( + ';AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAK,GAQxB;' +- 'EALD,AAEE,IAFE,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,sBAAsB,' +- 'GAC7B' ++ 'EALD,AAEE,IAFE,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,kBAAkB,' ++ 'GACzB' + ), + }, + os.path.join(d, 'css', 'd.scss.css.map'), +@@ -1633,9 +1633,9 @@ def test_stack_trace_formatting(): + # TODO: https://github.com/sass/libsass/issues/3092 + assert tb.endswith( + 'CompileError: Error: Invalid CSS after "a{☃": expected "{", was ""\n' +- ' on line 1:5 of stdin\n' ++ ' on line 1:4 of stdin\n' + '>> a{☃\n' +- ' ----^\n\n', ++ ' ---^\n\n', + ) + + diff --git a/libsass-python-pr433-sphinx60-remove-deprecated-item.patch b/libsass-python-pr433-sphinx60-remove-deprecated-item.patch new file mode 100644 index 0000000..ac08ed8 --- /dev/null +++ b/libsass-python-pr433-sphinx60-remove-deprecated-item.patch @@ -0,0 +1,36 @@ +From 593ac9a887a15eacd4e68a71998331ac93bc3e60 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 14 Jul 2023 17:01:04 +0900 +Subject: [PATCH] doc: support sphinx 6.0 ext.extlinks + +As sphinx 5 already warns, sphinx.ext.extlinks requires a caption string +to contain (exactly) one '%s' if caption is not None, and now sphinx forces +this with the following change: + +https://github.com/sphinx-doc/sphinx/pull/10471 + +Fixes #424 . +--- + docs/conf.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/conf.py b/docs/conf.py +index ca7e3906..46964c23 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -267,11 +267,11 @@ + + + extlinks = { +- 'issue': ('https://github.com/sass/libsass-python/issues/%s', '#'), ++ 'issue': ('https://github.com/sass/libsass-python/issues/%s', '#%s'), + 'branch': ( + 'https://github.com/sass/libsass-python/compare/master...%s', +- '', ++ '%s', + ), +- 'commit': ('https://github.com/sass/libsass-python/commit/%s', ''), +- 'upcommit': ('https://github.com/sass/libsass/commit/%s', ''), ++ 'commit': ('https://github.com/sass/libsass-python/commit/%s', '%s'), ++ 'upcommit': ('https://github.com/sass/libsass/commit/%s', '%s'), + } diff --git a/python-libsass.spec b/python-libsass.spec index 6069073..36a225f 100644 --- a/python-libsass.spec +++ b/python-libsass.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.20.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Python bindings for libsass License: MIT @@ -10,6 +10,11 @@ URL: https://github.com/dahlia/libsass-python Source0: %{url}/archive/%{version}.tar.gz#/%{srcname}-%{version}.tar.gz # Patch for correct naming of manpages Patch0: python-libsass-man.patch +# https://github.com/sass/libsass-python/issues/424 +# https://github.com/sass/libsass-python/pull/433 - a bit modified +Patch1: libsass-python-pr433-sphinx60-remove-deprecated-item.patch +# https://github.com/sass/libsass-python/pull/344 +Patch2: libsass-python-pr344-sass-365.patch BuildRequires: make BuildRequires: python3-devel @@ -39,7 +44,12 @@ sass which is binding Libsass (written in C/C++ by Hampton Catlin and Aaron Leung). %prep -%autosetup -n %{srcname}-python-%{version} -p1 +%autosetup -n %{srcname}-python-%{version} -N +%patch -P0 -p1 +%patch -P1 -p1 +if pkg-config --atleast-version 3.6.5 libsass ; then +%patch -P2 -p1 +fi sed -i -e '/^#!\//, 1d' sassc.py %build @@ -85,6 +95,10 @@ py.test-3 sasstests.py %exclude %{_bindir}/sassc.py %changelog +* Fri Jul 14 2023 Mamoru TASAKA - 0.20.0-12 +- Patch for sphinx 6.0 some deprecated items removal +- Backport upstream patch for testsuite to support sasl 3.6.5 + * Fri Jun 16 2023 Python Maint - 0.20.0-11 - Rebuilt for Python 3.12