Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.28
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4407
Modified Files:
libgnomekbd2.info
Added Files:
libxklavier16.info libxklavier16.patch
Removed Files:
libxklavier15.info libxklavier15.patch
Log Message:
let's not be *too* ridiculous
--- libxklavier15.patch DELETED ---
--- NEW FILE: libxklavier16.patch ---
diff -Nurd -x'*~' libxklavier-5.0.orig/configure libxklavier-5.0/configure
--- libxklavier-5.0.orig/configure 2010-01-11 05:02:48.000000000 -0500
+++ libxklavier-5.0/configure 2010-02-11 06:23:18.000000000 -0500
@@ -2831,7 +2831,7 @@
# Define the identity of the package.
- PACKAGE='libxklavier'
+ PACKAGE='libxklavier16'
VERSION='5.0'
@@ -12812,12 +12812,12 @@
pkg_cv_XINPUT_CFLAGS="$XINPUT_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"xi >= 1.1.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xi >= 1.1.3") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"xi >= 99999.FORCE.NONDETECT\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xi >= 99999.FORCE.NONDETECT") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_XINPUT_CFLAGS=`$PKG_CONFIG --cflags "xi >= 1.1.3" 2>/dev/null`
+ pkg_cv_XINPUT_CFLAGS=`$PKG_CONFIG --cflags "xi >= 99999.FORCE.NONDETECT"
2>/dev/null`
else
pkg_failed=yes
fi
@@ -12830,12 +12830,12 @@
pkg_cv_XINPUT_LIBS="$XINPUT_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"xi >= 1.1.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xi >= 1.1.3") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"xi >= 99999.FORCE.NONDETECT\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xi >= 99999.FORCE.NONDETECT") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_XINPUT_LIBS=`$PKG_CONFIG --libs "xi >= 1.1.3" 2>/dev/null`
+ pkg_cv_XINPUT_LIBS=`$PKG_CONFIG --libs "xi >= 99999.FORCE.NONDETECT"
2>/dev/null`
else
pkg_failed=yes
fi
@@ -12854,9 +12854,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "xi >= 1.1.3"`
+ XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "xi >= 99999.FORCE.NONDETECT"`
else
- XINPUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "xi >= 1.1.3"`
+ XINPUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "xi >= 99999.FORCE.NONDETECT"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XINPUT_PKG_ERRORS" >&5
diff -Nurd -x'*~' libxklavier-5.0.orig/doc/reference/Makefile.in
libxklavier-5.0/doc/reference/Makefile.in
--- libxklavier-5.0.orig/doc/reference/Makefile.in 2010-01-11
05:02:47.000000000 -0500
+++ libxklavier-5.0/doc/reference/Makefile.in 2010-02-11 06:18:44.000000000
-0500
@@ -256,7 +256,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
@gtk_doc_use_libtool_fa...@gtkdoc_cc = $(CC) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@gtk_doc_use_libtool_t...@gtkdoc_cc = $(LIBTOOL) --mode=compile $(CC)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@gtk_doc_use_libtool_fa...@gtkdoc_ld = $(CC) $(AM_CFLAGS) $(CFLAGS)
$(AM_LDFLAGS) $(LDFLAGS)
diff -Nurd -x'*~' libxklavier-5.0.orig/libxklavier/Makefile.in
libxklavier-5.0/libxklavier/Makefile.in
--- libxklavier-5.0.orig/libxklavier/Makefile.in 2010-01-11
05:02:47.000000000 -0500
+++ libxklavier-5.0/libxklavier/Makefile.in 2010-02-11 06:36:49.000000000
-0500
@@ -247,7 +247,7 @@
@enable_xkb_support_t...@enable_xkb_support_cflag = -DENABLE_XKB_SUPPORT=1
@enable_xmodmap_support_fa...@enable_xmodmap_support_cflag =
-DDISABLE_XMODMAP_SUPPORT=1
@enable_xmodmap_support_t...@enable_xmodmap_support_cflag =
-DENABLE_XMODMAP_SUPPORT=1
-AM_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+AM_CPPFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-I. -I$(top_srcdir) $(X_CFLAGS) \
$(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \
$(LIBXKBFILE_PRESENT_CFLAG) \
@@ -273,7 +273,7 @@
libxklavier_la_LIBADD = \
$(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \
$(LIBXKBFILE_PRESENT_LDFLAGS) \
- $(X_LIBS) -lX11 $(LIBICONV)
+ $(X_LIBS) -lX11 $(LIBICONV) -lintl
EXTRA_DIST = marshal.list
GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
diff -Nurd -x'*~' libxklavier-5.0.orig/tests/Makefile.in
libxklavier-5.0/tests/Makefile.in
--- libxklavier-5.0.orig/tests/Makefile.in 2010-01-11 05:02:47.000000000
-0500
+++ libxklavier-5.0/tests/Makefile.in 2010-02-11 06:36:22.000000000 -0500
@@ -210,7 +210,7 @@
top_srcdir = @top_srcdir@
test_config_SOURCES = test_config.c
test_monitor_SOURCES = test_monitor.c
-AM_CFLAGS = -Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = -Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
LDADD = $(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS)
all: all-am
--- NEW FILE: libxklavier16.info ---
Package: libxklavier16
Version: 5.0
Revision: 1
Depends: <<
%N-shlibs (= %v-%r),
libiconv,
libxml2-shlibs,
x11
<<
BuildDepends: <<
doxygen,
fink (>= 0.24.12-1),
glib2-dev (>= 2.22.0-1),
gtk-doc (>= 1.13-5),
libgettext8-dev,
libiconv-dev,
libxml2 (>= 2.6.30-1),
pkgconfig (>= 0.23),
x11-dev
<<
Source: mirror:gnome:sources/libxklavier/%v/libxklavier-%v.tar.bz2
Source-MD5: 134c7ea177ff901123b909de77394780
Conflicts: libxklavier1, libxklavier10, libxklavier11, libxklavier12
Replaces: libxklavier1, libxklavier10, libxklavier11, libxklavier12
PatchFile: %n.patch
PatchFile-MD5: 09dc8bb832aff6b167510b9d95efdff7
SetCFLAGS: -Os
ConfigureParams: --disable-dependency-tracking --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib --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.22.0-1),
iso-codes,
libgettext8-shlibs,
libiconv,
libxml2-shlibs (>= 2.6.30-1),
x11-shlibs
<<
Files: lib/libxklavier.16.*dylib
Shlibs: %p/lib/libxklavier.16.dylib 17.0.0 %n (>= 5.0-1)
DocFiles: AUTHORS COPYING* CREDITS ChangeLog NEWS README
<<
DocFiles: AUTHORS COPYING* CREDITS ChangeLog NEWS README
Description: Library to make XKB stuff easier
DescPort: <<
XKB doesn't work on OS X, so force its activation function to fail.
Recent glib doesn't publish -lintl, so pass it directly.
<<
DescPackaging: <<
Fix -I messes. See:
https://bugs.freedesktop.org/show_bug.cgi?id=20244
Some supported x11 flavors have older XInput that has no
xi.pc, so make sure it's never detected in order to get
consistent build.
<<
License: LGPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Homepage: http://www.gnome.org/
--- libxklavier15.info DELETED ---
Index: libgnomekbd2.info
===================================================================
RCS file:
/cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.28/libgnomekbd2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgnomekbd2.info 17 Feb 2010 08:18:01 -0000 1.1
+++ libgnomekbd2.info 17 Feb 2010 15:39:24 -0000 1.2
@@ -1,6 +1,6 @@
Package: libgnomekbd2
Version: 2.28.2
-Revision: 1
+Revision: 2
Depends: <<
%N-4-shlibs (>= %v-%r),
atk1-shlibs (>= 1.28.0-1),
@@ -14,7 +14,7 @@
glib2-shlibs (>= 2.22.0-1),
gtk+2-shlibs (>= 2.18.0-1),
libgettext8-shlibs,
- libxklavier15-shlibs,
+ libxklavier16-shlibs,
libxml2-shlibs (>= 2.6.30-1),
pango1-xft2-ft219-shlibs (>= 1.24.5-4),
x11
@@ -39,7 +39,7 @@
gtk-doc (>= 1.13-5),
intltool40,
libgettext8-dev,
- libxklavier15,
+ libxklavier16,
libxml2 (>= 2.6.30-1),
pango1-xft2-ft219-dev (>= 1.24.5-4),
pixman (>= 0.16.0-1),
@@ -85,7 +85,7 @@
glib2-shlibs (>= 2.22.0-1),
gtk+2-shlibs (>= 2.18.0-1),
libgettext8-shlibs,
- libxklavier15-shlibs,
+ libxklavier16-shlibs,
libxml2-shlibs (>= 2.6.30-1),
pango1-xft2-ft219-shlibs (>= 1.24.5-4),
x11
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
