$ git diff --patch-with-stat --summary 039e56f055da5d3601288ca492279b27c30a4e04..2ccf5dcc7b11ec484c165eac6a02667fee0d03c2
falkon-3.1.0-find-pyside-headers.patch | 11 +++++++
falkon-3.1.0-menuentry.patch | 60 ++++++++++++++++++++++++++++++++++
falkon-3.1.0-omdv-settings.patch | 4 +--
falkon.spec | 15 +++++++--
4 files changed, 85 insertions(+), 5 deletions(-)
create mode 100644 falkon-3.1.0-find-pyside-headers.patch
create mode 100644 falkon-3.1.0-menuentry.patch
diff --git a/falkon-3.1.0-find-pyside-headers.patch b/falkon-3.1.0-find-pyside-headers.patch
new file mode 100644
index 0000000..6236757
--- /dev/null
+++ b/falkon-3.1.0-find-pyside-headers.patch
@@ -0,0 +1,11 @@
+diff -up falkon-3.1.0/src/plugins/PyFalkon/CMakeLists.txt.omv~ falkon-3.1.0/src/plugins/PyFalkon/CMakeLists.txt
+--- falkon-3.1.0/src/plugins/PyFalkon/CMakeLists.txt.omv~ 2019-09-21 22:58:22.074117013 +0200
++++ falkon-3.1.0/src/plugins/PyFalkon/CMakeLists.txt 2019-09-21 22:58:59.236364238 +0200
+@@ -167,6 +167,7 @@ target_include_directories(PyFalkon
+ ${SHIBOKEN_INCLUDE_DIR}
+ ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+ ${PYSIDE_INCLUDE_DIR}
++ ${PYSIDE_INCLUDE_DIR}/QtPrintSupport
+ ${PYSIDE_ADDITIONAL_INCLUDES}
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon
diff --git a/falkon-3.1.0-menuentry.patch b/falkon-3.1.0-menuentry.patch
new file mode 100644
index 0000000..0706d4a
--- /dev/null
+++ b/falkon-3.1.0-menuentry.patch
@@ -0,0 +1,60 @@
+diff -up falkon-3.1.0/linux/applications/org.kde.falkon.desktop.omv~ falkon-3.1.0/linux/applications/org.kde.falkon.desktop
+--- falkon-3.1.0/linux/applications/org.kde.falkon.desktop.omv~ 2019-06-15 01:31:59.737154300 +0200
++++ falkon-3.1.0/linux/applications/org.kde.falkon.desktop 2019-06-15 01:58:33.735076965 +0200
+@@ -1,30 +1,30 @@
+ [Desktop Entry]
+-Name=Falkon
+-Name[ar]=فالكون
+-Name[ca]=Falkon
+-Name[ca@valencia]=Falkon
+-Name[cs]=Falkon
+-Name[da]=Falkon
+-Name[de]=Falkon
+-Name[en_GB]=Falkon
+-Name[es]=Falkon
+-Name[fi]=Falkon
+-Name[fr]=Falkon
+-Name[gl]=Falkon
+-Name[id]=Falkon
+-Name[it]=Falkon
+-Name[nl]=Falkon
+-Name[nn]=Falkon
+-Name[pl]=Falkon
+-Name[pt]=Falkon
+-Name[pt_BR]=Falkon
+-Name[ru]=Falkon
+-Name[sk]=Falkon
+-Name[sv]=Falkon
+-Name[uk]=Falkon
+-Name[x-test]=xxFalkonxx
+-Name[zh_CN]=Falkon
+-Name[zh_TW]=Falkon
++Name=Falkon Web Browser
++Name[ar]=فالكون متصفّح وبّ
++Name[ca]=Navegador web Falkon
++Name[ca@valencia]=Navegador web Falkon
++Name[cs]=Falkon Webový prohlížeč
++Name[da]=Falkon Webbrowser
++Name[de]=Falkon Web-Browser
++Name[en_GB]=Falkon web browser
++Name[es]=Navegador web Falkon
++Name[fi]=Verkkoselain Falkon
++Name[fr]=Navigateur Web Falkon
++Name[gl]=Navegador web Falkon
++Name[id]=Falkon Penelusur Web
++Name[it]=Falkon Web browser
++Name[nl]=Falkon Webbrowser
++Name[nn]=Falkon Nettlesar
++Name[pl]=Przeglądarka internetowa Falkon
++Name[pt]=Navegador Web Falkon
++Name[pt_BR]=Navegador Web Falkon
++Name[ru]=Falkon интернет-браузер
++Name[sk]=Webový prehliadač Falkon
++Name[sv]=Falkon Webbläsare
++Name[uk]=Falkon Переглядач інтернету
++Name[x-test]=xxFalkon Web Browserxx
++Name[zh_CN]=Falkon 网页浏览器
++Name[zh_TW]=Falkon 網路瀏覽器
+ Type=Application
+ Icon=falkon
+ Categories=KDE;Qt;X-MandrivaLinux-CrossDesktop;Network;WebBrowser;
diff --git a/falkon-3.1.0-omdv-settings.patch b/falkon-3.1.0-omdv-settings.patch
index 7956f8f..49bb996 100644
--- a/falkon-3.1.0-omdv-settings.patch
+++ b/falkon-3.1.0-omdv-settings.patch
@@ -6,7 +6,7 @@ diff -Naur falkon-3.1.0/src/lib/app/browserwindow.cpp falkon-3.1.0.tpg/src/lib/a
//Url settings
settings.beginGroup(QSL("Web-URL-Settings"));
- m_homepage = settings.value(QSL("homepage"), QSL("falkon:start")).toUrl();
-+ m_homepage = settings.value(QSL("homepage"), QSL("file:///usr/share/doc/HTML/index.html")).toUrl();
++ m_homepage = settings.value(QSL("homepage"), QSL("file:///usr/share/mdk/indexhtml/index.html")).toUrl();
settings.endGroup();
//Browser Window settings
@@ -74,7 +74,7 @@ diff -Naur falkon-3.1.0/src/lib/preferences/preferences.cpp falkon-3.1.0.tpg/src
//GENERAL URLs
settings.beginGroup("Web-URL-Settings");
- m_homepage = settings.value("homepage", QUrl(QSL("falkon:start"))).toUrl();
-+ m_homepage = settings.value("homepage", QUrl(QSL("file:///usr/share/doc/HTML/index.html"))).toUrl();
++ m_homepage = settings.value("homepage", QUrl(QSL("file:///usr/share/mdk/indexhtml/index.html"))).toUrl();
m_newTabUrl = settings.value("newTabUrl", QUrl(QSL("falkon:speeddial"))).toUrl();
ui->homepage->setText(m_homepage.toEncoded());
ui->newTabUrl->setText(m_newTabUrl.toEncoded());
diff --git a/falkon.spec b/falkon.spec
index b4e3e1e..551d824 100644
--- a/falkon.spec
+++ b/falkon.spec
@@ -12,7 +12,7 @@ Version: 3.1.0
Release: 0.%{snapshot}.1
Source0: %{oname}-%{snapshot}.tar.xz
%else
-Release: 5
+Release: 10
Source0: http://download.kde.org/stable/falkon/%(echo %{version} |cut -d. -f1-2)/falkon-%{version}.tar.xz
%endif
License: GPLv3+ and BSD and LGPLv2.1 and GPLv2+ and MPL
@@ -22,10 +22,12 @@ Source100: falkon.rpmlintrc
Patch0: falkon-3.0.1-webinspector.patch
Patch1: falkon-3.1.0-not-in-More-menu.patch
# Running a browser as root may not be the smartest thing to do,
-# but falkon does it during installation, so let's make it work...
+# but calamares does it during installation, so let's make it work...
Patch2: falkon-3.1.0-fix-running-as-root.patch
Patch3: falkon-3.1.0-native-scrollbars.patch
Patch4: falkon-3.1.0-omdv-settings.patch
+Patch5: falkon-3.1.0-menuentry.patch
+Patch6: falkon-3.1.0-find-pyside-headers.patch
BuildRequires: cmake(ECM)
BuildRequires: qt5-linguist-tools
@@ -49,6 +51,7 @@ BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Purpose)
BuildRequires: cmake(PySide2)
+BuildRequires: cmake(Shiboken2)
BuildRequires: gettext-devel
Requires: %{name}-core = %{EVRD}
Suggests: %{name}-plugins = %{EVRD}
@@ -191,7 +194,13 @@ dos2unix README.md
%build
export PORTABLE_BUILD="false"
-%cmake_kde5 -DDISABLE_DBUS:BOOL=FALSE
+%cmake_kde5 -DDISABLE_DBUS:BOOL=FALSE \
+ -DSHIBOKEN_BINARY=%{_bindir}/shiboken2 \
+ -DSHIBOKEN_INCLUDE_DIR=%{_includedir}/shiboken2 \
+ -DSHIBOKEN_PYTHON_INCLUDE_DIR=%{_includedir}/python3.7m \
+ -DSHIBOKEN_LIBRARY=$(ls %{_libdir}/libshiboken2.cpython-3*.so) \
+ -DPYSIDE_LIBRARY=$(ls %{_libdir}/libpyside2.cpython-3*.so) \
+ -DPYSIDE_INCLUDE_DIR=%{_includedir}/PySide2
%ninja_build
%install