OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2006 17:24:09
Branch: HEAD Handle: 2006122216240900
Modified files:
openpkg-src/firefox firefox.patch firefox.spec
Log:
blind update (still fails to build correctly)
Summary:
Revision Changes Path
1.10 +30 -41 openpkg-src/firefox/firefox.patch
1.35 +2 -2 openpkg-src/firefox/firefox.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/firefox/firefox.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 firefox.patch
--- openpkg-src/firefox/firefox.patch 12 Oct 2006 20:41:04 -0000 1.9
+++ openpkg-src/firefox/firefox.patch 22 Dec 2006 16:24:09 -0000 1.10
@@ -1,7 +1,7 @@
Index: browser/app/Makefile.in
---- browser/app/Makefile.in.orig 2005-09-07 03:51:58 +0200
-+++ browser/app/Makefile.in 2005-11-30 14:56:57 +0100
-@@ -169,6 +169,19 @@
+--- browser/app/Makefile.in.orig 2006-08-29 04:03:07 +0200
++++ browser/app/Makefile.in 2006-12-22 17:13:52 +0100
+@@ -176,6 +176,19 @@
include $(topsrcdir)/config/static-rules.mk
endif
@@ -20,10 +20,10 @@
+
APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
DEFINES += -DAPP_VERSION="$(APP_VERSION)"
-
+ APP_UA_NAME = $(shell echo $(MOZ_APP_DISPLAYNAME) | sed -e's/[^A-Za-z]//g')
Index: config/make-jars.pl
---- config/make-jars.pl.orig 2005-09-28 20:19:34 +0200
-+++ config/make-jars.pl 2005-11-30 14:56:49 +0100
+--- config/make-jars.pl.orig 2006-02-06 18:17:26 +0100
++++ config/make-jars.pl 2006-12-22 17:13:53 +0100
@@ -48,6 +48,7 @@
last if ($arg eq "--");
}
@@ -33,9 +33,9 @@
getopts("d:s:t:c:j:f:avlD:o:p:xz:e");
Index: embedding/browser/gtk/tests/Makefile.in
---- embedding/browser/gtk/tests/Makefile.in.orig 2005-02-04 00:01:41
+0100
-+++ embedding/browser/gtk/tests/Makefile.in 2005-11-30 14:56:57 +0100
-@@ -131,6 +131,19 @@
+--- embedding/browser/gtk/tests/Makefile.in.orig 2006-03-24 17:10:37
+0100
++++ embedding/browser/gtk/tests/Makefile.in 2006-12-22 17:13:53 +0100
+@@ -138,6 +138,19 @@
include $(topsrcdir)/config/rules.mk
@@ -57,7 +57,7 @@
ifdef ENABLE_GNOME
Index: extensions/xmlterm/tests/Makefile.in
--- extensions/xmlterm/tests/Makefile.in.orig 2004-04-19 00:14:17
+0200
-+++ extensions/xmlterm/tests/Makefile.in 2005-11-30 14:56:57 +0100
++++ extensions/xmlterm/tests/Makefile.in 2006-12-22 17:13:53 +0100
@@ -75,3 +75,14 @@
include $(srcdir)/../config/xmlterm_config.mk
@@ -75,7 +75,7 @@
+endif
Index: js/src/xpconnect/shell/Makefile.in
--- js/src/xpconnect/shell/Makefile.in.orig 2005-04-05 14:35:51 +0200
-+++ js/src/xpconnect/shell/Makefile.in 2005-11-30 14:56:49 +0100
++++ js/src/xpconnect/shell/Makefile.in 2006-12-22 17:13:53 +0100
@@ -63,6 +63,17 @@
include $(topsrcdir)/config/rules.mk
@@ -95,8 +95,8 @@
#
Index: layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp
---- layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp.orig 2005-10-03
23:12:35 +0200
-+++ layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp 2005-11-30
14:56:49 +0100
+--- layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp.orig 2006-07-25
22:11:52 +0200
++++ layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp 2006-12-22
17:13:53 +0100
@@ -50,6 +50,11 @@
#include "nsRect.h"
#include "nsISVGCairoSurface.h"
@@ -110,8 +110,8 @@
#ifdef MOZ_X11
extern "C" {
Index: layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp
---- layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp.orig
2005-10-13 20:30:21 +0200
-+++ layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp 2005-11-30
14:56:49 +0100
+--- layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp.orig
2006-11-23 02:10:02 +0100
++++ layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp 2006-12-22
17:13:53 +0100
@@ -50,6 +50,7 @@
#include "nsIDOMSVGRect.h"
#include "nsSVGTypeCIDs.h"
@@ -121,8 +121,8 @@
extern cairo_surface_t *gSVGCairoDummySurface;
Index: nsprpub/pr/include/md/_freebsd.h
---- nsprpub/pr/include/md/_freebsd.h.orig 2004-11-23 22:22:35 +0100
-+++ nsprpub/pr/include/md/_freebsd.h 2005-11-30 14:56:49 +0100
+--- nsprpub/pr/include/md/_freebsd.h.orig 2004-11-22 22:24:53 +0100
++++ nsprpub/pr/include/md/_freebsd.h 2006-12-22 17:13:53 +0100
@@ -43,6 +43,7 @@
#if __FreeBSD__ >= 2
#include <osreldate.h> /* for __FreeBSD_version */
@@ -132,9 +132,9 @@
#define PR_LINKER_ARCH "freebsd"
Index: nsprpub/pr/src/md/unix/unix.c
---- nsprpub/pr/src/md/unix/unix.c.orig 2005-08-18 19:24:37 +0200
-+++ nsprpub/pr/src/md/unix/unix.c 2005-11-30 14:56:49 +0100
-@@ -65,7 +65,8 @@
+--- nsprpub/pr/src/md/unix/unix.c.orig 2006-02-07 20:29:04 +0100
++++ nsprpub/pr/src/md/unix/unix.c 2006-12-22 17:13:53 +0100
+@@ -68,7 +68,8 @@
* PRInt32* pointer to a _PRSockLen_t* pointer.
*/
#if defined(HAVE_SOCKLEN_T) \
@@ -144,7 +144,7 @@
#define _PRSockLen_t socklen_t
#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
|| defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -73,7 +74,7 @@
+@@ -76,7 +77,7 @@
|| defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
|| defined(NEXTSTEP) || defined(QNX)
#define _PRSockLen_t int
@@ -154,8 +154,8 @@
|| defined(DGUX) || defined(VMS) || defined(NTO) || defined(RISCOS)
#define _PRSockLen_t size_t
Index: nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig 2005-08-18 19:24:38 +0200
-+++ nsprpub/pr/src/pthreads/ptio.c 2005-11-30 14:56:49 +0100
+--- nsprpub/pr/src/pthreads/ptio.c.orig 2006-02-07 02:29:02 +0100
++++ nsprpub/pr/src/pthreads/ptio.c 2006-12-22 17:13:53 +0100
@@ -3460,6 +3460,17 @@
&on, sizeof(on));
}
@@ -175,9 +175,9 @@
if (fd == NULL) close(osfd);
}
Index: security/nss/cmd/shlibsign/Makefile
---- security/nss/cmd/shlibsign/Makefile.orig 2004-04-25 17:02:53 +0200
-+++ security/nss/cmd/shlibsign/Makefile 2005-11-30 14:56:57 +0100
-@@ -91,6 +91,17 @@
+--- security/nss/cmd/shlibsign/Makefile.orig 2006-04-19 02:46:06 +0200
++++ security/nss/cmd/shlibsign/Makefile 2006-12-22 17:13:53 +0100
+@@ -74,6 +74,17 @@
include $(CORE_DEPTH)/coreconf/rules.mk
@@ -195,20 +195,9 @@
#######################################################################
# (6) Execute "component" rules. (OPTIONAL) #
#######################################################################
-@@ -104,8 +115,8 @@
- include ../platrules.mk
-
- %.chk: %.$(DLL_SUFFIX)
--ifeq ($(OS_TARGET), OS2)
-- @cmd.exe /c sign.cmd $(DIST) $(OBJDIR) $(OS_TARGET) $<
-+ifeq ($(OS_TARGET), SunOS)
-+ touch `echo $< | cut -f1,1 -d.`.chk
- else
- @sh ./sign.sh $(DIST) $(OBJDIR) $(OS_TARGET) $<
- endif
Index: security/nss/cmd/shlibsign/mangle/Makefile
--- security/nss/cmd/shlibsign/mangle/Makefile.orig 2004-04-25 17:02:54
+0200
-+++ security/nss/cmd/shlibsign/mangle/Makefile 2005-11-30 14:56:57
+0100
++++ security/nss/cmd/shlibsign/mangle/Makefile 2006-12-22 17:13:53
+0100
@@ -65,6 +65,17 @@
include $(CORE_DEPTH)/coreconf/rules.mk
@@ -229,7 +218,7 @@
#######################################################################
Index: security/nss/lib/pki1/oiddata.h
--- security/nss/lib/pki1/oiddata.h.orig 2005-03-14 19:02:00 +0100
-+++ security/nss/lib/pki1/oiddata.h 2005-11-30 14:57:06 +0100
++++ security/nss/lib/pki1/oiddata.h 2006-12-22 17:13:53 +0100
@@ -42,6 +42,9 @@
static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: oiddata.h,v $
$Revision: 1.4 $ $Date: 2005/03/14 18:02:00 $ ; @(#) $RCSfile: oiddata.h,v $
$Revision: 1.4 $ $Date: 2005/03/14 18:02:00 $";
#endif /* DEBUG */
@@ -242,7 +231,7 @@
#endif /* NSSPKI1T_H */
Index: widget/src/xremoteclient/Makefile.in
--- widget/src/xremoteclient/Makefile.in.orig 2005-04-04 21:08:51
+0200
-+++ widget/src/xremoteclient/Makefile.in 2005-11-30 14:56:49 +0100
++++ widget/src/xremoteclient/Makefile.in 2006-12-22 17:13:53 +0100
@@ -88,6 +88,17 @@
include $(topsrcdir)/config/rules.mk
@@ -263,7 +252,7 @@
endif
Index: xpcom/tools/registry/Makefile.in
--- xpcom/tools/registry/Makefile.in.orig 2005-06-30 04:04:23 +0200
-+++ xpcom/tools/registry/Makefile.in 2005-11-30 14:56:49 +0100
++++ xpcom/tools/registry/Makefile.in 2006-12-22 17:13:53 +0100
@@ -71,3 +71,13 @@
include $(topsrcdir)/config/rules.mk
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/firefox/firefox.spec
============================================================================
$ cvs diff -u -r1.34 -r1.35 firefox.spec
--- openpkg-src/firefox/firefox.spec 13 Oct 2006 17:28:00 -0000 1.34
+++ openpkg-src/firefox/firefox.spec 22 Dec 2006 16:24:09 -0000 1.35
@@ -32,8 +32,8 @@
Class: EVAL
Group: Web
License: MPL
-Version: 1.5.0.7
-Release: 20061013
+Version: 2.0.0.1
+Release: 20061222
# package options
%option with_optimize yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
