From 2175cb8d1781ae28deb9970dcae182895678c7d7 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 19 Sep 2016 17:54:44 -0400 Subject: [PATCH 01/71] Remove webkit1 dependency --- xiphos.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index 9263d45..47d03f6 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -7,7 +7,7 @@ Name: xiphos Version: 4.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -30,7 +30,7 @@ BuildRequires: sword-devel >= 1.7.3 BuildRequires: webkitgtk-devel %if 0%{build3} > 0 BuildRequires: gtk3-devel -BuildRequires: webkitgtk3-devel +BuildRequires: webkitgtk4-devel %endif Requires: yelp @@ -111,6 +111,7 @@ pushd gtk3 LDFLAGS='%{?__global_ldflags}' \ ./waf configure \ --prefix=%{_prefix} \ + --enable-webkit2 \ --gtk=3 || cat build/config.log ./waf build -v @@ -207,6 +208,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Mon Sep 19 2016 Greg Hellings - 4.0.4-5 +- Moved to WebKit2 + * Wed Jun 01 2016 Greg Hellings - 4.0.4-4 - Moved appdata and desktop files to gtk2 build, allowing proper auto-discovery by gnome-software. BZ#1330096 From 111b48cbea376ab860cc2c0a47aacdd9556bb2ce Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 9 Jan 2017 10:50:33 -0600 Subject: [PATCH 02/71] Remove GTK2 builds, webkitgtk3 --- xiphos.spec | 139 +++++++--------------------------------------------- 1 file changed, 19 insertions(+), 120 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index 47d03f6..13c19f2 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,13 +1,6 @@ -# Define whether or not we are building for GTK3 -%if 0%{?rhel} > 0 && 0%{?rhel} <= 6 -%define build3 0 -%else -%define build3 1 -%endif - Name: xiphos Version: 4.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -20,19 +13,19 @@ BuildRequires: GConf2-devel BuildRequires: gettext BuildRequires: gnome-doc-utils BuildRequires: libglade2-devel -BuildRequires: gtkhtml3-devel -BuildRequires: compat-gtkhtml314-devel BuildRequires: intltool BuildRequires: libgsf-devel BuildRequires: libuuid-devel BuildRequires: rarian-compat BuildRequires: sword-devel >= 1.7.3 -BuildRequires: webkitgtk-devel -%if 0%{build3} > 0 BuildRequires: gtk3-devel BuildRequires: webkitgtk4-devel -%endif +BuildRequires: gtkhtml3-devel Requires: yelp +Provides: xiphos +Provides: xiphos-common +Obsoletes: xiphos-gtk2 +Obsoletes: xiphos-gtk3 %if 0%{?rhel} > 0 && 0%{?rhel} <= 7 ExcludeArch: ppc64 @@ -44,46 +37,9 @@ UNIX, and Windows under the GNOME toolkit, offering a rich and featureful environment for reading, study, and research using modules from The SWORD Project and elsewhere. -%package gtk2 -Obsoletes: xiphos < 4.0.0 -Requires: %{name}-common = %{version}-%{release} -Summary: A version of Xiphos built against the GTK2 toolkit - -%description gtk2 -Xiphos is a Bible study tool written for Linux, -UNIX, and Windows under the GNOME toolkit, offering a rich and featureful -environment for reading, study, and research using modules from The SWORD -Project and elsewhere. - -%if 0%{build3} > 0 -%package gtk3 -Requires: %{name}-common = %{version}-%{release} -Summary: A version of Xiphos built against the GTK3 toolkit - -%description gtk3 -Xiphos is a Bible study tool written for Linux, -UNIX, and Windows under the GNOME toolkit, offering a rich and featureful -environment for reading, study, and research using modules from The SWORD -Project and elsewhere. -%endif - -%package common -Summary: Common files for all versions of Xiphos - -%description common -Xiphos is a Bible study tool written for Linux, -UNIX, and Windows under the GNOME toolkit, offering a rich and featureful -environment for reading, study, and research using modules from The SWORD -Project and elsewhere. - %prep %setup -q rm -rf src/biblesync -# Ugly hack because of bugs in this version of waf -mkdir gtk2 -cp -r * gtk2 || true -mkdir gtk3 -cp -r gtk2/* gtk3 %build export CC="gcc -fPIC" @@ -95,19 +51,6 @@ export CXX="g++ -fPIC" export CXXFLAGS export CFLAGS -# Build GTK2 version -pushd gtk2 -LDFLAGS='%{?__global_ldflags}' \ -./waf configure \ - --prefix=%{_prefix} \ - --gtk=2 || cat build/config.log - -./waf build -v -popd - -# Build GTK3 version -%if 0%{build3} > 0 -pushd gtk3 LDFLAGS='%{?__global_ldflags}' \ ./waf configure \ --prefix=%{_prefix} \ @@ -115,27 +58,9 @@ LDFLAGS='%{?__global_ldflags}' \ --gtk=3 || cat build/config.log ./waf build -v -popd -%endif %install -# Install GTK2 version -pushd gtk2 -./waf install -b . --destdir %{buildroot} -mv %{buildroot}%{_bindir}/xiphos %{buildroot}%{_bindir}/xiphos-gtk2 -mv %{buildroot}%{_bindir}/xiphos-nav %{buildroot}%{_bindir}/xiphos-nav-gtk2 -touch %{buildroot}%{_bindir}/xiphos -popd - -# Install GTK3 version -%if 0%{build3} > 0 -pushd gtk3 ./waf install --destdir %{buildroot} -mv %{buildroot}%{_bindir}/xiphos %{buildroot}%{_bindir}/xiphos-gtk3 -mv %{buildroot}%{_bindir}/xiphos-nav %{buildroot}%{_bindir}/xiphos-nav-gtk3 -touch %{buildroot}%{_bindir}/xiphos -popd -%endif desktop-file-install --delete-original \ --add-category=X-Bible \ @@ -150,64 +75,38 @@ rm -frv %{buildroot}%{_docdir}/%{name} %find_lang %{name} # Post-install options -%post common +%post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%if 0%{build3} > 0 -%post gtk3 -%{_sbindir}/update-alternatives --install %{_bindir}/xiphos xiphos %{_bindir}/xiphos-gtk3 10 \ - --slave %{_bindir}/xiphos-nav xiphos-nav %{_bindir}/xiphos-nav-gtk3 -%endif - -%post gtk2 -%{_sbindir}/update-alternatives --install %{_bindir}/xiphos xiphos %{_bindir}/xiphos-gtk2 10 \ - --slave %{_bindir}/xiphos-nav xiphos-nav %{_bindir}/xiphos-nav-gtk2 +%{_sbindir}/update-alternatives --remove xiphos %{_bindir}/xiphos-gtk3 +%{_sbindir}/update-alternatives --remove xiphos %{_bindir}/xiphos-gtk2 # Post-uninstall options -%postun common +%postun if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%if 0%{build3} > 0 -# Pre-uninstall options -%preun gtk3 -if [ $1 -eq 0 ]; then - %{_sbindir}/update-alternatives --remove xiphos %{_bindir}/xiphos-gtk3 -fi -%endif - -%preun gtk2 -if [ $1 -eq 0 ]; then - %{_sbindir}/update-alternatives --remove xiphos %{_bindir}/xiphos-gtk2 -fi - %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%files gtk2 -%{_bindir}/xiphos-gtk2 -%{_bindir}/xiphos-nav-gtk2 -%ghost %{_bindir}/xiphos +%files -f %{name}.lang +%doc AUTHORS ChangeLog README RELEASE-NOTES TODO Xiphos.ogg +%license COPYING +%{_bindir}/xiphos +%{_bindir}/xiphos-nav %{_datadir}/appdata/xiphos.appdata.xml %{_datadir}/applications/xiphos.desktop - -%if 0%{build3} > 0 -%files gtk3 -%{_bindir}/xiphos-gtk3 -%{_bindir}/xiphos-nav-gtk3 -%ghost %{_bindir}/xiphos -%endif - -%files -f %{name}.lang common -%doc AUTHORS COPYING ChangeLog README RELEASE-NOTES TODO Xiphos.ogg %{_datadir}/gnome/help/xiphos %{_datadir}/icons/hicolor/scalable/apps/xiphos.svg %{_datadir}/omf/xiphos/ %{_datadir}/xiphos/ %changelog +* Mon Jan 09 2017 Greg Hellings - 4.0.4-6 +- Dropped GTK2 support +- Dropped WebKitGTK support + * Mon Sep 19 2016 Greg Hellings - 4.0.4-5 - Moved to WebKit2 From f0a90b4647c0b57a5c64325763b701a85f7c0d29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:54:18 +0000 Subject: [PATCH 03/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index 13c19f2..7b54dc7 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -103,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 09 2017 Greg Hellings - 4.0.4-6 - Dropped GTK2 support - Dropped WebKitGTK support From 3c4d9786143a620e7a6b3862d39ccccaa9f05521 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sun, 23 Apr 2017 22:54:52 -0500 Subject: [PATCH 04/71] Upstream version 4.0.5 --- .gitignore | 1 + sources | 2 +- xiphos.spec | 15 +++++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 718a5bb..65501d6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ xiphos-3.1.3.tar.gz /xiphos-4.0.2.tar.gz /xiphos-4.0.3.tar.gz /xiphos-4.0.4.tar.gz +/4.0.5.tar.gz diff --git a/sources b/sources index c95f5e1..87f19c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1d88b7d6812fd261d71a229999c669d xiphos-4.0.4.tar.gz +SHA512 (4.0.5.tar.gz) = fab84736ac2302bbd7078b776b8ae28a721507fefe458b84ce9ba74205d6ee0a15553b364b2157983d605a549d8db671bd31e9c7c4200e4ceb10fbfbd4c00be2 diff --git a/xiphos.spec b/xiphos.spec index 7b54dc7..e85aeec 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,10 +1,10 @@ Name: xiphos -Version: 4.0.4 -Release: 7%{?dist} +Version: 4.0.5 +Release: 1%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ -Source0: http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz +Source0: https://github.com/crosswire/%{name}/archive/%{version}.tar.gz BuildRequires: biblesync-devel >= 1.1.2 BuildRequires: desktop-file-utils BuildRequires: dbus-glib-devel @@ -24,6 +24,8 @@ BuildRequires: gtkhtml3-devel Requires: yelp Provides: xiphos Provides: xiphos-common +Provides: xiphos-gtk2 +Provides: xiphos-gtk3 Obsoletes: xiphos-gtk2 Obsoletes: xiphos-gtk3 @@ -91,7 +93,7 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang -%doc AUTHORS ChangeLog README RELEASE-NOTES TODO Xiphos.ogg +%doc AUTHORS ChangeLog README.md RELEASE-NOTES TODO Xiphos.ogg %license COPYING %{_bindir}/xiphos %{_bindir}/xiphos-nav @@ -103,6 +105,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Sun Apr 23 2017 Greg Hellings - 4.0.5-1 +- Upstream version 4.0.5 +- Added extra Provides lines +- Updated URL for source tarball + * Sat Feb 11 2017 Fedora Release Engineering - 4.0.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 142de7c8af3d7b81ac443317521f58614a24c213 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Tue, 11 Jul 2017 10:40:17 -0500 Subject: [PATCH 05/71] Partial resolution of BZ1448623 Addresses problems with upgrading from 4.0.4 to 4.0.5 Addresses problems with the post install script --- xiphos.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index e85aeec..26903e7 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ -Name: xiphos +Name: xiphos Version: 4.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -28,6 +28,7 @@ Provides: xiphos-gtk2 Provides: xiphos-gtk3 Obsoletes: xiphos-gtk2 Obsoletes: xiphos-gtk3 +Obsoletes: xiphos-common %if 0%{?rhel} > 0 && 0%{?rhel} <= 7 ExcludeArch: ppc64 @@ -79,8 +80,6 @@ rm -frv %{buildroot}%{_docdir}/%{name} # Post-install options %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%{_sbindir}/update-alternatives --remove xiphos %{_bindir}/xiphos-gtk3 -%{_sbindir}/update-alternatives --remove xiphos %{_bindir}/xiphos-gtk2 # Post-uninstall options %postun @@ -105,6 +104,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Tue Jul 11 2017 Greg Hellings - 4.0.5-2 +- Fix post install scripts for upgrades +- Added obsoletes for xiphos-common to stop collision issues +- Partially addresses BZ1448623 + * Sun Apr 23 2017 Greg Hellings - 4.0.5-1 - Upstream version 4.0.5 - Added extra Provides lines From e295315e924e7898e23c5aeac1ad2be779fb6b33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:10:13 +0000 Subject: [PATCH 06/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index 26903e7..aca4a7f 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jul 11 2017 Greg Hellings - 4.0.5-2 - Fix post install scripts for upgrades - Added obsoletes for xiphos-common to stop collision issues From d6601985f4ec70084254ce49ad702385fab80ee8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:45:02 +0000 Subject: [PATCH 07/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index aca4a7f..5b09991 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 4.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 4.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 64926780b6f17e55cb0feb71d818f6ff092af7d7 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sat, 12 Aug 2017 17:16:05 -0400 Subject: [PATCH 08/71] Upstream release 4.0.6 --- .gitignore | 1 + sources | 2 +- xiphos.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 65501d6..0afb105 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ xiphos-3.1.3.tar.gz /xiphos-4.0.3.tar.gz /xiphos-4.0.4.tar.gz /4.0.5.tar.gz +/4.0.6.tar.gz diff --git a/sources b/sources index 87f19c8..b2a5f91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.0.5.tar.gz) = fab84736ac2302bbd7078b776b8ae28a721507fefe458b84ce9ba74205d6ee0a15553b364b2157983d605a549d8db671bd31e9c7c4200e4ceb10fbfbd4c00be2 +SHA512 (4.0.6.tar.gz) = a7e645c2aa6f098c4888d63d3bbfa57009924d9594e89fd003d9ab47c03e25571e8a982ac640c29be02412d10baad08ff51b2bd25807d3a4a7b3abba16c9112a diff --git a/xiphos.spec b/xiphos.spec index 5b09991..128e88d 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos -Version: 4.0.5 -Release: 4%{?dist} +Version: 4.0.6 +Release: 1%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -104,6 +104,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Sat Aug 12 2017 Greg Hellings - 4.0.6-1 +- Upstream release 4.0.6 +- Addresses display bug BZ1448623 + * Thu Aug 03 2017 Fedora Release Engineering - 4.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -140,7 +144,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Fri Feb 05 2016 Fedora Release Engineering - 4.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Tue Sep 02 2015 Greg Hellings - 4.0.4-1 +* Tue Sep 01 2015 Greg Hellings - 4.0.4-1 - Update to new upstream version * Fri Aug 07 2015 Greg Hellings - 4.0.3-1 From 13092f4d0ff477b03a41668972888b2d14ebc1c2 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 25 Sep 2017 18:51:10 -0500 Subject: [PATCH 09/71] Upstream version 4.0.7 --- .gitignore | 1 + sources | 2 +- xiphos.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0afb105..e14bfdb 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ xiphos-3.1.3.tar.gz /xiphos-4.0.4.tar.gz /4.0.5.tar.gz /4.0.6.tar.gz +/4.0.7.tar.gz diff --git a/sources b/sources index b2a5f91..fac913b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.0.6.tar.gz) = a7e645c2aa6f098c4888d63d3bbfa57009924d9594e89fd003d9ab47c03e25571e8a982ac640c29be02412d10baad08ff51b2bd25807d3a4a7b3abba16c9112a +SHA512 (4.0.7.tar.gz) = 041e0e9c6a7406b02c5b45066b44a3d44c37a34a799c3dfd617b6aa52dc50efbf800e475e107108fcf1d0d23a3522d0a9fa0838c474d2e4dd39f3af9d3429bd4 diff --git a/xiphos.spec b/xiphos.spec index 128e88d..7119749 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,5 +1,5 @@ Name: xiphos -Version: 4.0.6 +Version: 4.0.7 Release: 1%{?dist} Summary: Bible study and research tool License: GPLv2+ @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Mon Sep 25 2017 Greg Hellings - 4.0.7-1 +- Upstream release 4.0.7 + * Sat Aug 12 2017 Greg Hellings - 4.0.6-1 - Upstream release 4.0.6 - Addresses display bug BZ1448623 From 7f31ec14aa862733d8ec6f429c10242af0b5c054 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 30 Nov 2017 20:56:19 +0000 Subject: [PATCH 10/71] Rebuild for ICU 60.1 --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index 7119749..cda6020 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Thu Nov 30 2017 Pete Walter - 4.0.7-2 +- Rebuild for ICU 60.1 + * Mon Sep 25 2017 Greg Hellings - 4.0.7-1 - Upstream release 4.0.7 From 9db04874382e85526aa715414ff3803c4b5a1069 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 12 Jan 2018 15:34:23 +0100 Subject: [PATCH 11/71] Adapt to the webkitgtk4 rename --- xiphos.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index cda6020..bfff80a 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -19,7 +19,7 @@ BuildRequires: libuuid-devel BuildRequires: rarian-compat BuildRequires: sword-devel >= 1.7.3 BuildRequires: gtk3-devel -BuildRequires: webkitgtk4-devel +BuildRequires: webkit2gtk3-devel BuildRequires: gtkhtml3-devel Requires: yelp Provides: xiphos @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Fri Jan 12 2018 Tomas Popela - 4.0.7-3 +- Adapt to the webkitgtk4 rename + * Thu Nov 30 2017 Pete Walter - 4.0.7-2 - Rebuild for ICU 60.1 From 571da8b77ec959b4b07aa7daf882c4570cd81546 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 15 Jan 2018 17:00:29 -0600 Subject: [PATCH 12/71] Rebuild for Sword 1.8 --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index cda6020..2eb87d8 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Mon Jan 15 2018 Greg Hellings - 4.0.7-3 +- Rebuild for SWORD 1.8 + * Thu Nov 30 2017 Pete Walter - 4.0.7-2 - Rebuild for ICU 60.1 From 83a499f803635a94d4b46613f968ae54da9e4703 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:42:55 +0000 Subject: [PATCH 13/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index 632ae92..a73fca4 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.0.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 15 2018 Greg Hellings - 4.0.7-4 - Rebuild for SWORD 1.8 From 72c928db620885e48c75a3c2e01122767f06fe21 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 30 Apr 2018 20:44:58 +0100 Subject: [PATCH 14/71] Rebuild for ICU 61.1 --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index a73fca4..b9d5785 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.0.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Mon Apr 30 2018 Pete Walter - 4.0.7-6 +- Rebuild for ICU 61.1 + * Fri Feb 09 2018 Fedora Release Engineering - 4.0.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e0471489cfe02149ccba578faf86bd462cab2a35 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 May 2018 22:47:55 -0500 Subject: [PATCH 15/71] Upstream version 4.1.0 --- .gitignore | 1 + sources | 2 +- xiphos.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e14bfdb..7c894ce 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ xiphos-3.1.3.tar.gz /4.0.5.tar.gz /4.0.6.tar.gz /4.0.7.tar.gz +/4.1.0.tar.gz diff --git a/sources b/sources index fac913b..f0c6c3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.0.7.tar.gz) = 041e0e9c6a7406b02c5b45066b44a3d44c37a34a799c3dfd617b6aa52dc50efbf800e475e107108fcf1d0d23a3522d0a9fa0838c474d2e4dd39f3af9d3429bd4 +SHA512 (4.1.0.tar.gz) = f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400 diff --git a/xiphos.spec b/xiphos.spec index 632ae92..e3d7b7b 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,11 +1,11 @@ Name: xiphos -Version: 4.0.7 -Release: 4%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ Source0: https://github.com/crosswire/%{name}/archive/%{version}.tar.gz -BuildRequires: biblesync-devel >= 1.1.2 +BuildRequires: biblesync-devel >= 1.2 BuildRequires: desktop-file-utils BuildRequires: dbus-glib-devel BuildRequires: docbook-utils @@ -17,7 +17,7 @@ BuildRequires: intltool BuildRequires: libgsf-devel BuildRequires: libuuid-devel BuildRequires: rarian-compat -BuildRequires: sword-devel >= 1.7.3 +BuildRequires: sword-devel >= 1.8 BuildRequires: gtk3-devel BuildRequires: webkit2gtk3-devel BuildRequires: gtkhtml3-devel @@ -104,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Mon May 14 2018 Greg Hellings - 4.1.0-1 +- Upstream release 4.1.0 + * Mon Jan 15 2018 Greg Hellings - 4.0.7-4 - Rebuild for SWORD 1.8 From 9c728cbdd8bf98645669742f9da99735a027ca11 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 May 2018 23:12:21 -0500 Subject: [PATCH 16/71] Correct several lint issues --- xiphos.spec | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/xiphos.spec b/xiphos.spec index 79f3adc..0b0c4b3 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -22,13 +22,9 @@ BuildRequires: gtk3-devel BuildRequires: webkit2gtk3-devel BuildRequires: gtkhtml3-devel Requires: yelp -Provides: xiphos -Provides: xiphos-common -Provides: xiphos-gtk2 -Provides: xiphos-gtk3 -Obsoletes: xiphos-gtk2 -Obsoletes: xiphos-gtk3 -Obsoletes: xiphos-common +Obsoletes: xiphos-gtk2 < 4.1 +Obsoletes: xiphos-gtk3 < 4.1 +Obsoletes: xiphos-common < 4.1 %if 0%{?rhel} > 0 && 0%{?rhel} <= 7 ExcludeArch: ppc64 @@ -66,11 +62,11 @@ LDFLAGS='%{?__global_ldflags}' \ ./waf install --destdir %{buildroot} desktop-file-install --delete-original \ - --add-category=X-Bible \ - --add-category=X-Religion \ - --dir=%{buildroot}%{_datadir}/applications \ - --copy-name-to-generic-name \ - %{buildroot}%{_datadir}/applications/xiphos.desktop + --add-category=X-Bible \ + --add-category=X-Religion \ + --dir=%{buildroot}%{_datadir}/applications \ + --copy-name-to-generic-name \ + %{buildroot}%{_datadir}/applications/xiphos.desktop # package docs with macro rm -frv %{buildroot}%{_docdir}/%{name} From e11279c0bca51a49d543048e4bdcfb05412e8ff6 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 10 Jul 2018 22:05:54 +0100 Subject: [PATCH 17/71] Rebuild for ICU 62 --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index 0b0c4b3..a76095c 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -100,6 +100,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Tue Jul 10 2018 Pete Walter - 4.1.0-3 +- Rebuild for ICU 62 + * Mon May 14 2018 Greg Hellings - 4.1.0-1 - Upstream release 4.1.0 From e5e43dcff2214fe9934ca44f6d4a23b56ac7e422 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 12 Jul 2018 13:41:27 -0500 Subject: [PATCH 18/71] Rebuild for SWORD 1.8.1-7 --- xiphos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index a76095c..dd4eada 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -1,6 +1,6 @@ Name: xiphos Version: 4.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bible study and research tool License: GPLv2+ URL: http://xiphos.org/ @@ -100,6 +100,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog +* Thu Jul 12 2018 Greg Hellings - 4.1.1-2 +- Rebuild for SWORD 1.8.1-7 + * Tue Jul 10 2018 Pete Walter - 4.1.0-3 - Rebuild for ICU 62 From fb30d64e2e583f6c0dcb12d85ae03bbc6f8140b5 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 12 Jul 2018 14:10:45 -0500 Subject: [PATCH 19/71] Fix %changelog version name --- xiphos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xiphos.spec b/xiphos.spec index dd4eada..1a93728 100644 --- a/xiphos.spec +++ b/xiphos.spec @@ -100,7 +100,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xiphos/ %changelog -* Thu Jul 12 2018 Greg Hellings - 4.1.1-2 +* Thu Jul 12 2018 Greg Hellings - 4.1.0-2 - Rebuild for SWORD 1.8.1-7 * Tue Jul 10 2018 Pete Walter - 4.1.0-3 From fae7108249d70f8fe6584881bea97d906d387a3a Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sat, 28 Jul 2018 22:28:33 -0500 Subject: [PATCH 20/71] Switch build to CMake --- cmake.patch | 124109 +++++++++++++++++++++++++++++++++++++++++++++++++ xiphos.spec | 48 +- 2 files changed, 124144 insertions(+), 13 deletions(-) create mode 100644 cmake.patch diff --git a/cmake.patch b/cmake.patch new file mode 100644 index 0000000..ca63bad --- /dev/null +++ b/cmake.patch @@ -0,0 +1,124109 @@ +diff --git a/.bzrignore b/.bzrignore +index 1425fec6..67dc79cd 100644 +--- a/.bzrignore ++++ b/.bzrignore +@@ -34,12 +34,12 @@ po/.intltool-merge-cache + po/Makefile.in.in + po/POTFILES + po/stamp-it +-src/gnome2/.libs/ +-src/gnome2/ipc-interface.h +-src/gnome2/locale_set.c +-src/gnome2/marshal.c +-src/gnome2/marshal.h +-src/gnome2/xiphos ++src/gtk/.libs/ ++src/gtk/ipc-interface.h ++src/gtk/locale_set.c ++src/gtk/marshal.c ++src/gtk/marshal.h ++src/gtk/xiphos + .waf* + build + .lock-wscript +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 00000000..02073f1d +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,109 @@ ++# Xiphos build script ++# ++# Copyright (C) 2018 Xiphos Development Team ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU Library General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. ++# ++ ++# the oldest stable cmake version we support ++cmake_minimum_required (VERSION 3.6 FATAL_ERROR) ++cmake_policy(VERSION 3.6) ++ ++ ++### set project name and version HERE ### ++project (xiphos ++ VERSION "4.1.0" ++ LANGUAGES C CXX) ++ ++ ++# set commonly used Xiphos variables: ++# Xiphos website ++set (XIPHOS_WEBSITE "http://xiphos.org") ++ ++# Xiphos issues report website ++set (XIPHOS_BUG_REPORT "https://github.com/crosswire/xiphos/issues") ++ ++# Xiphos release date, (read from 'ChangeLog') ++# read last entry in ChangeLog ++file(STRINGS ${PROJECT_SOURCE_DIR}/ChangeLog ++ ChangeLog_lastentry REGEX "^20[0-9][0-9]-[0-9][0-9]" LIMIT_COUNT 1) ++# get year ++string(SUBSTRING ${ChangeLog_lastentry} 0 4 ChangeLog_year) ++# get month's number ++string(SUBSTRING ${ChangeLog_lastentry} 5 2 ChangeLog_month) ++# transform month's number into month's name ++list(APPEND month_names "XXX;Jan;Feb;Mar;Apr;May;Jun;Jul;Aug;Sep;Oct;Nov;Dec") ++list(GET month_names ${ChangeLog_month} ChangeLog_month) ++# generate release date string ++string(CONFIGURE "@ChangeLog_month@ @ChangeLog_year@" XIPHOS_RELEASE_DATE) ++ ++ ++# make sure it's an out-of-stream build ++file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}/CMakeLists.txt" LOC_PATH) ++if(EXISTS "${LOC_PATH}") ++ message(FATAL_ERROR "You cannot build in the source directory (or any directory with a CMakeLists.txt file). Please make an out-of-stream build subdirectory.") ++endif() ++ ++ ++# tell cmake where its modules can be found in our project directory ++list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) ++list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules) ++ ++# set install directory variables as defined by the GNU Coding Standards. ++# e.g. CMAKE_INSTALL_DATAROOTDIR; CMAKE_INSTALL_FULL_BINDIR; ++# CMAKE_INSTALL_FULL_DOCDIR... ++include (GNUInstallDirs) ++ ++# set CMAKE options that the user can optionally select ON or OFF. ++include (XiphosOptions) ++ ++# find needed tools for building Xiphos ++include (XiphosBuildTools) ++ ++# find dependencies ++include (XiphosDependencies) ++ ++# set flags ++include (XiphosFlags) ++ ++# create config.h ++include (XiphosConfig_h) ++ ++# build xiphos ++add_subdirectory(win32) ++add_subdirectory(src/backend) ++add_subdirectory(src/editor) ++add_subdirectory(src/main) ++add_subdirectory(src/webkit) ++add_subdirectory(src/xiphos_html) ++add_subdirectory(src/gtk) ++ ++# build xiphos-nav ++add_subdirectory(src/examples) ++ ++# build other stuff ++add_subdirectory(pixmaps) ++add_subdirectory(ui) ++add_subdirectory(po) ++add_subdirectory(desktop) ++add_subdirectory(doc) ++add_subdirectory(mhelp) ++ ++# create packages ++add_subdirectory(cpack) ++ ++# report ++include (XiphosReport) ++# End +diff --git a/INSTALL-cmake.md b/INSTALL-cmake.md +new file mode 100644 +index 00000000..d0f601d9 +--- /dev/null ++++ b/INSTALL-cmake.md +@@ -0,0 +1,232 @@ ++Installation instructions ++========================== ++ ++On Linux install Xiphos through you package manager, for example on Fedora: ++ ++ $ sudo dnf install xiphos-gtk3 ++ ++Or on Debian, Ubuntu, or Linux Mint: ++ ++ $ sudo apt-get update ++ $ sudo apt-get install xiphos ++ ++If you use Windows download the .exe file from: http://xiphos.org/download/ ++ ++Compile Xiphos from source ++========================== ++ ++Get source ++---------- ++ ++To compile Xiphos from source you will need to get a checkout of Xiphos from ++GitHub. To do so, do: ++ ++ $ git clone https://github.com/crosswire/xiphos.git ++ ++Dependencies ++------------ ++ ++Before building Xiphos with CMake, please ensure that you have the platform ++specific dependencies installed: ++ ++ gcc GCC, the GNU Compiler Collection ++ intltool Set of tools to centralize translation ++ libxml2 XML C parser and toolkit ++ libgsf The G Structured File Library ++ gconfmm C++ wrappers for GConf ++ libuuid universally unique identifier library ++ sword >= 1.8.0 CrossWire Bible Society's Bible software ++ biblesync Protocol to support Bible software shared co-navigation ++ Gtk+-2.0 or GTK+-3.0 The GIMP Toolkit ++ WebKit1 or Webkit2 Port to Gtk+ of the WebKit rendering engine ++ ++Optional Dependencies: ++ ++ gtkhtml Lightweight HTML rendering/editing engine ++ dbus-glib API for use of D-Bus from GLib applications ++ ++Recommended tools: ++ ++ intltool An internationalization tool ++ appstream-util Utility to validate AppStream metadata ++ desktop-file-validate Validates a desktop file ++ itstool Translates XML documents with PO files ++ xmllint Validates an XML file against an XSD schema ++ yelp-build Creates HTML, EPUB, and other files from help files ++ chmcmd Creates a Compressed HTML help file (chm) ++ ++For *Fedora*, you need to make sure you have these packages installed: ++ ++ $ sudo dnf install cmake gcc-c++ intltool gtk3-devel dbus-glib-devel gtkhtml3-devel webkitgtk4-devel libxml2-devel libgsf-devel gconfmm26-devel sword-devel libuuid-devel biblesync-devel intltool libappstream-glib-devel desktop-file-utils itstool yelp-tools fpc ++ ++Or for *Ubuntu*, both GTK3 and GTK2 versions, install: ++ ++ $ sudo apt-get install cmake cpp intltool libdbus-glib-1-dev libwebkitgtk-3.0-dev libxml2-dev libgsf-1-dev libgconfmm-2.6-dev libsword-dev uuid-dev libwebkitgtk-dev libglade2-dev intltool appstream-util desktop-file-utils itstool libxml2-utils yelp-tools fp-utils uuid-runtime ++ ++ ++Building Xiphos with CMake ++-------------------------- ++ ++CMake is a cross-platform tool for generating makefiles (as well as project files ++used by IDEs). ++ ++The current version of the buildsystem is capable of building and packaging ++Xiphos for the following platforms: ++ ++- Linux (GNU Makefiles, Ninja) ++ ++Should work, but untested: ++- FreeBSD (GNU Makefiles) ++ ++Work in progress: ++- Linux Cross compiling for Windows (GNU Makefiles, Ninja) ++ ++While the legacy build systems typically used in-source builds, it's highly ++recommended to use *out-of-source* builds with CMake. ++ ++The necessary runtime dependencies such as generated source files, static ++libraries, translated files are copied over to the build directory automatically ++during the build process. ++ ++ ++Commands for building Xiphos ++---------------------------- ++ ++This section lists the necessary commands for building Xiphos with CMake. ++CMake supports different generators (like GNU/NMake Makefiles or Ninja). ++ ++The cmake command-line tool --help output lists available generators on the ++current platform. Use its -G option to specify the generator for a new build tree. ++ ++Set-up the out-of-source build. Using a build tree that is separate from the ++source tree will prevent CMake from generating any files in the source tree. ++Create a completely separate directory: ++ ++ ++ mkdir xiphos-build && cd xiphos-build ++ ++ ++All examples below are for out-of-source builds with Xiphos checked out to ++``: ++ ++### Linux build with Ninja ++ ++ ++ cmake -G Ninja ++ cmake --build . -- -v # or: ninja -v all ++ ++`CMAKE_BUILD_TYPE` defaults to `Release` (or to `Debug` if a .git dir exists) ++ ++### Linux build with Makefiles ++ ++ cmake ++ cmake --build . -- VERBOSE=1 -j$(nproc) # or: make VERBOSE=1 -j$(nproc) ++ ++ ++Build Options ++------------- ++ ++Xiphos supports a number of build options that can enable or disable certain ++functionality. These options must be set when running CMake with ++`-DENABLE_