Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17:/tmp/cvs-serv3444/main/finkinfo/gnome
Modified Files:
Tag: pangocairo-branch
gedit-plugins.info gedit.info gedit.patch glade2.info
gnome-blog.info gnome-games.info
Added Files:
Tag: pangocairo-branch
glade2.patch pygtksourceview2-py.info
Log Message:
more build fixes
Index: gnome-games.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-games.info,v
retrieving revision 1.4.2.51
retrieving revision 1.4.2.52
diff -u -d -r1.4.2.51 -r1.4.2.52
--- gnome-games.info 21 Sep 2007 00:24:35 -0000 1.4.2.51
+++ gnome-games.info 26 Sep 2007 17:13:51 -0000 1.4.2.52
@@ -18,7 +18,7 @@
gnome-python2-desktop-py25 (>= 2.19.2-1),
gnome-vfs2-unified (>= 1:2.20.0-1),
gtk+2 (>= 2.12.0-1),
- guile16 (>= 1.6.7-1010),
+ guile18,
libart2-shlibs (>= 2.3.16-1),
libbonobo2 (>= 2.20.0-1),
libbonoboui2 (>= 2.20.0-1),
@@ -67,7 +67,7 @@
gob2 (>= 2.0.14-1002),
gtk-doc (>= 1.8-1),
gtk+2-dev (>= 2.12.0-1),
- guile16-dev (>= 1.6.7-1010),
+ guile18-dev,
intltool (>= 0.36.0-1),
libart2 (>= 2.3.16-1),
libbonobo2-dev (>= 2.20.0-1),
@@ -100,11 +100,11 @@
Replaces: gnome-games-dev (<< 2.12.0-1), gnome-games-shlibs (<< 2.12.0-1)
Source: mirror:gnome:sources/%n/2.20/%n-%v.tar.bz2
Source-MD5: b852cfe1f65c076b8af4fa9c7383a35f
-Patch: %n.patch
PatchScript: <<
#!/bin/sh -ev
perl -pi -e 's/(guile)(-config| -c)/$1-1.6$2/' configure
perl -pi -e 's/game_server/games_network_server_name/'
libgames-support/games-network.c
+ perl -pi -e 's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python2.5|'
`find . -name \*.py -o -name \*.in`
# recode ./some/path/ChangeLog as ChangeLogs/ChangeLog.some.path
mkdir ChangeLogs
@@ -118,17 +118,15 @@
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
BuildConflicts: libggz, libggz-crypto, ggz-client-libs-dev, ggz-server-dev
-ConfigureParams: --without-ggz-server --disable-scrollkeeper
--disable-schemas-install --with-ncurses=%p --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 PYTHON=%p/bin/python2.5
-InstallScript: <<
- make -j1 install DESTDIR=%d
-<<
+ConfigureParams: --without-ggz-server --disable-scrollkeeper
--disable-schemas-install --with-ncurses=%p --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 PYTHON=%p/bin/python2.5
GUILE=%p/bin/guile-1.8 GUILE_CONFIG=%p/bin/guile-1.8-config
+InstallScript: make -j1 install DESTDIR=%d
PostInstScript: <<
if [ configure = "$1" ]; then
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- for s in aisleriot blackjack glines gnect gnibbles gnobots2 \
- gnometris gnomine gnotravex gnotski gtali iagno
libgnomegames mahjongg same-gnome; do
+ for s in aisleriot blackjack glchess glines gnect gnibbles
gnobots2 \
+ gnometris gnomine gnotravex gnotski gtali iagno
mahjongg same-gnome; do
gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/$s.schemas >/dev/null
done
fi
@@ -157,6 +155,7 @@
ConfFiles: <<
%p/etc/gconf/schemas/aisleriot.schemas
%p/etc/gconf/schemas/blackjack.schemas
+ %p/etc/gconf/schemas/glchess.schemas
%p/etc/gconf/schemas/glines.schemas
%p/etc/gconf/schemas/gnect.schemas
%p/etc/gconf/schemas/gnibbles.schemas
@@ -167,12 +166,8 @@
%p/etc/gconf/schemas/gnotski.schemas
%p/etc/gconf/schemas/gtali.schemas
%p/etc/gconf/schemas/iagno.schemas
- %p/etc/gconf/schemas/libgnomegames.schemas
%p/etc/gconf/schemas/mahjongg.schemas
%p/etc/gconf/schemas/same-gnome.schemas
- %p/etc/sound/events/gnibbles.soundlist
- %p/etc/sound/events/gnobots2.soundlist
- %p/etc/sound/events/iagno.soundlist
<<
DocFiles: AUTHORS COPYING* ChangeLogs/* HACKING MAINTAINERS NEWS README TODO
Description: The Gnome simple games collection
@@ -195,8 +190,8 @@
sol
<<
DescPort: <<
- Needs guile16: fink's guile16* packages have their files renamed to
- include "1.6" so they don't conflict with the guile* (14) pkgs. So
+ Needs guile18: fink's guile18* packages have their files renamed to
+ include "1.8" so they don't conflict with the guile* (14) pkgs. So
we adjust how guile is detected.
<<
DescPackaging: <<
Index: gedit.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gedit.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- gedit.patch 19 Mar 2007 20:57:15 -0000 1.2.2.1
+++ gedit.patch 26 Sep 2007 17:13:50 -0000 1.2.2.2
@@ -1,6 +1,6 @@
-diff -uNr gedit-2.18.0/gedit/gedit-python-module.c
gedit-2.18.0-new/gedit/gedit-python-module.c
---- gedit-2.18.0/gedit/gedit-python-module.c 2007-03-04 05:54:18.000000000
-0500
-+++ gedit-2.18.0-new/gedit/gedit-python-module.c 2007-03-19
16:30:31.000000000 -0400
+diff -uNr gedit-2.20.0/gedit/gedit-python-module.c
gedit-2.20.0-new/gedit/gedit-python-module.c
+--- gedit-2.20.0/gedit/gedit-python-module.c 2007-07-21 06:31:18.000000000
-0400
++++ gedit-2.20.0-new/gedit/gedit-python-module.c 2007-09-26
10:55:41.000000000 -0400
@@ -24,6 +24,9 @@
#include <config.h>
#endif
@@ -11,3 +11,15 @@
#include <pygobject.h>
#include <pygtk/pygtk.h>
+diff -uNr gedit-2.20.0/plugins/externaltools/data/Makefile.in
gedit-2.20.0-new/plugins/externaltools/data/Makefile.in
+--- gedit-2.20.0/plugins/externaltools/data/Makefile.in 2007-09-17
06:51:11.000000000 -0400
++++ gedit-2.20.0-new/plugins/externaltools/data/Makefile.in 2007-09-26
10:56:03.000000000 -0400
+@@ -465,7 +465,7 @@
+ # (.desktop), which happens to be translated using intltool.
+ $(tools_SCRIPTS): %: %.tool.in %.desktop $(TOOL_MERGE)
+ perl $(TOOL_MERGE) -o $@ $< $(word 2,$^)
+- chmod --reference=$< $@
++ chmod 755 $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: gedit.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gedit.info,v
retrieving revision 1.6.2.56
retrieving revision 1.6.2.57
diff -u -d -r1.6.2.56 -r1.6.2.57
--- gedit.info 21 Sep 2007 00:24:35 -0000 1.6.2.56
+++ gedit.info 26 Sep 2007 17:13:50 -0000 1.6.2.57
@@ -33,6 +33,7 @@
pango1-xft2-ft219 (>= 1.18.2-1),
popt-shlibs,
pygtk2-gtk-py25 (>= 2.10.0-1),
+ pygtksourceview2-py25 (>= 2.0.0-1),
scrollkeeper,
x11-shlibs
<<
@@ -83,13 +84,17 @@
pycairo-py25-dev,
pygobject2-py25-dev (>= 2.12.0-1),
pygtk2-gtk-py25-dev (>= 2.10.0-1),
+ pygtksourceview2-py25-dev (>= 2.0.0-1),
x11-dev,
xft2-dev
<<
Source: mirror:gnome:sources/%n/2.20/%n-%v.tar.bz2
Source-MD5: 6c14d4f3583c921bdd551df6cd822289
Patch: %n.patch
-PatchScript: perl -pi -e 's/(-scrollkeeper-update)/#\1/' help/*/Makefile.in
+PatchScript: <<
+ perl -pi -e 's/(-scrollkeeper-update)/#\1/' help/*/Makefile.in
+ perl -pi -e 's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python2.5|'
`find . -name \*.py -o -name \*.in`
+<<
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 -fno-common
-DNO_IMPORT_PYGOBJECT=1 -DNO_IMPORT_PYGTK=1
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
--- NEW FILE: pygtksourceview2-py.info ---
Info2: <<
Package: pygtksourceview2-py%type_pkg[python]
Version: 2.0.0
Revision: 1
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Description: Python bindings for GTK source view
DescDetail: <<
PyGtkSourceView provides Python bindings for the GtkSourceView widget
and is built on top of PyGTK.
<<
Homepage: http://sourceforge.net/projects/pygtksourceview
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.2-1),
expat1,
fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.5-1),
gettext-bin,
gettext-tools,
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
gtk-doc (>= 1.8-1),
libgettext3-dev,
libglade2 (>= 2.6.2-1),
libiconv-dev,
libjpeg,
libpng3,
libtiff,
libxml2 (>= 2.6.30-1),
pango1-xft2-ft219-dev (>= 1.18.2-1),
pkgconfig (>= 0.21-1),
pycairo-py%type_pkg[python]-dev,
pygobject2-py%type_pkg[python]-dev,
pygtk2-gtk-py%type_pkg[python]-dev (>= 2.10.0-1),
x11-dev,
xft2-dev
<<
Depends: <<
atk1-shlibs (>= 1.20.0-1),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libgettext3-shlibs,
libglade2-shlibs (>= 2.6.2-1),
libiconv,
libjpeg-shlibs,
libpng3-shlibs,
libtiff-shlibs,
libxml2-shlibs (>= 2.6.30-1),
numeric-py%type_pkg[python],
pango1-xft2-ft219-shlibs (>= 1.18.2-1),
pycairo-py%type_pkg[python],
pygobject2-py%type_pkg[python],
pygtk2-gtk-py%type_pkg[python] (>= 2.10.0-1),
python%type_pkg[python],
x11
<<
Replaces: pygtksourceview2-py23, pygtksourceview2-py24, pygtksourceview2-py25
Source: mirror:gnome:sources/pygtksourceview/2.0/pygtksourceview-%v.tar.bz2
Source-MD5: a4947108e7a669b67ff0ff157a132728
Type: python (2.3 2.4 2.5)
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
CompileScript: <<
PYTHON=%p/bin/python%type_raw[python]
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 ./configure %c
make
<<
InstallScript: make -j1 install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
SplitOff: <<
Package: %N-dev
Description: Tools for compiling against pygtksourceview2
Depends: %N (= %v-%r)
BuildDependsOnly: true
Conflicts: <<
pygtksourceview2-py23-dev, pygtksourceview2-py24-dev,
pygtksourceview2-py25-dev
<<
Replaces: <<
pygtksourceview2-py23-dev, pygtksourceview2-py24-dev,
pygtksourceview2-py25-dev
<<
Files: lib/pkgconfig share/gtk-doc
DocFiles: COPYING
<<
<<
Index: glade2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glade2.info,v
retrieving revision 1.4.2.32
retrieving revision 1.4.2.33
diff -u -d -r1.4.2.32 -r1.4.2.33
--- glade2.info 21 Sep 2007 00:24:35 -0000 1.4.2.32
+++ glade2.info 26 Sep 2007 17:13:50 -0000 1.4.2.33
@@ -86,9 +86,8 @@
x11-dev,
xft2-dev
<<
-Patchscript: <<
- perl -pi -e 's|-scrollkeeper-update|#-scrollkeeper-update|g'
omf-install/Makefile.in
-<<
+Patch: %n.patch
+Patchscript: perl -pi -e 's|-scrollkeeper-update|#-scrollkeeper-update|g'
omf-install/Makefile.in
ConfigureParams: --disable-dependency-tracking --enable-gnome-db
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
DocFiles: ABOUT-NLS AUTHORS COPYING FAQ INSTALL NEWS README TODO
InstallScript: <<
Index: gedit-plugins.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/Attic/gedit-plugins.info,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -d -r1.1.2.21 -r1.1.2.22
--- gedit-plugins.info 26 Sep 2007 00:12:39 -0000 1.1.2.21
+++ gedit-plugins.info 26 Sep 2007 17:13:50 -0000 1.1.2.22
@@ -88,12 +88,16 @@
pycairo-py25-dev,
pygobject2-py25-dev (>= 2.12.0-1),
pygtk2-gtk-py25-dev (>= 2.10.0-1),
+ pygtksourceview2-py25-dev (>= 2.0.0-1),
x11-dev,
xft2-dev
<<
Source: mirror:gnome:sources/%n/2.19/%n-%v.tar.bz2
Source-MD5: 0ab5f65726d0776e81af5c0ee22ef2e4
-PatchScript: perl -pi -e 's,gedit-2.16,gedit-2.20,g;
s,gtksourceview-1.0,gtksourceview-2.0,g' configure
+PatchScript: <<
+ perl -pi -e 's,gedit-2.16,gedit-2.20,g;
s,gtksourceview-1.0,gtksourceview-2.0,g' configure
+ perl -pi -e 's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python2.5|'
`find . -name \*.py -o -name \*.in`
+<<
SetLIBS: -L%p/lib
ConfigureParams: --with-plugins=all --disable-scrollkeeper
--disable-schemas-install --mandir=%p/share/man --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 PYTHON=%p/bin/python2.5
InstallScript: <<
Index: gnome-blog.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-blog.info,v
retrieving revision 1.4.2.34
retrieving revision 1.4.2.35
diff -u -d -r1.4.2.34 -r1.4.2.35
--- gnome-blog.info 21 Sep 2007 00:24:35 -0000 1.4.2.34
+++ gnome-blog.info 26 Sep 2007 17:13:50 -0000 1.4.2.35
@@ -11,11 +11,7 @@
SetCFLAGS: -Os
ConfigureParams: --libexecdir=%p/lib/%n --mandir=%p/share/man
--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 PYTHON=%p/bin/python2.5
F77=no
DocFiles: AUTHORS COPYING ChangeLog README TODO
-InstallScript: <<
- make -j1 install prefix=%i
- mkdir -p %i/share
- mv %i/lib/locale %i/share
-<<
+InstallScript: make -j1 install prefix=%i
Description: GNOME blog poster
DescDetail: <<
A GNOME blog poster
--- NEW FILE: glade2.patch ---
diff -uNr glade-2.12.1/glade/gnome/gnomecontrol.c
glade-2.12.1-new/glade/gnome/gnomecontrol.c
--- glade-2.12.1/glade/gnome/gnomecontrol.c 2003-10-30 13:31:20.000000000
-0500
+++ glade-2.12.1-new/glade/gnome/gnomecontrol.c 2007-09-26 09:50:48.000000000
-0400
@@ -29,6 +29,10 @@
#include <config.h>
+/* why doesn't including gladeconfig.h get this directly? */
+#undef _
+#define _(String) dgettext (GETTEXT_PACKAGE, String)
+
#include <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkmain.h>
-------------------------------------------------------------------------
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]
https://lists.sourceforge.net/lists/listinfo/fink-commits
