Update of /cvsroot/fink/dists/10.4/stable/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17609/crypto/finkinfo
Modified Files:
firefox2.info firefox2.patch
Log Message:
sync some build-fixes from unstable
Index: firefox2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/crypto/finkinfo/firefox2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- firefox2.info 16 Jul 2008 03:00:22 -0000 1.1
+++ firefox2.info 23 Jul 2008 03:20:34 -0000 1.2
@@ -40,7 +40,8 @@
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
x11-dev,
- xft2-dev
+ xft2-dev,
+ xmkmf
<<
Conflicts: <<
firefox,
@@ -80,7 +81,7 @@
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
-export PATH="%p/lib/freetype219/bin:$PATH"
+export PATH="%p/lib/freetype219/bin:%p/lib/xmkmf/bin:$PATH"
export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig"
export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
Index: firefox2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/crypto/finkinfo/firefox2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- firefox2.patch 16 Jul 2008 03:00:22 -0000 1.1
+++ firefox2.patch 23 Jul 2008 03:20:34 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
---- mozilla-orig/.mozconfig 1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/.mozconfig 2007-12-10 13:06:44.000000000 -0500
+diff -Nurd mozilla/.mozconfig mozilla-new/.mozconfig
+--- mozilla/.mozconfig 1969-12-31 19:00:00.000000000 -0500
++++ mozilla-new/.mozconfig 2008-07-22 15:53:50.000000000 -0400
@@ -0,0 +1,42 @@
+# sh
+# Build configuration script
@@ -44,9 +44,9 @@
+
+ac_add_options [EMAIL PROTECTED]@/lib/freetype219
+ac_add_options [EMAIL PROTECTED]@/lib/freetype219/bin
-diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html
mozilla/browser/locales/en-US/profile/bookmarks.html
---- mozilla-orig/browser/locales/en-US/profile/bookmarks.html 2006-08-19
02:04:11.000000000 -0400
-+++ mozilla/browser/locales/en-US/profile/bookmarks.html 2007-12-10
13:06:44.000000000 -0500
+diff -Nurd mozilla/browser/locales/en-US/profile/bookmarks.html
mozilla-new/browser/locales/en-US/profile/bookmarks.html
+--- mozilla/browser/locales/en-US/profile/bookmarks.html 2006-08-19
02:04:11.000000000 -0400
++++ mozilla-new/browser/locales/en-US/profile/bookmarks.html 2008-07-22
15:53:50.000000000 -0400
@@ -14,6 +14,7 @@
<DL><p>
<DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/central/";
ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
ID="rdf:#$GvPhC3">Getting Started</A>
@@ -55,9 +55,9 @@
</DL><p>
<HR>
<DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3>
-diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
---- mozilla-orig/config/autoconf.mk.in 2006-09-14 14:07:03.000000000 -0400
-+++ mozilla/config/autoconf.mk.in 2007-12-10 13:06:44.000000000 -0500
+diff -Nurd mozilla/config/autoconf.mk.in mozilla-new/config/autoconf.mk.in
+--- mozilla/config/autoconf.mk.in 2006-09-14 14:07:03.000000000 -0400
++++ mozilla-new/config/autoconf.mk.in 2008-07-22 15:53:51.000000000 -0400
@@ -57,14 +57,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -77,9 +77,9 @@
mrelibdir = $(mredir)/lib
DIST = $(DEPTH)/dist
-diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
---- mozilla-orig/config/config.mk 2007-02-01 17:31:07.000000000 -0500
-+++ mozilla/config/config.mk 2007-12-10 13:06:44.000000000 -0500
+diff -Nurd mozilla/config/config.mk mozilla-new/config/config.mk
+--- mozilla/config/config.mk 2007-11-23 16:12:26.000000000 -0500
++++ mozilla-new/config/config.mk 2008-07-22 15:53:51.000000000 -0400
@@ -665,7 +665,7 @@
ifeq ($(OS_ARCH),Darwin)
ifdef USE_PREBINDING
@@ -89,9 +89,18 @@
endif # USE_PREBINDING
ifdef NEXT_ROOT
export NEXT_ROOT
-diff -ruN mozilla-orig/configure mozilla/configure
---- mozilla-orig/configure 2007-11-08 14:22:51.000000000 -0500
-+++ mozilla/configure 2007-12-10 13:06:44.000000000 -0500
+diff -Nurd mozilla/configure mozilla-new/configure
+--- mozilla/configure 2007-12-18 16:42:55.000000000 -0500
++++ mozilla-new/configure 2008-07-22 15:54:29.000000000 -0400
+@@ -3914,7 +3914,7 @@
+ case "$PBBUILD" in
+ *xcodebuild*)
+
+- XCODEBUILD_VERSION=`$PBBUILD -version 2>/dev/null | sed -e
's/.*DevToolsCore-\([0-9]*\).*/\1/'`
++ XCODEBUILD_VERSION=`$PBBUILD -version 2>/dev/null | grep DevToolsCore
| sed -e 's/.*DevToolsCore-\([0-9]*\).*/\1/'`
+
+ if test -n "$XCODEBUILD_VERSION" && test "$XCODEBUILD_VERSION" -ge
620 ; then
+ HAS_XCODE_2_1=1;
@@ -5736,7 +5736,7 @@
;;
@@ -115,7 +124,7 @@
STRIP="$STRIP -x -S"
_PLATFORM_DEFAULT_TOOLKIT='mac'
MOZ_ENABLE_POSTSCRIPT=
-@@ -13579,14 +13579,14 @@
+@@ -13560,14 +13560,14 @@
echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
echo "configure:13563: checking MOZ_XFT_CFLAGS" >&5
@@ -132,9 +141,9 @@
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
+diff -Nurd mozilla/fink/applications/firefox.desktop
mozilla-new/fink/applications/firefox.desktop
+--- mozilla/fink/applications/firefox.desktop 1969-12-31 19:00:00.000000000
-0500
++++ mozilla-new/fink/applications/firefox.desktop 2008-07-22
15:53:51.000000000 -0400
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -146,9 +155,9 @@
+Type=Application
+Categories=Application;Network
+StartupNotify=true
-diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js
---- mozilla-orig/fink/fink.js 1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/fink/fink.js 2007-12-10 13:06:44.000000000 -0500
+diff -Nurd mozilla/fink/fink.js mozilla-new/fink/fink.js
+--- mozilla/fink/fink.js 1969-12-31 19:00:00.000000000 -0500
++++ mozilla-new/fink/fink.js 2008-07-22 15:53:51.000000000 -0400
@@ -0,0 +1,25 @@
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
+
@@ -175,9 +184,9 @@
+
+// AA with Bitmap scaling.
+//pref("font.scale.aa_bitmap.enable", true);
-diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
---- mozilla-orig/nsprpub/configure 2007-04-27 16:01:01.000000000 -0400
-+++ mozilla/nsprpub/configure 2007-12-10 13:08:06.000000000 -0500
+diff -Nurd mozilla/nsprpub/configure mozilla-new/nsprpub/configure
+--- mozilla/nsprpub/configure 2007-10-31 14:07:38.000000000 -0400
++++ mozilla-new/nsprpub/configure 2008-07-22 15:53:51.000000000 -0400
@@ -3338,9 +3338,6 @@
# Add Mac OS X support for loading CFM & CFBundle plugins
@@ -188,7 +197,7 @@
OS_TARGET=MacOSX
-@@ -4956,8 +4953,6 @@
+@@ -4964,8 +4961,6 @@
case $target in
@@ -196,10 +205,10 @@
- ;;
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
- echo "configure:4964: 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
+ echo "configure:4972: checking for dlopen in -ldl" >&5
+diff -Nurd mozilla/nsprpub/pr/include/md/_darwin.h
mozilla-new/nsprpub/pr/include/md/_darwin.h
+--- mozilla/nsprpub/pr/include/md/_darwin.h 2006-12-06 13:02:35.000000000
-0500
++++ mozilla-new/nsprpub/pr/include/md/_darwin.h 2008-07-22
15:53:51.000000000 -0400
@@ -62,7 +62,8 @@
#undef HAVE_STACK_GROWING_UP
@@ -210,9 +219,9 @@
#define _PR_HAVE_SOCKADDR_LEN
#define _PR_STAT_HAS_ST_ATIMESPEC
#define _PR_HAVE_LARGE_OFF_T
-diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in
mozilla/nsprpub/pr/src/Makefile.in
---- mozilla-orig/nsprpub/pr/src/Makefile.in 2006-10-18 20:39:28.000000000
-0400
-+++ mozilla/nsprpub/pr/src/Makefile.in 2007-12-10 13:06:44.000000000 -0500
+diff -Nurd mozilla/nsprpub/pr/src/Makefile.in
mozilla-new/nsprpub/pr/src/Makefile.in
+--- mozilla/nsprpub/pr/src/Makefile.in 2006-10-18 20:39:28.000000000 -0400
++++ mozilla-new/nsprpub/pr/src/Makefile.in 2008-07-22 15:53:51.000000000
-0400
@@ -204,9 +204,9 @@
endif
endif
@@ -226,9 +235,9 @@
ifdef GC_LEAK_DETECTOR
EXTRA_LIBS = -L$(dist_libdir) -lboehm
-diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c
mozilla/nsprpub/pr/src/linking/prlink.c
---- mozilla-orig/nsprpub/pr/src/linking/prlink.c 2006-10-06
19:36:22.000000000 -0400
-+++ mozilla/nsprpub/pr/src/linking/prlink.c 2007-12-10 13:06:44.000000000
-0500
+diff -Nurd mozilla/nsprpub/pr/src/linking/prlink.c
mozilla-new/nsprpub/pr/src/linking/prlink.c
+--- mozilla/nsprpub/pr/src/linking/prlink.c 2006-10-06 19:36:22.000000000
-0400
++++ mozilla-new/nsprpub/pr/src/linking/prlink.c 2008-07-22
15:53:51.000000000 -0400
@@ -158,7 +158,8 @@
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|| defined(WIN16) || defined(XP_OS2) \
-------------------------------------------------------------------------
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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
