[weasel-commit] Source: glib=2.22.4-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Sun, 06 Jun 2010 12:11:04 -0400
================================
glib:source=2.22.4-1 (previous: 2.20.5-1)
cvc rdiff glib -1 /weasel.rpath.org@wgl:3-devel/2.22.4-1
================================
2.22.4-1 Filip Brcic (brcha@xxxxxxxxxxxx) Sun Jun 6 12:09:16 2010
version bump to 2.22.4
glib.recipe: changed
Index: glib.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- glib.recipe /weasel.rpath.org@wgl:3-devel/2.20.5-1
+++ glib.recipe /weasel.rpath.org@wgl:3-devel/2.22.4-1
@@ -1,19 +1,25 @@
#
-# Copyright (c) 2009 Filip Brcic <brcha@xxxxxxx>
+# Copyright (c) 2009-2010 Filip Brcic <brcha@xxxxxxx>
# Distributed under the terms of the GNU General Public License v3
#
class Glib(AutoPackageRecipe):
name = 'glib'
- version = '2.20.5'
+ version = '2.22.4'
buildRequires = [
- 'autoconf:runtime', 'automake:runtime', 'gettext:runtime',
- 'intltool:runtime', 'libtool:runtime', 'python:devel'
+ 'gettext:runtime', 'intltool:runtime', 'perl-XML-Parser:perl',
+ 'libtool:runtime', 'libtool:devel', 'python:devel',
+ 'attr:devel', 'gamin:devel', 'pkg-config:devel',
+ 'perl:devellib', 'libstdc++:devel', 'gcc-c++:runtime',
]
+ if Use.builddocs:
+ buildRequires.extend(['libxslt:runtime', 'gtk-doc:runtime',
+ 'gtk-doc:devellib', 'docbook-xml-dtd-412:data',
+ ])
+
shortDesc = 'The GLib library of C routines'
- longDesc = 'The GLib library of C routines'
url = 'http://www.gtk.org/'
licenses = [ 'LGPL-2' ]
categories = [ 'System' ]
@@ -22,21 +28,37 @@
r.macros.majorminor = '.'.join(r.version.split('.')[:-1])
r.addArchive('mirror://gnome/sources/%(name)s/%(majorminor)s/')
+ # Don't fail gio tests when ran without userpriv, upstream bug 552912
+ # This is only a temporary workaround, remove as soon as possible
r.addPatch('glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch')
+
+ # Fix gmodule issues on fbsd
r.addPatch('glib-2.12.12-fbsd.patch')
- r.addPatch('glib2-CVE-2009-3289.patch')
- r.Autoreconf(m4Dir='m4macros')
+ # Do not try to remove files on live filesystem
+ r.Replace('^(.*"/desktop-app-info/delete".*)', '/*\\1*/',
+ 'gio/tests/desktop-app-info.c')
+
+# r.Autoreconf(m4Dir='m4macros')
for profile in ('glib2.sh', 'glib2.csh'):
r.addSource(profile, dest='%(sysconfdir)s/profile.d/', mode=0755)
def configure(r):
+ docArgs = (
+ ' --disable-man'
+ ' --disable-gtk-doc'
+ )
+ if Use.builddocs:
+ docArgs = (
+ ' --enable-man'
+ ' --enable-gtk-doc'
+ )
r.Configure(
' --enable-xattr'
-# ' --enable-man' # TODO: once gtk-doc is built
-# ' --enable-gtk-doc' # -- || --
-# ' --enable-fam' # TODO: once gamin is built
+ + docArgs +
+ ' --enable-fam'
+ ' --disable-selinux'
' --enable-static'
' --enable-regex'
' --with-pcre=internal'
glib-2.22.4.tar.bz2: new
glib-2.20.5.tar.bz2: removed
glib2-CVE-2009-3289.patch: removed
Committed by: brcha
Other related posts:
