Author: bdubbs
Date: Wed May 1 13:11:32 2019
New Revision: 21533
Log:
Currency script fixes for icewm and gtksourceview
Modified:
trunk/scripts/blfs-chapter25.php
trunk/scripts/blfs-chapter26.php
Modified: trunk/scripts/blfs-chapter25.php
==============================================================================
--- trunk/scripts/blfs-chapter25.php Wed May 1 10:14:16 2019 (r21532)
+++ trunk/scripts/blfs-chapter25.php Wed May 1 13:11:32 2019 (r21533)
@@ -13,6 +13,8 @@
$renames[ 'gtk+1' ] = 'gtk+3';
$renames[ 'gtkmm' ] = 'gtkmm2';
$renames[ 'gtkmm1' ] = 'gtkmm3';
+$renames[ 'gtksourceview' ] = 'gtksourceview3';
+$renames[ 'gtksourceview1' ] = 'gtksourceview4';
$renames[ 'qt-everywhere-opensource-src' ] = 'qt5';
$renames[ 'qt-everywhere-opensource' ] = 'qt5';
$renames[ 'qtwebengine-opensource-src' ] = 'qtwebengine';
@@ -91,22 +93,24 @@
if ( preg_match( "/^ftp/", $dirpath ) )
{
// glib type packages
- if ( $book_index == "atk" ||
- $book_index == "atkmm" ||
- $book_index == "at-spi2-core" ||
- $book_index == "at-spi2-atk" ||
- $book_index == "cogl" ||
- $book_index == "clutter" ||
- $book_index == "clutter-gtk" ||
- $book_index == "gdk-pixbuf" ||
- $book_index == "gtk+1" ||
- $book_index == "gtk-engines" ||
- $book_index == "gtk-vnc" ||
- $book_index == "libglade" ||
- $book_index == "pango" ||
- $book_index == "pangomm" ||
- $book_index == "gtkmm1" ||
- $book_index == "goffice" )
+ if ( $book_index == "atk" ||
+ $book_index == "atkmm" ||
+ $book_index == "at-spi2-core" ||
+ $book_index == "at-spi2-atk" ||
+ $book_index == "cogl" ||
+ $book_index == "clutter" ||
+ $book_index == "clutter-gtk" ||
+ $book_index == "gdk-pixbuf" ||
+ $book_index == "gtksourceview" ||
+ $book_index == "gtksourceview1" ||
+ $book_index == "gtk+1" ||
+ $book_index == "gtk-engines" ||
+ $book_index == "gtk-vnc" ||
+ $book_index == "libglade" ||
+ $book_index == "pango" ||
+ $book_index == "pangomm" ||
+ $book_index == "gtkmm1" ||
+ $book_index == "goffice" )
{
// Parent listing
$dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
@@ -116,9 +120,11 @@
if ( $book_index == "atk" ||
$book_index == "gtk-vnc" ) // For now atk uses devel versions
- $dir = find_max( $dirlines, '/\d$/', '/^.* ([\d\.]+)$/' );
- else
- $dir = find_even_max( $dirlines, '/\d$/', '/^.* ([\d\.]+)$/' );
+ $dir = find_max( $dirlines, '/\d$/', '/^.* ([\d\.]+)$/' );
+ elseif ( $book_index == "gtksourceview" )
+ $dir = find_even_max( $dirlines, '/3\.\d/', '/^.*(3[\d\.]+)$/', TRUE
);
+ else
+ $dir = find_even_max( $dirlines, '/\d$/', '/^.* ([\d\.]+)$/', TRUE );
$dirpath .= "/$dir/";
}
@@ -222,6 +228,20 @@
return 0; // This is an error
}
+ if ( $book_index == "gtksourceview" )
+ {
+ $lines = http_get_file( "$dirpath" );
+ return find_max( $lines, '/gtksourceview-/',
+ '/^.*gtksourceview-(\d\.[\d\.]+).tar.*$/' );
+ }
+
+ if ( $book_index == "gtksourceview1" )
+ {
+ $lines = http_get_file( "$dirpath" );
+ return find_max( $lines, '/gtksourceview-/',
+ '/^.*gtksourceview-(\d\.[\d\.]+).tar.*$/' );
+ }
+
if ( $book_index == "glew" )
return find_max( $lines, '/GLEW/', '/^.*GLEW (\d\.[\d\.]+\d).*$/' );
Modified: trunk/scripts/blfs-chapter26.php
==============================================================================
--- trunk/scripts/blfs-chapter26.php Wed May 1 10:14:16 2019 (r21532)
+++ trunk/scripts/blfs-chapter26.php Wed May 1 13:11:32 2019 (r21533)
@@ -26,7 +26,7 @@
array( 'pkg' => 'icewm',
'match' => '^.*$',
- 'replace' => "https://github.com/bbidulock/icewm/releases/"; ),
+ 'replace' => "https://github.com/ice-wm/icewm/releases"; ),
array( 'pkg' => 'lxdm',
'match' => '^.*$',
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
