Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15306
Modified Files:
Tag: pangocairo-branch
libgnomeprint2.2.info libgnomeprint2.2.patch
libgnomeprintui2.2.info
Added Files:
Tag: pangocairo-branch
libgnomeprintui2.2.patch
Log Message:
yup, popt doesn't seem to be needed
Index: libgnomeprint2.2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgnomeprint2.2.patch,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- libgnomeprint2.2.patch 3 Nov 2007 19:49:17 -0000 1.2.2.3
+++ libgnomeprint2.2.patch 18 Nov 2007 23:06:14 -0000 1.2.2.4
@@ -1,6 +1,6 @@
diff -Nurd -x'*~' libgnomeprint-2.18.2.orig/configure
libgnomeprint-2.18.2/configure
--- libgnomeprint-2.18.2.orig/configure 2007-09-17 09:13:10.000000000
-0400
-+++ libgnomeprint-2.18.2/configure 2007-11-03 13:36:39.000000000 -0400
++++ libgnomeprint-2.18.2/configure 2007-11-18 17:09:02.000000000 -0500
@@ -23821,11 +23821,6 @@
;;
esac
@@ -24,3 +24,11 @@
+@@ -24914,7 +24909,6 @@
+ echo "${ECHO_T}yes" >&6; }
+ :
+ fi
+-TOOLS_LIBS="$TOOLS_LIBS -lpopt"
+
+
+
--- NEW FILE: libgnomeprintui2.2.patch ---
diff -Nurd -x'*~' libgnomeprintui-2.18.1.orig/tests/Makefile.in
libgnomeprintui-2.18.1/tests/Makefile.in
--- libgnomeprintui-2.18.1.orig/tests/Makefile.in 2007-09-17
09:35:44.000000000 -0400
+++ libgnomeprintui-2.18.1/tests/Makefile.in 2007-11-18 17:26:26.000000000
-0500
@@ -270,8 +270,7 @@
printui_libs = \
$(top_builddir)/libgnomeprintui/libgnomeprintui-2-2.la \
$(libgnomeprint_local) \
- $(LIBGNOMEPRINTUI_LIBS) \
- -lpopt
+ $(LIBGNOMEPRINTUI_LIBS)
test_dialog_SOURCES = test-dialog.c test-common.c test-common.h
test_dialog_LDFLAGS =
Index: libgnomeprintui2.2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgnomeprintui2.2.info,v
retrieving revision 1.2.2.35
retrieving revision 1.2.2.36
diff -u -d -r1.2.2.35 -r1.2.2.36
--- libgnomeprintui2.2.info 18 Nov 2007 21:20:12 -0000 1.2.2.35
+++ libgnomeprintui2.2.info 18 Nov 2007 23:06:14 -0000 1.2.2.36
@@ -10,6 +10,7 @@
atk1 (>= 1.20.0-1),
cairo (>= 1.2-1),
expat1,
+ fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
gail18-dev (>= 1.20.0-1),
@@ -21,7 +22,6 @@
gtk-doc (>= 1.8-1),
intltool (>= 0.36.0-1),
libart2 (>= 2.3.16-1),
- libbonobo2-dev (>= 2.20.0-1),
libgettext3-dev,
libglade2 (>= 2.6.2-1),
libgnomecanvas2-dev (>= 2.20.0-1),
@@ -36,6 +36,8 @@
<<
Source: mirror:gnome:sources/libgnomeprintui/2.18/libgnomeprintui-%v.tar.bz2
Source-MD5: 4f9a09372a5fa2cd5c35be30dff3fcd6
+PatchFile: %n.patch
+PatchFile-MD5: 6aa749d900ddce95989a49a59d1b7c90
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
@@ -44,9 +46,6 @@
SetCFLAGS: -Os
SetCXXFLAGS: -Os
ConfigureParams: --disable-dependency-tracking --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 F77=no
-InfoTest: <<
- TestDepends: popt
-<<
InstallScript: <<
make -j1 install DESTDIR="%d"
mkdir -p %i/share/doc/installed-packages
@@ -103,6 +102,6 @@
when "fort77" is installed.
<<
DescPort: <<
- Can scrap popt linkage? See:
+ Scrap popt linkage. See:
http://bugzilla.gnome.org/show_bug.cgi?id=497968
<<
Index: libgnomeprint2.2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgnomeprint2.2.info,v
retrieving revision 1.5.2.35
retrieving revision 1.5.2.36
diff -u -d -r1.5.2.35 -r1.5.2.36
--- libgnomeprint2.2.info 18 Nov 2007 21:20:12 -0000 1.5.2.35
+++ libgnomeprint2.2.info 18 Nov 2007 23:06:14 -0000 1.5.2.36
@@ -25,14 +25,13 @@
libxml2 (>= 2.6.30-1),
pango1-xft2-ft219-dev (>= 1.18.2-1),
pkgconfig (>= 0.21-1),
- popt,
x11-dev
<<
BuildConflicts: freetype, freetype-hinting
Source: mirror:gnome:sources/libgnomeprint/2.18/libgnomeprint-%v.tar.bz2
Source-MD5: b1f6c95a8dbb8ce17ab00fc2eea2aa91
PatchFile: %n.patch
-PatchFile-MD5: 3ce56ef2d56ce1aaf1549ba4369662ac
+PatchFile-MD5: 3623a4b58eb678c6cb826c511f7a48b4
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
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
@@ -53,7 +52,6 @@
libiconv,
libxml2-shlibs (>= 2.6.30-1),
pango1-xft2-ft219-shlibs (>= 1.18.2-1),
- popt-shlibs,
x11
<<
Replaces: libgnomeprint2, %N-dev, %N
@@ -88,7 +86,7 @@
OSX math is in libSystem, so no linker flag needed. See:
http://bugzilla.gnome.org/show_bug.cgi?id=471730
- Can scrap popt linkage? See:
+ Scrap popt linkage. See:
http://bugzilla.gnome.org/show_bug.cgi?id=497968
<<
License: GPL
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
