From 0899e8b68e328d939538eb5728a280ca70c2bf7c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 May 2026 07:26:33 +0200 Subject: [PATCH] v7.0 --- sources | 2 +- ...h => wordpress-7.0-remove-jshint-refs.patch | 18 +++++++++--------- wordpress.spec | 11 +++++++---- 3 files changed, 17 insertions(+), 14 deletions(-) rename wordpress-5.1-remove-jshint-refs.patch => wordpress-7.0-remove-jshint-refs.patch (50%) diff --git a/sources b/sources index ca97e85..1e44dd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.9.4.tar.gz) = 3065a037dae9450459c475ab85030f0ef0517942d681afe364afbdfd010587d2cb0bb3a520e03ac0492fa6c3d6e904c0da67b8b0b5f1fbd5adf40b5ba29d4362 +SHA512 (wordpress-7.0.tar.gz) = 61cdf1d0bb918f92f8370dd6f050b3f56ac0ab90a519a994314ff9771c00e2abf73c13e41fe7409e8acfc430055862ac18f117ab36b31a77031fab7fb63d9461 diff --git a/wordpress-5.1-remove-jshint-refs.patch b/wordpress-7.0-remove-jshint-refs.patch similarity index 50% rename from wordpress-5.1-remove-jshint-refs.patch rename to wordpress-7.0-remove-jshint-refs.patch index fff7368..a96ced6 100644 --- a/wordpress-5.1-remove-jshint-refs.patch +++ b/wordpress-7.0-remove-jshint-refs.patch @@ -1,11 +1,11 @@ -diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php ---- wordpress/wp-includes/script-loader.php.orig 2019-02-22 10:52:01.902006889 +0100 -+++ wordpress/wp-includes/script-loader.php 2019-02-22 10:52:04.560023086 +0100 -@@ -1251,7 +1251,6 @@ function wp_default_scripts( &$scripts ) - $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' ); +diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/script-loader.php +--- wordpress/wp-includes/script-loader.php.old 2026-05-26 07:16:50.150861636 +0200 ++++ wordpress/wp-includes/script-loader.php 2026-05-26 07:16:52.778780477 +0200 +@@ -1202,7 +1202,6 @@ function wp_default_scripts( $scripts ) + $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.65.20' ); $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); - $scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.0' ); -- $scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); - $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); - $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); + $scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.1' ); // Deprecated. +- $scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); // Deprecated. + $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.3' ); + $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '1.8.0' ); $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress.spec b/wordpress.spec index fa21e8a..910ae4a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.9.4 +%global upstream_version 7.0 #global upstream_prever RC5 #global upstream_lower rc5 @@ -49,7 +49,7 @@ Patch5: wordpress-5.4-config.patch # ignore WP_AUTO_UPDATE_CORE (always false) Patch6: wordpress-5.8-noupdate.patch # Debian patch for jshint -Patch8: wordpress-5.1-remove-jshint-refs.patch +Patch8: wordpress-7.0-remove-jshint-refs.patch BuildArch: noarch @@ -94,9 +94,9 @@ Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php Provides: bundled(php-simplepie) = 1.9.0 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php -Provides: bundled(php-getid3) = 1.9.24 +Provides: bundled(php-getid3) = 1.9.25 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 7.0.0 +Provides: bundled(php-phpmailer) = 7.0.2 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -245,6 +245,9 @@ end %changelog +* Tue May 26 2026 Remi Collet -7.0-1 +- WordPress 7.0 “Armstrong” + * Thu Mar 12 2026 Remi Collet - 6.9.4-1 - WordPress 6.9.4 Release