Author: bdubbs
Date: Wed Jan 11 12:17:31 2017
New Revision: 18172
Log:
Update several scripts for upstream changes and for
new packages we ahve added.
Modified:
trunk/scripts/blfs-chapter11.php
trunk/scripts/blfs-chapter13.php
trunk/scripts/blfs-chapter39.php
trunk/scripts/blfs-chapter43.php
Modified: trunk/scripts/blfs-chapter11.php
==============================================================================
--- trunk/scripts/blfs-chapter11.php Wed Jan 11 09:05:49 2017 (r18171)
+++ trunk/scripts/blfs-chapter11.php Wed Jan 11 12:17:31 2017 (r18172)
@@ -9,8 +9,10 @@
$STOP_PACKAGE = 'xdg-user-dirs';
$renames = array();
-$renames[ 'lsof_' ] = 'lsof';
-$renames[ 'rep-gtk_' ] = 'rep-gtk';
+$renames[ 'lsof_' ] = 'lsof';
+$renames[ 'rep-gtk_' ] = 'rep-gtk';
+$renames[ 'ImageMagick' ] = 'ImageMagick6';
+$renames[ 'ImageMagick1' ] = 'ImageMagick7';
$ignores = array();
@@ -19,7 +21,7 @@
$regex[ 'intltool' ] = "/^.*Latest version is (\d[\d\.]+\d).*$/";
$regex[ 'xscreensaver' ] = "/^.*xscreensaver-(\d[\d\.]+\d).tar.*$/";
-//$current="ibus"; // For debugging
+//$current="ImageMagick1"; // For debugging
$url_fix = array (
array( 'pkg' => 'bogofilter',
@@ -170,7 +172,10 @@
return find_max( $lines, '/hd2u/', '/^.*hd2u-([\d\.]+).tgz.*$/' );
if ( $book_index == "ImageMagick" )
- return find_max( $lines, '/ImageMagick/',
'/^.*ImageMagick-([\d\.-]+).tar.*$/' );
+ return find_max( $lines, '/Magick-6/',
'/^.*ImageMagick-([\d\.-]+).tar.*$/' );
+
+ if ( $book_index == "ImageMagick1" )
+ return find_max( $lines, '/Magick/', '/^.*ImageMagick-([\d\.-]+).tar.*$/'
);
if ( $book_index == "js" )
return find_max( $lines, '/js/', '/^.*js(\d[\d\.-]+\d).tar.*$/' );
Modified: trunk/scripts/blfs-chapter13.php
==============================================================================
--- trunk/scripts/blfs-chapter13.php Wed Jan 11 09:05:49 2017 (r18171)
+++ trunk/scripts/blfs-chapter13.php Wed Jan 11 12:17:31 2017 (r18172)
@@ -34,7 +34,7 @@
$ignores[ 'python' ] = '';
$ignores[ 'python1' ] = '';
-//$current="elfutils"; // For debugging
+//$current="funcsigs"; // For debugging
$regex = array();
$regex[ 'check' ] = "/^.*Download check-(\d[\d\.]+\d).tar.*$/";
@@ -50,6 +50,9 @@
$regex[ 'valgrind'] = "/^.*Valgrind (\d[\d\.]+\d).*$/";
$regex[ 'jtreg' ] = "/^.*jtreg-(\d[b\d\.\-]+\d)\.tar.*$/";
$regex[ 'OpenJDK1'] = "/^.*OpenJDK-(\d[\d\.]+\d)\-.*$/";
+$regex[ 'setuptools' ] = "/^.*setuptools-(\d[\d\.]+\d).zip.*$/";
+$regex[ 'lxml' ] = "/^.*lxml (\d[\d\.]+\d).*$/";
+$regex[ 'funcsigs' ] = "/^.*funcsigs (\d[\d\.]+\d).*$/";
// Perl Modules
$regex[ 'Archive-Zip' ] = "/^.*Archive-Zip-(\d[\d\.]+\d).*$/";
@@ -318,6 +321,22 @@
'match' => '^.*$',
'replace' => "http://us2.php.net/distributions"; ),
+ array( 'pkg' => 'ruby',
+ 'match' => '^.*$',
+ 'replace' => "http://cache.ruby-lang.org/pub/ruby"; ),
+
+ array( 'pkg' => 'setuptools',
+ 'match' => '^.*$',
+ 'replace' => "https://pypi.python.org/pypi/setuptools"; ),
+
+ array( 'pkg' => 'lxml',
+ 'match' => '^.*$',
+ 'replace' => "https://pypi.python.org/pypi/lxml"; ),
+
+ array( 'pkg' => 'funcsigs',
+ 'match' => '^.*$',
+ 'replace' => "https://pypi.python.org/pypi/funcsigs"; ),
+
);
/*
Modified: trunk/scripts/blfs-chapter39.php
==============================================================================
--- trunk/scripts/blfs-chapter39.php Wed Jan 11 09:05:49 2017 (r18171)
+++ trunk/scripts/blfs-chapter39.php Wed Jan 11 12:17:31 2017 (r18172)
@@ -5,7 +5,7 @@
$CHAPTER = '39';
$CHAPTERS = 'Chapters 39-43';
-$START_PACKAGE = 'libsysstat';
+$START_PACKAGE = 'lxqt-build-tools';
$STOP_PACKAGE = 'QupZilla';
$renames = array();
@@ -14,7 +14,7 @@
$ignores = array();
-//$current="kidletime"; // Debug
+//$current="lxqt-qtplugin"; // Debug
$regex = array();
$regex[ 'libfm' ] = "/^.*Download libfm-(\d[\d\.]+\d).tar.*$/";
@@ -108,6 +108,18 @@
array( 'pkg' => 'QupZilla',
'match' => '^.*$',
'replace' => "https://github.com/QupZilla/qupzilla/tags"; ),
+
+ array( 'pkg' => 'lxqt-common',
+ 'match' => '^.*$',
+ 'replace' => "https://github.com/lxde/lxqt-common/releases"; ),
+
+ array( 'pkg' => 'lxqt-l10n',
+ 'match' => '^.*$',
+ 'replace' => "https://github.com/lxde/lxqt-l10n/releases"; ),
+
+ array( 'pkg' => 'lxqt-qtplugin',
+ 'match' => '^.*$',
+ 'replace' => "https://github.com/lxde/lxqt-qtplugin/releases"; ),
);
function get_packages( $package, $dirpath )
@@ -180,6 +192,9 @@
$book_index != "solid" &&
$book_index != "kwindowsystem" &&
$book_index != "libkscreen" &&
+ $book_index != "lxqt-common" &&
+ $book_index != "lxqt-l10n" &&
+ $book_index != "lxqt-qtplugin" &&
$book_index != "QScintilla_gpl"
) // http
{
Modified: trunk/scripts/blfs-chapter43.php
==============================================================================
--- trunk/scripts/blfs-chapter43.php Wed Jan 11 09:05:49 2017 (r18171)
+++ trunk/scripts/blfs-chapter43.php Wed Jan 11 12:17:31 2017 (r18172)
@@ -17,10 +17,10 @@
$libreoffice = array();
-//$current="chromium";
+//$current="inkscape";
$regex = array();
-$regex[ 'inkscape' ] = "/^.*Latest.*(\d[\d\.]+\d).*$/";
+//$regex[ 'inkscape' ] = "/^.*Latest.*(\d[\d\.]+\d).*$/";
//$regex[ 'chromium' ] = "/^.*stable.*updated to (\d[\d\.]+\d) for
Windows.*$/";
$regex[ 'chromium' ] = "/^pkgver=(\d[\d\.]+\d).*$/";
$regex[ 'gnucash' ] = "/^.*Download gnucash-(\d[\d\.]+\d).tar.*$/";
@@ -245,7 +245,7 @@
}
if ( preg_match( "/inkscape/", "$dirpath" ) )
- return find_max( $lines, "/\d\./", "/^.* (\d[\d\.]+\d)$/" );
+ return find_max( $lines, "/inkscape-/",
"/^.*inkscape-(\d[\d\.]+\d).tar.*$/" );
if ( preg_match( "/abiword/", "$dirpath" ) )
return find_max( $lines, "/^\d/", "/^([\d\.]+).*$/" );
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
