Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24503
Modified Files:
gnome-mag2.info
Added Files:
gnome-mag2.patch
Log Message:
flag/dep cleanup
--- NEW FILE: gnome-mag2.patch ---
diff -Nurd -x'*~' gnome-mag-0.14.0.orig/magnifier/Makefile.in
gnome-mag-0.14.0/magnifier/Makefile.in
--- gnome-mag-0.14.0.orig/magnifier/Makefile.in 2006-12-15 16:26:08.000000000
-0500
+++ gnome-mag-0.14.0/magnifier/Makefile.in 2009-01-21 03:55:21.000000000
-0500
@@ -316,10 +316,10 @@
magnifier_CFLAGS = $(AM_CFLAGS)
INCLUDES = \
- $(DEPS_CFLAGS) \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/idl \
+ $(DEPS_CFLAGS) \
$(GNOME_MAG_DEBUG_CFLAGS) \
-DCURSORSDIR=\""$(Cursorsdir)"\"
@@ -328,9 +328,9 @@
BUILT_SOURCES = $(IDL_OUT)
CLEANFILES = $(IDL_OUT) $(server_in_files) $(serverinfo_DATA)
DISTCLEANFILES = $(IDL_OUT)
-IDLFLAGS = -I$(BONOBO_ACTIVATION_IDL_DIR) \
+IDLFLAGS = -I$(top_srcdir)/idl \
+ -I$(BONOBO_ACTIVATION_IDL_DIR) \
-I$(LIBBONOBO_IDL_DIR) \
- -I$(top_srcdir)/idl \
--add-imodule
orbittypelibdir = $(libdir)/orbit-2.0
diff -Nurd -x'*~' gnome-mag-0.14.0.orig/test/Makefile.in
gnome-mag-0.14.0/test/Makefile.in
--- gnome-mag-0.14.0.orig/test/Makefile.in 2006-12-15 16:26:08.000000000
-0500
+++ gnome-mag-0.14.0/test/Makefile.in 2009-01-21 03:53:50.000000000 -0500
@@ -260,11 +260,11 @@
control_client_SOURCES = control-client.c
mag_test_SOURCES = mag-test.c
INCLUDES = \
- $(DEPS_CFLAGS) \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_builddir)/magnifier \
- -I$(top_srcdir)/idl
+ -I$(top_srcdir)/idl \
+ $(DEPS_CFLAGS)
LDADD = $(DEPS_LIBS) $(top_builddir)/magnifier/libgnome-mag.la $(X_LIBS)
$(POPT_LIBS)
all: all-am
Index: gnome-mag2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-mag2.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gnome-mag2.info 13 Nov 2008 07:19:36 -0000 1.12
+++ gnome-mag2.info 21 Jan 2009 09:21:20 -0000 1.13
@@ -1,56 +1,52 @@
Package: gnome-mag2
# can't go higher than 0.14.0 until we update X11 to x.org 7.2
Version: 0.14.0
-Revision: 1002
+Revision: 1003
Conflicts: gnome-mag
Replaces: gnome-mag
Depends: <<
%N-shlibs (>= %v-%r),
- at-spi (>= 1.20.0-1),
- 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,
- libbonobo2 (>= 2.20.0-1),
+ at-spi (>= 1.24.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,
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),
popt-shlibs,
x11-shlibs
<<
BuildDepends: <<
- at-spi-dev (>= 1.20.0-1),
- atk1 (>= 1.20.0-1),
- cairo (>= 1.6-1),
- dbus-dev (>= 1.0-1),
+ at-spi-dev (>= 1.24.0-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),
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),
- intltool (>= 0.36.0-1),
- libart2,
- libbonobo2-dev (>= 2.20.0-1),
- libbonoboui2-dev (>= 2.20.0-1),
+ gtk+2-dev (>= 2.14.0-1),
+ intltool40,
+ libbonobo2-dev (>= 2.24.0-1),
libgettext3-dev,
- libgnome2-dev (>= 2.20.0-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomeui2-dev (>= 2.20.0-1),
libiconv-dev,
libpng3,
- libxml2 (>= 2.6.30-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,
@@ -58,13 +54,13 @@
<<
Source: mirror:gnome:sources/gnome-mag/0.14/gnome-mag-%v.tar.bz2
Source-MD5: 012ad052da51031eca1f521942f865f2
-ConfigureParams: --libexecdir=%p/lib/%n --mandir=%p/share/man
--disable-dependency-tracking --enable-static
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
+PatchFile: %n.patch
+PatchFile-MD5: 8d990295d8ddeedada4baaa4d08aeb2e
+ConfigureParams: --libexecdir=%p/lib/%n --mandir=%p/share/man
--disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-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
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os -pipe
CompileScript: <<
#!/bin/sh -ev
@@ -76,11 +72,10 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- glib2-shlibs (>= 2.14.0-1),
+ glib2-shlibs (>= 2.18.0-1),
libgettext3-shlibs,
libiconv,
- orbit2-shlibs (>= 2.14.9-1),
- popt-shlibs
+ orbit2-shlibs (>= 2.14.16-1)
<<
Description: Shared libraries for gnome-mag
Files: lib/libgnome-mag.*.dylib
@@ -94,7 +89,14 @@
Conflicts: gnome-mag-dev
Replaces: gnome-mag-dev
Description: Development headers and libraries for gnome-mag
- Files: include lib/*.a lib/*.dylib lib/*.la lib/pkgconfig share/idl
lib/orbit-2.0/*.a lib/orbit-2.0/*.la
+ Files: <<
+ include
+ lib/*.dylib
+ lib/*.la
+ lib/pkgconfig
+ share/idl
+ lib/orbit-2.0/*.la
+ <<
DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS
README
<<
DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS README
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
