Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32185/10.3/unstable/main/finkinfo/gnome
Modified Files:
libgnomeprint2.2.info libgnomeprint2.2.patch
Log Message:
New version. cups disabled.
Index: libgnomeprint2.2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/libgnomeprint2.2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libgnomeprint2.2.patch 2 Jul 2004 15:36:59 -0000 1.4
+++ libgnomeprint2.2.patch 16 Jul 2005 20:31:13 -0000 1.5
@@ -1,35 +1,35 @@
-diff -Naur libgnomeprint-2.6.0-old/configure libgnomeprint-2.6.0/configure
---- libgnomeprint-2.6.0-old/configure Mon Mar 22 09:04:21 2004
-+++ libgnomeprint-2.6.0/configure Wed Apr 7 10:22:13 2004
-@@ -22437,7 +22437,7 @@
+diff -Nurd -x'*~' libgnomeprint-2.10.3.orig/configure
libgnomeprint-2.10.3/configure
+--- libgnomeprint-2.10.3.orig/configure 2005-03-30 17:28:44.000000000
-0500
++++ libgnomeprint-2.10.3/configure 2005-07-16 03:49:07.000000000 -0400
+@@ -23958,7 +23958,7 @@
GNOME_PRINT_DATA_DIR=$GNOME_PRINT_DATA_DIR
-LIBGNOMEPRINT_CFLAGS="$GP_CFLAGS $FREETYPE_CFLAGS"
+LIBGNOMEPRINT_CFLAGS="$FREETYPE_CFLAGS $GP_CFLAGS"
- LIBGNOMEPRINT_LIBS="$GP_LIBS $FREETYPE_LIBS"
+ LIBGNOMEPRINT_LIBS="$GP_LIBS $FREETYPE_LIBS $Z_LIBS"
-diff -Naur libgnomeprint-2.6.0-old/libgnomeprint/gnome-fontmap.c
libgnomeprint-2.6.0/libgnomeprint/gnome-fontmap.c
---- libgnomeprint-2.6.0-old/libgnomeprint/gnome-fontmap.c Fri Jan 30
15:22:08 2004
-+++ libgnomeprint-2.6.0/libgnomeprint/gnome-fontmap.c Wed Apr 7 10:22:13 2004
-@@ -197,6 +197,8 @@
- font_type = GP_FONT_ENTRY_TYPE1;
- else if (strcasecmp (c, ".ttf") == 0)
+diff -Nurd -x'*~' libgnomeprint-2.10.3.orig/libgnomeprint/gnome-fontmap.c
libgnomeprint-2.10.3/libgnomeprint/gnome-fontmap.c
+--- libgnomeprint-2.10.3.orig/libgnomeprint/gnome-fontmap.c 2005-03-30
17:05:33.000000000 -0500
++++ libgnomeprint-2.10.3/libgnomeprint/gnome-fontmap.c 2005-07-16
03:49:07.000000000 -0400
+@@ -223,6 +223,8 @@
font_type = GP_FONT_ENTRY_TRUETYPE;
-+ else if (strcasecmp (c, ".otf") == 0)
+ else if (g_ascii_strcasecmp (c, ".ttc") == 0)
+ font_type = GP_FONT_ENTRY_TRUETYPE;
++ else if (g_ascii_strcasecmp (c, ".otf") == 0)
+ font_type = GP_FONT_ENTRY_TRUETYPE;
- else if (strcasecmp (c, ".font") == 0) /* See #102400 */
+ else if (g_ascii_strcasecmp (c, ".font") == 0) /* See #102400 */
font_type = GP_FONT_ENTRY_TRUETYPE;
else {
-diff -Naur libgnomeprint-2.6.0-old/libgnomeprint/gnome-print.c
libgnomeprint-2.6.0/libgnomeprint/gnome-print.c
---- libgnomeprint-2.6.0-old/libgnomeprint/gnome-print.c Tue Feb 24
15:33:07 2004
-+++ libgnomeprint-2.6.0/libgnomeprint/gnome-print.c Wed Apr 7 10:22:13 2004
+diff -Nurd -x'*~' libgnomeprint-2.10.3.orig/libgnomeprint/gnome-print.c
libgnomeprint-2.10.3/libgnomeprint/gnome-print.c
+--- libgnomeprint-2.10.3.orig/libgnomeprint/gnome-print.c 2004-12-31
12:25:25.000000000 -0500
++++ libgnomeprint-2.10.3/libgnomeprint/gnome-print.c 2005-07-16
03:49:07.000000000 -0400
@@ -28,6 +28,7 @@
#include <config.h>
#include <string.h>
#include <gmodule.h>
+#include <sys/types.h>
+ #include <errno.h>
+ #include <fcntl.h>
- #include <libgnomeprint/gnome-print-i18n.h>
- #include <libgnomeprint/gnome-print-private.h>
Index: libgnomeprint2.2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/libgnomeprint2.2.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libgnomeprint2.2.info 12 Mar 2005 17:47:33 -0000 1.6
+++ libgnomeprint2.2.info 16 Jul 2005 20:31:13 -0000 1.7
@@ -1,16 +1,17 @@
Package: libgnomeprint2.2
-Version: 2.6.2
-Revision: 9
-Depends: %N-shlibs (= %v-%r), gettext, glib2 (>= 2.4.0-1), libart2-shlibs (>=
2.3.16-1), libbonobo2 (>= 2.6.0-1), libiconv, libxml2-shlibs (>= 2.6.7-1),
pango1-xft2 (>= 1.4.0-1)
+Version: 2.10.3
+Revision: 1
+Depends: %N-shlibs (= %v-%r), libgettext3-shlibs, glib2 (>= 2.4.0-1),
libart2-shlibs (>= 2.3.16-1), libbonobo2 (>= 2.6.0-1), libiconv, libxml2-shlibs
(>= 2.6.7-1), pango1-xft2 (>= 1.4.0-1)
Replaces: libgnomeprint2
-BuildDepends: cups-dev, glib2-dev (>= 2.4.0-1), pango1-xft2-dev (>= 1.4.0-1),
orbit2-dev (>= 2.10.0-1), libxml2 (>= 2.6.7-1), libbonobo2-dev (>= 2.6.0-1),
libart2 (>= 2.3.16-1), pkgconfig, gettext-dev, gettext-bin, gettext-tools,
libiconv-dev
-Source: mirror:gnome:sources/libgnomeprint/2.6/libgnomeprint-%v.tar.bz2
-Source-MD5: f742bb321fab833b67270f7b86af0fdb
+BuildDepends: glib2-dev (>= 2.4.0-1), pango1-xft2-dev (>= 1.4.0-1), orbit2-dev
(>= 2.10.0-1), libxml2 (>= 2.6.7-1), libbonobo2-dev (>= 2.6.0-1), libart2 (>=
2.3.16-1), pkgconfig, libgettext3-dev, gettext-bin, gettext-tools,
libiconv-dev, popt, intltool, gtk-doc
+# cups-dev (>= 1.1.21-1), libgnomecups2-dev (>= 0.2.0-1)
+Source: mirror:gnome:sources/libgnomeprint/2.10/libgnomeprint-%v.tar.bz2
+Source-MD5: 9052dc919ad038b1a9e4d5301148588e
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
NoSetLDFLAGS: true
-ConfigureParams: --enable-compile-warnings=no
+ConfigureParams: --disable-dependency-tracking --without-cups
CompileScript: <<
F77=no ./configure %c
make
@@ -18,9 +19,14 @@
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
- Depends: gettext, glib2 (>= 2.4.0-1), libart2-shlibs (>= 2.3.16-1),
libbonobo2 (>= 2.6.0-1), libiconv, libxml2-shlibs (>= 2.6.7-1), pango1-xft2 (>=
1.4.0-1)
+ Depends: libgettext3-shlibs, glib2-shlibs (>= 2.4.0-1), libart2-shlibs (>=
2.3.16-1), libbonobo2 (>= 2.6.0-1), libiconv, libxml2-shlibs (>= 2.6.7-1),
pango1-xft2-shlibs (>= 1.4.0-1), popt-shlibs
+# libgnomecups2-shlibs (>= 0.2.0-1)
Replaces: libgnomeprint2
- Files: lib/libgnomeprint-2-2.*.dylib lib/libgnomeprint
+ Files: <<
+ lib/libgnomeprint-2-2.*.dylib
+ lib/libgnomeprint/%v/modules/*.so
+ lib/libgnomeprint/%v/modules/transports/*.so
+ <<
Shlibs: %p/lib/libgnomeprint-2-2.0.dylib 2.0.0 %n (>= 2.6.0-1)
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
<<
@@ -33,7 +39,7 @@
glib2-dev (>= 2.4.0-1), libart2 (>= 2.3.16-1), libbonobo2-dev (>=
2.6.0-1), libxml2 (>= 2.6.7-1), orbit2-dev (>= 2.10.0-1), pango1-dev
<<
BuildDependsOnly: True
- Files: include lib/libgnomeprint-2-2.* lib/pkgconfig
+ Files: include lib
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
<<
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
@@ -48,4 +54,6 @@
DescPackaging: <<
Had to add F77=no to configure to get around a weird libtool thing
when "fort77" is installed.
+
+ The cups module needs libgnomecups>=0.2.0, which needs cups-dev>=1.1.21
<<
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
