Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17:/tmp/cvs-serv9424/main/finkinfo/gnome
Modified Files:
Tag: pangocairo-branch
control-center-1.4.0.5.info glibmm2.4.info gnome-core.info
gnome-print.info gnome-print.patch gnome-vfs.info
gtkmm2.4.info libglade2.info libglade2.patch
libglademm2.4.info
Log Message:
merge from trunk (pangocairo-root-31)
Index: gtkmm2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtkmm2.4.info,v
retrieving revision 1.4.2.13
retrieving revision 1.4.2.14
diff -u -d -r1.4.2.13 -r1.4.2.14
--- gtkmm2.4.info 1 May 2007 18:23:07 -0000 1.4.2.13
+++ gtkmm2.4.info 15 Jul 2007 15:10:21 -0000 1.4.2.14
@@ -54,15 +54,19 @@
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
SetLIBS: -L%p/lib
-SetCFLAGS: -Os
-SetCXXFLAGS: -Os
+SetCFLAGS: -Os -pipe
+SetCXXFLAGS: -Os -pipe
SetLIBRARY_PATH: %p/lib
ConfigureParams: --disable-examples --disable-demos --mandir=%p/share/man
--disable-shm --disable-dependency-tracking --enable-warnings=maximum
--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
CompileScript: <<
PERL_PATH=/usr/bin/perl ./configure %c
make
<<
-InstallScript: make -j1 install DESTDIR="%d"
+InstallScript: <<
+ make -j1 install DESTDIR="%d"
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%N
+<<
SplitOff: <<
Package: %N-shlibs
Depends: <<
@@ -103,14 +107,17 @@
Files: include lib/gtkmm-2.4/include lib/lib*.* lib/pkgconfig
DocFiles: AUTHORS CHANGES COPYING ChangeLog NEWS README
<<
-DocFiles: AUTHORS CHANGES COPYING ChangeLog NEWS README
Description: C++ interface for the gtk+2 library
DescPackaging: <<
install_name and compatibility_version have not changed since %v=2.4.x
but those packages had those fields wrong in the Shlibs entries. So
we'll make a clean break with the Shlibs dependency.
-Doc processors (lib/{gtk,gdk}mm-2.4/proc) were in %N-shlibs until 2.6.4-1
+Doc processors (lib/{gtk,gdk}mm-2.4/proc) moved %N-shlibs -> %N as of 2.6.4-1
+Then moved %N -> %N-dev as of 2.6.14-2/1002
+
+Misc other docs and things used by things that use gtkmm moved
+%N -> %N-dev as of 2.6.14-2/1002
Use glib2-2.12.0 for GCC version independence and new glib2 package
layout
Index: libglademm2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libglademm2.4.info,v
retrieving revision 1.3.2.17
retrieving revision 1.3.2.18
diff -u -d -r1.3.2.17 -r1.3.2.18
--- libglademm2.4.info 19 Jun 2007 14:41:40 -0000 1.3.2.17
+++ libglademm2.4.info 15 Jul 2007 15:10:22 -0000 1.3.2.18
@@ -11,7 +11,6 @@
fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.1-1),
glib2-dev (>= 2.12.0-1),
- glibmm2.4 (>= 2.6.1-1001),
glibmm2.4-dev (>= 2.6.1-1001),
glitz,
gtk+2-dev (>= 2.10.0-1),
Index: gnome-print.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-print.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- gnome-print.info 16 Jan 2007 16:02:30 -0000 1.1.2.3
+++ gnome-print.info 15 Jul 2007 15:10:20 -0000 1.1.2.4
@@ -1,11 +1,12 @@
Package: gnome-print
Version: 0.37
-Revision: 6
+Revision: 7
Source: mirror:gnome:sources/%n/%v/%n-%v.tar.bz2
Source-MD5: f9e13f4f17b04baceec1cdeed0f88eae
BuildDepends: <<
audiofile (>= 0.2.3-1),
esound (>= 0.2.28-1),
+ fink (>= 0.24.12),
gdk-pixbuf (>= 0.18.0-12),
gettext-bin,
gettext-dev,
@@ -31,8 +32,10 @@
libxml-shlibs (>= 1.8.17-14),
x11-shlibs
<<
+PatchFile: %n.patch
+PatchFile-MD5: 0bef9803cba50f4a44d700d9a4908fca
PatchScript: <<
- sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+ sed -e 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi -e 's/(.*run-gnome-font-install.*)/#\1/' installer/Makefile.in
perl -pi -e 's,(lib\S+)/(lib\S+)\.la,\1/.libs/\2.dylib,g'
tests/Makefile.in
<<
Index: glibmm2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glibmm2.4.info,v
retrieving revision 1.6.2.13
retrieving revision 1.6.2.14
diff -u -d -r1.6.2.13 -r1.6.2.14
--- glibmm2.4.info 12 Jun 2007 04:48:17 -0000 1.6.2.13
+++ glibmm2.4.info 15 Jul 2007 15:10:20 -0000 1.6.2.14
@@ -1,16 +1,12 @@
Package: glibmm2.4
Version: 2.12.10
-Revision: 1001
+Revision: 1003
GCC: 4.0
Depends: <<
- %N-shlibs (= %v-%r),
- glib2-shlibs (>= 2.12.0-1),
- libgettext3-shlibs,
- libiconv,
- libsigc++2-shlibs (>= 2.0.17-1001)
+ %N-dev (= %v-%r),
+ fink-obsolete-packages
<<
-Replaces: %N-common, %N-shlibs (<< 2.6.1-1)
-Conflicts: %N-common
+BuildDependsOnly: true
BuildDepends: <<
glib2-dev (>= 2.12.0-1),
libgettext3-dev,
@@ -24,10 +20,14 @@
SetCFLAGS: -Os -pipe
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--enable-warnings=maximum --enable-static
CompileScript: <<
- PERL_PATH=/usr/bin/perl ./configure %c
+ PERL_PATH=/usr/bin/perl M4=/usr/bin/m4 ./configure %c
make
<<
-InstallScript: make -j1 install DESTDIR="%d"
+InstallScript: <<
+ make -j1 install DESTDIR=%d
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%N
+<<
SplitOff: <<
Package: %N-shlibs
Depends: <<
@@ -46,23 +46,33 @@
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
+ Replaces: %N-common, %N-shlibs (<< 2.6.1-1), %N (<< %v-%r)
+ Conflicts: %N-common
DescPackaging: <<
Uses pkgconfig.
Any package which BuildDepends on this one must also
BuildDepend on:
glib2-dev (>= 2.12.0-1), libsigc++2 (>= 2.0.17-1001)
<<
BuildDependsOnly: True
- Files: include lib/glibmm-2.4/include lib/lib*.* lib/pkgconfig
share/aclocal
+ Files: <<
+ include
+ lib
+ share/aclocal
+ share/doc/glibmm-2.4
+ <<
DocFiles: AUTHORS CHANGES COPYING ChangeLog NEWS README
<<
-DocFiles: AUTHORS CHANGES COPYING ChangeLog NEWS README
Description: C++ interface for the glib2 library
DescPackaging: <<
install_name and compatibility_version have not changed since %v=2.4.x
but those packages had those fields wrong in the Shlibs entries. So
we'll make a clean break with the Shlibs dependency.
-Doc processor (lib/glibmm-2.4/proc) was in %N-shlibs until 2.6.1-1
+Doc processor (lib/glibmm-2.4/proc) moved %N-shlibs -> %N as of 2.6.1-1
+Then moved %N -> %N-dev as of 2.12.10-1/1001
+
+Misc other docs and things used by things that use glibmm moved
+%N->%N-dev as of 2.12.10-2/1002
Not sure why we pass -DX_LOCALE
<<
Index: libglade2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libglade2.info,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -d -r1.5.2.10 -r1.5.2.11
--- libglade2.info 19 Jun 2007 14:33:44 -0000 1.5.2.10
+++ libglade2.info 15 Jul 2007 15:10:21 -0000 1.5.2.11
@@ -55,9 +55,11 @@
<<
Source: mirror:gnome:sources/libglade/2.6/libglade-%v.tar.bz2
Source-MD5: 489be887b26b9973f77e2c6111ab7d5a
-Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: 2a85a560281c8b76b4b157ea240a1aa4
PatchScript: <<
- mv m4/jh-xml-catalog.m4 acinclude.m4
+ patch -p1 < %{PatchFile}
+ mv m4/jh-xml-catalog.m4 acinclude.m4
<<
SetCFLAGS: -Os
ConfigureParams: --disable-dependency-tracking --without-xml-catalog
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
Index: libglade2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libglade2.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- libglade2.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ libglade2.patch 15 Jul 2007 15:10:22 -0000 1.1.2.1
@@ -12,3 +12,36 @@
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
+diff -ruN libglade-2.3.6/glade/glade-gtk.c
libglade-2.3.6-patched/glade/glade-gtk.c
+--- libglade-2.3.6/glade/glade-gtk.c 2004-03-10 00:13:29.000000000 -0800
++++ libglade-2.3.6-patched/glade/glade-gtk.c 2007-07-08 13:43:59.000000000
-0700
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+
++#define G_IMPLEMENT_INLINES
+ /* for GtkText et all */
+ #ifndef GTK_ENABLE_BROKEN
+ #define GTK_ENABLE_BROKEN
+diff -ruN libglade-2.3.6/glade/glade-parser.c
libglade-2.3.6-patched/glade/glade-parser.c
+--- libglade-2.3.6/glade/glade-parser.c 2004-02-03 01:40:37.000000000
-0800
++++ libglade-2.3.6-patched/glade/glade-parser.c 2007-07-08
13:43:32.000000000 -0700
+@@ -36,6 +36,7 @@
+
+ #include <libxml/parser.h>
+
++#define G_IMPLEMENT_INLINES
+ #include "glade-parser.h"
+ #include "glade-private.h"
+
+diff -ruN libglade-2.3.6/glade/glade-xml.c
libglade-2.3.6-patched/glade/glade-xml.c
+--- libglade-2.3.6/glade/glade-xml.c 2004-02-03 01:40:38.000000000 -0800
++++ libglade-2.3.6-patched/glade/glade-xml.c 2007-07-08 13:43:32.000000000
-0700
+@@ -25,6 +25,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#define G_IMPLEMENT_INLINES
+ #include <glade/glade-xml.h>
+ #include <glade/glade-init.h>
+ #include <glade/glade-build.h>
Index: gnome-print.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-print.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- gnome-print.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ gnome-print.patch 15 Jul 2007 15:10:21 -0000 1.1.2.1
@@ -68,3 +68,58 @@
'/usr/lib/texmf/fonts/afm',
'/usr/lib/texmf/fonts/type1/adobe',
'/usr/lib/texmf/fonts/type1/omega',
+diff -ruN gnome-print-0.37/installer/gf-pfb.c
gnome-print-0.37-patched/installer/gf-pfb.c
+--- gnome-print-0.37/installer/gf-pfb.c 2002-01-18 16:23:00.000000000
-0800
++++ gnome-print-0.37-patched/installer/gf-pfb.c 2007-07-14
10:36:51.000000000 -0700
+@@ -12,6 +12,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include "gf-pfb.h"
+
+diff -ruN gnome-print-0.37/installer/gf-ttf.c
gnome-print-0.37-patched/installer/gf-ttf.c
+--- gnome-print-0.37/installer/gf-ttf.c 2001-11-05 06:07:28.000000000
-0800
++++ gnome-print-0.37-patched/installer/gf-ttf.c 2007-07-14
10:37:10.000000000 -0700
+@@ -32,6 +32,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+
+ #include "gf-ttf.h"
+diff -ruN gnome-print-0.37/installer/gnome-font-install.c
gnome-print-0.37-patched/installer/gnome-font-install.c
+--- gnome-print-0.37/installer/gnome-font-install.c 2002-01-22
13:44:55.000000000 -0800
++++ gnome-print-0.37-patched/installer/gnome-font-install.c 2007-07-14
10:33:26.000000000 -0700
+@@ -26,6 +26,7 @@
+ #include <parser.h>
+ #include <xmlmemory.h>
+ /* End of ugly thing */
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <libgnome/gnome-defs.h>
+ #include <libgnome/gnome-util.h>
+diff -ruN gnome-print-0.37/libgnomeprint/gnome-font-private.h
gnome-print-0.37-patched/libgnomeprint/gnome-font-private.h
+--- gnome-print-0.37/libgnomeprint/gnome-font-private.h 2001-12-05
14:07:58.000000000 -0800
++++ gnome-print-0.37-patched/libgnomeprint/gnome-font-private.h
2007-07-14 10:16:36.000000000 -0700
+@@ -22,6 +22,7 @@
+
+ BEGIN_GNOME_DECLS
+
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <libgnomeprint/gp-character-block.h>
+ #include <libgnomeprint/gp-fontmap.h>
+diff -ruN gnome-print-0.37/libgnomeprint/parseTT.h
gnome-print-0.37-patched/libgnomeprint/parseTT.h
+--- gnome-print-0.37/libgnomeprint/parseTT.h 2001-11-05 11:27:09.000000000
-0800
++++ gnome-print-0.37-patched/libgnomeprint/parseTT.h 2007-07-14
10:29:33.000000000 -0700
+@@ -22,6 +22,7 @@
+ BEGIN_GNOME_DECLS
+
+ #include <glib.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+
+ /*
Index: gnome-vfs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-vfs.info,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- gnome-vfs.info 16 Jan 2007 16:02:31 -0000 1.7.2.2
+++ gnome-vfs.info 15 Jul 2007 15:10:21 -0000 1.7.2.3
@@ -1,6 +1,6 @@
Package: gnome-vfs
Version: 1.0.5
-Revision: 1035
+Revision: 1036
Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2
Source-MD5: e2a17a6b178f54c43968241258f3e729
Depends: %N-shlibs (= %v-%r) | gnome-vfs-ssl-shlibs (= %v-%r)
@@ -12,6 +12,7 @@
UpdatePoMakefile: true
SetLIBS: -L%p/lib
NoSetLDFLAGS: true
+SetCFLAGS: -O0
ConfigureParams: --mandir=%p/share/man --with-openssl-libs=no --disable-gtk-doc
InstallScript: <<
make install DESTDIR=%d
Index: control-center-1.4.0.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/control-center-1.4.0.5.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- control-center-1.4.0.5.info 16 Jan 2007 16:02:24 -0000 1.1.2.2
+++ control-center-1.4.0.5.info 15 Jul 2007 15:10:19 -0000 1.1.2.3
@@ -1,6 +1,6 @@
Package: control-center
Version: 1.4.0.5
-Revision: 1019
+Revision: 1020
Source: mirror:gnome:sources/%n/1.4/%n-%v.tar.bz2
Source-MD5: 63e731f7c9f5fca354de5de4f881e952
PatchScript: <<
@@ -11,6 +11,7 @@
BuildDepends: gdk-pixbuf (>= 0.18.0-12), esound, audiofile, db3 (>=
3.3.11-1027), glib, gtk+ (>= 1.2.10-20), libjpeg, libpng3, libtiff, netpbm,
orbit-dev (>= 0.5.17-15), readline (>= 4.3-1028), imlib (>= 1.9.14-14),
gconf-dev (>= 1.0.9-21), gnome-libs-dev (>= 1.4.2-19), oaf-dev (>= 0.6.10-22),
libxml, popt, gnome-vfs-dev (>= 1.0.5-29) | gnome-vfs-ssl-dev (>= 1.0.5-29),
gettext-dev, gettext-bin, gettext-tools, giflib | libungif, libiconv-dev
UpdatePoMakefile: true
ConfigureParams: --mandir=%p/share/man
+SetCFLAGS: -O0
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Index: gnome-core.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-core.info,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -d -r1.2.2.4 -r1.2.2.5
--- gnome-core.info 16 Jan 2007 16:02:30 -0000 1.2.2.4
+++ gnome-core.info 15 Jul 2007 15:10:20 -0000 1.2.2.5
@@ -1,6 +1,6 @@
Package: gnome-core
Version: 1.4.1
-Revision: 16
+Revision: 17
Source: mirror:gnome:sources/%n/1.4/%n-%v.tar.bz2
Source-MD5: fea00c24018057a6f04315bea8e4bdab
Depends: <<
@@ -52,6 +52,7 @@
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
+SetCFLAGS: -O0
ConfigureParams: --mandir=%p/share/man
InstallScript: <<
make install DESTDIR=%d
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
