falkon 3.1.0-10 (x86_64) 2019-7963
-1

Status rejected
Submitter nobodydead [@T] gmail.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/635042
Packages
falkon-3.1.0-10.x86_64.binary
falkon-3.1.0-10.x86_64.source
falkon-core-3.1.0-10.x86_64.binary
falkon-core-debuginfo-3.1.0-10.x86_64.debuginfo
falkon-debuginfo-3.1.0-10.x86_64.debuginfo
falkon-gnome-keyring-3.1.0-10.x86_64.binary
falkon-gnome-keyring-debuginfo-3.1.0-10.x86_64.debuginfo
falkon-kde-3.1.0-10.x86_64.binary
falkon-kde-debuginfo-3.1.0-10.x86_64.debuginfo
falkon-plugins-3.1.0-10.x86_64.binary
falkon-plugins-debuginfo-3.1.0-10.x86_64.debuginfo
Build Date 2019-10-20 16:54:27 +0000 UTC
Last Updated 2019-10-20 19:44:56.808770595 +0000 UTC
$ git diff --patch-with-stat --summary 54414483e409b8f96df83cab6ca16fcfe53a3455..2ccf5dcc7b11ec484c165eac6a02667fee0d03c2

 falkon-3.1.0-find-pyside-headers.patch | 11 +++++++++++
 falkon.spec                            | 12 ++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 falkon-3.1.0-find-pyside-headers.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.spec b/falkon.spec
index dd4731e..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:	6
+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
@@ -27,6 +27,7 @@ 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
@@ -50,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}
@@ -192,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
Not Available

benbullard79 [@T] cox.netWe seem to be having some issue.1621d 15hrs
benbullard79 [@T] cox.netMistaken rejection.1621d 15hrs