Author: bdubbs
Date: Thu Apr 21 12:22:09 2016
New Revision: 17279
Log:
Fix phonon and libdbusmenu-qt scripts
Modified:
trunk/scripts/blfs-chapter29.php
Modified: trunk/scripts/blfs-chapter29.php
==============================================================================
--- trunk/scripts/blfs-chapter29.php Thu Apr 21 03:03:12 2016 (r17278)
+++ trunk/scripts/blfs-chapter29.php Thu Apr 21 12:22:09 2016 (r17279)
@@ -11,7 +11,7 @@
$renames = array();
$ignores = array();
-//$current="extra-cmake-modules";
+//$current="libdbusmenu-qt";
$kde_ver = "";
$kde_lines = "";
@@ -23,6 +23,10 @@
array( 'pkg' => 'extra-cmake-modules',
'match' => '^.*$',
'replace' => "http://download.kde.org/stable/frameworks"; ),
+
+ array( 'pkg' => 'libdbusmenu-qt',
+ 'match' => '^.*$',
+ 'replace' =>
"http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/"; ),
);
function get_packages( $package, $dirpath )
@@ -69,18 +73,6 @@
if ( preg_match( "/^ftp/", $dirpath ) )
{
- if ( $book_index == "phonon-backend-vlc" ||
- $book_index == "phonon" ||
- $book_index == "phonon-backend-gstreamer" )
- {
- $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
- $position = strrpos( $dirpath, "/" );
- $dirpath = substr ( $dirpath, 0, $position ); // Up 1
- $position = strrpos( $dirpath, "/" );
- $dirpath = substr ( $dirpath, 0, $position ); // Up 2
- //$dirpath .= "/$book_index";
- }
-
// Get listing
$lines = http_get_file( "$dirpath/" );
}
@@ -99,8 +91,6 @@
$dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
$position = strrpos( $dirpath, "/" );
$dirpath = substr ( $dirpath, 0, $position ); // Up 1
- $position = strrpos( $dirpath, "/" );
- $dirpath = substr ( $dirpath, 0, $position ); // Up 2
$lines = http_get_file( "$dirpath" );
return find_max( $lines, "/\d\./", "/^.*;([\d\.]+)\/.*$/" );
}
@@ -112,6 +102,14 @@
return $max . ".0";
}
+ if ( $book_index == "libdbusmenu-qt" )
+ {
+ $lines = http_get_file( "$dirpath" );
+ $max = find_max( $lines, "/libdbusmenu-qt/",
+ "/^.*libdbusmenu-qt_([\d\.]+.*)\.orig.*$/" );
+ return $max;
+ }
+
if ( ! is_array($kde_lines) )
{
// All http for kde
@@ -133,12 +131,6 @@
//if ( ! is_array( $lines ) ) return $lines;
} // End fetch
- // automoc4 and similar
- if ( $book_index == "phonon" ||
- $book_index == "phonon-backend-gstreamer" ||
- $book_index == "phonon-backend-vlc" )
- return find_max( $lines, "/\d\./", "/^.* (\d\.[\d\.]+).*$/" );
-
// 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.*$/" );
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
