Skip to content

Commit

Permalink
Change call to gdk-pixbuf-query-loaders hence remove the symlink rout…
Browse files Browse the repository at this point in the history 
…ine.

Old versions of gdk are now unsupported. IIRC, slacko based on 13.37 was fine with this. Precise too. Needs testing for the newer debian family.
  • Loading branch information
@01micko
01micko committed Apr 15, 2017
1 parent d2089ff commit dd819cb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
21 changes: 2 additions & 19 deletions woof-code/3builddistro-Z
View file
Expand Up @@ -1429,25 +1429,8 @@ fi
#110622 /etc/rc.d/rc.update executes: gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
#however, mageia1 requires above file to be at /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
#create a symlink...
VERDIR=''
if [ -d rootfs-complete/usr/lib${lsuffix}/gdk-pixbuf-2.0 ];then
[ ! -f rootfs-complete/etc/gtk-2.0/gdk-pixbuf.loaders ] && touch rootfs-complete/etc/gtk-2.0/gdk-pixbuf.loaders
PIXBUFLOADERSDIR="`find rootfs-complete/usr/lib${lsuffix}/gdk-pixbuf-2.0 -maxdepth 2 -mindepth 2 -type d -name loaders | head -n 1`"
if [ "$PIXBUFLOADERSDIR" ];then
PIXBUFCACHEDIR="`dirname $PIXBUFLOADERSDIR`"
VERDIR="`basename $PIXBUFCACHEDIR`" #2.10.0
ln -snf ../../../../etc/gtk-2.0/gdk-pixbuf.loaders ${PIXBUFCACHEDIR}/loaders.cache #110903 change -s to -snf
#there may be some loaders in wrong place...
[ -d rootfs-complete/usr/lib${lsuffix}/gtk-2.0/loaders ] && mv -f rootfs-complete/usr/lib${lsuffix}/gtk-2.0/loaders/*.so ${PIXBUFLOADERSDIR}/ 2>/dev/null
if [ -d rootfs-complete/usr/lib${lsuffix}/gtk-2.0/${VERDIR}/loaders ];then
mv -f rootfs-complete/usr/lib${lsuffix}/gtk-2.0/${VERDIR}/loaders/*.so ${PIXBUFLOADERSDIR}/ 2>/dev/null
rmdir rootfs-complete/usr/lib${lsuffix}/gtk-2.0/${VERDIR}/loaders #111114
ln -s ../../gdk-pixbuf-2.0/${VERDIR}/loaders rootfs-complete/usr/lib${lsuffix}/gtk-2.0/${VERDIR}/loaders #111114
else #111117
ln -s ../../gdk-pixbuf-2.0/${VERDIR}/loaders rootfs-complete/usr/lib${lsuffix}/gtk-2.0/${VERDIR}/loaders
fi
fi
fi
#170330 change to native way of updating loader chache: gdk-pixbuf-query-loaders --update-cache
#see /etc/rc.d/rc.update

#120605 shinobar ref: http://murga-linux.com/puppy/viewtopic.php?t=76961&start=195
if [ "$WOOF_HOSTARCH" = "$WOOF_TARGETARCH" ];then
Expand Down
2 changes: 1 addition & 1 deletion woof-code/rootfs-skeleton/etc/rc.d/rc.update
View file
Expand Up @@ -18,7 +18,7 @@ basic_update() {
/usr/sbin/updatenetmoduleslist.sh #creates /etc/networkmodules...
#just in case something missing (like svg loader)...
echo -n " pixbuf-loaders" >/dev/console
gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
gdk-pixbuf-query-loaders --update-cache
#update icon cache (supposed to speed things up)...
echo -n " gtk-icon-cache" >/dev/console
#note, can use --ignore-theme-index if want to...
Expand Down

3 comments on commit dd819cb

@01micko
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wdlkmpx you may want to review these last 2 commits and merge them into testing. The icon cache one is necessary. The query-loaders one works in older slacko and precise but not sure of newer xenial, ascii and stretch. Should work though.

I have more commits to make here but won't until you've made a decision. It's mainly to do with adding adrive support (ie, construct an adrv*.sfs) in the build stage. Coming along nicely. I'll probably move the mkwallpaper routine to a separate script in support/ too.

@wdlkmpx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested the code and it works fine.. I merged both commits into testing.

@01micko
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. Saw that. Am working on my adrv stuff now.

Please sign in to comment.