Check-in [f8ead420c2]
Not logged in

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

Overview

SHA1 Hash:f8ead420c2b37ac984ca5ea34195e3b23db987d0
Date: 2012-01-15 23:09:24
User: BarryK
Comment:jwm rev 574 fixes -reload icon rendering, modify some ppm scripts

Tags And Properties
Changes

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

@@ -5,10 +5,11 @@
 #package to be previewed prior to installation is TREE1 -- inherited from parent.
 #/tmp/petget_filterversion has the repository that installing from.
 #100821 bug in Lucid 5.1, /tmp/pup_event_sizefreem had two identical lines.
 #101221 yaf-splash fix.
 #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.
 
 . /etc/DISTRO_SPECS #has DISTRO_BINARY_COMPAT, DISTRO_COMPAT_VERSION
 . /root/.packages/DISTRO_PKGS_SPECS
 
 #/usr/X11R7/bin/yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "Please wait, processing package database files..." &
@@ -318,11 +319,11 @@
 INSTALLEDCAT="menu" #any string.
 [ "`cat /tmp/petget-installed-pkgs-log | grep -o 'CATEGORY' | grep -v 'none'`" = "" ] && INSTALLEDCAT="none"
 RESTARTMSG="Please wait, updating help page and menu..."
 if [ "`pidof jwm`" != "" ];then #120101
  JWMVER=`jwm -v|head -n1|cut -d ' ' -f2|cut -d - -f2`
- if vercmp $JWMVER lt 547;then
+ if vercmp $JWMVER lt 574;then #120116 introduced rev 547, but 574 fixes -reload.
   RESTARTMSG="Please wait, updating help page and menu (the screen will flicker!)..."
  fi
 fi
 [ "$INSTALLEDCAT" = "none" ] && RESTARTMSG="Please wait, updating help page..."
 #/usr/X11R7/bin/yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "${RESTARTMSG}" &
@@ -344,11 +345,11 @@
 /usr/sbin/indexgen.sh #${WKGDIR}/${APKGNAME}
 #Reconstruct configuration files for JWM, Fvwm95, IceWM...
 if [ "$INSTALLEDCAT" != "none" ];then
  /usr/sbin/fixmenus
  if [ "`pidof jwm`" != "" ];then #120101
-  if vercmp $JWMVER lt 547;then
+  if vercmp $JWMVER lt 574;then #120116 547 to 574.
    jwm -restart #w482
   else
    jwm -reload
   fi
  fi

Changes to woof-code/rootfs-skeleton/usr/local/petget/petget

@@ -17,10 +17,11 @@
 #101116 call download_file to download pkg, instead of direct run of wget.
 #101221 yaf-splash fix.
 #110505 support sudo for non-root user.
 #110523 support for rpm pkgs.
 #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.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 [ ! $1 ] && exit
 
@@ -258,11 +259,11 @@
 gtkdialog3 --program=INSTALL_DIALOG
 
 RESTARTMSG="Please wait, updating help page and menu..."
 if [ "`pidof jwm`" != "" ];then #120101
  JWMVER=`jwm -v|head -n1|cut -d ' ' -f2|cut -d - -f2`
- if vercmp $JWMVER lt 547;then
+ if vercmp $JWMVER lt 574;then #120116 547 to 574.
   RESTARTMSG="Please wait, updating help page and menu (the screen will flicker!)..."
  fi
 fi
 [ "$INSTALLEDCAT" = "none" ] && RESTARTMSG="Please wait, updating help page..."
 #/usr/X11R7/bin/yaf-splash -font "8x16" -outline 0 -margin 4 -bg orange -text "${RESTARTMSG}" &
@@ -280,11 +281,11 @@
 /usr/sbin/indexgen.sh
 #Reconstruct configuration files for JWM, Fvwm95, IceWM...
 if [ "$INSTALLEDCAT" != "none" ];then
  /usr/sbin/fixmenus
  if [ "`pidof jwm`" != "" ];then #120101
-  if vercmp $JWMVER lt 547;then
+  if vercmp $JWMVER lt 574;then #120116 547 to 574.
    jwm -restart #w482
   else
    jwm -reload
   fi
  fi

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

@@ -14,10 +14,11 @@
 #110706 update menu if .desktop file exists.
 #111228 if snapmergepuppy running, wait for it to complete.
 #120101 01micko: jwm >=547 has -reload, no screen flicker.
 #120103 shinobar, bk: improve file deletion when older file in lower layer.
 #120107 rerwin: need quotes around some paths in case of space chars.
+#120116 rev. 514 introduced icon rendering method which broke -reload at 547. fixed at rev. 574.
 
 . /etc/rc.d/PUPSTATE  #111228 this has PUPMODE and SAVE_LAYER.
 . /etc/DISTRO_SPECS #has DISTRO_BINARY_COMPAT, DISTRO_COMPAT_VERSION
 . /root/.packages/DISTRO_PKGS_SPECS
 
@@ -151,11 +152,11 @@
  if [ "`grep '\.desktop$' /root/.packages/${DB_pkgname}.files`" != "" ];then
   #Reconstruct configuration files for JWM, Fvwm95, IceWM...
   /usr/sbin/fixmenus
   if [ "`pidof jwm`" != "" ];then #120101
    JWMVER=`jwm -v|head -n1|cut -d ' ' -f2|cut -d - -f2`
-   if vercmp $JWMVER lt 547;then
+   if vercmp $JWMVER lt 574;then #120116 547 to 574.
     jwm -restart #screen will flicker.
    else
     jwm -reload
    fi
   fi

Changes to woof-distro/x86/Packages-puppy-common-official

@@ -161,11 +161,11 @@
 inkscapelite-0.36.3-no_gnomeprint-q1|inkscapelite|0.36.3-no_gnomeprint-q1||Graphic|1776K||inkscapelite-0.36.3-no_gnomeprint-q1.pet|+gtk+|InkLite vector editor|t2|8.0rc||
 inotail-0.5|inotail|0.5||BuildingBlock|16K||inotail-0.5.pet||tail utility uses inotify, essential|puppy|4||
 installwatch-0.6.3|installwatch|0.6.3||BuildingBlock|14K||installwatch-0.6.3.pet||essential, used by petget|puppy|4||
 isomaster-1.3.6-q1|isomaster|1.3.6-q1||Multimedia|224K||isomaster-1.3.6-q1.pet|+gtk+|ISOMaster iso file editor|t2|8.0rc||
 jimtcl-0.70|jimtcl|0.70||BuildingBlock|152K||jimtcl-0.70.pet||tiny Tcl interpreter, compiled in wary should work all puppies. note, used by usb-modeswitch||||
-jwm2-562-w5c|jwm2|562-w5c||Desktop|224K||jwm2-562-w5c.pet|+fribidi|joes window manager and tray, compiled in wary 5.2 but should run anywhere|puppy|wary5||
+jwm2-574-w5c|jwm2|574-w5c||Desktop|224K||jwm2-574-w5c.pet|+fribidi|joes window manager and tray, compiled in wary 5.2 but should run anywhere|puppy|wary5||
 jwmconfig2-20111110|jwmconfig2|20111110||Desktop|256K||jwmconfig2-20111110.pet|+jwm2,+gtkdialog3|JWM configuration. note, theme font spec different from shinobars pet. note, designed to work with jwm 500+||||
 jwm_theme_bluevariety-1|jwm_theme_bluevariety|1||Desktop|32K||jwm_theme_bluevariety-1.pet|+jwm2|jwm window manager theme, many shades and gradients of blue||||
 jwm_theme_deepbluebold-1|jwm_theme_deepbluebold|1||Desktop|36K||jwm_theme_deepbluebold-1.pet|+jwm2|Theme for JWM window manager, deep blue, white bold text||||
 jwmthememaker-1.5|jwmthememaker|1.5||Desktop|36K||jwmthememaker-1.5.pet||JWM Theme Maker|ubuntu|lucid||
 jwm_theme_stark-1|jwm_theme_stark|1||Desktop|36K||jwm_theme_stark-1.pet|+jwm2|stark black-white with bits of colour theme for jwm window manager||||

Changes to woof-distro/x86/Packages-puppy-wary5-official

@@ -386,19 +386,22 @@
 grisbi_NLS-0.6.0-w5|grisbi_NLS|0.6.0-w5||Business|1720K||grisbi_NLS-0.6.0-w5.pet|+grisbi|Grisbi finance manager||||
 groff_DEV-1.20.1-w5c|groff_DEV|1.20.1-w5c||Document|7212K||groff_DEV-1.20.1-w5c.pet|+groff|The GNU groff document formatting system|puppy|wary5||
 groff_DOC-1.20.1-w5c|groff_DOC|1.20.1-w5c||Document|12624K||groff_DOC-1.20.1-w5c.pet||The GNU groff document formatting system|puppy|wary5||
 gtk+-2.20.1-w5c|gtk+|2.20.1-w5c||BuildingBlock|7488K||gtk+-2.20.1-w5c.pet|+cairo,+glib,+pango,+atk|gui widget toolkit|puppy|wary5||
 gtk+-2.24.5-1-w5c|gtk+|2.24.5-1-w5c||BuildingBlock|3896K||gtk+-2.24.5-1-w5c.pet|+cairo|The Gimp ToolKit GTK|puppy|wary5||
+gtk+-2.24.8-1-w5c|gtk+|2.24.8-1-w5c||BuildingBlock|7080K||gtk+-2.24.8-1-w5c.pet|+cairo,+glib,+pango,+gdk-pixbuf,+atk|gui widget toolkit|puppy|wary5||
 gtk+-2.24.8_no_introspection-w5c|gtk+|2.24.8_no_introspection-w5c||BuildingBlock|7080K||gtk+-2.24.8_no_introspection-w5c.pet|+cairo,+glib,+pango,+gdk-pixbuf,+atk|gui widget toolkit|puppy|wary5||
 gtkam-0.1.17-w5c|gtkam|0.1.17-w5c||Multimedia|264K||gtkam-0.1.17-w5c.pet|+cairo,+geany,+gtk+,+libexif-gtk,+libgphoto,+perl-xml-parser|Graphical front end for gphoto2|puppy|wary5||
 gtkam_DOC-0.1.17-w5c|gtkam_DOC|0.1.17-w5c||Multimedia|296K||gtkam_DOC-0.1.17-w5c.pet||Graphical front end for gphoto2|puppy|wary5||
 gtkam_NLS-0.1.17-w5c|gtkam_NLS|0.1.17-w5c||Multimedia|576K||gtkam_NLS-0.1.17-w5c.pet|+gtkam|Graphical front end for gphoto2|puppy|wary5||
 gtk+_DEV-2.20.1-w5c|gtk+_DEV|2.20.1-w5c||BuildingBlock|2396K||gtk+_DEV-2.20.1-w5c.pet|+gtk+|gui widget toolkit|puppy|wary5||
 gtk+_DEV-2.24.5-1-w5c|gtk+_DEV|2.24.5-1-w5c||BuildingBlock|2320K||gtk+_DEV-2.24.5-1-w5c.pet|+gtk+|The Gimp ToolKit GTK|puppy|wary5||
+gtk+_DEV-2.24.8-1-w5c|gtk+_DEV|2.24.8-1-w5c||BuildingBlock|2312K||gtk+_DEV-2.24.8-1-w5c.pet|+gtk+|gui widget toolkit|puppy|wary5||
 gtk+_DEV-2.24.8_no_introspection-w5c|gtk+_DEV|2.24.8_no_introspection-w5c||BuildingBlock|2312K||gtk+_DEV-2.24.8_no_introspection-w5c.pet|+gtk+|gui widget toolkit|puppy|wary5||
 gtk+_DOC-2.20.1-w5c|gtk+_DOC|2.20.1-w5c||BuildingBlock|24040K||gtk+_DOC-2.20.1-w5c.pet||gui widget toolkit||||
 gtk+_DOC-2.24.5-1-w5c|gtk+_DOC|2.24.5-1-w5c||BuildingBlock|22880K||gtk+_DOC-2.24.5-1-w5c.pet||The Gimp ToolKit GTK|puppy|wary5||
+gtk+_DOC-2.24.8-1-w5c|gtk+_DOC|2.24.8-1-w5c||BuildingBlock|23480K||gtk+_DOC-2.24.8-1-w5c.pet||gui widget library||||
 gtk+_DOC-2.24.8_no_introspection-w5c|gtk+_DOC|2.24.8_no_introspection-w5c||BuildingBlock|23480K||gtk+_DOC-2.24.8_no_introspection-w5c.pet||gui widget library||||
 gtklp-1.2.5-w5|gtklp|1.2.5-w5||System|292K||gtklp-1.2.5-w5.pet|+cairo,+gtk+|a graphical Frontend to CUPS|puppy|wary5||
 gtklp_DOC-1.2.5-w5|gtklp_DOC|1.2.5-w5||System|36K||gtklp_DOC-1.2.5-w5.pet||a graphical Frontend to CUPS|puppy|wary5||
 gtklp_NLS-1.2.5-w5|gtklp_NLS|1.2.5-w5||System|448K||gtklp_NLS-1.2.5-w5.pet|+gtklp|a graphical Frontend to CUPS|puppy|wary5||
 gtkmm-2.20.3-w5c|gtkmm|2.20.3-w5c||BuildingBlock|5448K||gtkmm-2.20.3-w5c.pet|+gtk+,+cairomm,+glibmm,+pangomm|oo wrapper for gtk library|puppy|wary5||
@@ -405,10 +408,11 @@
 gtkmm_DEV-2.20.3-w5c|gtkmm_DEV|2.20.3-w5c||BuildingBlock|10792K||gtkmm_DEV-2.20.3-w5c.pet|+gtkmm|oo wrapper for gtk library|puppy|wary5||
 gtkmm_DOC-2.20.3-w5c|gtkmm_DOC|2.20.3-w5c||BuildingBlock|52272K||gtkmm_DOC-2.20.3-w5c.pet||oo wrapper for gtk library|puppy|wary5||
 gtkmoz-0.3-w5|gtkmoz|0.3-w5||Internet|104K||gtkmoz-0.3-w5.pet|+seamonkey1&eq1.1.19-gtkembedmoz|fast html viewer/browser, warning needs seamonkey 1.1.x with libgtkembedmoz.so|puppy|wary5||
 gtk+_NLS-2.20.1-w5c|gtk+_NLS|2.20.1-w5c||BuildingBlock|21296K||gtk+_NLS-2.20.1-w5c.pet|+gtk+|gui widget toolkit||||
 gtk+_NLS-2.24.5-1-w5c|gtk+_NLS|2.24.5-1-w5c||BuildingBlock|20980K||gtk+_NLS-2.24.5-1-w5c.pet|+gtk+|The Gimp ToolKit GTK|puppy|wary5||
+gtk+_NLS-2.24.8-1-w5c|gtk+_NLS|2.24.8-1-w5c||BuildingBlock|21008K||gtk+_NLS-2.24.8-1-w5c.pet|+gtk+|gui widget toolkit||||
 gtk+_NLS-2.24.8_no_introspection-w5c|gtk+_NLS|2.24.8_no_introspection-w5c||BuildingBlock|21008K||gtk+_NLS-2.24.8_no_introspection-w5c.pet|+gtk+|gui widget toolkit||||
 gtksourceview-2.10.5-w5c|gtksourceview|2.10.5-w5c||BuildingBlock|1352K||gtksourceview-2.10.5-w5c.pet|+cairo,+gtk+,+libxml,+perl-xml-parser|An extension to the GTK+ multiline text editing|puppy|wary5||
 gtksourceview_DEV-2.10.5-w5c|gtksourceview_DEV|2.10.5-w5c||BuildingBlock|156K||gtksourceview_DEV-2.10.5-w5c.pet|+gtksourceview|An extension to the GTK+ multiline text editing|puppy|wary5||
 gtksourceview_DOC-2.10.5-w5c|gtksourceview_DOC|2.10.5-w5c||BuildingBlock|1080K||gtksourceview_DOC-2.10.5-w5c.pet||An extension to the GTK+ multiline text editing|puppy|wary5||
 gtksourceview_NLS-2.10.5-w5c|gtksourceview_NLS|2.10.5-w5c||BuildingBlock|3024K||gtksourceview_NLS-2.10.5-w5c.pet|+gtksourceview|An extension to the GTK+ multiline text editing|puppy|wary5||

Changes to woof-distro/x86/racy/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -234,11 +234,12 @@
 yes|grep|grep|exe,dev>null,doc,nls
 no|grisbi||exe
 yes|groff|groff|exe>dev,dev,doc,nls
 yes|grub||exe
 yes|grub4dos||exe
-yes|gtk+|gtk+-2.24.8_no_introspection*,gtk+_DEV-2.24.8_no_introspection*|exe,dev,doc,nls|
+yes|gtk+|gtk+-2.24.8-1*,gtk+_DEV-2.24.8-1*|exe,dev,doc,nls|
+no|gtk+|gtk+-2.24.8_no_introspection*,gtk+_DEV-2.24.8_no_introspection*|exe,dev,doc,nls|
 no|gtk+|gtk+-2.24.5*,gtk+_DEV-2.24.5*|exe,dev,doc,nls| #rolled back from 2.24.8 had gseal errors.
 no|gtk+|gtk+-2.20.1*,gtk+_DEV-2.20.1*|exe,dev,doc,nls
 no|gtkam|gtkam|exe,dev>null,doc,nls
 no|gtkam||exe
 yes|gtk-chtheme||exe,dev>null,doc,nls

Changes to woof-distro/x86/wary/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -234,11 +234,12 @@
 yes|grep|grep|exe,dev>null,doc,nls
 no|grisbi||exe
 yes|groff|groff|exe>dev,dev,doc,nls
 yes|grub||exe
 yes|grub4dos||exe
-yes|gtk+|gtk+-2.24.8_no_introspection*,gtk+_DEV-2.24.8_no_introspection*|exe,dev,doc,nls|
+yes|gtk+|gtk+-2.24.8-1*,gtk+_DEV-2.24.8-1*|exe,dev,doc,nls|
+no|gtk+|gtk+-2.24.8_no_introspection*,gtk+_DEV-2.24.8_no_introspection*|exe,dev,doc,nls|
 no|gtk+|gtk+-2.24.5*,gtk+_DEV-2.24.5*|exe,dev,doc,nls| #rolled back from 2.24.8, had gseal errors.
 no|gtk+|gtk+-2.20.1*,gtk+_DEV-2.20.1*|exe,dev,doc,nls
 no|gtkam|gtkam|exe,dev>null,doc,nls
 no|gtkam||exe
 yes|gtk-chtheme||exe,dev>null,doc,nls