From 5caacd26b81269ce0645b3ca19714ffdb64a4bb6 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Mon, 28 Aug 2023 13:30:27 +0100
Subject: [PATCH] Upgrade noblogs/themes-misc to 0.1.25
---
composer.json | 3 +-
composer.lock | 28 ++++---------------
composer.patches.json | 3 --
.../0057-Patch-theme-carrington-blog.patch | 18 ------------
4 files changed, 6 insertions(+), 46 deletions(-)
delete mode 100644 patches/themes/0057-Patch-theme-carrington-blog.patch
diff --git a/composer.json b/composer.json
index b2cdf1e5..bb38c95e 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,6 @@
"wpackagist-plugin/wp-syntax": "1.1",
"wpackagist-theme/azul": "1.51",
"wpackagist-theme/bliss": "1.2.0",
- "wpackagist-theme/carrington-blog": "2.3.1",
"wpackagist-theme/classic": "1.6",
"wpackagist-theme/fresh-editorial": "2.1",
"wpackagist-theme/gone-fishing": "2.0",
@@ -104,7 +103,7 @@
"wpackagist-plugin/katex": "2.2.3",
"noblogs/eu-compliance": "0.1.0",
"noblogs/nospam": "0.2.3",
- "noblogs/themes-misc": "0.1.24",
+ "noblogs/themes-misc": "0.1.25",
"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 0aef7649..7b21ac32 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": "98b9a080198399386fdf61c1458928cc",
+ "content-hash": "fa0f98dc25c77c81ac045d8dab9259c7",
"packages": [
{
"name": "bjornjohansen/wplang",
@@ -684,16 +684,16 @@
},
{
"name": "noblogs/themes-misc",
- "version": "0.1.24",
+ "version": "0.1.25",
"source": {
"type": "git",
"url": "https://git.autistici.org/noblogs/themes-misc.git",
- "reference": "05093a70da6f2469dce8dbc5118a93905d8e60e4"
+ "reference": "97790c944817e689f0891df03c76ec6816d37c0d"
},
"dist": {
"type": "zip",
- "url": "https://git.autistici.org/api/v4/projects/487/packages/composer/archives/noblogs/themes-misc.zip?sha=05093a70da6f2469dce8dbc5118a93905d8e60e4",
- "reference": "05093a70da6f2469dce8dbc5118a93905d8e60e4",
+ "url": "https://git.autistici.org/api/v4/projects/487/packages/composer/archives/noblogs/themes-misc.zip?sha=97790c944817e689f0891df03c76ec6816d37c0d",
+ "reference": "97790c944817e689f0891df03c76ec6816d37c0d",
"shasum": ""
},
"type": "project",
@@ -1538,24 +1538,6 @@
"type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/bliss/"
},
- {
- "name": "wpackagist-theme/carrington-blog",
- "version": "2.3.1",
- "source": {
- "type": "svn",
- "url": "https://themes.svn.wordpress.org/carrington-blog/",
- "reference": "2.3.1"
- },
- "dist": {
- "type": "zip",
- "url": "https://downloads.wordpress.org/theme/carrington-blog.2.3.1.zip"
- },
- "require": {
- "composer/installers": "^1.0 || ^2.0"
- },
- "type": "wordpress-theme",
- "homepage": "https://wordpress.org/themes/carrington-blog/"
- },
{
"name": "wpackagist-theme/classic",
"version": "1.6",
diff --git a/composer.patches.json b/composer.patches.json
index 965b5b16..f554e2ae 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -31,9 +31,6 @@
"wpackagist-theme/azul": {
"Teme footer": "patches/themes/0056-Patch-theme-azul.patch"
},
- "wpackagist-theme/carrington-blog": {
- "Theme footer": "patches/themes/0057-Patch-theme-carrington-blog.patch"
- },
"wpackagist-theme/classic": {
"Theme footer": "patches/themes/0058-Patch-theme-classic.patch"
},
diff --git a/patches/themes/0057-Patch-theme-carrington-blog.patch b/patches/themes/0057-Patch-theme-carrington-blog.patch
deleted file mode 100644
index 2969b76b..00000000
--- a/patches/themes/0057-Patch-theme-carrington-blog.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/wp-content/themes/carrington-blog/footer/footer-default.php b/wp-content/themes/carrington-blog/footer/footer-default.php
-index 6e9686242..15a89b622 100644
---- a/wp-content/themes/carrington-blog/footer/footer-default.php
-+++ b/wp-content/themes/carrington-blog/footer/footer-default.php
-@@ -25,11 +25,11 @@ if (CFCT_DEBUG) { cfct_banner(__FILE__); }
- <hr class="lofi" />
- <div id="footer" class="section">
- <div class="wrapper">
-- <p id="generator-link"><?php _e('Proudly powered by <a href="http://wordpress.org/" rel="generator">WordPress</a> and <a href="http://carringtontheme.com" title="Carrington theme for WordPress">Carrington</a>.', 'carrington-blog'); ?></p>
-+ <p id="generator-link"><?php _e('Proudly powered by <a href="http://autistici.org/" rel="generator">R*</a>'); ?></p>
- <?php
- if (cfct_get_option('cfct_credit') == 'yes') {
- ?>
-- <p id="developer-link"><?php printf(__('<a href="http://crowdfavorite.com" title="Custom WordPress development, design and backup services." rel="developer designer">%s</a>', 'carrington-blog'), 'Carrington Theme by Crowd Favorite'); ?></p>
-+
- <?php
- }
- ?>
--
GitLab