Check-in [d3806ae4e0]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:d3806ae4e08fc2543c28958754198cc7dd7b97a6
Date: 2012-06-04 01:05:34
User: BarryK
Comment:ppm: fixed bug, search multi-repos then click to install a pkg

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/local/petget/installpreview.sh

@@ -9,10 +9,11 @@
 #120101 01micko: jwm >=547 has -reload, no screen flicker.
 #120116 rev. 514 introduced icon rendering method which broke -reload at 547. fixed at rev. 574.
 #120203 BK: internationalized.
 #120504 if no pkgs in category, then when click in window in main dlg, comes here with TREE1="".
 #120504 select correct repo when have chosen a pkg from multiple-repo list.
+#120604 fix for prepended icons field.
 
 export TEXTDOMAIN=petget___installpreview.sh
 export OUTPUT_CHARSET=UTF-8
 
 [ "$TREE1" = "" ] && exit #120504 nothing to install.
@@ -25,16 +26,23 @@
 X1PID=$!
 
 #ex: TREE1=abiword-1.2.4 (first field in database entry).
 DB_FILE=Packages-`cat /tmp/petget/current-repo-triad` #ex: Packages-slackware-12.2-official
 tPATTERN='^'"$TREE1"'|'
+xtPATTERN='|'"$TREE1"'|'
 
 #120504 if findnames.sh searched multiple repos, /tmp/petget/current-repo-triad (set in pkg_chooser.sh) might be wrong...
 [ -f /tmp/petget/current-repo-triad.previous ] && rm -f /tmp/petget/current-repo-triad.previous
 if [ -f /tmp/petget/filterpkgs.results.post ];then
  #file ex line: abiword-1.2.3|[puppy-4-official] Abiword word processor|puppy-4-official|
- ALTSEARCHREPO="$(grep "$tPATTERN" /tmp/petget/filterpkgs.results.post | grep '|\[' | cut -f 2 -d '[' | cut -f 1 -d ']')"
+ #120604 fix for prepended icons field...
+ FLG_APPICONS="`cat /var/local/petget/flg_appicons`" #see configure.sh
+ if [ "$FLG_APPICONS" = "true" ];then
+  ALTSEARCHREPO="$(grep "$xtPATTERN" /tmp/petget/filterpkgs.results.post | grep '|\[' | cut -f 2 -d '[' | cut -f 1 -d ']')"
+ else
+  ALTSEARCHREPO="$(grep "$tPATTERN" /tmp/petget/filterpkgs.results.post | grep '|\[' | cut -f 2 -d '[' | cut -f 1 -d ']')"
+ fi
  [ "$ALTSEARCHREPO" ] && DB_FILE="Packages-${ALTSEARCHREPO}"
  #hmmm, other scripts, ex dependencies.sh, will need to have this correct...
  if [ "$ALTSEARCHREPO" ];then
   mv -f /tmp/petget/current-repo-triad /tmp/petget/current-repo-triad.previous #need to restore old one before exit this script.
   echo -n "$ALTSEARCHREPO" > /tmp/petget/current-repo-triad

Changes to woof-distro/arm/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -319,10 +319,11 @@
 yes|libdaemon|libdaemon0,libdaemon-dev|exe,dev,doc,nls
 yes|libdatrie|libdatrie1,libdatrie-dev|exe,dev,doc,nls
 yes|libdb|libdb4.8,libdb4.8-dev|exe>dev,dev,doc,nls
 yes|libdc1394|libdc1394-22,libdc1394-22-dev|exe,dev,doc,nls|
 yes|libdca|libdca0,libdca-dev|exe,dev,doc,nls| #mplayer needs this.
+yes|libdmx|libdmx1,libdmx-dev|exe,dev,doc,nls| #this is actaully part of xorg.
 no|libdrm||exe,dev,doc,nls
 yes|libdvdcss||exe,dev,doc,nls
 yes|libdvdnav|libdvdnav4,libdvdnav-dev|exe,dev,doc,nls| #needed by mplayer.
 no|libdvdplay||exe,dev,doc,nls
 yes|libdvdread|libdvdread4,libdvdread-dev|exe,dev,doc,nls
@@ -329,10 +330,11 @@
 yes|libedit|libedit2,libedit-dev|exe,dev,doc,nls
 yes|libelf|libelfg0,libelfg0-dev|exe,dev,doc,nls| #note, elfutils is a different pkg.
 yes|libexif|libexif12,libexif-dev|exe,dev,doc,nls
 yes|libexif-gtk|libexif-gtk5,libexif-gtk-dev|exe,dev,doc,nls
 yes|libffi|libffi6,libffi-dev|exe,dev,doc,nls
+yes|libfs|libfs6,libfs-dev|exe,dev,doc,nls| #120603 mavrothal reported need this for compiling xorg drivers.
 yes|libgcrypt|libgcrypt11,libgcrypt11-dev|exe,dev,doc,nls
 yes|libgee|libgee2,libgee-dev|exe,dev,doc,nls| #used by vala.
 yes|libgif|libgif4,libgif-dev|exe,dev,doc,nls
 no|libgio-fam|libgio-fam|exe,dev,doc,nls
 yes|libglade2|libglade2-0,libglade2-dev|exe,dev,doc,nls
@@ -409,10 +411,11 @@
 no|libxfce4util|libxfce4util4,libxfce4util-dev|exe,dev,doc,nls
 no|libxfcegui4|libxfcegui4-4,libxfcegui4-dev|exe,dev,doc,nls
 yes|libxml2|libxml2,libxml2-dev|exe,dev,doc,nls
 yes|libxml2-utils|libxml2-utils|exe>dev,dev,doc,nls
 yes|libxslt|libxslt1.1,libxslt1-dev,xsltproc|exe,dev,doc,nls
+yes|libxvmc|libxvmc1,libxvmc-dev|exe,dev,doc,nls| #this is actually part of xorg.
 no|libyahoo2||exe,dev,doc,nls| #needed by ayttm.
 yes|linux_firewall||exe
 no|linux_firmware_dvb||exe
 yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls
 yes|lirc|liblircclient0,liblircclient-dev|exe,dev,doc,nls

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -156,11 +156,11 @@
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
 no|firefox-flash|firefox|exe,dev,doc>null,nls>null
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
-yes|flashplayer||exe
+yes|flashplayer10|flashplayer10-10.3.*|exe,dev,doc,nls|pet:common
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|flsynclient||exe
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls
 no|foomatic-db|foomatic-db|exe,dev,doc,nls
 yes|foomatic-filters|foomatic-filters|exe,dev,doc,nls
@@ -187,11 +187,12 @@
 yes|gdbm|libgdbm3,libgdbm-dev|exe,dev,doc,nls
 yes|gdk-pixbuf|libgdk-pixbuf2.0-0,libgdk-pixbuf2.0-common,libgdk-pixbuf2.0-dev|exe,dev,doc,nls
 yes|gdmap|gdmap|exe,dev>null,doc,nls
 yes|geany|geany,geany-common,geany-plugins-common,geany-plugin-addons,geany-plugin-codenav,geany-plugin-extrasel,geany-plugin-numberedbookmarks,geany-plugin-prettyprinter,geany-plugin-spellcheck,geany-plugin-treebrowser,geany-plugin-xmlsnippets|exe,dev>null,doc,nls
 no|geany||exe
-yes|gecko-mediaplayer|gecko-mediaplayer|exe,dev,doc,nls
+no|gecko-mediaplayer|gecko-mediaplayer|exe,dev,doc,nls| #does not  work, use my pet.
+yes|gecko-mediaplayer||exe,dev,doc,nls
 no|gedit||exe
 yes|getcurpos||exe
 yes|getdir||exe,dev>null,doc,nls
 yes|gettext|gettext-base,gettext|exe>dev,dev,doc,nls
 yes|gettext|gettext-base,gettext|exe,dev>null,doc>null,nls>null
@@ -323,19 +324,21 @@
 yes|libdaemon|libdaemon0,libdaemon-dev|exe,dev,doc,nls
 yes|libdatrie|libdatrie1,libdatrie-dev|exe,dev,doc,nls
 yes|libdb|libdb4.8,libdb4.8-dev|exe>dev,dev,doc,nls
 yes|libdc1394|libdc1394-22,libdc1394-22-dev|exe,dev,doc,nls| #ffmpeg3 compiled in luci needs this
 yes|libdca|libdca0,libdca-dev|exe,dev,doc,nls| #mplayer needs this.
+yes|libdmx|libdmx1,libdmx-dev|exe,dev,doc,nls| #this is actaully part of xorg.
 yes|libdvdcss||exe,dev,doc,nls
 yes|libdvdnav|libdvdnav4,libdvdnav-dev|exe,dev,doc,nls| #needed by mplayer.
 no|libdvdplay||exe,dev,doc,nls
 yes|libdvdread|libdvdread4,libdvdread-dev|exe,dev,doc,nls
 yes|libedit|libedit2,libedit-dev|exe,dev,doc,nls
 yes|libelf|libelfg0,libelfg0-dev|exe,dev,doc,nls| #note, elfutils is a different pkg.
 yes|libexif|libexif12,libexif-dev|exe,dev,doc,nls
 yes|libexif-gtk|libexif-gtk5,libexif-gtk-dev|exe,dev,doc,nls
 yes|libffi|libffi6,libffi-dev|exe,dev,doc,nls
+yes|libfs|libfs6,libfs-dev|exe,dev,doc,nls| #120603 mavrothal reported need this for compiling xorg drivers.
 yes|libgcrypt|libgcrypt11,libgcrypt11-dev|exe,dev,doc,nls
 yes|libgee|libgee2,libgee-dev|exe,dev,doc,nls
 yes|libgif|libgif4,libgif-dev|exe,dev,doc,nls
 no|libgio-fam|libgio-fam|exe,dev,doc,nls
 yes|libglade2|libglade2-0,libglade2-dev|exe,dev,doc,nls
@@ -399,11 +402,11 @@
 yes|libtool|libtool,autotools-dev|exe>dev,dev,doc,nls
 yes|libunistring|libunistring0,libunistring-dev|exe,dev,doc,nls
 yes|libusb|libusb-0.1-4,libusb-dev|exe,dev,doc,nls
 yes|libusb1|libusb-1.0-0,libusb-1.0-0-dev|exe,dev,doc,nls| #libusb1 necesssary for ffmpeg3
 yes|libva|libva1,libva-dev,libva-glx1,libva-egl1|exe,dev,doc,nls| #needed by mplayer.
-yes|libvdpau|libvdpau1,libvdpau-dev|exe,dev,doc,nls| #needed by mplayer.
+yes|libvdpau|libvdpau1,libvdpau-dev|exe,dev,doc,nls| #needed by mplayer. no, this has another big dep: Failed to open VDPAU backend libvdpau_nvidia.so missing.
 no|libvolume-id|libvolume-id1,libvolume-id-dev|exe,dev,doc,nls
 yes|libvorbis|libvorbis0a,libvorbis-dev,libvorbisenc2,libvorbisfile3|exe,dev,doc,nls
 yes|libvpx|libvpx1,libvpx-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|libwmf|libwmf0.2-7,libwmf-dev|exe,dev,doc,nls
 yes|libwpg|libwpg-0.2-2|exe,dev>null,doc,nls
@@ -414,10 +417,11 @@
 no|libxfce4util|libxfce4util4,libxfce4util-dev|exe,dev,doc,nls
 no|libxfcegui4|libxfcegui4-4,libxfcegui4-dev|exe,dev,doc,nls
 yes|libxml2|libxml2,libxml2-dev|exe,dev,doc,nls
 yes|libxml2-utils|libxml2-utils|exe>dev,dev,doc,nls
 yes|libxslt|libxslt1.1,libxslt1-dev,xsltproc|exe,dev,doc,nls
+yes|libxvmc|libxvmc1,libxvmc-dev|exe,dev,doc,nls| #this is actually part of xorg.
 yes|libyahoo2||exe,dev,doc,nls| #needed by ayttm.
 yes|linux_firewall||exe
 yes|linux_firmware_dvb||exe
 yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls
 yes|linux_headers|linux_headers-3.2.18*|exe>dev,dev,doc,nls|pet: