Source: gtk2=2.21.5-3

0 views
Skip to first unread message

rbui...@rpath.com

unread,
Jul 17, 2010, 12:39:09 PM7/17/10
to gnome-develop...@googlegroups.com
================================
gtk2:source=2.21.5-3 (previous: 2.21.5-2)
cvc rdiff gtk2 -1 /gnome.rpath.org@gnome:unstable/2.21.5-3
================================
2.21.5-3 Zhang Sen (je...@foresightlinux.org) Sat Jul 17 12:39:01 2010
Fix recipe as in gtk3

gtk2.recipe: changed
Index: gtk2.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- gtk2.recipe /gnome.rpath.org@gnome:unstable/2.21.5-2
+++ gtk2.recipe /gnome.rpath.org@gnome:unstable/2.21.5-3
@@ -5,7 +5,7 @@
#


-loadRecipe('gnomepackage')
+loadSuperClass('gnomepackage')
class Gtk2(GnomePackageRecipe):
name = 'gtk2'
version = '2.21.5'
@@ -61,10 +61,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,
@@ -79,24 +75,17 @@
# autotools appends -gnu to -linux
r.macros.host += '-gnu'

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

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

- #r.Remove('%(sysconfdir)s/gtk-2.0/gdk-pixbuf.loaders')
r.Remove('%(sysconfdir)s/gtk-2.0/gtk.immodules')
r.ComponentSpec('runtime', '%(sysconfdir)s/gtk-2.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
@@ -107,15 +96,13 @@
'%(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-2.0.pc')

# modules require tag handlers being run in order to be loaded
- r.Requires('gtk:runtime',
- r'%(libdir)s/gtk-[^/]*/[^/]*/(loaders|immodules)/[^/]*\.so')
+ r.Requires('%(name)s:runtime',
+ r'%(libdir)s/gtk-[^/]*/[^/]*/immodules/[^/]*\.so')

Committed by: jesse

Reply all
Reply to author
Forward
0 new messages