Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xiphos for openSUSE:Factory checked in at 2021-06-04 00:33:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xiphos (Old) and /work/SRC/openSUSE:Factory/.xiphos.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xiphos" Fri Jun 4 00:33:40 2021 rev:22 rq:897110 version:4.2.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/xiphos/xiphos.changes 2020-04-04 12:21:27.507729011 +0200 +++ /work/SRC/openSUSE:Factory/.xiphos.new.1898/xiphos.changes 2021-06-04 00:34:01.544951171 +0200 @@ -1,0 +2,85 @@ +Mon May 17 07:43:27 UTC 2021 - [email protected] + +- Update to version 4.2.1.7: + * Update fr.po + * #1073 add vietnamese translation. + * INSTALL.md update Ubuntu pkgs section + * update #1036 restrict to actual commentaries. + * fix #1036 commentary by chapter default on. + * Two new entries for locale in the IBT repository (#1031) + * Fix #1025, #1026 - windows remove cpack stuff from build dir + * update #1018 final for 4.2.1 + * Fix up release builds and process: (#1020) + * Fix vendored path + * Tell github-linguist to ignore Festival + * fix #1019 bracket search results disposal w/flag to avoid + unneeded verse formatting. + * update #1018 + * fix #1018 release notes + * Use pre-built MinGW Biblesync package (#1016) + * More ci (#1015) + * Fix #1013 zip help dependency issue + * Update INSTALL.md + * Get rid of the additional install page about paths, moreover + it is not translatable, and make adding a Desktop icon a silent + operation + * Small fix path to xiphos source + * Cpack: xiphos.spec -> Fix download link + * Win32 installer: Add exe path and desktop icon options + * Win32 builds (#1012) + * fix multi-arch build in xc-xiphos-win.sh, add toolbox info + * Fix Windows build + * fix #1011 2020 copyright update. + * update #845. == REQUIRES SWORD @ SVN 3721+. == re-worked + .introMaterial: sword no longer generates self-closing <div/>. + * Generate version string at build time from git tags (#979) + * fix #895 re-arrange code to obtain "controlling module" earlier, + for v11n & display purposes, pushed into previous calling + function in order to have use of getRenderHeader(). unreliable: + 1st parallel module wins. should be OSIS, which is typical, but + not guaranteed. + * fix #910 do not show previewer on state change of + sidebar-or-not, if previewer is not to be shown at all. + * fix #990 adjust row spacing in strongs/morph blocked layout. + best i can manage. varies with font choice. it will be wrong + again in a year or 2 when webkit goes through more updates. + * update #845 an ultimately gratuitous change. had no beneficial + effect toward getting widgets interpreted by webkit as xhtml. + done anyway because it is the correct use even if i cannot make + it fly properly. + * fix #1006 NULL out parallel dialog widget pointer on close. + * Fix build errors for minizip (#1004) + * Use minizip to replace libgsf (#1003) + * Locale my and bg updated (#1002) + * fix #1000 trim parenthesized language descriptions + * Fix Arch build (#997) + * fix #996 add constant for hist.list element content length, + distinct from length of hist.list + * fix #919 - disabled status bar reappeared when launching + program (#983) + * Remove all #if 0...#endif and some other dead code (#913) + * Remove specific handling of NASB lexica (#994) + * Locale (#992) + * Add Ubuntu and Debian deps + * Add build badge from Travis + * More CI cleanup + * Don't double-install on Arch + * Test on Ubuntu 19.10 + * Fix Arch Linux Docker setup + * Remove gconf mentions from .travis.yml as well. + * Try to update testing + * Update .travis.yml to fix all builds + * remove gconf-2.0 from xiphos (after CMake) +- Use version in format parent_tag.tag_offset, since this is the + format that the upstream generated cmake/source_version.txt + uses +- Removed xiphos-remove-gconf-2.0.patch that is integrated upstream +- Modified find_biblesync.patch to accept cmake 3.10 + +------------------------------------------------------------------- +Mon May 17 06:59:59 UTC 2021 - Fridrich Strba <[email protected]> + +- Add xiphos-glib.patch to fix build in factory with newer glib + * do not include glib headers in extern "C" block + +------------------------------------------------------------------- Old: ---- xiphos-4.1.0+git.1580414635.9e573336.tar.xz xiphos-remove-gconf-2.0.patch New: ---- xiphos-4.2.1.7.tar.xz xiphos-glib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xiphos.spec ++++++ --- /var/tmp/diff_new_pack.VrTFUO/_old 2021-06-04 00:34:02.308953371 +0200 +++ /var/tmp/diff_new_pack.VrTFUO/_new 2021-06-04 00:34:02.308953371 +0200 @@ -1,7 +1,7 @@ # # spec file for package xiphos # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xiphos -Version: 4.1.0+git.1580414635.9e573336 +Version: 4.2.1.7 Release: 0 Summary: GNOME-based Bible research tool License: GPL-2.0-only @@ -25,14 +25,10 @@ URL: http://xiphos.org/ Source0: %{name}-%{version}.tar.xz Source1: %{name}.desktop -# PATCH-FIX-UPSTREAM xiphos-remove-gconf-2.0.patch gh#crosswire/xiphos#986 [email protected] -# Remove gconf-2.0 -# patch originally from Debian https://salsa.debian.org/pkg-crosswire-team/xiphos/tree/master/debian/patches -# no. 16 and 17. -Patch0: xiphos-remove-gconf-2.0.patch # PATCH-FIX-OPENSUSE find_biblesync.patch [email protected] # Allow working with ancient cmake 3.10 on SLE/Leap 15. Patch1: find_biblesync.patch +Patch2: xiphos-glib.patch BuildRequires: appstream-glib BuildRequires: cmake # BuildRequires: docbook-utils-minimal @@ -42,21 +38,21 @@ BuildRequires: intltool BuildRequires: itstool BuildRequires: pkgconfig +BuildRequires: python3-lxml BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: zip -BuildRequires: pkgconfig(biblesync) >= 1.1.2 +BuildRequires: pkgconfig(biblesync) >= 1.2.0 BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-unix-print-2.0) BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(libgsf-1) >= 1.14 BuildRequires: pkgconfig(libgtkhtml-4.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(sword) >= 1.7.3 -BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8 +BuildRequires: pkgconfig(minizip) +BuildRequires: pkgconfig(sword) >= 1.8.1 BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(yelp-xsl) Requires: sword @@ -64,10 +60,6 @@ Recommends: sword-bible Recommends: sword-commentary Provides: sword-frontend -%if 0%{?suse_version} < 1550 -BuildRequires: scrollkeeper -BuildRequires: pkgconfig(gconf-2.0) -%endif %description Bible Study Software for the Linux community. Lookup and search Bible texts and @@ -81,19 +73,18 @@ %prep %setup -q -%if 0%{?suse_version} >= 1550 -%patch0 -p1 -%else +echo %{version} >cmake/source_version.txt +%if 0%{?suse_version} < 1550 %patch1 -p1 %endif - +%patch2 -p1 %build export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" export PYTHON="%{_bindir}/python3" %cmake -DGTKHTML=ON -%cmake_build +make %{?_smp_mflags} %install %cmake_install ++++++ _service ++++++ --- /var/tmp/diff_new_pack.VrTFUO/_old 2021-06-04 00:34:02.332953440 +0200 +++ /var/tmp/diff_new_pack.VrTFUO/_new 2021-06-04 00:34:02.332953440 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">xiphos</param> - <param name="versionprefix">4.1.0+git</param> + <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VrTFUO/_old 2021-06-04 00:34:02.348953487 +0200 +++ /var/tmp/diff_new_pack.VrTFUO/_new 2021-06-04 00:34:02.348953487 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/crosswire/xiphos.git</param> - <param name="changesrevision">9e57333639f14944bcb325ddc21a93994dab0e2d</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">a9283769ef4d0d47f1d09a3ca4138610bb96a46c</param></service></servicedata> \ No newline at end of file ++++++ find_biblesync.patch ++++++ --- /var/tmp/diff_new_pack.VrTFUO/_old 2021-06-04 00:34:02.356953509 +0200 +++ /var/tmp/diff_new_pack.VrTFUO/_new 2021-06-04 00:34:02.356953509 +0200 @@ -1,6 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 780acf1a..4a24afb2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,8 +18,8 @@ + # + + # the oldest stable cmake version we support +-cmake_minimum_required (VERSION 3.11 FATAL_ERROR) +-cmake_policy(VERSION 3.11) ++cmake_minimum_required (VERSION 3.10 FATAL_ERROR) ++cmake_policy(VERSION 3.10) + + ### set project name (version set later) + project (xiphos C CXX) +diff --git a/cmake/modules/FindBiblesync.cmake b/cmake/modules/FindBiblesync.cmake +index 0b5261e9..0aee73e1 100755 --- a/cmake/modules/FindBiblesync.cmake +++ b/cmake/modules/FindBiblesync.cmake -@@ -69,9 +69,12 @@ find_package_handle_standard_args(Bibles +@@ -69,9 +69,12 @@ find_package_handle_standard_args(Biblesync REQUIRED_VARS BIBLESYNC_INCLUDE_DIR BIBLESYNC_LIBRARY_DIR VERSION_VAR BIBLESYNC_VERSION) ++++++ xiphos-4.1.0+git.1580414635.9e573336.tar.xz -> xiphos-4.2.1.7.tar.xz ++++++ /work/SRC/openSUSE:Factory/xiphos/xiphos-4.1.0+git.1580414635.9e573336.tar.xz /work/SRC/openSUSE:Factory/.xiphos.new.1898/xiphos-4.2.1.7.tar.xz differ: char 13, line 1 ++++++ xiphos-glib.patch ++++++ --- xiphos-4.1.0+git.1580414635.9e573336/src/main/sword.h 2020-01-30 21:03:55.000000000 +0100 +++ xiphos-4.1.0+git.1580414635.9e573336/src/main/sword.h 2021-05-17 08:57:31.991514248 +0200 @@ -22,12 +22,12 @@ #ifndef _SWORD_H__ #define _SWORD_H__ -#ifdef __cplusplus -extern "C" { -#endif #include <gtk/gtk.h> #include <glib/gi18n.h> +#ifdef __cplusplus +extern "C" { +#endif #include "main/configs.h" /*** these defs need to be seen by gui and backend ***/
