Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv18749/main/finkinfo/gnome
Modified Files:
Tag: pangocairo-branch
gedit.info gnome-panel.info gnome-session.info
gnome-terminal.info gnome-utils.info gnome-utils.patch
pango1-xft2-ft219.info
Log Message:
build fixes, pth update
Index: pango1-xft2-ft219.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/pango1-xft2-ft219.info,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- pango1-xft2-ft219.info 23 Dec 2006 18:08:05 -0000 1.4.2.3
+++ pango1-xft2-ft219.info 24 Dec 2006 21:07:19 -0000 1.4.2.4
@@ -32,15 +32,15 @@
<<
SetCFLAGS: -Os
-SetCPPFLAGS: -no-cpp-precomp
-SetLDFLAGS: -no-undefined -L%p/lib/fontconfig2/lib -L%p/lib/freetype219/lib
-L/usr/X11R6/lib -lexpat
+SetCPPFLAGS: -no-cpp-precomp -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
+SetLDFLAGS: -no-undefined -L%p/lib/fontconfig2/lib -L%p/lib/freetype219/lib
-L%p/lib -lexpat
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--enable-static --includedir=%p/lib/pango-ft219/include
--libdir=%p/lib/pango-ft219/lib --sysconfdir=%p/lib/pango-ft219/etc
CompileScript: <<
#!/bin/bash -ev
export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
- export
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig
+ export
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig
LD_TWOLEVEL_NAMESPACE=1 ./configure %c
make
make check
Index: gedit.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gedit.info,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -u -d -r1.6.2.9 -r1.6.2.10
--- gedit.info 22 Dec 2006 05:02:03 -0000 1.6.2.9
+++ gedit.info 24 Dec 2006 21:07:19 -0000 1.6.2.10
@@ -85,7 +85,7 @@
make
<<
InstallScript: <<
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make -j1 install DESTDIR="%d"
<<
PostInstScript: <<
if [ configure = "$1" ]; then
Index: gnome-session.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-session.info,v
retrieving revision 1.9.2.9
retrieving revision 1.9.2.10
diff -u -d -r1.9.2.9 -r1.9.2.10
--- gnome-session.info 23 Dec 2006 18:29:46 -0000 1.9.2.9
+++ gnome-session.info 24 Dec 2006 21:07:19 -0000 1.9.2.10
@@ -4,7 +4,7 @@
Depends: <<
atk1-shlibs (>= 1.12.3-1),
audiofile-shlibs (>= 0.2.5-1),
- control-center (>= 2.6.0-1),
+ control-center (>= 2.16.0-1),
esound-shlibs (>= 0.2.34-1),
gconf2 (>= 2.16.0-1),
glib2-shlibs (>= 2.12.0-1),
@@ -34,6 +34,7 @@
atk1 (>= 1.12.3-1),
audiofile (>= 0.2.5-1),
cairo (>= 1.2-1),
+ control-center2-dev (>= 2.16.0-1),
dbus-dev (>= 1.0-1),
esound (>= 0.2.34),
fontconfig2-dev (>= 2.3.2-13),
@@ -70,7 +71,8 @@
Source: mirror:gnome:sources/%n/2.16/%n-%v.tar.bz2
Source-MD5: ed09f3b2d87f25e9de4a60b15c8df6c9
ConfigureParams: --mandir=%p/share/man --with-reboot-command=/sbin/reboot
--with-halt-command=/sbin/halt --with-rsh-command=/usr/bin/rsh
--disable-schemas-install --disable-dependency-tracking
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
-SetCFLAGS: -Os -fno-commonSetCPPFLAGS: -fno-common
-I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include
-I%p/lib/pango-ft219/include -I%p/include/libcdparanoia -I%p/include
+SetCFLAGS: -Os -fno-common
+SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/pango-ft219/include
-I%p/include/libcdparanoia -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/pango-ft219/lib
SetLIBS: -L%p/lib
NoSetCFLAGS: true
Index: gnome-utils.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-utils.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- gnome-utils.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ gnome-utils.patch 24 Dec 2006 21:07:19 -0000 1.1.2.1
@@ -1,63 +1,43 @@
-diff -Naur gnome-utils-2.0.5.old/logview/log_repaint.c
gnome-utils-2.0.5.new/logview/log_repaint.c
---- gnome-utils-2.0.5.old/logview/log_repaint.c Fri May 17 10:30:14 2002
-+++ gnome-utils-2.0.5.new/logview/log_repaint.c Tue Sep 17 03:00:52 2002
-@@ -24,7 +24,9 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
-+#ifdef HAVE_MALLOC_H
-+# include <malloc.h>
-+#endif
- #include <string.h>
- #include <gnome.h>
- #include "logview.h"
-diff -Naur gnome-utils-2.0.5.old/logview/logrtns.c
gnome-utils-2.0.5.new/logview/logrtns.c
---- gnome-utils-2.0.5.old/logview/logrtns.c Thu Jun 13 00:30:48 2002
-+++ gnome-utils-2.0.5.new/logview/logrtns.c Tue Sep 17 03:00:52 2002
-@@ -857,7 +857,7 @@
- if (IsLeapYear (curmark->year - lastyear + thisyear))
- curmark->time += 24 * 60 * 60; /* Add one day */
-
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
- curmark->time += correction - tmptm->tm_gmtoff;
- #else
- curmark->time += correction - timezone;
-@@ -883,7 +883,7 @@
- if (IsLeapYear (thisyear))
- log->lstats.enddate += 24 * 60 * 60; /* Add one day */
-
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
- log->lstats.enddate += correction - tmptm->tm_gmtoff;
- #else
- log->lstats.enddate += correction - timezone;
-@@ -894,7 +894,7 @@
- if (IsLeapYear (thisyear - lastyear))
- log->lstats.startdate += 24 * 60 * 60; /* Add one day */
+diff -uNr gnome-utils-2.16.2/baobab/src/baobab.c
gnome-utils-2.16.2-new/baobab/src/baobab.c
+--- gnome-utils-2.16.2/baobab/src/baobab.c 2006-08-27 07:10:39.000000000
-0400
++++ gnome-utils-2.16.2-new/baobab/src/baobab.c 2006-12-24 15:34:13.000000000
-0500
+@@ -22,6 +22,8 @@
+
+ #include <config.h>
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
- log->lstats.startdate += correction - tmptm->tm_gmtoff;
- #else
- log->lstats.startdate += correction - timezone;
-diff -Naur gnome-utils-2.0.5.old/logview/logrtns.h
gnome-utils-2.0.5.new/logview/logrtns.h
---- gnome-utils-2.0.5.old/logview/logrtns.h Wed Jun 6 20:17:03 2001
-+++ gnome-utils-2.0.5.new/logview/logrtns.h Tue Sep 17 03:00:52 2002
-@@ -20,11 +20,14 @@
- ---------------------------------------------------------------------- */
++#define BAOBAB_SKIP_EXTERNALS 1
++
+ #include <pwd.h>
+ #include <time.h>
+ #include <gtk/gtk.h>
+@@ -36,6 +38,11 @@
+ #include <glibtop.h>
+ #include "baobab.h"
++
++baobab_application baobab;
++baobab_fs g_fs;
++struct BaobabSearchOpt bbSearchOpt;
++
+ #include "baobab-scan.h"
+ #include "baobab-treeview.h"
+ #include "baobab-utils.h"
+diff -uNr gnome-utils-2.16.2/baobab/src/baobab.h
gnome-utils-2.16.2-new/baobab/src/baobab.h
+--- gnome-utils-2.16.2/baobab/src/baobab.h 2006-08-16 21:02:01.000000000
-0400
++++ gnome-utils-2.16.2-new/baobab/src/baobab.h 2006-12-24 15:26:27.000000000
-0500
+@@ -117,10 +117,11 @@
+ gboolean search_whole;
+ };
-+#include <config.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
-+#ifdef HAVE_MALLOC_H
-+# include <malloc.h>
+-/* globals */
+-baobab_application baobab;
+-baobab_fs g_fs;
+-struct BaobabSearchOpt bbSearchOpt;
++#ifndef BAOBAB_SKIP_EXTERNALS
++extern baobab_application baobab;
++extern baobab_fs g_fs;
++extern struct BaobabSearchOpt bbSearchOpt;
+#endif
- #include <string.h>
- #include "logview.h"
+ void set_busy (gboolean busy);
+ void start_proc_on_dir (const gchar *);
Index: gnome-utils.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-utils.info,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -u -d -r1.4.2.9 -r1.4.2.10
--- gnome-utils.info 23 Dec 2006 18:27:10 -0000 1.4.2.9
+++ gnome-utils.info 24 Dec 2006 21:07:19 -0000 1.4.2.10
@@ -16,6 +16,7 @@
libgnome2 (>= 2.16.0-1),
libgnomecanvas2 (>= 2.14.0-1),
libgnomeui2 (>= 2.16.0-1),
+ libgtop2.0.7-shlibs (>= 2.14.5-1),
libiconv,
libxml2-shlibs (>= 2.6.7-1),
orbit2 (>= 2.10.0-1),
@@ -49,6 +50,7 @@
libgnome2-dev (>= 2.16.0-1),
libgnomeui2-dev (>= 2.16.0-1),
libgnomecanvas2-dev (>= 2.14.0-1),
+ libgtop2.0.7-dev (>= 2.14.5-1),
libhowl-dev,
libiconv-dev,
libxml2 (>= 2.6.7-1),
@@ -61,7 +63,7 @@
<<
Source: mirror:gnome:sources/%n/2.16/%n-%v.tar.bz2
Source-MD5: 4e70e667a78fc5bee4a4b8f2f3ae8440
-#Patch: %n.patch
+Patch: %n.patch
SetCFLAGS: -Os -fno-common
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/pango-ft219/include
-I%p/include/libcdparanoia -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/pango-ft219/lib
Index: gnome-terminal.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-terminal.info,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -d -r1.6.2.8 -r1.6.2.9
--- gnome-terminal.info 23 Dec 2006 18:27:10 -0000 1.6.2.8
+++ gnome-terminal.info 24 Dec 2006 21:07:19 -0000 1.6.2.9
@@ -67,19 +67,17 @@
xft2-dev
<<
Conflicts: gnome-core (<< 2.0.0)
+Replaces: gnome-panel
Source: mirror:gnome:sources/%n/2.16/%n-%v.tar.bz2
Source-MD5: 861e1b780819214b4d5a398e7999c093
-SetCFLAGS: -Os -fno-commonSetCPPFLAGS: -fno-common
-I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include
-I%p/lib/pango-ft219/include -I%p/include/libcdparanoia -I%p/include
+SetCFLAGS: -Os -fno-common
+SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/pango-ft219/include
-I%p/include/libcdparanoia -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/pango-ft219/lib
SetLIBS: -L%p/lib
NoSetCFLAGS: true
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-ConfigureParams: --disable-scrollkeeper --disable-schemas-install
--disable-dependency-tracking
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: <<
- F77=no ./configure %c
- make
-<<
+ConfigureParams: --disable-scrollkeeper --disable-schemas-install
--disable-dependency-tracking
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
InstallScript: <<
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
<<
@@ -96,7 +94,7 @@
fi
<<
ConfFiles: %p/etc/gconf/schemas/gnome-terminal.schemas
-DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po HACKING NEWS
README TODO
+DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po HACKING NEWS
README
Description: The Gnome Terminal
License: GPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: gnome-panel.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-panel.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
--- gnome-panel.info 22 Dec 2006 05:02:07 -0000 1.5.2.10
+++ gnome-panel.info 24 Dec 2006 21:07:19 -0000 1.5.2.11
@@ -70,6 +70,7 @@
xft2-dev
<<
Conflicts: gnome-core (<< 2.0.0)
+Replaces: gnome-terminal
Source: mirror:gnome:sources/%n/2.16/%n-%v.tar.bz2
Source-MD5: 82b98a9b2685cca2d381e185cae47596
NoSetCPPFLAGS: true
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
