You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2017/07/21 03:11:22 UTC
svn commit: r1802537 - in /openoffice/trunk/main: ./ connectivity/prj/
connectivity/source/drivers/kab/ postprocess/packcomponents/
postprocess/packregistry/ scp2/source/ooo/
Author: damjan
Date: Fri Jul 21 03:11:22 2017
New Revision: 1802537
URL: http://svn.apache.org/viewvc?rev=1802537&view=rev
Log:
Remove the obsolete KDE address book SDBC driver, that only worked on
KDE 3.2 - 3.6, which are obsolete since 9 years ago.
Patch by: me
Removed:
openoffice/trunk/main/connectivity/source/drivers/kab/
Modified:
openoffice/trunk/main/configure.ac
openoffice/trunk/main/connectivity/prj/build.lst
openoffice/trunk/main/connectivity/prj/d.lst
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/postprocess/packregistry/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/ooo/makefile.mk
openoffice/trunk/main/set_soenv.in
Modified: openoffice/trunk/main/configure.ac
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1802537&r1=1802536&r2=1802537&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Fri Jul 21 03:11:22 2017
@@ -332,9 +332,6 @@ AC_ARG_ENABLE(kde,
[ --enable-kde Determines whether to use Qt/KDE vclplug on platforms
where Qt and KDE are available.
],,)
-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
@@ -6588,33 +6585,6 @@ AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS)
dnl ===================================================================
-dnl Test whether to include KDE AB support
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable KDE address book support])
-if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then
- AC_MSG_RESULT([yes])
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
- AC_MSG_CHECKING([whether KDE is between 3.2 and 3.6])
- AC_TRY_RUN([
-#include <kdeversion.h>
-
-int main(int argc, char **argv) {
- if (KDE_VERSION_MAJOR == 3 && 2 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 6) return 0;
- else return 1;
-}
- ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old or too recent, please use another version of KDE or disable KDE address book support])])
- CXXFLAGS=$save_CXXFLAGS
- AC_LANG_POP([C++])
- ENABLE_KAB=TRUE
-else
- AC_MSG_RESULT([no])
- ENABLE_KAB=
-fi
-AC_SUBST(ENABLE_KAB)
-
-dnl ===================================================================
dnl Test whether to include MathMLDTD
dnl ===================================================================
AC_MSG_CHECKING([whether to include MathMLDTD])
Modified: openoffice/trunk/main/connectivity/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/prj/build.lst?rev=1802537&r1=1802536&r2=1802537&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/prj/build.lst (original)
+++ openoffice/trunk/main/connectivity/prj/build.lst Fri Jul 21 03:11:22 2017
@@ -8,7 +8,6 @@ cn connectivity\source\cpool
cn connectivity\source\resource nmake - all cn_res cn_inc NULL
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_inc NULL
cn connectivity\source\drivers\ado nmake - all cn_ado cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\kab nmake - all cn_kab cn_dbtools cn_inc NULL
cn connectivity\source\drivers\macab nmake - all cn_macab cn_dbtools cn_inc NULL
cn connectivity\source\drivers\evoab2 nmake - all cn_evoab2 cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\calc nmake - all cn_calc cn_file cn_inc NULL
@@ -26,4 +25,4 @@ cn connectivity\source\simpledbt
cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
cn connectivity\qa nmake - all cn_qa cn_inc NULL
-cn connectivity\util nmake - all cn_util cn_ado cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
+cn connectivity\util nmake - all cn_util cn_ado cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
Modified: openoffice/trunk/main/connectivity/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/prj/d.lst?rev=1802537&r1=1802536&r2=1802537&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/prj/d.lst (original)
+++ openoffice/trunk/main/connectivity/prj/d.lst Fri Jul 21 03:11:22 2017
@@ -10,7 +10,6 @@
..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\adabas\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\ado\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\kab\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\macab\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\file\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\flat\*.xml %_DEST%\xml%_EXT%\*.xml
@@ -43,7 +42,6 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component
..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component
..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
-..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component
..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1802537&r1=1802536&r2=1802537&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Fri Jul 21 03:11:22 2017
@@ -261,10 +261,6 @@ my_components += component/ucb/source/uc
my_components += component/ucb/source/ucp/gvfs/ucpgvfs
.END
-.IF "$(ENABLE_KAB)" != ""
-my_components += kab1
-.END
-
.IF "$(ENABLE_KDE)" != ""
my_components += kdebe1
.END
Modified: openoffice/trunk/main/postprocess/packregistry/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packregistry/makefile.mk?rev=1802537&r1=1802536&r2=1802537&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packregistry/makefile.mk Fri Jul 21 03:11:22 2017
@@ -354,9 +354,6 @@ MY_FILES_main += \
$(MY_MOD)/DataAccess/hsqldb.xcu \
$(MY_MOD)/DataAccess/jdbc.xcu
.END
-.IF "$(ENABLE_KAB)" == "TRUE"
-MY_FILES_main += $(MY_MOD)/DataAccess/kab.xcu
-.END
.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1802537&r1=1802536&r2=1802537&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri Jul 21 03:11:22 2017
@@ -463,23 +463,6 @@ End
#ifdef UNX
-#ifdef ENABLE_KAB
-File gid_File_Lib_Kab_1
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(libkab1,UNXSUFFIX));
-End
-
-File gid_File_Lib_Kab_Drv_1
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX));
-End
-
-#endif
-
#ifdef MACOSX
File gid_File_Lib_Macab_1
TXT_FILE_BODY;
Modified: openoffice/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/makefile.mk?rev=1802537&r1=1802536&r2=1802537&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/ooo/makefile.mk Fri Jul 21 03:11:22 2017
@@ -77,10 +77,6 @@ SCPDEFS+=-DENABLE_KDE
SCPDEFS+=-DENABLE_KDE4
.ENDIF
-.IF "$(ENABLE_KAB)" != ""
-SCPDEFS+=-DENABLE_KAB
-.ENDIF
-
.IF "$(ENABLE_EVOAB2)" != ""
SCPDEFS+=-DENABLE_EVOAB2
.ENDIF
Modified: openoffice/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1802537&r1=1802536&r2=1802537&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Fri Jul 21 03:11:22 2017
@@ -1677,7 +1677,6 @@ ToFile( "ENABLE_KDE4", "@ENABLE_KD
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" );
ToFile( "nodep", "@nodep@", "e" );