[ooo-build-commit] Branch 'ooo/master' - 4 commits - automation/util extensions/source forms/util setup_native/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Sep 18 17:30:45 PDT 2009
automation/util/makefile.mk | 4 --
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 6 ++-
extensions/source/plugin/util/makefile.mk | 4 +-
forms/util/makefile.mk | 16 ---------
setup_native/source/java/javaversion.dat | 26 ++++++++--------
setup_native/source/packinfo/spellchecker_selection.txt | 4 ++
6 files changed, 24 insertions(+), 36 deletions(-)
New commits:
commit 998d7d60f901c8cc16c0bc9644493f61f65f8b75
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Sep 18 12:40:04 2009 +0000
CWS-TOOLING: integrate CWS cmcfixes63
2009-09-16 11:24:47 +0200 cmc r276193 : #i105118# remove overly const warnings for -Wall
2009-09-15 18:04:24 +0200 cmc r276183 : #i105089# fix include
2009-09-15 14:30:55 +0200 cmc r276176 : #i105090# fix includes for s390x bridge
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 1fceb8d..6d3fad4 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -67,7 +67,9 @@ extern "C" {
# endif
#endif
#include <X11/Xatom.h>
-#define XP_UNIX
+#ifndef XP_UNIX
+# define XP_UNIX
+#endif
#define MOZ_X11
#include <stdio.h>
#ifdef SYSTEM_MOZILLA
@@ -102,7 +104,7 @@ extern "C" {
extern "C" {
#include <npsdk/npupp.h>
}
-#include <npapi.h>
+#include <npsdk/npapi.h>
#if NP_VERSION_MINOR < 17
// compatibility hack: compile with older NPN api header, but define
commit f49adc0743dc59a459377ac5e6e5b43e76a8b2eb
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Sep 18 11:54:06 2009 +0000
CWS-TOOLING: integrate CWS dtrans2vcl
2009-09-09 19:47:56 +0200 pl r276016 : merge fix for #i104390# into moved code
2009-09-07 12:50:47 +0200 pl r275891 : remove nonexistant header
2009-09-04 16:47:05 +0200 pl r275819 : forgot calling convention for Windoze
2009-09-04 13:27:36 +0200 pl r275800 : #150926# remove X11 dependency
2009-09-04 13:19:08 +0200 pl r275799 : #150926# move mac dtrans service to vcl to be used in service implementation
2009-09-03 21:19:01 +0200 pl r275774 : fix warning, adjust comment
2009-09-03 18:36:01 +0200 pl r275768 : no more sjlib
2009-09-03 17:56:49 +0200 pl r275767 : remove unused X11 link dependency
2009-09-03 17:43:35 +0200 pl r275766 : headless not used in X11 case
2009-09-03 17:34:36 +0200 pl r275765 : #150926# bye bye sj2
2009-09-03 16:19:04 +0200 pl r275761 : #150926# bye bye sj2, x11 dependenices removed where not necessary
2009-09-01 17:22:54 +0200 pl r275674 : #150926# step 1: move X11 code from dtrans to vcl, adapt glue code
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index f96910a..8d68000 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -157,7 +157,6 @@ APP1STDLIBS+= \
$(SVLLIB) \
$(VCLLIB) \
$(SALLIB) \
- $(SJLIB) \
$(VOSLIB) \
$(UCBHELPERLIB) \
$(COMPHELPERLIB) \
@@ -221,8 +220,7 @@ APP3STDLIBS= \
$(SALLIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
- $(VCLLIB) \
- $(SJLIB)
+ $(VCLLIB)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index 657992e..dfba6a7 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -96,8 +96,8 @@ SHL1STDLIBS+= \
$(CPPULIB) \
$(SALLIB)
-.IF "$(OS)"=="MACOSX" && "$(GUIBASE)"=="unx"
-SHL1STDLIBS+= -lX11
+.IF "$(GUIBASE)"=="unx"
+SHL1STDLIBS+=$(X11LINK_DYNAMIC)
.ENDIF
SHL1STDLIBS+=$(SHL1OWNLIBS)
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index 17f594b..1c454b1 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -96,22 +96,6 @@ RES1FILELIST=\
RESLIB1NAME=$(TARGET)
RESLIB1SRSFILES=$(RES1FILELIST)
-.IF "$(GUI)"=="UNX"
-
-# [ed] 6/19/02 Only add in libraries for X11 OS X builds
-
-.IF "$(OS)"=="MACOSX"
-.IF "$(GUIBASE)"=="unx"
-SHL1STDLIBS +=\
- -lX11 -lXt -lXmu
-.ENDIF
-.ELSE
-SHL1STDLIBS +=\
- -lX11
-.ENDIF # OS == MACOSX
-
-.ENDIF
-
.IF "$(GUI)"=="OS2"
SHL1STDLIBS += pthread.lib libz.lib
.ENDIF
commit fb7a0cd6bcd9014b3963f94da36169a820228502
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Fri Sep 18 10:15:03 2009 +0000
CWS-TOOLING: integrate CWS mba32issues02
2009-09-17 mb93783 merge commit
2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial
2009-09-01 mba #101455#: code simplification
2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no
2009-08-25 mba merge to m55
2009-07-29 mba cleanup after rebase
2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI
2009-07-27 mba adding dictionary changes from broken svn CWS
2009-07-27 mba adding dictionary changes from broken svn CWS
2009-07-27 mba apply patch from broken svn CWS
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index bc53123..d7f7f7d 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -4,6 +4,7 @@
# Second column: Assigned spellchecker languages. Comma separated list.
af = "af,en-US"
+ca = "ca,es,en,fr"
cs = "cs,en-US"
da = "da,de,en-US"
de = "de,en-US,fr,it"
@@ -17,10 +18,13 @@ it = "de,en-US,fr,it"
ja = "en-US"
ko = "en-US"
lt = "en-US,lt"
+nb = "no,en,fr,de,es"
ne = "en-US,ne"
nl = "en-US,fr,de,nl"
+nn = "no,en,fr,de,es"
pl = "de,en-US,pl,ru"
pt-BR = "en-US,es,pt"
+ro = "ro,en,de,hu"
ru = "de,en-US,ru"
sk = "en-US,sk"
sl = "en-US,sl"
commit 0b4794eff901408c308b216d472e710910ae1b27
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Sep 18 10:00:24 2009 +0000
CWS-TOOLING: integrate CWS native267
2009-09-08 16:34:02 +0200 is r275939 : #i104893# new jre6u16 for all products
2009-09-08 15:18:09 +0200 is r275932 : #i104893# new jre6u16 for all products
2009-09-07 14:34:35 +0200 is r275899 : #104765# update version of vcredist_x86.exe
diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat
index 120bed2..87172c3 100755
--- a/setup_native/source/java/javaversion.dat
+++ b/setup_native/source/java/javaversion.dat
@@ -30,30 +30,30 @@
#*************************************************************************
# GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 13
-WINDOWSJAVAVERSION=Java 6 Update 13
+JAVAVERSION=Java 6 Update 16
+WINDOWSJAVAVERSION=Java 6 Update 16
# Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u13-windows-i586-p.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_13
+WINDOWSJAVAFILENAME=jre-6u16-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_16
# Linux (scp2)
-LINUXJAVAFILENAME=jre-6u13-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u16-linux-i586.rpm
# Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_13-fcs
+LINUXJAVANAME=jre-1.6.0_16-fcs
# Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u13-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u16-linux-amd64.rpm
# Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_13_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_13_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_13_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_16_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_16_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_16_sparc.tar.gz
# Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_13_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_13_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_13_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_16_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_16_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_16_x86.tar.gz
# Solaris (pkgUnit.xml, needs only to be changed in major changes)
SOLARISJAVART=SUNWj6rt
More information about the ooo-build-commit
mailing list