rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update rhel6 patches

Browse Source
This commit is contained in:
David Tardon 2014-11-22 16:06:57 +01:00
parent 82bb8b3134
commit 5afd95a1d9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libreoffice-rhel6gcj.patch
View File

@ -19,7 +19,7 @@ index c5e3e67..8bd18b4 100644
-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \ -linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
$(odk_JAVAPACKAGES) \ $(odk_JAVAPACKAGES) \
- $(if $(JAVADOCISGJDOC),,-notimestamp) \ - $(if $(JAVADOCISGJDOC),,-notimestamp) \
> $@ > $@)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp

6
libreoffice-rhel6glib.patch
View File

@ -45,7 +45,7 @@ index 3461381..eb74104 100644
Library_localebe \ Library_localebe \
)) ))
-ifeq ($(OS),LINUX) -ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
-ifeq ($(ENABLE_GIO),TRUE) -ifeq ($(ENABLE_GIO),TRUE)
-$(eval $(call gb_Module_add_targets,shell,\ -$(eval $(call gb_Module_add_targets,shell,\
- Library_losessioninstall \ - Library_losessioninstall \
@ -53,9 +53,9 @@ index 3461381..eb74104 100644
-endif -endif
-endif -endif
- -
ifeq ($(ENABLE_GCONF),TRUE) ifeq ($(OS),SOLARIS)
ifeq ($(ENABLE_GIO),TRUE)
$(eval $(call gb_Module_add_targets,shell,\ $(eval $(call gb_Module_add_targets,shell,\
Library_gconfbe \
-- --
1.8.5.3 1.8.5.3