Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2021-12-22 20:17:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Wed Dec 22 20:17:53 2021 rev:243 rq:941892 version:7.2.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2021-12-12 00:56:22.058533212 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.2520/libreoffice.changes 2021-12-22 20:18:41.731864737 +0100 @@ -1,0 +2,27 @@ +Mon Dec 20 15:57:19 UTC 2021 - Danilo Spinella <danilo.spine...@suse.com> + +- Update to 7.2.5.1 + +------------------------------------------------------------------- +Thu Dec 16 15:07:26 UTC 2021 - Danilo Spinella <danilo.spine...@suse.com> + +- Removed unrecognized option `--disable-vlc` + This option has been removed from upstream in commit + https://gerrit.libreoffice.org/c/core/+/108283 + There's no real change in our build given that the + VLC avmedia backend was explicitly disabled. + * Fix provided by Marina Latini +- Fix gtk popover usage on gtk 3.20 + * patch provided by Gustavo Boiko fix_gtk_popover_on_3.20.patch +- Revert upstream commit https://gerrit.libreoffice.org/c/core/+/116884 + * patch provided by Gustavo Boiko fix_math_desktop_file.patch +- Fix generated list of files for python scripts +- Use older syntax for Supplements on SLE12 + +------------------------------------------------------------------- +Tue Dec 7 17:01:43 UTC 2021 - Danilo Spinella <danilo.spine...@suse.com> + +- Add and update minimum version of dependencies +- Refresh 0001-Revert-java-9-changes.patch + +------------------------------------------------------------------- Old: ---- icu4c-68_1-data.zip icu4c-68_1-src.tgz libreoffice-7.2.4.1.tar.xz libreoffice-7.2.4.1.tar.xz.asc libreoffice-help-7.2.4.1.tar.xz libreoffice-help-7.2.4.1.tar.xz.asc libreoffice-translations-7.2.4.1.tar.xz libreoffice-translations-7.2.4.1.tar.xz.asc poppler-21.01.0.tar.xz New: ---- fix_gtk_popover_on_3.20.patch fix_math_desktop_file.patch icu4c-69_1-data.zip icu4c-69_1-src.tgz libreoffice-7.2.5.1.tar.xz libreoffice-7.2.5.1.tar.xz.asc libreoffice-help-7.2.5.1.tar.xz libreoffice-help-7.2.5.1.tar.xz.asc libreoffice-translations-7.2.5.1.tar.xz libreoffice-translations-7.2.5.1.tar.xz.asc poppler-21.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.bbQ8VR/_old 2021-12-22 20:18:46.623867030 +0100 +++ /var/tmp/diff_new_pack.bbQ8VR/_new 2021-12-22 20:18:46.627867032 +0100 @@ -46,7 +46,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.2.4.1 +Version: 7.2.5.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -107,6 +107,8 @@ Patch7: pld-skia-patches.patch # PATCH-FIX-UPSTREAM https://bugs.documentfoundation.org/show_bug.cgi?id=137924 Use proper DPI without requiring window handle Patch8: fix-wayland-scaling-in-plasma.patch +Patch9: fix_math_desktop_file.patch +Patch10: fix_gtk_popover_on_3.20.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -180,7 +182,7 @@ BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.18 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42 BuildRequires: pkgconfig(hunspell) @@ -189,11 +191,11 @@ BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libcdr-0.1) >= 0.1 BuildRequires: pkgconfig(libclucene-core) -BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1 +BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.2 BuildRequires: pkgconfig(libeot) >= 0.01 BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.10 -BuildRequires: pkgconfig(libexttextcat) >= 3.1.1 +BuildRequires: pkgconfig(libexttextcat) >= 3.4.1 BuildRequires: pkgconfig(libfreehand-0.1) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) >= 0.1 @@ -222,7 +224,7 @@ BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(redland) BuildRequires: pkgconfig(sane-backends) -BuildRequires: pkgconfig(serf-1) >= 1.1.0 +BuildRequires: pkgconfig(serf-1) >= 1.3.9 BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28 BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xt) @@ -260,7 +262,7 @@ %if 0%{?suse_version} < 1550 # Too old boost on the system Source2020: %{external_url}/boost_1_75_0.tar.xz -Source2023: %{external_url}/poppler-21.01.0.tar.xz +Source2023: %{external_url}/poppler-21.11.0.tar.xz Source2024: %{external_url}/poppler-data-0.4.10.tar.gz %else BuildRequires: libboost_date_time-devel @@ -273,8 +275,8 @@ %endif %if 0%{?suse_version} < 1500 # Too old icu on the system -Source2021: %{external_url}/icu4c-68_1-src.tgz -Source2022: %{external_url}/icu4c-68_1-data.zip +Source2021: %{external_url}/icu4c-69_1-src.tgz +Source2022: %{external_url}/icu4c-69_1-data.zip BuildRequires: gcc7 BuildRequires: gcc7-c++ BuildRequires: java-devel >= 1.8 @@ -301,6 +303,10 @@ BuildConflicts: java-devel < 9 BuildConflicts: java-headless < 9 %endif +%if 0%{?suse_version} +# needed by python3_sitelib +BuildRequires: python-rpm-macros +%endif %if %{with system_gpgme} BuildRequires: libgpgmepp-devel %endif @@ -364,7 +370,11 @@ Obsoletes: libreoffice-branding-openSUSE < 4.0.1 Provides: libreoffice-branding-SLE = 4.0.1 Obsoletes: libreoffice-branding-SLE < 4.0.1 +%if 0%{suse_version} < 1500 +Supplements: packageand(libreoffice:branding-openSUSE) +%else Supplements: (libreoffice and branding-openSUSE) +%endif BuildArch: noarch %description branding-upstream @@ -573,12 +583,21 @@ Summary: Gtk3 interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name}-gnome = %{version} +%if 0%{suse_version} < 1500 +Supplements: packageand(libreoffice:gnome-session) +Supplements: packageand(libreoffice:mate-session-manager) +Supplements: packageand(libreoffice:xfce4-session) +%if !%{with kdeintegration} +Supplements: packageand(libreoffice:plasma5-workspace) +%endif +%else Supplements: (libreoffice and gnome-session) Supplements: (libreoffice and mate-session-manager) Supplements: (libreoffice and xfce4-session) %if !%{with kdeintegration} Supplements: (libreoffice and plasma5-workspace) %endif +%endif %description gtk3 This package contains Gtk3 interface rendering option for LibreOffice. @@ -587,7 +606,11 @@ Summary: Qt5/KDE Frameworks interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} +%if 0%{suse_version} < 1500 Supplements: packageand(libreoffice:plasma5-workspace) +%else +Supplements: (libreoffice and plasma5-workspace) +%endif Provides: %{name}-kde4 = %{version} Obsoletes: %{name}-kde4 < %{version} @@ -987,7 +1010,9 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %if 0%{?suse_version} < 1500 +%patch10 -p1 %patch101 -p1 %endif %patch990 -p1 @@ -1148,7 +1173,6 @@ --enable-scripting-beanshell \ --enable-scripting-javascript \ --enable-build-opensymbol \ - --disable-vlc \ --disable-ccache \ --disable-coinmp \ --enable-symbols \ @@ -1339,8 +1363,10 @@ # python3 has __pycache__ dir while py2 does not pydir="${j%/*}" pyname="${j##*/}" + if compgen -G "%{buildroot}${pydir}/__pycache__/${pyname%.*}*.pyc" > /dev/null; then echo "%dir ${pydir}/__pycache__/" >> "${i}" echo "${pydir}/__pycache__/${pyname%.*}*.pyc" >> "${i}" + fi done fi done ++++++ 0001-Revert-java-9-changes.patch ++++++ --- /var/tmp/diff_new_pack.bbQ8VR/_old 2021-12-22 20:18:46.659867047 +0100 +++ /var/tmp/diff_new_pack.bbQ8VR/_new 2021-12-22 20:18:46.663867049 +0100 @@ -31,31 +31,6 @@ path here. Note that this is not the location of the java command but the location of the entire distribution. In case of cross-compiling, this is the JDK of the host os. Use --with-build-platform-configure-options -@@ -8004,12 +8004,20 @@ if test "$ENABLE_JAVA" != ""; then - reg_get_value "$WIN_HOST_BITS" "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/$ver/JavaHome" - reg_jdk_home=$regvalue - fi -- -- if test -f "$reg_jdk_home/lib/jvm.lib" -a -f "$reg_jdk_home/bin/java.exe"; then -- with_jdk_home="$reg_jdk_home" -+ if test -z "$with_jdk_home"; then -+ for ver in 1.8; do -+ reg_get_value "$bitness" "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome" -+ if test -n "$regvalue"; then -+ _jdk_home=$regvalue -+ break -+ fi -+ done -+ fi -+ if test -f "$_jdk_home/lib/jvm.lib" -a -f "$_jdk_home/bin/java.exe"; then -+ with_jdk_home="$_jdk_home" - howfound="found automatically" - else -- AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option pointing to a $WIN_HOST_BITS-bit JDK >= 9]) -+ AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option pointing to a $bitness-bit JDK]) - fi - else - test "$build_os" = "cygwin" && with_jdk_home=`win_short_path_for_make "$with_jdk_home"` @@ -8089,7 +8097,24 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "BEA"` -gt 0; then AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.ac]) ++++++ fix_gtk_popover_on_3.20.patch ++++++ diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 6b592b3..2fce9eb 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -21415,12 +21415,16 @@ public: gtk_popover_set_relative_to(m_pPopover, pWidget); #endif gtk_popover_set_pointing_to(m_pPopover, &aRect); - gtk_popover_popup(m_pPopover); + // in GTK 3.22 you can just call gtk_popover_popup() to get it to show with transitions, + // but on SLE-12-SP5 we just have GTK 3.20, so enable transitions and show it to get the + // same effect + gtk_popover_set_transitions_enabled(m_pPopover, true); + gtk_widget_show(GTK_WIDGET(m_pPopover)); } virtual void popdown() override { - gtk_popover_popdown(m_pPopover); + gtk_widget_hide(GTK_WIDGET(m_pPopover)); } virtual ~GtkInstancePopover() override ++++++ fix_math_desktop_file.patch ++++++ diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 5a8192a..d2391be 100644 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -21,7 +21,7 @@ Terminal=false NoDisplay=false Icon=math Type=Application -Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; +Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; Exec=${UNIXBASISROOTNAME} --math %%FILE%% MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml; Name=%PRODUCTNAME Math ++++++ icu4c-68_1-src.tgz -> icu4c-69_1-src.tgz ++++++ /work/SRC/openSUSE:Factory/libreoffice/icu4c-68_1-src.tgz /work/SRC/openSUSE:Factory/.libreoffice.new.2520/icu4c-69_1-src.tgz differ: char 12, line 1 ++++++ libreoffice-7.2.4.1.tar.xz -> libreoffice-7.2.5.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-7.2.4.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2520/libreoffice-7.2.5.1.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-7.2.4.1.tar.xz -> libreoffice-help-7.2.5.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-7.2.4.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2520/libreoffice-help-7.2.5.1.tar.xz differ: char 26, line 1 ++++++ libreoffice-translations-7.2.4.1.tar.xz -> libreoffice-translations-7.2.5.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-7.2.4.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2520/libreoffice-translations-7.2.5.1.tar.xz differ: char 26, line 1 ++++++ poppler-21.01.0.tar.xz -> poppler-21.11.0.tar.xz ++++++ ++++ 40778 lines of diff (skipped)
