From 7be0ab5f136aed00b0f2d8cb1994a8e5652ede55 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 26 Aug 2023 18:22:49 +0100
Subject: [PATCH] Get the fixed minimalism theme from themes-misc
---
composer.json | 3 +--
composer.lock | 28 +++++---------------------
composer.patches.json | 3 ---
patches/themes/themes-minimalism.patch | 14 -------------
4 files changed, 6 insertions(+), 42 deletions(-)
delete mode 100644 patches/themes/themes-minimalism.patch
diff --git a/composer.json b/composer.json
index fcb99260..c184f3ae 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,6 @@
"wpackagist-theme/gone-fishing": "2.0",
"wpackagist-theme/launchpad": "1.6",
"wpackagist-theme/micro": "1.5.4",
- "wpackagist-theme/minimalism": "1.0.3",
"wpackagist-theme/mnml": "1.3",
"wpackagist-theme/ocular-professor": "1.3.1",
"wpackagist-theme/rusty-grunge": "1.3",
@@ -108,7 +107,7 @@
"wpackagist-plugin/katex": "2.2.3",
"noblogs/eu-compliance": "0.1.0",
"noblogs/nospam": "0.2.3",
- "noblogs/themes-misc": "0.1.18",
+ "noblogs/themes-misc": "0.1.19",
"stuttter/ludicrousdb": "5.0.0",
"wpackagist-plugin/creative-commons": "^2021.04",
"wpackagist-plugin/disable-remove-google-fonts": "1.5.5",
diff --git a/composer.lock b/composer.lock
index 1b2b2ca5..dfb63f85 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": "cfc5b8f10bdddff14dae4075d9cf4ebe",
+ "content-hash": "94a6db2bb68ed1554cae6c73478397b0",
"packages": [
{
"name": "bjornjohansen/wplang",
@@ -684,16 +684,16 @@
},
{
"name": "noblogs/themes-misc",
- "version": "0.1.18",
+ "version": "0.1.19",
"source": {
"type": "git",
"url": "https://git.autistici.org/noblogs/themes-misc.git",
- "reference": "26168154078ac2fda242d053dfee21cc33536828"
+ "reference": "bd5e7ef378d22f8edaecbad26bb839879a18dc1e"
},
"dist": {
"type": "zip",
- "url": "https://git.autistici.org/api/v4/projects/487/packages/composer/archives/noblogs/themes-misc.zip?sha=26168154078ac2fda242d053dfee21cc33536828",
- "reference": "26168154078ac2fda242d053dfee21cc33536828",
+ "url": "https://git.autistici.org/api/v4/projects/487/packages/composer/archives/noblogs/themes-misc.zip?sha=bd5e7ef378d22f8edaecbad26bb839879a18dc1e",
+ "reference": "bd5e7ef378d22f8edaecbad26bb839879a18dc1e",
"shasum": ""
},
"type": "project",
@@ -1754,24 +1754,6 @@
"type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/micro/"
},
- {
- "name": "wpackagist-theme/minimalism",
- "version": "1.0.3",
- "source": {
- "type": "svn",
- "url": "https://themes.svn.wordpress.org/minimalism/",
- "reference": "1.0.3"
- },
- "dist": {
- "type": "zip",
- "url": "https://downloads.wordpress.org/theme/minimalism.1.0.3.zip"
- },
- "require": {
- "composer/installers": "^1.0 || ^2.0"
- },
- "type": "wordpress-theme",
- "homepage": "https://wordpress.org/themes/minimalism/"
- },
{
"name": "wpackagist-theme/mnml",
"version": "1.3",
diff --git a/composer.patches.json b/composer.patches.json
index 091c12cf..44c154cf 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -55,9 +55,6 @@
"wpackagist-theme/inove": {
"Theme footer": "patches/themes/0071-Patch-theme-inove.patch"
},
- "wpackagist-theme/minimalism": {
- "Theme footer": "patches/themes/themes-minimalism.patch"
- },
"wpackagist-theme/mnml": {
"Theme footer": "patches/themes/0073-Patch-theme-mnml.patch"
},
diff --git a/patches/themes/themes-minimalism.patch b/patches/themes/themes-minimalism.patch
deleted file mode 100644
index 051f4356..00000000
--- a/patches/themes/themes-minimalism.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/footer.php b/footer.php
-index a7f191a7..24ea872d 100644
---- a/footer.php
-+++ b/footer.php
-@@ -4,7 +4,7 @@
- <!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
- <p>
- <?php printf(__('%1$s powered by %2$s', 'minimalism'), get_bloginfo('name'),
-- '<a href="http://wordpress.org/">WordPress</a>'); ?> | <a href="http://www.genaehr.com/minimalism/">minimalism</a> by <a href="http://www.genaehr.com/">www.genaehr.com</a>
-+ '<a href="http://autistici.org/">R*</a>'); ?> | <a href="http://www.genaehr.com/minimalism/">minimalism</a> by <a href="http://www.genaehr.com/">www.genaehr.com</a>
- <br /><?php printf(__('%1$s and %2$s.', 'minimalism'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)', 'minimalism') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)', 'minimalism') . '</a>'); ?>
- <!-- <?php printf(__('%d queries. %s seconds.', 'minimalism'), get_num_queries(), timer_stop(0, 3)); ?> -->
- </p>
-
--
GitLab