Merge pull request #4513 from ayhanyalcinsoy/master

qupzilla:v.bump to 2.2.5

network/web/qupzilla/actions.py

@@ -12,14 +12,16 @@ from pisi.actionsapi import get
 def setup():
     qt5.configure(parameters="USE_WEBGL=true \
                               QUPZILLA_PREFIX=/usr/ \
+                              DISABLE_UPDATES_CHECK=true \
                               GNOME_INTEGRATION=true \
-                              KDE_INTEGRATION=true \
-                              NO_X11=true")
+                              KDE_INTEGRATION=true ")
 
 def build():
     qt5.make()
 
 def install():
     qt5.install("INSTALL_ROOT=%s" % get.installDIR())
+    #zsh
+    pisitools.insinto("/usr/share/zsh/site-functions", "linux/completion/*")
 
     pisitools.dodoc("AUTHORS", "BUILDING*", "CHANGELOG", "COPYRIGHT", "FAQ", "README*")

network/web/qupzilla/files/QupZilla-2.2.0-native-scrollbars.patch

@@ -0,0 +1,24 @@
+diff -ur QupZilla-2.2.0/src/lib/preferences/preferences.cpp QupZilla-2.2.0-native-scrollbars/src/lib/preferences/preferences.cpp
+--- QupZilla-2.2.0/src/lib/preferences/preferences.cpp	2017-10-08 16:05:56.000000000 +0200
++++ src/lib/preferences/preferences.cpp	2017-10-16 05:34:25.738624011 +0200
+@@ -278,7 +278,7 @@
+     ui->wheelScroll->setValue(settings.value("wheelScrollLines", qApp->wheelScrollLines()).toInt());
+     ui->xssAuditing->setChecked(settings.value("XSSAuditing", false).toBool());
+     ui->printEBackground->setChecked(settings.value("PrintElementBackground", true).toBool());
+-    ui->useNativeScrollbars->setChecked(settings.value("UseNativeScrollbars", false).toBool());
++    ui->useNativeScrollbars->setChecked(settings.value("UseNativeScrollbars", true).toBool());
+ 
+     foreach (int level, WebView::zoomLevels()) {
+         ui->defaultZoomLevel->addItem(QString("%1%").arg(level));
+diff -ur QupZilla-2.2.0/src/lib/webengine/webscrollbarmanager.cpp QupZilla-2.2.0-native-scrollbars/src/lib/webengine/webscrollbarmanager.cpp
+--- QupZilla-2.2.0/src/lib/webengine/webscrollbarmanager.cpp	2017-10-08 16:05:56.000000000 +0200
++++ src/lib/webengine/webscrollbarmanager.cpp	2017-10-16 05:33:36.152339717 +0200
+@@ -109,7 +109,7 @@
+ 
+ void WebScrollBarManager::loadSettings()
+ {
+-    m_enabled = Settings().value(QSL("Web-Browser-Settings/UseNativeScrollbars"), false).toBool();
++    m_enabled = Settings().value(QSL("Web-Browser-Settings/UseNativeScrollbars"), true).toBool();
+ 
+     if (!m_enabled) {
+         for (WebView *view : m_scrollbars.keys()) {

network/web/qupzilla/files/QupZilla-2.2.5-qtbug-65523-workaround.patch

@@ -0,0 +1,12 @@
+diff -ur QupZilla-2.2.5/src/lib/webengine/webpage.cpp QupZilla-2.2.5-qtbug-65523-workaround/src/lib/webengine/webpage.cpp
+--- QupZilla-2.2.5/src/lib/webengine/webpage.cpp	2018-01-28 16:37:13.000000000 +0100
++++ src/lib/webengine/webpage.cpp	2018-02-01 04:34:19.159005227 +0100
+@@ -102,7 +102,7 @@
+     });
+ 
+     // Workaround for broken load started/finished signals in QtWebEngine 5.10
+-    if (qstrcmp(qVersion(), "5.10.0") == 0) {
++    {
+         connect(this, &QWebEnginePage::loadProgress, this, [this](int progress) {
+             if (progress == 100) {
+                 emit loadFinished(true);

network/web/qupzilla/pspec.xml

@@ -10,7 +10,7 @@
         <IsA>app:gui</IsA>
         <Summary>Cross-platform QtWebKit browser</Summary>
         <Description>QupZilla is a new and very fast QtWebEngine browser.</Description>
-        <Archive type="tarxz" sha1sum="b2ba69f12a1ddacaf487ba6396b7e25e4de1aae8">https://github.com/QupZilla/qupzilla/releases/download/v2.1.2/QupZilla-2.1.2.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="c07b4db18cebd9403390f676a6ae87979305f205">https://github.com/QupZilla/qupzilla/releases/download/v2.2.5/QupZilla-2.2.5.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>openssl-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
@@ -42,13 +42,18 @@
             <Dependency>tiff-devel</Dependency>
             <Dependency>jbigkit-devel</Dependency>
             <Dependency>nss-devel</Dependency>
+            <Dependency>cups-devel</Dependency>
+            <Dependency>ffmpeg-devel</Dependency>
+            <Dependency>libXScrnSaver-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="0">speeddial.diff</Patch>
             <Patch level="0">preferences.diff</Patch>
             <Patch level="0">browserwindow.diff</Patch>
             <Patch level="0">defines.diff</Patch>
-            <Patch level="0">bookmarks_json.diff</Patch>
+            <Patch level="0">bookmarks.patch</Patch>
+            <Patch>QupZilla-2.2.0-native-scrollbars.patch</Patch>
+            <Patch>QupZilla-2.2.5-qtbug-65523-workaround.patch</Patch>
         </Patches>
     </Source>
     
@@ -84,6 +89,13 @@
     </Package>
     
     <History>
+        <Update release="5">
+            <Date>2018-02-15</Date>
+            <Version>2.2.5</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2017-04-13</Date>
             <Version>2.1.2</Version>