Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11168/gnome
Modified Files:
at-spi.info at-spi.patch
Log Message:
new version
Index: at-spi.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/at-spi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- at-spi.patch 15 Jul 2008 01:40:52 -0000 1.2
+++ at-spi.patch 23 Oct 2008 04:58:32 -0000 1.3
@@ -1,30 +1,19 @@
-diff -Nurd -x'*~' at-spi-1.20.1.orig/Makefile.in at-spi-1.20.1/Makefile.in
---- at-spi-1.20.1.orig/Makefile.in 2007-10-15 09:16:47.000000000 -0400
-+++ at-spi-1.20.1/Makefile.in 2007-11-04 17:57:31.000000000 -0500
-@@ -286,7 +286,7 @@
+diff -Nurd -x'*~' at-spi-1.24.0.orig/Makefile.in at-spi-1.24.0/Makefile.in
+--- at-spi-1.24.0.orig/Makefile.in 2008-09-22 04:55:52.000000000 -0400
++++ at-spi-1.24.0/Makefile.in 2008-10-23 00:35:25.000000000 -0400
+@@ -297,7 +297,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi pyatspi test
po
-+SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi test po
++SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi po
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-diff -Nurd -x'*~' at-spi-1.20.1.orig/atk-bridge/Makefile.in
at-spi-1.20.1/atk-bridge/Makefile.in
---- at-spi-1.20.1.orig/atk-bridge/Makefile.in 2007-10-15 09:16:45.000000000
-0400
-+++ at-spi-1.20.1/atk-bridge/Makefile.in 2007-12-01 16:37:25.000000000
-0500
-@@ -289,6 +289,7 @@
- $(WARN_CFLAGS) \
- $(ATK_BRIDGE_CFLAGS) \
- -DG_LOG_DOMAIN=\"atk-bridge\" \
-+ $(X_CFLAGS) \
- $(NULL)
-
- DEPS = \
-diff -Nurd -x'*~' at-spi-1.20.1.orig/configure at-spi-1.20.1/configure
---- at-spi-1.20.1.orig/configure 2007-10-15 09:16:44.000000000 -0400
-+++ at-spi-1.20.1/configure 2007-11-04 17:57:31.000000000 -0500
-@@ -5031,8 +5031,7 @@
+diff -Nurd -x'*~' at-spi-1.24.0.orig/configure at-spi-1.24.0/configure
+--- at-spi-1.24.0.orig/configure 2008-09-22 04:55:45.000000000 -0400
++++ at-spi-1.24.0/configure 2008-10-23 00:05:09.000000000 -0400
+@@ -5370,8 +5370,7 @@
if test "$PYTHON" = :; then
{ { echo "$as_me:$LINENO: error: no suitable Python interpreter found"
>&5
@@ -34,7 +23,7 @@
else
-@@ -25787,125 +25786,6 @@
+@@ -17559,125 +17558,6 @@
@@ -160,16 +149,33 @@
#libtool option to strip symbols starting with cspi
#
-diff -Nurd -x'*~' at-spi-1.20.1.orig/libspi/Makefile.in
at-spi-1.20.1/libspi/Makefile.in
---- at-spi-1.20.1.orig/libspi/Makefile.in 2007-10-15 09:16:46.000000000
-0400
-+++ at-spi-1.20.1/libspi/Makefile.in 2007-12-01 16:37:43.000000000 -0500
-@@ -297,7 +297,8 @@
- -I$(top_builddir) \
- $(LIBSPI_DEBUG_CFLAGS) \
- $(WARN_CFLAGS) \
-- $(LIBSPI_CFLAGS)
-+ $(LIBSPI_CFLAGS) \
-+ $(X_CFLAGS)
+diff -Nurd -x'*~' at-spi-1.24.0.orig/cspi/Makefile.in
at-spi-1.24.0/cspi/Makefile.in
+--- at-spi-1.24.0.orig/cspi/Makefile.in 2008-09-22 04:55:48.000000000
-0400
++++ at-spi-1.24.0/cspi/Makefile.in 2008-10-23 00:20:28.000000000 -0400
+@@ -303,9 +303,9 @@
+ lib_LTLIBRARIES = libcspi.la
+ INCLUDES = -I $(top_srcdir) \
+ -I $(top_builddir) \
+- $(X_CFLAGS) \
+ $(WARN_CFLAGS) \
+- $(LIBCSPI_CFLAGS)
++ $(LIBCSPI_CFLAGS) \
++ $(X_CFLAGS)
- libspi_la_LDFLAGS = @LT_VERSION_INFO@ -no-undefined
- libspi_la_LIBADD = $(LIBSPI_LIBS) $(XTST_LIBS)
+ libcspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSION_INFO@ @LIBTOOL_EXPORT_OPTIONS@
-no-undefined
+ LDADD = \
+diff -Nurd -x'*~' at-spi-1.24.0.orig/cspi/bonobo/Makefile.in
at-spi-1.24.0/cspi/bonobo/Makefile.in
+--- at-spi-1.24.0.orig/cspi/bonobo/Makefile.in 2008-09-22 04:55:48.000000000
-0400
++++ at-spi-1.24.0/cspi/bonobo/Makefile.in 2008-10-23 00:20:06.000000000
-0400
+@@ -275,9 +275,9 @@
+ target_alias = @target_alias@
+ INCLUDES = -I $(top_srcdir) \
+ -I $(top_builddir) \
+- $(X_CFLAGS) \
+ $(WARN_CFLAGS) \
+- $(LIBCSPI_CFLAGS)
++ $(LIBCSPI_CFLAGS) \
++ $(X_CFLAGS)
+
+ noinst_LTLIBRARIES = libcspi-bonobo.la
+ libcspi_bonobo_la_SOURCES = \
Index: at-spi.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/at-spi.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- at-spi.info 21 Jul 2008 23:13:39 -0000 1.12
+++ at-spi.info 23 Oct 2008 04:58:32 -0000 1.13
@@ -1,90 +1,85 @@
Package: at-spi
-Version: 1.20.1
+Version: 1.24.0
Revision: 1
Depends: <<
%N-shlibs (>= %v-%r),
- atk1-shlibs (>= 1.20.0-1),
- gail18 (>= 1.20.0-1),
- gconf2-shlibs (>= 2.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
- gtk+2 (>= 2.12.0-1),
- libart2-shlibs (>= 2.3.16-1),
- libbonobo2 (>= 2.20.0-1),
+ atk1-shlibs (>= 1.24.0-1),
+ cairo-shlibs (>= 1.8-1),
+ expat1-shlibs,
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.7-7),
+ gconf2 (>= 2.24.0-1),
+ glib2-shlibs (>= 2.18.0-1),
+ glitz-shlibs,
+ gtk+2 (>= 2.14.0-1),
+ libbonobo2 (>= 2.24.0-1),
libgettext3-shlibs,
- libgnome2 (>= 2.20.0-1),
- libgnomeui2 (>= 2.20.0-1),
- libgnomecanvas2 (>= 2.20.0-1),
libiconv,
- orbit2 (>= 2.14.9-1),
- pango1-xft2-ft219 (>= 1.18.4-4),
+ libpng3-shlibs,
+ orbit2 (>= 2.14.16-1),
+ pango1-xft2-ft219 (>= 1.22.0-4),
+ pixman-shlibs (>= 0.12.0-1),
x11
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- cairo (>= 1.6-1),
- dbus-dev (>= 1.0-1),
- esound (>= 0.2.38-1),
+ atk1 (>= 1.24.0-1),
+ cairo (>= 1.8-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gail18-dev (>= 1.20.0-1),
- gconf2-dev (>= 2.20.0-1),
+ freetype219 (>= 2.3.7-7),
+ gconf2-dev (>= 2.24.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.18.0-1),
glitz,
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- gtk+2-dev (>= 2.12.0-1),
+ gtk+2-dev (>= 2.14.0-1),
gtk-doc (>= 1.8-1),
- intltool (>= 0.36.0-1),
- libart2 (>= 2.3.16-1),
- libbonobo2-dev (>= 2.20.0-1),
- libbonoboui2-dev (>= 2.20.0-1),
+ intltool40,
+ libbonobo2-dev (>= 2.24.0-1),
libgettext3-dev,
- libgnome2-dev (>= 2.20.0-1),
- libgnomeui2-dev (>= 2.20.0-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
libiconv-dev,
libpng3,
- libxml2 (>= 2.6.30-1),
- libxslt (>= 1.1.22-1),
- orbit2-dev (>= 2.14.9-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
+ orbit2-dev (>= 2.14.16-1),
+ pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pixman (>= 0.12.0-1),
+ pkgconfig (>= 0.23),
popt,
x11-dev,
xft2-dev
<<
-Source: mirror:gnome:sources/%n/1.20/%n-%v.tar.bz2
-Source-MD5: 9dc4ce96c17452cd285d006d03574e93
+Source: mirror:gnome:sources/%n/1.24/%n-%v.tar.bz2
+Source-MD5: e546a35e21d127b502a3c57550a189a0
PatchFile: %n.patch
-PatchFile-MD5: 27cf67d6ce0774de678594e907d929bf
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+PatchFile-MD5: cc5044cfad74a0d4f097de20af06eaf9
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
-SetCXXFLAGS: -Os
-ConfigureParams: --libexecdir=%p/lib/%n --disable-dependency-tracking
--enable-static --enable-compile-warnings=maximum --enable-gtk-doc
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
-CompileScript: F77=no ./configure %c; make
+ConfigureParams: --libexecdir=%p/lib/%n --disable-dependency-tracking
--disable-static --enable-compile-warnings=maximum --enable-gtk-doc
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+CompileScript: <<
+ F77=no ./configure %c
+ make
+<<
+InfoTest: TestScript: make -C test || exit 2
InstallScript: make -j1 install DESTDIR="%d"
SplitOff: <<
Package: %N-shlibs
Depends: <<
- atk1-shlibs (>= 1.20.0-1),
- gail18 (>= 1.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
- gtk+2 (>= 2.12.0-1),
- libart2-shlibs (>= 2.3.16-1),
- libbonobo2 (>= 2.20.0-1),
+ atk1-shlibs (>= 1.24.0-1),
+ cairo-shlibs (>= 1.8-1),
+ expat1-shlibs,
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.7-7),
+ glib2-shlibs (>= 2.18.0-1),
+ glitz-shlibs,
+ gtk+2 (>= 2.14.0-1),
+ libbonobo2 (>= 2.24.0-1),
libgettext3-shlibs,
- libgnomecanvas2 (>= 2.20.0-1),
libiconv,
- orbit2 (>= 2.14.9-1),
- pango1-xft2-ft219 (>= 1.18.4-4),
+ libpng3-shlibs,
+ orbit2 (>= 2.14.16-1),
+ pango1-xft2-ft219 (>= 1.22.0-4),
+ pixman-shlibs (>= 0.12.0-1),
x11-shlibs
<<
Description: Shared libraries for at-spi
@@ -106,7 +101,6 @@
Files: <<
include
share/idl
- lib/*.a
lib/*.dylib
lib/*.la
lib/pkgconfig
@@ -144,13 +138,14 @@
http://bugzilla.gnome.org/show_bug.cgi?id=336297
But libbonobo needs popt.h
- Disable python bindings (externalize as -pyXX varianted pkgs).
+ Disable python bindings (could externalize as -pyXX varianted
+ pkgs if someone wanted them).
+
+ Move x11 -I flags after fink for self-consistent preference to
+ use fink-supplied libs whenever available.
<<
DescPort: <<
Linking against this lib may generate compiler warnings about
multiple definitions of various *_Bonobo_* symbols. See:
http://bugzilla.gnome.org/show_bug.cgi?id=313122
-
- Add missing X11 flag. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=493547
<<
-------------------------------------------------------------------------
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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
