Author: bdubbs
Date: Tue Dec 12 12:54:18 2017
New Revision: 19590
Log:
Fix script for qt5 name change
Modified:
trunk/scripts/blfs-chapter25.php
Modified: trunk/scripts/blfs-chapter25.php
==============================================================================
--- trunk/scripts/blfs-chapter25.php Tue Dec 12 11:11:32 2017 (r19589)
+++ trunk/scripts/blfs-chapter25.php Tue Dec 12 12:54:18 2017 (r19590)
@@ -14,12 +14,14 @@
$renames[ 'gtkmm' ] = 'gtkmm2';
$renames[ 'gtkmm1' ] = 'gtkmm3';
$renames[ 'qt-everywhere-opensource-src' ] = 'qt5';
+$renames[ 'qt-everywhere-opensource' ] = 'qt5';
$renames[ 'qtwebengine-opensource-src' ] = 'qtwebengine';
$renames[ 'qtwebkit-opensource-src' ] = 'qtwebkit';
$ignores = array();
//$current="libepoxy"; // For debugging
+$current="qt-everywhere-opensource-src"; // For debugging
$regex = array();
$regex[ 'freeglut' ] = "/^.*Download freeglut-(\d[\d\.]+\d).tar.*$/";
@@ -149,7 +151,8 @@
$dirpath .= "/$dir";
}
*/
- if ( $book_index == "qt-everywhere-opensource-src" )
+ $qt_len = strlen( "qt-everywhere" );
+ if ( substr($book_index, 0, $qt_len) == "qt-everywhere" )
{
// Customize http directories as needed
$dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
@@ -229,7 +232,7 @@
if ( $book_index == "firefox" )
return find_max( $lines, "/^\d/", "/^(\d{2}.\d+)$/" );
- if ( $book_index == "qt-everywhere-opensource-src1" )
+ if ( substr($book_index, 0, $qt_len) == "qt-everywhere" )
return find_max( $lines, "/src.*tar.xz/", "/^.*src-([\d\.]+).tar.*$/" );
if ( $book_index == "fltk" )
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
