Hello community, here is the log from the commit of package xiphos for openSUSE:Factory checked in at 2020-04-04 12:21:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xiphos (Old) and /work/SRC/openSUSE:Factory/.xiphos.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xiphos" Sat Apr 4 12:21:20 2020 rev:21 rq:790933 version:4.1.0+git.1580414635.9e573336 Changes: -------- --- /work/SRC/openSUSE:Factory/xiphos/xiphos.changes 2019-09-23 12:39:30.789589274 +0200 +++ /work/SRC/openSUSE:Factory/.xiphos.new.3248/xiphos.changes 2020-04-04 12:21:27.507729011 +0200 @@ -1,0 +2,24 @@ +Mon Mar 16 11:16:14 UTC 2020 - Matej Cepl <[email protected]> + +- Add find_biblesync.patch to make the package build on the + Leap/SLE 15 with cmake 3.10. + +------------------------------------------------------------------- +Sun Mar 15 13:03:48 UTC 2020 - [email protected] + +- Update to version 4.1.0+git.1580414635.9e573336: + * ui/languages: Added Kikongo (kg), native to Angola, DR Congo, Congo + * avoid deprecated g_type_class_add_private (#962) + * fix #958 check for null result of render_this_text() + * Fix #954 - Build error under Arch Linux + * Month names: fix translation issue + * clean old travis ci build scripts + * fix travis ci build + * Tiny edits + * fix spec file +- Reassemble xiphos-remove-gconf-2.0.patch + (gh#crosswire/xiphos#986) from Debian patches. +- Remove xiphos-build-without-scrollkeeper.patch which is now + included upstream. + +------------------------------------------------------------------- Old: ---- xiphos-4.1.0.tar.gz xiphos-build-without-scrollkeeper.patch New: ---- _service _servicedata find_biblesync.patch xiphos-4.1.0+git.1580414635.9e573336.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xiphos.spec ++++++ --- /var/tmp/diff_new_pack.pfs2Kz/_old 2020-04-04 12:21:28.847730163 +0200 +++ /var/tmp/diff_new_pack.pfs2Kz/_new 2020-04-04 12:21:28.851730166 +0200 @@ -1,7 +1,7 @@ # # spec file for package xiphos # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,28 +12,39 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: xiphos -Version: 4.1.0 +Version: 4.1.0+git.1580414635.9e573336 Release: 0 Summary: GNOME-based Bible research tool -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Scientific/Other -Url: http://xiphos.org/ -Source0: https://github.com/crosswire/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +URL: http://xiphos.org/ +Source0: %{name}-%{version}.tar.xz Source1: %{name}.desktop -Patch0: xiphos-build-without-scrollkeeper.patch -Patch1: xiphos-remove-gconf-2.0.patch -BuildRequires: docbook-utils-minimal +# 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 +BuildRequires: appstream-glib +BuildRequires: cmake +# BuildRequires: docbook-utils-minimal BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel BuildRequires: intltool +BuildRequires: itstool BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: yelp-tools +BuildRequires: zip BuildRequires: pkgconfig(biblesync) >= 1.1.2 BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) @@ -47,12 +58,12 @@ BuildRequires: pkgconfig(sword) >= 1.7.3 BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(webkit2gtk-4.0) +BuildRequires: pkgconfig(yelp-xsl) Requires: sword +Recommends: %{name}-lang Recommends: sword-bible Recommends: sword-commentary Provides: sword-frontend -Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} < 1550 BuildRequires: scrollkeeper BuildRequires: pkgconfig(gconf-2.0) @@ -71,20 +82,21 @@ %prep %setup -q %if 0%{?suse_version} >= 1550 -%autopatch -p1 +%patch0 -p1 +%else +%patch1 -p1 %endif + %build export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" -./waf configure \ - --prefix=%{_prefix} \ - --enable-webkit2 \ - --gtk=3 -./waf build +export PYTHON="%{_bindir}/python3" +%cmake -DGTKHTML=ON +%cmake_build %install -./waf install --destdir=%{buildroot} +%cmake_install %if 0%{?suse_version} < 1550 install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -93,8 +105,7 @@ %endif # package docs with macro rm -frv %{buildroot}/%{_datadir}/doc/%{name} -install -Dm644 xiphos.1 %{buildroot}%{_mandir}/man1/xiphos.1 -install -Dm644 xiphos-nav.1 %{buildroot}%{_mandir}/man1/xiphos-nav.1 +install -D -m644 -t %{buildroot}%{_mandir}/man1/ build/desktop/xiphos*.1 %fdupes -s %{buildroot}/%{_datadir} %find_lang %{name} @@ -107,8 +118,8 @@ %endif %files -%defattr(-,root,root) -%doc COPYING README.md RELEASE-NOTES Xiphos.ogg +%license COPYING +%doc README.md RELEASE-NOTES doc/Xiphos.ogg AUTHORS ChangeLog %dir %{_datadir}/%{name} %{_bindir}/xiphos* %{_datadir}/xiphos/* @@ -117,11 +128,7 @@ %dir %{_datadir}/appdata %{_datadir}/appdata/xiphos.appdata.xml %{_mandir}/man1/* -%if 0%{?suse_version} < 1550 -%dir %{_datadir}/omf -%endif %files lang -f %{name}.lang -%defattr(-, root, root) %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/crosswire/xiphos.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">xiphos</param> <param name="versionprefix">4.1.0+git</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/crosswire/xiphos.git</param> <param name="changesrevision">9e57333639f14944bcb325ddc21a93994dab0e2d</param></service></servicedata>++++++ find_biblesync.patch ++++++ --- a/cmake/modules/FindBiblesync.cmake +++ b/cmake/modules/FindBiblesync.cmake @@ -69,9 +69,12 @@ find_package_handle_standard_args(Bibles REQUIRED_VARS BIBLESYNC_INCLUDE_DIR BIBLESYNC_LIBRARY_DIR VERSION_VAR BIBLESYNC_VERSION) -# If found, add target +# Another version if(BIBLESYNC_FOUND AND NOT TARGET Biblesync::Biblesync) - add_library(PkgConfig::Biblesync INTERFACE IMPORTED) - target_include_directories(PkgConfig::Biblesync INTERFACE ${BIBLESYNC_INCLUDE_DIR}) - target_link_libraries(PkgConfig::Biblesync INTERFACE ${BIBLESYNC_LIBRARY_DIR}) + add_library(PkgConfig::Biblesync UNKNOWN IMPORTED) + set_target_properties(PkgConfig::Biblesync + PROPERTIES IMPORTED_LOCATION ${BIBLESYNC_LIBRARY_DIR} + INTERFACE_INCLUDE_DIRECTORIES ${BIBLESYNC_INCLUDE_DIR}) endif() + + ++++++ xiphos-remove-gconf-2.0.patch ++++++ --- /var/tmp/diff_new_pack.pfs2Kz/_old 2020-04-04 12:21:28.899730208 +0200 +++ /var/tmp/diff_new_pack.pfs2Kz/_new 2020-04-04 12:21:28.899730208 +0200 @@ -6,32 +6,34 @@ wscript | 1 - 1 file changed, 1 deletion(-) -diff --git a/wscript b/wscript -index 0254af3..32687d2 100644 ---- a/wscript -+++ b/wscript -@@ -303,7 +303,6 @@ def configure(conf): +--- a/src/gui/gui.h ++++ b/src/gui/gui.h +@@ -4,13 +4,6 @@ + void gui_init(int argc, char *argv[]); + void gui_main(void); - common_libs = string.join( - ''' -- "gconf-2.0" - "gmodule-2.0" - "glib-2.0" - "libgsf-1 >= 1.14" - -From: Teus Benschop <[email protected]> -Date: Sat, 17 Nov 2018 16:38:45 +0100 -Subject: remove gconf-2.0 from source - ---- - src/gnome2/gui.c | 66 -------------------------------------------------------- - src/gui/gui.h | 7 ------ - 2 files changed, 73 deletions(-) - -diff --git a/src/gnome2/gui.c b/src/gnome2/gui.c -index 5fc4ca3..23fb120 100644 ---- a/src/gnome2/gui.c -+++ b/src/gnome2/gui.c +-#ifndef WIN32 +-#include <gconf/gconf-client.h> +-void gconf_setup(void); +-#endif +- +-#define GS_GCONF_MAX 6 +- + #ifdef DEBUG + + gchar *XI_g_strdup_printf(const char *filename, +--- a/cmake/XiphosDependencies.cmake ++++ b/cmake/XiphosDependencies.cmake +@@ -86,7 +86,6 @@ pkg_check_modules(Gnome REQUIRED IMPORTE + "gobject-2.0" + "libsoup-2.4" + "pango" +- "gconf-2.0" + "libgsf-1>=1.14" + "libxml-2.0>=2.7.8" + ) +--- a/src/gtk/gui.c ++++ b/src/gtk/gui.c @@ -68,9 +68,6 @@ void gui_init(int argc, char *argv[]) if (!gtk_init_with_args(&argc, &argv, NULL, NULL, NULL, NULL)) { exit(1); @@ -112,21 +114,3 @@ #ifdef DEBUG /* NOTE: these routines are here only and exactly because there is no other */ -diff --git a/src/gui/gui.h b/src/gui/gui.h -index a6628e6..202e7ca 100644 ---- a/src/gui/gui.h -+++ b/src/gui/gui.h -@@ -4,13 +4,6 @@ - void gui_init(int argc, char *argv[]); - void gui_main(void); - --#ifndef WIN32 --#include <gconf/gconf-client.h> --void gconf_setup(void); --#endif -- --#define GS_GCONF_MAX 6 -- - #ifdef DEBUG - - gchar *XI_g_strdup_printf(const char *filename,
