From 9bbe28b06a9d01f60cbb27f50a9b47e0c7db1e9c Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Thu, 18 Mar 2021 16:36:11 -0700
Subject: [PATCH] adding remaining themes patches

not all of them apply cleaninly (sorry). See #15 and #5 for the list of things to fix.
---
 composer.lock                                 |  34 ++-
 composer.patches.json                         |  40 ++-
 patches/themes/0165-remove-google-fonts.patch |  33 ---
 patches/themes/0187-Patch-themes-twenty.patch | 272 ------------------
 patches/themes/0187-twentyfifteen.patch       | 119 ++++++++
 patches/themes/0187-twentyfourteen.patch      |  53 ++++
 patches/themes/0187-twentyseventeen.patch     |  25 ++
 patches/themes/0187-twentysixteen.patch       |  14 +
 patches/themes/0187-twentyten.patch           |  17 ++
 patches/themes/0187-twentytwelve.patch        |  20 ++
 10 files changed, 317 insertions(+), 310 deletions(-)
 delete mode 100644 patches/themes/0165-remove-google-fonts.patch
 delete mode 100644 patches/themes/0187-Patch-themes-twenty.patch
 create mode 100644 patches/themes/0187-twentyfifteen.patch
 create mode 100644 patches/themes/0187-twentyfourteen.patch
 create mode 100644 patches/themes/0187-twentyseventeen.patch
 create mode 100644 patches/themes/0187-twentysixteen.patch
 create mode 100644 patches/themes/0187-twentyten.patch
 create mode 100644 patches/themes/0187-twentytwelve.patch

diff --git a/composer.lock b/composer.lock
index 5db4eb14..2f10f386 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fc4d813a81be3aa85951300ed0837ba6",
+    "content-hash": "cf26757fc1257f858fc53c3395c2da89",
     "packages": [
         {
             "name": "bjornjohansen/wplang",
@@ -1366,6 +1366,12 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Remove Google Fonts API": "patches/themes/0189-removed-googleapis-fonts-from-bliss-theme.patch",
+                    "Change footer": "patches/themes/0223-bliss-footer.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/bliss/"
         },
         {
@@ -1568,6 +1574,9 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": []
+            },
             "homepage": "https://wordpress.org/themes/hybrid/"
         },
         {
@@ -1604,6 +1613,9 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": []
+            },
             "homepage": "https://wordpress.org/themes/micro/"
         },
         {
@@ -1806,6 +1818,11 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": {
+                    "Change footer": "patches/themes/0223-thematic-footer.patch"
+                }
+            },
             "homepage": "https://wordpress.org/themes/thematic/"
         },
         {
@@ -1870,6 +1887,9 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": []
+            },
             "homepage": "https://wordpress.org/themes/twentyfifteen/"
         },
         {
@@ -1888,6 +1908,9 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": []
+            },
             "homepage": "https://wordpress.org/themes/twentyfourteen/"
         },
         {
@@ -1924,6 +1947,9 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": []
+            },
             "homepage": "https://wordpress.org/themes/twentyseventeen/"
         },
         {
@@ -1942,6 +1968,9 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": []
+            },
             "homepage": "https://wordpress.org/themes/twentysixteen/"
         },
         {
@@ -1960,6 +1989,9 @@
                 "composer/installers": "~1.0"
             },
             "type": "wordpress-theme",
+            "extra": {
+                "patches_applied": []
+            },
             "homepage": "https://wordpress.org/themes/twentyten/"
         },
         {
diff --git a/composer.patches.json b/composer.patches.json
index 875164cb..1c09e8ee 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -106,16 +106,48 @@
         "wpackagist-theme/wp-andreas01": {
             "Theme footer": "patches/themes/0090-Patch-theme-wp-andreas01.patch"
         },
+	"wpackagist-theme/twentyten": {
+	    "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyten.patch"
+	},
         "wpackagist-theme/twentyeleven": {
             "Rheme footer": "patches/themes/0165-twentyeleven-footer.patch"
         },
+	"wpackagist-theme/twentytwelve": {
+            "Theme footer": "patches/themes/0165-twentytwelve-footer.patch",
+            "Remove Google Fonts API": "patches/themes/twentytwelve-google-fonts.patch",
+	    "Remove resource hints": "patches/themes/0187-twentytwelve.patch"
+        },
         "wpackagist-theme/twentythirteen": {
             "Theme footer": "patches/themes/0165-twentythirteen-footer.patch",
             "Remove Google Fonts API": "patches/themes/twentythirteen-google-fonts.patch"
         },
-        "wpackagist-theme/twentytwelve": {
-            "Theme footer": "patches/themes/0165-twentytwelve-footer.patch",
-            "Remove Google Fonts API": "patches/themes/twentytwelve-google-fonts.patch"
-        }
+	"wpackagist-theme/twentyfourteen": {
+	    "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyfourteen.patch"
+	},        
+	"wpackagist-theme/twentyfifteen": {
+	    "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyfifteen.patch"
+	},
+	"wpackagist-theme/twentysixteen": {
+	    "Remove Google Fonts API and resource hints": "patches/themes/0187-twentysixteen.patch",
+	    "Footer": "patches/themes/0223-twentysixteen-footer.patch"
+	},
+	"wpackagist-theme/twentyseventeen": {
+	    "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyseventeen.patch",
+	    "Footer": "patches/themes/0223-twentyseventeen-footer.patch"
+	},
+	"wpackagist-theme/bliss": {
+	    "Remove Google Fonts API": "patches/themes/0189-removed-googleapis-fonts-from-bliss-theme.patch",
+	    "Change footer": "patches/themes/0223-bliss-footer.patch"
+	},
+	"wpackagist-theme/micro": {
+	    "Remove Google Fonts API": "patches/themes/0193-Removed-Google-Fonts-Apis-from-micro-theme.patch"
+	},
+	"wpackagist-theme/hybrid": {
+	    "Change footer": "patches/themes/0223-hybrid-footer.patch"	    
+	},
+	"wpackagist-theme/thematic": {
+	    "Change footer": "patches/themes/0223-thematic-footer.patch"	    
+	}	
+	
     }
 }
diff --git a/patches/themes/0165-remove-google-fonts.patch b/patches/themes/0165-remove-google-fonts.patch
deleted file mode 100644
index 94175e3d..00000000
--- a/patches/themes/0165-remove-google-fonts.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 264c582530c6036b9ed4425572d95af4f2263927 Mon Sep 17 00:00:00 2001
-From: lucha <lucha@paranoici.org>
-Date: Sun, 6 Jan 2013 20:39:55 +0100
-Subject: [PATCH 165/229] Remove Google API, google fonts, flash plugin
-
-diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
-index 99ef20f3..dd8cabf8 100644
---- a/wp-includes/script-loader.php
-+++ b/wp-includes/script-loader.php
-@@ -1660,8 +1661,9 @@ function wp_default_styles( $styles ) {
- 			$subsets .= ',vietnamese';
- 		}
- 
-+		// A/I removed google font
- 		// Hotlink Open Sans, for now.
--		$open_sans_font_url = "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=$subsets&display=fallback";
-+		$open_sans_font_url = "";
- 	}
- 
- 	// Register a stylesheet for the selected admin color scheme.
-@@ -1738,7 +1740,8 @@ function wp_default_styles( $styles ) {
- 	 */
- 	$font_family = _x( 'Noto Serif:400,400i,700,700i', 'Google Font Name and Variants' );
- 	if ( 'off' !== $font_family ) {
--		$fonts_url = 'https://fonts.googleapis.com/css?family=' . urlencode( $font_family );
-+		// A/I removed google font
-+		$fonts_url = '' . urlencode( $font_family );
- 	}
- 	$styles->add( 'wp-editor-font', $fonts_url );
- 
--- 
-2.17.1
-
diff --git a/patches/themes/0187-Patch-themes-twenty.patch b/patches/themes/0187-Patch-themes-twenty.patch
deleted file mode 100644
index 560f0076..00000000
--- a/patches/themes/0187-Patch-themes-twenty.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-From 1cc67ed85a27d517b27c03b5cba1823fe46a3392 Mon Sep 17 00:00:00 2001
-From: lucha <lucha@paranoici.org>
-Date: Sun, 23 Aug 2015 16:17:33 +0200
-Subject: [PATCH 187/229] Patch themes twenty*
-
-Patch theme twentyten, twentyeleven, twentytwelve, twentythirtheen,
-twentyfourteen, twentyfifteen, twentysixteen, twentyseventeen
-
-Added a/i credits, and removed Google Fonts API.
----
- wp-content/themes/twentyfifteen/footer.php    |  7 +-
- wp-content/themes/twentyfifteen/functions.php | 72 +++----------------
- wp-content/themes/twentyfourteen/footer.php   |  4 +-
- .../themes/twentyfourteen/functions.php       | 13 +---
- .../themes/twentyseventeen/functions.php      |  7 +-
- wp-content/themes/twentysixteen/functions.php |  3 +-
- wp-content/themes/twentyten/footer.php        |  6 +-
- .../themes/twentythirteen/functions.php       |  2 +
- wp-content/themes/twentytwelve/functions.php  |  2 +
- 9 files changed, 30 insertions(+), 86 deletions(-)
-
-diff --git a/wp-content/themes/twentyfifteen/footer.php b/wp-content/themes/twentyfifteen/footer.php
-index 6447da0e..2097c9fd 100644
---- a/wp-content/themes/twentyfifteen/footer.php
-+++ b/wp-content/themes/twentyfifteen/footer.php
-@@ -22,14 +22,13 @@
- 				 */
- 				do_action( 'twentyfifteen_credits' );
- 			?>
--			<?php
-+
-+<?php
- 			if ( function_exists( 'the_privacy_policy_link' ) ) {
- 				the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
- 			}
- 			?>
--			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfifteen' ) ); ?>" class="imprint">
--				<?php printf( __( 'Proudly powered by %s', 'twentyfifteen' ), 'WordPress' ); ?>
--			</a>
-+        <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
- 		</div><!-- .site-info -->
- 	</footer><!-- .site-footer -->
- 
-diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
-index db6451f0..9e5f50fd 100644
---- a/wp-content/themes/twentyfifteen/functions.php
-+++ b/wp-content/themes/twentyfifteen/functions.php
-@@ -276,67 +276,15 @@ function twentyfifteen_widgets_init() {
- add_action( 'widgets_init', 'twentyfifteen_widgets_init' );
- 
- if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
--	/**
--	 * Register Google fonts for Twenty Fifteen.
--	 *
--	 * @since Twenty Fifteen 1.0
--	 *
--	 * @return string Google fonts URL for the theme.
--	 */
--	function twentyfifteen_fonts_url() {
--		$fonts_url = '';
--		$fonts     = array();
--		$subsets   = 'latin,latin-ext';
--
--		/*
--		 * Translators: If there are characters in your language that are not supported
--		 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
--		 */
--		if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
--			$fonts[] = 'Noto Sans:400italic,700italic,400,700';
--		}
--
--		/*
--		 * Translators: If there are characters in your language that are not supported
--		 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
--		 */
--		if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
--			$fonts[] = 'Noto Serif:400italic,700italic,400,700';
--		}
--
--		/*
--		 * Translators: If there are characters in your language that are not supported
--		 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
--		 */
--		if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
--			$fonts[] = 'Inconsolata:400,700';
--		}
--
--		/*
--		 * Translators: To add an additional character subset specific to your language,
--		 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
--		 */
--		$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
--
--		if ( 'cyrillic' == $subset ) {
--			$subsets .= ',cyrillic,cyrillic-ext';
--		} elseif ( 'greek' == $subset ) {
--			$subsets .= ',greek,greek-ext';
--		} elseif ( 'devanagari' == $subset ) {
--			$subsets .= ',devanagari';
--		} elseif ( 'vietnamese' == $subset ) {
--			$subsets .= ',vietnamese';
--		}
--
--		if ( $fonts ) {
--			$fonts_url = add_query_arg(
--				array(
--					'family' => urlencode( implode( '|', $fonts ) ),
--					'subset' => urlencode( $subsets ),
--				),
--				'https://fonts.googleapis.com/css'
--			);
--		}
-+/**
-+ * Register Google fonts for Twenty Fifteen.
-+ *
-+ * @since Twenty Fifteen 1.0
-+ *
-+ * @return string Google fonts URL for the theme.
-+ */
-+function twentyfifteen_fonts_url() {
-+	$fonts_url = '';
- 
- 		return $fonts_url;
- 	}
-@@ -425,6 +373,7 @@ add_action( 'enqueue_block_editor_assets', 'twentyfifteen_block_editor_styles' )
-  * @param string  $relation_type The relation type the URLs are printed.
-  * @return array URLs to print for resource hints.
-  */
-+/*
- function twentyfifteen_resource_hints( $urls, $relation_type ) {
- 	if ( wp_style_is( 'twentyfifteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
- 		if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
-@@ -440,6 +389,7 @@ function twentyfifteen_resource_hints( $urls, $relation_type ) {
- 	return $urls;
- }
- add_filter( 'wp_resource_hints', 'twentyfifteen_resource_hints', 10, 2 );
-+*/
- 
- /**
-  * Add featured image as background image to post navigation elements.
-diff --git a/wp-content/themes/twentyfourteen/footer.php b/wp-content/themes/twentyfourteen/footer.php
-index d1016eb9..51bd4833 100644
---- a/wp-content/themes/twentyfourteen/footer.php
-+++ b/wp-content/themes/twentyfourteen/footer.php
-@@ -23,9 +23,7 @@
- 					the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
- 				}
- 				?>
--				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfourteen' ) ); ?>" class="imprint">
--					<?php printf( __( 'Proudly powered by %s', 'twentyfourteen' ), 'WordPress' ); ?>
--				</a>
-+                <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
- 			</div><!-- .site-info -->
- 		</footer><!-- #colophon -->
- 	</div><!-- #page -->
-diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php
-index c017dac6..ec71dff8 100644
---- a/wp-content/themes/twentyfourteen/functions.php
-+++ b/wp-content/themes/twentyfourteen/functions.php
-@@ -288,17 +288,6 @@ add_action( 'widgets_init', 'twentyfourteen_widgets_init' );
-  */
- function twentyfourteen_font_url() {
- 	$font_url = '';
--	/*
--	 * Translators: If there are characters in your language that are not supported
--	 * by Lato, translate this to 'off'. Do not translate into your own language.
--	 */
--	if ( 'off' !== _x( 'on', 'Lato font: on or off', 'twentyfourteen' ) ) {
--		$query_args = array(
--			'family' => urlencode( 'Lato:300,400,700,900,300italic,400italic,700italic' ),
--			'subset' => urlencode( 'latin,latin-ext' ),
--		);
--		$font_url   = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
--	}
- 
- 	return $font_url;
- }
-@@ -372,6 +361,7 @@ add_action( 'admin_print_scripts-appearance_page_custom-header', 'twentyfourteen
-  * @param string  $relation_type The relation type the URLs are printed.
-  * @return array URLs to print for resource hints.
-  */
-+/*
- function twentyfourteen_resource_hints( $urls, $relation_type ) {
- 	if ( wp_style_is( 'twentyfourteen-lato', 'queue' ) && 'preconnect' === $relation_type ) {
- 		if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
-@@ -387,6 +377,7 @@ function twentyfourteen_resource_hints( $urls, $relation_type ) {
- 	return $urls;
- }
- add_filter( 'wp_resource_hints', 'twentyfourteen_resource_hints', 10, 2 );
-+*/
- 
- /**
-  * Enqueue styles for the block-based editor.
-diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php
-index 1ef1b570..952da193 100644
---- a/wp-content/themes/twentyseventeen/functions.php
-+++ b/wp-content/themes/twentyseventeen/functions.php
-@@ -299,8 +299,8 @@ function twentyseventeen_fonts_url() {
- 			'subset'  => urlencode( 'latin,latin-ext' ),
- 			'display' => urlencode( 'fallback' ),
- 		);
--
--		$fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-+		// A/I removed google fonts
-+		$fonts_url = add_query_arg( $query_args, '' );
- 	}
- 
- 	return esc_url_raw( $fonts_url );
-@@ -318,7 +318,8 @@ function twentyseventeen_fonts_url() {
- function twentyseventeen_resource_hints( $urls, $relation_type ) {
- 	if ( wp_style_is( 'twentyseventeen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
- 		$urls[] = array(
--			'href' => 'https://fonts.gstatic.com',
-+			// A/I removed google Fonts
-+			'href' => '',
- 			'crossorigin',
- 		);
- 	}
-diff --git a/wp-content/themes/twentysixteen/functions.php b/wp-content/themes/twentysixteen/functions.php
-index c180b826..b63354eb 100644
---- a/wp-content/themes/twentysixteen/functions.php
-+++ b/wp-content/themes/twentysixteen/functions.php
-@@ -346,7 +346,8 @@ if ( ! function_exists( 'twentysixteen_fonts_url' ) ) :
- 					'subset'  => urlencode( $subsets ),
- 					'display' => urlencode( 'fallback' ),
- 				),
--				'https://fonts.googleapis.com/css'
-+				// A/I removed google fonts
-+				''
- 			);
- 		}
- 
-diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php
-index 4763e99a..3752b700 100644
---- a/wp-content/themes/twentyten/footer.php
-+++ b/wp-content/themes/twentyten/footer.php
-@@ -43,9 +43,9 @@
- 				 */
- 				do_action( 'twentyten_credits' );
- 				?>
--				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyten' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>">
--					<?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?>
--				</a>
-+
-+    		   <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
-+
- 			</div><!-- #site-generator -->
- 
- 		</div><!-- #colophon -->
-diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
-index bdda0c64..fb584016 100644
---- a/wp-content/themes/twentytwelve/functions.php
-+++ b/wp-content/themes/twentytwelve/functions.php
-@@ -208,6 +208,7 @@ add_action( 'enqueue_block_editor_assets', 'twentytwelve_block_editor_styles' );
-  * @param string  $relation_type The relation type the URLs are printed.
-  * @return array URLs to print for resource hints.
-  */
-+/*
- function twentytwelve_resource_hints( $urls, $relation_type ) {
- 	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
- 		if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
-@@ -223,6 +224,7 @@ function twentytwelve_resource_hints( $urls, $relation_type ) {
- 	return $urls;
- }
- add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
-+*/
- 
- /**
-  * Filter TinyMCE CSS path to include Google Fonts.
--- 
-2.17.1
-
diff --git a/patches/themes/0187-twentyfifteen.patch b/patches/themes/0187-twentyfifteen.patch
new file mode 100644
index 00000000..9e332842
--- /dev/null
+++ b/patches/themes/0187-twentyfifteen.patch
@@ -0,0 +1,119 @@
+diff --git a/wp-content/themes/twentyfifteen/footer.php b/wp-content/themes/twentyfifteen/footer.php
+index 6447da0e..2097c9fd 100644
+--- a/wp-content/themes/twentyfifteen/footer.php
++++ b/wp-content/themes/twentyfifteen/footer.php
+@@ -22,14 +22,13 @@
+ 				 */
+ 				do_action( 'twentyfifteen_credits' );
+ 			?>
+-			<?php
++
++<?php
+ 			if ( function_exists( 'the_privacy_policy_link' ) ) {
+ 				the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+ 			}
+ 			?>
+-			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfifteen' ) ); ?>" class="imprint">
+-				<?php printf( __( 'Proudly powered by %s', 'twentyfifteen' ), 'WordPress' ); ?>
+-			</a>
++        <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
+ 		</div><!-- .site-info -->
+ 	</footer><!-- .site-footer -->
+ 
+diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
+index db6451f0..9e5f50fd 100644
+--- a/wp-content/themes/twentyfifteen/functions.php
++++ b/wp-content/themes/twentyfifteen/functions.php
+@@ -276,67 +276,15 @@ function twentyfifteen_widgets_init() {
+ add_action( 'widgets_init', 'twentyfifteen_widgets_init' );
+ 
+ if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
+-	/**
+-	 * Register Google fonts for Twenty Fifteen.
+-	 *
+-	 * @since Twenty Fifteen 1.0
+-	 *
+-	 * @return string Google fonts URL for the theme.
+-	 */
+-	function twentyfifteen_fonts_url() {
+-		$fonts_url = '';
+-		$fonts     = array();
+-		$subsets   = 'latin,latin-ext';
+-
+-		/*
+-		 * Translators: If there are characters in your language that are not supported
+-		 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
+-		 */
+-		if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
+-			$fonts[] = 'Noto Sans:400italic,700italic,400,700';
+-		}
+-
+-		/*
+-		 * Translators: If there are characters in your language that are not supported
+-		 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
+-		 */
+-		if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
+-			$fonts[] = 'Noto Serif:400italic,700italic,400,700';
+-		}
+-
+-		/*
+-		 * Translators: If there are characters in your language that are not supported
+-		 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
+-		 */
+-		if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
+-			$fonts[] = 'Inconsolata:400,700';
+-		}
+-
+-		/*
+-		 * Translators: To add an additional character subset specific to your language,
+-		 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
+-		 */
+-		$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
+-
+-		if ( 'cyrillic' == $subset ) {
+-			$subsets .= ',cyrillic,cyrillic-ext';
+-		} elseif ( 'greek' == $subset ) {
+-			$subsets .= ',greek,greek-ext';
+-		} elseif ( 'devanagari' == $subset ) {
+-			$subsets .= ',devanagari';
+-		} elseif ( 'vietnamese' == $subset ) {
+-			$subsets .= ',vietnamese';
+-		}
+-
+-		if ( $fonts ) {
+-			$fonts_url = add_query_arg(
+-				array(
+-					'family' => urlencode( implode( '|', $fonts ) ),
+-					'subset' => urlencode( $subsets ),
+-				),
+-				'https://fonts.googleapis.com/css'
+-			);
+-		}
++/**
++ * Register Google fonts for Twenty Fifteen.
++ *
++ * @since Twenty Fifteen 1.0
++ *
++ * @return string Google fonts URL for the theme.
++ */
++function twentyfifteen_fonts_url() {
++	$fonts_url = '';
+ 
+ 		return $fonts_url;
+ 	}
+@@ -425,6 +373,7 @@ add_action( 'enqueue_block_editor_assets', 'twentyfifteen_block_editor_styles' )
+  * @param string  $relation_type The relation type the URLs are printed.
+  * @return array URLs to print for resource hints.
+  */
++/*
+ function twentyfifteen_resource_hints( $urls, $relation_type ) {
+ 	if ( wp_style_is( 'twentyfifteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+ 		if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
+@@ -440,6 +389,7 @@ function twentyfifteen_resource_hints( $urls, $relation_type ) {
+ 	return $urls;
+ }
+ add_filter( 'wp_resource_hints', 'twentyfifteen_resource_hints', 10, 2 );
++*/
+ 
+ /**
+  * Add featured image as background image to post navigation elements.
diff --git a/patches/themes/0187-twentyfourteen.patch b/patches/themes/0187-twentyfourteen.patch
new file mode 100644
index 00000000..bfb00bab
--- /dev/null
+++ b/patches/themes/0187-twentyfourteen.patch
@@ -0,0 +1,53 @@
+diff --git a/wp-content/themes/twentyfourteen/footer.php b/wp-content/themes/twentyfourteen/footer.php
+index d1016eb9..51bd4833 100644
+--- a/wp-content/themes/twentyfourteen/footer.php
++++ b/wp-content/themes/twentyfourteen/footer.php
+@@ -23,9 +23,7 @@
+ 					the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+ 				}
+ 				?>
+-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfourteen' ) ); ?>" class="imprint">
+-					<?php printf( __( 'Proudly powered by %s', 'twentyfourteen' ), 'WordPress' ); ?>
+-				</a>
++                <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
+ 			</div><!-- .site-info -->
+ 		</footer><!-- #colophon -->
+ 	</div><!-- #page -->
+diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php
+index c017dac6..ec71dff8 100644
+--- a/wp-content/themes/twentyfourteen/functions.php
++++ b/wp-content/themes/twentyfourteen/functions.php
+@@ -288,17 +288,6 @@ add_action( 'widgets_init', 'twentyfourteen_widgets_init' );
+  */
+ function twentyfourteen_font_url() {
+ 	$font_url = '';
+-	/*
+-	 * Translators: If there are characters in your language that are not supported
+-	 * by Lato, translate this to 'off'. Do not translate into your own language.
+-	 */
+-	if ( 'off' !== _x( 'on', 'Lato font: on or off', 'twentyfourteen' ) ) {
+-		$query_args = array(
+-			'family' => urlencode( 'Lato:300,400,700,900,300italic,400italic,700italic' ),
+-			'subset' => urlencode( 'latin,latin-ext' ),
+-		);
+-		$font_url   = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+-	}
+ 
+ 	return $font_url;
+ }
+@@ -372,6 +361,7 @@ add_action( 'admin_print_scripts-appearance_page_custom-header', 'twentyfourteen
+  * @param string  $relation_type The relation type the URLs are printed.
+  * @return array URLs to print for resource hints.
+  */
++/*
+ function twentyfourteen_resource_hints( $urls, $relation_type ) {
+ 	if ( wp_style_is( 'twentyfourteen-lato', 'queue' ) && 'preconnect' === $relation_type ) {
+ 		if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
+@@ -387,6 +377,7 @@ function twentyfourteen_resource_hints( $urls, $relation_type ) {
+ 	return $urls;
+ }
+ add_filter( 'wp_resource_hints', 'twentyfourteen_resource_hints', 10, 2 );
++*/
+ 
+ /**
+  * Enqueue styles for the block-based editor.
diff --git a/patches/themes/0187-twentyseventeen.patch b/patches/themes/0187-twentyseventeen.patch
new file mode 100644
index 00000000..92b281d5
--- /dev/null
+++ b/patches/themes/0187-twentyseventeen.patch
@@ -0,0 +1,25 @@
+diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php
+index 1ef1b570..952da193 100644
+--- a/wp-content/themes/twentyseventeen/functions.php
++++ b/wp-content/themes/twentyseventeen/functions.php
+@@ -299,8 +299,8 @@ function twentyseventeen_fonts_url() {
+ 			'subset'  => urlencode( 'latin,latin-ext' ),
+ 			'display' => urlencode( 'fallback' ),
+ 		);
+-
+-		$fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
++		// A/I removed google fonts
++		$fonts_url = add_query_arg( $query_args, '' );
+ 	}
+ 
+ 	return esc_url_raw( $fonts_url );
+@@ -318,7 +318,8 @@ function twentyseventeen_fonts_url() {
+ function twentyseventeen_resource_hints( $urls, $relation_type ) {
+ 	if ( wp_style_is( 'twentyseventeen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+ 		$urls[] = array(
+-			'href' => 'https://fonts.gstatic.com',
++			// A/I removed google Fonts
++			'href' => '',
+ 			'crossorigin',
+ 		);
+ 	}
diff --git a/patches/themes/0187-twentysixteen.patch b/patches/themes/0187-twentysixteen.patch
new file mode 100644
index 00000000..29b11136
--- /dev/null
+++ b/patches/themes/0187-twentysixteen.patch
@@ -0,0 +1,14 @@
+diff --git a/wp-content/themes/twentysixteen/functions.php b/wp-content/themes/twentysixteen/functions.php
+index c180b826..b63354eb 100644
+--- a/wp-content/themes/twentysixteen/functions.php
++++ b/wp-content/themes/twentysixteen/functions.php
+@@ -346,7 +346,8 @@ if ( ! function_exists( 'twentysixteen_fonts_url' ) ) :
+ 					'subset'  => urlencode( $subsets ),
+ 					'display' => urlencode( 'fallback' ),
+ 				),
+-				'https://fonts.googleapis.com/css'
++				// A/I removed google fonts
++				''
+ 			);
+ 		}
+ 
diff --git a/patches/themes/0187-twentyten.patch b/patches/themes/0187-twentyten.patch
new file mode 100644
index 00000000..e1d98ad6
--- /dev/null
+++ b/patches/themes/0187-twentyten.patch
@@ -0,0 +1,17 @@
+diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php
+index 4763e99a..3752b700 100644
+--- a/wp-content/themes/twentyten/footer.php
++++ b/wp-content/themes/twentyten/footer.php
+@@ -43,9 +43,9 @@
+ 				 */
+ 				do_action( 'twentyten_credits' );
+ 				?>
+-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyten' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>">
+-					<?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?>
+-				</a>
++
++    		   <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
++
+ 			</div><!-- #site-generator -->
+ 
+ 		</div><!-- #colophon -->
diff --git a/patches/themes/0187-twentytwelve.patch b/patches/themes/0187-twentytwelve.patch
new file mode 100644
index 00000000..0775582a
--- /dev/null
+++ b/patches/themes/0187-twentytwelve.patch
@@ -0,0 +1,20 @@
+diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
+index bdda0c64..fb584016 100644
+--- a/wp-content/themes/twentytwelve/functions.php
++++ b/wp-content/themes/twentytwelve/functions.php
+@@ -208,6 +208,7 @@ add_action( 'enqueue_block_editor_assets', 'twentytwelve_block_editor_styles' );
+  * @param string  $relation_type The relation type the URLs are printed.
+  * @return array URLs to print for resource hints.
+  */
++/*
+ function twentytwelve_resource_hints( $urls, $relation_type ) {
+ 	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+ 		if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
+@@ -223,6 +224,7 @@ function twentytwelve_resource_hints( $urls, $relation_type ) {
+ 	return $urls;
+ }
+ add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
++*/
+ 
+ /**
+  * Filter TinyMCE CSS path to include Google Fonts.
-- 
GitLab