Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13319
Modified Files:
Tag: pangocairo-branch
control-center.info gnome-applets.info libgnomekbd2.info
libxklavier1.info libxklavier10.info libxklavier11.info
totem.info
Added Files:
Tag: pangocairo-branch
libxklavier12.info libxklavier12.patch
Log Message:
new libxklavier libversion
Index: libxklavier1.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libxklavier1.info,v
retrieving revision 1.2.2.18
retrieving revision 1.2.2.19
diff -u -d -r1.2.2.18 -r1.2.2.19
--- libxklavier1.info 4 Nov 2007 02:34:46 -0000 1.2.2.18
+++ libxklavier1.info 7 Mar 2008 09:26:13 -0000 1.2.2.19
@@ -1,6 +1,6 @@
Package: libxklavier1
Version: 1.02
-Revision: 1009
+Revision: 1010
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
atk1 (>= 1.20.0-1),
@@ -23,8 +23,8 @@
x11-dev,
xft2-dev
<<
-Conflicts: libxklavier10, libxklavier11
-Replaces: libxklavier10, libxklavier11
+Conflicts: libxklavier10, libxklavier11, libxklavier12
+Replaces: libxklavier10, libxklavier11, libxklavier12
Source: mirror:sourceforge:gswitchit/libxklavier-%v.tar.gz
Source-MD5: fba323a69bc904e9889df7fb5491ea55
NoSetCPPFLAGS: true
--- NEW FILE: libxklavier12.info ---
Package: libxklavier12
Version: 3.4
Revision: 1
Depends: <<
%N-shlibs (= %v-%r),
libiconv,
libxml2-shlibs,
x11
<<
BuildDepends: <<
doxygen,
fink (>= 0.24.12-1),
glib2-dev (>= 2.14.0-1),
libgettext3-dev,
libiconv-dev,
libxml2 (>= 2.6.30-1),
pkgconfig (>= 0.21-1),
x11-dev
<<
Source: mirror:gnome:sources/libxklavier/%v/libxklavier-%v.tar.bz2
Source-MD5: 103a9b6278d84159d08b386c0b6a63b5
Conflicts: libxklavier1, libxklavier10, libxklavier11
Replaces: libxklavier1, libxklavier10, libxklavier11
PatchFile: %n.patch
PatchFile-MD5: b8c75b215fc0d49aa63f20f14818a841
PatchScript: <<
%{default_script}
perl -pi -e 's/(-lxkbfile)/\1 -lX11/' libxklavier/Makefile.in
<<
SetCFLAGS: -Os
ConfigureParams: --disable-dependency-tracking --enable-doxygen
--disable-xkb-support --with-xmodmap-base=%p/share/xmodmap F77=no
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)
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]>
Homepage: http://www.gnome.org/
Index: gnome-applets.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-applets.info,v
retrieving revision 1.3.2.49
retrieving revision 1.3.2.50
diff -u -d -r1.3.2.49 -r1.3.2.50
--- gnome-applets.info 6 Mar 2008 05:07:20 -0000 1.3.2.49
+++ gnome-applets.info 7 Mar 2008 09:26:13 -0000 1.3.2.50
@@ -1,6 +1,6 @@
Package: gnome-applets
Version: 2.20.0
-Revision: 2
+Revision: 3
Depends: <<
%N-shlibs (= %v-%r),
gail18 (>= 1.20.0-1),
@@ -53,7 +53,7 @@
libjpeg,
libpng3,
libwnck1.22 (>= 2.20.0-1),
- libxklavier11,
+ libxklavier12,
libxml2 (>= 2.6.30-1),
orbit2-dev (>= 2.14.9-1),
pango1-xft2-ft219-dev (>= 1.18.2-1),
@@ -98,7 +98,7 @@
libavahi-common3-shlibs,
libavahi-glib1-shlibs,
libgtop2.0.7-shlibs (>= 2.20.0-1),
- libxklavier11-shlibs
+ libxklavier12-shlibs
<<
Files: lib/libgweather.0*.dylib share/locale
Shlibs: %p/lib/libgweather.0.dylib 1.0.0 %n (>= 2.20.0-1)
--- NEW FILE: libxklavier12.patch ---
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 @@
-PACKAGE=libxklavier
+PACKAGE=libxklavier12
MAJOR_VERSION=3
MINOR_VERSION=4
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 @@
@[EMAIL PROTECTED] = -DENABLE_XMODMAP_SUPPORT=1
EXTRA_DIST = marshal.list
GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
-AM_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
- -I. -I$(includedir) $(X_CFLAGS) -I$(top_srcdir) \
+AM_CPPFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+ -I. -I$(top_srcdir) -I$(includedir) $(X_CFLAGS) \
$(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 @@
target_alias = @target_alias@
test_config_SOURCES = test_config.c
test_monitor_SOURCES = test_monitor.c
-AM_CFLAGS = -Wall -Werror -I$(includedir) $(X_CFLAGS) -I$(top_srcdir)
$(GLIB_CFLAGS)
+AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir) -I$(includedir) $(X_CFLAGS)
$(GLIB_CFLAGS)
AM_LDFLAGS = $(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) -lX11
$(GLIB_LIBS)
all: all-am
Index: libxklavier10.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libxklavier10.info,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -d -r1.4.2.4 -r1.4.2.5
--- libxklavier10.info 6 Oct 2007 19:13:52 -0000 1.4.2.4
+++ libxklavier10.info 7 Mar 2008 09:26:13 -0000 1.4.2.5
@@ -17,8 +17,8 @@
<<
Source: mirror:sourceforge:gswitchit/libxklavier-%v.tar.gz
Source-MD5: a9c2e53ea96ed138b588df5a9b9addaf
-Conflicts: libxklavier1, libxklavier11
-Replaces: libxklavier1, libxklavier11
+Conflicts: libxklavier1, libxklavier11, libxklavier12
+Replaces: libxklavier1, libxklavier11, libxklavier12
PatchFile: %n.patch
PatchFile-MD5: dd6607055bfcd1637cd7d0f8a290c578
PatchScript: <<
Index: libxklavier11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/Attic/libxklavier11.info,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- libxklavier11.info 6 Oct 2007 19:13:52 -0000 1.1.2.6
+++ libxklavier11.info 7 Mar 2008 09:26:13 -0000 1.1.2.7
@@ -1,6 +1,6 @@
Package: libxklavier11
Version: 3.2
-Revision: 1
+Revision: 2
Depends: <<
%N-shlibs (= %v-%r),
libiconv,
@@ -19,8 +19,8 @@
<<
Source: mirror:gnome:sources/libxklavier/%v/libxklavier-%v.tar.bz2
Source-MD5: d248f96fdfc0e4f0ed583428eda9a997
-Conflicts: libxklavier1, libxklavier10
-Replaces: libxklavier1, libxklavier10
+Conflicts: libxklavier1, libxklavier10, libxklavier12
+Replaces: libxklavier1, libxklavier10, libxklavier12
PatchFile: %n.patch
PatchFile-MD5: 8a22fe022419952dacb093f138f5c917
PatchScript: <<
Index: control-center.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/control-center.info,v
retrieving revision 1.9.2.53
retrieving revision 1.9.2.54
diff -u -d -r1.9.2.53 -r1.9.2.54
--- control-center.info 6 Mar 2008 05:07:19 -0000 1.9.2.53
+++ control-center.info 7 Mar 2008 09:26:13 -0000 1.9.2.54
@@ -1,7 +1,7 @@
Package: control-center
#upstream renames to gnome-control-center in 2.20.x
Version: 2.18.1
-Revision: 2
+Revision: 3
Depends: <<
%N2-shlibs (= %v-%r),
audiofile-bin (>= 0.2.5-1),
@@ -68,7 +68,7 @@
libjpeg,
libpng3,
librsvg2 (>= 2.18.0-1),
- libxklavier11,
+ libxklavier12,
libxml2 (>= 2.6.30-1),
metacity-dev (>= 2.20.2-1),
orbit2-dev (>= 2.14.9-1),
@@ -145,7 +145,7 @@
libiconv,
libjpeg-shlibs,
librsvg2-shlibs (>= 2.18.0-1),
- libxklavier11-shlibs,
+ libxklavier12-shlibs,
libxml2-shlibs (>= 2.6.30-1),
metacity (>= 2.19.34-1),
orbit2-shlibs (>= 2.14.9-1),
Index: libgnomekbd2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/Attic/libgnomekbd2.info,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -d -r1.1.2.32 -r1.1.2.33
--- libgnomekbd2.info 4 Nov 2007 02:34:46 -0000 1.1.2.32
+++ libgnomekbd2.info 7 Mar 2008 09:26:13 -0000 1.1.2.33
@@ -1,6 +1,6 @@
Package: libgnomekbd2
Version: 2.20.0
-Revision: 1
+Revision: 2
GCC: 4.0
Depends: <<
gconf2 (>= 2.20.0-1)
@@ -41,7 +41,7 @@
libjpeg,
libpng3,
libtool14,
- libxklavier11 (>= 3.1-1),
+ libxklavier12,
libxml2 (>= 2.6.30-1),
libxslt (>= 1.1.22-1),
orbit2-dev (>= 2.14.9-1),
@@ -73,7 +73,7 @@
gtk+2-shlibs (>= 2.12.0-1),
libbonobo2-shlibs (>= 2.20.0-1),
libglade2-shlibs (>= 2.6.2-1),
- libxklavier11-shlibs (>= 3.1-1),
+ libxklavier12-shlibs,
orbit2-shlibs (>= 2.14.9-1),
popt-shlibs
<<
Index: totem.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/Attic/totem.info,v
retrieving revision 1.4.2.32
retrieving revision 1.4.2.33
diff -u -d -r1.4.2.32 -r1.4.2.33
--- totem.info 6 Mar 2008 05:07:21 -0000 1.4.2.32
+++ totem.info 7 Mar 2008 09:26:13 -0000 1.4.2.33
@@ -1,6 +1,6 @@
Package: totem
Version: 2.21.0
-Revision: 2
+Revision: 3
GCC: 4.0
Depends: <<
%N-shlibs (= %v-%r),
@@ -61,7 +61,7 @@
libpng3 (>= 1.2.5-4),
librsvg2 (>= 2.18.0-1),
libtiff,
- libxklavier11,
+ libxklavier12,
libxml2 (>= 2.6.30-1),
libxslt (>= 1.1.22-1),
metacity-dev (>= 2.19.34-1),
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs