Author: bdubbs
Date: Sat Jul 6 14:27:08 2019
New Revision: 21815
Log:
Script updates for vim, libarchive, newt, giflib, libevent, qtwebengine.
Modified:
trunk/scripts/blfs-chapter06.php
trunk/scripts/blfs-chapter09.php
trunk/scripts/blfs-chapter10.php
trunk/scripts/blfs-chapter17.php
trunk/scripts/blfs-chapter25.php
Modified: trunk/scripts/blfs-chapter06.php
==============================================================================
--- trunk/scripts/blfs-chapter06.php Sat Jul 6 10:03:14 2019 (r21814)
+++ trunk/scripts/blfs-chapter06.php Sat Jul 6 14:27:08 2019 (r21815)
@@ -34,7 +34,7 @@
array( 'pkg' => 'vim',
'match' => '^.*$',
- 'replace' => "http://ftp.vim.org/vim/unix"; ),
+ 'replace' => "http://github.com/vim/vim/releases"; ),
array( 'pkg' => 'nano',
'match' => '^.*$',
@@ -137,9 +137,9 @@
//$lines = http_get_file( "$dirpath/$dir" );
}
- // vim language pack
- if ( $book_index == "vim1" )
- return find_max( $lines, '/^.*vim-[\d\.]+-lang.*$/',
'/^.*vim-([\d\.]+)-lang.*$/' );
+ // vim
+ if ( $book_index == "vim" )
+ return find_max( $lines, '/v\d/', '/^.*v([\d\.]+).*$/' );
if ( $book_index == "nano" )
{
Modified: trunk/scripts/blfs-chapter09.php
==============================================================================
--- trunk/scripts/blfs-chapter09.php Sat Jul 6 10:03:14 2019 (r21814)
+++ trunk/scripts/blfs-chapter09.php Sat Jul 6 14:27:08 2019 (r21815)
@@ -49,6 +49,10 @@
'match' => '^.*$',
'replace' => "http://$sf/projects/expat/files/expat"; ),
+ array( 'pkg' => 'libarchive',
+ 'match' => '^.*$',
+ 'replace' => "https://github.com/libarchive/libarchive/releases"; ),
+
array( 'pkg' => 'libiodbc',
'match' => '^.*$',
'replace' => "http://$sf/projects/iodbc/files"; ),
@@ -367,6 +371,9 @@
if ( $book_index == "fftw" )
return find_max( $lines, '/ fftw-\d/', '/^.* fftw-([\d\.pl\-]+)\.tar.*$/'
);
+ if ( $book_index == "libarchive" )
+ return find_max( $lines, '/archive \d/', '/^.*archive ([\d\.]+).*$/' );
+
if ( $book_index == "libusb" )
return find_max( $lines, '/libusb/', '/^.*libusb-([\d\.]+).tar.*$/' );
Modified: trunk/scripts/blfs-chapter10.php
==============================================================================
--- trunk/scripts/blfs-chapter10.php Sat Jul 6 10:03:14 2019 (r21814)
+++ trunk/scripts/blfs-chapter10.php Sat Jul 6 14:27:08 2019 (r21815)
@@ -47,7 +47,7 @@
array( 'pkg' => 'giflib',
'match' => '^.*$',
- 'replace' => "http://$sf/projects/giflib/files/giflib-5.x"; ),
+ 'replace' => "http://$sf/projects/giflib/files"; ),
array( 'pkg' => 'glm',
'match' => '^.*$',
@@ -214,6 +214,7 @@
$dirpath .= "/$dir/";
}
+ if ( $book_index == "newt" ) $dirpath .= "/";
// Customize http directories as needed
$lines = http_get_file( $dirpath );
if ( ! is_array( $lines ) ) return $lines;
Modified: trunk/scripts/blfs-chapter17.php
==============================================================================
--- trunk/scripts/blfs-chapter17.php Sat Jul 6 10:03:14 2019 (r21814)
+++ trunk/scripts/blfs-chapter17.php Sat Jul 6 14:27:08 2019 (r21815)
@@ -62,7 +62,7 @@
array( 'pkg' => 'libevent',
'match' => '^.*$',
- 'replace' => "https://github.com/nmathewson/Libevent/releases"; ),
+ 'replace' => "https://github.com/libevent/libevent/releases"; ),
array( 'pkg' => 'geoclue',
'match' => '^.*$',
Modified: trunk/scripts/blfs-chapter25.php
==============================================================================
--- trunk/scripts/blfs-chapter25.php Sat Jul 6 10:03:14 2019 (r21814)
+++ trunk/scripts/blfs-chapter25.php Sat Jul 6 14:27:08 2019 (r21815)
@@ -17,7 +17,7 @@
$renames[ 'gtksourceview1' ] = 'gtksourceview4';
$renames[ 'qt-everywhere-opensource-src' ] = 'qt5';
$renames[ 'qt-everywhere-opensource' ] = 'qt5';
-$renames[ 'qtwebengine-opensource-src' ] = 'qtwebengine';
+$renames[ 'qtwebengine-everywhere-src' ] = 'qtwebengine';
$renames[ 'qtwebkit-opensource-src' ] = 'qtwebkit';
$ignores = array();
@@ -65,6 +65,8 @@
if ( isset( $current ) && $book_index != "$current" ) return 0;
+ if ( $book_index == "qtwebengine-everywhere-src" ) return "manual";
+
// Fix up directory path
foreach ( $url_fix as $u )
{
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
