Accepting request 561829 from LibreOffice:Factory
OBS-URL: https://build.opensuse.org/request/show/561829 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=142
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
ae2a2d6b9d
@ -1,38 +0,0 @@
|
||||
From b44f062df9f541b0a1bea974556483c7a5876b35 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Wed, 30 Aug 2017 15:16:22 +0200
|
||||
Subject: [PATCH] Adapt getcompver.awk to Java 9
|
||||
|
||||
...where at least <http://jdk.java.net/9/> "JDK 9 Early-Access Builds" 'java
|
||||
-version' outputs a single-digit
|
||||
|
||||
java version "9"
|
||||
|
||||
Change-Id: I7807f56593e5436418b49950ca6c2a178d6721f5
|
||||
---
|
||||
solenv/bin/getcompver.awk | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
|
||||
index ae08f4e21790..6744c4dc5c7c 100644
|
||||
--- a/solenv/bin/getcompver.awk
|
||||
+++ b/solenv/bin/getcompver.awk
|
||||
@@ -40,8 +40,13 @@ BEGIN {
|
||||
/java version/ || /openjdk version/ {
|
||||
compiler_matched = 1
|
||||
# match on the format of the java versions ( d[d].d[d].d[d] )
|
||||
- x = match( $0, /[0-9]*\.[0-9]*\.[0-9]*/ )
|
||||
- CCversion = substr( $0, RSTART, RLENGTH)
|
||||
+ if (match($0, /[0-9]+\.[0-9]+\.[0-9]+/)) {
|
||||
+ CCversion = substr($0, RSTART, RLENGTH)
|
||||
+ } else if (match($0, /[0-9]+\.[0-9]+/)) {
|
||||
+ CCversion = substr($0, RSTART, RLENGTH) "."
|
||||
+ } else if (match($0, /[0-9]+/)) {
|
||||
+ CCversion = substr($0, RSTART, RLENGTH) ".."
|
||||
+ }
|
||||
}
|
||||
/^[0-9]*[.][0-9]*\r*$/ {
|
||||
if ( compiler_matched == 0 ) {
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 93157811a1e290416422fea91c5bbc2a03b6324a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||
Date: Mon, 4 Sep 2017 20:59:02 +0200
|
||||
Subject: [PATCH 1/2] This hunk breaks jdk9 build
|
||||
|
||||
Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
|
||||
---
|
||||
external/rhino/rhino1_5R5.patch | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch
|
||||
index e44872e3df8f..40fc6cc9427b 100644
|
||||
--- a/external/rhino/rhino1_5R5.patch
|
||||
+++ b/external/rhino/rhino1_5R5.patch
|
||||
@@ -185,14 +185,6 @@
|
||||
</target>
|
||||
|
||||
<target name="compile" depends="properties,get-swing-ex">
|
||||
-@@ -68,6 +54,7 @@
|
||||
- includes="org/**/*.java"
|
||||
- deprecation="on"
|
||||
- debug="${debug}">
|
||||
-+ <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
|
||||
- </javac>
|
||||
- <copy todir="${nest}/${classes}">
|
||||
- <fileset dir="." includes="org/**/*.properties" />
|
||||
--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2004-03-25 21:54:34.000000000 +0100
|
||||
+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2009-01-17 20:44:22.000000000 +0100
|
||||
@@ -470,15 +470,21 @@
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From f0e34eaf4969af89eab22331c882a0a8a10e82d8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||
Date: Tue, 12 Sep 2017 10:32:26 +0200
|
||||
Subject: [PATCH 2/2] Detect libjawt automatically on java9 too
|
||||
|
||||
Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81
|
||||
---
|
||||
configure.ac | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f053df0192c7..d99b67676177 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -7003,7 +7003,12 @@ then
|
||||
my_java_arch=$host_cpu
|
||||
;;
|
||||
esac
|
||||
- JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
|
||||
+ # This is where JDK9 puts the library
|
||||
+ if test -e "$JAVA_HOME/lib/libjawt.so"; then
|
||||
+ JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
|
||||
+ else
|
||||
+ JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
|
||||
+ fi
|
||||
AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
|
||||
fi
|
||||
AC_MSG_RESULT([$JAWTLIB])
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
|
||||
size 555291
|
||||
@ -1,21 +0,0 @@
|
||||
Index: libreoffice-5.4.0.0.alpha1/dbaccess/Module_dbaccess.mk
|
||||
===================================================================
|
||||
--- libreoffice-5.4.0.0.alpha1.orig/dbaccess/Module_dbaccess.mk
|
||||
+++ libreoffice-5.4.0.0.alpha1/dbaccess/Module_dbaccess.mk
|
||||
@@ -45,16 +45,8 @@ $(eval $(call gb_Module_add_check_target
|
||||
CppunitTest_dbaccess_empty_stdlib_save \
|
||||
CppunitTest_dbaccess_nolib_save \
|
||||
CppunitTest_dbaccess_macros_test \
|
||||
- $(if $(ENABLE_JAVA), \
|
||||
- CppunitTest_dbaccess_RowSetClones) \
|
||||
))
|
||||
|
||||
-ifeq ($(ENABLE_JAVA),TRUE)
|
||||
-$(eval $(call gb_Module_add_check_targets,dbaccess,\
|
||||
- CppunitTest_dbaccess_hsqldb_test \
|
||||
-))
|
||||
-endif
|
||||
-
|
||||
# This runs a suite of performance tests on embedded firebird and HSQLDB.
|
||||
# Instructions on running the test can be found in qa/unit/embeddedb_performancetest
|
||||
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
|
||||
@ -1,27 +0,0 @@
|
||||
From e567ede54e85200f9e412dfa94a0f7b05c27d32f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Wed, 14 Jun 2017 21:18:22 +0100
|
||||
Subject: [PATCH] Related: rhbz#1444437 check if m_nTimeoutId is valid
|
||||
|
||||
Change-Id: I80d850d23ab0e95bb4b105efa5a1ae1e59933a95
|
||||
---
|
||||
libreofficekit/source/gtk/lokdocview.cxx | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
||||
index a59d72bcc374..ceda8160c9dd 100644
|
||||
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
||||
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
||||
@@ -246,7 +246,8 @@ struct LOKDocViewPrivateImpl
|
||||
|
||||
~LOKDocViewPrivateImpl()
|
||||
{
|
||||
- g_source_remove(m_nTimeoutId);
|
||||
+ if (m_nTimeoutId)
|
||||
+ g_source_remove(m_nTimeoutId);
|
||||
}
|
||||
};
|
||||
|
||||
--
|
||||
2.12.3
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
|
||||
index d20927f8eb27..6a1bd00736ee 100644
|
||||
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
|
||||
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
|
||||
@@ -263,7 +263,7 @@ public class FormatValueUtility
|
||||
final SectionLayoutController slc = findGroupOrDetail(ref);
|
||||
if (slc == null)
|
||||
{
|
||||
- // {Page, Report} × {Header, Footer} have no usable iteration count
|
||||
+ // {Page, Report} x {Header, Footer} have no usable iteration count
|
||||
// err on the side of showing them rather than not showing them
|
||||
return true;
|
||||
}
|
||||
102
kde5-configure-checks.patch
Normal file
102
kde5-configure-checks.patch
Normal file
@ -0,0 +1,102 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index fd06712066a4..e904fe3c29cc 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -10841,97 +10841,6 @@ the root of your Qt installation by exporting QT5DIR before running "configure".
|
||||
[
|
||||
QT5_HAVE_GLIB=1
|
||||
AC_DEFINE(QT5_HAVE_GLIB,1)
|
||||
- QT5_GLIB_CFLAGS=$(printf '%s' "$QT5_GLIB_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
|
||||
- FilterLibs "${QT5_GLIB_LIBS}"
|
||||
- QT5_GLIB_LIBS="${filteredlibs}"
|
||||
-
|
||||
- qt5_fix_warning=
|
||||
-
|
||||
- AC_LANG_PUSH([C++])
|
||||
- # tst_exclude_socket_notifiers.moc:70:28: runtime error: member access within address 0x60d00000bb20 which does not point to an object of type 'QO
|
||||
- # 0x60d00000bb20: note: object is of type 'QObjectPrivate'
|
||||
- # 02 00 80 3a 90 8a 4e d2 3a 00 00 00 f0 b4 b9 a7 ff 7f 00 00 00 00 00 00 00 00 00 00 20 d8 4e d2
|
||||
- # ^~~~~~~~~~~~~~~~~~~~~~~
|
||||
- # vptr for 'QObjectPrivate'
|
||||
- save_CXX=$CXX
|
||||
- CXX=$(printf %s "$CXX" \
|
||||
- | sed -e 's/-fno-sanitize-recover\(=[[0-9A-Za-z,_-]]*\)*//')
|
||||
- save_CXXFLAGS=$CXXFLAGS
|
||||
- CXXFLAGS="$CXXFLAGS $QT5_CFLAGS"
|
||||
- save_LIBS=$LIBS
|
||||
- LIBS="$LIBS $QT5_LIBS"
|
||||
- AC_MSG_CHECKING([whether Qt has fixed ExcludeSocketNotifiers])
|
||||
- # Prepare meta object data
|
||||
- TSTBASE="tst_exclude_socket_notifiers"
|
||||
- TSTMOC="${SRC_ROOT}/vcl/unx/qt5/${TSTBASE}"
|
||||
- ln -fs "${TSTMOC}.hxx"
|
||||
- $MOC5 "${TSTBASE}.hxx" -o "${TSTBASE}.moc"
|
||||
-
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
-#include <cstdlib>
|
||||
-#include "tst_exclude_socket_notifiers.moc"
|
||||
-
|
||||
-int main(int argc, char *argv[])
|
||||
-{
|
||||
- QCoreApplication app(argc, argv);
|
||||
- exit(tst_processEventsExcludeSocket());
|
||||
- return 0;
|
||||
-}
|
||||
- ]])],[
|
||||
- AC_MSG_RESULT([yes])
|
||||
- ],[
|
||||
- AC_MSG_RESULT([no])
|
||||
- AC_MSG_WARN([native Qt5 file pickers will be disabled at runtime])
|
||||
- if test -z "$qt5_fix_warning"; then
|
||||
- add_warning "native QT5 file pickers will be disabled at runtime, Qt5 fixes needed"
|
||||
- fi
|
||||
- qt5_fix_warning=1
|
||||
- add_warning " https://bugreports.qt-project.org/browse/QTBUG-37380 (needed)"
|
||||
- ])
|
||||
-
|
||||
- # Remove meta object data
|
||||
- rm -f "${TSTBASE}."*
|
||||
-
|
||||
- AC_MSG_CHECKING([whether Qt avoids QClipboard recursion caused by posted events])
|
||||
- # Prepare meta object data
|
||||
- TSTBASE="tst_exclude_posted_events"
|
||||
- TSTMOC="${SRC_ROOT}/vcl/unx/qt5/${TSTBASE}"
|
||||
- ln -fs "${TSTMOC}.hxx"
|
||||
- $MOC5 "${TSTBASE}.hxx" -o "${TSTBASE}.moc"
|
||||
-
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
-#include <cstdlib>
|
||||
-#include "tst_exclude_posted_events.moc"
|
||||
-
|
||||
-int main(int argc, char *argv[])
|
||||
-{
|
||||
- QCoreApplication app(argc, argv);
|
||||
- exit(tst_excludePostedEvents());
|
||||
- return 0;
|
||||
-}
|
||||
- ]])],[
|
||||
- AC_MSG_RESULT([yes])
|
||||
- ],[
|
||||
- AC_MSG_RESULT([no])
|
||||
- AC_MSG_WARN([native QT5 file pickers will be disabled at runtime])
|
||||
- if test -z "$qt5_fix_warning"; then
|
||||
- add_warning "native QT5 file pickers will be disabled at runtime, Qt5 fixes needed"
|
||||
- fi
|
||||
- qt5_fix_warning=1
|
||||
- add_warning " https://bugreports.qt-project.org/browse/QTBUG-34614 (needed)"
|
||||
- ])
|
||||
-
|
||||
- # Remove meta object data
|
||||
- rm -f "${TSTBASE}."*
|
||||
-
|
||||
- if test -n "$qt5_fix_warning"; then
|
||||
- add_warning " https://bugreports.qt-project.org/browse/QTBUG-38585 (recommended)"
|
||||
- fi
|
||||
-
|
||||
- LIBS=$save_LIBS
|
||||
- CXXFLAGS=$save_CXXFLAGS
|
||||
- CXX=$save_CXX
|
||||
- AC_LANG_POP([C++])
|
||||
],
|
||||
AC_MSG_WARN([[No Glib found, Qt5 support will not use native file pickers!]])
|
||||
)
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d59526dc6adf96c53cd7ed3c0235d9a876cbd1af07ab653456395ea94479d931
|
||||
size 192920640
|
||||
3
libreoffice-6.0.0.1.tar.xz
Normal file
3
libreoffice-6.0.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:71e82c59b5659d60cc97eb32c6e2e22a80621cfc166f148fd1b3e50ec0d4f485
|
||||
size 203038960
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:85dd76aabc205e8b30f9622bc5300156df6debf4ac0364eb732ced92932d30e4
|
||||
size 2343476
|
||||
3
libreoffice-help-6.0.0.1.tar.xz
Normal file
3
libreoffice-help-6.0.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7c4990a7c942d15610f451df8e2ade7e450ab9fe745e0244bff6a266b77d3e5c
|
||||
size 2972096
|
||||
@ -1,34 +0,0 @@
|
||||
Index: libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
===================================================================
|
||||
--- libreoffice-5.3.0.0.beta1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
+++ libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
@@ -1102,29 +1102,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "
|
||||
assertXPath(pXmlDoc, "//w:ind", "start", "1418");
|
||||
}
|
||||
|
||||
-DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
|
||||
-{
|
||||
- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
|
||||
- if (!pXmlDoc)
|
||||
- return;
|
||||
- // there should be no flipH and flipV attributes in this case
|
||||
- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
|
||||
- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
|
||||
- // check rotation angle
|
||||
- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
|
||||
- // check the first few coordinates of the polygon
|
||||
-#ifndef MACOSX /* Retina-related rounding rountrip error
|
||||
- * hard to smooth out due to the use of string compare
|
||||
- * instead of number */
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
|
||||
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
|
||||
-#endif
|
||||
-}
|
||||
-
|
||||
#endif
|
||||
|
||||
CPPUNIT_PLUGIN_IMPLEMENT();
|
||||
31
libreoffice-poppler-0.62.patch
Normal file
31
libreoffice-poppler-0.62.patch
Normal file
@ -0,0 +1,31 @@
|
||||
Index: libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
===================================================================
|
||||
--- libreoffice-6.0.0.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -32,10 +32,12 @@
|
||||
#pragma warning(push, 1)
|
||||
#endif
|
||||
|
||||
-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
|
||||
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0
|
||||
// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
|
||||
// because the internal poppler does not provide poppler-version.h and the macro always returns 0
|
||||
-#if POPPLER_CHECK_VERSION(0, 21, 1)
|
||||
+#if POPPLER_CHECK_VERSION(0, 62, 0)
|
||||
+#include <UnicodeMapFuncs.h>
|
||||
+#elif POPPLER_CHECK_VERSION(0, 21, 1)
|
||||
#include <UTF8.h>
|
||||
#elif POPPLER_CHECK_VERSION(0, 21, 0)
|
||||
#include "UTF.h"
|
||||
@@ -913,7 +915,11 @@ void PDFOutDev::drawChar(GfxState *state
|
||||
);
|
||||
|
||||
// silence spurious warning
|
||||
+#if POPPLER_CHECK_VERSION(0, 62, 0)
|
||||
+ (void)&mapUTF16;
|
||||
+#else
|
||||
(void)&mapUCS2;
|
||||
+#endif
|
||||
|
||||
char buf[9];
|
||||
for( int i=0; i<uLen; ++i )
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7249cc6f87f7d2448e2c23356c2ae260a9aeaaa88ca75fa8ac66b42a3626fd2d
|
||||
size 136408708
|
||||
3
libreoffice-translations-6.0.0.1.tar.xz
Normal file
3
libreoffice-translations-6.0.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1a4a07040ef5223807a0504ae09349f5350cb689daedae08fb68469822ce0101
|
||||
size 138936212
|
||||
@ -1,8 +1,93 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 4 21:30:45 UTC 2018 - dimstar@opensuse.org
|
||||
|
||||
- Add libreoffice-poppler-0.62.patch: Fix build with poppler 0.62,
|
||||
where UTF8.h (explcitly marked as an experimental header) was
|
||||
renamed to UnicodeMapFuncs.h.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 2 12:51:58 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- For now disable qt5 integration as it is utterly broken
|
||||
* just keep the kde4 one
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 20 20:03:58 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Version update to 6.0.0.1:
|
||||
* RC1 of 6 series, now tests seem to pass
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 12 08:52:45 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Reintroduce kde4 subpackage (now qt4 build with openssl-1.1)
|
||||
- Add the gtk2 subpackage to not pull-in the gtk2 on current desktop
|
||||
* Also supplement as needed for SLE12
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 11 14:38:26 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Supplement properly the qt5 and the plasma5-workspace
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 11 12:09:26 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Fix providing libgpg-error0 bsc#1072061 when bundling
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 8 09:42:28 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Version update to 6.0.0.0.beta2:
|
||||
* Many fixes in gpg4libre and all around
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 7 09:36:31 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Seems we no longer need the _r.so directly, no mentions in code
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 6 14:37:31 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Do not upse otherproviders() as it is not needed with new rpms
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 30 12:00:33 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Merge up all the icon themes as they have intermixed deps
|
||||
- Tweak up langpack generating to work with new gettext .mo files
|
||||
* Those macros are pretty ugly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 29 14:16:30 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Add patch to not bother checking qt4 bugs:
|
||||
* kde5-configure-checks.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 29 11:55:23 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Start updating to release 6.0.0.0.beta1:
|
||||
* Code for Qt5 UI
|
||||
* No longer flickering opengl backend
|
||||
* Tons of updates
|
||||
* Collada and gltf are removed upstream
|
||||
* Online help re-integrated even better
|
||||
- Remove merged patches:
|
||||
* 0001-Adapt-getcompver.awk-to-Java-9.patch
|
||||
* 0001-This-hunk-breaks-jdk9-build.patch
|
||||
* 0002-Detect-libjawt-automatically-on-java9-too.patch
|
||||
* java-encoding.patch
|
||||
* gnome-documents-check-ntimeoutid.patch
|
||||
- Drop no longer needed patches:
|
||||
* libreoffice-hotfix-disablebrokenshapetest.patch
|
||||
* disable-flaky-hsqldb-test.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 18 18:42:01 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Version update to release 5.4.3.2:
|
||||
* Various fixes in 5.4 branch
|
||||
* Contains also fixes for bnc#947117, bnc#1035589, bnc#954776, bnc#1021675
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 16 12:53:43 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
299
libreoffice.spec
299
libreoffice.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libreoffice
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -22,10 +22,10 @@
|
||||
%define numbertext_version 0.9.5
|
||||
# Urls
|
||||
%define external_url http://dev-www.libreoffice.org/src/
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.4.3
|
||||
#%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
|
||||
# Wether to enable the kde integration
|
||||
%if 0%{?is_opensuse} && 0%{?suse_version} < 1330
|
||||
#%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.0
|
||||
%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
|
||||
# Enable the kde integration on openSUSE only
|
||||
%if 0%{?is_opensuse}
|
||||
%bcond_without kdeintegration
|
||||
%else
|
||||
%bcond_with kdeintegration
|
||||
@ -38,10 +38,15 @@
|
||||
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
|
||||
%bcond_without system_gpgme
|
||||
%else
|
||||
# Hack in the bundled libs to not pop up on requires/provides to avoid
|
||||
# faking libreoffice provide some system packages
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_provides /bin/sh %_sourcedir/lo-provides %name
|
||||
%define __find_requires /bin/sh %_sourcedir/lo-requires %name
|
||||
%bcond_with system_gpgme
|
||||
%endif
|
||||
Name: libreoffice
|
||||
Version: 5.4.3.2
|
||||
Version: 6.0.0.1
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: LGPL-3.0+ and MPL-2.0+
|
||||
@ -59,11 +64,11 @@ Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu
|
||||
Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
|
||||
Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
|
||||
# GPGME bundle list
|
||||
Source998: lo-provides
|
||||
Source999: lo-requires
|
||||
Source1000: %{external_url}/gpgme-1.8.0.tar.bz2
|
||||
Source1001: %{external_url}/libgpg-error-1.26.tar.bz2
|
||||
Source1002: %{external_url}/libassuan-2.4.3.tar.bz2
|
||||
# This never had an release so just bundle it as per what other distros do
|
||||
Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
# Internal bundled stuff we can't remove
|
||||
# To build this we would pull cygwin; not worth it
|
||||
Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
@ -78,9 +83,7 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
|
||||
Source2006: http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
|
||||
Source2007: http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
|
||||
# PDFium is bundled everywhere
|
||||
Source2008: %{external_url}/pdfium-3064.tar.bz2
|
||||
# PATCH-FIX-SUSE: disable really fragile test run on hsqldb
|
||||
Patch0: disable-flaky-hsqldb-test.patch
|
||||
Source2008: %{external_url}/pdfium-3235.tar.bz2
|
||||
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
|
||||
# to avoid BerkleyDB incompatibility with the plain build
|
||||
Patch1: scp2-user-config-suse.diff
|
||||
@ -88,16 +91,8 @@ Patch1: scp2-user-config-suse.diff
|
||||
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
|
||||
Patch4: nlpsolver-no-broken-help.diff
|
||||
Patch5: mediawiki-no-broken-help.diff
|
||||
# PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs
|
||||
Patch16: libreoffice-hotfix-disablebrokenshapetest.patch
|
||||
Patch17: gnome-documents-check-ntimeoutid.patch
|
||||
# PATCH-FIX-UPSTREAM: remove a patch hunk that breaks rhino build
|
||||
Patch100: 0001-This-hunk-breaks-jdk9-build.patch
|
||||
# PATCH-FIX-UPSTREAM: fix detection of JDK9's libjawt.so
|
||||
Patch101: 0002-Detect-libjawt-automatically-on-java9-too.patch
|
||||
# PATCH-FIX-UPSTREAM: addapt getcompver.awk to java 9
|
||||
Patch102: 0001-Adapt-getcompver.awk-to-Java-9.patch
|
||||
Patch104: java-encoding.patch
|
||||
Patch6: kde5-configure-checks.patch
|
||||
Patch7: libreoffice-poppler-0.62.patch
|
||||
# try to save space by using hardlinks
|
||||
Patch990: install-with-hardlinks.diff
|
||||
BuildRequires: %{name}-share-linker
|
||||
@ -190,27 +185,28 @@ BuildRequires: pkgconfig(libclucene-core)
|
||||
BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.0
|
||||
BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1
|
||||
BuildRequires: pkgconfig(libeot) >= 0.01
|
||||
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.4
|
||||
BuildRequires: pkgconfig(libepubgen-0.1)
|
||||
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.7
|
||||
BuildRequires: pkgconfig(libexttextcat) >= 3.1.1
|
||||
BuildRequires: pkgconfig(libfreehand-0.1)
|
||||
BuildRequires: pkgconfig(libgltf-0.1) >= 0.1.0
|
||||
BuildRequires: pkgconfig(liblangtag)
|
||||
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
|
||||
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.11
|
||||
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.13
|
||||
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
|
||||
BuildRequires: pkgconfig(liborcus-0.12)
|
||||
BuildRequires: pkgconfig(liborcus-0.13)
|
||||
BuildRequires: pkgconfig(libpagemaker-0.0)
|
||||
BuildRequires: pkgconfig(libqxp-0.0)
|
||||
BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.3
|
||||
BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.4
|
||||
BuildRequires: pkgconfig(libvisio-0.1) >= 0.1
|
||||
BuildRequires: pkgconfig(libwpd-0.10) >= 0.10
|
||||
BuildRequires: pkgconfig(libwpg-0.3)
|
||||
BuildRequires: pkgconfig(libwps-0.4) >= 0.4.6
|
||||
BuildRequires: pkgconfig(libwps-0.4) >= 0.4.7
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(libxslt)
|
||||
BuildRequires: pkgconfig(libzmf-0.0)
|
||||
BuildRequires: pkgconfig(mdds-1.2)
|
||||
BuildRequires: pkgconfig(mdds-1.2) >= 1.2.3
|
||||
BuildRequires: pkgconfig(mythes)
|
||||
BuildRequires: pkgconfig(nspr) >= 4.8
|
||||
BuildRequires: pkgconfig(nss) >= 3.9.3
|
||||
@ -253,6 +249,7 @@ ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390x
|
||||
BuildRequires: libboost_date_time-devel
|
||||
BuildRequires: libboost_filesystem-devel
|
||||
BuildRequires: libboost_iostreams-devel
|
||||
BuildRequires: libboost_locale-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
%else
|
||||
BuildRequires: boost-devel
|
||||
@ -267,16 +264,15 @@ Recommends: liberation-fonts
|
||||
%if %{with firebird}
|
||||
BuildRequires: pkgconfig(fbclient)
|
||||
%endif
|
||||
%if 0%{?suse_version} == 1315
|
||||
BuildRequires: openCOLLADA-devel
|
||||
%else
|
||||
BuildRequires: libopenCOLLADA-devel
|
||||
%endif
|
||||
%if %{with kdeintegration}
|
||||
BuildRequires: libkde4-devel
|
||||
# needed for filepicker
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.4
|
||||
%else
|
||||
Provides: %{name}-kde4 = %{version}
|
||||
Obsoletes: %{name}-kde4 < %{version}
|
||||
Provides: %{name}-qt5 = %{version}
|
||||
Obsoletes: %{name}-qt5 < %{version}
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -296,7 +292,7 @@ Some optional features are provided by extra packages, for example:
|
||||
|
||||
- libreoffice-mailmerge
|
||||
- libreoffice-filters
|
||||
- libreoffice-kde4
|
||||
- libreoffice-qt5
|
||||
- libreoffice-gnome
|
||||
|
||||
Non-English localizations are provided by extra packages as well, for
|
||||
@ -310,7 +306,7 @@ example:
|
||||
Summary: Original Branding for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
Supplements: packageand(libreoffice:branding-upstream)
|
||||
Conflicts: otherproviders(libreoffice-branding)
|
||||
Conflicts: libreoffice-branding
|
||||
Provides: libreoffice-branding = %{version}
|
||||
Provides: libreoffice-branding-openSUSE = 4.0.1
|
||||
Obsoletes: libreoffice-branding-openSUSE < 4.0.1
|
||||
@ -319,77 +315,26 @@ BuildArch: noarch
|
||||
%description branding-upstream
|
||||
This package includes the original branding for the LibreOffice office suite.
|
||||
|
||||
%package icon-theme-breeze
|
||||
Summary: Breeze LibreOffice Icon Theme (KDE Frameworks default)
|
||||
Group: Productivity/Office/Suite
|
||||
Requires: %{name}-icon-theme-galaxy
|
||||
Requires(post): %{name}-share-linker
|
||||
Requires(postun): %{name}-share-linker
|
||||
Supplements: packageand(libreoffice:plasma5-workspace)
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description icon-theme-breeze
|
||||
This package provides Breeze LibreOffice icon theme. It is used in KDE
|
||||
Frameworks by default.
|
||||
|
||||
%package icon-theme-galaxy
|
||||
Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default)
|
||||
%package icon-themes
|
||||
Summary: LibreOffice Icon Themes
|
||||
Group: Productivity/Office/Suite
|
||||
Requires(post): %{name}-share-linker
|
||||
Requires(postun): %{name}-share-linker
|
||||
Supplements: libreoffice
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
Provides: %{name}-icon-theme-breeze = %{version}
|
||||
Obsoletes: %{name}-icon-theme-breeze < %{version}
|
||||
Provides: %{name}-icon-theme-galaxy = %{version}
|
||||
Obsoletes: %{name}-icon-theme-galaxy < %{version}
|
||||
Provides: %{name}-icon-theme-hicontrast = %{version}
|
||||
Obsoletes: %{name}-icon-theme-hicontrast < %{version}
|
||||
Provides: %{name}-icon-theme-sifr = %{version}
|
||||
Obsoletes: %{name}-icon-theme-sifr < %{version}
|
||||
Provides: %{name}-icon-theme-tango = %{version}
|
||||
Obsoletes: %{name}-icon-theme-tango < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description icon-theme-galaxy
|
||||
This package provides Galaxy LibreOffice icon theme. It is used in the original OOo-3.x by default.
|
||||
|
||||
%package icon-theme-hicontrast
|
||||
Summary: Hicontrast LibreOffice Icon Theme
|
||||
Group: Productivity/Office/Suite
|
||||
Requires: %{name}-icon-theme-galaxy
|
||||
Requires(post): %{name}-share-linker
|
||||
Requires(postun): %{name}-share-linker
|
||||
Supplements: libreoffice
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description icon-theme-hicontrast
|
||||
This package provides Hicontrast LibreOffice icon theme.
|
||||
|
||||
%package icon-theme-sifr
|
||||
Summary: Sifr LibreOffice Icon Theme
|
||||
Group: Productivity/Office/Suite
|
||||
Requires: %{name}-icon-theme-breeze
|
||||
Requires: %{name}-icon-theme-galaxy
|
||||
Requires(post): %{name}-share-linker
|
||||
Requires(postun): %{name}-share-linker
|
||||
Supplements: libreoffice
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description icon-theme-sifr
|
||||
This package provides Sifr LibreOffice icon theme.
|
||||
|
||||
%package icon-theme-tango
|
||||
Summary: Tango LibreOffice Icon Theme (GNOME default)
|
||||
Group: Productivity/Office/Suite
|
||||
Requires: %{name}-icon-theme-galaxy
|
||||
Requires(post): %{name}-share-linker
|
||||
Requires(postun): %{name}-share-linker
|
||||
Supplements: packageand(libreoffice:gnome-session)
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description icon-theme-tango
|
||||
This package provides Tango LibreOffice icon theme. It is used in GNOME by default
|
||||
and obsoleted the old Industrial theme.
|
||||
%description icon-themes
|
||||
This package provides all of the LibreOffice icon themes.
|
||||
|
||||
%package glade
|
||||
Summary: Support for creating LibreOffice dialogs in glade
|
||||
@ -559,20 +504,42 @@ Requires: %{name}-gnome = %{version}
|
||||
%if 0%{?suse_version} > 1315 || 0%{?is_opensuse}
|
||||
Supplements: packageand(libreoffice:gnome-session)
|
||||
%endif
|
||||
%if !%{with kdeintegration}
|
||||
Supplements: packageand(libreoffice:plasma5-workspace)
|
||||
%endif
|
||||
|
||||
%description gtk3
|
||||
This package contains Gtk3 interface rendering option for LibreOffice.
|
||||
|
||||
%package gtk2
|
||||
Summary: Gtk2 interface for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
Recommends: %{name}-gnome = %{version}
|
||||
# We are default on SLE12
|
||||
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
|
||||
Supplements: packageand(libreoffice:gnome-session)
|
||||
%endif
|
||||
# Without kde integration we provide gtk2 interface there
|
||||
%if !%{with kdeintegration}
|
||||
Supplements: packageand(libreoffice:plasma5-workspace)
|
||||
%endif
|
||||
|
||||
%description gtk2
|
||||
This package contains Gtk2 interface rendering option for LibreOffice.
|
||||
|
||||
%package kde4
|
||||
Summary: KDE4 Extensions for LibreOffice
|
||||
Summary: kde4 interface for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
Requires: %{name} = %{version}
|
||||
Supplements: packageand(libreoffice:plasma5-workspace)
|
||||
|
||||
%description kde4
|
||||
This package contains kde4 interface rendering options for LibreOffice.
|
||||
|
||||
%package qt5
|
||||
Summary: Qt5 interface for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description kde4
|
||||
This package contains some KDE4 extensions for LibreOffice.
|
||||
%description qt5
|
||||
This package contains Qt5 interface rendering options for LibreOffice.
|
||||
|
||||
%package sdk
|
||||
Summary: LibreOffice SDK
|
||||
@ -634,10 +601,7 @@ appearance and behavior.
|
||||
|
||||
%package base-drivers-mysql
|
||||
Summary: MySQL Database Driver for LibreOffice
|
||||
# This mysql thing is just dlopened
|
||||
# WARNING: the soname might change!
|
||||
Group: Productivity/Office/Suite
|
||||
Requires: libmysqlclient_r18
|
||||
Requires: libreoffice-base = %{version}
|
||||
Requires(pre): libreoffice = %{version}
|
||||
Supplements: packageand(libreoffice-base:mysql-client)
|
||||
@ -730,31 +694,22 @@ fi \
|
||||
|
||||
# Crazy magic for the auto help/lang generating.
|
||||
# Inspired and adjusted from Fedora spec.
|
||||
%define _langpack_common() \
|
||||
%dir %{_datadir}/%{name}/program/resource \
|
||||
%{_datadir}/%{name}/program/resource/*%{1}.res \
|
||||
%if "%{1}" != "tn" \
|
||||
%exclude %{_datadir}/%{name}/program/resource/*sr-Latn.res \
|
||||
%endif \
|
||||
%if "%{1}" != "en-US" \
|
||||
%dir %{_datadir}/%{name}/share/config/soffice.cfg \
|
||||
%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules \
|
||||
%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/*/ui/res \
|
||||
%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/*/ui \
|
||||
%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/* \
|
||||
%{_datadir}/%{name}/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \
|
||||
%dir %{_datadir}/%{name}/share/config/soffice.cfg/*/ui/res \
|
||||
%dir %{_datadir}/%{name}/share/config/soffice.cfg/*/ui \
|
||||
%dir %{_datadir}/%{name}/share/config/soffice.cfg/* \
|
||||
%{_datadir}/%{name}/share/config/soffice.cfg/*/ui/res/%{1}.zip \
|
||||
%define _langpack_common(g:l:j:) \
|
||||
%if "%{-l*}" != "en-US" \
|
||||
%dir %{_datadir}/libreoffice/program/resource \
|
||||
%dir %{_datadir}/libreoffice/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}} \
|
||||
%dir %{_datadir}/libreoffice/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}}/LC_MESSAGES \
|
||||
%{_datadir}/%{name}/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}}/LC_MESSAGES/*.mo \
|
||||
%endif \
|
||||
%dir %{_datadir}/%{name}/share/registry \
|
||||
%dir %{_datadir}/%{name}/share/registry/res \
|
||||
%{_datadir}/%{name}/share/registry/Langpack-%{1}.xcd \
|
||||
%if "%{1}" != "en-US" \
|
||||
%{_datadir}/%{name}/share/registry/res/registry_%{1}.xcd \
|
||||
%{_datadir}/%{name}/share/registry/Langpack-%{-l*}.xcd \
|
||||
%if "%{-l*}" != "en-US" \
|
||||
%{_datadir}/%{name}/share/registry/res/registry_%{-l*}.xcd \
|
||||
%endif \
|
||||
%{_datadir}/%{name}/share/registry/res/fcfg_langpack_%{1}.xcd \
|
||||
%{_datadir}/%{name}/share/registry/res/fcfg_langpack_%{-l*}.xcd \
|
||||
%dir %{_datadir}/%{name}/share/wizards \
|
||||
%{_datadir}/%{name}/share/wizards/resources_%{-j:%{-j*}}%{!-j:%{-l*}}.properties \
|
||||
%{nil}
|
||||
|
||||
# Defines a language pack subpackage.
|
||||
@ -779,6 +734,9 @@ fi \
|
||||
# i: additional language added to this package
|
||||
# L: internal (LibreOffice) language code, used in file names
|
||||
# l: language code, e.g., cs
|
||||
# g: glibc/java locale
|
||||
# j: java locale for the additional language
|
||||
# k: glibc locale for the additional language
|
||||
# Mm: myspell dependency
|
||||
# n: language name, e.g., Czech
|
||||
# p: Provides: of libreoffice-l10n
|
||||
@ -792,7 +750,7 @@ fi \
|
||||
# Example:
|
||||
# libreoffice-l10n-cs: langpack for Czech lang. Requiring myspell-cs_CZ:
|
||||
# %%langpack -l cs -n Czech -m cs_CZ
|
||||
%define langpack(c:Ei:L:l:Mm:n:p:q:r:S:s:Xx:) \
|
||||
%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:Xx:) \
|
||||
%define project LibreOffice \
|
||||
%define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \
|
||||
%define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \
|
||||
@ -839,11 +797,11 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%{!-E: \
|
||||
%define autotextdir %{_datadir}/%{name}/share/autotext \
|
||||
%dir %{autotextdir} \
|
||||
%{expand:%%_langpack_common %{_langpack_lang}} \
|
||||
%{expand:%%_langpack_common -l %{_langpack_lang} %{-g:-g %{-g*} -j %{-g*}}} \
|
||||
%{-x:%{autotextdir}/%{-x*}}%{!-x:%{-X:%{autotextdir}/%{_langpack_lang}}} \
|
||||
%{-c:%{_datadir}/%{name}/share/registry/%{-c*}.xcd} \
|
||||
%{-s:%{_datadir}/%{name}/share/registry/%{-s*}_%{_langpack_lang}.xcd} \
|
||||
%{-i:%{expand:%%_langpack_common %{-i*}}} \
|
||||
%{-i:%{expand:%%_langpack_common -l %{-i*} %{-k:-g %{-k*}} %{-j:-j %{-j*}}}} \
|
||||
} \
|
||||
\
|
||||
%{expand:%%_link_noarch_files %{pkgname}} \
|
||||
@ -862,7 +820,7 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%langpack -l de -n German -X -M
|
||||
%langpack -l dz -n Dzongkha -s ctl
|
||||
%langpack -l el -n Greek -m el_GR
|
||||
%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M
|
||||
%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M -g en_US
|
||||
%langpack -l eo -n Esperanto
|
||||
%langpack -l es -n Spanish -M -X
|
||||
%langpack -l et -n Estonian -m et_EE
|
||||
@ -893,16 +851,16 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%langpack -l nr -n Southern_Ndebele
|
||||
%langpack -l nso -n Northern_Sotho
|
||||
%langpack -l or -n Odia -s ctl
|
||||
%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN
|
||||
%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN
|
||||
%langpack -l pl -n Polish -X -m pl_PL
|
||||
%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X
|
||||
%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X -g pt_BR -j pt_BR
|
||||
%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT
|
||||
%langpack -l ro -n Romanian -M -X
|
||||
%langpack -l ru -n Russian -X -m ru_RU
|
||||
%langpack -l si -n Sinhalese -S ctl -m si_LK
|
||||
%langpack -l sk -n Slovak -X -m sk_SK
|
||||
%langpack -l sl -n Slovenian -X -m sl_SI
|
||||
%langpack -l sr -n Serbian -i sr-Latn -M
|
||||
%langpack -l sr -n Serbian -i sr-Latn -M -j sr_Latn -g sr -k sr@latin
|
||||
%langpack -l ss -n Swati
|
||||
%langpack -l st -n Southern_Sotho
|
||||
%langpack -l sv -n Swedish -X -m sv_SE
|
||||
@ -915,31 +873,28 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%langpack -l uk -n Ukrainian -m uk_UA
|
||||
%langpack -l ve -n Venda
|
||||
%langpack -l xh -n Xhosa
|
||||
%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans
|
||||
%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant
|
||||
%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans -g zh_CN -j zh_CN
|
||||
%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant -g zh_TW -j zh_TW
|
||||
%langpack -l zu -n Zulu -m zu_ZA
|
||||
|
||||
%prep
|
||||
%setup -q -b1 -b2
|
||||
%patch0 -p1
|
||||
# The rename of the configdir is needed only on older than factory for compat
|
||||
%if 0%{?suse_version} < 1330
|
||||
%patch1
|
||||
%endif
|
||||
%patch4
|
||||
%patch5
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch104 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch990 -p1
|
||||
|
||||
# Disable some of the failing tests (some are random)
|
||||
%if 0%{?suse_version} < 1330
|
||||
sed -i -e '/CppunitTest_desktop_lib/d' desktop/Module_desktop.mk
|
||||
%endif
|
||||
# Temporary disable as it fails on the RCs
|
||||
sed -i -e /CppunitTest_sw_rtfimport/d sw/Module_sw.mk
|
||||
|
||||
# Do not generate doxygen timestamp
|
||||
echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile
|
||||
@ -1021,8 +976,6 @@ export NOCONFIGURE=yes
|
||||
--enable-gtk3 \
|
||||
--enable-introspection \
|
||||
--with-doxygen \
|
||||
--enable-gltf \
|
||||
--enable-collada --with-system-opencollada \
|
||||
--enable-release-build \
|
||||
--enable-split-app-modules \
|
||||
--enable-split-opt-features \
|
||||
@ -1043,8 +996,10 @@ export NOCONFIGURE=yes
|
||||
--without-export-validation \
|
||||
--enable-odk \
|
||||
%if %{with kdeintegration}
|
||||
--disable-qt5 \
|
||||
--enable-kde4 \
|
||||
%else
|
||||
--disable-qt5 \
|
||||
--disable-kde4 \
|
||||
%endif
|
||||
%if %{with system_gpgme}
|
||||
@ -1093,6 +1048,9 @@ set +x
|
||||
# Split out gtk3 interface to -gtk3 subpackage
|
||||
grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist
|
||||
mv tmplist file-lists/gnome_list.txt
|
||||
# also split out gtk2 interface to make sure we do not pull gtk2 for fun of it
|
||||
grep -v "%{_libdir}/libreoffice/program/libvclplug_gtklo.so" file-lists/gnome_list.txt > tmplist
|
||||
mv tmplist file-lists/gnome_list.txt
|
||||
|
||||
# Remove firebird connector from main package filelist
|
||||
%if %{with firebird}
|
||||
@ -1136,21 +1094,18 @@ for dir in `find %{buildroot}/%{_datadir}/icons/gnome -type d` ; do
|
||||
done
|
||||
echo "%dir %{_datadir}/application-registry" >>file-lists/common_list.txt
|
||||
echo "%dir %{_datadir}/mime-info" >>file-lists/common_list.txt
|
||||
echo "%dir %{_datadir}/mimelnk" >>file-lists/common_list.txt
|
||||
echo "%dir %{_datadir}/mimelnk/application" >>file-lists/common_list.txt
|
||||
|
||||
#################################
|
||||
# Move split noarch data to share
|
||||
#################################
|
||||
for i in %{buildroot}%{_libdir}/%{name}/share/config/soffice.cfg/modules/*/ui/res/*.zip \
|
||||
%{buildroot}%{_libdir}/%{name}/share/config/soffice.cfg/*/ui/res/*.zip \
|
||||
for i in %{buildroot}%{_libdir}/%{name}/program/resource/*/*/*.mo \
|
||||
%{buildroot}%{_libdir}/%{name}/share/registry/res/fcfg_langpack_*.xcd \
|
||||
%{buildroot}%{_libdir}/%{name}/share/registry/res/registry_*.xcd \
|
||||
%{buildroot}%{_libdir}/%{name}/share/registry/Langpack-*.xcd \
|
||||
%{buildroot}%{_libdir}/%{name}/program/resource/*.res \
|
||||
%{buildroot}%{_libdir}/%{name}/share/config/images*.zip \
|
||||
%{buildroot}%{_libdir}/%{name}/share/registry/{cjk,ctl}_*.xcd \
|
||||
%{buildroot}%{_libdir}/%{name}/share/registry/ctlseqcheck_th.xcd \
|
||||
%{buildroot}%{_libdir}/%{name}/share/wizards/*.properties \
|
||||
; do
|
||||
trg="`dirname "$i" | sed 's|%{_libdir}|%{_datadir}|'`"
|
||||
mkdir -p "$trg"
|
||||
@ -1173,6 +1128,11 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/share/autotext/
|
||||
grep -v '%{_libdir}/%{name}/share/autotext' file-lists/common_list.txt > tmplist
|
||||
mv tmplist file-lists/common_list.txt
|
||||
mv %{buildroot}/%{_libdir}/%{name}/share/autotext/ %{buildroot}/%{_datadir}/%{name}/share/
|
||||
# translations of java apps should be in lang pkgs too
|
||||
grep -v '%{_libdir}/%{name}/share/wizards' file-lists/common_list.txt > tmplist
|
||||
mv tmplist file-lists/common_list.txt
|
||||
# the sr is dupe of sr_Latn
|
||||
rm -rf %{buildroot}%{datadir}/%{name}/share/wizards/resources_sr.properties
|
||||
|
||||
################
|
||||
# branding split
|
||||
@ -1270,6 +1230,7 @@ ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/
|
||||
chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgme.so.11
|
||||
chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgmepp.so.6
|
||||
chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libassuan.so.0
|
||||
chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpg-error.so.0
|
||||
%endif
|
||||
|
||||
# Symlink uno.py and unohelper.py so that python can find them
|
||||
@ -1357,11 +1318,7 @@ exit 0
|
||||
%postun writer
|
||||
%desktop_database_postun
|
||||
|
||||
%_link_noarch_files icon-theme-breeze
|
||||
%_link_noarch_files icon-theme-galaxy
|
||||
%_link_noarch_files icon-theme-hicontrast
|
||||
%_link_noarch_files icon-theme-sifr
|
||||
%_link_noarch_files icon-theme-tango
|
||||
%_link_noarch_files icon-themes
|
||||
|
||||
%files -f file-lists/common_list.txt
|
||||
# ignore helper files for brp-symlink check
|
||||
@ -1440,6 +1397,9 @@ exit 0
|
||||
%files gtk3
|
||||
%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so
|
||||
|
||||
%files gtk2
|
||||
%{_libdir}/libreoffice/program/libvclplug_gtklo.so
|
||||
|
||||
%if %{with kdeintegration}
|
||||
%files -f file-lists/kde4_list.txt kde4
|
||||
%endif
|
||||
@ -1462,36 +1422,17 @@ exit 0
|
||||
%files writer-extensions
|
||||
%{_libdir}/%{name}/share/extensions/wiki-publisher
|
||||
|
||||
%files icon-theme-breeze
|
||||
%files icon-themes
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/share
|
||||
%dir %{_datadir}/%{name}/share/config
|
||||
%{_datadir}/%{name}/share/config/images_breeze.zip
|
||||
%{_datadir}/%{name}/share/config/images_breeze_dark.zip
|
||||
|
||||
%files icon-theme-galaxy
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/share
|
||||
%dir %{_datadir}/%{name}/share/config
|
||||
%{_datadir}/%{name}/share/config/images_elementary.zip
|
||||
%{_datadir}/%{name}/share/config/images_galaxy.zip
|
||||
|
||||
%files icon-theme-hicontrast
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/share
|
||||
%dir %{_datadir}/%{name}/share/config
|
||||
%{_datadir}/%{name}/share/config/images_hicontrast.zip
|
||||
|
||||
%files icon-theme-sifr
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/share
|
||||
%dir %{_datadir}/%{name}/share/config
|
||||
%{_datadir}/%{name}/share/config/images_sifr.zip
|
||||
%{_datadir}/%{name}/share/config/images_sifr_dark.zip
|
||||
|
||||
%files icon-theme-tango
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/share
|
||||
%dir %{_datadir}/%{name}/share/config
|
||||
%{_datadir}/%{name}/share/config/images_tango.zip
|
||||
|
||||
%files -f file-lists/branding_upstream.txt branding-upstream
|
||||
|
||||
6
lo-provides
Normal file
6
lo-provides
Normal file
@ -0,0 +1,6 @@
|
||||
# hide some private libraries from provides
|
||||
grep -v -e libgpgme.so \
|
||||
-e libgpgmepp.so \
|
||||
-e libassuan.so \
|
||||
-e libgpg-error.so \
|
||||
| /usr/lib/rpm/find-provides “$@”
|
||||
6
lo-requires
Normal file
6
lo-requires
Normal file
@ -0,0 +1,6 @@
|
||||
# do not require some internal libraries
|
||||
/usr/lib/rpm/find-requires “$@” | \
|
||||
grep -v -e libgpgme.so \
|
||||
-e libgpgmepp.so \
|
||||
-e libassuan.so \
|
||||
-e libgpg-error.so
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883
|
||||
size 5515914
|
||||
3
pdfium-3235.tar.bz2
Normal file
3
pdfium-3235.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f
|
||||
size 5836207
|
||||
Loading…
Reference in New Issue
Block a user