strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cws tl74: merge with DEV300_m75

Browse source
This commit is contained in:
Thomas Lange [tl] 2010-03-24 13:08:23 +01:00
commit e90dc369db
8 changed files with 248 additions and 1059 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
jpeg/jpeg-6b.patch
View file

@ -18,111 +18,6 @@
+#undef RIGHT_SHIFT_IS_UNSIGNED
+#define NO_GETENV
+#endif
--- misc/jpeg-6b/jdcolor.c 1997-08-04 01:39:16.000000000 +0200
+++ misc/build/jpeg-6b/jdcolor.c 2009-03-19 11:30:30.000000000 +0100
@@ -284,6 +284,90 @@
}
}
+METHODDEF(void)
+ycck_rgb_convert (j_decompress_ptr cinfo,
+ JSAMPIMAGE input_buf, JDIMENSION input_row,
+ JSAMPARRAY output_buf, int num_rows)
+{
+ my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+ JDIMENSION num_cols = cinfo->output_width;
+ long cc, cm, cy, ck;
+ long y, cb, cr;
+ register JSAMPROW outptr;
+ register JSAMPROW inptr0, inptr1, inptr2, inptr3;
+ register JDIMENSION col;
+ register JSAMPLE* range_limit = cinfo->sample_range_limit;
+ register int* Crrtab = cconvert->Cr_r_tab;
+ register int* Cbbtab = cconvert->Cb_b_tab;
+ register INT32* Crgtab = cconvert->Cr_g_tab;
+ register INT32* Cbgtab = cconvert->Cb_g_tab;
+ SHIFT_TEMPS
+
+ while( --num_rows >= 0 )
+ {
+ inptr0 = input_buf[0][input_row];
+ inptr1 = input_buf[1][input_row];
+ inptr2 = input_buf[2][input_row];
+ inptr3 = input_buf[3][input_row++];
+
+ for( col = 0, outptr = *output_buf++; col < num_cols; col++ )
+ {
+ y = GETJSAMPLE(inptr0[col]);
+ cb = GETJSAMPLE(inptr1[col]);
+ cr = GETJSAMPLE(inptr2[col]);
+
+ // YCCK => CMYK
+ cc = 255L - range_limit[MAXJSAMPLE - (y + Crrtab[cr])];
+ cm = 255L - range_limit[MAXJSAMPLE - (y + ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS)))];
+ cy = 255L - range_limit[MAXJSAMPLE - (y + Cbbtab[cb])];
+ ck = 255L - inptr3[col];
+
+ // CMYK => RGB
+ outptr[ RGB_RED ] = range_limit[ 255L - ( cc + ck ) ];
+ outptr[ RGB_GREEN ] = range_limit[ 255L - ( cm + ck ) ];
+ outptr[ RGB_BLUE ] = range_limit[ 255L - ( cy + ck ) ];
+ outptr += RGB_PIXELSIZE;
+ }
+ }
+}
+
+METHODDEF(void)
+cmyk_rgb_convert (j_decompress_ptr cinfo,
+ JSAMPIMAGE input_buf, JDIMENSION input_row,
+ JSAMPARRAY output_buf, int num_rows)
+{
+ my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+ JDIMENSION num_cols = cinfo->output_width;
+ long cc, cm, cy, ck;
+ long y, cb, cr;
+ register JSAMPROW outptr;
+ register JSAMPROW inptr0, inptr1, inptr2, inptr3;
+ register JDIMENSION col;
+ register JSAMPLE* range_limit = cinfo->sample_range_limit;
+ SHIFT_TEMPS
+
+ while( --num_rows >= 0 )
+ {
+ inptr0 = input_buf[0][input_row];
+ inptr1 = input_buf[1][input_row];
+ inptr2 = input_buf[2][input_row];
+ inptr3 = input_buf[3][input_row++];
+
+ for( col = 0, outptr = *output_buf++; col < num_cols; col++ )
+ {
+ cc = 255 - GETJSAMPLE(inptr0[col]);
+ cm = 255 - GETJSAMPLE(inptr1[col]);
+ cy = 255 - GETJSAMPLE(inptr2[col]);
+ ck = 255 - GETJSAMPLE(inptr3[col]);
+
+ // CMYK => RGB
+ outptr[ RGB_RED ] = range_limit[ 255L - ( cc + ck ) ];
+ outptr[ RGB_GREEN ] = range_limit[ 255L - ( cm + ck ) ];
+ outptr[ RGB_BLUE ] = range_limit[ 255L - ( cy + ck ) ];
+ outptr += RGB_PIXELSIZE;
+ }
+ }
+}
/*
* Empty method for start_pass.
@@ -364,6 +448,11 @@
cconvert->pub.color_convert = gray_rgb_convert;
} else if (cinfo->jpeg_color_space == JCS_RGB && RGB_PIXELSIZE == 3) {
cconvert->pub.color_convert = null_convert;
+ } else if (cinfo->jpeg_color_space == JCS_YCCK) {
+ cconvert->pub.color_convert = ycck_rgb_convert;
+ build_ycc_rgb_table(cinfo);
+ } else if (cinfo->jpeg_color_space == JCS_CMYK) {
+ cconvert->pub.color_convert = cmyk_rgb_convert;
} else
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
break;
--- misc/jpeg-6b/jmorecfg.h 1997-08-10 01:58:56.000000000 +0200
+++ misc/build/jpeg-6b/jmorecfg.h 2009-03-19 11:30:30.000000000 +0100
@@ -157,8 +157,8 @@
@ -136,18 +31,6 @@
#endif
/* Datatype used for image dimensions. The JPEG standard only supports
@@ -311,9 +311,9 @@
* can't use color quantization if you change that value.
*/
-#define RGB_RED 0 /* Offset of Red in an RGB scanline element */
+#define RGB_RED 2 /* Offset of Red in an RGB scanline element */
#define RGB_GREEN 1 /* Offset of Green */
-#define RGB_BLUE 2 /* Offset of Blue */
+#define RGB_BLUE 0 /* Offset of Blue */
#define RGB_PIXELSIZE 3 /* JSAMPLEs per RGB scanline element */
--- misc/jpeg-6b/makefile.mk 2009-03-19 11:30:46.000000000 +0100
+++ misc/build/jpeg-6b/makefile.mk 2009-03-19 11:30:30.000000000 +0100
@@ -1 +1,76 @@

3
moz/makefile.mk
View file

@ -84,6 +84,7 @@ PATCH_FILES = \
seamonkey-source-$(MOZILLA_VERSION).patch \
patches/dtoa.patch \
patches/respect_disable_pango.patch \
patches/arm_build_fix.patch
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
@ -163,7 +164,7 @@ MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT)
# create a objdir build = build files in a seperate directory, not in the sourcetree directly
CONFIGURE_DIR=$(CPU)_objdir
BUILD_DIR=$(CONFIGURE_DIR)
MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="gcc -arch $(MOZ_ARCH)" CXX="g++ -arch $(MOZ_ARCH)" AR=ar
MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch $(MOZ_ARCH)" AR=ar
CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)

189
moz/patches/arm_build_fix.patch Normal file
View file

@ -0,0 +1,189 @@
--- misc/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2010-01-29 08:39:01.000000000 +0000
+++ misc/build/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2010-01-29 08:41:01.000000000 +0000
@@ -44,8 +44,21 @@
#error "This code is for Linux ARM only. Please check if it works for you, too.\nDepends strongly on gcc behaviour."
#endif
+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+/* This tells gcc3.4+ not to optimize away symbols.
+ * * @see http://gcc.gnu.org/gcc-3.4/changes.html
+ * */
+#define DONT_DROP_OR_WARN __attribute__((used))
+#else
+/* This tells older gccs not to warn about unused vairables.
+ * * @see http://docs.freebsd.org/info/gcc/gcc.info.Variable_Attributes.html
+ * */
+#define DONT_DROP_OR_WARN __attribute__((unused))
+#endif
+
/* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch")
+DONT_DROP_OR_WARN;
static nsresult
PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
--- misc/mozilla/security/nss/cmd/shlibsign/Makefile 2010-02-05 13:13:56.000000000 +0000
+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile 2010-02-05 13:14:16.000000000 +0000
@@ -124,5 +124,5 @@
endif
endif
-libs install :: $(CHECKLOC)
+libs install ::
--- misc/mozilla/security/manager/Makefile.in 2010-02-05 13:27:25.000000000 +0000
+++ misc/build/mozilla/security/manager/Makefile.in 2010-02-05 13:28:00.000000000 +0000
@@ -53,7 +53,6 @@
SMIME3_LIB \
SSL3_LIB \
SOFTOKEN3_LIB \
- SOFTOKEN3_CHK \
LOADABLE_ROOT_MODULE \
HAVE_FREEBL_LIBS \
HAVE_FREEBL_LIBS_32 \
@@ -68,7 +67,6 @@
SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
# Default
HAVE_FREEBL_LIBS = 1
@@ -99,23 +97,17 @@
ifdef HAVE_FREEBL_LIBS
FREEBL_LIB = $(DLL_PREFIX)freebl3$(DLL_SUFFIX)
-FREEBL_CHK = $(DLL_PREFIX)freebl3.chk
endif
ifdef HAVE_FREEBL_LIBS_32
FREEBL_32INT_LIB = libfreebl_32int_3$(DLL_SUFFIX)
-FREEBL_32INT_CHK = libfreebl_32int_3.chk
FREEBL_32FPU_LIB = libfreebl_32fpu_3$(DLL_SUFFIX)
-FREEBL_32FPU_CHK = libfreebl_32fpu_3.chk
endif
ifdef HAVE_FREEBL_LIBS_32INT64
FREEBL_32INT64_LIB = libfreebl_32int64_3$(DLL_SUFFIX)
-FREEBL_32INT64_CHK = libfreebl_32int64_3.chk
endif
ifdef HAVE_FREEBL_LIBS_64
FREEBL_64INT_LIB = libfreebl_64int_3$(DLL_SUFFIX)
-FREEBL_64INT_CHK = libfreebl_64int_3.chk
FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX)
-FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk
endif
ABS_DIST := $(shell cd $(DIST) && pwd)
@@ -210,7 +202,6 @@
OS_ARCH="$(OS_ARCH)" \
CPU_ARCH="$(TARGET_CPU)" \
$(NULL)
-SKIP_CHK=1
endif
SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile
@@ -223,10 +214,6 @@
ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
endif
@@ -262,43 +249,22 @@
# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
ifdef HAVE_FREEBL_LIBS
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
endif
ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
endif
ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
endif
ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
-endif
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
endif
@@ -313,38 +279,21 @@
install::
ifndef MOZ_NATIVE_NSS
$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
ifdef HAVE_FREEBL_LIBS
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
endif
ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
endif
ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
endif
ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
endif
@@ -366,10 +315,6 @@
ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
endif
echo-requires-recursive::

8
neon/makefile.mk
View file

@ -46,20 +46,20 @@ TARGET=so_neon
@echo "neon disabled...."
.ENDIF
NEON_NAME=neon-0.28.2
NEON_NAME=neon-0.29.3
TARFILE_NAME=$(NEON_NAME)
PATCH_FILES=neon.patch
.IF "$(GUI)"=="WNT"
.IF "$(GUI)"=="WNT"
PATCH_FILES+=neon_exports_win.patch
.ELSE
PATCH_FILES+=neon_exports_unix.patch
.ENDIF
ADDITIONAL_FILES=src$/makefile.mk src$/config.h src$/ne_ntlm.h src$/ne_ntlm.c
BUILD_DIR=src
ADDITIONAL_FILES=src$/makefile.mk src$/config.h
BUILD_DIR=src
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
OUT2INC= \

963
neon/neon.patch
View file

File diff suppressed because it is too large Load diff

11
neon/neon_exports_unix.patch
View file

@ -1,7 +1,7 @@
--- misc/neon-0.28.2/src/exports.map 2009-09-29 10:28:13.531250000 +0200
+++ misc/build/neon-0.28.2/src/exports.map 2009-09-21 12:16:53.453125000 +0200
@@ -0,0 +1,287 @@
+NEON_0_28_2 {
--- misc/neon-0.29.3/src/exports.map 2009-09-29 10:28:13.531250000 +0200
+++ misc/build/neon-0.29.3/src/exports.map 2009-09-21 12:16:53.453125000 +0200
@@ -0,0 +1,288 @@
+NEON_0_29_3 {
+ global:
+ ne__negotiate_ssl;
+ ne__ssl_exit;
@ -125,6 +125,7 @@
+ ne_sock_peek;
+ ne_sock_peer;
+ ne_sock_prebind;
+ ne_sock_proxy;
+ ne_sock_read;
+ ne_sock_read_timeout;
+ ne_sock_readline;
@ -275,7 +276,7 @@
+ ne_realloc;
+ ne_strdup;
+ ne_strndup;
+ ne_acl_set;
+ ne_acl3744_set;
+ ne_207_create;
+ ne_207_destroy;
+ ne_207_get_current_propstat;

12
neon/neon_exports_win.patch
View file

@ -1,7 +1,7 @@
--- misc/neon-0.28.2/src/exports.map 2009-09-29 10:28:13.531250000 +0200
+++ misc/build/neon-0.28.2/src/exports.map 2009-09-21 12:16:53.453125000 +0200
@@ -0,0 +1,292 @@
+NEON_0_28_2 {
--- misc/neon-0.29.3/src/exports.map 2009-09-29 10:28:13.531250000 +0200
+++ misc/build/neon-0.29.3/src/exports.map 2009-09-21 12:16:53.453125000 +0200
@@ -0,0 +1,294 @@
+NEON_0_29_3 {
+ global:
+ ne_sspi_authenticate;
+ ne_sspi_clear_context;
@ -131,6 +131,7 @@
+ ne_sock_peek;
+ ne_sock_peer;
+ ne_sock_prebind;
+ ne_sock_proxy;
+ ne_sock_read;
+ ne_sock_read_timeout;
+ ne_sock_readline;
@ -281,7 +282,8 @@
+ ne_realloc;
+ ne_strdup;
+ ne_strndup;
+ ne_acl_set;
+ ne_free;
+ ne_acl3744_set;
+ ne_207_create;
+ ne_207_destroy;
+ ne_207_get_current_propstat;

4
neon/version.mk
View file

@ -28,9 +28,9 @@
# the major
NEON_MAJOR=0
# the minor
NEON_MINOR=28
NEON_MINOR=29
# the micro
NEON_MICRO=2
NEON_MICRO=3
# concat
NEON_VERSION=$(NEON_MAJOR)$(NEON_MINOR)$(NEON_MICRO)