Revert "Drop gi-docgen patches"

This reverts commit f0e8b0aa9adb9028f1ed10e537dcadd04de373d1.

diff --git a/debian/patches/debian/Disable-web-fonts-for-now.patch b/debian/patches/debian/Disable-web-fonts-for-now.patch
new file mode 100644 (file)
index 0000000..ff813ed
--- /dev/null
+++ b/debian/patches/debian/Disable-web-fonts-for-now.patch
@@ -0,0 +1,211 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Thu, 15 Apr 2021 13:41:44 +0100
+Subject: Disable web fonts for now
+
+The way this works is still changing upstream, and getting the
+correct licensing and source code for the Red Hat font (ITP: #986999)
+is not really in the scope of packaging gi-docgen.
+
+Forwarded: not-needed, Debian-specific
+---
+ .../gi-docgen/gidocgen/templates/basic/fonts.css   | 176 ---------------------
+ .../gi-docgen/gidocgen/templates/basic/style.css   |   2 -
+ 2 files changed, 178 deletions(-)
+
+diff --git a/subprojects/gi-docgen/gidocgen/templates/basic/fonts.css b/subprojects/gi-docgen/gidocgen/templates/basic/fonts.css
+index ce790e7..0a01b93 100644
+--- a/subprojects/gi-docgen/gidocgen/templates/basic/fonts.css
++++ b/subprojects/gi-docgen/gidocgen/templates/basic/fonts.css
+@@ -3,179 +3,3 @@
+  *
+  * SPDX-License-Identifier: Apache-2.0 OR GPL-3.0-or-later
+  */
+-
+-/**
+- * RedHat Fonts taken from https://github.com/RedHatOfficial/RedHatFont
+- * License: SIL Open Font License 1.1 http://scripts.sil.org/OFL
+- *
+- * SourceCodePro Fonts
+- * License: SIL Open Font License 1.1 https://scripts.sil.org/OFL
+- */
+-
+-@font-face {
+-  font-family: "Red Hat Display";
+-  src: local('RedHatDisplayWeb'),
+-       url("RedHatDisplay-Regular.woff2") format("woff2"),
+-       url("RedHatDisplay-Regular.woff") format("woff");
+-  font-style: normal;
+-  font-weight: 400;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Display";
+-  src: local('RedHatDisplayWeb'),
+-       url("RedHatDisplay-RegularItalic.woff2") format("woff2"),
+-       url("RedHatDisplay-RegularItalic.woff") format("woff");
+-  font-style: italic;
+-  font-weight: 400;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Display";
+-  src: local('RedHatDisplayWeb'),
+-       url("RedHatDisplay-Medium.woff2") format("woff2"),
+-       url("RedHatDisplay-Medium.woff") format("woff");
+-  font-style: normal;
+-  font-weight: 500;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Display";
+-  src: local('RedHatDisplayWeb'),
+-       url("RedHatDisplay-MediumItalic.woff2") format("woff2"),
+-       url("RedHatDisplay-MediumItalic.woff") format("woff");
+-  font-style: italic;
+-  font-weight: 500;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Display";
+-  src: local('RedHatDisplayWeb'),
+-       url("RedHatDisplay-Bold.woff2") format("woff2"),
+-       url("RedHatDisplay-Bold.woff") format("woff");
+-  font-style: normal;
+-  font-weight: 700;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Display";
+-  src: local('RedHatDisplayWeb'),
+-       url("RedHatDisplay-BoldItalic.woff2") format("woff2"),
+-       url("RedHatDisplay-BoldItalic.woff") format("woff");
+-  font-style: italic;
+-  font-weight: 700;
+-  font-display: fallback;
+-}
+-
+-
+-@font-face {
+-  font-family: "Red Hat Display";
+-  src: local('RedHatDisplayWeb'),
+-       url("RedHatDisplay-Black.woff2") format("woff2"),
+-       url("RedHatDisplay-Black.woff") format("woff");
+-  font-style: normal;
+-  font-weight: 900;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Display";
+-  src: local('RedHatDisplayWeb'),
+-       url("RedHatDisplay-BlackItalic.woff2") format("woff2"),
+-       url("RedHatDisplay-BlackItalic.woff") format("woff");
+-  font-style: italic;
+-  font-weight: 900;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Text";
+-  src: local('RedHatTextWeb'),
+-       url("RedHatText-Regular.woff2") format("woff2"),
+-       url("RedHatText-Regular.woff") format("woff");
+-  font-style: normal;
+-  font-weight: 400;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Text";
+-  src: local('RedHatTextWeb'),
+-       url("RedHatText-Italic.woff2") format("woff2"),
+-       url("RedHatText-Italic.woff") format("woff");
+-  font-style: italic;
+-  font-weight: 400;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Text";
+-  src: local('RedHatTextWeb'),
+-       url("RedHatText-Medium.woff2") format("woff2"),
+-       url("RedHatText-Medium.woff") format("woff");
+-  font-style: normal;
+-  font-weight: 700;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Text";
+-  src: local('RedHatTextWeb'),
+-       url("RedHatText-MediumItalic.woff2") format("woff2"),
+-       url("RedHatText-MediumItalic.woff") format("woff");
+-  font-style: italic;
+-  font-weight: 700;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Text";
+-  src: local('RedHatTextWeb'),
+-       url("RedHatText-Bold.woff2") format("woff2"),
+-       url("RedHatText-Bold.woff") format("woff");
+-  font-style: normal;
+-  font-weight: 900;
+-  font-display: fallback;
+-}
+-
+-@font-face {
+-  font-family: "Red Hat Text";
+-  src: local('RedHatTextWeb'),
+-       url("RedHatText-BoldItalic.woff2") format("woff2"),
+-       url("RedHatText-BoldItalic.woff") format("woff");
+-  font-style: italic;
+-  font-weight: 900;
+-  font-display: fallback;
+-}
+-
+-/* Do not fall back to locally installed SourceCodePro, as there are
+- * known bad copies being distributed to this day
+- */
+-@font-face {
+-  font-family: 'Source Code Pro';
+-  font-style: normal;
+-  font-weight: 400;
+-  src: url("SourceCodePro-Regular.ttf.woff") format('woff');
+-  font-display: swap;
+-}
+-
+-@font-face {
+-  font-family: 'Source Code Pro';
+-  font-style: italic;
+-  font-weight: 400;
+-  src: url("SourceCodePro-It.ttf.woff") format('woff');
+-  font-display: swap;
+-}
+-
+-@font-face {
+-  font-family: 'Source Code Pro';
+-  font-style: normal;
+-  font-weight: 600;
+-  src: url("SourceCodePro-Semibold.ttf.woff") format('woff');
+-  font-display: swap;
+-}
+diff --git a/subprojects/gi-docgen/gidocgen/templates/basic/style.css b/subprojects/gi-docgen/gidocgen/templates/basic/style.css
+index 188c9a7..954b5d8 100644
+--- a/subprojects/gi-docgen/gidocgen/templates/basic/style.css
++++ b/subprojects/gi-docgen/gidocgen/templates/basic/style.css
+@@ -7,8 +7,6 @@
+ @import url("solarized-light.css") (prefers-color-scheme: light);
+ @import url("solarized-dark.css") (prefers-color-scheme: dark);
+ 
+-@import url("fonts.css");
+-
+ /*********************************
+  * LIGHT THEME
+  *********************************/

diff --git a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch b/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
index c18e22870628a1b24aeb37a6e5848673acc0c058..d7c031e8398a65ede2fabfff29d294a54b6dd0e8 100644 (file)
--- a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
+++ b/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
@@ -9,10 +9,10 @@ Forwarded: no
  2 files changed, 21 insertions(+), 8 deletions(-)
 
 diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
-index 2fb0208..8c3ff1f 100644
+index 106661a..06e1d18 100644
 --- a/testsuite/gsk/meson.build
 +++ b/testsuite/gsk/meson.build
-@@ -77,9 +77,7 @@ compare_render_tests = [
+@@ -77,15 +77,21 @@ compare_render_tests = [
    'scale-up-down',
    'shadow-in-opacity',
    'texture-url',
@@ -22,7 +22,6 @@ index 2fb0208..8c3ff1f 100644
    'repeat-texture',
    'transform-in-transform',
    'transform-in-transform-in-transform',
-@@ -87,6 +85,14 @@ compare_render_tests = [
    'rounded-clip-in-clip-3d', # not really 3d, but cairo fails it
  ]
  

diff --git a/debian/patches/debian/templates-Remove-html5shiv.patch b/debian/patches/debian/templates-Remove-html5shiv.patch
new file mode 100644 (file)
index 0000000..dd4cffa
--- /dev/null
+++ b/debian/patches/debian/templates-Remove-html5shiv.patch
@@ -0,0 +1,22 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Thu, 15 Apr 2021 14:09:42 +0100
+Subject: templates: Remove html5shiv
+
+Internet Explorer is dead, or really should be, so let's not generate
+references to external resources that can be a privacy breach.
+---
+ subprojects/gi-docgen/gidocgen/templates/basic/base.html | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/subprojects/gi-docgen/gidocgen/templates/basic/base.html b/subprojects/gi-docgen/gidocgen/templates/basic/base.html
+index 36598ba..a1be4ab 100644
+--- a/subprojects/gi-docgen/gidocgen/templates/basic/base.html
++++ b/subprojects/gi-docgen/gidocgen/templates/basic/base.html
+@@ -52,7 +52,6 @@ SPDX-License-Identifier: Apache-2.0 OR GPL-3.0-or-later
+   <script src="search.js"></script>
+   {% endif %}
+   <script src="main.js"></script>
+-  <!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+ </head>
+ 
+ <body>

diff --git a/debian/patches/series b/debian/patches/series
index 94ef853ea92b0d4733c0c42ed29154ffe47c0be0..83c9fc8f21146b4d6bfc1a2d37e918244d896d05 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,7 @@ GtkFileChooserWidget-check-for-empty-instead-of-NULL-GLis.patch
 GtkFileChooserWidget-return-empty-GListModel-in-get_files.patch
 reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
 reftests-Allow-minor-differences-to-be-tolerated.patch
+debian/Disable-web-fonts-for-now.patch
+debian/templates-Remove-html5shiv.patch
 debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
 debian/Disable-clipboard-test.patch