Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1568
Modified Files:
libxklavier12.info libxklavier12.patch
Log Message:
new version
Index: libxklavier12.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libxklavier12.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxklavier12.info 30 Aug 2008 04:28:34 -0000 1.3
+++ libxklavier12.info 10 Nov 2008 08:18:33 -0000 1.4
@@ -1,5 +1,5 @@
Package: libxklavier12
-Version: 3.4
+Version: 3.7
Revision: 1
Depends: <<
%N-shlibs (= %v-%r),
@@ -10,40 +10,45 @@
BuildDepends: <<
doxygen,
fink (>= 0.24.12-1),
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.18.0-1),
libgettext3-dev,
libiconv-dev,
libxml2 (>= 2.6.30-1),
- pkgconfig (>= 0.21-1),
+ pkgconfig (>= 0.23),
x11-dev
<<
Source: mirror:gnome:sources/libxklavier/%v/libxklavier-%v.tar.bz2
-Source-MD5: 103a9b6278d84159d08b386c0b6a63b5
+Source-MD5: ee167645becd11309d64c6ff3a1600ff
Conflicts: libxklavier1, libxklavier10, libxklavier11
Replaces: libxklavier1, libxklavier10, libxklavier11
PatchFile: %n.patch
-PatchFile-MD5: b8c75b215fc0d49aa63f20f14818a841
+PatchFile-MD5: c76d163ba5a14609fc2ae54db261e995
PatchScript: <<
%{default_script}
perl -pi -e 's/(-lxkbfile)/\1 -lX11/' libxklavier/Makefile.in
<<
SetCFLAGS: -Os
-ConfigureParams: --disable-dependency-tracking --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib --enable-doxygen --disable-xkb-support
--with-xmodmap-base=%p/share/xmodmap F77=no
+ConfigureParams: --disable-dependency-tracking --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib --enable-doxygen --disable-xkb-support
--with-xmodmap-base=%p/share/xmodmap F77=no --disable-static
InstallScript: make install DESTDIR=%d
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
- Depends: glib2-shlibs (>= 2.14.0-1), libiconv, libxml2-shlibs (>=
2.6.30-1), x11-shlibs
- Files: lib/libxklavier.12*dylib share/%N
- Shlibs: %p/lib/libxklavier.12.dylib 13.0.0 %n (>= 3.4-1)
+ Depends: <<
+ glib2-shlibs (>= 2.18.0-1),
+ iso-codes,
+ libgettext3-shlibs,
+ libiconv,
+ libxml2-shlibs (>= 2.6.30-1),
+ x11-shlibs
+ <<
+ Files: lib/libxklavier.12*dylib
+ Shlibs: %p/lib/libxklavier.12.dylib 14.0.0 %n (>= 3.7-1)
DocFiles: COPYING* README
<<
DocFiles: AUTHORS COPYING* CREDITS ChangeLog INSTALL NEWS README
Description: Library to make XKB stuff easier
DescPort: <<
XKB doesn't work on OS X, so force its activation function to fail.
-
-We're not quite clean for -Werror during compiling.
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: libxklavier12.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libxklavier12.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libxklavier12.patch 15 Jul 2008 01:41:03 -0000 1.2
+++ libxklavier12.patch 10 Nov 2008 08:18:33 -0000 1.3
@@ -1,19 +1,31 @@
-diff -Nurd libxklavier-3.4.orig/configure libxklavier-3.4/configure
---- libxklavier-3.4.orig/configure 2007-10-05 19:20:21.000000000 -0400
-+++ libxklavier-3.4/configure 2008-03-07 03:17:06.000000000 -0500
-@@ -1980,7 +1980,7 @@
+diff -Nurd -x'*~' libxklavier-3.7.orig/configure libxklavier-3.7/configure
+--- libxklavier-3.7.orig/configure 2008-09-05 15:50:11.000000000 -0400
++++ libxklavier-3.7/configure 2008-11-10 03:05:53.000000000 -0500
+@@ -1964,7 +1964,7 @@
-PACKAGE=libxklavier
+PACKAGE=libxklavier12
MAJOR_VERSION=3
- MINOR_VERSION=4
+ MINOR_VERSION=7
VERSION=$MAJOR_VERSION.$MINOR_VERSION
-diff -Nurd libxklavier-3.4.orig/libxklavier/Makefile.in
libxklavier-3.4/libxklavier/Makefile.in
---- libxklavier-3.4.orig/libxklavier/Makefile.in 2007-12-20
18:09:28.000000000 -0500
-+++ libxklavier-3.4/libxklavier/Makefile.in 2008-03-07 04:19:07.000000000
-0500
-@@ -225,8 +225,8 @@
+diff -Nurd -x'*~' libxklavier-3.7.orig/doc/reference/Makefile.in
libxklavier-3.7/doc/reference/Makefile.in
+--- libxklavier-3.7.orig/doc/reference/Makefile.in 2008-09-05
15:50:10.000000000 -0400
++++ libxklavier-3.7/doc/reference/Makefile.in 2008-11-10 03:05:40.000000000
-0500
+@@ -257,7 +257,7 @@
+ # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+ INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS)
+-GTKDOC_LIBS = $(GLIB_LIBS) -L$(top_builddir)/libxklavier -lxklavier
++GTKDOC_LIBS = $(GLIB_LIBS) $(top_builddir)/libxklavier/libxklavier.la
+ @[EMAIL PROTECTED] = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CFLAGS) $(CFLAGS)
+ @[EMAIL PROTECTED] = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @[EMAIL PROTECTED] = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+diff -Nurd -x'*~' libxklavier-3.7.orig/libxklavier/Makefile.in
libxklavier-3.7/libxklavier/Makefile.in
+--- libxklavier-3.7.orig/libxklavier/Makefile.in 2008-09-05
15:50:10.000000000 -0400
++++ libxklavier-3.7/libxklavier/Makefile.in 2008-11-10 03:05:54.000000000
-0500
+@@ -226,8 +226,8 @@
@[EMAIL PROTECTED] = -DENABLE_XMODMAP_SUPPORT=1
EXTRA_DIST = marshal.list
GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
@@ -24,10 +36,10 @@
$(XML_CFLAGS) $(GLIB_CFLAGS) \
$(LIBXKBFILE_PRESENT_CFLAG) \
$(ENABLE_XKB_SUPPORT_CFLAG) \
-diff -Nurd libxklavier-3.4.orig/tests/Makefile.in
libxklavier-3.4/tests/Makefile.in
---- libxklavier-3.4.orig/tests/Makefile.in 2007-12-20 18:09:28.000000000
-0500
-+++ libxklavier-3.4/tests/Makefile.in 2008-03-07 04:18:03.000000000 -0500
-@@ -204,7 +204,7 @@
+diff -Nurd -x'*~' libxklavier-3.7.orig/tests/Makefile.in
libxklavier-3.7/tests/Makefile.in
+--- libxklavier-3.7.orig/tests/Makefile.in 2008-09-05 15:50:10.000000000
-0400
++++ libxklavier-3.7/tests/Makefile.in 2008-11-10 03:05:54.000000000 -0500
+@@ -205,7 +205,7 @@
target_alias = @target_alias@
test_config_SOURCES = test_config.c
test_monitor_SOURCES = test_monitor.c
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
