Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27321
Modified Files:
firefox2.info firefox2.patch
Log Message:
overcome now private privates
Index: firefox2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox2.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- firefox2.info 24 Sep 2008 14:17:00 -0000 1.10
+++ firefox2.info 16 Oct 2008 03:08:29 -0000 1.11
@@ -1,6 +1,6 @@
Package: firefox2
Version: 2.0.0.17
-Revision: 1
+Revision: 5
Description: Lightweight browser from mozilla.org
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]>
@@ -9,12 +9,11 @@
atk1-shlibs (>= 1.20.0-1),
cairo-shlibs (>= 1.6-1),
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-2),
+ freetype219-shlibs (>= 2.3.7-7),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libgettext3-shlibs,
- libiconv,
- pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+ pango1-xft2-ft219-shlibs (>= 1.22.0-3),
x11
<<
BuildConflicts: <<
@@ -27,18 +26,17 @@
cairo (>= 1.6-1),
fink (>= 0.28-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219-default (>= 2.3.7-2),
+ freetype219 (>= 2.3.7-7),
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
libgettext3-dev,
- libiconv-dev,
libidl2 (>= 0.8.9-1),
libjpeg,
libpng3 (>= 1.2.8-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.22.0-3),
pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
+ pkgconfig (>= 0.23-1),
x11-dev,
xft2-dev
<<
@@ -76,6 +74,7 @@
#NoSetCPPFLAGS: true
#SetCC: gcc -I%p/lib/freetype219/include -I%p/lib/freetype219/include/freetype2
#SetCXX: g++ -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
+SetLIBS: -L/usr/X11R6/lib -lXft -lXrender -lfontconfig -lfreetype -lz -lX11
ConfigureParams: <<
--disable-dependency-tracking \
--enable-system-cairo \
@@ -85,7 +84,7 @@
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
-export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig"
+export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig"
./configure %c
/usr/bin/make -w \
@@ -129,9 +128,9 @@
Package: %N-dev
Depends: <<
%N-shlibs (= %v-%r),
+ freetype219-shlibs (>= 2.3.7-7),
glib2-shlibs (>= 2.14.0-1),
libgettext3-shlibs,
- libiconv,
libidl2-shlibs (>= 0.8.9-1)
<<
Conflicts: <<
@@ -162,14 +161,13 @@
atk1-shlibs (>= 1.20.0-1),
cairo-shlibs (>= 1.6-1),
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-2),
+ freetype219-shlibs (>= 2.3.7-7),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libgettext3-shlibs,
- libiconv,
libjpeg-shlibs,
libpng3-shlibs (>= 1.2.8-1),
- pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+ pango1-xft2-ft219-shlibs (>= 1.22.0-3),
x11-shlibs
<<
Description: Lightweight browser from mozilla.org
@@ -214,9 +212,6 @@
firefox
<<
DescPackaging: <<
-Changed package name from firefox to firefox1.5 because libxlibrgb.dylib
-was removed in the 1.0.x to 1.5.x transition.
-
Moved chrome* components* greprefs* res* to -shlibs because gecko needs
those files when loaded by a third party.
<<
@@ -224,9 +219,6 @@
GTK+2 build of the Mozilla Firefox browser for Mac OS X/X11. Compiled
without built-in support for GNOME (except for an app launcher button).
-Patch includes fix for bug #257773, which allows building on OS X/X11
-w/out the need for setting missing LDFLAGS.
-
ac_add_options --enable-macos-target=foo in patch file (.mozconfig) is
for the minimum OS version that this will compile in, usu. a lower version
than the Fink tree the file is in.
Index: firefox2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox2.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- firefox2.patch 24 Sep 2008 14:17:00 -0000 1.6
+++ firefox2.patch 16 Oct 2008 03:08:29 -0000 1.7
@@ -111,23 +111,6 @@
STRIP="$STRIP -x -S"
_PLATFORM_DEFAULT_TOOLKIT='mac'
MOZ_ENABLE_POSTSCRIPT=
-@@ -13560,14 +13560,14 @@
-
- echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
- echo "configure:13563: checking MOZ_XFT_CFLAGS" >&5
-- MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
-+ MOZ_XFT_CFLAGS="`$PKG_CONFIG --cflags "freetype2"` `$PKG_CONFIG
--cflags "xft"`"
- echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
-
- echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
- echo "configure:13568: checking MOZ_XFT_LIBS" >&5
- ## don't use --libs since that can do evil things like add
- ## -Wl,--export-dynamic
-- MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG
--libs-only-l \"xft\"`"
-+ MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"freetype2\"`
`$PKG_CONFIG --libs-only-l \"freetype2\"` `$PKG_CONFIG --libs-only-L \"xft\"`
`$PKG_CONFIG --libs-only-l \"xft\"`"
- echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
- else
- MOZ_XFT_CFLAGS=""
diff -ruN mozilla-orig/fink/applications/firefox.desktop
mozilla/fink/applications/firefox.desktop
--- mozilla-orig/fink/applications/firefox.desktop 1969-12-31
19:00:00.000000000 -0500
+++ mozilla/fink/applications/firefox.desktop 2007-12-10 13:06:44.000000000
-0500
@@ -192,7 +175,7 @@
- ;;
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
- echo "configure:4964: checking for dlopen in -ldl" >&5
+ echo "configure:4972: checking for dlopen in -ldl" >&5
diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h
mozilla/nsprpub/pr/include/md/_darwin.h
--- mozilla-orig/nsprpub/pr/include/md/_darwin.h 2006-12-06
13:02:35.000000000 -0500
+++ mozilla/nsprpub/pr/include/md/_darwin.h 2007-12-10 13:06:44.000000000
-0500
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
