Add .gitignore and .gitea/workflows/ci.yml

.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2024,6,20,14,42,6
+Version=3
+ViewMode=1

.gitea/workflows/ci.yml

@@ -13,4 +13,5 @@ jobs:
         with:
           CI_DEPLOY: ${{ secrets.CI_DEPLOY }}
           PUBLICATOR: ${{ secrets.PUBLICATOR }}
+          REPO_DEPLOY: ${{ secrets.REPO_DEPLOY }}
 

libreoffice.spec

@@ -3,6 +3,8 @@
 %bcond_with ccache
 %if %{mdvver} < 201900
 %bcond_without clang
+%define llvm_ver llvm17
+%define llvm_path /opt/%{llvm_ver}
 %else
 %bcond_with clang
 %endif
@@ -24,14 +26,14 @@
 
 %define javaless 1
 
-%define relurl http://download.documentfoundation.org/libreoffice/src/%{version}
+%define relurl https://download.documentfoundation.org/libreoffice/src/%{version}
-%define devurl http://dev-www.libreoffice.org/ooo_external
+%define devurl https://dev-www.libreoffice.org/ooo_external
-%define devexurl http://dev-www.libreoffice.org/extern
+%define devexurl https://dev-www.libreoffice.org/extern
-%define srcurl http://dev-www.libreoffice.org/src/
+%define srcurl https://dev-www.libreoffice.org/src/
-%define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/
+%define oxyurl https://ooo.itc.hu/oxygenoffice/download/libreoffice/
-%define distroname ROSA
+%define distroname R11
 %define ooname libreoffice
-%define buildver %{version}.2
+%define buildver %{version}.3
 %define ooodir %{_libdir}/libreoffice
 %define antver 1.8.1
 %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-%{antver}
@@ -51,11 +53,11 @@
 Summary:	Office suite
 Name:		libreoffice
 Epoch:		1
-Version:	6.4.7
+Version:	24.8.0
 Release:	1
 License:	(MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
 Group:		Office
-Url:		http://www.libreoffice.org
+URL:		https://www.libreoffice.org
 
 Source0:	%{relurl}/%{ooname}-%{buildver}.tar.xz
 Source1:	%{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz
@@ -67,7 +69,7 @@ Source5:	locales.csv
 # Unused, should be dropped in future package updates
 Source10:	Mandriva-Rosa_Icons.tar.bz2
 %if %{javaless}
-Source20:	http://archive.apache.org/dist/ant/binaries/apache-ant-%{antver}-bin.tar.bz2
+Source20:	https://archive.apache.org/dist/ant/binaries/apache-ant-%{antver}-bin.tar.bz2
 %endif
 Source33:	%{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 Source35:	%{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -75,7 +77,7 @@ Source36:	%{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 Source37:	%{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 
 # Extensions
-Source49:	%{srcurl}pdfium-3794.tar.bz2
+Source49:	%{srcurl}pdfium-6536.tar.bz2
 Source51:	%{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 Source54:	%{oxyurl}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
 Source56:	%{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
@@ -115,11 +117,12 @@ Patch104:	libreoffice-5.1.2.2-desktop-startcenter-nomate.patch
 
 BuildRequires:	bison
 BuildRequires:	bsh
+BuildRequires:  ant
 %if %{with ccache}
 BuildRequires:	ccache
 %endif
 %if %{with clang}
-BuildRequires:	clang
+BuildRequires:	%{llvm_ver}
 BuildRequires:	stdc++-gcc10-devel
 %endif
 BuildRequires:	desktop-file-utils
@@ -127,7 +130,7 @@ BuildRequires:	doxygen >= 1.8.4
 BuildRequires:	ed
 BuildRequires:	flex
 BuildRequires:	flute
-BuildRequires:	git
+BuildRequires:	git-core
 BuildRequires:	gperf
 %if %{with icecream}
 BuildRequires:	icecream
@@ -154,10 +157,11 @@ BuildRequires:	xsltproc >= 1.0.19
 BuildRequires:	zip
 BuildRequires:	boost-devel
 BuildRequires:	cups-devel
+BuildRequires:  %{_lib}qrcodegencpp-devel
 BuildRequires:	db-devel
 BuildRequires:	glm-devel
 BuildRequires:	hyphen-devel
-BuildRequires:	java-devel
+BuildRequires:	java-1.8.0-openjdk-devel
 BuildRequires:	jemalloc-devel
 BuildRequires:	lpsolve-devel
 BuildRequires:	mysql-connector-c++-devel
@@ -169,6 +173,7 @@ BuildRequires:  systemtap-devel
 BuildRequires:	unixODBC-devel
 #BuildRequires:	vigra-devel
 BuildRequires:	gpgmepp-devel
+BuildRequires:  atomic-devel
 BuildRequires:	pkgconfig(bluez)
 BuildRequires:	pkgconfig(cppunit) >= 1.14.0
 BuildRequires:	pkgconfig(dbus-1)
@@ -193,20 +198,20 @@ BuildRequires:	pkgconfig(lcms2)
 BuildRequires:	pkgconfig(libabw-0.1)
 BuildRequires:	pkgconfig(libclucene-core)
 BuildRequires:	pkgconfig(liblucene++-contrib)
-BuildRequires:	pkgconfig(libcmis-0.5) >= 0.5.2
+BuildRequires:	pkgconfig(libcmis-0.6) >= 0.6
 BuildRequires:	pkgconfig(libcurl)
 BuildRequires:	pkgconfig(libcdr-0.1)
 BuildRequires:	pkgconfig(libe-book-0.1)
 BuildRequires:	pkgconfig(libeot)
 BuildRequires:	pkgconfig(libexttextcat)
 BuildRequires:	pkgconfig(libepubgen-0.1)
-BuildRequires:	pkgconfig(libixion-0.14)
+BuildRequires:	pkgconfig(libixion-0.18)
 BuildRequires:	pkgconfig(liblangtag)
 BuildRequires:	pkgconfig(libmspub-0.1)
 BuildRequires:	pkgconfig(libmwaw-0.3) >= 0.3.4
 BuildRequires:	pkgconfig(libnumbertext)
 BuildRequires:	pkgconfig(libodfgen-0.1) >= 0.1.0
-BuildRequires:	pkgconfig(liborcus-0.14) >= 0.14.1
+BuildRequires:	pkgconfig(liborcus-0.18)
 BuildRequires:	pkgconfig(libpagemaker-0.0)
 BuildRequires:	pkgconfig(libpq)
 BuildRequires:	pkgconfig(libqxp-0.0)
@@ -222,7 +227,7 @@ BuildRequires:	pkgconfig(libwpg-0.3)
 BuildRequires:	pkgconfig(libwps-0.4)
 BuildRequires:	pkgconfig(libxml-2.0)
 BuildRequires:	pkgconfig(libxslt)
-BuildRequires:	pkgconfig(mdds-1.5) >= 1.5.0
+BuildRequires:	pkgconfig(mdds-2.1) >= 2.1
 BuildRequires:	pkgconfig(mythes)
 BuildRequires:	pkgconfig(neon)
 BuildRequires:	pkgconfig(nspr)
@@ -238,7 +243,7 @@ BuildRequires:	pkgconfig(redland)
 BuildRequires:	pkgconfig(sane-backends)
 BuildRequires:	pkgconfig(sndfile)
 BuildRequires:	pkgconfig(xaw7)
-BuildRequires:	pkgconfig(xmlsec1) >= 1.2.28
+BuildRequires:	pkgconfig(xmlsec1) >= 1.2.35
 BuildRequires:	pkgconfig(xpm)
 BuildRequires:	pkgconfig(xtst)
 BuildRequires:	pkgconfig(valgrind)
@@ -265,21 +270,23 @@ BuildRequires:	kf5wayland-devel
 BuildRequires:	kf5widgetsaddons-devel
 BuildRequires:	kf5windowsystem-devel
 BuildRequires:	kf5xmlgui-devel
-BuildRequires:	pkgconfig(Qt5Concurrent)
+BuildRequires:  qt515
-BuildRequires:	pkgconfig(Qt5Core)
+#BuildRequires:	pkgconfig(Qt5Concurrent)
-BuildRequires:	pkgconfig(Qt5DBus)
+#BuildRequires:	pkgconfig(Qt5Core)
-BuildRequires:	pkgconfig(Qt5Gui)
+#BuildRequires:	pkgconfig(Qt5DBus)
-BuildRequires:	pkgconfig(Qt5Multimedia)
+#BuildRequires:	pkgconfig(Qt5Gui)
-BuildRequires:	pkgconfig(Qt5Network)
+#BuildRequires:	pkgconfig(Qt5Multimedia)
-BuildRequires:	pkgconfig(Qt5Qml)
+#BuildRequires:	pkgconfig(Qt5Network)
-BuildRequires:	pkgconfig(Qt5Quick)
+#BuildRequires:	pkgconfig(Qt5Qml)
-BuildRequires:	pkgconfig(Qt5QuickWidgets)
+#BuildRequires:	pkgconfig(Qt5Quick)
-BuildRequires:	pkgconfig(Qt5Sensors)
+#BuildRequires:	pkgconfig(Qt5QuickWidgets)
-BuildRequires:	pkgconfig(Qt5Script)
+#BuildRequires:	pkgconfig(Qt5Sensors)
-BuildRequires:	pkgconfig(Qt5Test)
+#BuildRequires:	pkgconfig(Qt5Script)
-BuildRequires:	pkgconfig(Qt5UiTools)
+#BuildRequires:	pkgconfig(Qt5Test)
-BuildRequires:	pkgconfig(Qt5Widgets)
+#BuildRequires:	pkgconfig(Qt5UiTools)
-BuildRequires:	pkgconfig(Qt5X11Extras)
+#BuildRequires:	pkgconfig(Qt5Widgets)
+#BuildRequires:	pkgconfig(Qt5X11Extras)
+BuildRequires:  pkgconfig(mariadb)
 %if !%{javaless}
 BuildRequires:	ant
 BuildRequires:	ant-apache-regexp
@@ -895,6 +902,16 @@ chmod 777 ~/tmp
 # 4.4.1.2 specific
 chmod +x bin/unpack-sources
 
+# up mdds to 2.1, liborcus-0.18
+sed -i 's/mdds-1.5/mdds-2.1/g' configure*
+sed -i 's/liborcus-0.15/liborcus-0.18/g' configure*
+
+# qrcodegen/QrCode.hpp
+sed -i 's|qrcodegen/QrCode.hpp|qrcodegencpp/QrCode.hpp|' configure*
+
+# update and fix pdfium
+sed -i 's/pdfium-4137/pdfium-6536/g' download.lst solenv/flatpak-manifest.in 
+
 %build
 # path to external tarballs
 EXTSRCDIR=`dirname %{SOURCE0}`
@@ -927,9 +944,9 @@ done
 mkdir -p local_bin
 install -m0755 %{SOURCE80} "local_bin/clang++"
 export PATH="${PWD}/local_bin:${PATH}"
-export CC=clang
+export CC=%{llvm_path}/bin/clang
-export CXX=clang++
+export CXX=%{llvm_path}/bin/clang++
-export CPP=clang-cpp
+export CPP=%{llvm_path}/bin/clang-cpp
 # libstdc++ from gcc5 is too old, use newer version of libstdc++
 export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libstdc++-gcc10 -I%{_includedir}/libstdc++-gcc10/%{_host}"
 export CXXFLAGS="$CXXFLAGS -nostdinc++ $CPPFLAGS -Wno-unused-command-line-argument -D__STDCPP_WANT_MATH_SPEC_FUNCS__"
@@ -947,10 +964,15 @@ sed -i \
 	configure
 %endif
 
+export ORCUS_CFLAGS="-lliborcus-0.18"
+
+export LD_LIBRARY_PATH=/opt/openssl3.3/lib/:${LD_LIBRARY_PATH}
+
 %configure \
+    LIBS="-lqrcodegencpp  $LIBS" \
 	%{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \
-	--with-vendor=ROSA \
+	--with-vendor=R11 \
-	--with-build-version="ROSA %{buildver}-%{release}" \
+	--with-build-version="R11 %{buildver}-%{release}" \
 	--disable-coinmp \
 	--disable-fetch-external \
 	--with-external-tar="$EXTSRCDIR" \
@@ -968,6 +990,7 @@ sed -i \
 	--without-fonts \
 	--without-lxml \
 	--without-junit \
+	--with-system-qrcodegen \
 %if %{javaless}
 	--with-ant-home="%{antpath}" \
 %else
@@ -988,6 +1011,7 @@ sed -i \
 	--enable-ext-languagetool \
 	--enable-ext-wiki-publisher \
 	--enable-ext-mariadb-connector \
+	--with-system-mdds \
 %if %{with ccache} && !%{with icecream}
 	--with-gcc-speedup=ccache \
 %else