cellog Thu Dec 1 02:56:20 2005 EDT
Modified files:
/pear-core package-PEAR.xml package2.xml
/pear-core/scripts pearcmd.php
Log:
* fix Request #6119: Add PEAR_Frontend_Gtk2 support to PEAR
http://cvs.php.net/diff.php/pear-core/package-PEAR.xml?r1=1.316&r2=1.317&ty=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.316 pear-core/package-PEAR.xml:1.317
--- pear-core/package-PEAR.xml:1.316 Thu Dec 1 02:52:30 2005
+++ pear-core/package-PEAR.xml Thu Dec 1 02:56:19 2005
@@ -77,6 +77,7 @@
* fix Bug #6034: date format bug
* fix Bug #6047: pear makerpm fails to handle docs in root directory
* fix Bug #6106: Notices by list-upgrades (caused by time-outs ?)
+ * fix Request #6119: Add PEAR_Frontend_Gtk2 support to PEAR
</notes>
<provides type="class" name="OS_Guess"/>
<provides type="class" name="System"/>
http://cvs.php.net/diff.php/pear-core/package2.xml?r1=1.209&r2=1.210&ty=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.209 pear-core/package2.xml:1.210
--- pear-core/package2.xml:1.209 Thu Dec 1 02:52:30 2005
+++ pear-core/package2.xml Thu Dec 1 02:56:20 2005
@@ -82,6 +82,7 @@
* fix Bug #6034: date format bug
* fix Bug #6047: pear makerpm fails to handle docs in root directory
* fix Bug #6106: Notices by list-upgrades (caused by time-outs ?)
+ * fix Request #6119: Add PEAR_Frontend_Gtk2 support to PEAR
</notes>
<contents>
<dir name="/">
http://cvs.php.net/diff.php/pear-core/scripts/pearcmd.php?r1=1.31&r2=1.32&ty=u
Index: pear-core/scripts/pearcmd.php
diff -u pear-core/scripts/pearcmd.php:1.31 pear-core/scripts/pearcmd.php:1.32
--- pear-core/scripts/pearcmd.php:1.31 Wed Nov 30 02:18:22 2005
+++ pear-core/scripts/pearcmd.php Thu Dec 1 02:56:20 2005
@@ -18,7 +18,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: pearcmd.php,v 1.31 2005/11/30 07:18:22 cellog Exp $
+// $Id: pearcmd.php,v 1.32 2005/12/01 07:56:20 cellog Exp $
ob_end_clean();
if (!defined('PEAR_RUNTYPE')) {
@@ -99,6 +99,11 @@
}
}
}
+//Check if Gtk and PHP >= 5.1.0
+if ($fetype == 'Gtk' && version_compare(phpversion(), '5.1.0', '>=')) {
+ $fetype = 'Gtk2';
+}
+
$pear_user_config = '';
$pear_system_config = '';
$store_user_config = false;
@@ -237,7 +242,7 @@
exit;
}
-if ($fetype == 'Gtk') {
+if ($fetype == 'Gtk' || $fetype == 'Gtk2') {
if (!$config->validConfiguration()) {
PEAR::raiseError('CRITICAL ERROR: no existing valid configuration
files found in files ' .
"'$pear_user_config' or '$pear_system_config', please copy an
existing configuration" .
|
