Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14266/unstable/crypto/finkinfo
Modified Files:
epiphany.info seahorse.info seahorse.patch
Added Files:
epiphany.patch
Log Message:
new gnome2.28 suite to unstable
Index: epiphany.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/epiphany.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- epiphany.info 6 Apr 2010 15:27:35 -0000 1.17
+++ epiphany.info 7 Apr 2010 13:55:53 -0000 1.18
@@ -1,160 +1,131 @@
Package: epiphany
-Version: 2.26.2
-Revision: 3
+Version: 2.28.2
+Revision: 2
Depends: <<
- atk1-shlibs (>= 1.26.0-1),
- audiofile-shlibs (>= 0.2-10),
- cairo-shlibs (>= 1.8-1),
- dbus-shlibs (>= 1.2.1-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ dbus-glib1.2-shlibs,
+ dbus1.3-shlibs,
default-icon-theme,
- esound-shlibs (>= 0.2.38-1),
- expat1-shlibs,
- firefox2-shlibs (>= 2.0.0.20-4),
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- gconf2 (>= 2.26.0-1),
- gconf2-shlibs (>= 2.26.0-1),
- glib2-shlibs (>= 2.20.0-1),
- glitz-shlibs,
- gnome-desktop2.11-shlibs,
+ 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),
gnome-icon-theme (>= 2.26.0-1),
- gnome-keyring-shlibs (>= 2.26.0-1),
+ gnome-keyring-shlibs (>= 2.28.0-1),
gnome-mime-data (>= 2.18.0-1),
- gnome-vfs2-unified-shlibs (>= 1:2.24.1-1),
- gtk+2 (>= 2.16.0-1),
- gtk+2-shlibs (>= 2.16.0-1),
+ gtk+2 (>= 2.18.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
iso-codes,
- libart2-shlibs (>= 2.3.16-2),
- libavahi-glib1-shlibs,
- libbonobo2-shlibs (>= 2.24.1-1),
- libbonoboui2-shlibs (>= 2.24.1-1),
- libcanberra-gtk0-shlibs (>= 0.12-1),
- libcanberra0-shlibs (>= 0.12-1),
- libgettext3-shlibs (>= 0.14.2-13),
- libglade2-shlibs (>= 2.6.4-1),
- libgnome2-shlibs (>= 2.26.0-1),
- libgnomecanvas2-shlibs (>= 2.26.0-1),
- libgnomeui2-shlibs (>= 2.24.1-1),
+ libgettext8-shlibs,
libiconv,
- libogg-shlibs,
- libpng3-shlibs,
- libtool2-shlibs,
- libvorbis0-shlibs,
+ libnotify-shlibs,
+ libsoup-gnome2.4.1-shlibs,
+ libsoup2.4.1-ssl-shlibs (>= 2.28.0-1),
libxml2-shlibs (>= 2.6.30-1),
libxslt-shlibs (>= 1.1.22-1),
- orbit2-shlibs (>= 2.14.17-1),
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
- popt-shlibs,
+ notification-daemon,
+ nspr.0d-shlibs,
+ nss.1d-shlibs,
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
rarian-compat,
shared-mime-info (>= 0.51-1),
startup-notification-shlibs (>= 0.8-1),
+ webkit-1.0.2-shlibs (>= 1.1.15.4-1),
x11
<<
BuildDepends: <<
- atk1 (>= 1.26.0-1),
- audiofile (>= 0.2-10),
- avahi-dev,
- cairo (>= 1.8-1),
- dbus-dev (>= 1.2.1-1),
- esound (>= 0.2.38-1),
- expat1,
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
+ dbus-glib1.2-dev,
+ dbus1.3-dev,
fink (>= 0.24.12-1),
- firefox2-dev (>= 2.0.0.20-4),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.8-2),
- gconf2-dev (>= 2.26.0-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
gettext-bin (>= 0.14.2-13),
gettext-tools (>= 0.14.2-13),
- glib2-dev (>= 2.20.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gnome-desktop2.11-dev,
- gnome-doc-utils (>= 0.16.0-1),
- gnome-keyring-dev (>= 2.26.0-1),
- gnome-vfs2-unified-dev (>= 1:2.24.1-1),
- gtk+2-dev (>= 2.16.0-1),
- gtk-doc (>= 1.9-1),
+ gnome-doc-utils (>= 0.18.1-1),
+ gnome-keyring-dev (>= 2.28.0-1),
+ gtk+2-dev (>= 2.18.0-1),
+ gtk-doc (>= 1.13-5),
intltool40,
- libart2 (>= 2.3.16-2),
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.24.1-1),
- libbonoboui2-dev (>= 2.24.1-1),
- libcanberra-gtk0 (>= 0.12-1),
- libcanberra0 (>= 0.12-1),
- libgettext3-dev (>= 0.14.2-13),
- libglade2 (>= 2.6.4-1),
- libgnome2 (>= 2.26.0-1),
- libgnome2-dev (>= 2.26.0-1),
- libgnomecanvas2-dev (>= 2.26.0-1),
- libgnomeui2-dev (>= 2.24.1-1),
+ libgettext8-dev,
libiconv-dev,
- libogg,
- libpng3,
- libtool2,
- libvorbis0,
+ libnotify,
+ libsoup-gnome2.4.1,
+ libsoup2.4.1-ssl (>= 2.28.0-1),
libxml2 (>= 2.6.30-1),
libxslt (>= 1.1.22-1),
- orbit2-dev (>= 2.14.17-1),
- pango1-xft2-ft219-dev (>= 1.24.0-1),
- pixman (>= 0.14.0-1),
+ nspr.0d,
+ nss.1d,
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
- popt,
startup-notification-dev (>= 0.8-1),
- x11-dev,
- xft2-dev
+ webkit-1.0.2 (>= 1.1.15.4-1),
+ x11-dev
<<
Recommends: yelp, gedit
Conflicts: %N2.24-dev
Replaces: %N2.24-dev
-Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2
-Source-MD5: 29c23cfb0a5713b53255a9ca652192c1
+Source: mirror:gnome:sources/%n/2.28/%n-%v.tar.bz2
+Source-MD5: cf32404bfe6f0cb4d3f01d0c33c08def
+PatchFile: %n.patch
+PatchFile-MD5: 9140abab84d5a9c7f9c95c5271e4ce0c
PatchScript: <<
- perl -pi -e 's/-Wl,--rpath=\$_GECKO_HOME//' configure
+ %{default_script}
perl -pi -e 's/(AVAHI_REQUIRED\s*=).*/${1}99999.FORCE.NONDETECT/'
configure
<<
GCC: 4.0
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-scrollkeeper --disable-schemas-install --disable-static
--with-gecko=firefox --disable-python
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--enable-gtk-doc
+ConfigureParams: --mandir=%p/share/man --enable-dependency-tracking
--disable-scrollkeeper --disable-schemas-install --disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--enable-gtk-doc --disable-silent-rules
SetCFLAGS: -Os
CompileScript: <<
- ./configure %c
+ X11ISH_LIBS="-lICE -lX11 -lSM -L/usr/X11R6/lib" ./configure %c
make CCLD=g++
+ fink-package-precedence --prohibit-bdep %n-dev .
<<
InstallScript: make -j1 install CCLD=g++ DESTDIR="%d"
DocFiles: AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README TODO
PostInstScript: <<
- . %p/bin/init.sh
if [ configure = "$1" ]; then
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/epiphany.schemas >/dev/null
- gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/epiphany-fonts.schemas >/dev/null
gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/epiphany-lockdown.schemas >/dev/null
- gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/epiphany-pango.schemas >/dev/null
fi
gtk-update-icon-cache -f -t %p/share/icons/hicolor || :
+ gtk-update-icon-cache -f -t %p/share/icons/HighContrastLargePrint || :
+ gtk-update-icon-cache -f -t
%p/share/icons/HighContrastLargePrintInverse || :
+ gtk-update-icon-cache -f -t %p/share/icons/LowContrastLargePrint || :
<<
PostRmScript: <<
- . %p/bin/init.sh
if [ update != "$1" ]; then
scrollkeeper-update
fi
gtk-update-icon-cache -f -t %p/share/icons/hicolor || :
+ gtk-update-icon-cache -f -t %p/share/icons/HighContrastLargePrint || :
+ gtk-update-icon-cache -f -t
%p/share/icons/HighContrastLargePrintInverse || :
+ gtk-update-icon-cache -f -t %p/share/icons/LowContrastLargePrint || :
<<
ConfFiles: <<
%p/etc/gconf/schemas/epiphany.schemas
- %p/etc/gconf/schemas/epiphany-fonts.schemas
%p/etc/gconf/schemas/epiphany-lockdown.schemas
- %p/etc/gconf/schemas/epiphany-pango.schemas
<<
Splitoff: <<
- Package: %N2.26-dev
+ Package: %N2.28-dev
Depends: %N (= %v-%r)
BuildDependsOnly: true
Files: include lib/pkgconfig
@@ -182,8 +153,10 @@
DescPort: <<
Uses C++ in some low-level libs, so need g++ when linking against them
- Remove linux-specific linker flag from configure gecko tests.
- See: http://bugzilla.gnome.org/show_bug.cgi?id=387185
+ Not all supported X11 suppliers have .pc files. Remove from
+ PKG_CHECK_MODULES and instead pass as hardcoded variables.
+
+ Recent glib doesn't publish -lintl, so pass it directly.
<<
DescPackaging: <<
Made a dev split-off for potential epiphany-extensions
@@ -198,6 +171,9 @@
Ignore avahi-gobject that isn't yet in fink so build is
consistent if/when we do get it.
+
+ Rip out mozilla call (uses webkit now, not right path anyway).
+ See: https://bugzilla.gnome.org/show_bug.cgi?id=613423
<<
License: GPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Index: seahorse.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/seahorse.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- seahorse.info 28 Feb 2010 14:22:07 -0000 1.19
+++ seahorse.info 7 Apr 2010 13:55:53 -0000 1.20
@@ -1,80 +1,65 @@
Package: seahorse
-Version: 2.26.2
-Revision: 5
+Version: 2.28.1
+Revision: 2
-Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2
-Source-MD5: c5126bd7ddfda3317daa71c06f261034
+Source: mirror:gnome:sources/%n/2.28/%n-%v.tar.bz2
+Source-MD5: c49d4d9bcfe7620081df517ab939f67b
BuildDepends: <<
- atk1 (>= 1.26.0-1),
- avahi-dev,
- cairo (>= 1.8-1),
- dbus-dev (>= 1.2.1-1),
- expat1,
+ atk1 (>= 1.28.0-1),
+ avahi-dev (>= 0.6.25-3),
+ cairo (>= 1.8.8-3),
+ dbus-glib1.2-dev,
+ dbus1.3-dev,
+ dpkg-base-files,
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.8-2),
- gconf2-dev (>= 2.26.0-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
gettext-tools (>= 0.17),
- glib2-dev (>= 2.20.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gnome-doc-utils (>= 0.16.0-1),
- gnome-keyring-dev (>= 2.26.0-1),
- gnutls26 (>= 2.8.0-1),
+ gnome-doc-utils (>= 0.18.1-1),
+ gnome-keyring-dev (>= 2.28.0-1),
gpgme11 (>= 1.1.8-1),
- gtk+2-dev (>= 2.16.0-1),
- gtk-doc (>= 1.11-1),
+ gtk+2-dev (>= 2.18.0-1),
+ gtk-doc (>= 1.13-5),
intltool40,
- libavahi-glib1-dev,
- libgcrypt (>= 1.4.3-2),
- libgettext3-dev,
- libglade2 (>= 2.6.4-1),
+ libavahi-glib1-dev (>= 0.6.25-2),
+ libgettext8-dev,
libgpg-error,
- libiconv-dev,
- libpng3,
- libsoup2.4.1-ssl (>= 2.26.0-1),
- libtasn1-3 (>= 2.2-2),
- libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.17-1),
- pango1-xft2-ft219-dev (>= 1.24.0-1),
- pixman (>= 0.14.0-1),
+ libsoup2.4.1-ssl (>= 2.28.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
- x11-dev,
- xft2-dev
+ x11-dev
<<
Depends: <<
%N1-shlibs (>= %v-%r),
- atk1-shlibs (>= 1.26.0-1),
- cairo-shlibs (>= 1.8-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
dbus (>= 1.2.1-1),
- dbus-shlibs (>= 1.2.1-1),
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- gconf2 (>= 2.26.0-1),
- glib2-shlibs (>= 2.20.0-1),
- glitz-shlibs,
- gnome-keyring-shlibs (>= 2.26.0-1),
+ dbus-glib1.2-shlibs,
+ dbus1.3-shlibs,
+ 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),
+ gnome-keyring-shlibs (>= 2.28.0-1),
gnupg,
- gnutls26-shlibs (>= 2.8.0-1),
gpgme11-shlibs (>= 1.1.8-1),
- gtk+2 (>= 2.16.0-1),
- gtk+2-shlibs (>= 2.16.0-1),
- libavahi-client3-shlibs,
- libavahi-common3-shlibs,
- libavahi-glib1-shlibs,
- libgcrypt-shlibs (>= 1.4.3-2),
- libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.4-1),
+ gtk+2 (>= 2.18.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ libavahi-client3-shlibs (>= 0.6.25-3),
+ libavahi-common3-shlibs (>= 0.6.25-3),
+ libavahi-glib1-shlibs (>= 0.6.25-2),
+ libgettext8-shlibs,
libgpg-error-shlibs,
- libiconv,
- libpng3-shlibs,
- libsoup2.4.1-ssl-shlibs (>= 2.26.0-1),
- libtasn1-3-shlibs (>= 2.2-2),
- libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.17-1),
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
+ libsoup2.4.1-ssl-shlibs (>= 2.28.0-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
rarian-compat,
shared-mime-info,
x11
@@ -82,18 +67,19 @@
Replaces: %N1-dev (<< 2.20.3-2), %N1-shlibs (<< 2.20.3-2)
PatchFile: %n.patch
-PatchFile-MD5: 232bf826ced916fd1373d1f0e5737ebb
+PatchFile-MD5: ed36bf72fb9aebcf3e568726bfdfc884
PatchScript: <<
%{default_script}
- perl -pi -e 's/(2.10.0 gconf-2.0)/\1 dbus-glib-1/g' configure
+ perl -pi -e 's/-version-info/-no-undefined -version-info/'
libcryptui/Makefile.in
<<
-ConfigureParams: --mandir=%p/share/man --disable-schemas-install
--disable-scrollkeeper --disable-dependency-tracking --disable-static
--disable-ldap --disable-libnotify --disable-update-mime-database
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ConfigureParams: --mandir=%p/share/man --disable-schemas-install
--disable-scrollkeeper --enable-dependency-tracking --disable-static
--disable-ldap --disable-libnotify --disable-update-mime-database
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--enable-gtk-doc
SetCPPFLAGS: -Wall -fno-common
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
./configure %c
make
+ fink-package-precedence --prohibit-bdep %n1-dev .
<<
InstallScript: make install DESTDIR=%d
@@ -101,7 +87,6 @@
ConfFiles: %p/etc/gconf/schemas/seahorse.schemas
PostInstScript: <<
- . %p/bin/init.sh
if [ configure = "$1" ]; then
scrollkeeper-update -q
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -111,7 +96,6 @@
%p/bin/update-mime-database %p/share/mime || :
<<
PostRmScript: <<
- . %p/bin/init.sh
if [ remove != "$1" ]; then
scrollkeeper-update -q
fi
@@ -122,23 +106,17 @@
SplitOff: <<
Package: %N1-shlibs
Depends: <<
- atk1-shlibs (>= 1.26.0-1),
- cairo-shlibs (>= 1.8-1),
- dbus-shlibs (>= 1.2.1-1),
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- gconf2-shlibs (>= 2.26.0-1),
- glib2-shlibs (>= 2.20.0-1),
- glitz-shlibs,
- gtk+2-shlibs (>= 2.16.0-1),
- libgettext3-shlibs,
- libiconv,
- libpng3-shlibs,
- orbit2-shlibs (>= 2.14.17-1),
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
- x11
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ dbus (>= 1.2.1-1),
+ dbus-glib1.2-shlibs,
+ dbus1.3-shlibs,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4)
<<
Files: lib/libcryptui.0*.dylib
Shlibs: %p/lib/libcryptui.0.dylib 1.0.0 %n (>= 1.0-1)
@@ -166,10 +144,6 @@
DescPort: <<
Recent glib doesn't publish -lintl, so pass it directly.
- libcryptui directly uses dbus-glib, needs to pass flags for it
- directly, not rely on dependencies' .pc to publish/inherit
- See: https://bugzilla.gnome.org/show_bug.cgi?id=596691
-
Hardcode -L for -lSM since -lSM is hardcoded (no x11 AC vars)
See: https://bugzilla.gnome.org/show_bug.cgi?id=611399
<<
--- NEW FILE: epiphany.patch ---
diff -Nurd -x'*~' epiphany-2.28.2.orig/configure epiphany-2.28.2/configure
--- epiphany-2.28.2.orig/configure 2009-12-16 06:00:35.000000000 -0500
+++ epiphany-2.28.2/configure 2010-03-20 11:56:51.000000000 -0400
@@ -14670,9 +14670,6 @@
gio-unix-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
gtk+-unix-print-2.0 >= \$GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= \$LIBXML_REQUIRED
libxslt >= \$LIBXSLT_REQUIRED
gconf-2.0
@@ -14689,9 +14686,6 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-unix-print-2.0 >= $GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= $LIBXML_REQUIRED
libxslt >= $LIBXSLT_REQUIRED
gconf-2.0
@@ -14711,9 +14705,6 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-unix-print-2.0 >= $GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= $LIBXML_REQUIRED
libxslt >= $LIBXSLT_REQUIRED
gconf-2.0
@@ -14740,9 +14731,6 @@
gio-unix-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
gtk+-unix-print-2.0 >= \$GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= \$LIBXML_REQUIRED
libxslt >= \$LIBXSLT_REQUIRED
gconf-2.0
@@ -14759,9 +14747,6 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-unix-print-2.0 >= $GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= $LIBXML_REQUIRED
libxslt >= $LIBXSLT_REQUIRED
gconf-2.0
@@ -14781,9 +14766,6 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-unix-print-2.0 >= $GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= $LIBXML_REQUIRED
libxslt >= $LIBXSLT_REQUIRED
gconf-2.0
@@ -14817,9 +14799,6 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-unix-print-2.0 >= $GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= $LIBXML_REQUIRED
libxslt >= $LIBXSLT_REQUIRED
gconf-2.0
@@ -14837,9 +14816,6 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-unix-print-2.0 >= $GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= $LIBXML_REQUIRED
libxslt >= $LIBXSLT_REQUIRED
gconf-2.0
@@ -14860,9 +14836,6 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-unix-print-2.0 >= $GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= $LIBXML_REQUIRED
libxslt >= $LIBXSLT_REQUIRED
gconf-2.0
@@ -14889,9 +14862,6 @@
gio-unix-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-unix-print-2.0 >= $GTK_REQUIRED
- ice
- x11
- sm
libxml-2.0 >= $LIBXML_REQUIRED
libxslt >= $LIBXSLT_REQUIRED
gconf-2.0
@@ -14944,6 +14914,9 @@
:
fi
+DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS $X11ISH_CFLAGS"
+DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS $X11ISH_LIBS"
+
# ****
# DBUS
# ****
diff -Nurd -x'*~' epiphany-2.28.2.orig/embed/ephy-embed-single.c
epiphany-2.28.2/embed/ephy-embed-single.c
--- epiphany-2.28.2.orig/embed/ephy-embed-single.c 2009-12-16
05:26:26.000000000 -0500
+++ epiphany-2.28.2/embed/ephy-embed-single.c 2010-03-20 13:40:21.000000000
-0400
@@ -21,7 +21,6 @@
#include "config.h"
#define
LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
-#define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config"
#include "ephy-embed-single.h"
#include "ephy-embed-prefs.h"
@@ -334,10 +333,6 @@
SoupCookieJar *jar;
char *filename;
- /* Initialise nspluginwrapper's plugins if available */
- if (g_file_test (NSPLUGINWRAPPER_SETUP, G_FILE_TEST_EXISTS) != FALSE)
- g_spawn_command_line_sync (NSPLUGINWRAPPER_SETUP, NULL, NULL, NULL, NULL);
-
ephy_embed_prefs_init ();
session = webkit_get_default_session ();
diff -Nurd -x'*~' epiphany-2.28.2.orig/lib/Makefile.in
epiphany-2.28.2/lib/Makefile.in
--- epiphany-2.28.2.orig/lib/Makefile.in 2009-12-16 06:00:33.000000000
-0500
+++ epiphany-2.28.2/lib/Makefile.in 2010-03-20 12:32:27.000000000 -0400
@@ -451,7 +451,7 @@
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
$(am__append_2)
-libephymisc_la_LIBADD = -lm $(am__append_3)
+libephymisc_la_LIBADD = -lm $(am__append_3) $(INTLLIBS)
BUILT_SOURCES = \
ephy-lib-type-builtins.c \
ephy-lib-type-builtins.h \
diff -Nurd -x'*~' epiphany-2.28.2.orig/lib/widgets/Makefile.in
epiphany-2.28.2/lib/widgets/Makefile.in
--- epiphany-2.28.2.orig/lib/widgets/Makefile.in 2009-12-16
06:00:33.000000000 -0500
+++ epiphany-2.28.2/lib/widgets/Makefile.in 2010-03-20 12:50:45.000000000
-0400
@@ -50,7 +50,7 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libephywidgets_la_LIBADD =
+libephywidgets_la_LIBADD = $(INTLLIBS)
am_libephywidgets_la_OBJECTS = \
libephywidgets_la-ephy-location-entry.lo \
libephywidgets_la-ephy-node-view.lo \
Index: seahorse.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/seahorse.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- seahorse.patch 28 Feb 2010 12:07:38 -0000 1.5
+++ seahorse.patch 7 Apr 2010 13:55:53 -0000 1.6
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' seahorse-2.26.2.orig/libegg/Makefile.in
seahorse-2.26.2/libegg/Makefile.in
---- seahorse-2.26.2.orig/libegg/Makefile.in 2009-05-20 12:50:06.000000000
-0400
-+++ seahorse-2.26.2/libegg/Makefile.in 2010-02-28 06:42:18.000000000 -0500
-@@ -301,7 +301,7 @@
+diff -Nurd -x'*~' seahorse-2.28.1.orig/libegg/Makefile.in
seahorse-2.28.1/libegg/Makefile.in
+--- seahorse-2.28.1.orig/libegg/Makefile.in 2009-10-17 19:15:31.000000000
-0400
++++ seahorse-2.28.1/libegg/Makefile.in 2010-02-28 09:22:59.000000000 -0500
+@@ -323,7 +323,7 @@
libeggsmclient_la_LIBADD = $(EGG_SMCLIENT_LIBS) \
$(GTK_LIBS) \
@@ -10,15 +10,15 @@
libeggsmclient_la_SOURCES = eggsmclient.c \
eggsmclient.h \
-diff -Nurd -x'*~' seahorse-2.26.2.orig/libseahorse/Makefile.in
seahorse-2.26.2/libseahorse/Makefile.in
---- seahorse-2.26.2.orig/libseahorse/Makefile.in 2009-05-20
12:50:06.000000000 -0400
-+++ seahorse-2.26.2/libseahorse/Makefile.in 2010-02-28 06:27:44.000000000
-0500
-@@ -365,7 +365,7 @@
+diff -Nurd -x'*~' seahorse-2.28.1.orig/libseahorse/Makefile.in
seahorse-2.28.1/libseahorse/Makefile.in
+--- seahorse-2.28.1.orig/libseahorse/Makefile.in 2009-10-17
19:15:31.000000000 -0400
++++ seahorse-2.28.1/libseahorse/Makefile.in 2010-02-28 07:54:03.000000000
-0500
+@@ -401,7 +401,7 @@
libseahorse_la_LIBADD = \
$(top_builddir)/common/libseahorse-common.la \
- $(top_builddir)/libcryptui/libcryptui.la
+ $(top_builddir)/libcryptui/libcryptui.la $(INTLLIBS)
- glade_DATA = \
- seahorse-prefs.glade \
+ ui_DATA = \
+ seahorse-prefs.xml \
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
