================================ libxklavier:source=4.0-2 (previous: 4.0-1) cvc rdiff libxklavier -1 /weasel.rpath.org@wgl:3-devel/4.0-2 ================================ 4.0-2 Filip Brcic (brcha@xxxxxxx) Wed Jan 13 09:31:45 2010 fixed recipe a bit + added metadata libxklavier-4.0-tests.patch: new --- /dev/null +++ libxklavier-4.0-tests.patch @@ -0,0 +16 @@ +diff -ur libxklavier-4.0.orig/tests/Makefile.am libxklavier-4.0/tests/Makefile.am +--- libxklavier-4.0.orig/tests/Makefile.am 2009-04-07 01:50:08.000000000 +0300 ++++ libxklavier-4.0/tests/Makefile.am 2009-07-20 23:44:22.000000000 +0300 +@@ -1,10 +1,10 @@ +-noinst_PROGRAMS=test_config test_monitor ++check_PROGRAMS=test_config test_monitor + + test_config_SOURCES=test_config.c + + test_monitor_SOURCES=test_monitor.c + +-AM_CFLAGS=-Wall -Werror -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS) ++AM_CFLAGS=-Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS) + + LDADD=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS) + libxklavier.recipe: changed Index: libxklavier.recipe ==================================================================== contents(size sha1) inode(mtime) --- libxklavier.recipe /weasel.rpath.org@wgl:3-devel/4.0-1 +++ libxklavier.recipe /weasel.rpath.org@wgl:3-devel/4.0-2 @@ -1,18 +1,38 @@ # -# Copyright (c) 2008 Filip Brcic <brcha@xxxxxxx> +# Copyright (c) 2008-2010 Filip Brcic <brcha@xxxxxxxxxxxx> # Distributed under the terms of the GNU General Public License v3 # -loadSuperClass('gnomepackage') -class Libxklavier(GnomePackageRecipe): +class Libxklavier(AutoPackageRecipe): name = 'libxklavier' version = '4.0' buildRequires = [ - 'xkeyboard-config:data', 'libX11:devel', 'xkbcomp:runtime', 'glib:devel', - 'libxml2:devel', 'pkg-config:devel', 'libICE:devel', 'libxkbfile:devel', + 'autoconf:runtime', 'automake:runtime', 'glib:devel', + 'libICE:devel', 'libX11:devel', 'libXi:devel', + 'libtool:runtime', 'libxkbfile:devel', 'libxml2:devel', + 'pkg-config:devel', 'xkbcomp:runtime', + 'xkeyboard-config:data', 'iso-codes:devellib', + 'iso-codes:data' ] - extraConfig = '--with-xkb-base=%(datadir)s/X11/xkb' + shortDesc = 'High level XKB library' + url = 'http://www.freedesktop.org/Software/LibXklavier' + licenses = [ 'LGPL-2' ] + categories = [ 'X' ] - buildMultiarch = True + def unpack(r): + r.addArchive('mirror://sourceforge/gswitchit/') + r.addPatch('libxklavier-4.0-tests.patch') + + r.Remove('m4/{libtool,lt*}.m4') + + r.Autoreconf() + + def configure(r): + r.Configure( + ' --disable-static' + ' --with-xkb-base=%(datadir)s/X11/xkb' + ' --with-xkb-bin-base=%(bindir)s' +# ' --enable-doc' # with gtk-doc + ) Committed by: brcha