Check-in [03dbd2b1d9]
Not logged in

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

Overview

SHA1 Hash:03dbd2b1d98a42bb830fbbdae48ce4dcf5ed063a
Date: 2012-05-10 01:03:32
User: BarryK
Comment:01micko: ppm: ziggy ui crashed if no repos chosen in configure window

Tags And Properties
Changes

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

@@ -3,10 +3,11 @@
 #2009 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html).
 #called from /usr/local/petget/pkg_chooser.sh
 #configure package manager
 #110118 alternate user interfaces.
 #120203 BK: internationalized.
+#120210 01micko: Ziggy ui crashes if *all* repos unticked here (no one would do that, but it is still a bug).
 
 export TEXTDOMAIN=petget___configure.sh
 export OUTPUT_CHARSET=UTF-8
 
 #export LANG=C
@@ -13,13 +14,21 @@
 . /etc/DISTRO_SPECS #has DISTRO_BINARY_COMPAT, DISTRO_COMPAT_VERSION
 . /root/.packages/DISTRO_PKGS_SPECS
 . /root/.packages/DISTRO_PET_REPOS
 . /root/.packages/PKGS_MANAGEMENT #has PKG_REPOS_ENABLED
 
-#find what repos are currently in use...
+#find what repos are currently in use... 120510...
 CHECKBOXES_REPOS=""
-for ONEREPO in `ls -1 /root/.packages/Packages-*`
+#for ONEREPO in `ls -1 /root/.packages/Packages-*`
+#120510 bugfix with ui_Ziggy. add CHECKBOX_MAIN_REPO var to gui
+MAIN_REPO="`ls -1 /root/.packages/Packages-* | grep "puppy\-${DISTRO_FILE_PREFIX}\-" | head -n 1`"
+BASE_MAIN_REPO="`basename $MAIN_REPO`"
+bMAIN_PATTERN=' '"$BASE_MAIN_REPO"' '
+MAIN_DBNAME="`echo -n "$BASE_MAIN_REPO" | sed -e 's%Packages\-%%'`"
+CHECKBOX_MAIN_REPO="<checkbox><default>true</default><label>${MAIN_DBNAME}</label><variable>CHECK_${MAIN_DBNAME}</variable><visible>disabled</visible></checkbox>" #hard coded "true"
+
+for ONEREPO in `ls -1 /root/.packages/Packages-*|grep -v "puppy\-${DISTRO_FILE_PREFIX}\-"`
 do
  BASEREPO="`basename $ONEREPO`"
  bPATTERN=' '"$BASEREPO"' '
  DEFAULT='true'
  [ "`echo -n "$PKG_REPOS_ENABLED" | grep "$bPATTERN"`" = "" ] && DEFAULT='false'
@@ -60,10 +69,11 @@
 <vbox>
  <text use-markup=\"true\"><label>\"<b>$(gettext 'Requires restart of PPM to see changes')</b>\"</label></text>
  <frame $(gettext 'Choose repositories')>
   <text><label>$(gettext 'Choose what repositories you would like to have appear in the main GUI window (tick a maximum of 5 boxes):')</label></text>
   ${CHECKBOXES_REPOS}
+  ${CHECKBOX_MAIN_REPO}
   <hbox>
    <text><label>$(gettext 'Adding a new repository currently requires manual editing of some text files. Click this button for further information:')</label></text>
    <button><label>$(gettext 'Add repo help')</label>
    <action>nohup defaulthtmlviewer file:///usr/local/petget/README-add-repo.htm & </action>
    </button>

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

@@ -104,17 +104,17 @@
 yes|devmapper|libdevmapper1.02.1,libdevmapper-dev,libdevmapper-event1.02.1|exe,dev,doc,nls
 no|dhcpcd|dhcpcd|exe,dev>null,doc,nls
 yes|dhcpcd||exe
 no|dialog|dialog|exe,dev>null,doc,nls
 yes|dialog||exe,dev>null,doc,nls
-yes|dictd_client|dict,libmaa2|exe,dev,doc,nls| #note, libmaa2 is actually a different package.
+yes|dictd_client|dict,libmaa3|exe,dev,doc,nls| #note, libmaa3 is actually a different package.
 yes|didiwiki||exe
 no|dietlibc|dietlibc-dev|exe>dev,dev,doc,nls
 yes|diffstat|diffstat|exe,dev>null,doc,nls
 yes|diffutils|diffutils|exe,dev>null,doc,nls
 no|diffutils||exe
-yes|directfb|libdirectfb-1.2-0,libdirectfb-dev,libdirectfb-extra|exe,dev,doc,nls|+libts
+yes|directfb|libdirectfb-1.2-9,libdirectfb-dev,libdirectfb-extra|exe,dev,doc,nls|+libts
 yes|disktype|disktype|exe,dev>null,doc,nls
 no|dmidecode|dmidecode|exe,dev>null,doc,nls
 yes|dosfstools|dosfstools|exe,dev>null,doc,nls
 yes|dpkg-deb|dpkg|exe,dev>null,doc,nls
 yes|dvdauthor|dvdauthor|exe,dev,doc,nls
@@ -125,11 +125,11 @@
 yes|eject|eject|exe,dev>null,doc,nls
 yes|elspci||exe,dev>null,doc,nls
 yes|embutils_cut||exe
 yes|enchant|libenchant1c2a,libenchant-dev|exe,dev,doc,nls
 yes|epdfview|epdfview|exe,dev>null,doc,nls
-yes|esound|esound-common,libesd-alsa0,libesd0-dev|exe,dev,nls,doc
+yes|esound|esound-common,libesd0,libesd0-dev|exe,dev,nls,doc
 yes|ethtool|ethtool|exe,dev>null,doc,nls
 yes|exiv2|exiv2,libexiv2-11,libexiv2-dev|exe,dev,doc,nls
 no|exo|exo-utils,libexo-0.3-0,libexo-0.3-dev|exe,dev,doc,nls
 yes|expat|libexpat1,libexpat1-dev|exe,dev,doc,nls
 yes|faac|libfaac0,libfaac-dev|exe,dev,doc,nls
@@ -142,10 +142,11 @@
 no|ffmpeg3||exe,dev,doc,nls
 yes|file|file,libmagic1,libmagic-dev|exe,dev,doc,nls
 no|file||exe
 no|file_sharing-curlftpfs-mpscan||exe| #note, currently has x86 binaries in it.
 yes|findutils|findutils|exe,dev>null,doc,nls
+yes|firefox|firefox|exe,dev,doc,nls
 no|firefox-flash|firefox|exe,dev,doc>null,nls>null
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 no|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 no|flsynclient||exe
@@ -164,11 +165,11 @@
 no|gail||exe,dev,doc,nls
 yes|gail|libgail18,libgail-common,libgail-dev|exe,dev,doc,nls
 yes|gamin|gamin,libgamin0,libgamin-dev|exe,dev,doc,nls
 yes|gawk|gawk|exe,dev,doc,nls
 yes|gcc_dev|gcc-4.6-base,gcc,gcc-4.6,g++,g++-4.6,cpp,cpp-4.6|exe>dev,dev,doc,nls
-yes|gcc_lib|libgcc1,libgomp1,libquadmath0|exe,dev,doc,nls
+yes|gcc_lib|libgcc1,libgomp1|exe,dev,doc,nls
 no|gccmakedep||exe>dev,dev,doc,nls
 no|gcolor2|gcolor2|exe,dev>null,doc,nls
 yes|gcolorsel||exe,dev>null,doc,nls
 no|gconf|gconf2-common,gconf2,libgconf2-4,libgconf2-dev|exe,dev,doc,nls
 yes|gconf|gconf2-common,gconf2,libgconf2-4,libgconf2-dev,libgconf-2-4,gconf-service|exe,dev,doc,nls
@@ -176,11 +177,11 @@
 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|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
 no|gedit||exe
 yes|getcurpos||exe
 no|getdir||exe,dev>null,doc,nls| #what uses this?
 yes|gettext|gettext-base,gettext|exe>dev,dev,doc,nls
 yes|gettext|gettext-base,gettext|exe,dev>null,doc>null,nls>null
@@ -433,11 +434,11 @@
 yes|mp||exe
 yes|mpclib|libmpc2|exe>dev,dev,doc,nls
 yes|mpeg2dec|libmpeg2-4,libmpeg2-4-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|mpfr|libmpfr4|exe>dev,dev,doc,nls
 no|mplayerplug-in||exe,dev,doc,nls
-yes|mplayer|mplayer,libaa1,libaudio2,libcaca0,libenca0,libesd0,libgpm2,libjack0,liblzo2-2,libmpcdec6,libopenal1,libpostproc52,libpulse0,libschroedinger-1.0-0,libsdl1.2debian,libsmbclient,libspeex1,libsvga1,libswscale2,libtalloc2,libwbclient0,libwrap0,libx86-1,libx264-120,libxvidcore4,libxvmc1,libxxf86dga1|exe,dev,doc,nls
+yes|mplayer|mplayer,libaa1,libaudio2,libcaca0,libenca0,libesd0,libgpm2,libjack0,liblzo2-2,libmpcdec6,libopenal1,libpostproc52,libpulse0,libschroedinger-1.0-0,libsdl1.2debian,libsmbclient,libspeex1,libsvga1,libswscale2,libtalloc2,libwbclient0,libwrap0,libx264-120,libxvidcore4,libxvmc1,libxxf86dga1|exe,dev,doc,nls
 yes|mplayer_codecs_basic||exe
 no|ms-sys||exe
 yes|mtpaint|mtpaint|exe,dev,doc,nls
 no|mtpaint||exe
 no|mtr||exe
@@ -444,21 +445,21 @@
 yes|mtr|mtr-tiny|exe,dev,doc,nls
 no|mut2||exe
 no|nasm|nasm|exe>dev,dev,doc,nls
 yes|nbtscan|nbtscan|exe,dev,doc,nls
 yes|ncurses|ncurses-base,ncurses-bin,libncurses5,libncurses5-dev,libncursesw5,libncursesw5-dev,libtinfo5,libtinfo-dev|exe,dev,doc,nls
-yes|ndiswrapper|ndiswrapper-common,ndiswrapper-utils-1.9|exe,dev>null,doc,nls
+yes|ndiswrapper|ndiswrapper-common|exe,dev>null,doc,nls
 yes|nenscript||exe
 no|netpbm|netpbm,libnetpbm10,libnetpbm10-dev|exe,dev,doc,nls
 yes|netpbm||exe
 yes|net_setup||exe
 yes|net-tools|net-tools|exe,dev,doc,nls
 no|netsurf2||exe,dev,doc,nls
 yes|network_tray||exe
 no|nicoedit||exe
 yes|normalize|normalize-audio|exe,dev,doc,nls
-yes|notecase|notecase|exe,dev,doc,nls
+no|notecase|notecase|exe,dev,doc,nls
 yes|nspr|libnspr4-0d,libnspr4-dev|exe,dev,doc,nls| #using seamonkey pkg with these built-in...
 yes|nss|libnss3-1d,libnss3-dev|exe,dev,doc,nls
 yes|ntfs-3g|ntfs-3g,ntfs-3g-dev|exe,dev,doc,nls
 yes|ntfsprogs|ntfsprogs,libntfs10,libntfs-dev|exe,dev,doc,nls
 yes|numlockx||exe,dev,doc,nls|
@@ -475,11 +476,11 @@
 yes|orc|liborc-0.4-0,liborc-0.4-dev|exe,dev,doc,nls| #needed by mplayer.
 no|osmo|osmo|exe,dev,doc,nls| #aaargh, has changed from libgtkhtml dep to webkitgtk, huge size.
 yes|ots|libots0,libots-dev|exe,dev,doc,nls
 yes|p11-kit|libp11-kit0|exe,dev>null,doc,nls| #needed by cupsd (ubuntu cups pkg).
 yes|pam|libpam0g|exe,dev,doc,nls
-yes|pango|libpango1.0-0,libpango1.0-dev,libpango1.0-common|exe,dev,doc,nls
+yes|pango|libpango1.0-0,libpango1.0-dev|exe,dev,doc,nls
 yes|pangomm|libpangomm-1.4-1,libpangomm-1.4-dev|exe,dev,doc,nls
 yes|parted|parted,libparted0debian1,libparted0-dev|exe,dev,doc,nls
 yes|patch|patch|exe>dev,dev,doc,nls
 yes|patchutils|patchutils|exe>dev,dev,doc,nls
 yes|pawdioconverter||exe,dev,doc,nls
@@ -552,11 +553,11 @@
 no|pure_ftpd||exe
 yes|pwallpaper||exe
 no|pwget||exe
 yes|pwsget||exe
 no|pwireless||exe
-yes|python|python,python2.6-minimal,python2.6|exe>dev,dev,doc,nls
+yes|python|python,python2.7-minimal,python2.7|exe>dev,dev,doc,nls
 yes|python-libxml2|python-libxml2|exe>dev,dev,doc,nls|+libxml2
 yes|pzchmview||exe,dev,doc,nls
 yes|readline|libreadline6,libreadline6-dev,readline-common|exe,dev,doc,nls
 no|replaceit||exe
 yes|retrovol||exe
@@ -577,11 +578,11 @@
 no|samba_client||exe
 yes|sane-backends|libsane,libsane-dev,sane-utils|exe,dev,doc,nls
 yes|scale2x||exe
 no|scanpci||exe| #needs library libpciaccesss (normally part of that pkg).
 no|seamonkey|seamonkey-browser,seamonkey-mailnews|exe,dev>null,doc,nls| #lucid: crashes at startup with illegal instruction.
-yes|seamonkey|seamonkey,seamonkey-browser,seamonkey-mailnews|exe,dev,doc,nls
+no|seamonkey|seamonkey,seamonkey-browser,seamonkey-mailnews|exe,dev,doc,nls
 no|searchmonkey||exe
 yes|sed|sed|exe,dev>null,doc,nls
 yes|setserial|setserial|exe,dev>null,doc,nls
 yes|setvol||exe
 yes|sfs-converter||exe
@@ -597,11 +598,11 @@
 yes|squashfs-tools4||exe|  #note, kernel-version sensitive
 yes|ssh_gui||exe
 yes|startup-notification|libstartup-notification0,libstartup-notification0-dev|exe,dev,doc,nls
 yes|strace|strace|exe>dev,dev,doc,nls
 yes|streamripper|streamripper|exe,dev,doc,nls
-yes|subversion|subversion,libsvn1,libdb5.1,libneon27-gnutls,libaprutil1,libpq5,libmysqlclient16,libapr1|exe>dev,dev,doc,nls
+yes|subversion|subversion,libsvn1,libdb5.1,libneon27-gnutls,libaprutil1,libpq5,libmysqlclient18,libapr1|exe>dev,dev,doc,nls
 yes|superscan||exe
 no|sylpheed|sylpheed,libbluetooth3,libcompfaceg1,libonig2,libpisock9,libgpgme11|exe,dev,doc,nls
 no|sylpheed||exe
 no|synclient||exe
 no|sys-freedos||exe
@@ -680,22 +681,22 @@
 yes|xkbconfigmanager||exe
 yes|xload||exe
 yes|xlock_gui||exe
 yes|xlockmore||exe
 yes|xml-core|xml-core|exe>dev,dev,doc,nls
-yes|xorg_base|xfonts-utils,libxmu-headers,mesa-common-dev,libgl1-mesa-dri,xinit,x11-xkb-utils,x11-xserver-utils,x11-utils,x11-apps,fontconfig,libdrm2,libdrm-dev,libdrm-intel1,libdrm-nouveau1,libdrm-radeon1,libfontconfig1,libfontconfig1-dev,libfontenc1,libfontenc-dev,libgl1-mesa-glx,libgl1-mesa-dev,libglu1-mesa,libglu1-mesa-dev,libice6,libice-dev,libsm6,libsm-dev,libx11-6,libx11-dev,libx11-data,libxau6,libxau-dev,libxaw7,libxaw7-dev,libxcomposite1,libxcomposite-dev,libxcursor1,libxcursor-dev,libxdamage1,libxdamage-dev,libxdmcp6,libxdmcp-dev,libxext6,libxext-dev,libxfixes3,libxfixes-dev,libxfont1,libxfont-dev,libxft2,libxft-dev,libxi6,libxi-dev,libxinerama1,libxinerama-dev,libxkbfile1,libxkbfile-dev,libxmu6,libxmu-dev,libxmuu1,libxmuu-dev,libxpm4,libxpm-dev,libxrandr2,libxrandr-dev,libxrender1,libxrender-dev,libxres1,libxres-dev,libxss1,libxss-dev,libxt6,libxt-dev,libxtst6,libxtst-dev,libxv1,libxv-dev,libxxf86dga1,libxxf86dga-dev,libxxf86misc1,libxxf86misc-dev,libxxf86vm1,libxxf86vm-dev|exe,dev,doc,nls
+yes|xorg_base|xfonts-utils,libxmu-headers,mesa-common-dev,libgl1-mesa-dri,xinit,x11-xkb-utils,x11-xserver-utils,x11-utils,x11-apps,fontconfig,libdrm2,libdrm-dev,libdrm-intel1,libdrm-radeon1,libfontconfig1,libfontconfig1-dev,libfontenc1,libfontenc-dev,libgl1-mesa-glx,libgl1-mesa-dev,libglu1-mesa,libglu1-mesa-dev,libice6,libice-dev,libsm6,libsm-dev,libx11-6,libx11-dev,libx11-data,libxau6,libxau-dev,libxaw7,libxaw7-dev,libxcomposite1,libxcomposite-dev,libxcursor1,libxcursor-dev,libxdamage1,libxdamage-dev,libxdmcp6,libxdmcp-dev,libxext6,libxext-dev,libxfixes3,libxfixes-dev,libxfont1,libxfont-dev,libxft2,libxft-dev,libxi6,libxi-dev,libxinerama1,libxinerama-dev,libxkbfile1,libxkbfile-dev,libxmu6,libxmu-dev,libxmuu1,libxmuu-dev,libxpm4,libxpm-dev,libxrandr2,libxrandr-dev,libxrender1,libxrender-dev,libxres1,libxres-dev,libxss1,libxss-dev,libxt6,libxt-dev,libxtst6,libxtst-dev,libxv1,libxv-dev,libxxf86dga1,libxxf86dga-dev,libxxf86vm1,libxxf86vm-dev|exe,dev,doc,nls
 no|xorg_dri|libgl1-mesa-dri|exe,dev,doc,nls
 no|xorg_full|libgl1-mesa-dri,mesa-utils|exe,dev,doc,nls
 no|xsane|xsane,xsane-common|exe,dev>null,doc,nls| #this needs libgimp, compiled my own pet pkg without this dep.
 no|xsane||exe
 no|xserver_xorg|xserver-xorg-dev,xserver-common,xserver-xorg,xserver-xorg-core,xserver-xorg-video-*,xserver-xorg-input-mouse,xserver-xorg-input-synaptics,xserver-xorg-input-evdev,xserver-xorg-input-wacom,-xserver-xorg-video-*-dbg,-xserver-xorg-video-dummy,-xserver-xorg-video-glint,-xserver-xorg-video-ivtv,-xserver-xorg-video-nouveau,-xserver-xorg-video-nsc,-xserver-xorg-video-tga,-xserver-xorg-video-vga,-xserver-xorg-video-vmware|exe,dev,doc,nls
-yes|xserver_xorg|xserver-xorg-dev,xserver-common,xserver-xorg,xserver-xorg-core,xserver-xorg-input-synaptics,xserver-xorg-input-evdev,xserver-xorg-input-evtouch,xserver-xorg-input-tslib,xserver-xorg-input-wacom,xserver-xorg-video-fbdev|exe,dev,doc,nls|
+yes|xserver_xorg|xserver-xorg-dev,xserver-common,xserver-xorg,xserver-xorg-core,xserver-xorg-input-synaptics,xserver-xorg-input-evdev,xserver-xorg-input-kbd,xserver-xorg-input-mouse,xserver-xorg-input-tslib,xserver-xorg-input-wacom,xserver-xorg-video-fbdev|exe,dev,doc,nls|
 no|xserver_xorg_input_old||exe| #-input-evdev supercedes these, but i am still stuck on using -input-mouse and -input-kbd, provided in this pet.
 no|xserver_xvesa||exe
 no|xsoldier||exe
 yes|xtrans|xtrans-dev|exe>dev,dev,doc,nls
-yes|xz|xz-utils,liblzma1,liblzma-dev|exe,dev,doc,nls
+yes|xz|xz-utils,liblzma5,liblzma-dev|exe,dev,doc,nls
 no|yad||exe,dev,doc,nls|
 yes|yaf_splash||exe
 no|ycalc||exe
 no|you2pup||exe
 no|zfind||exe