Source: gtk=0-1

1 view
Skip to first unread message

rbui...@rpath.com

unread,
Jul 14, 2010, 11:21:47 AM7/14/10
to gnome-develop...@googlegroups.com
================================
gtk:source=0-1 (previous: 2.90.4-4)
cvc rdiff gtk -1 /gnome.rpath.org@gnome:unstable/0-1
================================
0-1 Zhang Sen (je...@foresightlinux.org) Wed Jul 14 11:21:43 2010
Remove gtk; use gkt2/gtk3 now

gtk.recipe: changed
Index: gtk.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- gtk.recipe /gnome.rpath.org@gnome:unstable/2.90.4-4
+++ gtk.recipe /gnome.rpath.org@gnome:unstable/0-1
@@ -4,115 +4,9 @@
# A copy is available at http://www.rpath.com/permanent/mit-license.html
#

+class Gtk2(RedirectRecipe):
+ name = 'gtk'
+ version = '0'

-loadRecipe('gnomepackage')
-class Gtk2(GnomePackageRecipe):
- name = 'gtk'
- version = '2.90.4'
-
- externalArchive = 'mirror://gnome/gtk+/%(major_version)s/gtk+-%(version)s.tar.bz2'
-
- clearBuildRequires('gtk:devel')
- buildRequires = [
- 'atk:devellib',
- 'autoconf:runtime',
- 'automake:runtime',
- 'cups:devel',
- 'docbook-utils:runtime',
- 'gcc-c++:runtime',
- 'gnutls:devellib',
- 'gobject-introspection:devellib',
- 'gobject-introspection:runtime',
- 'indent:runtime',
- 'jasper:devel',
- 'libXcomposite:devel',
- 'libXcursor:devel',
- 'libXdamage:devel',
- 'libXfixes:devel',
- 'libXrandr:devel',
- 'libjpeg:devel',
- 'libtiff:devel',
- 'openssl:devel',
- 'pango:devellib',
- 'perl:runtime',
- 'python:devel',
-]
-
- #patches = [
- # Better support multilib.
- #'lib64.patch',
- #]
-
- extraConfig = ' --build=%(host)s --host=%(host)s --with-xinput=xfree'
- preMakeInstall = ' RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false '
-
- def unpack (r):
- GnomePackageRecipe.unpack(r)
-
- # setup some macros to make the taghandler work properly
- r.macros.fieldnum = str(len(r.macros.datadir.split('/'))+2)
-
- r.Replace('tests ','','Makefile.*')
-
- r.addSource('gtk-input-method.tagdescription', macros=True,
- 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,
- dest='%(taghandlerdir)s/gtk-update-icon-cache', mode=0755)
-
- def policy (r):
- r.MakeDirs('%(sysconfdir)s/gtk-3.0')
-
- # set up HOST definition for gtk.modules location
- r.macros.host = r.macros.target
- if r.macros.target.endswith("linux"):
- # 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
- # move de-collided paths into :lib where they belong
- r.ComponentSpec('lib',
- '%(bindir)s/.*query.*',
- '%(sysconfdir)s/gtk-.*/.*',
- '%(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')
-
- # modules require tag handlers being run in order to be loaded
- r.Requires('gtk:runtime',
- r'%(libdir)s/gtk-[^/]*/[^/]*/(loaders|immodules)/[^/]*\.so')
+ def setup(r):
+ r.addRemoveRedirect()


gtk+-2.90.4.tar.bz2: removed

Committed by: jesse

Reply all
Reply to author
Forward
0 new messages