[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b97f109cb62de8f005a7e2fdc95c92f94d120676
Author: Rene Engelhard r...@debian.org
Date: Mon Apr 23 22:07:20 2012 +0200
fix gtk3salnativewidgets-gtk build with gcc 4.4
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index aaa4bd7..6bd2280 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -622,7 +622,7 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext
*context,
{
if ( !pSpinVal )
{
-std::fprintf( stderr, Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n );
+fprintf( stderr, Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n );
return;
}
areaRect = pSpinVal-maUpperRect;
@@ -1335,10 +1335,10 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
}
aInfo.m_eWidth = WIDTH_ULTRA_CONDENSED;
-std::fprintf( stderr, font name BEFORE system match: \%s\\n,
aFamily.getStr() );
+fprintf( stderr, font name BEFORE system match: \%s\\n,
aFamily.getStr() );
// match font to e.g. resolve Sans
psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
-std::fprintf( stderr, font match %s, name AFTER: \%s\\n,
+fprintf( stderr, font match %s, name AFTER: \%s\\n,
aInfo.m_nID != 0 ? succeeded : failed,
rtl::OUStringToOString( aInfo.m_aStyleName,
RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
@@ -1447,7 +1447,7 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
gchar* pThemeName = NULL;
g_object_get( pSettings, gtk-theme-name, pThemeName, (char *)NULL );
#if OSL_DEBUG_LEVEL 1
-std::fprintf( stderr, Theme name is \%s\\n, pThemeName );
+fprintf( stderr, Theme name is \%s\\n, pThemeName );
#endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 68fc62667c23cd8cbab01c91667186356a4ef031 Author: Rene Engelhard r...@debian.org Date: Tue Apr 17 17:46:03 2012 +0200 add 5.3 into the db check for-loop diff --git a/configure.in b/configure.in index ed16f92..fc6fdb1 100644 --- a/configure.in +++ b/configure.in @@ -6383,7 +6383,7 @@ if test $with_system_db = yes; then AC_MSG_RESULT([external]) db_header= -for dbver in 5.1 5.0 5 4.8 4.7 4; do +for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do for dash in - ''; do AC_CHECK_HEADER([db$dash$dbver/db.h], [ db_header=db$dash$dbver/db.h; break 2 ]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - bridges/source testtools/com testtools/source
bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S | 18 +
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 40
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx |2
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 167 +-
testtools/com/sun/star/comp/bridge/TestComponent.java |4
testtools/source/bridgetest/bridgetest.cxx|5
testtools/source/bridgetest/cli/cli_cs_testobj.cs |5
testtools/source/bridgetest/cppobj.cxx|3
testtools/source/bridgetest/idl/bridgetest.idl|5
9 files changed, 197 insertions(+), 52 deletions(-)
New commits:
commit 062c8a02b0402e535dea3be0aeaf0c32b1964a03
Author: Rene Engelhard r...@debian.org
Date: Mon Apr 16 13:47:52 2012 +0200
merge armhf bridge fixes from master
Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
index d5faf15..27148dc 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S
@@ -10,6 +10,17 @@
# define UNWIND @
#endif
+@ If the VFP ABI variant (armhf in Debian/Ubuntu) is used, an additional extra
64 bytes
+@ are taken up on the stack (the equivalent of the 8 double precision VFP
registers)
+
+#ifdef __ARM_PCS_VFP
+# define PAD 80
+# define DISCARDED 84
+#else
+# define PAD 16
+# define DISCARDED 20
+#endif
+
.file armhelper.s
.text
.align 4
@@ -19,9 +30,12 @@ privateSnippetExecutor:
UNWIND .fnstart@ start of unwinder entry
stmfd sp!, {r0-r3} @ follow other parameters on stack
- UNWIND .pad #16 @ throw this data away on exception
mov r0, ip @ r0 points to functionoffset/vtable
mov r1, sp @ r1 points to this and params
+#ifdef __ARM_PCS_VFP
+ vpush {d0-d7} @ floating point parameter on stack
+#endif
+ UNWIND .pad #PAD @ throw this data away on exception
@ (see cppuno.cxx:codeSnippet())
stmfd sp!, {r4,lr} @ save return address
@ (r4 pushed to preserve stack alignment)
@@ -30,7 +44,7 @@ privateSnippetExecutor:
blcpp_vtable_call(PLT)
add sp, sp, #4 @ no need to restore r4 (we didn't touch it)
- ldr pc, [sp], #20@ return, discarding function arguments
+ ldr pc, [sp], #DISCARDED @ return, discarding function arguments
UNWIND .fnend @ end of unwinder entry
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 9869bb5..0191e1b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -66,6 +66,10 @@ namespace
char * pTopStack = (char *)(pCallStack + 0);
char * pCppStack = pTopStack;
+#ifdef __ARM_PCS_VFP
+int dc = 0;
+char * pFloatArgs = (char *)(pCppStack - 64);
+#endif
// return
typelib_TypeDescription * pReturnTypeDescr = 0;
if (pReturnTypeRef)
@@ -122,7 +126,9 @@ namespace
{
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
+#ifndef __ARM_PCS_VFP
case typelib_TypeClass_DOUBLE:
+#endif
if ((pCppStack - pTopStack) % 8) pCppStack+=sizeof(sal_Int32);
//align to 8
break;
default:
@@ -130,13 +136,36 @@ namespace
}
#endif
-pCppArgs[nPos] = pCppStack;
-pUnoArgs[nPos] = pCppStack;
+// For armhf we get the floating point arguments from a different area of the
stack
+// TODO: deal with functions with more than 8 floating point args that need to
overflow
+// to the stack. Find such an UNO API to try on.
+#ifdef __ARM_PCS_VFP
+if (pParamTypeDescr-eTypeClass == typelib_TypeClass_FLOAT)
+{
+pCppArgs[nPos] = pUnoArgs[nPos] = pFloatArgs;
+pFloatArgs += sizeof(float);
+} else
+if (pParamTypeDescr-eTypeClass == typelib_TypeClass_DOUBLE)
+{
+if ((pFloatArgs - pTopStack) % 8)
pFloatArgs+=sizeof(float); //align to 8
+pCppArgs[nPos] = pUnoArgs[nPos] = pFloatArgs;
+pFloatArgs += sizeof(double);
+if (++dc == arm::MAX_FPR_REGS) {
+if (pCppStack - pTopStack 16)
+pCppStack = pTopStack + 16;
+pFloatArgs = pCppStack;
+}
+} else
+#endif
+pCppArgs[nPos] = pUnoArgs[nPos] = pCppStack;
+
switch
[Libreoffice-commits] .: configure.in
configure.in | 13 + 1 file changed, 13 insertions(+) New commits: commit 8fd72efca9564b94e0c9974ac1bbfbd0115b0027 Author: Rene Engelhard r...@debian.org Date: Mon Apr 16 14:07:24 2012 +0200 configure.in: fix Qt detection in Debian/Ubuntu multiarch diff --git a/configure.in b/configure.in index e75f81c..624464a 100644 --- a/configure.in +++ b/configure.in @@ -9202,6 +9202,7 @@ dnl === KDE4_CFLAGS= KDE4_LIBS= +QMAKE4=qmake MOC4=moc KDE_GLIB_CFLAGS= KDE_GLIB_LIBS= @@ -9271,6 +9272,18 @@ if test $test_kde4 = yes -a $ENABLE_KDE4 = TRUE; then AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running configure.]) fi +dnl Check for qmake +AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) +QMAKE4=$QMAKEQT4 +if test $QMAKE4 = no ; then +AC_PATH_PROG( QMAKE4, qmake, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) +if test $QMAKE4 = no ; then +AC_MSG_ERROR([Qmake not found. Please specify +the root of your Qt installation by exporting QT4DIR before running configure.]) +fi +fi + +qt_libdirs=`$QMAKE4 -query QT_INSTALL_LIBS` $qt_libdirs AC_MSG_CHECKING([for Qt4 libraries]) qt_lib_dir=no for lib_dir in $qt_libdirs; do ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in
configure.in | 13 + 1 file changed, 13 insertions(+) New commits: commit bbbe092e29ed1d44bc782d07522db1c5d646f6c5 Author: Rene Engelhard r...@debian.org Date: Mon Apr 16 14:07:24 2012 +0200 configure.in: fix Qt detection in Debian/Ubuntu multiarch Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/configure.in b/configure.in index 825edda..ea9dee1 100644 --- a/configure.in +++ b/configure.in @@ -7784,6 +7784,7 @@ dnl === KDE4_CFLAGS= KDE4_LIBS= +QMAKE4=qmake MOC4=moc KDE_GLIB_CFLAGS= KDE_GLIB_LIBS= @@ -7853,6 +7854,18 @@ if test $test_kde4 = yes -a $ENABLE_KDE4 = TRUE ; then AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running configure.]) fi +dnl Check for qmake +AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) +QMAKE4=$QMAKEQT4 +if test $QMAKE4 = no ; then +AC_PATH_PROG( QMAKE4, qmake, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) +if test $QMAKE4 = no ; then +AC_MSG_ERROR([Qmake not found. Please specify +the root of your Qt installation by exporting QT4DIR before running configure.]) +fi +fi + +qt_libdirs=`$QMAKE4 -query QT_INSTALL_LIBS` $qt_libdirs AC_MSG_CHECKING([for Qt4 libraries]) qt_lib_dir=no for lib_dir in $qt_libdirs ; do ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - testtools/source
testtools/source/bridgetest/cli/cli_cs_testobj.cs |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 27c304bda61889a2e900f2b773a102ee2b3d3364
Author: Caolán McNamara caol...@redhat.com
Date: Sun Feb 19 13:42:04 2012 +
method should be public
diff --git a/testtools/source/bridgetest/cli/cli_cs_testobj.cs
b/testtools/source/bridgetest/cli/cli_cs_testobj.cs
index f89241b..941e35b 100644
--- a/testtools/source/bridgetest/cli/cli_cs_testobj.cs
+++ b/testtools/source/bridgetest/cli/cli_cs_testobj.cs
@@ -264,7 +264,7 @@ public class BridgeTestObject : WeakBase, XRecursiveCall,
XBridgeTest2
return i2;
}
-double testTenDoubles( double d1, double d2, double d3, double d4, double
d5, double d6, double d7, double d8, double d9, double d10 )
+public double testTenDoubles( double d1, double d2, double d3, double d4,
double d5, double d6, double d7, double d8, double d9, double d10 )
{
return d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in scp2/source
configure.in |4 +++-
scp2/source/graphicfilter/module_graphicfilter.scp |3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6cc3499c777bfe07438a24b23bf79ea5c4c2cd74
Author: Rene Engelhard r...@debian.org
Date: Mon Apr 9 15:37:03 2012 +0200
fix mysqlcppconn version check
diff --git a/configure.in b/configure.in
index 090c4eb..24d55e4 100644
--- a/configure.in
+++ b/configure.in
@@ -6493,6 +6493,8 @@ if test $ENABLE_MYSQLC = YES; then
[AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++
Connectivity)], [])
AC_CHECK_LIB([mysqlcppconn], [main], [:],
[AC_MSG_ERROR(MySQL C++ Connectivity lib not found or
functional)], [])
+save_LDFLAGS=$LDFLAGS
+LDFLAGS=$LDFLAGS -lmysqlcppconn
AC_MSG_CHECKING([version])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include mysql_driver.h
@@ -6510,7 +6512,7 @@ int main(int argc, char **argv) {
]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need =
1.0.6])],[])
AC_LANG_POP([C++])
-
+LDFLAGS=$save_LDFLAGS
else
AC_MSG_RESULT([internal])
AC_MSG_CHECKING([for mysqlcppconn module])
commit 28f6fedd11aff6bf3b3579d9101e39560f83113f
Author: Rene Engelhard r...@debian.org
Date: Mon Apr 9 15:25:25 2012 +0200
actually add gid_File_Lib_CDRImport to gid_Module_Optional_Grfflt
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp
b/scp2/source/graphicfilter/module_graphicfilter.scp
index 984b247..dd66724 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -34,5 +34,6 @@ Module gid_Module_Optional_Grfflt
ParentID = gid_Module_Optional;
Default = YES;
Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
-gid_File_Lib_VisioImport,
gid_File_Share_Registry_Graphicfilter_Xcd);
+gid_File_Lib_VisioImport, gid_File_Lib_CDRImport,
+ gid_File_Share_Registry_Graphicfilter_Xcd);
End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |1 + 1 file changed, 1 insertion(+) New commits: commit f55423d1d44173dec5705700e7ebddedf8f6d250 Author: Rene Engelhard r...@debian.org Date: Tue Mar 13 14:51:51 2012 +0100 remove *.pyc in solenv/gdb in make distclean diff --git a/Makefile b/Makefile index c9ff3b8..3b55e87 100644 --- a/Makefile +++ b/Makefile @@ -322,6 +322,7 @@ endif bin/repo-list config.log config.status configure \ ooo.lst post_download post_download.log \ config_host.mk.last set_soenv.stamp src.downloaded warn + find $(SOLARENV)/gdb -name *.pyc -exec rm [} \; # # custom command ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/nsplugin/source/so_instance.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a6d65732f14e49be8ec61aac53a2a8b909d810f7
Author: Rene Engelhard r...@debian.org
Date: Wed Feb 29 23:19:00 2012 +0100
fix nsplugin to create correct com.sun.star.ucb.SimpleFileAccess instance
diff --git a/extensions/source/nsplugin/source/so_instance.cxx
b/extensions/source/nsplugin/source/so_instance.cxx
index b87b83f..8b243ae 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -239,7 +239,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
//create stream for the document
Reference ::com::sun::star::ucb::XSimpleFileAccess
xSimpleFileAccess(
-mxRemoteMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.SimpleFileAccessw))
),
+mxRemoteMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.SimpleFileAccess))
),
uno::UNO_QUERY );
if(!xSimpleFileAccess.is())
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - extensions/source
extensions/source/nsplugin/source/so_instance.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b975e59e7d5213f99ff22138a1065eb0f0a9cb07
Author: Rene Engelhard r...@debian.org
Date: Thu Mar 1 08:45:13 2012 +0100
fix nsplugin to create correct com.sun.star.ucb.SimpleFileAccess instance
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Tor Lillqvist t...@iki.fi
diff --git a/extensions/source/nsplugin/source/so_instance.cxx
b/extensions/source/nsplugin/source/so_instance.cxx
index 658d73a..f14b7b3 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -243,7 +243,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
//create stream for the document
Reference ::com::sun::star::ucb::XSimpleFileAccess
xSimpleFileAccess(
-mxRemoteMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.SimpleFileAccessw))
),
+mxRemoteMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.SimpleFileAccess))
),
uno::UNO_QUERY );
if(!xSimpleFileAccess.is())
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in extensions/source set_soenv.in
configure.in | 20
extensions/source/nsplugin/source/makefile.mk |4
extensions/source/nsplugin/source/npshell.cxx |5 -
set_soenv.in |1 +
4 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 2ec27f4b250781956aedc27a3a1b304d9e72e2ec
Author: Rene Engelhard r...@debian.org
Date: Tue Feb 21 18:07:34 2012 +0100
build also with older npapi
(merge from e6d0daefbdb8367384d8e5c217f65118bd8dc565)
Signed-off-by: Rene Engelhard r...@debian.org
diff --git a/configure.in b/configure.in
index 26a500a..94b6de9 100644
--- a/configure.in
+++ b/configure.in
@@ -6095,6 +6095,7 @@ AC_SUBST(NSS_LIBS)
dnl ===
dnl Check for system mozilla headers
dnl ===
+HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=
AC_MSG_CHECKING([which mozilla headers to use])
if test $with_system_mozilla_headers = yes; then
AC_MSG_RESULT([external])
@@ -6109,12 +6110,31 @@ if test $with_system_mozilla_headers = yes; then
if test x$LOCATED != xyes; then
AC_MSG_ERROR([npapi.h header file not found])
fi
+
+AC_LANG_PUSH([C])
+save_CFLAGS=$CFLAGS
+CFLAGS=$CFLAGS $MOZILLA_HEADERS_CFLAGS
+AC_MSG_CHECKING([for NPP_GetMIMEDescription return type])
+AC_COMPILE_IFELSE(
+[AC_LANG_SOURCE([[
+#define XP_UNIX
+#include npapi.h
+const char* NPP_GetMIMEDescription(void) { return foo; }
+]])],
+[AC_MSG_RESULT([const char*])],
+[
+AC_MSG_RESULT([char*])
+HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=TRUE
+])
+CFLAGS=$save_CFLAGS
+AC_LANG_POP([C])
else
AC_MSG_RESULT([internal])
SYSTEM_MOZILLA_HEADERS=NO
fi
AC_SUBST(MOZILLA_HEADERS_CFLAGS)
AC_SUBST(SYSTEM_MOZILLA_HEADERS)
+AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION)
dnl ===
dnl Check for system sane
diff --git a/extensions/source/nsplugin/source/makefile.mk
b/extensions/source/nsplugin/source/makefile.mk
index 5b74764..7d302b5 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -42,6 +42,10 @@ INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
INCPRE=$(SOLARINCDIR)$/npsdk
.ENDIF
+.IF $(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) TRUE
+CXXFLAGS += -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1
+.ENDIF
+
.IF $(GUI)==UNX
# not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index e25326f..be8ea84 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -361,7 +361,10 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII
:odp:OpenDocument Presentation;
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII :otp:OpenDocument
Presentation Template;
MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII :odf:OpenDocument Formula; );
-const char*
+#ifndef HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION
+const
+#endif
+char*
NPP_GetMIMEDescription(void)
{
debug_fprintf(NSP_LOG_APPEND, print by Netscape Plugin,
NPP_GetMIMEDescription:%s.\n, pMimeTypes);
diff --git a/set_soenv.in b/set_soenv.in
index 817693e..3dc9cfa 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1777,6 +1777,7 @@ ToFile( HAVE_GCC_VISIBILITY_FEATURE,
ToFile( HAVE_GCC_VISIBILITY_BROKEN,
@HAVE_GCC_VISIBILITY_BROKEN@, e );
ToFile( HAVE_LD_HASH_STYLE,@HAVE_LD_HASH_STYLE@,e );
+ToFile(
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION,@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@,e
);
ToFile( WITH_LINKER_HASH_STYLE,@WITH_LINKER_HASH_STYLE@,e );
ToFile( HAVE_LD_BSYMBOLIC_FUNCTIONS,
@HAVE_LD_BSYMBOLIC_FUNCTIONS@,e );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/qa
sc/qa/unit/data/ods/passwordOld.ods|binary
sc/qa/unit/subsequent_filters-test.cxx | 27 ++-
2 files changed, 22 insertions(+), 5 deletions(-)
New commits:
commit adb293f84d2f7e50ecc8b37ce439fd75c42ad84c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 21 09:30:26 2012 +0100
add test case for old password algorithm, related fdo#45171
(cherry picked from 8f82bccf26d14d3ad4a64739edd9ba23c124b8ad)
Signed-off-by: Rene Engelhard r...@debian.org
diff --git a/sc/qa/unit/data/ods/passwordOld.ods
b/sc/qa/unit/data/ods/passwordOld.ods
new file mode 100644
index 000..eee9ede
Binary files /dev/null and b/sc/qa/unit/data/ods/passwordOld.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 9916584..3b46a91 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -171,7 +171,9 @@ public:
void testBugFixesXLSX();
//misc tests unrelated to the import filters
-void testPassword();
+void testPasswordNew();
+void testPasswordOld();
+
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testRangeName);
@@ -185,7 +187,8 @@ public:
//disable testPassword on MacOSX due to problems with libsqlite3
//also crashes on DragonFly due to problems with nss/nspr headers
#if !defined(MACOSX) !defined(DRAGONFLY)
-CPPUNIT_TEST(testPassword);
+CPPUNIT_TEST(testPasswordOld);
+CPPUNIT_TEST(testPasswordNew);
#endif
#if TEST_BUG_FILES
@@ -196,6 +199,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
+void testPassword_Impl(const rtl::OUString rFileNameBase);
uno::Referenceuno::XInterface m_xCalcComponent;
::rtl::OUString m_aBaseString;
};
@@ -544,15 +548,13 @@ void ScFiltersTest::testBugFixesXLSX()
xDocSh-DoClose();
}
-void ScFiltersTest::testPassword()
+void ScFiltersTest::testPassword_Impl(const rtl::OUString aFileNameBase)
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(password.));
rtl::OUString aFileExtension(aFileFormats[0].pName,
strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
rtl::OUString aFilterName(aFileFormats[0].pFilterName,
strlen(aFileFormats[0].pFilterName), RTL_TEXTENCODING_UTF8) ;
rtl::OUString aFileName;
createFileURL(aFileNameBase, aFileExtension, aFileName);
rtl::OUString aFilterType(aFileFormats[0].pTypeName,
strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8);
-std::cout aFileFormats[0].pName Test std::endl;
sal_uInt32 nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
SfxFilter* aFilter = new SfxFilter(
@@ -577,6 +579,21 @@ void ScFiltersTest::testPassword()
ScDocument* pDoc = xDocSh-GetDocument();
CPPUNIT_ASSERT_MESSAGE(No Document, pDoc); //remove with first test
xDocSh-DoClose();
+
+}
+
+void ScFiltersTest::testPasswordNew()
+{
+//tests opening a file with new password algorithm
+const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(password.));
+testPassword_Impl(aFileNameBase);
+}
+
+void ScFiltersTest::testPasswordOld()
+{
+//tests opening a file with old password algorithm
+const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(passwordOld.));
+testPassword_Impl(aFileNameBase);
}
ScFiltersTest::ScFiltersTest()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - icu/arm-assembler.patch icu/makefile.mk Repository.mk svx/Executable_gengal.bin.mk
Repository.mk|1 +
icu/arm-assembler.patch | 24
icu/makefile.mk |3 ++-
svx/Executable_gengal.bin.mk | 23 +++
4 files changed, 42 insertions(+), 9 deletions(-)
New commits:
commit fdfaf2cd8488d0d527993672db9407307eab39aa
Author: Caolán McNamara caol...@redhat.com
Date: Sun Feb 19 15:51:34 2012 +
fix windows build, gengal.bin should be gengal.exe there according to scp2
diff --git a/Repository.mk b/Repository.mk
index 5df6c87..daa6d2d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -52,6 +52,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_executables,OOO,\
crashrep_com \
+ gengal \
guiloader \
guistdio \
odbcconfig \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 36f7752..3143e5f 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -25,9 +25,16 @@
#
#*
-$(eval $(call gb_Executable_Executable,gengal.bin))
+ifeq ($(OS),WNT)
+gengalbin := gengal
+else
+gengalbin := gengal.bin
+endif
+
+
+$(eval $(call gb_Executable_Executable,$(gengalbin)))
-$(eval $(call gb_Executable_set_include,gengal.bin,\
+$(eval $(call gb_Executable_set_include,$(gengalbin),\
$$(INCLUDE) \
-I$(SRCDIR)/svx/inc/ \
-I$(SRCDIR)/svx/inc/pch \
@@ -36,11 +43,11 @@ $(eval $(call gb_Executable_set_include,gengal.bin,\
-I$(OUTDIR)/inc/offapi \
))
-$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
+$(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\
$$(CXXFLAGS) \
))
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
sal \
tl \
svl \
@@ -52,16 +59,16 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
svxcore \
))
-$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
+$(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\
svx/source/gengal/gengal \
))
-$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_static_libs,$(gengalbin),\
vclmain \
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
kernel32 \
msvcrt \
oldnames \
@@ -71,7 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
dl \
pthread \
))
commit 30d5fa85a2fadd473d82fe76445840393ac6bf8d
Author: Rene Engelhard r...@debian.org
Date: Fri Feb 17 15:37:20 2012 +0100
fix icu build on arm
(from
http://patch-tracker.debian.org/patch/series/view/icu/4.4.1-7/arm-assembler.patch)
diff --git a/icu/arm-assembler.patch b/icu/arm-assembler.patch
new file mode 100644
index 000..752f9ad
--- /dev/null
+++ b/icu/arm-assembler.patch
@@ -0,0 +1,24 @@
+Index: icu-4.4.1/source/tools/toolutil/pkg_genc.c
+===
+--- misc/icu/source/tools/toolutil/pkg_genc.c 2010-04-28 11:27:46.0
-0400
misc/build/icu/source/tools/toolutil/pkg_genc.c2010-07-17
07:31:54.408752610 -0400
+@@ -1,5 +1,5 @@
+
/**
+- * Copyright (C) 2009, International Business Machines
++ * Copyright (C) 2009-2010, International Business Machines
+ * Corporation and others. All Rights Reserved.
+
***
+ */
+@@ -118,10 +118,10 @@
+ } assemblyHeader[] = {
+ {gcc,
+ .globl %s\n
+-\t.section .note.GNU-stack,\\,@progbits\n
++\t.section .note.GNU-stack,\\,%%progbits\n
+ \t.section .rodata\n
+ \t.align 8\n /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is
needed. */
+-\t.type %s,@object\n
++\t.type %s,%%object\n
+ %s:\n\n,
+
+ .long ,,HEX_0X
diff --git a/icu/makefile.mk b/icu/makefile.mk
index cb02475..338333c 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -53,7 +53,8 @@ PATCH_FILES=\
icu4c-warnings.patch \
icu4c-escapespace.patch \
icu4c-strict-c.patch \
-CVE-2011-4599.patch
+CVE-2011-4599.patch \
+arm-assembler.patch
.IF $(OS)==ANDROID
PATCH_FILES+=\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |4 1 file changed, 4 insertions(+) New commits: commit 3dfae9e2e6416ce2605b1db75e139f1185841a43 Author: Rene Engelhard r...@debian.org Date: Fri Feb 17 11:23:37 2012 +0100 fix armel/armv4t build diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 97eff51..8e69ebe 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -279,7 +279,11 @@ void callVirtualMethod( #endif //Make the call ldr r5, %[pmethod]\n\t +#ifndef __ARM_ARCH_4T__ blx r5\n\t +#else +mov lr, pc ; bx r5\n\t +#endif //Fill in return values mov %[r0], r0\n\t ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - extensions/source icu/arm-assembler.patch icu/makefile.mk np_sdk/inc Repository.mk scp2/source svx/Executable_gengal.bin.mk svx/Module_svx.mk svx/Package_gengal.mk
Repository.mk |1 extensions/source/nsplugin/source/npshell.cxx |2 icu/arm-assembler.patch | 24 ++ icu/makefile.mk |3 np_sdk/inc/npapi.h|2 scp2/source/ooo/file_ooo.scp | 22 + svx/Executable_gengal.bin.mk | 80 svx/Module_svx.mk |2 svx/Package_gengal.mk | 31 +++ svx/source/gengal/gengal.cxx |8 +- svx/source/gengal/gengal.sh | 103 ++ 11 files changed, 271 insertions(+), 7 deletions(-) New commits: commit d40a7f18a859f01678008c05cb1baf9cc272a9fb Author: Rene Engelhard r...@debian.org Date: Fri Feb 17 15:45:05 2012 +0100 make gengal work again diff --git a/Repository.mk b/Repository.mk index b87dc61..5584744 100644 --- a/Repository.mk +++ b/Repository.mk @@ -84,6 +84,7 @@ else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ +gengal.bin \ )) ifeq ($(OS),MACOSX) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 4d5d771..33432aa 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -124,6 +124,28 @@ End #endif #endif +File gid_File_Bin_Gengal +BIN_FILE_BODY; +Dir = gid_Brand_Dir_Program; +Styles = (PACKED); + #ifdef UNX +Name = gengal.bin; + #else +Name = gengal.exe; + #endif +End + +#ifdef UNX + +File gid_File_Script_Gengal +BIN_FILE_BODY; +Dir = gid_Brand_Dir_Program; +Styles = (PACKED); +Name = gengal; +End + +#endif + #if !defined(WITHOUT_MOZILLA) defined(UNX) !defined(QUARTZ) File gid_File_Bin_Pluginapp diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk new file mode 100644 index 000..36f7752 --- /dev/null +++ b/svx/Executable_gengal.bin.mk @@ -0,0 +1,80 @@ +#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# http://www.openoffice.org/license.html +# for a copy of the LGPLv3 License. +# +#* + +$(eval $(call gb_Executable_Executable,gengal.bin)) + +$(eval $(call gb_Executable_set_include,gengal.bin,\ +$$(INCLUDE) \ +-I$(SRCDIR)/svx/inc/ \ +-I$(SRCDIR)/svx/inc/pch \ +-I$(OUTDIR)/inc/offuh \ +-I$(OUTDIR)/inc/udkapi \ +-I$(OUTDIR)/inc/offapi \ +)) + +$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\ +$$(CXXFLAGS) \ +)) + +$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +sal \ +tl \ +svl \ +comphelper \ +cppu \ +cppuhelper \ +vcl \ +ucbhelper \ +svxcore \ +)) + +$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\ +svx/source/gengal/gengal \ +)) + +$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\ +vclmain \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +kernel32 \ +msvcrt \ +oldnames \ +user32 \ +uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +dl \ +pthread \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index ab1b595..fad 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Module_add_targets,svx,\ Package_globlmn_hrc \ Package_inc \ Package_sdi \ +Package_gengal \ +Executable_gengal.bin \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ diff --git a/svx/Package_gengal.mk b/svx/Package_gengal.mk new file mode 100644 index 000..c47fc85 --- /dev/null +++ b/svx/Package_gengal.mk @@ -0,0 +1,31 @@ +#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - extensions/source np_sdk/inc Repository.mk scp2/source svx/Executable_gengal.bin.mk svx/Module_svx.mk svx/Package_gengal.mk svx/source
Repository.mk |1
extensions/source/nsplugin/source/npshell.cxx |2
np_sdk/inc/npapi.h|2
scp2/source/ooo/file_ooo.scp | 22 +
svx/Executable_gengal.bin.mk | 80
svx/Module_svx.mk |2
svx/Package_gengal.mk | 31 +++
svx/source/gengal/gengal.cxx |8 +-
svx/source/gengal/gengal.sh | 103 ++
9 files changed, 245 insertions(+), 6 deletions(-)
New commits:
commit e46472ae2e4eea0e201565fb8dd7bdcb59ef9c28
Author: Rene Engelhard r...@debian.org
Date: Fri Feb 17 15:40:37 2012 +0100
char* - const char* for npapis getMIMEDescription to fix build with newer
mozs
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index 134ee36..e25326f 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -361,7 +361,7 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII
:odp:OpenDocument Presentation;
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII :otp:OpenDocument
Presentation Template;
MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII :odf:OpenDocument Formula; );
-char*
+const char*
NPP_GetMIMEDescription(void)
{
debug_fprintf(NSP_LOG_APPEND, print by Netscape Plugin,
NPP_GetMIMEDescription:%s.\n, pMimeTypes);
diff --git a/np_sdk/inc/npapi.h b/np_sdk/inc/npapi.h
index d67dcd3..4a7f7ce 100644
--- a/np_sdk/inc/npapi.h
+++ b/np_sdk/inc/npapi.h
@@ -784,7 +784,7 @@ extern C {
/* NPP_* functions are provided by the plugin and called by the navigator. */
-char* NPP_GetMIMEDescription(void);
+const char* NPP_GetMIMEDescription(void);
NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
uint16_t mode, int16_t argc, char* argn[],
char* argv[], NPSavedData* saved);
commit b948b1ec30e2001fe2386f70510c64ed9f19270c
Author: Rene Engelhard r...@debian.org
Date: Fri Feb 17 15:45:05 2012 +0100
make gengal work again
diff --git a/Repository.mk b/Repository.mk
index 251405b..5df6c87 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -78,6 +78,7 @@ else
$(eval $(call gb_Helper_register_executables,OOO,\
soffice.bin \
unopkg.bin \
+ gengal.bin \
))
ifeq ($(OS),MACOSX)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7f1cc64..e3b9abe 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -121,6 +121,28 @@ File gid_File_Exe_Nsplugin
End
#endif
+File gid_File_Bin_Gengal
+BIN_FILE_BODY;
+Dir = gid_Brand_Dir_Program;
+Styles = (PACKED);
+ #ifdef UNX
+Name = gengal.bin;
+ #else
+Name = gengal.exe;
+ #endif
+End
+
+#ifdef UNX
+
+File gid_File_Script_Gengal
+BIN_FILE_BODY;
+Dir = gid_Brand_Dir_Program;
+Styles = (PACKED);
+Name = gengal;
+End
+
+#endif
+
#if !defined(WITHOUT_MOZILLA) defined(UNX) !defined(QUARTZ)
File gid_File_Bin_Pluginapp
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
new file mode 100644
index 000..36f7752
--- /dev/null
+++ b/svx/Executable_gengal.bin.mk
@@ -0,0 +1,80 @@
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# http://www.openoffice.org/license.html
+# for a copy of the LGPLv3 License.
+#
+#*
+
+$(eval $(call gb_Executable_Executable,gengal.bin))
+
+$(eval $(call gb_Executable_set_include,gengal.bin,\
+$$(INCLUDE) \
+-I$(SRCDIR)/svx/inc/ \
+-I$(SRCDIR)/svx/inc/pch \
+-I$(OUTDIR)/inc/offuh \
+-I$(OUTDIR)/inc/udkapi \
+-I$(OUTDIR)/inc/offapi \
+))
+
+$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
+$$(CXXFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+sal \
+tl \
+svl \
+comphelper \
+cppu \
+cppuhelper \
+vcl \
+
[Libreoffice-commits] .: Makefile
Makefile |1 - 1 file changed, 1 deletion(-) New commits: commit 659f381fe2e12c8125fbf529be47624deaad4a5d Author: Rene Engelhard r...@debian.org Date: Fri Feb 10 21:21:04 2012 +0100 remove accidentially committed pyuno-py3 module from Makefile... diff --git a/Makefile b/Makefile index fba7796..04c4c8e 100644 --- a/Makefile +++ b/Makefile @@ -205,7 +205,6 @@ postgresql\ postprocess\ python\ pyuno\ -pyuno-py3\ rdbmaker\ readlicense_oo\ redland\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in Makefile
Makefile |2 ++
configure.in | 29 +
2 files changed, 31 insertions(+)
New commits:
commit 5582b7f129a4db4204107f2a38ac809684aa6893
Author: Rene Engelhard r...@debian.org
Date: Tue Feb 7 06:36:49 2012 +
add testtools to dmake_modules
diff --git a/Makefile b/Makefile
index 24b2a5b..38ed6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ postgresql\
postprocess\
python\
pyuno\
+pyuno-py3\
rdbmaker\
readlicense_oo\
redland\
@@ -226,6 +227,7 @@ stlport\
stoc\
store\
sysui\
+testtools\
tomcat\
translations\
udm\
commit 8f06cc44149ca6be84b1cd8ce0f609d2dc3db346
Author: Rene Engelhard r...@debian.org
Date: Tue Feb 7 06:28:46 2012 +
configure.in: readd arch-detection for kFreeBSD
diff --git a/configure.in b/configure.in
index 7102f10..7910b2b 100644
--- a/configure.in
+++ b/configure.in
@@ -2820,6 +2820,35 @@ freebsd*)
SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
;;
+kfreebsd*)
+COM=GCC
+GUI=UNX
+GUIBASE=unx
+OS=LINUX
+
+case $host_cpu in
+
+i*86)
+CPU=I
+CPUNAME=INTEL
+OUTPATH=unxkfgi6
+;;
+x86_64)
+CPU=X
+CPUNAME=X86_64
+LIB64=lib64
+OUTPATH=unxkfgx6
+;;
+*)
+AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+;;
+esac
+SOLAREXTRALIB=-L../$LIB64
+SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
+SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
+SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
+;;
+
linux-gnu*)
COM=GCC
GUI=UNX
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - oox/Library_oox.mk sw/inc
oox/Library_oox.mk |4
sw/inc/cellatr.hxx |1 +
2 files changed, 5 insertions(+)
New commits:
commit 0558807ddc938d945eda23da00d446df4ac5573a
Author: Rene Engelhard r...@debian.org
Date: Tue Jan 31 21:09:48 2012 +0100
build oox with explicit -Os on ia64 as it otherwise gets too big to link
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index f513f9b..a8244ac 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -40,6 +40,10 @@ $(eval $(call gb_Library_set_include,oox,\
-I$(realpath $(SRCDIR)/oox/inc) \
))
+$(eval $(call gb_Library_add_cxxflags,oox,\
+-Os \
+))
+
$(eval $(call gb_Library_add_defs,oox,\
-DOOX_DLLIMPLEMENTATION \
))
commit 6597d4bec2a26c8cf7232e02aef5632f3b8df7c5
Author: Rene Engelhard r...@debian.org
Date: Tue Jan 31 21:06:47 2012 +0100
add explicit empty SwTblBoxFormula destructor to fix armel build...
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index e081375..c147379 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -64,6 +64,7 @@ class SwTblBoxFormula : public SfxPoolItem, public
SwTableFormula
public:
SwTblBoxFormula( const String rFormula );
+~SwTblBoxFormula() {};
// pure virtual methods of SfxPoolItem
virtual int operator==( const SfxPoolItem ) const;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - oox/Library_oox.mk sw/inc
oox/Library_oox.mk |4
sw/inc/cellatr.hxx |1 +
2 files changed, 5 insertions(+)
New commits:
commit bd530e28868f8573fdb85d45c80f07a66edb8d7b
Author: Rene Engelhard r...@debian.org
Date: Tue Jan 31 21:09:48 2012 +0100
build oox with explicit -Os on ia64 as it otherwise gets too big to link
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index f513f9b..a8244ac 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -40,6 +40,10 @@ $(eval $(call gb_Library_set_include,oox,\
-I$(realpath $(SRCDIR)/oox/inc) \
))
+$(eval $(call gb_Library_add_cxxflags,oox,\
+-Os \
+))
+
$(eval $(call gb_Library_add_defs,oox,\
-DOOX_DLLIMPLEMENTATION \
))
commit be4dc9f80c62435a42c6ed0967eee443abd6e3dd
Author: Rene Engelhard r...@debian.org
Date: Tue Jan 31 21:06:47 2012 +0100
add explicit empty SwTblBoxFormula destructor to fix armel build...
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index e081375..c147379 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -64,6 +64,7 @@ class SwTblBoxFormula : public SfxPoolItem, public
SwTableFormula
public:
SwTblBoxFormula( const String rFormula );
+~SwTblBoxFormula() {};
// pure virtual methods of SfxPoolItem
virtual int operator==( const SfxPoolItem ) const;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/Library_oox.mk
oox/Library_oox.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 95c826237d264457b77f3c6f782bc5665897c411 Author: Rene Engelhard r...@debian.org Date: Tue Jan 31 21:26:50 2012 +0100 add missed ifeq to check for IA64... diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index a8244ac..089605d 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -40,9 +40,11 @@ $(eval $(call gb_Library_set_include,oox,\ -I$(realpath $(SRCDIR)/oox/inc) \ )) +ifeq ($(CPUNAME),IA64) $(eval $(call gb_Library_add_cxxflags,oox,\ -Os \ )) +endif $(eval $(call gb_Library_add_defs,oox,\ -DOOX_DLLIMPLEMENTATION \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/Library_oox.mk
oox/Library_oox.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 168d3b12482e2cf1bbd331ba4e9d2d86f0184273 Author: Rene Engelhard r...@debian.org Date: Tue Jan 31 21:26:50 2012 +0100 add missed ifeq to check for IA64... diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index a8244ac..089605d 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -40,9 +40,11 @@ $(eval $(call gb_Library_set_include,oox,\ -I$(realpath $(SRCDIR)/oox/inc) \ )) +ifeq ($(CPUNAME),IA64) $(eval $(call gb_Library_add_cxxflags,oox,\ -Os \ )) +endif $(eval $(call gb_Library_add_defs,oox,\ -DOOX_DLLIMPLEMENTATION \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/Library_oox.mk
oox/Library_oox.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 8d2ec1da0449271888d8912306ad8e8a9220c5a2 Author: Rene Engelhard r...@debian.org Date: Tue Jan 31 23:57:37 2012 +0100 fix -Os comment in oox/Library_oox.mk diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 6e4b60e..0171b4e 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -41,9 +41,9 @@ $(eval $(call gb_Library_set_include,oox,\ )) ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-IA64) -#Debian Linux ia64 fails at compile time on -#oox/source/drawingml/customshapepresets*.cxx which are apparently too large -#for the toolchain to handle with default optimization +# at least Debian Linux ia64 fails at compile time on +# link libooxlo.so which is apparently too large +# for the toolchain to handle with default optimization $(eval $(call gb_Library_add_cxxflags,oox,\ -Os \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/JavaClassSet.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 80a1001a206a3e3b6bf83b9734580cc7f46b0e33 Author: Rene Engelhard r...@debian.org Date: Thu Jan 19 15:19:42 2012 +0100 honour JAVAFLAGS in gbuild diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 6befda1..6fd19fe 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,7 @@ # #* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) gb_JavaClassSet_JAVACDEBUG := ifneq ($(gb_DEBUGLEVEL),0) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/JavaClassSet.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f150e63a4df2f4dccc6eeeac3a2462429ebc4c2 Author: Rene Engelhard r...@debian.org Date: Thu Jan 19 15:19:42 2012 +0100 honour JAVAFLAGS in gbuild diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index cea27c0..d8c648e 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,7 @@ # #* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) gb_JavaClassSet_JAVACDEBUG := ifneq ($(gb_DEBUGLEVEL),0) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - RepositoryModule_ooo.mk
RepositoryModule_ooo.mk |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit cdebe172bf0e276983421f73e62ffcae84c6cbcb Author: Rene Engelhard r...@debian.org Date: Fri Dec 30 16:01:28 2011 +0100 build qadevOOo only if SOLAR_JAVA and OOO_JUNIT_JAR are set diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index f59b2e0..5f7fa6f 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -67,7 +67,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ package \ padmin \ psprint_config \ -qadevOOo \ regexp \ reportdesign \ sane \ @@ -108,6 +107,14 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ xmlscript \ )) +ifneq ($(SOLAR_JAVA),) + ifneq $(OOO_JUNIT_JAR) +$(eval $(call gb_Module_add_moduledirs,ooo,\ +qadevOOo \ +)) + endif +endif + # these have only migrated subsequentcheck for now $(eval $(call gb_Module_add_moduledirs,ooo,\ configmgr \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in connectivity/prj dbaccess/prj forms/prj tail_build/prj testgraphical/prj toolkit/prj unotest/prj
configure.in|3 +++ connectivity/prj/build.lst |2 +- dbaccess/prj/build.lst |2 +- forms/prj/build.lst |2 +- tail_build/prj/build.lst|2 +- testgraphical/prj/build.lst |2 +- toolkit/prj/build.lst |2 +- unotest/prj/build.lst |2 +- 8 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 9c0643eb010dc5685cd97cb54a7a1ac1fa32f68f Author: Rene Engelhard r...@debian.org Date: Fri Dec 30 16:31:23 2011 +0100 build qadevOOo only if OOO_JUNIT_JAR are set (add BUILD_TYPE) diff --git a/configure.in b/configure.in index 0a39ef4..290b294 100644 --- a/configure.in +++ b/configure.in @@ -9137,6 +9137,9 @@ provide a full junit jar or use --without-junit]) location (/usr/share/java), specify its pathname via --with-junit=..., or disable it via --without-junit]) fi +if test $OOO_JUNIT_JAR != ; then + BUILD_TYPE=$BUILD_TYPE QADEVOOO +fi fi AC_SUBST(OOO_JUNIT_JAR) diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index fd358fa..f4851c5 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity:shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL +cn connectivity:shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL cn connectivityusr1- all cn_mkout NULL cn connectivity\incnmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index 45372a7..ce429ec 100644 --- a/dbaccess/prj/build.lst +++ b/dbaccess/prj/build.lst @@ -1,3 +1,3 @@ -ba dbaccess: TRANSLATIONS:translations BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt test NULL +ba dbaccess: TRANSLATIONS:translations BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript LIBXSLT:libxslt test NULL ba dbaccess usr1- all ba_mkout NULL ba dbaccess\prjnmake - all ba_prj NULL diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 819a57c..131e8e4 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -1,4 +1,4 @@ -fm forms :TRANSLATIONS:translations oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL +fm forms :TRANSLATIONS:translations oovbaapi svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL fm forms usr1- all fm_mkofrm NULL fm forms\prj nmake - all fm_prj NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 72e90b4..394ac7d 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL +tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL tb tail_build\prj nmake - all tb_prj NULL diff --git a/testgraphical/prj/build.lst b/testgraphical/prj/build.lst index 75878a6..d7b1a92 100644 --- a/testgraphical/prj/build.lst +++ b/testgraphical/prj/build.lst @@ -1,4 +1,4 @@ -gfxcmptestgraphical :
[Libreoffice-commits] .: configure.in connectivity/prj dbaccess/prj forms/prj tail_build/prj toolkit/prj unotest/prj
configure.in |3 +++ connectivity/prj/build.lst |2 +- dbaccess/prj/build.lst |2 +- forms/prj/build.lst|2 +- tail_build/prj/build.lst |2 +- toolkit/prj/build.lst |2 +- unotest/prj/build.lst |2 +- 7 files changed, 9 insertions(+), 6 deletions(-) New commits: commit 36d7f011a35c282c6c5f219681502e85dd8b768c Author: Rene Engelhard r...@debian.org Date: Fri Dec 30 16:31:23 2011 +0100 build qadevOOo only if OOO_JUNIT_JAR are set (add BUILD_TYPE) diff --git a/configure.in b/configure.in index 405e64e..6842771 100644 --- a/configure.in +++ b/configure.in @@ -9213,6 +9213,9 @@ provide a full junit jar or use --without-junit]) location (/usr/share/java), specify its pathname via --with-junit=..., or disable it via --without-junit]) fi +if test $OOO_JUNIT_JAR != ; then + BUILD_TYPE=$BUILD_TYPE QADEVOOO +fi fi AC_SUBST(OOO_JUNIT_JAR) diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index fd358fa..f4851c5 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity:shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL +cn connectivity:shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL cn connectivityusr1- all cn_mkout NULL cn connectivity\incnmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index 45372a7..ce429ec 100644 --- a/dbaccess/prj/build.lst +++ b/dbaccess/prj/build.lst @@ -1,3 +1,3 @@ -ba dbaccess: TRANSLATIONS:translations BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt test NULL +ba dbaccess: TRANSLATIONS:translations BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript LIBXSLT:libxslt test NULL ba dbaccess usr1- all ba_mkout NULL ba dbaccess\prjnmake - all ba_prj NULL diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 819a57c..131e8e4 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -1,4 +1,4 @@ -fm forms :TRANSLATIONS:translations oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL +fm forms :TRANSLATIONS:translations oovbaapi svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL fm forms usr1- all fm_mkofrm NULL fm forms\prj nmake - all fm_prj NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 6ae2a1c..b00d683 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL tb tail_build\prj nmake - all tb_prj NULL diff --git a/toolkit/prj/build.lst
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/qa
connectivity/qa/connectivity/tools/makefile.mk |7 +++ connectivity/qa/makefile.mk|6 ++ 2 files changed, 13 insertions(+) New commits: commit 7731d8146ac7d26869dce7656c24c4e431938c5c Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Dec 30 14:30:06 2011 -0600 now that QADEVOOO build_type exist we need to use it... diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index d77da7f..897a85f 100755 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -38,6 +38,11 @@ all: @echo Java not available. Build skipped .ELSE +.IF $(BUILD_TYPE) == $(BUILD_TYPE:s/QADEVOOO//) +all: +@echo QADEVOO not set. Build skipped +.ELSE + #- compile .java files - JARFILES= ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar @@ -56,6 +61,8 @@ ALL : ALLTAR ALL: ALLDEP .ENDIF +.ENDIF # QADEVOOO option .ENDIF # $(SOLAR_JAVA) == .INCLUDE : target.mk + diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index 3081a75..76028ad 100755 --- a/connectivity/qa/makefile.mk +++ b/connectivity/qa/makefile.mk @@ -33,6 +33,10 @@ PACKAGE = complex/connectivity # --- Settings - .INCLUDE: settings.mk +.IF $(BUILD_TYPE) == $(BUILD_TYPE:s/QADEVOOO//) +all: +@echo QADEVOO not set. Build skipped +.ELSE #- compile .java files - JARFILES= ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar @@ -65,6 +69,7 @@ ALL : ALLTAR .ELSE ALL: ALLDEP .ENDIF +.ENDIF # QADEVOOO option .INCLUDE : target.mk @@ -76,3 +81,4 @@ run: $(CLASSDIR)$/$(JARTARGET) run_%: $(CLASSDIR)$/$(JARTARGET) +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//) + ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a8feb5b1df99c12a5cb644097f935e9ccf512ed5
Author: Rene Engelhard r...@debian.org
Date: Sat Dec 24 14:08:51 2011 +0100
support libebook-1.2.so.12 (evolution 3.2)
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index 12465f6..5cf5247 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -33,6 +33,7 @@
#define DECLARE_FN_POINTERS 1
#include EApi.h
static const char *eBookLibNames[] = {
+libebook-1.2.so.12, // bumped again
libebook-1.2.so.10, // bumped again
libebook-1.2.so.9, // evolution-2.8
libebook-1.2.so.5, // evolution-2.4 and 2.6+
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 7dfc54c7337f77be8e258a218df741c330904f73
Author: Rene Engelhard r...@debian.org
Date: Sat Dec 24 14:08:51 2011 +0100
support libebook-1.2.so.12 (evolution 3.2)
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index 12465f6..5cf5247 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -33,6 +33,7 @@
#define DECLARE_FN_POINTERS 1
#include EApi.h
static const char *eBookLibNames[] = {
+libebook-1.2.so.12, // bumped again
libebook-1.2.so.10, // bumped again
libebook-1.2.so.9, // evolution-2.8
libebook-1.2.so.5, // evolution-2.4 and 2.6+
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/extensions/post_AuxTargets.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 12775a8890726df230e2c8c93bacf552eee14b47 Author: Rene Engelhard r...@debian.org Date: Wed Dec 21 17:19:28 2011 +0100 don't remove configure and aclocal.m4 in distclean anymore diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index 119536c..72414b7 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -78,8 +78,8 @@ clean-build: distclean: clean if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi - cd $(SRCDIR) rm -rf Env.Host.sh aclocal.m4 autogen.lastrun autom4te.cache \ - bin/repo-list build_env config.log config.status configure \ + cd $(SRCDIR) rm -rf Env.Host.sh autogen.lastrun autom4te.cache \ + bin/repo-list build_env config.log config.status \ desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/gnome/module_gnome.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bacf1f9d7be4030b292e4f586654907601b9e4ed Author: Rene Engelhard r...@debian.org Date: Tue Dec 20 05:39:09 2011 +0100 evoab is gid_File_Lib_Evoab since long(er), not gid_File_Lib_Evoab_2 diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 8b84916..88a2926 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -41,7 +41,7 @@ Module gid_Module_Optional_Gnome XpdCheckSolaris = SUNWgnome-vfs; #endif Files = ( - gid_File_Lib_Evoab_2, + gid_File_Lib_Evoab, gid_File_Lib_Fps_Gnome, gid_File_Lib_Vclplug_Gtk, #ifdef ENABLE_GTK3 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source
scp2/source/gnome/module_gnome.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d12c87415711b8d73604a5fd16fac1590b1a92bc Author: Rene Engelhard r...@debian.org Date: Tue Dec 20 05:39:09 2011 +0100 evoab is gid_File_Lib_Evoab since long(er), not gid_File_Lib_Evoab_2 diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 8b84916..88a2926 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -41,7 +41,7 @@ Module gid_Module_Optional_Gnome XpdCheckSolaris = SUNWgnome-vfs; #endif Files = ( - gid_File_Lib_Evoab_2, + gid_File_Lib_Evoab, gid_File_Lib_Fps_Gnome, gid_File_Lib_Vclplug_Gtk, #ifdef ENABLE_GTK3 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/graphicfilter/module_graphicfilter.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90e94d06bc6123687bcf47eaf4e03959491adef2 Author: Rene Engelhard r...@debian.org Date: Fri Dec 16 17:51:33 2011 +0100 actually add gid_File_Lib_VisioImport to gid_Module_Optional_Grfflt diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 5b6dffb..984b247 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -34,5 +34,5 @@ Module gid_Module_Optional_Grfflt ParentID = gid_Module_Optional; Default = YES; Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport, -gid_File_Share_Registry_Graphicfilter_Xcd); +gid_File_Lib_VisioImport, gid_File_Share_Registry_Graphicfilter_Xcd); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source
scp2/source/graphicfilter/module_graphicfilter.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 17c1f97f55183719b05d91580c937079454b22d3 Author: Rene Engelhard r...@debian.org Date: Fri Dec 16 17:51:33 2011 +0100 actually add gid_File_Lib_VisioImport to gid_Module_Optional_Grfflt diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 5b6dffb..984b247 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -34,5 +34,5 @@ Module gid_Module_Optional_Grfflt ParentID = gid_Module_Optional; Default = YES; Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport, -gid_File_Share_Registry_Graphicfilter_Xcd); +gid_File_Lib_VisioImport, gid_File_Share_Registry_Graphicfilter_Xcd); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - bin/distro-install-desktop-integration solenv/gbuild
bin/distro-install-desktop-integration |2 +- solenv/gbuild/extensions/post_AuxTargets.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit b7b23ac999393c02ec68f19667960183f512bf43 Author: Rene Engelhard r...@debian.org Date: Tue Nov 29 22:28:58 2011 + don't remove Makefile on make distclean, we need it now in all cases... diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index a08d46e..962f275 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -71,7 +71,7 @@ clean-build: distclean: clean if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi - cd $(SRCDIR) rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun autom4te.cache \ + cd $(SRCDIR) rm -rf Env.Host.sh aclocal.m4 autogen.lastrun autom4te.cache \ bin/repo-list build_env config.log config.status configure \ desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn commit 7f31dfc4b6265b7115f07bc711c969e0e86e5118 Author: Rene Engelhard r...@debian.org Date: Fri Nov 11 16:46:55 2011 + fix test: s/==/=/ diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index f988e12..6e45285 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -66,7 +66,7 @@ add_wrapper() # do we want compat oowrapper? oowrapper_name= -if test $WITH_COMPAT_OOWRAPPERS == 'YES' ; then +if test $WITH_COMPAT_OOWRAPPERS = 'YES' ; then oowrapper_name=`echo $lowrapper_name | sed -e s/^lo/oo/` # oo prefix only for wrappers stating with lo prefix test $oowrapper_name = $lowrapper_name oowrapper_name= ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: np_sdk/prj
np_sdk/prj/d.lst |1 + 1 file changed, 1 insertion(+) New commits: commit a468e0cb567ef84d238cc0b1a5ad265825a54f02 Author: Rene Engelhard r...@debian.org Date: Tue Nov 8 02:05:20 2011 +0100 deliver .h also from np_sdk/inc diff --git a/np_sdk/prj/d.lst b/np_sdk/prj/d.lst index cfd2429..ec0a6fa 100644 --- a/np_sdk/prj/d.lst +++ b/np_sdk/prj/d.lst @@ -1,6 +1,7 @@ mkdir: %_DEST%\inc\npsdk ..\mozsrc\*.h %_DEST%\inc\npsdk\*.h +..\inc\*.h %_DEST%\inc\npsdk\*.h ..\%__SRC%\slo\npunix.o %_DEST%\lib\npunix.o ..\%__SRC%\slo\npunix.obj %_DEST%\lib\npunix.obj ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 910bbf6f1e4c6bed983b51bc611b25a119960809
Author: Cosimo Cecchi cosi...@gnome.org
Date: Thu Nov 3 20:35:11 2011 +
fix gtk2 build
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 2df357b..f3e7f6f 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -751,7 +751,7 @@ static void lcl_set_accept_focus( GtkWindow* pWindow,
gboolean bAccept, bool bBe
else if( ! bBeforeRealize )
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
-XLIB_Window aWindow = widget_get_xid(m_pWindow);
+XLIB_Window aWindow = widget_get_xid(GTK_WIDGET(pWindow));
XWMHints* pHints = XGetWMHints( pDisplay, aWindow );
if( ! pHints )
{
@@ -814,14 +814,14 @@ static void lcl_set_user_time( GtkWindow* i_pWindow,
guint32 i_nTime )
p_gdk_x11_window_set_user_time =
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin,
gdk_x11_window_set_user_time );
}
if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( widget_get_window(i_pWindow), i_nTime
);
+p_gdk_x11_window_set_user_time(
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
else
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
if( nUserTime )
{
-XChangeProperty( pDisplay, widget_get_xid(i_pWindow),
+XChangeProperty( pDisplay, widget_get_xid(GTK_WIDGET(i_pWindow)),
nUserTime, XA_CARDINAL, 32,
PropModeReplace, (unsigned char*)i_nTime, 1 );
}
@@ -3251,7 +3251,7 @@ gboolean implDelayedFullScreenHdl (void *pWindow)
}
}
-gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*, gpointer frame )
+gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame
)
{
GtkSalFrame* pThis = (GtkSalFrame*)frame;
@@ -3280,7 +3280,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*,
gpointer frame )
if( bSetFocus )
{
XSetInputFocus( pThis-getDisplay()-GetDisplay(),
-widget_get_xid(m_pWindow),
+widget_get_xid(pWidget),
RevertToParent, CurrentTime );
}
#else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dictionaries/pt_PT
dictionaries/pt_PT/dictionaries.xcu.bak | 44 1 file changed, 44 deletions(-) New commits: commit ca7e6f5cabfeaa82aa4479b8aa1151c26d903993 Author: Rene Engelhard r...@debian.org Date: Wed Nov 2 18:24:33 2011 +0100 remove bogus dictionaries/pt_PT/dictionaries.xcu.bak diff --git a/dictionaries/pt_PT/dictionaries.xcu.bak b/dictionaries/pt_PT/dictionaries.xcu.bak deleted file mode 100644 index 0979975..000 --- a/dictionaries/pt_PT/dictionaries.xcu.bak +++ /dev/null @@ -1,44 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -oor:component-data xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; oor:name=Linguistic oor:package=org.openoffice.Office - node oor:name=ServiceManager -node oor:name=Dictionaries -node oor:name=HunSpellDic_pt_PT oor:op=fuse -prop oor:name=Locations oor:type=oor:string-list -value%origin%/dictionaries/pt_PT.aff %origin%/dictionaries/pt_PT.dic/value -/prop -prop oor:name=Format oor:type=xs:string -valueDICT_SPELL/value -/prop -prop oor:name=Locales oor:type=oor:string-list -valuept-PT/value -/prop -/node - -node oor:name=HyphDic_pt_PT oor:op=fuse -prop oor:name=Locations oor:type=oor:string-list -value%origin%/dictionaries/hyph_pt_PT.dic/value -/prop -prop oor:name=Format oor:type=xs:string -valueDICT_HYPH/value -/prop -prop oor:name=Locales oor:type=oor:string-list -valuept-PT/value -/prop -/node - -node oor:name=ThesDic_pt_PT oor:op=fuse -prop oor:name=Locations oor:type=oor:string-list -value%origin%/dictionaries/th_pt_PT_v2.dat %origin%/dictionaries/th_pt_PT_v2.idx/value -/prop -prop oor:name=Format oor:type=xs:string -valueDICT_THES/value -/prop -prop oor:name=Locales oor:type=oor:string-list -valuept-PT/value -/prop -/node -/node - /node -/oor:component-data - - ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: set_soenv.in
set_soenv.in |1 - 1 file changed, 1 deletion(-) New commits: commit a5925095882efee3cd2cfbecfdb43c72b47caf34 Author: Rene Engelhard r...@debian.org Date: Wed Nov 2 17:35:05 2011 + remove obsolete @SYSTEM_TRANSLATE_TOOLKIT@ from set_soenv.in diff --git a/set_soenv.in b/set_soenv.in index 6a97b45..0344653 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1927,7 +1927,6 @@ ToFile( WITH_EXTRA_GALLERY, @WITH_EXTRA_GALLERY@, e ); ToFile( WITH_EXTRA_TEMPLATE, @WITH_EXTRA_TEMPLATE@, e ); ToFile( WITH_EXTRA_SAMPLE, @WITH_EXTRA_SAMPLE@, e ); ToFile( WITH_EXTRA_FONT, @WITH_EXTRA_FONT@, e ); -ToFile( SYSTEM_TRANSLATE_TOOLKIT, @SYSTEM_TRANSLATE_TOOLKIT@,e ); ToFile( SYSTEM_DB, @SYSTEM_DB@,e ); ToFile( SYSTEM_DB_CFLAGS, @SYSTEM_DB_CFLAGS@, e ); ToFile( DB_LIB,@DB_LIB@, e ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libxmlsec/makefile.mk
libxmlsec/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e80f012e75dfbcd3343fc45e35e0b32ca754b39 Author: Rene Engelhard r...@debian.org Date: Wed Oct 19 08:58:26 2011 + make libxmlsec be built again with SYSTEM_MOZILLA=YES diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 673cdbf..3ef990f 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -35,7 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .INCLUDE : settings.mk -.IF $(ENABLE_NSS_MODULE) == NO +.IF $(ENABLE_NSS_MODULE) == NO $(SYSTEM_MOZILLA) != YES @all: @echo NSS module disabled = no libxmlsec .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit aaf48368c80e60d6bf325573bab89a2efae6da4c Author: Rene Engelhard r...@debian.org Date: Tue Oct 18 21:26:40 2011 +0200 remove accidential Debian-only commit diff --git a/configure.in b/configure.in index 0fb9e7b..157a527 100644 --- a/configure.in +++ b/configure.in @@ -6485,9 +6485,8 @@ if test -n $with_system_lpsolve -o -n $with_system_libs \ # some systems need this. Like Ubuntu AC_CHECK_LIB(m, floor) AC_CHECK_LIB(dl, dlopen) -AC_CHECK_LIB(colamd, colamd) AC_CHECK_LIB(lpsolve55, make_lp, , -[ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lpsolve]) +[ AC_MSG_ERROR(lpsolve library not found or too old.)], []) MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS lpsolve55.dll else AC_MSG_RESULT([internal]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - configure.in Makefile.in scripting/Jar_ScriptProviderForBeanShell.mk swext/Extension_wiki-publisher.mk swext/Jar_mediawiki.mk
Makefile.in |2 +- configure.in|7 ++- scripting/Jar_ScriptProviderForBeanShell.mk |5 + swext/Extension_wiki-publisher.mk |2 ++ swext/Jar_mediawiki.mk | 18 ++ 5 files changed, 32 insertions(+), 2 deletions(-) New commits: commit a8699a2665b465a19db1fde1159dbeb70253da0b Author: Rene Engelhard r...@debian.org Date: Sun Oct 16 13:15:42 2011 + add Class-Path: to ScriptProviderForBeanShell.jar when using system-beanshell diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index e81f5b0..7fd3201 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -39,6 +39,11 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\ bsh \ )) +ifeq ($(SYSTEM_BSH),YES) +$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell,\ +$(BSH_JAR) \ +)) +endif $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com)) commit 8e970bc4e75caf40324f821123fdce36cb01918c Author: Rene Engelhard r...@debian.org Date: Sun Oct 16 12:19:25 2011 + fix swext build with SYSTEM_APACHE_COMMONS==YES diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 278b467..bdf0855 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -31,10 +31,12 @@ WIKISRC := $(SRCDIR)/swext/mediawiki $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src)) +ifneq ($(SYSTEM_APACHE_COMMONS),YES) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar)) +endif $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu)) diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk index acafa86..2a1c7ef 100644 --- a/swext/Jar_mediawiki.mk +++ b/swext/Jar_mediawiki.mk @@ -33,12 +33,30 @@ $(eval $(call gb_Jar_set_packageroot,mediawiki,com)) $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF)) +ifeq ($(SYSTEM_APACHE_COMMONS),YES) +# FIXME: use gb_Jar_use_externals? +# for the build +$(eval $(call gb_Jar_add_jars,mediawiki,\ + $(COMMONS_CODEC_JAR) \ + $(COMMONS_LANG_JAR) \ + $(COMMONS_HTTPCLIENT_JAR) \ + $(COMMONS_LOGGING_JAR) \ +)) +# Class-Path: in MANIFEST.MF +$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\ + $(COMMONS_CODEC_JAR) \ + $(COMMONS_LANG_JAR) \ + $(COMMONS_HTTPCLIENT_JAR) \ + $(COMMONS_LOGGING_JAR) \ +)) +else $(eval $(call gb_Jar_set_jarclasspath,mediawiki,\ commons-codec-1.3.jar \ commons-lang-2.3.jar \ commons-httpclient-3.1.jar \ commons-logging-1.1.1.jar \ )) +endif $(eval $(call gb_Jar_add_jars,mediawiki,\ $(OUTDIR)/bin/juh.jar \ commit 4a1d3a8cfef7ebcbb0fe311648237c42f40509f8 Author: Rene Engelhard r...@debian.org Date: Sat Oct 15 19:46:00 2011 + don't remove bootstrap in make distclean diff --git a/Makefile.in b/Makefile.in index a7d884c..197eb8e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -86,7 +86,7 @@ ifeq (@BUILD_DMAKE@,YES) -test -f dmake/Makefile $(MAKE) -C dmake distclean endif rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun autom4te.cache \ - bin/repo-list bootstrap config.log config.status configure \ + bin/repo-list config.log config.status configure \ desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn commit 6923f3fc13f560fd0a2f4f8a12b6f4d45fb4da71 Author: Rene Engelhard r...@debian.org Date: Sat Oct 15 17:44:01 2011 + don't grep /proc/cpuinfo but use getconf on Linux diff --git a/configure.in b/configure.in index d7b9a5c..07e2e50 100644 --- a/configure.in +++ b/configure.in @@ -6488,8 +6488,9 @@ if test -n $with_system_lpsolve -o -n $with_system_libs \ # some systems need this. Like Ubuntu AC_CHECK_LIB(m, floor) AC_CHECK_LIB(dl, dlopen) +AC_CHECK_LIB(colamd, colamd) AC_CHECK_LIB(lpsolve55,
[Libreoffice-commits] .: bin/lo-xlate-lang
bin/lo-xlate-lang | 210 ++
1 file changed, 210 insertions(+)
New commits:
commit 8d153dc965379672321b7c351db4b9c41473f6cf
Author: Rene Engelhard r...@debian.org
Date: Thu Oct 13 14:58:48 2011 +0200
add lo-xlate-lang (formerly openoffice-xlate-lang in libreoffice-build)
diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang
new file mode 100755
index 000..7549f85
--- /dev/null
+++ b/bin/lo-xlate-lang
@@ -0,0 +1,210 @@
+#!/usr/bin/env perl
+
+use strict;
+
+my $progname=$0; $progname = $ if $progname =~ m,[^/]+$,;
+
+my %PREFIX; # used to search for prefix numbers
+my %ISOCODE; # used to search for iso codes
+my %LANGUAGE; # used to search for language names
+
+#===
+# initialisation code - stuff the DATA into the CODES hash
+#===
+sub init {
+
+my $prefix;
+my $code;
+my $name;
+
+
+while (DATA)
+{
+next unless /\S/;
+chop;
+($prefix, $code, $name ) = split(/:/, $_, 3);
+$PREFIX{$prefix} = $prefix;
+$PREFIX{$code} = $prefix;
+$PREFIX{$name} = $prefix;
+
+$ISOCODE{$prefix} = $code;
+$ISOCODE{$code} = $code;
+$ISOCODE{$name} = $code;
+
+$LANGUAGE{$prefix} = $name;
+$LANGUAGE{$code} = $name;
+$LANGUAGE{$name} = $name;
+}
+}
+
+
+#===
+# usage - error message
+#===
+sub usage {
+my $errmsg = shift;
+my $errcode = shift;
+print STDERR $progname: $errmsg\n if $errmsg;
+print STDERR $progname: Converts between prefix codes, iso codes and
langnames\n;
+print STDERR Usage: $progname (-i|-l|-p|-h) code|all\n;
+print STDERR -i code: convert prefix to iso code (ex: 03 - pt)\n;
+print STDERR -l code: convert iso code to language name (ex: pt -
portuguese)\n;
+print STDERR -p code: convert iso code to prefix (ex: pt - 03)\n;
+print STDERR the code can either be an iso code, a prefix or even a
language name\n;
+print STDERR The special code \all\ asks for all possible
values.\n\n;
+print STDERR -h : print this help\n;
+exit $errcode;
+}
+
+#===
+# main -
+#===
+init();
+
+my ($LanguageCode, $LanguageMap);
+
+while ($ARGV[0] =~ /^-/) {
+$_ = shift;
+if (m/^-i/) {
+ $LanguageMap = \%ISOCODE;
+}
+elsif (m/^-l/) {
+ $LanguageMap = \%LANGUAGE;
+}
+elsif (m/^-p/) {
+ $LanguageMap = \%PREFIX;
+}
+elsif (m/^-h/) {
+ usage(,0);
+}
+else {
+ usage (unknown option $_,1);
+}
+}
+
+usage (no operation specified on command line,1)
+if (!$LanguageMap);
+
+usage (no language code specified on command line,1)
+if (!($LanguageCode = shift));
+
+if ($LanguageCode =~ (m/^all$/)) {
+# Asked for all codes
+my $old=;
+foreach my $key (sort values %$LanguageMap) {
+ if ($key ne $old) {
+ print $key ;
+ $old=$key;
+ }
+}
+print \n;
+exit 0;
+}
+
+usage (no mapping found for $LanguageCode\n,1)
+ if (!(%$LanguageMap-{$LanguageCode}));
+
+print $LanguageMap-{$LanguageCode}, \n;
+
+1;
+
+# keep third column names here with openoffice-dir/share/*/long lang name/
+
+__DATA__
+:be:belarussian
+:bg:bulgarian
+:bn:bengali
+:bs:bosnian
+:en-GB:english_british
+:gu:gujarati
+:hr:croatian
+:km:khmer
+:ku:kurdish
+:pa-IN:punjabi
+:rw:kinarwanda
+:xh:xhosa
+:lt:lithuanian
+:ne:nepali
+:vi:vietnamese
+:nso:northern_sotho
+:ss:swazi
+:sr:serbian
+:ve:venda
+:ts:tsonga
+:st:southern_sotho
+:tn:tswana
+:br:breton
+:ga:gaelic
+:gd:scottish_gaelic
+:th:thai
+:hi:hindi
+:bs-BA:bosnian
+:en-ZA:english_southafrican
+:mk:macedonian
+:as:assamese
+:ml:malayalam
+:mr:marathi
+:or:oriya
+:ur:urdu
+:fa:farsi
+:lv:latvian
+:nr:ndebele
+:ne:nepalese
+:sh:serbian
+:te:telugu
+:ta:tamil
+:tg:tajik
+:ka:georgian
+:eo:esperanto
+:uk:ukrainian
+:kk:kazahk
+:dz:dzongkha
+:kn:kannada
+:gl:galician
+:uz:uzbek
+:oc:occitan
+:ro:romanian
+:eu:basque
+:mn:mongolian
+:om:oromo
+:bo:tibetan
+:ast:asturian
+:is:icelandic
+:ug:uighur
+:si:sinhala
+:id:indonesian
+:my:burmese
+01:en-US:english_american
+03:pt:portuguese
+07:ru:russian
+26:ns:northernsotho
+27:af:afrikaans
+28:zu:zulu
+30:el:greek
+31:nl:dutch
+33:fr:french
+34:es:spanish
+35:fi:finnish
+36:hu:hungarian
+37:ca:catalan
+39:it:italian
+42:cs:czech
+43:sk:slovak
+45:da:danish
+46:sv:swedish
+47:nb:norwegian
+48:pl:polish
+49:de:german
+50:sl:slovenian
+53:cy:welsh
+55:pt-BR:portuguese_brazilian
+77:et:estonian
+79:nn:norwegian_nynorsk
+81:ja:japanese
+82:ko:korean
+86:zh-CN:chinese_simplified
+88:zh-TW:chinese_traditional
[Libreoffice-commits] .: 2 commits - libexttextcat/makefile.mk libexttextcat/prj libtextcat/libexttextcat-3.0.1.patch libtextcat/makefile.mk libtextcat/prj lingucomponent/prj lingucomponent/source
libexttextcat/makefile.mk | 87 libexttextcat/prj/build.lst|3 libexttextcat/prj/d.lst| 10 ++ libtextcat/libexttextcat-3.0.1.patch | 20 libtextcat/makefile.mk | 90 - libtextcat/prj/build.lst |3 libtextcat/prj/d.lst | 10 -- lingucomponent/prj/build.lst |2 lingucomponent/source/languageguessing/makefile.mk |8 + 9 files changed, 107 insertions(+), 126 deletions(-) New commits: commit d001fb170616df7b6068e66e9f9a573ed33b8445 Author: Rene Engelhard r...@debian.org Date: Tue Oct 4 14:37:36 2011 + update LIBTEXTCATLIB diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk index 624ccba..b4e5bc9 100644 --- a/lingucomponent/source/languageguessing/makefile.mk +++ b/lingucomponent/source/languageguessing/makefile.mk @@ -39,9 +39,13 @@ ENABLE_EXCEPTIONS=TRUE # --- Files .IF $(GUI)==UNX || $(GUI)==MAC || $(GUI)$(COM)==WNTGCC -LIBTEXTCATLIB=-ltextcat +.IF $(SYSTEM_LIBEXTTEXTCAT) == YES +LIBTEXTCATLIB=$(LIBEXTTEXTCAT_LIBS) +.ELSE +LIBTEXTCATLIB=-lexttextcat +.ENDIF .ELSE # $(GUI)==UNX || $(GUI)==MAC -LIBTEXTCATLIB=ilibtextcat.lib +LIBTEXTCATLIB=ilibexttextcat.lib .ENDIF # $(GUI)==UNX || $(GUI)==MAC SLOFILES = \ commit 816c7a28a0a8bf464111812c61ffda120d0f769b Author: Rene Engelhard r...@debian.org Date: Tue Oct 4 13:43:05 2011 + update to libexttextcat 3.1.1 diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk new file mode 100644 index 000..ce607a3 --- /dev/null +++ b/libexttextcat/makefile.mk @@ -0,0 +1,87 @@ +#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# http://www.openoffice.org/license.html +# for a copy of the LGPLv3 License. +# +#* + +PRJ=. + +PRJNAME=libexttextcat +TARGET=libexttextcat + +.IF $(SYSTEM_LIBEXTTEXTCAT) == YES +all: +@echo An already available installation of libexttextcat should exist on your system. +@echo Therefore the version provided here does not need to be built in addition. +.ENDIF + +# --- Settings - + +.INCLUDE : settings.mk + +# --- Files + +# See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream +# sources, far better to commit your changes in there +TARFILE_NAME=libexttextcat-3.1.1 +TARFILE_MD5=33f01c57f92eb6f940b59015c35a4eea +TARFILE_ROOTDIR=libexttextcat-3.1.1 + +.IF $(GUI)==UNX +#relative to CONFIGURE_DIR +CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS=$(ARCH_FLAGS) $(EXTRA_CFLAGS) +CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS=$(EXTRA_CDEFS) $(NULL)) +.IF $(OS)==AIX +CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT +.ENDIF +.IF $(CROSS_COMPILING)==YES +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + +BUILD_ACTION=make + +OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libexttextcat.a + +.ENDIF # $(GUI)==UNX + + +.IF $(GUI)==WNT +BUILD_ACTION=cd src dmake $(MAKEMACROS) +.ENDIF # $(GUI)==WNT + +ALLTAR: $(BIN)/fingerprint.zip + +# --- Targets -- + +.INCLUDE : set_ext.mk +.INCLUDE : tg_ext.mk +.INCLUDE : target.mk + +$(BIN)/fingerprint.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) + @-rm -f $@ + @echo creating ../../../../../$@ + $(COMMAND_ECHO)zip -j $(ZIP_VERBOSITY) $@ $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/fpdb.conf + $(COMMAND_ECHO)find $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/LM \ + -name *.lm -print0 | \ +xargs -0 zip -j $(ZIP_VERBOSITY) $@ diff --git a/libexttextcat/prj/build.lst b/libexttextcat/prj/build.lst new file mode 100644 index
[Libreoffice-commits] .: ooo.lst.in
ooo.lst.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 46f1caf94dece0cfd0b222bc5118f944920f72a6 Author: Rene Engelhard r...@debian.org Date: Tue Oct 4 22:14:45 2011 +0200 update ooo.lst.in for new libexttextcat diff --git a/ooo.lst.in b/ooo.lst.in index 4ba17d2..5eea4b4 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -3,7 +3,7 @@ http://dev-www.libreoffice.org/src 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt -8dc93ffd48cb80b738075ce37df8f915-libexttextcat-3.1.0.tar.bz2 +33f01c57f92eb6f940b59015c35a4eea-libexttextcat-3.1.1.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lingucomponent/source
lingucomponent/source/languageguessing/guess.cxx |2 +- lingucomponent/source/languageguessing/guesslang.cxx |2 +- lingucomponent/source/languageguessing/simpleguesser.cxx | 10 +- 3 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 4d6f1ad5ad6cfb633c38a8320fa6227038d504fc Author: Rene Engelhard r...@debian.org Date: Tue Oct 4 22:34:32 2011 +0200 libtextcat - libexttextcat in #include's diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx index dc0a743..66717cc 100644 --- a/lingucomponent/source/languageguessing/guess.cxx +++ b/lingucomponent/source/languageguessing/guess.cxx @@ -32,7 +32,7 @@ #include iostream #include string.h -#include libtextcat/textcat.h +#include libexttextcat/textcat.h #include altstrfunc.hxx #include guess.hxx diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index fff3e72..8dfee1e 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -51,7 +51,7 @@ #include sal/macros.h -#include libtextcat/textcat.h +#include libexttextcat/textcat.h using namespace ::rtl; using namespace ::osl; diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx index eb6efdb..b4018e4 100644 --- a/lingucomponent/source/languageguessing/simpleguesser.cxx +++ b/lingucomponent/source/languageguessing/simpleguesser.cxx @@ -43,11 +43,11 @@ #include sstream #include iostream -#include libtextcat/textcat.h -#include libtextcat/common.h -#include libtextcat/constants.h -#include libtextcat/fingerprint.h -#include libtextcat/utf8misc.h +#include libexttextcat/textcat.h +#include libexttextcat/common.h +#include libexttextcat/constants.h +#include libexttextcat/fingerprint.h +#include libexttextcat/utf8misc.h #include sal/types.h ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 0f862a7432737d16056270cf8fbc29478f988f7d Author: Rene Engelhard r...@debian.org Date: Wed Sep 28 20:40:07 2011 + make configure check for cpp/poppler-version.h diff --git a/configure.in b/configure.in index 3224852..d71eb22 100644 --- a/configure.in +++ b/configure.in @@ -7034,6 +7034,16 @@ if test x$enable_ext_pdfimport != xno -a x$enable_extension_integration != AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler = 0.8.0 ) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + save_CPPFLAGS=$CPPFLAGS + CXXFLAGS=$CXXFLAGS $POPPLER_CFLAGS + CPPFLAGS=$CPPFLAGS $POPPLER_CFLAGS + AC_CHECK_HEADER([cpp/poppler-version.h], [], + [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], []) + CXXFLAGS=$save_CXXFLAGS + CPPFLAGS=$save_CPPFLAGS + AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) SYSTEM_POPPLER=NO ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
