From 783e962854b854e346ccb03f7ae5ceb198458bb1 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Sat, 6 Jan 2024 05:35:01 +0100 Subject: [PATCH] automatic version update by autodist [release 7.4.1.2-1mamba;Wed Sep 14 2022] --- libreoffice-7.4.1.1-gpgme-1.18.patch | 20 ++++++++++++++++++++ libreoffice.spec | 24 ++++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 libreoffice-7.4.1.1-gpgme-1.18.patch diff --git a/libreoffice-7.4.1.1-gpgme-1.18.patch b/libreoffice-7.4.1.1-gpgme-1.18.patch new file mode 100644 index 0000000..d95085a --- /dev/null +++ b/libreoffice-7.4.1.1-gpgme-1.18.patch @@ -0,0 +1,20 @@ +diff --git a/configure.ac b/configure.ac +index e5d202b..94f1224 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12537,12 +12537,11 @@ + # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way + AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], + [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) +- # progress_callback is the only func with plain C linkage +- # checking for it also filters out older, KDE-dependent libgpgmepp versions +- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], +- [AC_MSG_ERROR(gpgmepp not found or not functional)], []) + AC_CHECK_HEADER(gpgme.h, [], + [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) ++ AC_CHECK_LIB(gpgmepp, main, [], ++ [AC_MSG_ERROR(gpgmepp not found or not functional)], []) ++ GPGMEPP_LIBS=-lgpgmepp + else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" diff --git a/libreoffice.spec b/libreoffice.spec index f884a11..a264403 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -19,7 +19,7 @@ %define langpacks 1 Name: libreoffice -Version: 7.4.0.3 +Version: 7.4.1.2 Release: 1mamba Summary: Free Office Suite Group: Graphical Desktop/Applications/Office @@ -61,8 +61,9 @@ Patch44: libreoffice-6.4.0.3-libpoppler-0.84.0.patch Patch45: libreoffice-6.4.3.2-build-workaround-fix-deleteTestDirectory-failed-assert.patch Patch46: libreoffice-6.4.3.2-libpoppler-0.87.patch Patch47: libreoffice-7.2.0.4-libfreetype-2.11.0.patch -Patch48: libreoffice-7.3.3.2-poppler-22.03.0.patch -Patch49: libreoffice-7.3.3.2-poppler-22.04.0.patch +Patch48: libreoffice-7.3.3.2-poppler-22.03.0.patch +Patch49: libreoffice-7.3.3.2-poppler-22.04.0.patch +Patch50: libreoffice-7.4.1.1-gpgme-1.18.patch License: BSD, Common Development and Distribution License 1.0, GPL, LGPL, MPL 1.1, Netscape, Public Domain ## AUTOBUILDREQ-BEGIN #liblapack.so.3()(64bit): .so link not found @@ -101,7 +102,7 @@ BuildRequires: libfontconfig-devel BuildRequires: libfreehand-devel BuildRequires: libfreetype-devel BuildRequires: libgcc -#BuildRequires: libgcj4-devel +#BuildRequires: libgcj4 BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel BuildRequires: libgpgme-devel @@ -517,9 +518,9 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro %debug_package %prep -#% setup -q -b 2 -b 3 -b4 -a5 -%setup -q -c -T -D -:<< ____EOF +%setup -q -b 2 -b 3 -b4 -a5 +#% setup -q -c -T -D +#:<< ____EOF #rm -rf libreoffice-*/git-hooks #for a in libreoffice-*/*; do mv $PWD/$a .; done @@ -531,6 +532,7 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro #%patch47 -p1 #%patch48 -p1 -b .poppler-22.03.0 #%patch49 -p0 -b .poppler-22.04.0 +%patch50 -p1 touch scripting/source/pyprov/delzip #touch scripting/util/provider/beanshell/delzip @@ -580,7 +582,7 @@ export JAVACMD=%{java_home}/bin/java #:<< ___EOF -#./autogen.sh +./autogen.sh %configure \ --enable-release-build \ @@ -1046,6 +1048,12 @@ This package contains %{langname} translations and resources for LibreOffice.\ %langpack -l zu -n Zulu -F -H -Y %changelog +* Wed Sep 14 2022 Automatic Build System 7.4.1.2-1mamba +- automatic version update by autodist + +* Sat Sep 10 2022 Automatic Build System 7.4.1.1-1mamba +- automatic version update by autodist + * Sun Aug 21 2022 Automatic Build System 7.4.0.3-1mamba - automatic version update by autodist