[ooo-build-commit] patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Sun Sep 6 15:13:16 PDT 2009
patches/dev300/apply | 4 -
patches/dev300/cws-mysqlnative-20090828.diff | 103 +++++++++++++--------------
2 files changed, 52 insertions(+), 55 deletions(-)
New commits:
commit c8801b5448f30a9adfec60211c8dffc46e21c789
Author: Rene Engelhard <rene at debian.org>
Date: Mon Sep 7 00:11:54 2009 +0200
adapt cws-mysqlnative-20090828.diff for dev300-m56
* patches/dev300/cws-mysqlnative-20090828.diff: adapt
* patches/dev300/apply: uncomment, together with debian-mysqlc-*
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ad1b87b..959b94a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3364,9 +3364,9 @@ offapi-layoutcode.diff, cocofan
xmloff-layoutcode.diff, cocofan
[ MySQL ]
-#cws-mysqlnative-20090828.diff
+cws-mysqlnative-20090828.diff
[ MySQL and DebianBaseOnly ]
# add hack to link against STLport version of libmysqlcppconn on i386.
# Needs a libmysqlcppconn-stlport.so etc built with STLport
-#debian-mysqlc-build-against-stlport-hack.diff
+debian-mysqlc-build-against-stlport-hack.diff
diff --git a/patches/dev300/cws-mysqlnative-20090828.diff b/patches/dev300/cws-mysqlnative-20090828.diff
index 03cd47c..6d2a255 100644
--- a/patches/dev300/cws-mysqlnative-20090828.diff
+++ b/patches/dev300/cws-mysqlnative-20090828.diff
@@ -665,20 +665,21 @@ Index: dbaccess/source/ui/browser/brwctrlr.cxx
}
break;
-@@ -2465,13 +2486,27 @@
- void SbaXDataBrowserController::criticalFail()
+@@ -2556,14 +2556,28 @@
{
- InvalidateAll();
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen at sun.com", "SbaXDataBrowserController::criticalFail" );
+ InvalidateAll();
+ m_nRowSetPrivileges = 0;
}
-
+
//------------------------------------------------------------------------------
void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
{
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen at sun.com", "SbaXDataBrowserController::LoadFinished" );
+ m_nRowSetPrivileges = 0;
+
- if (isValid() && !loadingCancelled())
- {
+ if (isValid() && !loadingCancelled())
+ {
+ // obtain cached values
+ try
+ {
@@ -687,12 +688,12 @@ Index: dbaccess/source/ui/browser/brwctrlr.cxx
+ }
+ catch( const Exception& )
+ {
-+ DBG_UNHANDLED_EXCEPTION();
++ DBG_UNHANDLED_EXCEPTION();
+ }
+
- // --------------------------------
- // switch the control to alive mode
- getBrowserView()->getGridControl()->setDesignMode(sal_False);
+ // --------------------------------
+ // switch the control to alive mode
+ getBrowserView()->getGridControl()->setDesignMode(sal_False);
Index: dbaccess/source/ui/inc/brwctrlr.hxx
===================================================================
--- dbaccess/source/ui/inc/brwctrlr.hxx (.../tags/OOO310_m10) (Revision 275542)
@@ -20515,16 +20516,14 @@ Index: connectivity/qa/jdbc/OOoDriverTest.java
+ }
+}
-Index: solenv/config/sooo310.ini
-===================================================================
---- solenv/config/sooo310.ini (.../tags/OOO310_m10) (Revision 275542)
-+++ solenv/config/sooo310.ini (.../cws/mysqlnative) (Revision 275542)
+--- solenv/config/sdev300.ini-old 2009-09-06 23:55:08.000000000 +0200
++++ solenv/config/sdev300.ini 2009-09-06 23:59:35.000000000 +0200
@@ -13,7 +13,7 @@
BMP_WRITES_FLAG TRUE
BTARGET 1
BUILD_SPECIAL TRUE
-- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX
-+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX MYSQLCPPCONN MYSQLC
+- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX L10N
++ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX L10N MYSQLCPPCONN MYSQL
common_build TRUE
COMMON_OUTDIR common
CONFIG_PROJECT config_office
@@ -20536,55 +20535,54 @@ Index: solenv/config/sooo310.ini
ENABLE_RANDR TRUE
ENABLE_REPORTBUILDER YES
ENABLE_SVCTAGS YES
-@@ -414,6 +415,7 @@
+@@ -716,6 +717,7 @@
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
KDE_ROOT /so/env/kde/linux/kde-3.2.2
-+ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
++ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
NO_BSYMBOLIC True
OJDK16PATH %SOLAR_OJDK16PATH%
OS LINUX
-@@ -743,6 +745,7 @@
+@@ -1042,6 +1044,7 @@
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
KDE_ROOT /so/env/kde/linux/kde-3.2.2
-+ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
++ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
NO_BSYMBOLIC True
OJDK16PATH %SOLAR_OJDK16PATH%
OS LINUX
-@@ -1078,6 +1081,7 @@
+@@ -1370,6 +1373,7 @@
JDK13PATH %SOLAR_JDK13PATH%
JDK14PATH %SOLAR_JDK15PATH%
JDK15PATH %SOLAR_JDK15PATH%
-+ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
++ IBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
NO_BSYMBOLIC True
OS MACOSX
OUTPATH unxmacxi
-@@ -1380,6 +1384,7 @@
+@@ -1667,6 +1671,7 @@
JDK13PATH %SOLAR_JDK13PATH%
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
-+ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
++ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
OJDK16PATH %SOLAR_OJDK16PATH%
OS SOLARIS
OUTPATH unxsoli4
-@@ -1688,6 +1693,7 @@
+@@ -1974,6 +1979,7 @@
JDK13PATH %SOLAR_JDK13PATH%
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
-+ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
++ LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
OJDK16PATH %SOLAR_OJDK16PATH%
OS SOLARIS
-@@ -2648,6 +2654,7 @@
+@@ -2847,6 +2853,7 @@
GUIBASE WIN
GVER NT351
- INPATH wntmsci12%PROEXT%
-+ LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
+ INPATH wntgcci1%PROEXT%
++ LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
OS WNT
- OUTPATH wntmsci12
- PACKMS %SO_PACK%\wntmsci12\MS
-
+ OUTPATH wntgcci1
+ SET_EXEPTIONS TRUE
Index: solenv/bin/transform_description.pl
===================================================================
--- solenv/bin/transform_description.pl (.../tags/OOO310_m10) (Revision 0)
@@ -20736,37 +20734,36 @@ Index: solenv/inc/extension_post.mk
@@ -29,6 +29,8 @@
#
#*************************************************************************
-
+
+EXTENSION_TARGET:=$(ZIP9TARGETN)
+
- .SOURCE.xcu : $(MISC)$/$(EXTNAME)$/merge $(MISC)$/$(EXTNAME)$/registry$/data $(COMPONENT_CONFIGDIR) .
+ .SOURCE.xcu : $(MISC)$/$(EXTNAME)$/merge $(MISC)$/$(EXTNAME)$/registry$/data $(MISC)$/$(COMPONENT_SHARED_CONFIG)_in$/merge $(MISC)$/$(COMPONENT_SHARED_CONFIG)_in$/registry$/data $(COMPONENT_CONFIGDIR) .
.SOURCE.xcs : $(MISC)$/$(EXTNAME)$/registry $(MISC)$/$(EXTNAME)$/registry$/schema .
-
-@@ -122,13 +124,19 @@
+
+@@ -123,12 +123,18 @@
.IF "$(DESCRIPTION)"!=""
$(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
- @@-$(MKDIRHIER) $(@:d)
-- $(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
- @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
-- $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(MISC)$/desc.tmp.$(EXTNAME)
-- @@-$(RM) $@.$(EXTNAME)
-- $(TYPE) $(MISC)$/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-- @@-$(RM) $(MISC)$/desc.tmp.$(EXTNAME)
-
-+ $(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
+ @@-$(MKDIRHIER) $(@:d)
+- $(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
+ @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
+- $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(MISC)$/desc.tmp.$(EXTNAME)
+- @@-$(RM) $@.$(EXTNAME)
+- $(TYPE) $(MISC)$/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
+- @@-$(RM) $(MISC)$/desc.tmp.$(EXTNAME)
+
-+ $(PERL) $(SOLARENV)$/bin$/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
-+ @@-$(RM) $@.1.$(EXTNAME)
++ $(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
+
-+ $(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $@.3.$(EXTNAME)
-+ @@-$(RM) $@.2.$(EXTNAME)
++ $(PERL) $(SOLARENV)$/bin$/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
++ @@-$(RM) $@.1.$(EXTNAME)
+
-+ $(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-+ @@-$(RM) $@.3.$(EXTNAME)
++ $(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $@.3.$(EXTNAME)
++ @@-$(RM) $@.2.$(EXTNAME)
+
- .ENDIF # "$(DESCRIPTION)"!=""
++ $(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
++ @@-$(RM) $@.3.$(EXTNAME)
+
+ .ENDIF # "$(DESCRIPTION)"!=""
# default OOo license text!!!
- # may not fit...
Index: solenv/inc/unxsoli4.mk
===================================================================
--- solenv/inc/unxsoli4.mk (.../tags/OOO310_m10) (Revision 275542)
More information about the ooo-build-commit
mailing list