rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '3cbd5e6205'
${ noResults }
libreoffice/libreoffice-rhel6gcj.patch

149 lines
6.1 KiB
Raw Blame History

From 5ae1c74d453150a54a4b377d29a9228acf3e61fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 20 Feb 2014 11:35:28 +0000
Subject: [PATCH] gcj fixes
Change-Id: I99fe963bb2ca413b323c44a77ad2f48dd7c477f4
---
odk/CustomTarget_javadoc.mk | 1 -
odk/Package_javadoc.mk | 61 ----------------------------------------
scp2/source/ooo/common_brand.scp | 1 +
3 files changed, 1 insertion(+), 62 deletions(-)
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index c5e3e67..8bd18b4 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -41,7 +41,6 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
-linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \
-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
$(odk_JAVAPACKAGES) \
- $(if $(JAVADOCISGJDOC),,-notimestamp) \
> $@
# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_javadoc.mk b/odk/Package_javadoc.mk
index 5f0ea44..9ad26cb 100644
--- a/odk/Package_javadoc.mk
+++ b/odk/Package_javadoc.mk
@@ -19,11 +19,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/
com/sun/star/comp/helper/ComponentContext.html \
com/sun/star/comp/helper/ComponentContextEntry.html \
com/sun/star/comp/helper/SharedLibraryLoader.html \
- com/sun/star/comp/helper/class-use/Bootstrap.html \
- com/sun/star/comp/helper/class-use/BootstrapException.html \
- com/sun/star/comp/helper/class-use/ComponentContext.html \
- com/sun/star/comp/helper/class-use/ComponentContextEntry.html \
- com/sun/star/comp/helper/class-use/SharedLibraryLoader.html \
com/sun/star/comp/helper/package-frame.html \
com/sun/star/comp/helper/package-summary.html \
com/sun/star/comp/helper/package-tree.html \
@@ -38,30 +33,17 @@ $(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/
com/sun/star/lib/uno/helper/UnoUrl.html \
com/sun/star/lib/uno/helper/WeakAdapter.html \
com/sun/star/lib/uno/helper/WeakBase.html \
- com/sun/star/lib/uno/helper/class-use/ComponentBase.html \
- com/sun/star/lib/uno/helper/class-use/Factory.html \
- com/sun/star/lib/uno/helper/class-use/InterfaceContainer.html \
- com/sun/star/lib/uno/helper/class-use/MultiTypeInterfaceContainer.html \
- com/sun/star/lib/uno/helper/class-use/PropertySet.html \
- com/sun/star/lib/uno/helper/class-use/PropertySetMixin.BoundListeners.html \
- com/sun/star/lib/uno/helper/class-use/PropertySetMixin.html \
- com/sun/star/lib/uno/helper/class-use/UnoUrl.html \
- com/sun/star/lib/uno/helper/class-use/WeakAdapter.html \
- com/sun/star/lib/uno/helper/class-use/WeakBase.html \
com/sun/star/lib/uno/helper/package-frame.html \
com/sun/star/lib/uno/helper/package-summary.html \
com/sun/star/lib/uno/helper/package-tree.html \
com/sun/star/lib/uno/helper/package-use.html \
com/sun/star/lib/unoloader/UnoClassLoader.html \
com/sun/star/lib/unoloader/UnoLoader.html \
- com/sun/star/lib/unoloader/class-use/UnoClassLoader.html \
- com/sun/star/lib/unoloader/class-use/UnoLoader.html \
com/sun/star/lib/unoloader/package-frame.html \
com/sun/star/lib/unoloader/package-summary.html \
com/sun/star/lib/unoloader/package-tree.html \
com/sun/star/lib/unoloader/package-use.html \
com/sun/star/lib/util/UrlToFileMapper.html \
- com/sun/star/lib/util/class-use/UrlToFileMapper.html \
com/sun/star/lib/util/package-frame.html \
com/sun/star/lib/util/package-summary.html \
com/sun/star/lib/util/package-tree.html \
@@ -84,24 +66,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/
com/sun/star/uno/Union.html \
com/sun/star/uno/UnoRuntime.html \
com/sun/star/uno/WeakReference.html \
- com/sun/star/uno/class-use/Any.html \
- com/sun/star/uno/class-use/AnyConverter.html \
- com/sun/star/uno/class-use/Ascii.html \
- com/sun/star/uno/class-use/AsciiString.html \
- com/sun/star/uno/class-use/Enum.html \
- com/sun/star/uno/class-use/IBridge.html \
- com/sun/star/uno/class-use/IEnvironment.html \
- com/sun/star/uno/class-use/IFieldDescription.html \
- com/sun/star/uno/class-use/IMapping.html \
- com/sun/star/uno/class-use/IMemberDescription.html \
- com/sun/star/uno/class-use/IMethodDescription.html \
- com/sun/star/uno/class-use/IQueryInterface.html \
- com/sun/star/uno/class-use/ITypeDescription.html \
- com/sun/star/uno/class-use/MappingException.html \
- com/sun/star/uno/class-use/Type.html \
- com/sun/star/uno/class-use/Union.html \
- com/sun/star/uno/class-use/UnoRuntime.html \
- com/sun/star/uno/class-use/WeakReference.html \
com/sun/star/uno/package-frame.html \
com/sun/star/uno/package-summary.html \
com/sun/star/uno/package-tree.html \
@@ -109,36 +73,11 @@ $(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/
constant-values.html \
deprecated-list.html \
help-doc.html \
- index-files/index-1.html \
- index-files/index-10.html \
- index-files/index-11.html \
- index-files/index-12.html \
- index-files/index-13.html \
- index-files/index-14.html \
- index-files/index-15.html \
- index-files/index-16.html \
- index-files/index-17.html \
- index-files/index-18.html \
- index-files/index-19.html \
- index-files/index-2.html \
- index-files/index-20.html \
- index-files/index-21.html \
- index-files/index-3.html \
- index-files/index-4.html \
- index-files/index-5.html \
- index-files/index-6.html \
- index-files/index-7.html \
- index-files/index-8.html \
- index-files/index-9.html \
index.html \
overview-frame.html \
overview-summary.html \
overview-tree.html \
package-list \
- resources/background.gif \
- resources/tab.gif \
- resources/titlebar.gif \
- resources/titlebar_end.gif \
serialized-form.html \
stylesheet.css \
))
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2498822..d459997 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1239,6 +1239,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
Section = "Bootstrap";
Key = "URE_MORE_JAVA_CLASSPATH_URLS";
Value = "";
+ ValueList1 = "$ORIGIN/../ure-link/lib";
#ifdef SYSTEM_HSQLDB
ValueList1 = HSQLDB_JAR;
#endif
--
1.8.5.3
Reference in new issue View Git Blame Copy Permalink