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

fix up rhel-6 patch into git format

Browse Source
f41
Caolán McNamara 11 years ago
parent a305f26a15
commit 4fd0213212
6 changed files with 137 additions and 60 deletions
Show Stats Download Patch File Download Diff File

52
libreoffice-rhel6gcj.patch
Unescape View File

@ -1,16 +1,20 @@
--- a/scp2/source/ooo/common_brand.scp From 5ae1c74d453150a54a4b377d29a9228acf3e61fb Mon Sep 17 00:00:00 2001
+++ b/scp2/source/ooo/common_brand.scp From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
@@ -1252,6 +1252,7 @@ Date: Thu, 20 Feb 2014 11:35:28 +0000
Section = "Bootstrap"; Subject: [PATCH] gcj fixes
Key = "URE_MORE_JAVA_CLASSPATH_URLS";
Value = ""; Change-Id: I99fe963bb2ca413b323c44a77ad2f48dd7c477f4
+ ValueList1 = "$ORIGIN/../ure-link/lib"; ---
#ifdef SYSTEM_HSQLDB odk/CustomTarget_javadoc.mk | 1 -
ValueList1 = HSQLDB_JAR; odk/Package_javadoc.mk | 61 ----------------------------------------
#endif 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 --- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk +++ b/odk/CustomTarget_javadoc.mk
@@ -40,7 +40,6 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call g @@ -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 ../../common/reg $(SRCDIR)/odk/docs/java-uno \
-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) \
@ -18,9 +22,12 @@
> $@ > $@
# vim: set noet sw=4 ts=4: # 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 --- a/odk/Package_javadoc.mk
+++ b/odk/Package_javadoc.mk +++ b/odk/Package_javadoc.mk
@@ -20,10 +20,5 @@ @@ -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/ComponentContextEntry.html \
com/sun/star/comp/helper/SharedLibraryLoader.html \ com/sun/star/comp/helper/SharedLibraryLoader.html \
- com/sun/star/comp/helper/class-use/Bootstrap.html \ - com/sun/star/comp/helper/class-use/Bootstrap.html \
@ -31,7 +38,7 @@
com/sun/star/comp/helper/package-frame.html \ com/sun/star/comp/helper/package-frame.html \
com/sun/star/comp/helper/package-summary.html \ com/sun/star/comp/helper/package-summary.html \
com/sun/star/comp/helper/package-tree.html \ com/sun/star/comp/helper/package-tree.html \
@@ -40,30 +34,17 @@ @@ -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/UnoUrl.html \
com/sun/star/lib/uno/helper/WeakAdapter.html \ com/sun/star/lib/uno/helper/WeakAdapter.html \
com/sun/star/lib/uno/helper/WeakBase.html \ com/sun/star/lib/uno/helper/WeakBase.html \
@ -62,7 +69,7 @@
com/sun/star/lib/util/package-frame.html \ com/sun/star/lib/util/package-frame.html \
com/sun/star/lib/util/package-summary.html \ com/sun/star/lib/util/package-summary.html \
com/sun/star/lib/util/package-tree.html \ com/sun/star/lib/util/package-tree.html \
@@ -86,24 +67,6 @@ @@ -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/Union.html \
com/sun/star/uno/UnoRuntime.html \ com/sun/star/uno/UnoRuntime.html \
com/sun/star/uno/WeakReference.html \ com/sun/star/uno/WeakReference.html \
@ -87,7 +94,7 @@
com/sun/star/uno/package-frame.html \ com/sun/star/uno/package-frame.html \
com/sun/star/uno/package-summary.html \ com/sun/star/uno/package-summary.html \
com/sun/star/uno/package-tree.html \ com/sun/star/uno/package-tree.html \
@@ -111,36 +74,11 @@ @@ -109,36 +73,11 @@ $(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/
constant-values.html \ constant-values.html \
deprecated-list.html \ deprecated-list.html \
help-doc.html \ help-doc.html \
@ -124,3 +131,18 @@
serialized-form.html \ serialized-form.html \
stylesheet.css \ 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

60
libreoffice-rhel6glib.patch
Unescape View File

@ -1,25 +1,21 @@
--- a/shell/Module_shell.mk 2013-02-13 15:48:02.880128705 +0000 From cb7ad37354e6e189d540d14450cf733942b95da0 Mon Sep 17 00:00:00 2001
+++ b/shell/Module_shell.mk 2013-02-13 16:37:33.766353120 +0000 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
@@ -32,14 +32,6 @@ Date: Thu, 20 Feb 2014 11:37:33 +0000
Library_localebe \ Subject: [PATCH] rhel6 glib
))
Change-Id: I75ccb56e8eea821bc00dcf14e9852b929a87163e
---
Repository.mk | 1 -
postprocess/Rdb_services.mk | 1 -
shell/Module_shell.mk | 8 --------
3 files changed, 10 deletions(-)
mode change 100755 => 100644 postprocess/Rdb_services.mk
-ifeq ($(OS),LINUX)
-ifeq ($(ENABLE_GIO),TRUE)
-$(eval $(call gb_Module_add_targets,shell,\
- Library_losessioninstall \
-))
-endif
-endif
-
ifeq ($(ENABLE_GCONF),TRUE)
$(eval $(call gb_Module_add_targets,shell,\
Library_gconfbe \
diff --git a/Repository.mk b/Repository.mk diff --git a/Repository.mk b/Repository.mk
index d0de1d8..526fea3 100644 index 3977ac3..14b01ff 100644
--- a/Repository.mk --- a/Repository.mk
+++ b/Repository.mk +++ b/Repository.mk
@@ -229,7 +229,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \ @@ -193,7 +193,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
$(if $(ENABLE_GTK3),vclplug_gtk3) \ $(if $(ENABLE_GTK3),vclplug_gtk3) \
$(if $(ENABLE_GCONF),gconfbe1) \ $(if $(ENABLE_GCONF),gconfbe1) \
$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \ $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
@ -28,10 +24,12 @@ index d0de1d8..526fea3 100644
$(if $(ENABLE_GNOMEVFS),ucpgvfs1) \ $(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
)) ))
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 936aac2..7d26eb4 100644 old mode 100755
new mode 100644
index b72f4abc..90e4711
--- a/postprocess/Rdb_services.mk --- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk
@@ -197,7 +197,6 @@ $(eval $(call gb_Rdb_add_components,services,\ @@ -193,7 +193,6 @@ $(eval $(call gb_Rdb_add_components,services,\
shell/source/backends/gconfbe/gconfbe1 \ shell/source/backends/gconfbe/gconfbe1 \
) \ ) \
$(if $(ENABLE_GIO), \ $(if $(ENABLE_GIO), \
@ -39,3 +37,25 @@ index 936aac2..7d26eb4 100644
ucb/source/ucp/gio/ucpgio \ ucb/source/ucp/gio/ucpgio \
) \ ) \
$(if $(ENABLE_GNOMEVFS), \ $(if $(ENABLE_GNOMEVFS), \
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 3461381..eb74104 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -14,14 +14,6 @@ $(eval $(call gb_Module_add_targets,shell,\
Library_localebe \
))
-ifeq ($(OS),LINUX)
-ifeq ($(ENABLE_GIO),TRUE)
-$(eval $(call gb_Module_add_targets,shell,\
- Library_losessioninstall \
-))
-endif
-endif
-
ifeq ($(ENABLE_GCONF),TRUE)
$(eval $(call gb_Module_add_targets,shell,\
Library_gconfbe \
--
1.8.5.3

24
libreoffice-rhel6langs.patch
Unescape View File

@ -1,7 +1,18 @@
diff -ru solenv/inc/langlist.mk solenv/inc/langlist.mk From 5a02450a2af673dcdfca32389abc9d801fe55380 Mon Sep 17 00:00:00 2001
--- a/solenv/inc/langlist.mk 2012-01-16 14:40:54.278805428 +0000 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+++ b/solenv/inc/langlist.mk 2012-01-16 14:41:19.090485861 +0000 Date: Thu, 20 Feb 2014 11:37:07 +0000
@@ -88,6 +88,7 @@ Subject: [PATCH] rhel-6 langs
Change-Id: I79a0256fd1c707770cbfbeb03002f96d6f793350
---
solenv/inc/langlist.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 5d2448b..95c44d9 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -79,6 +79,7 @@ ml \
mn \ mn \
mni \ mni \
mr \ mr \
@ -9,7 +20,7 @@ diff -ru solenv/inc/langlist.mk solenv/inc/langlist.mk
my \ my \
nb \ nb \
ne \ ne \
@@ -129,6 +130,7 @@ @@ -120,6 +121,7 @@ ts \
tt \ tt \
ug \ ug \
uk \ uk \
@ -17,3 +28,6 @@ diff -ru solenv/inc/langlist.mk solenv/inc/langlist.mk
uz \ uz \
ve \ ve \
vi \ vi \
--
1.8.5.3

55
libreoffice-rhel6poppler.patch
Unescape View File

@ -1,6 +1,20 @@
--- a/configure.ac 2011-11-10 13:22:02.062474990 +0000 From b80670a266c8d138d11a3b62577afd18d17ee6bd Mon Sep 17 00:00:00 2001
+++ b/configure.ac 2011-11-10 13:22:35.072472880 +0000 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
@@ -9659,16 +9659,6 @@ if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then Date: Thu, 20 Feb 2014 11:36:38 +0000
Subject: [PATCH] poppler fixes
Change-Id: Iaad3d6ba494a00e7581c5d7a35ec3ec5f57134dc
---
configure.ac | 10 ----------
sdext/Module_sdext.mk | 5 -----
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 +++-
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index b8def00..5c34e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10425,16 +10425,6 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_POPPLER=YES SYSTEM_POPPLER=YES
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
@ -17,22 +31,11 @@
libo_MINGW_CHECK_DLL([libpoppler]) libo_MINGW_CHECK_DLL([libpoppler])
POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else else
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-10 13:22:11.949473646 +0000 diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-10 13:23:24.889473889 +0000 index 5299cd8..94baf45 100644
@@ -64,7 +64,9 @@
class GfxPath;
class GfxFont;
class PDFDoc;
-#include <cpp/poppler-version.h>
+#define POPPLER_VERSION_MAJOR 0
+#define POPPLER_VERSION_MINOR 12
+#define POPPLER_VERSION_MICRO 4
#define POPPLER_CHECK_VERSION(major,minor,micro) \
(POPPLER_VERSION_MAJOR > (major) || \
(POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
--- a/sdext/Module_sdext.mk --- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk
@@ -32,11 +32,6 @@ $(eval $(call gb_Module_add_targets,sdext,\ @@ -26,11 +26,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
StaticLibrary_pdfimport_s \ StaticLibrary_pdfimport_s \
)) ))
@ -44,3 +47,21 @@
endif endif
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index f7e4a98..d1218578 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -58,7 +58,9 @@
class GfxPath;
class GfxFont;
class PDFDoc;
-#include <cpp/poppler-version.h>
+#define POPPLER_VERSION_MAJOR 0
+#define POPPLER_VERSION_MINOR 12
+#define POPPLER_VERSION_MICRO 4
#define POPPLER_CHECK_VERSION(major,minor,micro) \
(POPPLER_VERSION_MAJOR > (major) || \
(POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
--
1.8.5.3

Write Preview
Loading…
Cancel
Save