~sircmpwn/sr.ht-packages

core.sr.ht-deb: Replace bootstrap patches with symlink v1 PROPOSED

Including bootstrap/breadcrumbs trashes git.sr.ht's UI[0]

[0]: https://arminweigl.srht.site/git.sr.ht_breadcrumbs.png

Armin Weigl (3):
  Drop "Import bootstrap only once"
  Drop "Add /usr/share/sass/bootstrap to sassc load path"
  Add symbolic link to system bootstrap

 debian/links                                  |  1 +
 ...re-sass-bootstrap-to-sassc-load-path.patch | 21 ---------
 .../patches/Import-bootstrap-only-once.patch  | 43 -------------------
 debian/patches/series                         |  2 -
 4 files changed, 1 insertion(+), 66 deletions(-)
 create mode 100644 debian/links
 delete mode 100644 debian/patches/Add-usr-share-sass-bootstrap-to-sassc-load-path.patch
 delete mode 100644 debian/patches/Import-bootstrap-only-once.patch

-- 
2.30.2
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~sircmpwn/sr.ht-packages/patches/21445/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH core.sr.ht-deb 1/3] Drop "Import bootstrap only once" Export this patch

---
 .../patches/Import-bootstrap-only-once.patch  | 43 -------------------
 debian/patches/series                         |  1 -
 2 files changed, 44 deletions(-)
 delete mode 100644 debian/patches/Import-bootstrap-only-once.patch

diff --git a/debian/patches/Import-bootstrap-only-once.patch b/debian/patches/Import-bootstrap-only-once.patch
deleted file mode 100644
index fde068e..0000000
--- a/debian/patches/Import-bootstrap-only-once.patch
@@ -1,43 +0,0 @@
From: Denis Laxalde <denis@laxalde.org>
Date: Sun, 9 Jun 2019 22:01:31 +0200
Subject: Import bootstrap only once

Hopefully, this will make things work with bootstrap installed from
Debian.
----
 srht/scss/base.scss | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/srht/scss/base.scss b/srht/scss/base.scss
index bedc56b..5abdf7d 100644
---- a/srht/scss/base.scss
+++ b/srht/scss/base.scss
@@ -1,27 +1,6 @@
 @import "contrast";
-@import "bootstrap/scss/functions";
-@import "bootstrap/scss/variables";
+@import "bootstrap";
 @import "variables";
-@import "bootstrap/scss/mixins";
-@import "bootstrap/scss/root";
-@import "bootstrap/scss/reboot";
-@import "bootstrap/scss/code";
-@import "bootstrap/scss/type";
-@import "bootstrap/scss/grid";
-@import "bootstrap/scss/tables";
-@import "bootstrap/scss/forms";
-@import "bootstrap/scss/buttons";
-@import "bootstrap/scss/transitions";
-@import "bootstrap/scss/dropdown";
-@import "bootstrap/scss/progress";
-@import "bootstrap/scss/button-group";
-@import "bootstrap/scss/input-group";
-@import "bootstrap/scss/custom-forms";
-@import "bootstrap/scss/nav";
-@import "bootstrap/scss/navbar";
-@import "bootstrap/scss/alert";
-@import "bootstrap/scss/utilities";
-@import "bootstrap/scss/print";
 
 @import "icons";
 @import "nav";
diff --git a/debian/patches/series b/debian/patches/series
index a7ffaa5..f3eebb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
Rely-on-cleancss-being-installed-on-the-system.patch
Import-bootstrap-only-once.patch
Add-usr-share-sass-bootstrap-to-sassc-load-path.patch
-- 
2.30.2

[PATCH core.sr.ht-deb 2/3] Drop "Add /usr/share/sass/bootstrap to sassc load path" Export this patch

---
 ...re-sass-bootstrap-to-sassc-load-path.patch | 21 -------------------
 debian/patches/series                         |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 debian/patches/Add-usr-share-sass-bootstrap-to-sassc-load-path.patch

diff --git a/debian/patches/Add-usr-share-sass-bootstrap-to-sassc-load-path.patch b/debian/patches/Add-usr-share-sass-bootstrap-to-sassc-load-path.patch
deleted file mode 100644
index f93184f..0000000
--- a/debian/patches/Add-usr-share-sass-bootstrap-to-sassc-load-path.patch
@@ -1,21 +0,0 @@
From: Denis Laxalde <denis@laxalde.org>
Date: Sun, 9 Jun 2019 22:21:58 +0200
Subject: Add /usr/share/sass/bootstrap to sassc load path

----
 srht/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srht/Makefile b/srht/Makefile
index 717ca8e..9f9a311 100644
---- a/srht/Makefile
+++ b/srht/Makefile
@@ -19,7 +19,7 @@ $(MODULE)static/%: _static/%
 
 $(MODULE)static/main.css: scss/*.scss ${SRHT_PATH}/scss/*.scss
 	@mkdir -p $(MODULE)static/
-	sassc -I${SRHT_PATH}/scss scss/main.scss $@
+	sassc -I/usr/share/sass/bootstrap -I${SRHT_PATH}/scss scss/main.scss $@
 
 $(MODULE)static/main.min.css: $(MODULE)static/main.css
 	cleancss \
diff --git a/debian/patches/series b/debian/patches/series
index f3eebb4..532060e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
Rely-on-cleancss-being-installed-on-the-system.patch
Add-usr-share-sass-bootstrap-to-sassc-load-path.patch
-- 
2.30.2

[PATCH core.sr.ht-deb 3/3] Add symbolic link to system bootstrap Export this patch

---
 debian/links | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian/links

diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..df52d09
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
usr/share/sass/bootstrap usr/lib/python3/dist-packages/srht/scss/bootstrap/scss
-- 
2.30.2