Author: bdubbs
Date: Fri Jan 22 13:28:42 2021
New Revision: 24128
Log:
Fixes for gnome renumbering scheme.
There are several hardcoded areas, but should be automatically skipped when
stable releases of th enext gnome version start to be released.
Modified:
trunk/scripts/blfs-chapter25.php
trunk/scripts/blfs-chapter35.php
trunk/scripts/blfs-chapter36.php
trunk/scripts/blfs-include.php
Modified: trunk/scripts/blfs-chapter25.php
==============================================================================
--- trunk/scripts/blfs-chapter25.php Fri Jan 22 05:30:47 2021 (r24127)
+++ trunk/scripts/blfs-chapter25.php Fri Jan 22 13:28:42 2021 (r24128)
@@ -17,6 +17,7 @@
$renames[ 'gtksourceview1' ] = 'gtksourceview4';
$renames[ 'qt-everywhere-opensource-src' ] = 'qt5';
$renames[ 'qt-everywhere-opensource' ] = 'qt5';
+$renames[ 'qt-everywhere-src' ] = 'qt5';
$renames[ 'qtwebengine-everywhere-src' ] = 'qtwebengine';
$renames[ 'qtwebkit-opensource-src' ] = 'qtwebkit';
$renames[ 'keybinder1' ] = 'keybinder3';
@@ -25,6 +26,7 @@
$ignores[ 'gdk-pixbuf-xlib' ] = "";
//$current="graphene"; // For debugging
+//$current="qt-everywhere-src";
$regex = array();
Modified: trunk/scripts/blfs-chapter35.php
==============================================================================
--- trunk/scripts/blfs-chapter35.php Fri Jan 22 05:30:47 2021 (r24127)
+++ trunk/scripts/blfs-chapter35.php Fri Jan 22 13:28:42 2021 (r24128)
@@ -19,6 +19,7 @@
$kde_ver = "";
//$current="telepathy-glib"; // For debugging
+//$current="tracker-miners1"; // For debugging
$regex = array();
//$regex[ 'libzeitgeist' ] = "/^.*Latest version is (\d[\d\.]+\d).*$/";
@@ -206,8 +207,29 @@
if ( $package == 'tracker1' ) $package = 'tracker';
if ( $package == 'tracker-miners1' ) $package = 'tracker-miners';
-
+
$max = find_max( $lines, "/$package/", "/^.*$package-([\d\.]*\d)\.tar.*$/",
TRUE );
+
+ if ( $max == 0 && preg_match( "/tracker/", $dirpath ) )
+ {
+ $lines = backup_dir( $dirpath, 3, 0.1 );
+ return find_max( $lines, "/$package/",
"/^.*$package-([\d\.]*\d)\.tar.*$/", TRUE );
+ }
+
+
+ // Hardcode this for now
+ if ( $max == 0 && preg_match( "/40\//", $dirpath ) )
+ {
+ if ( $package == 'libgweather' )
+ $dir = "3.36";
+ else
+ $dir = "3.38";
+
+ $dirpath = preg_replace( "/40/", "/$dir/", $dirpath );
+ $lines = http_get_file( "$dirpath" );
+ $max = find_max( $lines, "/$package/",
"/^.*$package-([\d\.]*\d)\.tar.*$/", FALSE );
+ }
+
return $max;
}
Modified: trunk/scripts/blfs-chapter36.php
==============================================================================
--- trunk/scripts/blfs-chapter36.php Fri Jan 22 05:30:47 2021 (r24127)
+++ trunk/scripts/blfs-chapter36.php Fri Jan 22 13:28:42 2021 (r24128)
@@ -106,6 +106,19 @@
// Most packages are in the form $package-n.n.n
// Occasionally there are dashes (e.g. 201-1)
$max = find_max( $lines, "/$package/", "/^.*$package-([\d\.]*\d)\.tar.*$/" );
+
+ // Hardcode this for now
+ if ( $max == 0 && preg_match( "/40\//", $dirpath ) )
+ {
+ if ( $package == 'gnome-weather' )
+ $dir = "3.36";
+ else
+ $dir = "3.38";
+
+ $dirpath = preg_replace( "/40/", "/$dir/", $dirpath );
+ $lines = http_get_file( "$dirpath" );
+ $max = find_max( $lines, "/$package/",
"/^.*$package-([\d\.]*\d)\.tar.*$/", FALSE );
+ }
return $max;
}
Modified: trunk/scripts/blfs-include.php
==============================================================================
--- trunk/scripts/blfs-include.php Fri Jan 22 05:30:47 2021 (r24127)
+++ trunk/scripts/blfs-include.php Fri Jan 22 13:28:42 2021 (r24128)
@@ -81,9 +81,13 @@
$slice1 = preg_replace( "/^(.*)-.*$/", "$1", $slice );
// Skip odd numbered minor versions and minors > 80
- list( $major, $minor, $other ) = explode( ".", $slice1 . ".0", 3 );
- if ( $minor % 2 == 1 ) continue;
- if ( $minor > 80 ) continue;
+ // Sometimes there is no period in $slice
+ if ( preg_match( "/\./", $slice1 ) )
+ {
+ list( $major, $minor, $other ) = explode( ".", $slice1 . ".0", 3 );
+ if ( $minor % 2 == 1 ) continue;
+ if ( $minor > 80 ) continue;
+ }
array_push( $a, $slice );
}
@@ -126,9 +130,10 @@
$position = strrpos( $path, "/" );
$basedir = substr ( $path, 0, $position );
$lastdir = substr ( $path, -$dirlen ); // last $dirlen characters
- $newdir = (float)$lastdir - $diff ; // backup
+ $precision= $dirlen - 2;
+ $format = "%$dirlen.${precision}f";
+ $newdir = sprintf( $format, (float)$lastdir - $diff ); // backup
$fullpath = $basedir . "/" . $newdir;
-
// Get values from that diretory
$newlines = http_get_file( "$fullpath/" );
return $newlines;
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
