Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome
In directory vz-cvs-3.sog:/tmp/cvs-serv9327/10.7/main/finkinfo/gnome
Added Files:
libgnomeprint2.2-shlibs.info libgnomeprint2.2-shlibs.patch
Removed Files:
libgnomeprint2.2.info libgnomeprint2.2.patch
Log Message:
shuffle layout to put non-obsolete as main
--- libgnomeprint2.2.patch DELETED ---
--- NEW FILE: libgnomeprint2.2-shlibs.patch ---
diff -Nurd -x'*~' libgnomeprint-2.18.6.orig/configure
libgnomeprint-2.18.6/configure
--- libgnomeprint-2.18.6.orig/configure 2009-03-06 05:31:09.000000000 -0500
+++ libgnomeprint-2.18.6/configure 2009-05-18 11:09:47.000000000 -0400
@@ -20084,11 +20084,6 @@
esac
-if test "x$LIBM" = "x"; then
- { { $as_echo "$as_me:$LINENO: error: You need -lm(mathematic library)
for this version of libgnomeprint." >&5
-$as_echo "$as_me: error: You need -lm(mathematic library) for this version of
libgnomeprint." >&2;}
- { (exit 1); exit 1; }; }
-fi
LDFLAGS="$LDFLAGS $LIBM"
FREETYPE_LIBS=
@@ -20592,7 +20587,7 @@
$as_echo "Cups found but the version found is less than 1.1.20" >&6; }
cups_msg="Version requirement not satisfied"
else
- CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config
--libs`"
+ CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config
--libs | perl -p -e 's/(-\S*framework)\s+(\S+)/-Wl,\1,\2/g'`"
CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`"
{ $as_echo "$as_me:$LINENO: result: Found version $verstxt"
>&5
$as_echo "Found version $verstxt" >&6; }
diff -Nurd -x'*~'
libgnomeprint-2.18.6.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c
libgnomeprint-2.18.6/libgnomeprint/modules/cups/gnome-print-cups-transport.c
---
libgnomeprint-2.18.6.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c
2007-01-01 19:23:08.000000000 -0500
+++
libgnomeprint-2.18.6/libgnomeprint/modules/cups/gnome-print-cups-transport.c
2011-07-12 13:04:35.000000000 -0400
@@ -36,6 +36,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <locale.h>
+#include <stdio.h>
#include <cups/cups.h>
#include <libgnomeprint/gnome-print.h>
--- NEW FILE: libgnomeprint2.2-shlibs.info ---
Package: libgnomeprint2.2-shlibs
Version: 2.18.6
Revision: 8
Depends: <<
fontconfig2-shlibs (>= 2.8.0-4),
freetype219-shlibs (>= 2.3.12-1),
glib2-shlibs (>= 2.22.0-1),
libart2-shlibs (>= 2.3.16-1),
libgettext8-shlibs,
libgnomecups-shlibs (>= 0.2.3-6),
libxml2-shlibs (>= 2.6.30-1),
pango1-xft2-ft219-shlibs (>= 1.24.5-4)
<<
BuildDepends: <<
bison,
fink (>= 0.24.12-1),
fink-package-precedence,
fontconfig2-dev (>= 2.8.0-4),
freetype219 (>= 2.3.12-1),
gettext-bin,
gettext-tools,
glib2-dev (>= 2.22.0-1),
gtk-doc (>= 1.13-5),
intltool40,
libart2 (>= 2.3.16-1),
libgettext8-dev,
libgnomecups-dev (>= 0.2.3-6),
libiconv-dev,
libxml2 (>= 2.6.30-1),
pango1-xft2-ft219-dev (>= 1.24.5-4),
pkgconfig (>= 0.23)
<<
Replaces: libgnomeprint2, libgnomeprint2.2-dev, libgnomeprint2.2
BuildConflicts: freetype, freetype-hinting
Source: mirror:gnome:sources/libgnomeprint/2.18/libgnomeprint-%v.tar.bz2
Source-MD5: a5aa248058a07de4b3cf444673cfc683
PatchFile: %n.patch
PatchFile-MD5: cc5a08f3db998855fea2aafcc33ccf54
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS:-L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
ConfigureParams: --enable-dependency-tracking --disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
F77=no --enable-gtk-doc --without-papi --with-cups
CompileScript: <<
./configure %c
make
fink-package-precedence --prohibit-bdep libgnomeprint2.2-dev .
<<
InstallScript: <<
make -j1 install DESTDIR="%d"
<<
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
Shlibs: %p/lib/libgnomeprint-2-2.0.dylib 2.0.0 %n (>= 2.6.0-1)
SplitOff: <<
Package: libgnomeprint2.2
Depends: <<
libgnomeprint2.2-shlibs (= %v-%r),
fink-obsolete-packages
<<
Replaces: libgnomeprint2
InstallScript: <<
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%n
<<
<<
SplitOff2: <<
Package: libgnomeprint2.2-dev
Depends: libgnomeprint2.2-shlibs (= %v-%r)
Replaces: libgnomeprint2.2
BuildDependsOnly: True
Files: <<
include
lib/libgnomeprint-2-2.{dylib,la}
lib/pkgconfig
share/gtk-doc
<<
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
<<
Description: The GNOME printing library
DescPort: <<
Patch configure to pass pass freetype2 flags before freetype.
OSX math is in libSystem, so no linker flag needed. See:
http://bugzilla.gnome.org/show_bug.cgi?id=471730
<<
License: GPL
Maintainer: The Gnome Core Team <[email protected]>
Homepage: http://www.gnome.org
DescPackaging: <<
Had to add F77=no to configure to get around a weird libtool thing
when "fort77" is installed.
lib/libgnomeprint2.2/%v/modules/filters/*.so moved
libgnomeprint2.2-dev -> libgnomeprint2.2-shlibs in
2.12.1-2/1002
share/gtk-doc moved libgnomeprint2.2 -> libgnomeprint2.2-dev
in 2.12.1-2/1002
share/libgnomeprint2.2/%v/modules/filters/*.so moved
libgnomeprint2.2 -> libgnomeprint2.2-shlibs in 2.12.1-2/1002
share/locale moved libgnomeprint2.2 -> libgnomeprint2.2-shlibs
in 2.12.1-2/1002
libgnomeprint2.2 is now OBSOLETE
lib/libgnomeprint2.2/%v/modules/**.la moved
libgnomeprint2.2-dev -> libgnomeprint2.2-shlibs in 2.18.6-4
Make sure -framework flags from cups-config are protected
going into public .la
<<
--- libgnomeprint2.2.info DELETED ---
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
