[oe-commits] org.oe.dev merge of '14b201ae82df51749f503f2abf62d5b4e962bc2f'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jul 5 19:56:10 UTC 2007
merge of '14b201ae82df51749f503f2abf62d5b4e962bc2f'
and 'f795d68d1af21b0bfa8f21c4a97bdee642fcc48a'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 6b88b1247ef1b0bcc9568b3b7feda1c77c827589
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6b88b1247ef1b0bcc9568b3b7feda1c77c827589
Files:
1
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/tasks/task-opie.bb
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/index.php
contrib/feed-browser/update.php
Diffs:
#
# mt diff -r14b201ae82df51749f503f2abf62d5b4e962bc2f -r6b88b1247ef1b0bcc9568b3b7feda1c77c827589
#
#
#
# add_file "packages/opie-taskbar/opie-taskbar-images.inc"
# content [d360a128f6873d3f280eb4f83502e056159dc8df]
#
# add_file "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
# content [f3d0e51204ca5fdab33a587c2c7f69acfa799f9e]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
# from [5045ef2e767e1eb852ad651743f8406528e34237]
# to [07a52b1c21aa01167bd3a2e275bec12dab2a4797]
#
# patch "packages/opie-taskbar/opie-taskbar.inc"
# from [612634b0a0376dfe1e4b563804c51987a32320b0]
# to [be2742efc78e19b24da24ffd4ac78bff559fed6e]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [0081cd5790b5ddf838977339678872f2b347b50c]
# to [6ab03fd59add9cd0437b756d1e8d70378db9023c]
#
# patch "packages/tasks/task-opie.bb"
# from [104850af17afa7f7a6340e0cbf3ef4e4bb8351ad]
# to [d9b3a961501d5c121f18763d6efbd94634b0ebb4]
#
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc d360a128f6873d3f280eb4f83502e056159dc8df
+++ packages/opie-taskbar/opie-taskbar-images.inc d360a128f6873d3f280eb4f83502e056159dc8df
@@ -0,0 +1,46 @@
+DESCRIPTION = "Opie Launcher and Taskbar"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RPROVIDES = "${PN}"
+APPNAME = "qpe"
+
+S = "${WORKDIR}/launcher"
+
+# Wallpaper and welcome splash
+PIXMAP_SIZE = ""
+PIXMAP_SIZE_c7x0 = "-640x480"
+PIXMAP_SIZE_spitz = "-640x480"
+PIXMAP_SIZE_akita = "-640x480"
+PIXMAP_SIZE_tosa = "-480x640"
+PIXMAP_SIZE_simpad = "-800x600"
+PIXMAP_SIZE_asus730 = "-480x640"
+PIXMAP_SIZE_htcuniversal= "-480x640"
+PIXMAP_SIZE_hx4700 = "-480x640"
+
+PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-240x320"
+
+#inherit opie
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/launcher
+
+ install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg
+ install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg
+
+ install -m 0644 ${WORKDIR}/pics/launcher/firstuse-480x640.jpg ${D}${palmtopdir}/pics/launcher/firstuse-480x640.jpg
+ install -m 0644 ${WORKDIR}/pics/launcher/opie-background-480x640.jpg ${D}${palmtopdir}/pics/launcher/opie-background-480x640.jpg
+
+ install -m 0644 ${WORKDIR}/pics/launcher/firstuse-640x480.jpg ${D}${palmtopdir}/pics/launcher/firstuse-640x480.jpg
+ install -m 0644 ${WORKDIR}/pics/launcher/opie-background-640x480.jpg ${D}${palmtopdir}/pics/launcher/opie-background-640x480.jpg
+
+ install -m 0644 ${WORKDIR}/pics/launcher/firstuse-800x600.jpg ${D}${palmtopdir}/pics/launcher/firstuse-800x600.jpg
+ install -m 0644 ${WORKDIR}/pics/launcher/opie-background-800x600.jpg ${D}${palmtopdir}/pics/launcher/opie-background-800x600.jpg
+}
+
+FILES_${PN}-240x320 += " ${palmtopdir}/pics/*/*-240x320.*"
+FILES_${PN}-480x640 += " ${palmtopdir}/pics/*/*-480x640.*"
+FILES_${PN}-640x480 += " ${palmtopdir}/pics/*/*-640x480.*"
+FILES_${PN}-800x600 += " ${palmtopdir}/pics/*/*-800x600.*"
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/opie-taskbar/opie-taskbar-images_cvs.bb f3d0e51204ca5fdab33a587c2c7f69acfa799f9e
+++ packages/opie-taskbar/opie-taskbar-images_cvs.bb f3d0e51204ca5fdab33a587c2c7f69acfa799f9e
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PV = "${OPIE_CVS_PV}"
+PR = "r3"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc 5045ef2e767e1eb852ad651743f8406528e34237
+++ conf/distro/include/preferred-opie-versions-1.2.3-pre.inc 07a52b1c21aa01167bd3a2e275bec12dab2a4797
@@ -188,6 +188,7 @@ PREFERRED_VERSION_opie-taskbar = "${OPIE
PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
@@ -378,6 +379,7 @@ SRCDATE_opie-taskbar = "${OPIE_SRCDATE}"
SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}"
SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}"
SRCDATE_opie-taskbar = "${OPIE_SRCDATE}"
+SRCDATE_opie-taskbar-images = "${OPIE_SRCDATE}"
SRCDATE_opie-tetrix = "${OPIE_SRCDATE}"
SRCDATE_opie-textedit = "${OPIE_SRCDATE}"
SRCDATE_opie-theme = "${OPIE_SRCDATE}"
============================================================
--- packages/opie-taskbar/opie-taskbar.inc 612634b0a0376dfe1e4b563804c51987a32320b0
+++ packages/opie-taskbar/opie-taskbar.inc be2742efc78e19b24da24ffd4ac78bff559fed6e
@@ -1,23 +1,17 @@ DEPENDS = "opie-libqrsync opie-qss"
DESCRIPTION = "Opie Launcher and Taskbar"
SECTION = "opie/base"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "opie-libqrsync opie-qss"
+# Unfortunately, ipkg has buggy handling of Rdepends to multiple packages with the same Provides.
+# Instead of seeing if something in package package lists selects needed package among the rest
+# or errors out otherwise, it just install random package which has needed Provides. So, comment
+# this out.
+#RDEPENDS = "opie-taskbar-images"
APPNAME = "qpe"
S = "${WORKDIR}/launcher"
-# Wallpaper and welcome splash
-PIXMAP_SIZE = ""
-PIXMAP_SIZE_c7x0 = "-640x480"
-PIXMAP_SIZE_spitz = "-640x480"
-PIXMAP_SIZE_akita = "-640x480"
-PIXMAP_SIZE_tosa = "-480x640"
-PIXMAP_SIZE_simpad = "-800x600"
-PIXMAP_SIZE_asus730 = "-480x640"
-PIXMAP_SIZE_htcuniversal= "-480x640"
-PIXMAP_SIZE_hx4700 = "-480x640"
-
inherit opie
do_configure_prepend() {
@@ -56,8 +50,6 @@ do_install() {
do
install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p
done
- install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/firstuse.jpg
- install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/opie-background.jpg
install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/
install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/
@@ -70,5 +62,3 @@ FILES_opie-taskbar_append = " ${sysconfd
}
FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb 0081cd5790b5ddf838977339678872f2b347b50c
+++ packages/opie-taskbar/opie-taskbar_cvs.bb 6ab03fd59add9cd0437b756d1e8d70378db9023c
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r10"
+PR = "r12"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
============================================================
--- packages/tasks/task-opie.bb 104850af17afa7f7a6340e0cbf3ef4e4bb8351ad
+++ packages/tasks/task-opie.bb d9b3a961501d5c121f18763d6efbd94634b0ebb4
@@ -5,7 +5,7 @@ PROVIDES = "task-opie-everything"
LICENSE = "MIT"
PROVIDES = "task-opie-everything"
-PR = "r9"
+PR = "r10"
PACKAGES = "task-opie-base \
task-opie-base-applets task-opie-base-apps \
@@ -26,8 +26,10 @@ RDEPENDS_task-opie-base = "opie-init opi
# Dependencies to get the launcher up and running
#
RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \
- opie-taskbar opie-pics opie-sounds opie-freetype \
+ opie-taskbar opie-taskbar-images-240x320 opie-pics opie-sounds opie-freetype \
ttf-dejavu-sans ttf-dejavu-sans-mono"
+# TODO: Instead of opie-taskbar-images-240x320 version for target machine should be used, pending
+# mechanism to specify screen size for all machines.
#
# things for reasonable bootstrap image
#
# mt diff -rf795d68d1af21b0bfa8f21c4a97bdee642fcc48a -r6b88b1247ef1b0bcc9568b3b7feda1c77c827589
#
#
#
# patch "contrib/feed-browser/includes/functions.inc"
# from [f33374987037202cd21d7f82a93b7da3f0c573a9]
# to [041208fd72802891209d607c7a4f1777a946ed1d]
#
# patch "contrib/feed-browser/index.php"
# from [0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf]
# to [b7a98a4213e06372bea54a7e27ea29b13d1e615a]
#
# patch "contrib/feed-browser/update.php"
# from [0a6696349338576e60018f0f8fbbf645cec91913]
# to [9b418cf2e8cefddae617ffd8e121293445ea1ee1]
#
============================================================
--- contrib/feed-browser/includes/functions.inc f33374987037202cd21d7f82a93b7da3f0c573a9
+++ contrib/feed-browser/includes/functions.inc 041208fd72802891209d607c7a4f1777a946ed1d
@@ -1,7 +1,7 @@
<?php
/*
- * (c) Koen Kooi 2006
- * (c) Marcin Juszkiewicz 2006
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
@@ -112,19 +112,28 @@ function searchletter($searchletter = ''
}
else
{
- $ipkgoutput .= sprintf(" <a href='?action=letter&g=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
+ $ipkgoutput .= sprintf(" <a href='?letter=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
}
}
- $ipkgoutput .= " <a href='?action=letter&g=z' title='packages which names begins with \"z\"'>z</a></div>";
+ $ipkgoutput .= " <a href='?letter=z' title='packages which names begins with \"z\"'>z</a></div>";
return $ipkgoutput;
}
-function searchpkg ($searchword)
+function searchpkg ($searchword, $searcharch = '')
{
- if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC"))
+ $query = "SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ";
+
+ if(!empty($searcharch))
{
+ $query .= " AND p_arch='{$searcharch}' ";
+ }
+
+ $query .= 'ORDER BY p_name ASC';
+
+ if($result = db_query($query))
+ {
return generate_list_of_packages($result);
}
}
@@ -149,7 +158,7 @@ function generate_list_of_packages($quer
}
$ipkgoutput .= sprintf
- ("<tr><td><a href='?action=details&pnm=%s'>%s</a></td><td><a href=\"?action=section&section=%s\">%s</a></td><td> %s</td></tr>\n",
+ ("<tr><td><a href='?pkgname=%s'>%s</a></td><td><a href=\"?section=%s\">%s</a></td><td> %s</td></tr>\n",
urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], htmlentities($package['p_desc']));
}
@@ -173,7 +182,7 @@ function pkgdetails ($package)
$result = db_query("SELECT * FROM packages,feeds
WHERE (packages.p_name='$package' OR packages.p_provides='$package')
AND feeds.f_id = packages.p_feed
- ORDER BY packages.p_version DESC, feeds.f_name ASC, packages.p_arch DESC ");
+ ORDER BY packages.p_version DESC, packages.p_arch ASC ");
// display first result
@@ -194,7 +203,7 @@ function pkgdetails ($package)
if($package['packages.p_section'])
{
- $details .= sprintf ("\n<dt>Section:</dt><dd><a href='?action=section&section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
+ $details .= sprintf ("\n<dt>Section:</dt><dd><a href='?section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
}
if($package['packages.p_depends'])
@@ -310,7 +319,7 @@ function addlinks ($input)
{
// find position of string in line
$pos = strpos ($input, $element, $offset);
- $link = sprintf("<a href=\"?action=details&pnm=%s\">$element</a>", urlencode ($element));
+ $link = sprintf("<a href=\"?pkgname=%s\">$element</a>", urlencode ($element));
// replace element with a link
$input = substr_replace ($input, $link, $pos, strlen ($element));
@@ -361,7 +370,7 @@ function sectionslist()
foreach($sections as $section_name1=>$item)
{
- $output .= sprintf ("<li><a href='?action=section&section=%s' title='%s'>%s</a>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a>",
urlencode($section_name1),
urlencode($section_name1),
$section_name1);
@@ -373,7 +382,7 @@ function sectionslist()
foreach($item as $section_name2=>$subitem)
{
$section_name = "{$section_name1}/{$section_name2}";
- $output .= sprintf ("<li><a href='?action=section&section=%s' title='%s'>%s</a>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a>",
urlencode($section_name),
urlencode($section_name),
$section_name2);
@@ -385,7 +394,7 @@ function sectionslist()
foreach($subitem as $section_name3=>$subitem2)
{
$section_name = "{$section_name1}/{$section_name2}/{$section_name3}";
- $output .= sprintf ("<li><a href='?action=section&section=%s' title='%s'>%s</a></li>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a></li>",
urlencode($section_name),
urlencode($section_name),
$section_name3);
@@ -411,8 +420,12 @@ function check_database()
function check_database()
{
- if($db = sqlite_open(DB_FILENAME))
+ $db_exists = FALSE;
+
+ if(file_exists(DB_FILENAME) AND $db = sqlite_open(DB_FILENAME))
{
+ $db_exists = TRUE;
+
//initialize db
if (db_table_exists ($db, 'packages') === FALSE)
{
@@ -443,15 +456,32 @@ function check_database()
f_name varchar(32),
f_uri varchar(100),
f_type varchar(16)
- )");
+ f_comments varchar(500))");
insert_feeds ($db) ;
}
sqlite_close($db);
}
+
+ return $db_exists;
}
+function read_vars_from_get($array_of_vars)
+{
+ foreach($array_of_vars as $name_of_var)
+ {
+ $GLOBALS[$name_of_var] = '';
+ if(isset($_GET[$name_of_var]))
+ {
+ $GLOBALS[$name_of_var] = $_GET[$name_of_var];
+ }
+ }
+}
+function get_arch_list()
+{
+ return db_query('SELECT DISTINCT p_arch FROM packages WHERE p_arch NOT IN (NULL, "", "all") ORDER BY p_arch ASC');
+}
?>
============================================================
--- contrib/feed-browser/index.php 0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf
+++ contrib/feed-browser/index.php b7a98a4213e06372bea54a7e27ea29b13d1e615a
@@ -1,8 +1,8 @@
<?php
/*
- * (c) Koen Kooi 2006
- * (c) Marcin Juszkiewicz 2006
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This php script is intended to do the following:
*
@@ -33,46 +33,34 @@ require_once 'includes/functions.inc';
require_once 'includes/config.inc';
require_once 'includes/functions.inc';
-check_database();
+if(!check_database())
+{
+ die("Database not found and cannot be created.");
+}
-$name = '';
+read_vars_from_get(array('name', 'arch', 'pkgsearch', 'letter', 'pkgname', 'section'));
-if(isset($_GET['name']))
+$ipkgoutput = '';
+
+if(!empty($section))
{
- $name = $_GET['name'];
+ $ipkgoutput = searchsection($section);
}
-
-$action = '';
-
-if(isset($_GET['action']))
+elseif(!empty($letter))
{
- $action = $_GET['action'];
+ $ipkgoutput = searchpkg("{$letter}%", $arch);
}
-
-switch($action)
+elseif(!empty($pkgname))
{
- case "details":
- $ipkgoutput = pkgdetails ($_GET['pnm']);
- break;
+ $ipkgoutput = pkgdetails($pkgname);
+}
+elseif(!empty($pkgsearch) OR !empty($arch))
+{
+ $ipkgoutput = searchpkg("%{$pkgsearch}%", $arch);
+}
- case "search":
- $ipkgoutput = searchpkg ("%{$name}%");
- break;
+$archs_list = get_arch_list();
- case "section":
- $ipkgoutput = searchsection($_GET['section']);
- break;
-
- case "letter":
- $letter = $_GET['g'];
- $ipkgoutput = searchpkg ("{$letter}%");
- break;
-
- default:
- $ipkgoutput = searchpkg("a");
- break;
-}
-
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
@@ -88,8 +76,25 @@ switch($action)
<form action="" method="get">
<fieldset>
<label for="name">Package name</label>
- <input type="text" name="name" value="<?php echo $name; ?>" />
- <input type="hidden" name="action" value="search" />
+ <input type="text" name="pkgsearch" value="<?php echo $pkgsearch; ?>" />
+ <select name="arch">
+ <option value="" selected="selected">all architectures</option>
+ <option value="all">no arch</option>
+<?php
+
+foreach($archs_list as $architecture)
+{
+ echo "<option value='{$architecture['p_arch']}'";
+
+ if($architecture['p_arch'] == $arch)
+ {
+ echo ' selected="selected"';
+ }
+ echo ">{$architecture['p_arch']}</option>";
+}
+
+?>
+ </select>
<input type="submit" value="Search" />
</fieldset>
</form>
============================================================
--- contrib/feed-browser/update.php 0a6696349338576e60018f0f8fbbf645cec91913
+++ contrib/feed-browser/update.php 9b418cf2e8cefddae617ffd8e121293445ea1ee1
@@ -1,5 +1,7 @@
<?php
-/* (c) Koen Kooi 2006
+/*
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
@@ -37,7 +39,10 @@ require_once 'includes/functions.inc';
Description: IPv4 link-local address allocator
*/
-check_database();
+if(!check_database())
+{
+ die("Database not found and cannot be created.");
+}
$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
More information about the Openembedded-commits
mailing list