Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12447/crypto/finkinfo
Modified Files:
Tag: pangocairo-branch
epiphany.info epiphany.patch
Log Message:
more updates -- completely untested, yay!
Index: epiphany.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/epiphany.info,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -d -r1.3.2.10 -r1.3.2.11
--- epiphany.info 22 Dec 2006 05:01:59 -0000 1.3.2.10
+++ epiphany.info 9 Jan 2007 04:04:33 -0000 1.3.2.11
@@ -1,12 +1,13 @@
Package: epiphany
-Version: 1.6.5
-Revision: 1002
+Version: 2.16.2
+Revision: 1001
Depends: <<
audiofile-shlibs (>= 0.2-10),
default-icon-theme,
esound-shlibs,
+ firefox1.5,
gconf2 (>= 2.16.0-1),
glib2-shlibs (>= 2.12.0-1),
gnome-base,
@@ -29,9 +30,6 @@
libjpeg-shlibs (>= 6b-16),
libxml2-shlibs (>= 2.6.17-1),
libxslt-shlibs (>= 1.1.7-1),
- mozilla-browser (>= 1.7.5-1102),
- mozilla-psm (>= 1.7.5-1102),
- mozilla-shlibs (>= 1.7.5-1102),
orbit2-shlibs (>= 2.10.3-9),
pango1-xft2-ft219-shlibs (>= 1.14.9-1),
popt-shlibs,
@@ -46,6 +44,7 @@
cairo (>= 1.2-1),
dbus-dev (>= 1.0-1),
esound,
+ firefox1.5-shlibs,
fontconfig2-dev (>= 2.3.2-13),
freetype219,
gconf2-dev (>= 2.16.0-1),
@@ -58,6 +57,7 @@
gnome-vfs2-unified-dev (>= 1:2.16.0-1),
gtk+2-dev (>= 2.10.0-1),
intltool,
+ iso-codes,
libart2 (>= 2.3.16-2),
libbonobo2-dev (>= 2.16.0-1),
libbonoboui2-dev (>= 2.16.0-1),
@@ -73,7 +73,6 @@
libjpeg (>= 6b-16),
libxml2 (>= 2.6.17-1),
libxslt (>= 1.1.7-1),
- mozilla-dev (>= 1.7.5-1102),
orbit2-dev (>= 2.10.3-9),
pango1-xft2-ft219-dev (>= 1.14.9-1),
pkgconfig (>= 0.21-1),
@@ -83,23 +82,22 @@
xft2-dev
<<
Recommends: yelp, gedit
-Source: mirror:gnome:sources/%n/1.6/%n-%v.tar.bz2
-Source-MD5: ac87745115e41f4d9488e80c8684c207
+Source: mirror:gnome:sources/%n/2.16/%n-%v.tar.bz2
+Source-MD5: 6d4ca4c3c1fb52b432ad3f5006866b6b
Patch: %n.patch
-PatchScript: perl -pi.bak -e "s/-scrollkeeper-update/#-scrollkeeper-update/g"
help/*/Makefile.in
GCC: 4.0
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-schemas-install --enable-static --with-mozilla=mozilla
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
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-scrollkeeper --disable-schemas-install --enable-static
--with-gecko=firefox
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
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -Os
CompileScript: <<
#!/bin/sh -ev
- ./configure %c
- perl -pi.bak -e 's,-L%p/lib/freetype219/lib,,g;
-s,-I%p/lib/freetype219/include/freetype2,,g;
s,-I%p/lib/freetype219/include,,g; s,-L%p/lib/mozilla/freetype2/lib,,g;
s,-I/usr/X11R6/include/freetype2,,g; s,-L%p/lib/freetype2,,g;
s,-I%p/lib/freetype2/include/freetype2,,g; s,-I%p/lib/freetype2/include,,g;
s,-lfreetype,,g' config.status
- make
+
+ ./configure %c
+ make CCLD=g++
<<
-InstallScript: make install DESTDIR=%d
+InstallScript: make -j1 install CCLD=g++ DESTDIR="%d"
DocFiles: AUTHORS COPYING* ChangeLog* po/ChangeLog:ChangeLog.po HACKING
MAINTAINERS NEWS README TODO
PostInstScript: <<
@@ -107,7 +105,9 @@
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
<<
PostRmScript: <<
@@ -118,21 +118,23 @@
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: %N1.6-dev
+ Package: %N-dev
Depends: %N (= %v-%r)
- BuildDependsOnly: True
+ BuildDependsOnly: true
Files: include lib/pkgconfig
DocFiles: AUTHORS COPYING* ChangeLog* po/ChangeLog:ChangeLog.po HACKING
MAINTAINERS NEWS README TODO
- Description: Files for writing extensions for epiphany-1.6
+ Description: Files for writing extensions for epiphany
<<
Description: GNOME light-weight web browser
DescDetail: <<
-Epiphany is a GNOME web browser based on the mozilla rendering engine.
+Epiphany is a GNOME web browser based on the gecko rendering engine.
The name meaning:
"An intuitive grasp of reality through something (as an event) usually
simple and striking"
@@ -149,14 +151,6 @@
<<
DescPort: <<
dpkg scripts for scrollkeeper and gconf2
-
- Patching Makefile.in in help directories to disable scrollkeeper-update
- at build time
-
- Patching configure.status to remove fake dependancies on freetype
-
- Modified by Michele Garoche <[EMAIL PROTECTED]>
-
Fix malformed gconf schema.
<<
DescPackaging: <<
Index: epiphany.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/epiphany.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- epiphany.patch 4 Feb 2006 03:21:45 -0000 1.1
+++ epiphany.patch 9 Jan 2007 04:04:33 -0000 1.1.2.1
@@ -1,11 +1,95 @@
-diff -Nurd -x'*~' epiphany-1.6.5.orig/data/epiphany.schemas.in
epiphany-1.6.5/data/epiphany.schemas.in
---- epiphany-1.6.5.orig/data/epiphany.schemas.in 2005-07-24
07:33:18.000000000 -0400
-+++ epiphany-1.6.5/data/epiphany.schemas.in 2005-11-04 02:33:50.000000000
-0500
+diff -uNr epiphany-2.16.2/configure epiphany-2.16.2-new/configure
+--- epiphany-2.16.2/configure 2006-11-19 14:50:58.000000000 -0500
++++ epiphany-2.16.2-new/configure 2007-01-08 21:50:36.000000000 -0500
+@@ -25028,7 +25028,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS=""
+@@ -25197,7 +25197,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS=""
+@@ -25373,7 +25373,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS="pipnss"
+@@ -25674,7 +25674,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS="windowwatcher"
+@@ -25899,7 +25899,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS="docshell"
+@@ -26124,7 +26124,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS="necko"
+@@ -26349,7 +26349,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS="xpcom"
+@@ -26573,7 +26573,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS="spellchecker"
+@@ -26820,7 +26820,7 @@
+ _SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS "
+ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+
+ _GECKO_DISPATCH_INCLUDEDIRS=""
+diff -uNr epiphany-2.16.2/data/epiphany.schemas.in
epiphany-2.16.2-new/data/epiphany.schemas.in
+--- epiphany-2.16.2/data/epiphany.schemas.in 2006-11-19 14:49:45.000000000
-0500
++++ epiphany-2.16.2-new/data/epiphany.schemas.in 2007-01-08
21:23:32.000000000 -0500
@@ -382,6 +382,7 @@
- <owner>epiphany</owner>
- <type>int</type>
- <default>0</default>
-+ <locale name="C"/>
- </schema>
<schema>
- <key>/schemas/apps/epiphany/dialogs/print_file</key>
+ <key>/schemas/apps/epiphany/web/autodetect_encoding</key>
+ <applyto>/apps/epiphany/web/autodetect_encoding</applyto>
++ <locale name="C"/>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <locale name="C">
-------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
