Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15109/editors
Modified Files:
abiword-docs.info abiword.info abiword.patch emacs23-10.4.info
emacs23-10.4.patch emacs23.info emacs23.patch ghex2.info
gnote.info
Added Files:
ghex2.patch
Removed Files:
gnote.patch
Log Message:
latest gnome and kde3 to stable, along with .la cleaning and associated build
fixes and others uncovered while working on it, and other related packages
Index: gnote.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/gnote.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gnote.info 26 Jan 2010 00:23:53 -0000 1.4
+++ gnote.info 2 Nov 2010 15:46:16 -0000 1.5
@@ -1,129 +1,103 @@
Package: gnote
-Version: 0.5.2
+Version: 0.7.1
Revision: 1
Epoch: 1
Depends: <<
- atk1-shlibs (>= 1.26.0-1),
- audiofile-shlibs,
+ atk1-shlibs (>= 1.28.0-1),
boost1.35.nopython-shlibs,
- cairo-shlibs (>= 1.8-1),
- cairomm1-shlibs (>= 1.8.0-1),
- dbus-shlibs (>= 1.2.1-1),
- enchant1-shlibs (>= 1.4.2-2),
- esound-shlibs,
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- gconf2 (>= 2.26.0-1),
- gconf2-shlibs (>= 2.26.0-1),
- gconfmm2.6-shlibs (>= 2.24.0-2),
- glib2-shlibs (>= 2.20.0-1),
- glibmm2.4-shlibs (>= 2.20.0-1),
- glitz-shlibs,
- gnome-panel-shlibs (>= 2.26.0-1),
- gnome-vfs2-unified-shlibs (>= 1:2.24.1-1),
- gtk+2 (>= 2.16.0-1),
- gtk+2-shlibs (>= 2.16.0-1),
- gtkmm2.4-shlibs (>= 2.16.0-1),
- gtkspell2-shlibs (>= 2.0.15-1),
+ cairo-shlibs (>= 1.8.8-3),
+ cairomm1-shlibs (>= 1.8.4-1),
+ dpkg-base-files,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2 (>= 2.28.0-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ gconfmm2.6-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ glibmm2.4-shlibs (>= 2.22.0-1),
+ gnome-panel-shlibs (>= 2.28.0-1),
+ gtk+2 (>= 2.18.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ gtkmm2.4-shlibs (>= 2.18.0-1),
+ gtkspell2-shlibs (>= 2.0.16-2),
libart2-shlibs,
- libavahi-client3-shlibs,
- libavahi-common3-shlibs,
- libavahi-glib1-shlibs,
- libbonobo2 (>= 2.24.1-1),
- libbonobo2-shlibs (>= 2.24.1-1),
- libbonoboui2-shlibs (>= 2.24.1-1),
- libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.4-1),
- libgnome2-shlibs (>= 2.26.0-1),
- libgnomecanvas2-shlibs (>= 2.26.0-1),
+ libbonobo2 (>= 2.24.2-1),
+ libbonobo2-shlibs (>= 2.24.2-1),
+ libbonoboui2-shlibs (>= 2.24.2-1),
+ libgettext8-shlibs,
+ libgnome2-shlibs (>= 2.28.0-1),
+ libgnomecanvas2-shlibs (>= 2.26.0-3),
libiconv,
- libpanelappletmm2.6.1-shlibs,
- libpng3-shlibs,
+ libpanelappletmm2.6.1-shlibs (>= 2.26.0-3),
libsigc++2-shlibs (>= 2.2.3-1),
libxml2-shlibs (>= 2.6.30-1),
libxslt-shlibs,
- orbit2-shlibs (>= 2.14.17-1),
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pangomm1.4.1-shlibs (>= 2.24.0-1),
+ orbit2-shlibs (>= 2.14.17-2),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+ pangomm1.4.1-shlibs (>= 2.26.0-1),
pcre-shlibs,
- pixman-shlibs (>= 0.14.0-1),
popt-shlibs,
rarian-compat,
uuid-shlibs,
x11
<<
BuildDepends: <<
- atk1 (>= 1.26.0-1),
- autoconf,
- audiofile,
- automake1.11,
- avahi-dev,
+ atk1 (>= 1.28.0-1),
boost1.35.nopython,
- cairo (>= 1.8-1),
- cairomm1 (>= 1.8.0-1),
- dbus-dev (>= 1.2.1-1),
- enchant1-dev (>= 1.4.2-2),
- esound,
- expat1,
+ cairo (>= 1.8.8-3),
+ cairomm1 (>= 1.8.4-1),
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.8-2),
- gconf2-dev (>= 2.26.0-1),
- gconfmm2.6 (>= 2.24.0-2),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
+ gconfmm2.6 (>= 2.28.0-1),
gettext-bin,
gettext-tools (>= 0.17),
- glib2-dev (>= 2.20.0-1),
- glibmm2.4-dev (>= 2.20.0-1),
+ glib2-dev (>= 2.22.0-1),
+ glibmm2.4-dev (>= 2.22.0-1),
glitz,
gnome-common,
- gnome-doc-utils (>= 0.16.0-1),
- gnome-panel-dev (>= 2.26.0-1),
- gnome-vfs2-unified-dev (>= 1:2.24.1-1),
- gtk+2-dev (>= 2.16.0-1),
- gtkmm2.4-gtk-dev (>= 2.16.0-1),
- gtkspell2-dev (>= 2.0.15-1),
+ gnome-doc-utils (>= 0.18.1-1),
+ gnome-panel-dev (>= 2.28.0-1),
+ gtk+2-dev (>= 2.18.0-1),
+ gtkmm2.4-gtk-dev (>= 2.18.0-1),
+ gtkspell2-dev (>= 2.0.16-2),
intltool40,
libart2,
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.24.1-1),
- libbonoboui2-dev (>= 2.24.1-1),
- libgettext3-dev,
- libglade2 (>= 2.6.4-1),
- libgnome2-dev (>= 2.26.0-1),
- libgnomecanvas2-dev (>= 2.26.0-1),
+ libbonobo2-dev (>= 2.24.2-1),
+ libbonoboui2-dev (>= 2.24.2-1),
+ libgettext8-dev,
+ libgnome2-dev (>= 2.28.0-1),
+ libgnomecanvas2-dev (>= 2.26.0-3),
libiconv-dev,
- libpanelappletmm2.6.1,
- libpng3,
+ libpanelappletmm2.6.1 (>= 2.26.0-3),
libsigc++2 (>= 2.2.3-1),
- libtool2,
libxml2 (>= 2.6.30-1),
libxslt,
- orbit2-dev (>= 2.14.17-1),
- pango1-xft2-ft219-dev (>= 1.24.0-1),
- pangomm1.4.1 (>= 2.24.0-1),
+ orbit2-dev (>= 2.14.17-2),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pangomm1.4.1 (>= 2.26.0-1),
pcre,
- pixman (>= 0.14.0-1),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
popt,
uuid,
- x11-dev,
- xft2-dev
+ x11-dev
<<
-Source: mirror:gnome:sources/%n/0.5/%n-%v.tar.bz2
-Source-MD5: 19a56ecc51d21011b65b502dea305622
-PatchFile: %n.patch
-PatchFile-MD5: 901049f7082a1a49df2b61e8ebe30c84
+Source: mirror:gnome:sources/%n/0.7/%n-%v.tar.bz2
+Source-MD5: 894ccd75570e576166ff50893abe75ab
GCC: 4.0
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
-ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n
--disable-schemas-install --disable-scrollkeeper --disable-static
--with-boost=%p --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n
--disable-schemas-install --disable-scrollkeeper --disable-static
--with-boost=%p --enable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--disable-dbus
CompileScript: <<
- autoreconf -fi
./configure %c
- make V=1
+ make X_LIBS="-L/usr/X11R6/lib -lX11"
+ fink-package-precedence .
+ echo '(ignore any preceding messages about .hpp files not found in
%p/include/boost/)'
<<
InstallScript: <<
make install DESTDIR=%d
@@ -147,19 +121,22 @@
<<
DescPackaging: <<
- Safer linking against libtool convenience lib. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=587262
-
Need to make sure icon is available in theme ('make install'
doesn't know to handle this, even though it would be disabled)
+
+ 0.7.2 doesn't build against our current gtkmm
+
+ dbus supprot requires gbus++, which isn't in fink right now.
+
+ boost detection finds include/boost before include/boost-1.35.
+ The former is a symlink to the latter directory, so dpkg
+ doesn't know the files in that directory are part of the
+ package when referenced via the symlink path, which confuses
+ fink-package-precedence.
<<
DescPort: <<
- Missing link against some boost lib. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=587261
-
- --export-dynamic is the gnu-specific linker flag; instead use
- the libtool flag to Do The Right Thing on the local platform.
- See: http://bugzilla.gnome.org/show_bug.cgi?id=587228
+ configure doesn't actually set X_LIBS makefile variable, so
+ force-feed the result.
<<
Description: Simple desktop note-taking application
Homepage: http://www.gnome.org
--- NEW FILE: ghex2.patch ---
diff -Nurd -x'*~' ghex-2.24.0.orig/src/Makefile.in ghex-2.24.0/src/Makefile.in
--- ghex-2.24.0.orig/src/Makefile.in 2009-02-19 00:16:58.000000000 -0500
+++ ghex-2.24.0/src/Makefile.in 2010-02-25 03:14:10.000000000 -0500
@@ -66,7 +66,7 @@
libgtkhex_la_OBJECTS = $(am_libgtkhex_la_OBJECTS)
libgtkhex_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgtkhex_la_CFLAGS) \
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -no-undefined $(INTLLIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_ghex2_OBJECTS = hex-document-ui.$(OBJEXT) preferences.$(OBJEXT) \
diff -Nurd -x'*~' ghex-2.24.0.orig/src/ghex-window.c
ghex-2.24.0/src/ghex-window.c
--- ghex-2.24.0.orig/src/ghex-window.c 2009-02-06 23:05:35.000000000 -0500
+++ ghex-2.24.0/src/ghex-window.c 2010-02-25 02:57:02.000000000 -0500
@@ -20,7 +20,7 @@
#include <bonobo.h>
#include <bonobo/bonobo-ui-main.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
+#include <gio/gio.h>
#include <math.h>
#include <ctype.h>
@@ -1183,15 +1183,15 @@
gboolean
ghex_window_uri_exists (const gchar* text_uri)
{
- GnomeVFSURI *uri;
+ GFile *uri;
gboolean res;
g_return_val_if_fail (text_uri != NULL, FALSE);
- uri = gnome_vfs_uri_new (text_uri);
+ uri = g_file_new_for_uri (text_uri);
g_return_val_if_fail (uri != NULL, FALSE);
- res = gnome_vfs_uri_exists (uri);
+ res = g_file_query_exists (uri, NULL);
- gnome_vfs_uri_unref (uri);
+ g_object_unref (uri);
return res;
}
Index: abiword-docs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/abiword-docs.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- abiword-docs.info 15 Nov 2009 08:20:26 -0000 1.4
+++ abiword-docs.info 2 Nov 2010 15:46:15 -0000 1.5
@@ -1,60 +1,22 @@
Package: abiword-docs
-Version: 2.6.8
+Version: 2.8.4
Revision: 1
-Architecture: i386, powerpc
Depends: <<
abiword (>= %v-1)
<<
BuildDepends: <<
- abiword (>= %v-1),
- atk1 (>= 1.24.0-1),
- audiofile,
- cairo (>= 1.8-1),
- dbus-dev (>= 1.2.1-1),
- enchant1-dev (>= 1.4.2-1),
- esound,
- expat1,
- fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
- fribidi (>= 0.10.9-1),
- fribidi-dev,
- gconf2-dev (>= 2.24.0-1),
- gettext-bin,
- gettext-tools,
- glib2-dev (>= 2.18.0-1),
- glitz,
- gnome-keyring-dev (>= 2.26.0-1),
- gnome-vfs2-unified-dev (>= 1:2.24.0-1),
- gtk+2-dev (>= 2.14.0-1),
- libart2,
- libbonobo2-dev (>= 2.24.0-1),
- libbonoboui2-dev (>= 2.24.0-1),
- libgettext3-dev,
- libglade2 (>= 2.6.3-1),
- libgnome2-dev (>= 2.24.0-1),
- libgnomecanvas2-dev (>= 2.20.1.1-2),
- libgnomeprint2.2-dev (>= 2.18.5-1),
- libgnomeprintui2.2-dev (>= 2.18.3-1),
- libgnomeui2-dev (>= 2.24.0-1),
- libgsf1.114-gnome-dev (>= 1.14.11-1),
- libgsf1.114-dev (>= 1.14.11-1),
- libiconv-dev,
- libpng3,
- libwv1,
- libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.16-1),
- pango1-xft2-ft219-dev (>= 1.22.4-1),
- pixman (>= 0.12.0-1),
- pkgconfig (>= 0.23),
- popt,
- x11-dev,
- xft2-dev
+ abiword2.8-dev (>= %v-1),
+ pkgconfig (>= 0.23)
<<
Source: http://www.abiword.com/downloads/abiword/%v/source/%n-%v.tar.gz
-Source-MD5: 5698c79cfa179f4b15c82a699d11a309
+Source-MD5: f0902e3e45d3e5a9916997e3347bc491
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
+PatchScript: <<
+ cp %p/lib/pkgconfig/abiword-2.8.pc .
+ perl -ni -e 'print unless /^Requires/' abiword-2.8.pc
+<<
+ConfigureParams: PKG_CONFIG_PATH="%b"
InstallScript: <<
make -j1 install DESTDIR=%d
<<
@@ -62,9 +24,9 @@
As of 2.6.8, -docs is separated into its own package. The
helpfile build system needs to be able to run abiword.
- Because abiword.pc is accessed, need all the indirect deps of
- abiword even though we're not compiling anything at
- all. Thanks pkg-config:(
+ Because abiword's .pc is accessed, would need all the indirect
+ deps of abiword even though we're not compiling anything. Only
+ need a variable from the .pc, so make local copy with no deps.
<<
Description: Helpfiles for AbiWord
License: GPL
Index: emacs23.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs23.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- emacs23.info 24 Sep 2009 20:01:53 -0000 1.1
+++ emacs23.info 2 Nov 2010 15:46:16 -0000 1.2
@@ -1,7 +1,7 @@
Info2: <<
Package: emacs23%type_pkg[uitype]
Version: 23.1
-Revision: 104
+Revision: 201
Distribution: 10.5, 10.6
Type: uitype (. -nox)
Description: Flexible real-time text editor
@@ -10,65 +10,75 @@
Provides: emacsen
Depends: <<
dbus,
- dbus-shlibs,
+ dbus1.3-shlibs,
+ dpkg-base-files,
emacsen-common,
libncurses5-shlibs (>= 5.4-20041023-1006),
ncurses (>= 5.4-20041023-1006),
passwd,
+ (%type_raw[uitype] = .) atk1-shlibs (>= 1.28.0-1),
+ (%type_raw[uitype] = .) cairo-shlibs (>= 1.8.8-3),
+ (%type_raw[uitype] = .) fontconfig2-shlibs (>= 2.8.0-4),
+ (%type_raw[uitype] = .) freetype219-shlibs (>= 2.3.12-1),
(%type_raw[uitype] = .) giflib-shlibs,
- (%type_raw[uitype] = .) gtk+2-shlibs (>= 2.12.0-1),
- (%type_raw[uitype] = .) libgettext3-shlibs,
- (%type_raw[uitype] = .) libiconv,
- (%type_raw[uitype] = .) libjpeg-shlibs,
+ (%type_raw[uitype] = .) glib2-shlibs (>= 2.22.0-1),
+ (%type_raw[uitype] = .) gtk+2-shlibs (>= 2.18.0-1),
+ (%type_raw[uitype] = .) libjpeg8-shlibs,
(%type_raw[uitype] = .) libotf-shlibs,
- (%type_raw[uitype] = .) libpng3-shlibs (>= 1:1.2.18-1),
- (%type_raw[uitype] = .) librsvg2-shlibs,
+ (%type_raw[uitype] = .) libpng3-shlibs,
+ (%type_raw[uitype] = .) librsvg2-shlibs (>= 2.26.0-3),
(%type_raw[uitype] = .) libtiff-shlibs,
- (%type_raw[uitype] = .) pango1-xft2-ft219 (>= 1.18.4-4),
- (%type_raw[uitype] = .) x11
+ (%type_raw[uitype] = .) pango1-xft2-ft219 (>= 1.24.5-4),
+ (%type_raw[uitype] = .) x11,
+ (%type_raw[uitype] = .) xft2-shlibs (>= 2.1.14-1)
<<
BuildDepends: <<
- dbus-dev,
+ dbus1.3-dev,
fink (>= 0.24.12-1),
+ fink-package-precedence,
libncurses5 (>= 5.4-20041023-1006),
- (%type_raw[uitype] = .) atk1 (>= 1.20.0-1),
- (%type_raw[uitype] = .) cairo (>= 1.6-1),
+ pkgconfig (>= 0.23-1),
+ (%type_raw[uitype] = .) atk1 (>= 1.28.0-1),
+ (%type_raw[uitype] = .) cairo (>= 1.8.8-3),
(%type_raw[uitype] = .) expat1,
- (%type_raw[uitype] = .) fontconfig2-dev (>= 2.4.1-1),
- (%type_raw[uitype] = .) freetype219 (>= 2.3.5-1),
+ (%type_raw[uitype] = .) fontconfig2-dev (>= 2.8.0-4),
+ (%type_raw[uitype] = .) freetype219 (>= 2.3.12-1),
(%type_raw[uitype] = .) giflib,
- (%type_raw[uitype] = .) glib2-dev (>= 2.14.0-1),
+ (%type_raw[uitype] = .) glib2-dev (>= 2.22.0-1),
(%type_raw[uitype] = .) glitz,
- (%type_raw[uitype] = .) gtk+2-dev (>= 2.12.0-1),
- (%type_raw[uitype] = .) libgettext3-dev,
- (%type_raw[uitype] = .) libiconv-dev,
+ (%type_raw[uitype] = .) gtk+2-dev (>= 2.18.0-1),
+ (%type_raw[uitype] = .) libjpeg8,
(%type_raw[uitype] = .) libotf,
- (%type_raw[uitype] = .) libjpeg,
- (%type_raw[uitype] = .) libpng3 (>= 1:1.2.18-1),
- (%type_raw[uitype] = .) librsvg2,
+ (%type_raw[uitype] = .) libpng3,
+ (%type_raw[uitype] = .) librsvg2 (>= 2.26.0-3),
(%type_raw[uitype] = .) libtiff,
- (%type_raw[uitype] = .) pango1-xft2-ft219-dev (>= 1.18.4-4),
- (%type_raw[uitype] = .) pixman (>= 0.10.0-1),
- (%type_raw[uitype] = .) pkgconfig (>= 0.21-1),
- (%type_raw[uitype] = .) x11-dev
+ (%type_raw[uitype] = .) pango1-xft2-ft219-dev (>= 1.24.5-4),
+ (%type_raw[uitype] = .) pixman (>= 0.16.0-1),
+ (%type_raw[uitype] = .) x11-dev,
+ (%type_raw[uitype] = .) xft2-dev (>= 2.1.14-1)
<<
Conflicts: emacs23, emacs23-nox
Replaces: emacs23, emacs23-nox
Source: mirror:gnu:emacs/emacs-%v.tar.gz
Source-MD5: a620d4452769d04ad8864d662f34f8dd
PatchFile: emacs23.patch
-PatchFile-MD5: b7d9ab3ff299adb86898526a3bbf131a
+PatchFile-MD5: 95ed8daff9fd24ae9c7a70c06594a2bc
+PatchScript: <<
+ %{default_script}
+
+ # see DescPackaging
+ perl -pi -e 's/(xft >= 0.13.0)/\1 xrender/g' configure
+<<
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-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
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib -L/usr/X11/lib
+# makefiles pass CPPFLAGS early: don't want to override local -I with global
+NoSetCPPFLAGS: true
+SetCPPFLAGS: -MD
+SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib/xft2/lib
SetCFLAGS: -Os -pipe
-ConfigureParams: --disable-dependency-tracking
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib'
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
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+ConfigureParams: --enable-dependency-tracking --infodir='${prefix}/share/info'
--mandir='${prefix}/share/man' --libexecdir='${prefix}/lib'
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
INSTALL_INFO=/usr/bin/true
CompileScript: <<
#!/bin/bash -ev
- if [ $UID -ne 0 ]; then echo "%n cannot be built with --build-as-nobody";
exit 1; fi
if [ "%type_raw[uitype]" == "-nox" ]; then
./configure %c --without-x
else
@@ -79,6 +89,7 @@
(cd lisp && make recompile EMACS=../src/bootstrap-emacs) || exit
# Compile emacs with new *.elc
make
+ fink-package-precedence --depfile-ext='\.d' .
<<
InstallScript: <<
make install prefix=%i
@@ -108,14 +119,10 @@
mv %i/share/info %i/share/emacs-23.info
mkdir -p %i/share/info
mv %i/share/emacs-23.info %i/share/info/emacs-23
- rm %i/share/info/emacs-23/dir %i/share/info/emacs-23/dir.old
chmod 755 mangle-info
chmod 755 fix-info
./fix-info %i/share/info/emacs-23
- chown -R root:admin %i/share/emacs/%v/etc
- chown -R root:admin %i/share/emacs/%v/lisp
- chown -R root:admin %i/share/emacs/%v/leim
chmod 755 %i/share/emacs/%v/leim/ja-dic
chmod 755 %i/share/emacs/%v/leim/quail
rm %i/share/emacs/site-lisp/subdirs.el
@@ -152,6 +159,13 @@
do
install-info --infodir=%p/share/info --section Emacs Emacs
%p/share/info/emacs-23/${file}
done
+
+ # this was removed from lib-src/Makefile so that package passes
+ # --build-as-nobody
+ chown games %p/lib/emacs/%v/*/update-game-score
+ chmod u+s %p/lib/emacs/%v/*/update-game-score
+ chown games %p/var/games/emacs23
+ chmod u=rwx,g=rwx,o=rx %p/var/games/emacs23
<<
PreRmScript: <<
# Manually remove all of our info docs from the dir-file
@@ -194,11 +208,25 @@
%p/share/info for the same reason.
Original packages by Christoph Pfister and Christian Swinehart
+
+ dmacks cleaned up to pass --build-as-nobody and for GNOME2.28
+ standards. Uses xrender directly but was relying on xft2.pc to
+ propagate it, which fink's doesn't, so include it explicitly as part
+ of xft2 flag detection. --enable-dependency-tracking doesn't seem to
+ have an effect, so do -MD explicitly. Make sure to get proper
+ fink-supplied masking of x11-supplied stuff, including buried things.
+
+ Uses png_check_sig, which fink's libpng14 doesn't have.
<<
ConfFiles: %p/var/games/emacs23/tetris-scores %p/var/games/emacs23/snake-scores
DescPort: <<
The patchfile modifies startup.el, and brings in the scripts fix-info
and mangle-info, in order to implement our emacs packaging system.
+ Implements patch from
+
+http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=4122
+
+to fix the Buffers menu. Thanks to Ingo Theis for reporting this and finding
the bug report thread.
<<
Homepage: http://www.gnu.org/software/emacs/
<<
Index: emacs23-10.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs23-10.4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- emacs23-10.4.info 24 Sep 2009 20:01:53 -0000 1.1
+++ emacs23-10.4.info 2 Nov 2010 15:46:16 -0000 1.2
@@ -1,7 +1,7 @@
Info2: <<
Package: emacs23%type_pkg[uitype]
Version: 23.1
-Revision: 3
+Revision: 67
Distribution: 10.4
Type: uitype (. -nox)
Description: Flexible real-time text editor
@@ -39,7 +39,7 @@
(%type_raw[uitype] = .) giflib,
(%type_raw[uitype] = .) glib2-dev (>= 2.14.0-1),
(%type_raw[uitype] = .) glitz,
- (%type_raw[uitype] = .) gtk+2-dev (>= 2.12.0-1),
+ (%type_raw[uitype] = .) gtk+2-dev (>= 2.18.0-1),
(%type_raw[uitype] = .) libgettext3-dev,
(%type_raw[uitype] = .) libiconv-dev,
(%type_raw[uitype] = .) libotf,
@@ -58,7 +58,10 @@
Source: mirror:gnu:emacs/emacs-%v.tar.gz
Source-MD5: a620d4452769d04ad8864d662f34f8dd
PatchFile: emacs23-10.4.patch
-PatchFile-MD5: e4aa0f4c5511619fcfed690e4a1a8f80
+PatchFile-MD5: cc0461e5171b4c3642138c43cfd32514
+PatchScript: <<
+ %{default_script}
+<<
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
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 -I%p/lib/xft2/include
@@ -66,10 +69,9 @@
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib -L%p/lib/xft2/lib -Wl,-search_paths_first
SetLIBS: -L%p/lib
SetCFLAGS: -Os -pipe
-ConfigureParams: --disable-dependency-tracking
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib'
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --disable-dependency-tracking
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib'
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
INSTALL_INFO=/usr/bin/true
CompileScript: <<
#!/bin/bash -ev
- if [ $UID -ne 0 ]; then echo "%n cannot be built with --build-as-nobody";
exit 1; fi
if [ "%type_raw[uitype]" == "-nox" ]; then
./configure %c --without-x
else
@@ -109,14 +111,10 @@
mv %i/share/info %i/share/emacs-23.info
mkdir -p %i/share/info
mv %i/share/emacs-23.info %i/share/info/emacs-23
- rm %i/share/info/emacs-23/dir %i/share/info/emacs-23/dir.old
chmod 755 mangle-info
chmod 755 fix-info
./fix-info %i/share/info/emacs-23
- chown -R root:admin %i/share/emacs/%v/etc
- chown -R root:admin %i/share/emacs/%v/lisp
- chown -R root:admin %i/share/emacs/%v/leim
chmod 755 %i/share/emacs/%v/leim/ja-dic
chmod 755 %i/share/emacs/%v/leim/quail
rm %i/share/emacs/site-lisp/subdirs.el
@@ -153,6 +151,13 @@
do
install-info --infodir=%p/share/info --section Emacs Emacs
%p/share/info/emacs-23/${file}
done
+
+ # this was removed from lib-src/Makefile so that package passes
+ # --build-as-nobody
+ chown games %p/lib/emacs/%v/*/update-game-score
+ chmod u+s %p/lib/emacs/%v/*/update-game-score
+ chown games %p/var/games/emacs23
+ chmod u=rwx,g=rwx,o=rx %p/var/games/emacs23
<<
PreRmScript: <<
# Manually remove all of our info docs from the dir-file
@@ -206,6 +211,9 @@
we get the actual fink pkg, not the one that is Provides: by various
x11-dev). Fink's libXft is static-only, so need -search_paths_first
to make sure linker doesn't choose x11's shared lib.
+
+ dmacks--build fails due to missing link against libXrender (formerly
+ passed via .la dependency_libs?), so just link it directly.
<<
Homepage: http://www.gnu.org/software/emacs/
<<
Index: abiword.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/abiword.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- abiword.info 15 Nov 2009 08:20:26 -0000 1.12
+++ abiword.info 2 Nov 2010 15:46:15 -0000 1.13
@@ -1,110 +1,83 @@
Package: abiword
-Version: 2.6.8
+Version: 2.8.4
Revision: 3
Depends: <<
+ %n2.8-shlibs (>= %v-%r),
applesystemfonts,
- atk1-shlibs (>= 1.24.0-1),
- cairo-shlibs (>= 1.8-1),
- enchant1-shlibs (>= 1.4.2-1),
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ enchant1-shlibs (>= 1.6.0-1),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
fribidi-shlibs (>= 0.10.9-1),
- gconf2 (>= 2.24.0-1),
- gconf2-shlibs (>= 2.24.0-1),
- glib2-shlibs (>= 2.18.0-1),
- gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
- gtk+2-shlibs (>= 2.14.0-1),
- libart2-shlibs,
- libbonobo2-shlibs (>= 2.24.0-1),
- libbonoboui2-shlibs (>= 2.24.0-1),
- libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.3-1),
- libgnome2-shlibs (>= 2.24.0-1),
- libgnomecanvas2-shlibs (>= 2.20.1.1-2),
- libgnomeprint2.2-shlibs (>= 2.18.5-1),
- libgnomeprintui2.2-shlibs (>= 2.18.3-1),
- libgnomeui2-shlibs (>= 2.24.0-1),
- libgsf1.114-gnome-shlibs (>= 1.14.11-1),
- libgsf1.114-shlibs (>= 1.14.11-1),
- libiconv,
- libpng3-shlibs,
- libwv1-shlibs,
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ libgettext8-shlibs,
+ libgoffice-0.8-shlibs,
+ libgsf1.114-shlibs (>= 1.14.18-1),
+ libjpeg8-shlibs,
+ libpng14-shlibs,
+ librsvg2-shlibs (>= 2.26.0-3),
+ libwv3-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.16-1),
- pango1-xft2-ft219-shlibs (>= 1.22.4-1),
- popt-shlibs,
- x11-shlibs
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+ x11
<<
BuildDepends: <<
applesystemfonts,
- atk1 (>= 1.24.0-1),
- audiofile,
- cairo (>= 1.8-1),
- dbus-dev (>= 1.2.1-1),
- enchant1-dev (>= 1.4.2-1),
- esound,
- expat1,
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
+ enchant1-dev (>= 1.6.0-1),
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
fribidi (>= 0.10.9-1),
- fribidi-dev,
- gconf2-dev (>= 2.24.0-1),
+ fribidi-dev (>= 0.10.9-1),
+ gconf2-dev (>= 2.28.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.18.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gnome-keyring-dev (>= 2.26.0-1),
- gnome-vfs2-unified-dev (>= 1:2.24.0-1),
- gtk+2-dev (>= 2.14.0-1),
- libart2,
- libbonobo2-dev (>= 2.24.0-1),
- libbonoboui2-dev (>= 2.24.0-1),
- libgettext3-dev,
- libglade2 (>= 2.6.3-1),
- libgnome2-dev (>= 2.24.0-1),
- libgnomecanvas2-dev (>= 2.20.1.1-2),
- libgnomeprint2.2-dev (>= 2.18.5-1),
- libgnomeprintui2.2-dev (>= 2.18.3-1),
- libgnomeui2-dev (>= 2.24.0-1),
- libgsf1.114-gnome-dev (>= 1.14.11-1),
- libgsf1.114-dev (>= 1.14.11-1),
+ gtk+2-dev (>= 2.18.0-1),
+ libgettext8-dev,
+ libglade2 (>= 2.6.4-7),
+ libgoffice-0.8,
+ libgsf1.114-dev (>= 1.14.18-1),
+ libjpeg8,
libiconv-dev,
- libpng3,
- libwv1,
+ libpng14,
+ librsvg2 (>= 2.26.0-3),
+ libwv3,
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.16-1),
- pango1-xft2-ft219-dev (>= 1.22.4-1),
- pixman (>= 0.12.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
- popt,
- x11-dev,
- xft2-dev
+ x11-dev
<<
-BuildConflicts: libgoffice, libgoffice-0.6
Recommends: abiword-docs
+Source: http://www.abiword.com/downloads/%n/%v/source/%n-%v.tar.gz
+Source-MD5: f782ecb8e07d07ec179f7a143353cc29
+GCC: 4.0
PatchFile: %n.patch
-PatchFile-MD5: 293e295814d941c57d907cbe56f85fea
+PatchFile-MD5: 55bbfb33492ef97ce2d01d042a8404bf
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
- perl -pi -e
's,(GOFFICE_VERSION_REQUIRED=).*,${1}99999.FORCE.NONDETECT,' configure
perl -pi -e 's/-pedantic//g' configure
-<<
-Description: Open-source word processor
-DescUsage: <<
-
- Default help viewer might be your OS X default web-browser.
- Setting the BROWSER environment variable to an alternate
- command (for example, "firefox" if you have %p/bin/firefox)
- might override.
+ perl -pi -e 's/--no-undefined/-no-undefined/' src/Makefile.in
+ perl -pi -e 's/enable_dynamic/enable_shared/g' configure
- As of 2.6.8, the docs are separated into their own package
- (abiword-docs).
+ # --{enable,disable}-collab-backend-* flags are broken:
+ # --disable acts like --enable, and not passing still
+ # autodetects. So make it fail.
+ perl -pi -e 's/^(collab_.*req)=".*"/\1="FORCE.NONDETECT"/' configure
+<<
+ConfigureParams: <<
+ --without-gnomevfs --with-gio \
+ --enable-dependency-tracking \
+ --disable-static \
+
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
<<
-Source: http://www.abiword.com/downloads/%n/%v/source/%n-%v.tar.gz
-Source-MD5: fab04d8ef999c303f720197adf261310
-GCC: 4.0
-ConfigureParams: --enable-gnomevfs --enable-gnomeui --disable-Cocoa
--with-libxml2 --disable-gucharmap --without-epath
--disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
SetCPPFLAGS: -I%p/lib/fontconfig2/include
@@ -114,6 +87,7 @@
CompileScript: <<
./configure %c
make
+ fink-package-precedence --prohibit-bdep %n2.8-dev .
<<
InstallScript: <<
make -j1 install DESTDIR=%d
@@ -125,9 +99,43 @@
# install abiword startup script
install -m 755 abiword.sh %i/bin/abiword
<<
+DocFiles: BUILD.TXT BiDiReadme.txt COPYING COPYRIGHT.TXT README
+SplitOff: <<
+ Package: %N2.8-shlibs
+ Depends: <<
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ enchant1-shlibs (>= 1.6.0-1),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ fribidi-shlibs (>= 0.10.9-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ libgoffice-0.8-shlibs,
+ libgsf1.114-shlibs (>= 1.14.18-1),
+ libjpeg8-shlibs,
+ libpng14-shlibs,
+ librsvg2-shlibs (>= 2.26.0-3),
+ libwv3-shlibs,
+ libxml2-shlibs (>= 2.6.30-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+ x11
+ <<
+ Files: lib/libabiword-2.8.dylib
+ Shlibs: %p/lib/libabiword-2.8.dylib 0.0.0 %n (>= 2.8.4-1)
+ DocFiles: BUILD.TXT BiDiReadme.txt COPYING COPYRIGHT.TXT README
+<<
+SplitOff2: <<
+ Package: %N2.8-dev
+ Depends: %N2.8-shlibs
+ Files: <<
+ include
+ lib/pkgconfig
+ lib/libabiword-2.8.la
+ <<
+ DocFiles: BUILD.TXT BiDiReadme.txt COPYING COPYRIGHT.TXT README
+<<
DescPort: <<
- Patch to use 'open' as default help browser (set the BROWSER
- environment variable to override this).
abiword is a wrapper script that sets up symlinks to applettf
fonts in ~/.fonts, so that abiword will find them.
@@ -137,18 +145,61 @@
Got a bunch of realloc diagnostics while reading fonts (font
pulldown or format menu) but oh well. See:
http://bugzilla.abisource.com/show_bug.cgi?id=12024
+
+ Patch missing #include and lib for directly used x11. See:
+ http://bugzilla.abisource.com/show_bug.cgi?id=12734
+
+ libtool autoconf is enable-dynamic not enable-shared, so
+ configure was never auto-detecting that we were a
+ shared-binaries platform. See:
+ http://bugzilla.abisource.com/show_bug.cgi?id=12737
+
+ Link against libtool lib rather than using -l and -L to
+ resolve build-time library. See:
+ http://bugzilla.abisource.com/show_bug.cgi?id=12738
<<
DescPackaging: <<
- Uses libgnomeprint directly. Fixed in 2.7 dev cycle.
+ Use modern gio instead of crufty obsolete gnomevfs.
- Wants gucharmap (old, unavailable in fink) not gucharmap-2.
- Fixed in 2.7 dev cycle.
+ Tons of global-before-local -I flag ordering. Not fixing for
+ now (known no interference from installed %n, unknown about
+ unexpected external that masks source). Would have to adjust
+ lots of Makefile.in, and fix recursively-defined/expanded
+ variables in configure)
- Wants libgoffice-0.4 (old, unavailable in fink) not
- libgoffice-0.6. Instead builds a local lib fragment, so need
- to make we don't accidentally see the installed wrong-version.
+ Fix typo in forcing symbol resolution when building lib. See:
+ http://bugzilla.abisource.com/show_bug.cgi?id=12732
+
+ Add missing png direct dependency for lib. See:
+ http://bugzilla.abisource.com/show_bug.cgi?id=12731
+
+ Build as runtime binary (not framework) for x11 gui (not aqua)
+ because that's how this %n has apways been and that's how our
+ gtk is. See:
+ http://bugzilla.abisource.com/show_bug.cgi?id=12733
+
+ Shared library is tied to package major-minor by name (no
+ unversioned link) so not caring that it doesn't use proper c_v
+ values..."that's how upstream must want it"
+
+ Clean up .pc Requires: don't need entries that are not
+ #included by public .h to avoid publishing useless and hidden
+ InheritedBuildDepends.
+
+ Going with default plugins set for now. Disable collaboration
+ backends...untested, need to avoid autodetect.
+<<
+Description: Open-source word processor
+DescUsage: <<
+ Default help viewer might be your OS X default web-browser.
+ Setting the BROWSER environment variable to an alternate
+ command (for example, "firefox" if you have %p/bin/firefox)
+ might override.
+
+ As of 2.6.8, the docs are separated into their own package
+ (abiword-docs). Viewing is via gtk service, which may not
+ detect your html-viewer properly at this time.
<<
-DocFiles: BUILD.TXT BiDiReadme.txt COPYING COPYRIGHT.TXT CREDITS.TXT README.TXT
License: GPL
Homepage: http://www.abiword.com
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Index: emacs23.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs23.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- emacs23.patch 24 Sep 2009 20:01:53 -0000 1.1
+++ emacs23.patch 2 Nov 2010 15:46:16 -0000 1.2
@@ -10,6 +10,28 @@
gameuser=games
+@@ -2489,12 +2489,6 @@
+ opsys=darwin
+ # Define CPP as follows to make autoconf work correctly.
+ CPP="${CC-cc} -E -no-cpp-precomp"
+- # Use fink packages if available.
+- if test -d /sw/include && test -d /sw/lib; then
+- GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+- CPP="${CPP} ${GCC_TEST_OPTIONS}"
+- NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+- fi
+ ;;
+
+ ## HP 9000 series 700 and 800, running HP/UX
+@@ -10942,7 +10942,7 @@
+ HAVE_GTK=no
+ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
+ GLIB_REQUIRED=2.6
+- GTK_REQUIRED=2.6
++ GTK_REQUIRED=2.17.9
+ GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
+
+
@@ -14610,9 +14610,9 @@
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
@@ -40,6 +62,23 @@
+ ./mangle-info ${THE_INFO_PREFIX}/${file}
+done
\ No newline at end of file
+diff --exclude='*~' -ruN emacs-23.1/lib-src/Makefile.in
emacs-23.1.patched/lib-src/Makefile.in
+--- emacs-23.1/lib-src/Makefile.in 2009-06-21 00:37:34.000000000 -0400
++++ emacs-23.1.patched/lib-src/Makefile.in 2010-07-18 03:29:30.000000000
-0400
+@@ -306,13 +306,6 @@
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}
+ touch $(DESTDIR)${gamedir}/snake-scores
+ touch $(DESTDIR)${gamedir}/tetris-scores
+-/* If the following commands fail, that is not a big deal.
+- update-game-score will detect at runtime that it is not setuid,
+- and handle things accordingly. */
+- -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score &&
chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \
+- chown ${gameuser} $(DESTDIR)${gamedir}; \
+- chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
+- fi
+ if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
+ != `(cd ${srcdir} && /bin/pwd)` ]; then \
+ for file in ${SCRIPTS}; do \
diff --exclude='*~' -ruN emacs-23.1/lisp/startup.el
emacs-23.1.patched/lisp/startup.el
--- emacs-23.1/lisp/startup.el 2009-06-21 06:37:46.000000000 +0200
+++ emacs-23.1.patched/lisp/startup.el 2009-08-26 16:57:34.000000000 +0200
@@ -99,6 +138,19 @@
+print "$1($prefix/$2)";
+print ${POSTMATCH};
+
+diff --exclude='*~' -ruN emacs-23.1/src/Makefile.in
emacs-23.1.patched/src/Makefile.in
+--- emacs-23.1/src/Makefile.in 2009-07-01 08:24:14.000000000 -0400
++++ emacs-23.1.patched/src/Makefile.in 2010-07-21 04:27:48.000000000 -0400
+@@ -253,8 +253,8 @@
+
+ /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
+ since it may have -I options that should override those two. */
+-ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir}
C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS}
${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@
@M17N_FLT_CFLAGS@
++ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir}
C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SYSTEM_TEMACS @XFT_CFLAGS@
@FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ ${CFLAGS_SOUND} ${RSVG_CFLAGS}
${DBUS_CFLAGS} ${CFLAGS} @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ C_SWITCH_X_SITE
C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM
+ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
+
+ .SUFFIXES: .m
+ #endif /* not HAVE_X11 */
--- emacs-23.1/src/unexmacosx.c 2009-09-02 12:46:14.000000000 +0200
+++ emacs-23.1.patched/src/unexmacosx.c 2009-09-02 12:53:34.000000000
+0200
@@ -582,6 +582,14 @@
@@ -186,3 +238,33 @@
#endif
/* The ncurses library has been moved out of the System framework in
+--- emacs-23.1/src/xfns.c 2009-08-31 00:03:02.000000000 +0100
++++ emacs-23.1.patched/src/xfns.c 2009-08-31 00:21:39.000000000 +0100
+@@ -468,8 +468,10 @@
+ if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+ continue;
+ x = f->output_data.x;
+- /* Match if the window is this frame's menubar. */
+ #ifdef USE_GTK
++ /* Match if the window is this frame's window (button presses are no
longer
++ caught by the menubar) or a menu in the menubar.
++ */
+ if (x->menubar_widget)
+ {
+ GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
+@@ -477,13 +479,14 @@
+
+ BLOCK_INPUT;
+ if (gwdesc != 0
+- && (gwdesc == x->menubar_widget
++ && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent
(x->menubar_widget))
+ || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
+ found = 1;
+ UNBLOCK_INPUT;
+ if (found) return f;
+ }
+ #else
++ /* Match if the window is in this frame's menubar */
+ if (x->menubar_widget
+ && lw_window_is_in_menubar (wdesc, x->menubar_widget))
+ return f;
Index: emacs23-10.4.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs23-10.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- emacs23-10.4.patch 3 Jan 2010 01:51:12 -0000 1.1
+++ emacs23-10.4.patch 2 Nov 2010 15:46:16 -0000 1.2
@@ -10,6 +10,28 @@
gameuser=games
+@@ -2489,12 +2489,6 @@
+ opsys=darwin
+ # Define CPP as follows to make autoconf work correctly.
+ CPP="${CC-cc} -E -no-cpp-precomp"
+- # Use fink packages if available.
+- if test -d /sw/include && test -d /sw/lib; then
+- GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+- CPP="${CPP} ${GCC_TEST_OPTIONS}"
+- NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+- fi
+ ;;
+
+ ## HP 9000 series 700 and 800, running HP/UX
+@@ -10942,7 +10942,7 @@
+ HAVE_GTK=no
+ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
+ GLIB_REQUIRED=2.6
+- GTK_REQUIRED=2.6
++ GTK_REQUIRED=2.17.9
+ GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
+
+
@@ -14610,9 +14610,9 @@
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
@@ -40,6 +62,23 @@
+ ./mangle-info ${THE_INFO_PREFIX}/${file}
+done
\ No newline at end of file
+diff --exclude='*~' -ruN emacs-23.1/lib-src/Makefile.in
emacs-23.1.patched/lib-src/Makefile.in
+--- emacs-23.1/lib-src/Makefile.in 2009-06-21 00:37:34.000000000 -0400
++++ emacs-23.1.patched/lib-src/Makefile.in 2010-07-18 03:29:30.000000000
-0400
+@@ -306,13 +306,6 @@
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}
+ touch $(DESTDIR)${gamedir}/snake-scores
+ touch $(DESTDIR)${gamedir}/tetris-scores
+-/* If the following commands fail, that is not a big deal.
+- update-game-score will detect at runtime that it is not setuid,
+- and handle things accordingly. */
+- -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score &&
chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \
+- chown ${gameuser} $(DESTDIR)${gamedir}; \
+- chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
+- fi
+ if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
+ != `(cd ${srcdir} && /bin/pwd)` ]; then \
+ for file in ${SCRIPTS}; do \
diff --exclude='*~' -ruN emacs-23.1/lisp/startup.el
emacs-23.1.patched/lisp/startup.el
--- emacs-23.1/lisp/startup.el 2009-06-21 06:37:46.000000000 +0200
+++ emacs-23.1.patched/lisp/startup.el 2009-08-26 16:57:34.000000000 +0200
@@ -99,3 +138,45 @@
+print "$1($prefix/$2)";
+print ${POSTMATCH};
+
+diff -Nurd -x'*~' emacs-23.1.orig/src/Makefile.in emacs-23.1/src/Makefile.in
+--- emacs-23.1.orig/src/Makefile.in 2009-07-01 08:24:14.000000000 -0400
++++ emacs-23.1/src/Makefile.in 2010-04-20 01:59:45.000000000 -0400
+@@ -350,7 +350,7 @@
+ #endif /* not USE_X_TOOLKIT */
+
+ #if HAVE_XFT
+-xft_li...@xft_libs@
++xft_li...@xft_libs@ -lXrender
+ #endif /* HAVE_XFT */
+
+ #if HAVE_XPM
+--- emacs-23.1/src/xfns.c 2009-08-31 00:03:02.000000000 +0100
++++ emacs-23.1.patched/src/xfns.c 2009-08-31 00:21:39.000000000 +0100
+@@ -468,8 +468,10 @@
+ if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+ continue;
+ x = f->output_data.x;
+- /* Match if the window is this frame's menubar. */
+ #ifdef USE_GTK
++ /* Match if the window is this frame's window (button presses are no
longer
++ caught by the menubar) or a menu in the menubar.
++ */
+ if (x->menubar_widget)
+ {
+ GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
+@@ -477,13 +479,14 @@
+
+ BLOCK_INPUT;
+ if (gwdesc != 0
+- && (gwdesc == x->menubar_widget
++ && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent
(x->menubar_widget))
+ || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
+ found = 1;
+ UNBLOCK_INPUT;
+ if (found) return f;
+ }
+ #else
++ /* Match if the window is in this frame's menubar */
+ if (x->menubar_widget
+ && lw_window_is_in_menubar (wdesc, x->menubar_widget))
+ return f;
Index: abiword.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/abiword.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- abiword.patch 11 May 2009 18:01:59 -0000 1.4
+++ abiword.patch 2 Nov 2010 15:46:15 -0000 1.5
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' abiword-2.6.8.orig/abiword.sh abiword-2.6.8/abiword.sh
---- abiword-2.6.8.orig/abiword.sh 1969-12-31 19:00:00.000000000 -0500
-+++ abiword-2.6.8/abiword.sh 2009-03-20 16:24:26.000000000 -0400
+diff -Nurd -x'*~' abiword-2.8.4.orig/abiword.sh abiword-2.8.4/abiword.sh
+--- abiword-2.8.4.orig/abiword.sh 1969-12-31 19:00:00.000000000 -0500
++++ abiword-2.8.4/abiword.sh 2010-05-16 16:08:41.000000000 -0400
@@ -0,0 +1,14 @@
+#!/bin/sh
+# make symlinks in ~/.fonts for applettf .ttf files
@@ -16,15 +16,88 @@
+done
+# launch abiword
+exec @PREFIX@/bin/abiword.exe "$@"
-diff -Nurd -x'*~' abiword-2.6.8.orig/src/af/util/xp/ut_go_file.cpp
abiword-2.6.8/src/af/util/xp/ut_go_file.cpp
---- abiword-2.6.8.orig/src/af/util/xp/ut_go_file.cpp 2009-03-04
13:15:22.000000000 -0500
-+++ abiword-2.6.8/src/af/util/xp/ut_go_file.cpp 2009-03-20
16:20:16.000000000 -0400
-@@ -1594,7 +1594,7 @@
+diff -Nurd -x'*~' abiword-2.8.4.orig/configure abiword-2.8.4/configure
+--- abiword-2.8.4.orig/configure 2010-04-14 17:50:56.000000000 -0400
++++ abiword-2.8.4/configure 2010-05-17 14:05:10.000000000 -0400
+@@ -16598,10 +16598,10 @@
+ { $as_echo "$as_me:$LINENO: checking for platform and toolkit" >&5
+ $as_echo_n "checking for platform and toolkit... " >&6; }
+ case ${host_os} in
+- *darwin*)
+- PLATFORM="unix"
+- TOOLKIT="cocoa"
+- ;;
++# *darwin*)
++# PLATFORM="unix"
++# TOOLKIT="cocoa"
++# ;;
+ *mingw*)
+ PLATFORM="win"
+ TOOLKIT="win"
+@@ -19036,13 +19036,13 @@
+ test "$enable_dynamic" == "yes"; then
+ # link plugins to work around gcc visibility issue with
+ # derived classes in dlopened modules
+- PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'"
-labiword-$ABIWORD_SERIES"
++ PLUGIN_LIBS="$PLUGIN_LIBS
"'${top_builddir}/src'"/libabiword-$ABIWORD_SERIES.la"
+ elif test "$TOOLKIT" == "win"; then
+ PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'-D_WIN32_IE=0x0501
-D_WIN32_WINNT=0x0500'
+ # link plugins to the executable so they can be loaded
+ PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src -labiword'
+ elif test "$TOOLKIT" == "cocoa" ; then
+- PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'"
-labiword-$ABIWORD_SERIES"
++ PLUGIN_LIBS="$PLUGIN_LIBS
"'${top_builddir}/src'"/libabiword-$ABIWORD_SERIES.la"
+ fi
- if (browser == NULL) {
- static char const * const browsers[] = {
-- "sensible-browser", /* debian */
-+ "open", /* OS X */
- "epiphany", /* primary gnome */
- "galeon", /* secondary gnome */
- "encompass",
+
+diff -Nurd -x'*~' abiword-2.8.4.orig/libabiword.pc.in
abiword-2.8.4/libabiword.pc.in
+--- abiword-2.8.4.orig/libabiword.pc.in 2010-04-14 17:50:18.000000000
-0400
++++ abiword-2.8.4/libabiword.pc.in 2010-05-17 23:57:21.000000000 -0400
+@@ -9,6 +9,6 @@
+ Name: abiwo...@abiword_series@
+ Description: AbiWord word processing library
+ Version: @VERSION@
+-Requires: @ABIWORD_REQUIRED_PKGS@
++Requires: glib-2.0 gobject-2.0 libgsf-1 gtk+-2.0
+ Libs: -L${libdir} -labiwo...@abiword_series@
+ Cflags: -I${includedir}/abiwo...@abiword_series@
+diff -Nurd -x'*~' abiword-2.8.4.orig/src/Makefile.in
abiword-2.8.4/src/Makefile.in
+--- abiword-2.8.4.orig/src/Makefile.in 2010-04-14 17:51:20.000000000 -0400
++++ abiword-2.8.4/src/Makefile.in 2010-05-17 19:12:44.000000000 -0400
+@@ -502,7 +502,7 @@
+
+ libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \
+ -export-dynamic $(am__append_6)
+-libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \
++libabiword_2_8_la_LIBADD_ltlibs = $(opt_libs) plugins/libplugins.la \
+ text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \
+ wp/ap/$(TOOLKIT)/lib$(TOOLKIT).la wp/ap/xp/libxp.la \
+ wp/impexp/$(TOOLKIT)/lib$(TOOLKIT).la wp/impexp/xp/libxp.la \
+@@ -511,6 +511,7 @@
+ af/util/$(PLATFORM)/lib$(PLATFORM).la af/util/xp/libxp.la \
+ af/ev/$(TOOLKIT)/lib$(TOOLKIT).la af/ev/xp/libxp.la \
+ $(am__append_7)
++libabiword_2_8_la_LIBADD = $(libabiword_2_8_la_LIBADD_ltlibs) $(PNG_LIBS)
-L/usr/X11R6/lib -lX11
+
+ # headers are GTK only.
+ @toolkit_gtk_t...@libabiword_2_8_includedir = @ABIWORD_HEADERSDIR@
+@@ -520,7 +521,7 @@
+ @TOOLKIT_GTK_TRUE@ af/xap/gtk/xap_UnixTableWidget.h
+
+ libabiword_2_8_la_DEPENDENCIES = \
+- $(libabiword_2_8_la_LIBADD)
++ $(libabiword_2_8_la_LIBADD_ltlibs)
+
+ libabiword_2_8_la_SOURCES = \
+ $(top_srcdir)/src/wp/main/xp/abi_ver.cpp \
+diff -Nurd -x'*~' abiword-2.8.4.orig/src/af/ev/gtk/ev_UnixKeyboard.cpp
abiword-2.8.4/src/af/ev/gtk/ev_UnixKeyboard.cpp
+--- abiword-2.8.4.orig/src/af/ev/gtk/ev_UnixKeyboard.cpp 2010-04-14
17:50:11.000000000 -0400
++++ abiword-2.8.4/src/af/ev/gtk/ev_UnixKeyboard.cpp 2010-05-17
03:51:26.000000000 -0400
+@@ -23,6 +23,7 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkkeysyms.h>
++#include <X11/keysym.h>
+
+ #include "ut_types.h"
+ #include "ut_assert.h"
Index: ghex2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/ghex2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ghex2.info 11 May 2009 18:01:59 -0000 1.3
+++ ghex2.info 2 Nov 2010 15:46:16 -0000 1.4
@@ -1,91 +1,85 @@
Package: ghex2
Version: 2.24.0
-Revision: 1
+Revision: 3
Source: mirror:gnome:sources/ghex/2.24/ghex-%v.tar.bz2
Source-MD5: 982b2a4e70e80d2166bcc782e989889c
Depends: <<
- atk1-shlibs (>= 1.22.0-1),
- audiofile-shlibs,
- cairo-shlibs (>= 1.8-1),
- dbus-shlibs (>= 1.2.1-1),
- esound-shlibs (>= 0.2.38-1),
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
- gconf2 (>= 2.24.0-1),
- glib2-shlibs (>= 2.18.0-1),
- glitz-shlibs,
- gnome-keyring-shlibs (>= 0.8.1-1),
- gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
- gtk+2-shlibs (>= 2.14.0-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ dpkg-base-files,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2 (>= 2.28.0-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
libart2-shlibs,
- libavahi-client3-shlibs,
- libavahi-common3-shlibs,
- libavahi-glib1-shlibs,
- libbonobo2-shlibs (>= 2.24.0-1),
- libbonoboui2-shlibs (>= 2.24.0-1),
- libgettext3-shlibs,
- libgnome2-shlibs (>= 2.24.0-1),
- libgnomeui2-shlibs (>= 2.24.0-1),
- libgnomecanvas2-shlibs (>= 2.20.1.1-1),
- libgnomeprint2.2-shlibs (>= 2.18.5-1),
- libgnomeprintui2.2-shlibs (>= 2.18.3-1),
+ libbonobo2-shlibs (>= 2.24.2-1),
+ libbonoboui2-shlibs (>= 2.24.2-1),
+ libgettext8-shlibs,
+ libgnome2-shlibs (>= 2.28.0-1),
+ libgnomeui2-shlibs (>= 2.24.2-1),
+ libgnomecanvas2-shlibs (>= 2.26.0-3),
+ libgnomeprint2.2-shlibs (>= 2.18.6-5),
+ libgnomeprintui2.2-shlibs (>= 2.18.4-4),
libgtkhex0-shlibs (>= %v-%r),
- libiconv,
- libpng3-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.16-1),
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
- pixman-shlibs (>= 0.12.0-1),
+ orbit2-shlibs (>= 2.14.17-2),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+ pixman-shlibs (>= 0.16.0-1),
popt-shlibs,
rarian-compat,
x11-shlibs
<<
BuildDepends: <<
- atk1 (>= 1.24.0-1),
- audiofile,
- avahi-dev,
- cairo (>= 1.8-1),
- dbus-dev (>= 1.2.1-1),
- esound (>= 0.2.38-1),
- expat1,
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
- gconf2-dev (>= 2.24.0-1),
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
+ fink (>= 0.24.12),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
gettext-tools,
gettext-bin,
- glib2-dev (>= 2.18.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gnome-doc-utils,
- gnome-keyring-dev (>= 0.8.1-1),
- gnome-vfs2-unified-dev (>= 1:2.24.0-1),
- gtk-doc (>= 1.8-1),
- gtk+2-dev (>= 2.14.0-1),
+ gnome-doc-utils (>= 0.18.1-1),
+ gnome-vfs2-unified-dev,
+ gtk+2-dev (>= 2.18.0-1),
+ gtk-doc (>= 1.13-5),
intltool40,
libart2,
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.24.0-1),
- libbonoboui2-dev (>= 2.24.0-1),
- libgettext3-dev,
- libgnome2-dev (>= 2.24.0-1),
- libgnomeui2-dev (>= 2.24.0-1),
- libgnomecanvas2-dev (>= 2.20.1.1-1),
- libgnomeprint2.2-dev (>= 2.18.5-1),
- libgnomeprintui2.2-dev (>= 2.18.3-1),
- libiconv-dev,
- libpng3,
+ libbonobo2-dev (>= 2.24.2-1),
+ libbonoboui2-dev (>= 2.24.2-1),
+ libgettext8-dev,
+ libgnome2-dev (>= 2.28.0-1),
+ libgnomeui2-dev (>= 2.24.2-1),
+ libgnomecanvas2-dev (>= 2.26.0-3),
+ libgnomeprint2.2-dev (>= 2.18.6-5),
+ libgnomeprintui2.2-dev (>= 2.18.4-4),
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.16-1),
- pango1-xft2-ft219-dev (>= 1.22.0-4),
- pixman (>= 0.12.0-1),
+ orbit2-dev (>= 2.14.17-2),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
popt,
- x11-dev,
- xft2-dev
+ x11-dev
<<
-ConfigureParams: --disable-schemas-install --disable-scrollkeeper
--disable-dependency-tracking --disable-static
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:PKG_CONFIG_PATH"
+PatchFile: %n.patch
+PatchFile-MD5: 8293296c7abe3ec6abfe4fe1d6a4551d
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's/(gtk\+-2.0)/gio-2.0 \1/g' configure
+<<
+
+ConfigureParams: --disable-schemas-install --disable-scrollkeeper
--enable-dependency-tracking --disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:PKG_CONFIG_PATH"
+CompileScript: <<
+ ./configure %c
+ make
+ fink-package-precedence .
+<<
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po NEWS README
@@ -109,20 +103,14 @@
SplitOff: <<
Package: libgtkhex0-shlibs
Depends: <<
- atk1-shlibs (>= 1.24.0-1),
- cairo-shlibs (>= 1.8-1),
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
- glib2-shlibs (>= 2.18.0-1),
- glitz-shlibs,
- gtk+2-shlibs (>= 2.14.0-1),
- libgettext3-shlibs,
- libiconv,
- libpng3-shlibs,
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
- pixman-shlibs (>= 0.12.0-1),
- x11-shlibs
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ libgettext8-shlibs,
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4)
<<
Files: lib/libgtkhex.0*.dylib
Shlibs: %p/lib/libgtkhex.0.dylib 1.0.0 %n (>= 2.8.2-1)
@@ -149,14 +137,22 @@
Still uses libgnomeprint. See:
http://bugzilla.gnome.org/show_bug.cgi?id=508563
- Still uses libgnomevfs. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=525072
+ Convert libgnomevfs calls to gio. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=525072#c3
+ (but patchscript to fix configure instead of patching
+ configure.in template and redoing autotools)
+ Still inherits libgnomevfs from libgnomeui...oh well
Not fixing some compiler noise. See:
http://bugzilla.gnome.org/show_bug.cgi?id=570688
Not removing non-public-interface dependencies from .pc. See:
http://bugzilla.gnome.org/show_bug.cgi?id=572697
+ They're Requires of ones that are in public API anyway, so
+ doesn't cause extra inherited BDep.
+<<
+DescPort: <<
+ Recent glib doesn't publish -lintl, so pass it directly.
<<
License: GPL/GFDL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
--- gnote.patch DELETED ---
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
