9:30 p.m.
The package rpms/kchmviewer.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kchmviewer.git/commit/?id=71f937a....
Change:
+ExclusiveArch: %{qt5_qtwebengine_arches}
Thanks.
Full change:
============
commit 71f937afc04b58b20dbef31233686675174852fb
Author: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Wed Jun 30 10:00:53 2021 +0800
Add ExclusiveArch for qt5-qtwebengine
diff --git a/kchmviewer.spec b/kchmviewer.spec
index 2d1d437..d1f895f 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -25,6 +25,7 @@ BuildRequires: gettext
BuildRequires: qt5-qtbase-devel
BuildRequires: libzip-devel
BuildRequires: qt5-qtwebengine-devel
+ExclusiveArch: %{qt5_qtwebengine_arches}
Requires: %{name}-common = %{version}-%{release}
commit 8bd15e28bd1776978112549667e281e8fa070ef1
Author: Robin Lee <cheeselee(a)fedoraproject.org>
Date: Wed Jun 30 09:52:17 2021 +0800
Update to 8.0
diff --git a/.gitignore b/.gitignore
index 45a47dc..2120659 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ kchmviewer-5.2.tar.gz
/kchmviewer-7.3.tar.gz
/kchmviewer-7.5.tar.gz
/kchmviewer-7.7.tar.gz
+/kchmviewer-RELEASE_8_0.tar.gz
diff --git a/0001-Custom-URL-scheme-registration-needs-to-be-applied-o.patch
b/0001-Custom-URL-scheme-registration-needs-to-be-applied-o.patch
new file mode 100644
index 0000000..7978eaa
--- /dev/null
+++ b/0001-Custom-URL-scheme-registration-needs-to-be-applied-o.patch
@@ -0,0 +1,62 @@
+From 9ac73e7ad15de08aab6b1198115be2eb44da7afe Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev(a)ulduzsoft.com>
+Date: Fri, 21 May 2021 15:57:21 -0700
+Subject: [PATCH] Custom URL scheme registration needs to be applied once per
+ https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
+
+---
+ src/viewwindow_webengine.cpp | 20 +++++++++++++-------
+ src/viewwindow_webengine.h | 3 ---
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/src/viewwindow_webengine.cpp b/src/viewwindow_webengine.cpp
+index 631d84d..34f3396 100644
+--- a/src/viewwindow_webengine.cpp
++++ b/src/viewwindow_webengine.cpp
+@@ -63,16 +63,22 @@ ViewWindow::ViewWindow( QWidget * parent )
+ m_contextMenuLink = 0;
+ m_storedScrollbarPosition = -1; // see header
+
+- // Use our network emulation layer. I don't know if we transfer the ownership
when we install it,
+- // so we create one per page. May be unnecessary.
+- m_provider = new DataProvider_QWebEngine( this );
+-
+- page()->profile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), m_provider
);
+- page()->profile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(),
m_provider );
+-
+ // All links are going through us
+ //page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
+
++ // This needs to be done only once
++ static bool providerInstalled = false;
++
++ if ( !providerInstalled )
++ {
++ // Use our network emulation layer. We do not transfer the ownership when we
install it. See https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
++ DataProvider_QWebEngine * provider = new DataProvider_QWebEngine( 0 );
++
++ QWebEngineProfile::defaultProfile()->installUrlSchemeHandler(
EBook_CHM::urlScheme(), provider );
++ QWebEngineProfile::defaultProfile()->installUrlSchemeHandler(
EBook_EPUB::urlScheme(), provider );
++ providerInstalled = true;
++ }
++
+ connect( this, SIGNAL( loadFinished(bool)), this, SLOT( onLoadFinished(bool)) );
+
+ // Search results highlighter
+diff --git a/src/viewwindow_webengine.h b/src/viewwindow_webengine.h
+index 0adea31..3e96690 100644
+--- a/src/viewwindow_webengine.h
++++ b/src/viewwindow_webengine.h
+@@ -128,9 +128,6 @@ class ViewWindow : public QWebEngineView
+ // It is set to -1 if no scrollbar position has been set and the page is not
loaded yet
+ // It is set to 0 if no scrollbar position has been set and the page is loaded
already
+ int m_storedScrollbarPosition;
+-
+- // Data provider
+- DataProvider_QWebEngine * m_provider;
+ };
+
+ #endif // VIEWWINDOW_WEBENGINE_H
+--
+2.31.1
+
diff --git a/0001-Only-add-Webkit-stuff-to-QT-if-we-re-compiling-under.patch
b/0001-Only-add-Webkit-stuff-to-QT-if-we-re-compiling-under.patch
new file mode 100644
index 0000000..f6252ae
--- /dev/null
+++ b/0001-Only-add-Webkit-stuff-to-QT-if-we-re-compiling-under.patch
@@ -0,0 +1,31 @@
+From a4a3984465cb635822953350c571950ae726b539 Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev(a)ulduzsoft.com>
+Date: Sun, 23 May 2021 15:01:24 -0700
+Subject: [PATCH] Only add Webkit stuff to QT if we're compiling under 5.6.
+ Thanks to @u-235 for reporting.
+
+---
+ src/src.pro | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index f502259..e75d6a9 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -60,12 +60,7 @@ FORMS += tab_bookmarks.ui \
+ toolbareditor.ui
+ RESOURCES += resources/images.qrc
+
+-QT += webkit \
+- xml \
+- network \
+- widgets \
+- webkitwidgets \
+- printsupport
++QT += xml network widgets printsupport
+
+ linux-g++*:{
+ LIBS += -lX11
+--
+2.31.1
+
diff --git a/0001-Rename-the-desktop-entry-file-to-match-the-applicati.patch
b/0001-Rename-the-desktop-entry-file-to-match-the-applicati.patch
new file mode 100644
index 0000000..258a4c1
--- /dev/null
+++ b/0001-Rename-the-desktop-entry-file-to-match-the-applicati.patch
@@ -0,0 +1,21 @@
+From 3904963376ccc4015a542ada18335933afeea252 Mon Sep 17 00:00:00 2001
+From: Robin Lee <cheeselee(a)fedoraproject.org>
+Date: Wed, 30 Jun 2021 09:43:15 +0800
+Subject: [PATCH] Rename the desktop entry file to match the application ID
+
+GNOME Shell requires this to load application icon and prepare
+sandboxing[1].
+
+[1] https://wiki.gnome.org/Projects/GnomeShell/ApplicationBased
+---
+ .../{kchmviewer.desktop => net.kchmviewer.kchmviewer.desktop} | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename packages/{kchmviewer.desktop => net.kchmviewer.kchmviewer.desktop} (100%)
+
+diff --git a/packages/kchmviewer.desktop b/packages/net.kchmviewer.kchmviewer.desktop
+similarity index 100%
+rename from packages/kchmviewer.desktop
+rename to packages/net.kchmviewer.kchmviewer.desktop
+--
+2.31.1
+
diff --git a/kchmviewer-7.7-qtwebengine-disable.patch
b/kchmviewer-7.7-qtwebengine-disable.patch
deleted file mode 100644
index 831ac16..0000000
--- a/kchmviewer-7.7-qtwebengine-disable.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur kchmviewer-7.7.orig/src/src.pro kchmviewer-7.7/src/src.pro
---- kchmviewer-7.7.orig/src/src.pro 2016-10-05 09:35:34.149265000 +0200
-+++ kchmviewer-7.7/src/src.pro 2017-02-07 15:16:27.749908883 +0100
-@@ -114,20 +114,10 @@
-
- greaterThan(QT_MAJOR_VERSION, 4) {
- # Qt 5
-- greaterThan(QT_MINOR_VERSION, 5) {
-- # Qt 5.6+
-- error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and
is not supported")
-- QT += webengine webenginewidgets
-- DEFINES += USE_WEBENGINE
-- SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
-- HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
-- } else {
-- # Qt 5.0-5.5
- QT += webkit webkitwidgets
- DEFINES += USE_WEBKIT
- SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
- HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
-- }
- } else {
- message("Qt4 is not supported anymore, please do not report any errors")
- QT += webkit webkitwidgets
diff --git a/kchmviewer-7.7-underlinking.patch b/kchmviewer-7.7-underlinking.patch
deleted file mode 100644
index 75bfed8..0000000
--- a/kchmviewer-7.7-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -108,7 +108,7 @@
- HEADERS += dbus_interface.h
- SOURCES += dbus_interface.cpp
- CONFIG += dbus
-- LIBS += ../lib/libebook/libebook.a
-+ LIBS += ../lib/libebook/libebook.a -lchm -lzip
- POST_TARGETDEPS += ../lib/libebook/libebook.a
- }
-
diff --git a/kchmviewer.spec b/kchmviewer.spec
index baef475..2d1d437 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -1,24 +1,30 @@
Name: kchmviewer
-Version: 7.7
-Release: 3%{?dist}
+Version: 8.0
+%global _tag RELEASE_%(echo %{version} | sed 's/\\./_/g')
+%global _appid net.%{name}.%{name}
+Release: 1%{?dist}
Summary: CHM viewer
License: GPLv3+
URL: http://www.kchmviewer.net/
-Source0: http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
-Patch0:
https://raw.githubusercontent.com/scx/flathub/820954b40029ab1ebe9a2c20d08...
-Patch1:
https://raw.githubusercontent.com/scx/flathub/820954b40029ab1ebe9a2c20d08...
+Source0:
https://github.com/gyunaev/%{name}/archive/refs/tags/%{_tag}.tar.gz#/%{na...
+# applied in upstream git 9ac73e7ad15de08aab6b1198115be2eb44da7afe
+Patch0: 0001-Custom-URL-scheme-registration-needs-to-be-applied-o.patch
+# applied in upstream git a4a3984465cb635822953350c571950ae726b539
+Patch1: 0001-Only-add-Webkit-stuff-to-QT-if-we-re-compiling-under.patch
+# https://github.com/gyunaev/kchmviewer/pull/17
+Patch2: 0001-Rename-the-desktop-entry-file-to-match-the-applicati.patch
Provides: %{name}-qt = %{version}-%{release}
Obsoletes: %{name}-qt < 7.3
-BuildRequires: make
+BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: chmlib-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: qt5-qtbase-devel
BuildRequires: libzip-devel
-BuildRequires: qt5-qtwebkit-devel
+BuildRequires: qt5-qtwebengine-devel
Requires: %{name}-common = %{version}-%{release}
@@ -35,31 +41,26 @@ Requires: hicolor-icon-theme
Common data files for KchmViewer.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-
+%autosetup -p1 -n %{name}-%{_tag}
%build
# make the Qt-only version
%qmake_qt5
-make
+%make_build
%install
# install the Qt-only version
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p bin/%{name} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
-cp -p packages/%{name}.desktop $RPM_BUILD_ROOT%{_datadir}/applications/
-sed -i -E 's/(MimeType.*)/\1;/'
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications
packages/%{_appid}.desktop
install -Dpm 644 packages/%{name}.png
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%files
%{_bindir}/kchmviewer
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{_appid}.desktop
%files common
%doc README ChangeLog FAQ
@@ -68,6 +69,9 @@ desktop-file-validate
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%changelog
+* Wed Jun 30 2021 Robin Lee <cheeselee(a)fedoraproject.org> - 8.0-1
+- Update to 8.0
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 8429437..5c3de31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kchmviewer-7.7.tar.gz) =
e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070
+SHA512 (kchmviewer-RELEASE_8_0.tar.gz) =
28ae8ee8a6f4a9be2e8a9666f6326906e04f34ad80a363697fc7e5bfbc745e6671884add3f57b6a1264f2056428cb0a31504da9c69a0bede0c3b485a08e75048
commit 6ad34149eb428b0552806bfee0c8098713a4feba
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 15:16:18 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/kchmviewer.spec b/kchmviewer.spec
index 8faaccd..baef475 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -1,6 +1,6 @@
Name: kchmviewer
Version: 7.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: CHM viewer
License: GPLv3+
@@ -68,6 +68,9 @@ desktop-file-validate
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 84674c3432f730a3cb4ec7715d54950edb757224
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Wed Jan 13 01:24:30 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/kchmviewer.spec b/kchmviewer.spec
index 1843e59..8faaccd 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -11,6 +11,7 @@ Patch1:
https://raw.githubusercontent.com/scx/flathub/820954b40029ab1ebe
Provides: %{name}-qt = %{version}-%{release}
Obsoletes: %{name}-qt < 7.3
+BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: chmlib-devel
BuildRequires: desktop-file-utils