diff options
Diffstat (limited to 'libreoffice')
| -rw-r--r-- | libreoffice/3.6.0/patches/libreoffice-trinity.diff | 220 |
1 files changed, 220 insertions, 0 deletions
diff --git a/libreoffice/3.6.0/patches/libreoffice-trinity.diff b/libreoffice/3.6.0/patches/libreoffice-trinity.diff new file mode 100644 index 0000000..4ee3f7f --- /dev/null +++ b/libreoffice/3.6.0/patches/libreoffice-trinity.diff @@ -0,0 +1,220 @@ +--- a/shell/Library_tdebe.mk ++++ b/shell/Library_tdebe.mk +@@ -27,6 +27,11 @@ + + $(eval $(call gb_Library_Library,tdebe1)) + ++$(eval $(call gb_Library_set_include,tdebe1,\ ++ $$(INCLUDE) \ ++ $$(TDE_CFLAGS) \ ++)) ++ + $(eval $(call gb_Library_use_packages,tdebe1,\ + shell_inc \ + )) +@@ -40,6 +45,11 @@ + tde \ + )) + ++$(eval $(call gb_Library_add_libs,tdebe1,\ ++ $$(TDE_LIBS) \ ++ -lkio \ ++)) ++ + $(eval $(call gb_Library_use_libraries,tdebe1,\ + cppu \ + cppuhelper \ +--- a/connectivity/Module_connectivity.mk ++++ b/connectivity/Module_connectivity.mk +@@ -74,7 +74,7 @@ + )) + endif + +-ifeq ($(ENABLE_TAB),TRUE) ++ifeq ($(ENABLE_TDEAB),TRUE) + $(eval $(call gb_Module_add_targets,connectivity,\ + Configuration_tdeab \ + Library_tdeab1 \ +--- a/Repository.mk ++++ b/Repository.mk +@@ -300,6 +300,8 @@ + itg \ + iti \ + jdbc \ ++ tdeab1 \ ++ tdeabdrv1 \ + kab1 \ + kabdrv1 \ + lng \ +@@ -534,6 +536,7 @@ + hatchwindowfactory \ + i18npool \ + i18nsearch \ ++ tdebe1 \ + kdebe1 \ + kde4be1 \ + localebe1 \ +--- a/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu ++++ /dev/null +@@ -1,46 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8"?> +-<!--*********************************************************************** +- * +- * 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. +- * +- ************************************************************************ --> +-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +- <node oor:name="Installed" install:module="tdeab"> +- <node oor:name="sdbc:address:tdeab" oor:op="replace"> +- <prop oor:name="Driver"> +- <value>com.sun.star.comp.sdbc.tdeab.Driver</value> +- </prop> +- <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> +- <value xml:lang="en-US">TDE Address Book</value> +- </prop> +- <node oor:name="Features"> +- <node oor:name="EscapeDateTime" oor:op="replace"> +- <prop oor:name="Value" oor:type="xs:boolean"> +- <value>true</value> +- </prop> +- </node> +- </node> +- </node> +- </node> +-</oor:component-data> +--- /dev/null ++++ b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu +@@ -0,0 +1,46 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!--*********************************************************************** ++ * ++ * 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. ++ * ++ ************************************************************************ --> ++<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema"> ++ <node oor:name="Installed" install:module="tdeab"> ++ <node oor:name="sdbc:address:tdeab" oor:op="replace"> ++ <prop oor:name="Driver"> ++ <value>com.sun.star.comp.sdbc.tdeab.Driver</value> ++ </prop> ++ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> ++ <value xml:lang="en-US">TDE Address Book</value> ++ </prop> ++ <node oor:name="Features"> ++ <node oor:name="EscapeDateTime" oor:op="replace"> ++ <prop oor:name="Value" oor:type="xs:boolean"> ++ <value>true</value> ++ </prop> ++ </node> ++ </node> ++ </node> ++ </node> ++</oor:component-data> +--- a/connectivity/Library_tdeab1.mk ++++ b/connectivity/Library_tdeab1.mk +@@ -33,11 +33,21 @@ + + $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1)) + ++$(eval $(call gb_Library_set_include,tdeab1,\ ++ -I$(SRCDIR)/connectivity/source/inc \ ++ $$(INCLUDE) \ ++ $$(TDE_CFLAGS) \ ++)) ++ + $(eval $(call gb_Library_use_api,tdeab1,\ + offapi \ + udkapi \ + )) + ++$(eval $(call gb_Library_add_libs,tdeab1,\ ++ $$(TDE_LIBS) \ ++)) ++ + $(eval $(call gb_Library_use_libraries,tdeab1,\ + comphelper \ + cppu \ +--- a/connectivity/Library_tdeabdrv1.mk ++++ b/connectivity/Library_tdeabdrv1.mk +@@ -27,12 +27,19 @@ + + $(eval $(call gb_Library_Library,tdeabdrv1)) + ++$(eval $(call gb_Library_set_include,tdeabdrv1,\ ++ -I$(SRCDIR)/connectivity/source/inc \ ++ $$(INCLUDE) \ ++ $$(TDE_CFLAGS) \ ++)) ++ + $(eval $(call gb_Library_use_api,tdeabdrv1,\ + offapi \ + udkapi \ + )) + + $(eval $(call gb_Library_add_libs,tdeabdrv1,\ ++ $$(TDE_LIBS) \ + -lkabc \ + )) + +--- a/connectivity/Configuration_tdeab.mk ++++ b/connectivity/Configuration_tdeab.mk +@@ -14,6 +14,8 @@ + # Major Contributor(s): + # Copyright (C) 2012 Red Hat, Inc., David Tardon <[email protected]> + # (initial developer) ++# Copyright (C) 2012 Timothy Pearson <[email protected]> ++# (TDE version) + # + # All Rights Reserved. + # +@@ -28,7 +30,7 @@ + $(eval $(call gb_Configuration_Configuration,driver_tdeab)) + + $(eval $(call gb_Configuration_add_spool_modules,driver_tdeab,connectivity/registry/tdeab,\ +- org/openoffice/Office/DataAccess/Drivers-tab.xcu \ ++ org/openoffice/Office/DataAccess/Drivers-tdeab.xcu \ + )) + + $(eval $(call gb_Configuration_add_localized_datas,driver_tdeab,connectivity/registry/tdeab,\ |