Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8944
Modified Files: firefox2.info firefox2.patch Log Message: upgrade to new 2.0.0.16 and work around xmkmf loss Index: firefox2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox2.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- firefox2.info 22 Jul 2008 20:17:52 -0000 1.8 +++ firefox2.info 18 Aug 2008 13:52:14 -0000 1.9 @@ -1,6 +1,6 @@ Package: firefox2 -Version: 2.0.0.14 -Revision: 1002 +Version: 2.0.0.16 +Revision: 2 Description: Lightweight browser from mozilla.org License: OSI-Approved Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]> @@ -40,8 +40,7 @@ pixman (>= 0.10.0-1), pkgconfig (>= 0.21-1), x11-dev, - xft2-dev, - xmkmf + xft2-dev << Conflicts: << firefox, @@ -55,7 +54,7 @@ << Source: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%v/source/firefox-%v-source.tar.bz2 SourceDirectory: mozilla -Source-MD5: 9e9c13ba7b81f93f2fa10c6f256ee31e +Source-MD5: 90e0b7996a14fdbe6d4e6e4d87980647 PatchScript: << /usr/bin/sed 's|@PREFIX@|%p|g' <%a/%n.patch | /usr/bin/patch -p1 ### hardcode paths inside dylibs so that programs linking to them can see them @@ -77,11 +76,16 @@ #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 -ConfigureParams: --disable-dependency-tracking --enable-system-cairo +ConfigureParams: << + --disable-dependency-tracking \ + --enable-system-cairo \ + --x-includes=/usr/X11R6/include \ + --x-libraries=/usr/X11R6/lib +<< GCC: 4.0 CompileScript: << #!/bin/sh -ev -export PATH="%p/lib/freetype219/bin:%p/lib/xmkmf/bin:$PATH" +export PATH="%p/lib/freetype219/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/unstable/crypto/finkinfo/firefox2.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- firefox2.patch 22 Jul 2008 20:17:52 -0000 1.4 +++ firefox2.patch 18 Aug 2008 13:52:14 -0000 1.5 @@ -1,6 +1,6 @@ -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 +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 @@ -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 -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 +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 @@ -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 -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 +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 @@ -57,14 +57,14 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -77,9 +77,9 @@ mrelibdir = $(mredir)/lib DIST = $(DEPTH)/dist -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 +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 @@ -665,7 +665,7 @@ ifeq ($(OS_ARCH),Darwin) ifdef USE_PREBINDING @@ -89,18 +89,9 @@ endif # USE_PREBINDING ifdef NEXT_ROOT export NEXT_ROOT -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; +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 @@ -5736,7 +5736,7 @@ ;; @@ -141,9 +132,9 @@ echo "$ac_t""$MOZ_XFT_LIBS" 1>&6 else MOZ_XFT_CFLAGS="" -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 +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 @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 @@ -155,9 +146,9 @@ +Type=Application +Categories=Application;Network +StartupNotify=true -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 +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 @@ -0,0 +1,25 @@ +pref("general.useragent.extra.vendorComment", "Fink Community Edition"); + @@ -184,9 +175,9 @@ + +// AA with Bitmap scaling. +//pref("font.scale.aa_bitmap.enable", true); -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 +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 @@ -3338,9 +3338,6 @@ # Add Mac OS X support for loading CFM & CFBundle plugins @@ -205,10 +196,10 @@ - ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 - 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 + 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 @@ -62,7 +62,8 @@ #undef HAVE_STACK_GROWING_UP @@ -219,9 +210,9 @@ #define _PR_HAVE_SOCKADDR_LEN #define _PR_STAT_HAS_ST_ATIMESPEC #define _PR_HAVE_LARGE_OFF_T -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 +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 @@ -204,9 +204,9 @@ endif endif @@ -235,9 +226,9 @@ ifdef GC_LEAK_DETECTOR EXTRA_LIBS = -L$(dist_libdir) -lboehm -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 +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 @@ -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 Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs