Source: gtk3=2.90.4-7

[rbui...@rpath.com]

================================
gtk3:source=2.90.4-7 (previous: 2.90.4-6)
cvc rdiff gtk3 -1 /gnome.rpath.org@gnome:unstable/2.90.4-7
================================
2.90.4-7 Zhang Sen (je...@foresightlinux.org) Sat Jul 17 06:35:28 2010
Fix taghandlers

gtk3.recipe: changed
Index: gtk3.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- gtk3.recipe /gnome.rpath.org@gnome:unstable/2.90.4-6
+++ gtk3.recipe /gnome.rpath.org@gnome:unstable/2.90.4-7
@@ -62,10 +62,6 @@
dest='%(tagdescriptiondir)s/gtk-input-method')
r.addSource('gtk-input-method.taghandler', macros=True,
dest='%(taghandlerdir)s/gtk-input-method', mode=0755)
- #r.addSource('gdk-pixbuf-loader.tagdescription', macros=True,
- #dest='%(tagdescriptiondir)s/gdk-pixbuf-loader')
- #r.addSource('gdk-pixbuf-loader.taghandler', macros=True,
- #dest='%(taghandlerdir)s/gdk-pixbuf-loader', mode=0755)
r.addSource('gtk-update-icon-cache.tagdescription', macros=True,
dest='%(tagdescriptiondir)s/gtk-update-icon-cache')
r.addSource('gtk-update-icon-cache.taghandler', macros=True,
@@ -80,24 +76,17 @@
# autotools appends -gnu to -linux
r.macros.host += '-gnu'

- r.macros.queryloaders = '%(bindir)s/gdk-pixbuf-query-loaders-3.0-%(host)s'
- r.macros.loadersfile = '%(sysconfdir)s/gtk-3.0/%(host)s/gdk-pixbuf.loaders'
-
r.macros.queryimmodules = '%(bindir)s/gtk-query-immodules-3.0-%(host)s'
r.macros.immodulesfile = '%(sysconfdir)s/gtk-3.0/%(host)s/gtk.immodules'

# separate query modules for multilib installation
- #r.Move('%(bindir)s/gdk-pixbuf-query-loaders-3.0', '%(queryloaders)s')
r.Move('%(bindir)s/gtk-query-immodules-3.0', '%(queryimmodules)s')

- #r.Remove('%(sysconfdir)s/gtk-3.0/gdk-pixbuf.loaders')
r.Remove('%(sysconfdir)s/gtk-3.0/gtk.immodules')
r.ComponentSpec('runtime', '%(sysconfdir)s/gtk-3.0/im-multipress.conf')

# zero-length config files
- r.Create('%(loadersfile)s')
r.Create('%(immodulesfile)s')
- r.InitialContents('%(loadersfile)s')
r.InitialContents('%(immodulesfile)s')

# :runtime can be installed only once, :lib has multilib, so
@@ -108,12 +97,10 @@
'%(libdir)s/libgdk-x11-.*.so')

r.Doc('docs/tutorial', 'docs/faq', 'examples')
- #r.ComponentSpec('devel', '%(bindir)s/gdk-pixbuf-csource')
r.ComponentSpec('doc', '%(datadir)s/gtk-.*/demo/')

# these pkg-config files have Requires: statements
r.Requires('atk:devel', '%(libdir)s/pkgconfig/gtk.*pc')
- #r.Requires('glib:devel', '%(libdir)s/pkgconfig/gdk-pixbuf-xlib.*pc')
r.Requires('pango:devel', '%(libdir)s/pkgconfig/gdk-x11.*pc',
'%(libdir)s/pkgconfig/gdk-3.0.pc')

gtk-input-method.taghandler: changed
Index: gtk-input-method.taghandler
====================================================================
contents(size sha1)
inode(mtime)
--- gtk-input-method.taghandler /gnome.rpath.org@gnome:unstable/2.90.4-6
+++ gtk-input-method.taghandler /gnome.rpath.org@gnome:unstable/2.90.4-7
@@ -24,7 +24,7 @@
for qm in %(bindir)s/gtk-query-immodules-3.0-*; do
HOST=$(basename $qm)
HOST=${HOST//gtk-query-immodules-3.0-/}
- $qm > %(sysconfdir)s/gtk-3.0/$HOST/gtk.immodules
+ $qm --update-cache
done
;;
*)

gdk-pixbuf-loader.taghandler: removed
gdk-pixbuf-loader.tagdescription: removed

Committed by: jesse