From eb2a5422d1b7cb56ce54cb68de7b37a7ce73fbff Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 20:25:39 +0000 Subject: thunderbird: put debug files in the debug package --- packages/mozilla/thunderbird_1.0.7.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mozilla/thunderbird_1.0.7.bb b/packages/mozilla/thunderbird_1.0.7.bb index c3370c6f28..3527ebe93b 100644 --- a/packages/mozilla/thunderbird_1.0.7.bb +++ b/packages/mozilla/thunderbird_1.0.7.bb @@ -1,7 +1,7 @@ SECTION = "x11/utils" DEPENDS += "gnupg" RRECOMMENDS += "gnupg" -PR = "r0" +PR = "r1" EMVER="0.92.0" IPCVER="1.1.3" @@ -15,7 +15,8 @@ http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz \ file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop" S = "${WORKDIR}/mozilla" -FILES_${PN} += "${libdir}/thunderbird-${PV} ${datadir}/idl" +FILES_${PN} += "${libdir}/thunderbird-${PV}/* ${datadir}/idl" +FILES_${PN}-dbg += "${libdir}/thunderbird-${PV}/.debug*" inherit mozilla -- cgit v1.2.3 From f717ee088a466889c765947fb06558deae99c0a5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 20:38:43 +0000 Subject: alsa-lib: fix packaging * debug files in -dbg * aserver in alsa-server * shlib renaming works again --- packages/alsa/alsa-lib_1.0.11.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb index fbf1442771..ebfd793f9b 100644 --- a/packages/alsa/alsa-lib_1.0.11.bb +++ b/packages/alsa/alsa-lib_1.0.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r0" +PR = "r1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, @@ -25,8 +25,9 @@ do_stage() { install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES += "libasound alsa-server alsa-conf alsa-doc alsa-dev" +PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev" PACKAGES_DYNAMIC = "libasound*" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" FILES_libasound = "${libdir}/libasound.so*" FILES_alsa-server = "${bindir}" FILES_alsa-conf = "${datadir}" -- cgit v1.2.3 From 8b63540334b750df47c88510ca19662b35d0e16e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Aug 2006 20:44:12 +0000 Subject: esound-gpe: fix packaging --- packages/esound/esound-gpe_20020817.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb index 1b98a1291e..d980ea35ca 100644 --- a/packages/esound/esound-gpe_20020817.bb +++ b/packages/esound/esound-gpe_20020817.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Enlightened Sound Daemon - GPE version" SECTION = "gpe/base" LICENSE = "GPL" DEPENDS = "audiofile" -PR = "r4" +PR = "r5" PROVIDES += "esound" RPROVIDES += "esound" @@ -30,4 +30,4 @@ PACKAGES =+ "esddsp esd esd-utils" FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*" FILES_esd = "${bindir}/esd" -FILES_esd-utils = "${bindir}" +FILES_esd-utils = "${bindir}/*" -- cgit v1.2.3 From 448afde0d8c049b93f6f4e87dc9392a6bfdde409 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 24 Aug 2006 10:00:33 +0000 Subject: feed-browser: starting version of web browser for feeds (GPLv2 license) - show packages list - show sections list - show package information - allow to download package --- contrib/feed-browser/.mtn2git_empty | 0 contrib/feed-browser/css/.mtn2git_empty | 0 contrib/feed-browser/css/feed.css | 57 ++++ contrib/feed-browser/index.php | 540 ++++++++++++++++++++++++++++++++ contrib/feed-browser/update.php | 158 ++++++++++ 5 files changed, 755 insertions(+) create mode 100644 contrib/feed-browser/.mtn2git_empty create mode 100644 contrib/feed-browser/css/.mtn2git_empty create mode 100644 contrib/feed-browser/css/feed.css create mode 100644 contrib/feed-browser/index.php create mode 100644 contrib/feed-browser/update.php diff --git a/contrib/feed-browser/.mtn2git_empty b/contrib/feed-browser/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contrib/feed-browser/css/.mtn2git_empty b/contrib/feed-browser/css/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contrib/feed-browser/css/feed.css b/contrib/feed-browser/css/feed.css new file mode 100644 index 0000000000..fd9f65c5c1 --- /dev/null +++ b/contrib/feed-browser/css/feed.css @@ -0,0 +1,57 @@ +body +{ + color: #000; + background-color: #fff; + font-family: Sans; + padding: 0; + margin: 0; +} + +a +{ + text-decoration: none; + color: #0066cc +} + +table +{ + width: 100%; +} + +th +{ + font-weight: bold; +} + +td +{ + padding: 0 0.5em; + vertical-align: top; +} + +#page { + margin: 1em auto; + width: 80%; +} + +#letters +{ + margin: 1em 0; + text-align: center; +} + +h1 +{ + font-size: 125%; +} + +h2 +{ + font-size: 105%; +} + +#menu, #menu li +{ + display: inline; + list-style: none; +} diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php new file mode 100644 index 0000000000..7921a42260 --- /dev/null +++ b/contrib/feed-browser/index.php @@ -0,0 +1,540 @@ + + + +Feed browser + + + + + +
+ + +
+ + +"; + $alfabet = array('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y'); + + foreach($alfabet as $letter) + { + if($letter == $searchletter) + { + $ipkgoutput .= sprintf(" %s |", $letter ); + } + else + { + $ipkgoutput .= sprintf(" %s |", $letter, $letter ); + } + } + + $ipkgoutput .= " z"; + + if(isset($searchletter)) + { + $ipkgoutput .= searchpkg("$searchletter%"); + } + + return $ipkgoutput; +} + +function searchpkg ($searchword) +{ + $result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC;"); + + $ipkgoutput = "\n"; + $ipkgoutput .="\n"; + + foreach($result as $package) + { + if (!strstr ($package['p_name'], 'locale')) + { + if(strlen($package['p_desc']) > 40) + { + $pos = strpos($package['p_desc'],' ', 40); + + if($pos) + { + $package['p_desc'] = substr($package['p_desc'], 0, $pos) . '...'; + } + } + + $ipkgoutput .= sprintf + ("\n", + urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], $package['p_desc']); + } + + } + + $ipkgoutput .= '
PackageSectionDescription
%s%s %s
'; + + return $ipkgoutput; +} + +function searchsection($section) +{ + $result= db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_section like '$section%' order by p_section asc, p_name asc;"); + + $ipkgoutput = "\n"; + $ipkgoutput .="\n"; + + foreach($result as $package) + { + if (!strstr ($package['p_name'], 'locale')) + { + if(strlen($package['p_desc'])> 40) + { + $pos = strpos($package['p_desc'],' ', 40); + + if($pos) + { + $package['p_desc'] = substr($package['p_desc'], 0, $pos) . '...'; + } + } + + $ipkgoutput .= sprintf ("", + urlencode($package['p_name']), + $package['p_name'], + $package['p_section'], $package['p_section'], + $package['p_desc']); + }//if strstr + } + + $ipkgoutput .= "
PackageSectionDescription
%s%s%s
\n"; + + return $ipkgoutput; +} + +function pkgdetails ($package) +{ + $result = db_query("SELECT * FROM packages,feeds WHERE packages.p_name='$package' AND feeds.f_name = packages.p_feed"); + + // display first result + + if ($result) + { + $package = $result[0]; + + $details = sprintf("

Package details for %s %s

", $package['packages.p_name'], $package['packages.p_version']); + $details .= sprintf ("

%s

", $package['packages.p_desc']); + $details .= ""; + + $details .= sprintf ("\n", htmlentities(str_replace('@', ' at ', $package['packages.p_maintainer']))); + + if($package['packages.p_homepage']) + { + $details .= sprintf ("\n", $package['packages.p_homepage']); + } + + if($package['packages.p_section']) + { + $details .= sprintf ("\n", $package['packages.p_section'],$package['packages.p_section']); + } + + if($package['packages.p_depends']) + { + $details .= sprintf ("\n", addlinks ($package['packages.p_depends'])); + } + + if($package['packages.p_recommends']) + { + $details .= sprintf ("\n", addlinks ($package['packages.p_recommends'])); + } + + if($package['packages.p_replaces']) + { + $details .= sprintf ("\n", addlinks ($package['packages.p_replaces'])); + } + + if($package['packages.p_provides']) + { + $details .= sprintf ("\n", addlinks ($package['packages.p_provides'])); + } + + if($package['packages.p_conflicts']) + { + $details .= sprintf ("\n", addlinks ($package['packages.p_conflicts'])); + } + + $size = $package['packages.p_size']; + + if(strlen($size) > 6) + { + $size = sprintf("%02.2f Megabytes", $size / (1024 * 1024)); + } + + if(strlen($size) > 3 && strlen($size) < 7) + { + $size = sprintf("%02.2f Kilobytes", $size / (1024 )); + } + + if(strlen($size) < 4) + { + $size = sprintf("%s Bytes", $size); + } + + $details .= sprintf ("\n
Maintainer:%s
Homepage:%s
Section:%s
Depends:%s
Recommends:%s
Replaces:%s
Provides:%s
Conflicts:%s
Size:%s
", $size); + + if($package['packages.p_source']) + { + $sourcearray = explode (" ", $package['packages.p_source']); + + $details .= "\n

Source:

    "; + + foreach ($sourcearray as $key => $source_url) + { + if (substr ($source_url, 0, 4) == "http" || substr ($source_url, 0, 3) == "ftp") + { + $url_parts = parse_url($source_url); + + $details .= sprintf ("
  • %s
    • ", $source_url, array_pop(explode('/', $url_parts['path']))); + } + else + { + $details .= sprintf ("
  • %s
    • ", $source_url); + } + } + + $details .= '
'; + + } + + $details .= "\n

Available versions and architectures:

    \n"; + + foreach($result as $packages_a) + { + $details .= sprintf("\n
  • %s %s for %s
    • \n", + $packages_a['feeds.f_uri']."/".$packages_a['packages.p_file'], + $packages_a['packages.p_name'], + $packages_a['packages.p_version'], + $packages_a['packages.p_arch']); + } + + $details .= "
\n"; + } + else + { + $details = "

Sorry, package not found\n

return\n"; + } + + return $details; +} + +function addlinks ($input) +{ + // split input elements up + $elements = preg_split ('/[\s,]+/', $input); + + $offset = 0; + + foreach ($elements as $element) + { + // skip version information and empty elements (shouldn't happend) + if (!eregi('^([0-9a-z\-]*)$', $element) OR empty($element)) + { + continue; + } + + // do we have this package in the db? + $result = db_query ("SELECT DISTINCT p_name FROM packages WHERE p_name='{$element}'"); + + if(isset($result[0]['p_name'])) + { + // find position of string in line + $pos = strpos ($input, $element, $offset); + $link = sprintf("$element", urlencode ($element)); + + // replace element with a link + $input = substr_replace ($input, $link, $pos, strlen ($element)); + + // update offset + $offset = ($pos + strlen ($link)); + } + else + { + $offset += strlen ($element); + } + } + + + return $input; +} + +function sectionslist() +{ + $ipkgoutput = ''; + + if($result = db_query ("SELECT DISTINCT p_section FROM packages ORDER BY p_section")) + { + $ipkgoutput = "
    \n"; + + foreach($result as $item) + { + $ipkgoutput .= sprintf ("
  • %s
    • ", + urlencode($item['p_section']), + $item['p_section']); + } + + $ipkgoutput .= "
\n"; + } + + return $ipkgoutput; +} + +?> diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php new file mode 100644 index 0000000000..5e5ba27e25 --- /dev/null +++ b/contrib/feed-browser/update.php @@ -0,0 +1,158 @@ += 2.4) +Provides: libfontconfig-utils +Replaces: libfontconfig-utils +Conflicts: libfontconfig-utils +Section: net +Architecture: armv5te +Maintainer: Angstrom Developers +MD5Sum: b8bd197224e24759d2162091a0fa727f +Size: 12346 +Filename: zeroconf_0.9-r0_armv5te.ipk +Source: http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.9.tar.gz file://zeroconf-default file://debian-zeroconf +Description: IPv4 link-local address allocator +*/ + + +$start = time(); +$p_count = 0; + + +$feeds = db_query("SELECT f_name, f_uri FROM feeds"); + +foreach($feeds as $feed) +{ + + print("Updating $feed[f_name]: $feed[f_uri]\n"); + db_query_n("DELETE FROM packages WHERE p_feed = '$feed[f_name]'"); + + $count = 0; + + $packagesgz_h = fopen("compress.zlib://$feed[f_uri]/Packages.gz", "r"); + if ($packagesgz_h) { + while (!feof($packagesgz_h)) { + $buffer = fscanf($packagesgz_h, "%[^:]: %[ -~]"); + list ($field, $value) = $buffer; + + + if($field == 'Package' && $count > 0) + { + insert_ipkgs ($package, $version, $depends, $section, $arch, $maintainer, $md5sum, $size, $file, $source, $desc,$feed[f_name], $conflicts, $provides, $replaces, $recommends); + unset($package, $version, $depends, $section, $arch, $maintainer, $md5sum, $size, $file, $source, $desc, $conflicts, $provides, $replaces, $recommends); + } + + + switch($field) + { + case 'Package': + $package = $value; + $count++; + break; + case 'Version': + $version = $value; + break; + case 'Depends': + $depends = $value; + break; + case 'Provides': + $provides = $value; + break; + case 'Recommends': + $recommends = $value; + break; + case 'Replaces': + $replaces = $value; + break; + case 'Conflicts': + $conflicts = $value; + break; + case 'Section': + $section = $value; + break; + case 'Architecture': + $arch = $value; + break; + case 'Maintainer': + $maintainer = str_replace("'","\"", $value); + break; + case 'MD5sum': + $md5sum = $value; + break; + case 'Size': + $size = $value; + break; + case 'Filename': + $file = $value; + break; + case 'Source': + $source = $value; + break; + case 'Description': + $desc = str_replace("'","\"", $value); + break; + } + + } + insert_ipkgs ($package, $version, $depends, $section, $arch, $maintainer, $md5sum, $size, $file, $source, $desc,$feed[f_name], $conflicts, $provides, $replaces, $recommends); + } + +$p_count = $count + $p_count; +gzclose($packagesgz_h); +} +//close the db + +$end = time(); +$difference = $end - $start; + +$days = floor($difference/86400); +$difference = $difference - ($days*86400); + +$hours = floor($difference/3600); +$difference = $difference - ($hours*3600); + +$minutes = floor($difference/60); +$difference = $difference - ($minutes*60); + +$seconds = $difference; + +print "Added $p_count packages in $days days, $hours hours, $minutes minutes and $seconds seconds \n"; + + +function insert_ipkgs ($package, $version, $depends, $section, $arch, $maintainer, $md5sum, $size, $file, $source, $desc, $feed, $conflicts, $provides, $replaces, $recommends) +{ + db_query_n( + "INSERT INTO packages (p_name, p_version, p_depends, p_arch, p_maintainer, p_section, p_size, p_md5, p_source, p_desc, p_feed, p_file, p_conflicts, p_provides, p_replaces, p_recommends) + VALUES ('$package', '$version', '$depends', '$arch', '$maintainer', '$section', '$size', '$md5sum', '$source', '$desc', '$feed', '$file', '$conflicts', '$provides', '$replaces', '$recommends') + "); +} + + +function db_query($query) +{ + $db_name = "/home/koen/feeds.db"; + $db_h = sqlite_open($db_name); + $query_h = sqlite_query ($db_h, $query); + $result = sqlite_fetch_all ($query_h, SQLITE_ASSOC); + sqlite_close($db_h); + return ($result); +} + + +function db_query_n($query) +{ + $db_name = "/home/koen/feeds.db"; + $db_h = sqlite_open($db_name); + $query_h = sqlite_query ($db_h, $query); + sqlite_close($db_h); + return ($result); +} + + + +?> -- cgit v1.2.3 From dd6571361026db09f1c48df72b8ca2c8a5c7d639 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 24 Aug 2006 10:26:28 +0000 Subject: contrib/feed-browser/update.php: add GPL header --- contrib/feed-browser/update.php | 50 +++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php index 5e5ba27e25..dab8bb260b 100644 --- a/contrib/feed-browser/update.php +++ b/contrib/feed-browser/update.php @@ -1,23 +1,39 @@ = 2.4) -Provides: libfontconfig-utils -Replaces: libfontconfig-utils -Conflicts: libfontconfig-utils -Section: net -Architecture: armv5te -Maintainer: Angstrom Developers -MD5Sum: b8bd197224e24759d2162091a0fa727f -Size: 12346 -Filename: zeroconf_0.9-r0_armv5te.ipk -Source: http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.9.tar.gz file://zeroconf-default file://debian-zeroconf -Description: IPv4 link-local address allocator -*/ + A package entry looks like this: + Package: zeroconf + Version: 0.9-r0 + Depends: libc6 (>= 2.4) + Provides: libfontconfig-utils + Replaces: libfontconfig-utils + Conflicts: libfontconfig-utils + Section: net + Architecture: armv5te + Maintainer: Angstrom Developers + MD5Sum: b8bd197224e24759d2162091a0fa727f + Size: 12346 + Filename: zeroconf_0.9-r0_armv5te.ipk + Source: http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.9.tar.gz file://zeroconf-default file://debian-zeroconf + Description: IPv4 link-local address allocator + */ $start = time(); -- cgit v1.2.3 From 70f28676088eeda6e58ee5d9246d0b3637c270b0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 24 Aug 2006 10:49:03 +0000 Subject: contrib/feed-browser/update.php: fix path to db --- contrib/feed-browser/update.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php index dab8bb260b..c32e1804cc 100644 --- a/contrib/feed-browser/update.php +++ b/contrib/feed-browser/update.php @@ -151,7 +151,7 @@ function insert_ipkgs ($package, $version, $depends, $section, $arch, $maintaine function db_query($query) { - $db_name = "/home/koen/feeds.db"; + $db_name = "./feeds.db"; $db_h = sqlite_open($db_name); $query_h = sqlite_query ($db_h, $query); $result = sqlite_fetch_all ($query_h, SQLITE_ASSOC); @@ -162,7 +162,7 @@ function db_query($query) function db_query_n($query) { - $db_name = "/home/koen/feeds.db"; + $db_name = "./feeds.db"; $db_h = sqlite_open($db_name); $query_h = sqlite_query ($db_h, $query); sqlite_close($db_h); -- cgit v1.2.3 From be99a6b3f42e9842343750845bda7471a6e4807e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 24 Aug 2006 11:42:39 +0000 Subject: xmms_1.2.10.bb : split the plugins into seperate packages as very few of them make sense on a PDA platform. Add RRECOMMENDS for needed plugins and mad/tremor ones so people automatically get working mp3/ogg playback --- packages/xmms/xmms_1.2.10.bb | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb index 9ee59cef29..ba6c1e115c 100644 --- a/packages/xmms/xmms_1.2.10.bb +++ b/packages/xmms/xmms_1.2.10.bb @@ -3,14 +3,17 @@ HOMEPAGE = "http://www.xmms.org/" LICENSE = "GPL" SECTION = "x11/multimedia" # TODO add esd -DEPENDS = "gtk+-1.2 libvorbis mikmod alsa-lib" +DEPENDS = "gtk+-1.2 libvorbis mikmod alsa-lib libsm esound" SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \ file://gcc4.patch;patch=1 \ file://xmms-config-dequote.patch;patch=1 \ file://acinclude.m4 \ file://xmms.sh" -PR = "r2" +PR = "r3" + +RRECOMMENDS_${PN} = "xmms-plugin-output-oss xmms-plugin-output-alsa \ + xmms-mad xmms-tremor" inherit autotools binconfig @@ -35,6 +38,31 @@ do_install_append() { install xmms/xmms_mini.xpm ${D}${datadir}/pixmaps } +PACKAGES_DYNAMIC = "xmms-plugin-effect-* xmms-plugin-general-* \ + xmms-plugin-input-* xmms-plugin-output-* \ + xmms-plugin-visualisation-*" + +python populate_packages_prepend () { + import os.path + + xmms_libdir = bb.data.expand('${libdir}/xmms', d) + effects_root = os.path.join(xmms_libdir, 'Effect') + general_root = os.path.join(xmms_libdir, 'General') + input_root = os.path.join(xmms_libdir, 'Input') + output_root = os.path.join(xmms_libdir, 'Output') + visualisation_root = os.path.join(xmms_libdir, 'Visualization') + + do_split_packages(d, effects_root, '^lib(.*)\.so$', 'xmms-plugin-effect-%s', 'XMMS Effect plugin for %s') + do_split_packages(d, general_root, '^lib(.*)\.so$', 'xmms-plugin-general-%s', 'XMMS General plugin for %s') + do_split_packages(d, input_root, '^lib(.*)\.so$', 'xmms-plugin-input-%s', 'XMMS Input plugin for %s') + do_split_packages(d, output_root, '^lib(.*)\.so$', 'xmms-plugin-output-%s', 'XMMS Output plugin for %s') + do_split_packages(d, visualisation_root, '^lib(.*)\.so$', 'xmms-plugin-visualization-%s', 'XMMS Visualization plugin for %s') +} + do_stage() { autotools_stage_all } + +FILES_${PN} = "${bindir}/xmms ${bindir}/xmms.sh ${libdir}/libxmms*.so.* \ + ${datadir}/applications/xmms.desktop \ + ${datadir}/pixmaps/xmms_mini.xpm" -- cgit v1.2.3 From 396927890b0daf83f835ffe50dcdc14e038acf74 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 24 Aug 2006 11:46:27 +0000 Subject: feed-browser/update.php: define database name once --- contrib/feed-browser/update.php | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php index c32e1804cc..07f4f15bc9 100644 --- a/contrib/feed-browser/update.php +++ b/contrib/feed-browser/update.php @@ -39,6 +39,7 @@ $start = time(); $p_count = 0; +define('DB_FILENAME', './feeds.db'); $feeds = db_query("SELECT f_name, f_uri FROM feeds"); @@ -151,22 +152,30 @@ function insert_ipkgs ($package, $version, $depends, $section, $arch, $maintaine function db_query($query) { - $db_name = "./feeds.db"; - $db_h = sqlite_open($db_name); - $query_h = sqlite_query ($db_h, $query); - $result = sqlite_fetch_all ($query_h, SQLITE_ASSOC); - sqlite_close($db_h); - return ($result); + $result = FALSE; + + if($db_h = sqlite_open(DB_FILENAME)) + { + $query_h = sqlite_query ($db_h, $query); + $result = sqlite_fetch_all ($query_h, SQLITE_ASSOC); + sqlite_close($db_h); + } + + return $result; } function db_query_n($query) { - $db_name = "./feeds.db"; - $db_h = sqlite_open($db_name); - $query_h = sqlite_query ($db_h, $query); - sqlite_close($db_h); - return ($result); + $result = FALSE; + + if($db_h = sqlite_open(DB_FILENAME)) + { + $query_h = sqlite_query ($db_h, $query); + sqlite_close($db_h); + } + + return $result; } -- cgit v1.2.3 From e9608f75362acabb2f3769259daaaa5872894c1d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 24 Aug 2006 11:55:02 +0000 Subject: feed-browser: more cleanups - package details switched to definition list - database check/creation moved to function - removed dead code --- contrib/feed-browser/css/feed.css | 5 ++ contrib/feed-browser/index.php | 109 +++++++++++++++++++------------------- 2 files changed, 59 insertions(+), 55 deletions(-) diff --git a/contrib/feed-browser/css/feed.css b/contrib/feed-browser/css/feed.css index fd9f65c5c1..7a7e55ebd6 100644 --- a/contrib/feed-browser/css/feed.css +++ b/contrib/feed-browser/css/feed.css @@ -55,3 +55,8 @@ h2 display: inline; list-style: none; } + +dt +{ + padding-top: 0.5em; +} diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php index 7921a42260..1603cfd779 100644 --- a/contrib/feed-browser/index.php +++ b/contrib/feed-browser/index.php @@ -48,44 +48,9 @@ error_reporting(E_ALL); -$db_name = "./feeds.db"; -$db = sqlite_open($db_name); - -//initialiaze db -if (db_table_exists ($db, 'packages') === FALSE) -{ - sqlite_query ($db, "CREATE TABLE packages ( - p_name varchar(50), - p_version varchar(10), - p_arch varchar(12), - p_depends varchar(50), - p_maintainer varchar(50), - p_homepage varchar(100), - p_section varchar(20), - p_replaces varchar(50), - p_provides varchar(50), - p_recommends varchar(50), - p_conflicts varchar(50), - p_size int(10), - p_md5 char(32), - p_source varchar(500), - p_feed varchar(20), - p_file varchar(100), - p_desc varchar(1000))"); -} - -if (db_table_exists ($db, 'feeds') === FALSE) -{ - sqlite_query ($db, "CREATE TABLE feeds ( - f_name varchar(20), - f_uri varchar(100), - f_comments varchar(500))"); +define('DB_FILENAME', './feeds.db'); - test_insert_ipkgs ($db) ; -} - -//close the db -sqlite_close($db); +check_database(); $action = ''; @@ -159,18 +124,11 @@ function db_table_exists ($db, $mytable) return FALSE; } -function get_archs_fromdb() -{ - return db_query("SELECT DISTINCT p_arch FROM packagess ORDER BY p_arch"); -} - function db_query($query) { - global $db_name; - $result = FALSE; - if($db_h = sqlite_open($db_name)) + if($db_h = sqlite_open(DB_FILENAME)) { if($query_h = sqlite_query ($db_h, $query)) { @@ -373,43 +331,43 @@ function pkgdetails ($package) $details = sprintf("

Package details for %s %s

", $package['packages.p_name'], $package['packages.p_version']); $details .= sprintf ("

%s

", $package['packages.p_desc']); - $details .= ""; + $details .= "
"; - $details .= sprintf ("\n
", htmlentities(str_replace('@', ' at ', $package['packages.p_maintainer']))); + $details .= sprintf ("\n
Maintainer:
%s
", htmlentities(str_replace('@', ' at ', $package['packages.p_maintainer']))); if($package['packages.p_homepage']) { - $details .= sprintf ("\n", $package['packages.p_homepage']); + $details .= sprintf ("\n
Homepage:
%s
", $package['packages.p_homepage']); } if($package['packages.p_section']) { - $details .= sprintf ("\n", $package['packages.p_section'],$package['packages.p_section']); + $details .= sprintf ("\n
Section:
%s
", $package['packages.p_section'],$package['packages.p_section']); } if($package['packages.p_depends']) { - $details .= sprintf ("\n", addlinks ($package['packages.p_depends'])); + $details .= sprintf ("\n
Depends:
%s
", addlinks ($package['packages.p_depends'])); } if($package['packages.p_recommends']) { - $details .= sprintf ("\n", addlinks ($package['packages.p_recommends'])); + $details .= sprintf ("\n
Recommends:
%s
", addlinks ($package['packages.p_recommends'])); } if($package['packages.p_replaces']) { - $details .= sprintf ("\n", addlinks ($package['packages.p_replaces'])); + $details .= sprintf ("\n
Replaces:
%s
", addlinks ($package['packages.p_replaces'])); } if($package['packages.p_provides']) { - $details .= sprintf ("\n", addlinks ($package['packages.p_provides'])); + $details .= sprintf ("\n
Provides:
%s
", addlinks ($package['packages.p_provides'])); } if($package['packages.p_conflicts']) { - $details .= sprintf ("\n", addlinks ($package['packages.p_conflicts'])); + $details .= sprintf ("\n
Conflicts:
%s
", addlinks ($package['packages.p_conflicts'])); } $size = $package['packages.p_size']; @@ -429,7 +387,7 @@ function pkgdetails ($package) $size = sprintf("%s Bytes", $size); } - $details .= sprintf ("\n
Maintainer:%s
Homepage:%s
Section:%s
Depends:%s
Recommends:%s
Replaces:%s
Provides:%s
Conflicts:%s
Size:%s
", $size); + $details .= sprintf ("\n
Size:
%s
", $size); if($package['packages.p_source']) { @@ -537,4 +495,45 @@ function sectionslist() return $ipkgoutput; } +function check_database() +{ + if($db = sqlite_open(DB_FILENAME)) + { + //initialize db + if (db_table_exists ($db, 'packages') === FALSE) + { + sqlite_query ($db, "CREATE TABLE packages ( + p_name varchar(50), + p_version varchar(10), + p_arch varchar(12), + p_depends varchar(50), + p_maintainer varchar(50), + p_homepage varchar(100), + p_section varchar(20), + p_replaces varchar(50), + p_provides varchar(50), + p_recommends varchar(50), + p_conflicts varchar(50), + p_size int(10), + p_md5 char(32), + p_source varchar(500), + p_feed varchar(20), + p_file varchar(100), + p_desc varchar(1000))"); + } + + if (db_table_exists ($db, 'feeds') === FALSE) + { + sqlite_query ($db, "CREATE TABLE feeds ( + f_name varchar(20), + f_uri varchar(100), + f_comments varchar(500))"); + + test_insert_ipkgs ($db) ; + } + + sqlite_close($db); + } +} + ?> -- cgit v1.2.3 From 048e8595e8cd1fbd8f90e35892244d81f7d9b6b7 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Thu, 24 Aug 2006 13:15:40 +0000 Subject: omap5912osk: change prefered version of u-boot to a recent git tag * Compiles with gcc 4.x * Compiles for omap5912osk --- conf/machine/omap5912osk.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index dccc5a227b..49ea6f6b90 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -9,6 +9,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020" + BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" -- cgit v1.2.3 From 5af48bb75ef7787123cab9b050cdca47ce2397b7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 24 Aug 2006 14:53:41 +0000 Subject: feed-browser: another set of functionality and look changes - added sections tree on left side - need some work as we do not have 'e' or 'gnome' section so parts are wrong - letterchooser is always visible - removed menu as it is useless now - package details has versions sorted by PV - all pages should now validate as HTML 1.0 Strict - restructured code a bit - now HTML mainblock is in one place --- contrib/feed-browser/css/feed.css | 32 ++++++++-- contrib/feed-browser/index.php | 131 +++++++++++++++++++++++++------------- 2 files changed, 112 insertions(+), 51 deletions(-) diff --git a/contrib/feed-browser/css/feed.css b/contrib/feed-browser/css/feed.css index 7a7e55ebd6..b1252c4f7e 100644 --- a/contrib/feed-browser/css/feed.css +++ b/contrib/feed-browser/css/feed.css @@ -29,11 +29,6 @@ td vertical-align: top; } -#page { - margin: 1em auto; - width: 80%; -} - #letters { margin: 1em 0; @@ -60,3 +55,30 @@ dt { padding-top: 0.5em; } + +#sections +{ + list-style: none; + font-size: 0.8em; +} + +.subsections +{ + list-style: none; + margin-left: -1em; +} + +#page +{ +} + +#left +{ + float: left; + width: 20%; +} + +#right +{ + width: 79%; +} diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php index 1603cfd779..c34fa4ffb8 100644 --- a/contrib/feed-browser/index.php +++ b/contrib/feed-browser/index.php @@ -30,22 +30,6 @@ * */ -?> - - -Feed browser - - - - - -
- - -
- + + + + Feed browser + + + + + +
+
+ +
+ "; $alfabet = array('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y'); @@ -238,16 +228,11 @@ function searchletter($searchletter) } else { - $ipkgoutput .= sprintf(" %s |", $letter, $letter ); + $ipkgoutput .= sprintf(" %s |", $letter, $letter, $letter ); } } - $ipkgoutput .= " z"; - - if(isset($searchletter)) - { - $ipkgoutput .= searchpkg("$searchletter%"); - } + $ipkgoutput .= " z"; return $ipkgoutput; } @@ -274,8 +259,8 @@ function searchpkg ($searchword) } $ipkgoutput .= sprintf - ("%s%s %s\n", - urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], $package['p_desc']); + ("%s%s %s\n", + urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], htmlentities($package['p_desc'])); } } @@ -306,11 +291,11 @@ function searchsection($section) } } - $ipkgoutput .= sprintf ("%s%s%s", + $ipkgoutput .= sprintf ("%s%s%s", urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], - $package['p_desc']); + htmlentities($package['p_desc'])); }//if strstr } @@ -321,7 +306,9 @@ function searchsection($section) function pkgdetails ($package) { - $result = db_query("SELECT * FROM packages,feeds WHERE packages.p_name='$package' AND feeds.f_name = packages.p_feed"); + $result = db_query("SELECT * FROM packages,feeds + WHERE packages.p_name='$package' AND feeds.f_name = packages.p_feed + ORDER BY packages.p_version DESC"); // display first result @@ -330,7 +317,7 @@ function pkgdetails ($package) $package = $result[0]; $details = sprintf("

Package details for %s %s

", $package['packages.p_name'], $package['packages.p_version']); - $details .= sprintf ("

%s

", $package['packages.p_desc']); + $details .= sprintf ("

%s

", htmlentities($package['packages.p_desc'])); $details .= "
"; $details .= sprintf ("\n
Maintainer:
%s
", htmlentities(str_replace('@', ' at ', $package['packages.p_maintainer']))); @@ -342,7 +329,7 @@ function pkgdetails ($package) if($package['packages.p_section']) { - $details .= sprintf ("\n
Section:
%s
", $package['packages.p_section'],$package['packages.p_section']); + $details .= sprintf ("\n
Section:
%s
", $package['packages.p_section'],$package['packages.p_section']); } if($package['packages.p_depends']) @@ -417,10 +404,13 @@ function pkgdetails ($package) foreach($result as $packages_a) { - $details .= sprintf("\n
  • %s %s for %s
    • \n", + $details .= sprintf("\n
  • %s %s for %s
    • \n", $packages_a['feeds.f_uri']."/".$packages_a['packages.p_file'], $packages_a['packages.p_name'], $packages_a['packages.p_version'], + $packages_a['packages.p_arch'], + $packages_a['packages.p_name'], + $packages_a['packages.p_version'], $packages_a['packages.p_arch']); } @@ -456,7 +446,7 @@ function addlinks ($input) { // find position of string in line $pos = strpos ($input, $element, $offset); - $link = sprintf("$element", urlencode ($element)); + $link = sprintf("$element", urlencode ($element)); // replace element with a link $input = substr_replace ($input, $link, $pos, strlen ($element)); @@ -480,13 +470,62 @@ function sectionslist() if($result = db_query ("SELECT DISTINCT p_section FROM packages ORDER BY p_section")) { - $ipkgoutput = "
      \n"; + $ipkgoutput = "
        \n"; + + $section_up = $result[0]['p_section']; + $section_level = FALSE; + $opie_top = FALSE; foreach($result as $item) { - $ipkgoutput .= sprintf ("
      • %s
        • ", + $section_name = $item['p_section']; + + if(0 === strpos($section_name, 'opie') AND !$opie_top) + { + $opie_top = TRUE; + + $section_up = 'opie'; + } + elseif($opie_top AND 0 !== strpos($section_name, 'opie')) + { + $opie_top = FALSE; + } + + if( + strpos($section_name, '/') // subsection + ) + { + if(0 === strpos($section_name, $section_up . '/')) // console/network are not part of console/net + { + if(!$section_level) + { + $ipkgoutput .= '
        • '; + } + + $section_name = str_replace($section_up . '/', '', $item['p_section']); + $section_level = TRUE; + } + } + elseif($section_level) + { + $section_up = $section_name; + $ipkgoutput .= '
        • '; + $section_level = FALSE; + } + else + { + $section_up = $section_name; + } + + $ipkgoutput .= sprintf ("
      • %s
        • ", urlencode($item['p_section']), - $item['p_section']); + urlencode($item['p_section']), + $section_name); + } + + if($section_level) + { + $ipkgoutput .= '
      '; } $ipkgoutput .= "
    \n"; -- cgit v1.2.3 From e4a01aea93c22898fb93db4e3fda041bcf55a7ca Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 24 Aug 2006 15:26:56 +0000 Subject: feed-browser: no need to keep two copies of package listing generation code --- contrib/feed-browser/index.php | 42 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php index c34fa4ffb8..809e2c7b8d 100644 --- a/contrib/feed-browser/index.php +++ b/contrib/feed-browser/index.php @@ -239,12 +239,18 @@ function searchletter($searchletter = '') function searchpkg ($searchword) { - $result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC;"); + if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC")) + { + return generate_list_of_packages($result); + } +} +function generate_list_of_packages($query_result) +{ $ipkgoutput = "\n"; $ipkgoutput .="\n"; - foreach($result as $package) + foreach($query_result as $package) { if (!strstr ($package['p_name'], 'locale')) { @@ -272,36 +278,10 @@ function searchpkg ($searchword) function searchsection($section) { - $result= db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_section like '$section%' order by p_section asc, p_name asc;"); - - $ipkgoutput = "
    PackageSectionDescription
    \n"; - $ipkgoutput .="\n"; - - foreach($result as $package) - { - if (!strstr ($package['p_name'], 'locale')) - { - if(strlen($package['p_desc'])> 40) - { - $pos = strpos($package['p_desc'],' ', 40); - - if($pos) - { - $package['p_desc'] = substr($package['p_desc'], 0, $pos) . '...'; - } - } - - $ipkgoutput .= sprintf ("", - urlencode($package['p_name']), - $package['p_name'], - $package['p_section'], $package['p_section'], - htmlentities($package['p_desc'])); - }//if strstr + if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_section LIKE '$section%' ORDER BY p_section ASC, p_name ASC")) + { + return generate_list_of_packages($result); } - - $ipkgoutput .= "
    PackageSectionDescription
    %s%s%s
    \n"; - - return $ipkgoutput; } function pkgdetails ($package) -- cgit v1.2.3 From 7bd6b93c45c1cf31e8593b0e8ee433f5d6c5100a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 24 Aug 2006 15:28:39 +0000 Subject: feed-browser: split maintainers to separate lines (works when ', ' is used as separator --- contrib/feed-browser/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php index 809e2c7b8d..9b612f9fd1 100644 --- a/contrib/feed-browser/index.php +++ b/contrib/feed-browser/index.php @@ -300,7 +300,7 @@ function pkgdetails ($package) $details .= sprintf ("

    %s

    ", htmlentities($package['packages.p_desc'])); $details .= "
    "; - $details .= sprintf ("\n
    Maintainer:
    %s
    ", htmlentities(str_replace('@', ' at ', $package['packages.p_maintainer']))); + $details .= sprintf ("\n
    Maintainer:
    %s
    ", str_replace(array('@',', '), array(' at ', '
    '), htmlentities($package['packages.p_maintainer']))); if($package['packages.p_homepage']) { -- cgit v1.2.3