[ooo-build-commit] .: patches/dev300
Hanno Meyer-Thurow
hmth at kemper.freedesktop.org
Tue Jul 13 05:03:48 PDT 2010
patches/dev300/disable-python.diff | 31 +++++++++++++++----------------
patches/dev300/jemalloc.diff | 2 +-
patches/dev300/system-db-check.diff | 28 +++++-----------------------
3 files changed, 21 insertions(+), 40 deletions(-)
New commits:
commit 3026206911a8079c4a0bbfac6395cb590e62cd02
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Tue Jul 13 13:55:31 2010 +0200
Update GentooExperimental section and ...
... my system-db-check.diff patch in GentooOnly.
* patches/dev300/disable-python.diff:
* patches/dev300/jemalloc.diff:
* patches/dev300/system-db-check.diff:
diff --git a/patches/dev300/disable-python.diff b/patches/dev300/disable-python.diff
index f3bacc6..12f0081 100644
--- a/patches/dev300/disable-python.diff
+++ b/patches/dev300/disable-python.diff
@@ -22,9 +22,9 @@
+ AC_MSG_RESULT([yes])
+ BUILD_TYPE="$BUILD_TYPE PYUNO"
+
+ AC_MSG_CHECKING([which python to use])
if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
with_system_python=yes
- fi
@@ -4153,6 +4159,12 @@
AC_SUBST(PYTHON_LIBS)
HOME=`echo $HOME | sed 's:\\\\:/:g'`
@@ -51,11 +51,11 @@
--- postprocess/prj/build.lst.orig 2010-01-02 17:25:56.000000000 +0100
+++ postprocess/prj/build.lst 2010-01-02 17:26:22.000000000 +0100
@@ -1,4 +1,4 @@
--po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox MYSQLC:mysqlc NULL
-+po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries PYUNO:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox MYSQLC:mysqlc NULL
+-po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
++po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries PYUNO:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
- po postprocess\checkdeliver nmake - all po_checkdlv NULL
+ po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
--- testtools/prj/build.lst.orig 2010-01-02 17:26:31.000000000 +0100
+++ testtools/prj/build.lst 2010-01-02 17:26:41.000000000 +0100
@@ -1,4 +1,4 @@
@@ -88,7 +88,7 @@
cp $? $@
@@ -117,4 +121,5 @@
cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
- -l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py
+ -l com.sun.star.loader.Python -c vnd.sun.star.expand:$$FOO/samplecomponent.py
.ENDIF # L10N_framework
+.ENDIF # DISABLE_PYTHON
@@ -109,7 +109,7 @@
+.ENDIF
SCPDEFS+=\
- -DPYVERSION=$(PYVERSION) \
+ -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
--- scp2/source/python/file_python.scp.orig 2010-01-02 17:38:00.000000000 +0100
+++ scp2/source/python/file_python.scp 2010-01-02 17:40:06.000000000 +0100
@@ -30,6 +30,8 @@
@@ -238,20 +238,19 @@
$(BIN)$/mailmerge.py
+.ENDIF
- # PKGFORMAT taken from environment. See possible
- # values below.
-@@ -365,6 +367,7 @@
-
+ xxxx:
+ echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
+@@ -365,12 +367,14 @@
.ENDIF # "$(alllangiso)"!=""
+ .ENDIF
+.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(LOCALPYFILES)"!=""
- .IF "$(PKGFORMAT)"==""
- $(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i openofficedev_$i broffice_$i brofficewithjre_$i brofficedev_$i sdkoo_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
-@@ -387,6 +390,7 @@
- $(BIN)$/iso8859_1.py :
- @echo "Using system python - nothing more to do here"
- .ENDIF
+ $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+ .ENDIF # "$(LOCALPYFILES)"!=""
+
+ $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
+ @$(COPY) $< $@
+.ENDIF # "$(DISABLE_PYTHON)" != "TRUE"
$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
diff --git a/patches/dev300/jemalloc.diff b/patches/dev300/jemalloc.diff
index d4ce7f5..847d9a9 100644
--- a/patches/dev300/jemalloc.diff
+++ b/patches/dev300/jemalloc.diff
@@ -1,7 +1,7 @@
--- configure.in.orig 2008-03-18 19:27:49.000000000 +0100
+++ configure.in 2008-03-18 19:29:49.000000000 +0100
@@ -745,7 +745,7 @@
- ],,)
+ ],with_build_version=$withval)
AC_ARG_WITH(alloc,
[ --with-alloc Define which allocator to build with
- (choices are oo, system, tcmalloc)
diff --git a/patches/dev300/system-db-check.diff b/patches/dev300/system-db-check.diff
index 142eae8..b21699a 100644
--- a/patches/dev300/system-db-check.diff
+++ b/patches/dev300/system-db-check.diff
@@ -12,33 +12,15 @@
- [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ )
- ], []
- )
-+ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
++ for dbver in -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
+ AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
+ done
+ if test "$DB_INCLUDES" = ""; then
+ AC_MSG_ERROR(no. install the db4-dev package)
+ fi
AC_MSG_CHECKING([whether db is at least 4.1])
- for v in `seq 1 8`; do
- AC_TRY_RUN([
-@@ -3302,11 +3300,12 @@
- else
- AC_MSG_ERROR([no. you need at least db 4.1])
- fi
-- # does not work :/
-- #AC_CHECK_LIB(db, db_create, [],
-- # [AC_MSG_ERROR([db library not installed or functional])], [])
-- AC_HAVE_LIBRARY(db, [],
-- [AC_MSG_ERROR([db not installed or functional])], [])
-+ save_LIBS="$LIBS"
-+ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
-+ AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
-+ done
-+ AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
-+ LIBS="$save_LIBS"
- SCPDEFS="$SCPDEFS -DSYSTEM_DB"
- else
- AC_MSG_RESULT([internal])
+ AC_TRY_RUN([
+ #include <db.h>
@@ -3315,6 +3314,8 @@
fi
AC_SUBST(SYSTEM_DB)
@@ -57,8 +39,8 @@
+ToFile( "DB_LIB", "@DB_LIB@", "e" );
+ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" );
ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
- ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" );
- ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
+ ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" );
+ ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" );
--- solenv/inc/libs.mk.orig 2007-07-15 16:45:47.000000000 +0200
+++ solenv/inc/libs.mk 2007-07-15 16:49:00.000000000 +0200
@@ -220,7 +220,7 @@
More information about the ooo-build-commit
mailing list