Hello community,
here is the log from the commit of package qt4-qtscript for openSUSE:Factory
checked in at 2017-12-05 01:25:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt4-qtscript (Old)
and /work/SRC/openSUSE:Factory/.qt4-qtscript.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt4-qtscript"
Tue Dec 5 01:25:57 2017 rev:9 rq:547671 version:0.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt4-qtscript/qt4-qtscript.changes
2017-06-21 13:50:47.713506733 +0200
+++ /work/SRC/openSUSE:Factory/.qt4-qtscript.new/qt4-qtscript.changes
2017-12-05 01:25:58.118604999 +0100
@@ -1,0 +2,8 @@
+Sat Dec 2 17:11:37 UTC 2017 - fab...@ritter-vogt.de
+
+- Do not build against Qt4 WebKit:
+ * Vade retro satana
+ * Add qtscript-qt-no_webkit.patch
+ * Remove qtscript-separate-webkit.patch, not needed anymore
+
+-------------------------------------------------------------------
Old:
----
qtscript-separate-webkit.patch
New:
----
qtscript-qt-no_webkit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt4-qtscript.spec ++++++
--- /var/tmp/diff_new_pack.hp0Fdz/_old 2017-12-05 01:25:58.814579714 +0100
+++ /var/tmp/diff_new_pack.hp0Fdz/_new 2017-12-05 01:25:58.818579569 +0100
@@ -1,7 +1,7 @@
#
# spec file for package qt4-qtscript
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,11 +28,12 @@
Source0: qtscriptgenerator-src-%{version}.tar.gz
Patch0: qtscript-qt-no_phonon.diff
Patch1: gcc-44.diff
-Patch2: qtscript-separate-webkit.patch
Patch3: fix-arm-build.diff
# PATCH-FIX-UPSTREAM https://github.com/qt-labs/qtscriptgenerator/pull/1
Patch4: reproducible.patch
-BuildRequires: libQtWebKit-devel
+# PATCH-FIX-OPENSUSE
+Patch5: qtscript-qt-no_webkit.patch
+BuildRequires: libqt4-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%requires_eq libqt4
@@ -55,11 +56,11 @@
%setup -q -n qtscriptgenerator-src-%{version}
%patch0
%patch1
-%patch2
%ifarch %arm
%patch3
%endif
%patch4 -p1
+%patch5 -p1
%build
export QTDIR=/usr
++++++ qtscript-qt-no_webkit.patch ++++++
From: Fabian Vogt <fab...@ritter-vogt.de>
Subject: Do not build parts depending on Qt WebKit
Qt WebKit is unmaintained and must not be used anymore.
Index: qtscriptgenerator-src-0.2.0/qtbindings/qtbindings.pro
===================================================================
--- qtscriptgenerator-src-0.2.0.orig/qtbindings/qtbindings.pro
+++ qtscriptgenerator-src-0.2.0/qtbindings/qtbindings.pro
@@ -7,7 +7,6 @@ SUBDIRS = qtscript_core \
qtscript_svg \
qtscript_xml \
# qtscript_phonon \
- qtscript_webkit \
qtscript_xmlpatterns \
qtscript_uitools \
qs_eval
