[calligra] Sync with upstream. Contributes to JB#47548

Including a small change to rtf image loading and upstreamed build fix.
sailfishos · Nov 14, 2019 · da5874c · da5874c
1 parent e510b11
commit da5874c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 28 deletions.
diff --git a/rpm/calligra-gcc6.patch b/rpm/calligra-gcc6.patch
diff --git a/rpm/calligra.spec b/rpm/calligra.spec
@@ -37,7 +37,6 @@ Patch18: calligra-cache.patch
 Patch19: calligra-qtdbus.patch
 Patch20: calligra-background.patch
 Patch21: calligra-invalidate-cache.patch
-Patch22: calligra-gcc6.patch
 
 %description
 %{summary}.
@@ -191,7 +190,6 @@ BuildRequires:  extra-cmake-modules >= 5.34.0
 %patch19 -d upstream -p1
 %patch20 -d upstream -p1
 %patch21 -d upstream -p1
-%patch22 -d upstream -p1
 
 %define build_kf5() cd %1 ; if [ ! -d build ] ; then mkdir build ; fi ; cd build ; if [ ! -e Makefile ] ; then CMAKE_PREFIX_PATH=%{_buildrootdir}/kf5/usr cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_RPATH=/usr/lib/calligra-kf5 %{?2} .. ; fi ; make %{?_smp_mflags} install DESTDIR=%{_buildrootdir}/kf5 ; cd ../.. ;
 %build

diff --git a/upstream b/upstream