[ooo-build-commit] Branch 'ooo/master' - 2 commits - configure.in scp2/source set_soenv.in
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Aug 7 17:06:29 PDT 2009
configure.in | 124 ++++++++++++++++++++++++++++++++--
scp2/source/kde/file_kde.scp | 12 +++
scp2/source/kde/makefile.mk | 11 ++-
scp2/source/kde/module_kde.scp | 14 +++
scp2/source/ooo/file_library_ooo.scp | 31 +++++++-
scp2/source/ooo/makefile.mk | 4 +
scp2/source/ooo/module_hidden_ooo.scp | 1
set_soenv.in | 6 +
8 files changed, 190 insertions(+), 13 deletions(-)
New commits:
commit f1ab035b45efabc52254ebd22494e9625ee63cde
Author: Release Engineers <releng at openoffice.org>
Date: Fri Aug 7 13:32:06 2009 +0000
CWS-TOOLING: integrate CWS gciteratorfix_DEV300
2009-08-04 10:23:19 +0200 od r274608 : add missing patch flags for libaries swui, msword and xo
2009-08-03 16:42:48 +0200 mav r274586 : #i101899# workaround the wrong error code on MAC
2009-08-03 13:24:44 +0200 tl r274575 : #i103936# fix for grammar checking loop
2009-08-03 12:37:37 +0200 tl r274573 : #i103936# fix for grammar checking loop
2009-08-03 12:10:01 +0200 tl r274572 : #i103936# fix for grammar checking loop
2009-08-03 09:06:49 +0200 tl r274565 : #i103936# fix for grammar checking loop
2009-08-03 09:04:50 +0200 tl r274564 : #i103936# fix for grammar checking loop
2009-07-31 17:52:45 +0200 tl r274545 : #i103936# fix for grammar checking loop
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 24e8342..9ffcfb4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1,4 +1,4 @@
-/*************************************************************************
+*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -559,7 +559,7 @@ End
File gid_File_Lib_Fps
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
Name = "fps.dll";
@@ -906,8 +906,9 @@ End
#endif
-#ifdef WNT
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng)
+#ifdef WNT
File gid_File_Lib_Rebasemsi
TXT_FILE_BODY;
Name = "rebase.dll";
@@ -1462,7 +1463,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
-STD_LIB_FILE( gid_File_Lib_Msword, msword )
+STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
File gid_File_Lib_Sysdtrans
TXT_FILE_BODY;
commit 965768690670d87fc43533d63a57b01a51a6d4c5
Author: Release Engineers <releng at openoffice.org>
Date: Fri Aug 7 10:16:34 2009 +0000
CWS-TOOLING: integrate CWS kde4int
2009-07-15 10:40:52 +0200 pl r273993 : #i103288# configure
2009-07-09 14:57:24 +0200 pl r273867 : #i103284# spin fields
2009-07-09 13:49:13 +0200 pl r273864 : #i103284# min size for dropdown comboboxes
2009-07-09 13:46:11 +0200 pl r273860 : #i103284# min size fro dropdown listboxes
2009-07-09 13:01:48 +0200 pl r273857 : #i103284# fix most radiobuttons and checboxes, also on tabpages
2009-07-08 19:38:12 +0200 pl r273847 : #i103290# clean up, enable KDE4 fpicker
2009-07-08 15:54:06 +0200 pl r273837 : #i103284# background mode opaque doesn't look that good
2009-07-07 19:29:01 +0200 pl r273814 : add kde4 directory and deliverables
2009-07-07 11:18:08 +0200 pl r273786 : make compile with Qt 4.1
2009-07-02 19:20:47 +0200 pl r273673 : #i103290# add: KDE4 file picker (thanks Roman Shtylman)
2009-07-02 19:16:07 +0200 pl r273672 : #i103289# add: KDE4integration (thanks Roman Shtylman)
2009-07-02 19:01:20 +0200 pl r273671 : #i103286# add: KDE4 checks (thanks Roman Shtylman)
2009-07-02 18:58:15 +0200 pl r273670 : #i103286# initial import for KDE4 backend (thanks Roman Shtylman)
2009-07-02 18:08:06 +0200 pl r273668 : #i103284# initial import for KDE4 plugin (thanks Roman Shtylman)
diff --git a/configure.in b/configure.in
index 3a565eb..0fa4670 100644
--- a/configure.in
+++ b/configure.in
@@ -259,6 +259,11 @@ AC_ARG_ENABLE(kde,
AC_ARG_ENABLE(kdeab,
[ --disable-kdeab Disable the KDE address book support
],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
+AC_ARG_ENABLE(kde4,
+[ --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms
+ where Qt4 and KDE4 are available. May be used with --enable-kde
+ if you want to support both KDE3 and KDE4.
+],,)
AC_ARG_ENABLE(binfilter,
[ --disable-binfilter Disable legacy binary file formats filters
],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
@@ -908,6 +913,7 @@ case "$build_os" in
test_gtk=yes
test_cairo=yes
test_kde=yes
+ test_kde4=yes
test_cups=yes
test_randr=yes
test_freetype=yes
@@ -951,6 +957,7 @@ case "$build_os" in
test_gtk=yes
test_cairo=yes
test_kde=yes
+ test_kde4=yes
test_cups=yes
test_randr=yes
test_freetype=yes
@@ -984,6 +991,7 @@ case "$build_os" in
test_gtk=yes
test_cairo=yes
test_kde=yes
+ test_kde4=yes
test_cups=no
test_randr=yes
test_freetype=yes
@@ -5242,6 +5250,13 @@ if test "x$enable_kde" = "xyes"; then
fi
AC_SUBST(ENABLE_KDE)
+ENABLE_KDE4=""
+if test "x$enable_kde4" = "xyes"; then
+ ENABLE_KDE4="TRUE"
+ R="$R kde4"
+fi
+AC_SUBST(ENABLE_KDE4)
+
if test -z "$R"; then
AC_MSG_RESULT([none])
else
@@ -5780,11 +5795,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
fi
fi
if test "$build_cpu" != "x86_64" ; then
- kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
- kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
+ kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
+ kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries"
else
- kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
- kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
+ kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
+ kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries"
fi
if test -n "$KDEDIR" ; then
kde_incdirs="$KDEDIR/include $kde_incdirs"
@@ -5831,12 +5846,13 @@ your Qt installation by exporting QTDIR before running "configure".])
your Qt installation by exporting QTDIR before running "configure".])
fi
+ dnl Check for Meta Object Compiler
AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] )
if test "$MOC" = "no" ; then
AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
the root of your Qt installation by exporting QTDIR before running "configure".])
- fi
-
+ fi
+
dnl Check for KDE headers
AC_MSG_CHECKING([for KDE headers])
kde_incdir="no"
@@ -5876,6 +5892,102 @@ AC_SUBST(KDE_LIBS)
AC_SUBST(MOC)
dnl ===================================================================
+dnl KDE4 Integration
+dnl ===================================================================
+
+KDE4_CFLAGS=""
+KDE4_LIBS=""
+MOC4="moc"
+if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+ qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+ qt_libdirs="$QTLIB /usr/lib $x_libraries"
+
+ kde_incdirs="/usr/include $x_includes"
+ kde_libdirs="/usr/lib $x_libraries"
+
+ if test "$build_cpu" == "x86_64" ; then
+ qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
+ kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+ fi
+
+ qt_test_include="Qt/qobject.h"
+ qt_test_library="libQtCore.so"
+ kde_test_include="ksharedptr.h"
+ kde_test_library="libkdeui.so"
+
+ AC_MSG_CHECKING([for Qt4 headers])
+ qt_header_dir="no"
+ for inc_dir in $qt_incdirs ; do
+ if test -r "$inc_dir/$qt_test_include" ; then
+ qt_header_dir="$inc_dir"
+ break
+ fi
+ done
+
+ AC_MSG_RESULT([$qt_header_dir])
+ if test "x$qt_header_dir" = "xno" ; then
+ AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
+ fi
+
+ AC_MSG_CHECKING([for Qt4 libraries])
+ qt_lib_dir="no"
+ for lib_dir in $qt_libdirs ; do
+ if test -r "$lib_dir/$qt_test_library" ; then
+ qt_lib_dir="$lib_dir"
+ break
+ fi
+ done
+
+ AC_MSG_RESULT([$qt_lib_dir])
+
+ if test "x$qt_lib_dir" = "xno" ; then
+ AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
+ fi
+
+ dnl Check for Meta Object Compiler
+ AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
+ if test "$MOC4" = "no" ; then
+ AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
+the root of your Qt installation by exporting QTDIR before running "configure".])
+ fi
+
+ dnl Check for KDE4 headers
+ AC_MSG_CHECKING([for KDE4 headers])
+ kde_incdir="no"
+ for kde_check in $kde_incdirs ; do
+ if test -r "$kde_check/$kde_test_include" ; then
+ kde_incdir="$kde_check"
+ break
+ fi
+ done
+ AC_MSG_RESULT([$kde_incdir])
+ if test "x$kde_incdir" = "xno" ; then
+ AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
+ fi
+
+ dnl Check for KDE4 libraries
+ AC_MSG_CHECKING([for KDE4 libraries])
+ kde_libdir="no"
+ for kde_check in $kde_libdirs ; do
+ if test -r "$kde_check/$kde_test_library" ; then
+ kde_libdir="$kde_check"
+ break
+ fi
+ done
+
+ AC_MSG_RESULT([$kde_libdir])
+ if test "x$kde_libdir" = "xno" ; then
+ AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
+ fi
+
+ KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
+ KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
+fi
+AC_SUBST(KDE4_CFLAGS)
+AC_SUBST(KDE4_LIBS)
+AC_SUBST(MOC4)
+
+dnl ===================================================================
dnl Test for the enabling the lockdown pieces
dnl ===================================================================
AC_MSG_CHECKING([whether to enable the lockdown pieces])
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index a6d6db4..1835a39 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -29,6 +29,7 @@
************************************************************************/
#include "macros.inc"
+#ifdef ENABLE_KDE
File gid_File_Lib_Kdebe
TXT_FILE_BODY;
Styles = (PACKED);
@@ -37,4 +38,15 @@ File gid_File_Lib_Kdebe
RegistryID = gid_Starregistry_Services_Rdb;
Regmergefile = "kdebe1-ucd.txt";
End
+#endif
+#ifdef ENABLE_KDE4
+File gid_File_Lib_Kde4be
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Program;
+ Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
+ RegistryID = gid_Starregistry_Services_Rdb;
+ Regmergefile = "kde4be1-ucd.txt";
+End
+#endif
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
index 0cbf6a4..6ddb301 100644
--- a/scp2/source/kde/makefile.mk
+++ b/scp2/source/kde/makefile.mk
@@ -43,7 +43,16 @@ TARGETTYPE=CUI
SCP_PRODUCT_TYPE=osl
-.IF "$(ENABLE_KDE)" == "TRUE"
+.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
+
+.IF "$(ENABLE_KDE)" != ""
+SCPDEFS+=-DENABLE_KDE
+.ENDIF
+
+.IF "$(ENABLE_KDE4)" != ""
+SCPDEFS+=-DENABLE_KDE4
+.ENDIF
+
PARFILES = \
module_kde.par \
file_kde.par
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 1dce456..28dacbe 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -30,12 +30,24 @@
#include "macros.inc"
+#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
Module gid_Module_Optional_Kde
ParentID = gid_Module_Optional;
Default = YES;
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = (DONTSHOWINUSERINSTALL);
- Files = (gid_File_Lib_Kdebe);
+ Files = (
+#ifdef ENABLE_KDE
+ gid_File_Lib_Kdebe
+#ifdef ENABLE_KDE4
+ ,
+#endif // ENABLE_KDE4
+#endif // ENABLE_KDE
+#ifdef ENABLE_KDE4
+ gid_File_Lib_Kde4be
+#endif // ENABLE_KDE4
+ );
End
+#endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 98d407c..24e8342 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -590,6 +590,18 @@ File gid_File_Lib_Fps_Gnome
End
#endif
#endif
+#ifdef ENABLE_KDE4
+#ifndef MACOSX
+File gid_File_Lib_Fps_Kde4
+ TXT_FILE_BODY;
+ Styles = (PACKED,UNO_COMPONENT);
+ RegistryID = gid_Starregistry_Services_Rdb;
+ Dir = gid_Dir_Program;
+ Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
+ Regmergefile = "fps-kde4-ucd.txt";
+End
+#endif
+#endif
#endif
#ifdef MACOSX
@@ -1202,6 +1214,16 @@ File gid_File_Lib_Vclplug_Kde
End
#endif
#endif
+#ifdef ENABLE_KDE4
+#ifndef MACOSX
+File gid_File_Lib_Vclplug_Kde4
+ Name = LIBNAME(vclplug_kde4);
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Program;
+End
+#endif
+#endif
#endif
#if defined(QUARTZ)
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index adb0175..646196e 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -79,6 +79,10 @@ SCPDEFS+=-DENABLE_SYSTRAY_GTK
SCPDEFS+=-DENABLE_KDE
.ENDIF
+.IF "$(ENABLE_KDE4)" != ""
+SCPDEFS+=-DENABLE_KDE4
+.ENDIF
+
.IF "$(ENABLE_KAB)" != ""
SCPDEFS+=-DENABLE_KAB
.ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c08852a..8729bea 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -242,6 +242,7 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Vclplug_Gen,
gid_File_Lib_Vclplug_Gtk,
gid_File_Lib_Vclplug_Kde,
+ gid_File_Lib_Vclplug_Kde4,
gid_File_Lib_Vclplug_Svp,
gid_File_Lib_Basctl,
gid_File_Lib_CanvasTools,
diff --git a/set_soenv.in b/set_soenv.in
index 5e7c56b..c02b3ff 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1689,8 +1689,12 @@ ToFile( "ENABLE_GIO", "@ENABLE_GIO@", "e" );
ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
ToFile( "KDE_LIBS", "@KDE_LIBS@", "e" );
-ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" );
ToFile( "MOC", "@MOC@", "e" );
+ToFile( "ENABLE_KDE4", "@ENABLE_KDE4@", "e" );
+ToFile( "KDE4_CFLAGS", "@KDE4_CFLAGS@", "e" );
+ToFile( "KDE4_LIBS", "@KDE4_LIBS@", "e" );
+ToFile( "MOC4", "@MOC4@", "e" );
+ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" );
ToFile( "PSPRINT", "TRUE", "e" );
ToFile( "MKDEPENDSOLVER", "TRUE", "e" );
#
More information about the ooo-build-commit
mailing list