From d9e4489ed1b2d4068ab409bc73d581cfc6a6057b Mon Sep 17 00:00:00 2001 From: AlmAck Date: Tue, 22 Mar 2016 21:52:04 +0100 Subject: [PATCH] =?UTF-8?q?revert=20qupzilla=20to=20use=20webkit,=20webeng?= =?UTF-8?q?ine=20is=20not=20ready,=20like=20the=20QTBUG-43008=20bug=20prev?= =?UTF-8?q?ent=20drag=C3=82&drop=20on=20html=20pages.=20Enable=20it=20agai?= =?UTF-8?q?n=20when=20Qt5.7=20is=20available?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qupzilla/PKGBUILD | 30 ++++++++--------- qupzilla/PKGBUILD_webengine | 64 +++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 16 deletions(-) create mode 100644 qupzilla/PKGBUILD_webengine diff --git a/qupzilla/PKGBUILD b/qupzilla/PKGBUILD index b16251b2c..dc2b37718 100644 --- a/qupzilla/PKGBUILD +++ b/qupzilla/PKGBUILD @@ -2,15 +2,14 @@ _pkgname=QupZilla pkgname='qupzilla' -pkgver=1.9.90 -_commit=a16c21b -pkgrel=1 +pkgver=1.8.9 +pkgrel=5 pkgdesc="A very fast open source browser based on WebKit core" url="http://www.qupzilla.com" arch=('x86_64') license=('GPL3') makedepends=('qt5-tools' 'kwallet') -depends=('qt5-webengine' 'qt5-script') +depends=('qt5-webkit' 'qt5-script') optdepends=('bash-completion: bash completion support' 'kwallet: kf5 kwallet integration') provides=('qupzilla-qt5') @@ -19,29 +18,29 @@ replaces=('qupzilla-qt5') install=${pkgname}.install categories=('network') screenshot='http://www.qupzilla.com/screens/kde.png' -source=("https://github.com/QupZilla/QupZilla/tarball/master/QupZilla-qupzilla-${pkgver}.tar.gz" +source=("https://github.com/QupZilla/qupzilla/releases/download/v${pkgver}/${_pkgname}-${pkgver}.tar.xz" '0001-branded-speeddial.patch' 'start-white.png') -sha1sums=('54f760f18880f9b453e12152a425a9c7449efd1d' +sha1sums=('6a4613d6df5cfabe949e3a14ec8a5294005c1a78' '7ae942d114016e5971caffd8a5cef8e20495f127' '6ec67993bda3054d4210cc08177b124f873774e3') prepare() { msg 'Applying browserUI patch...' - cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}/src/lib/app/" + cd ${srcdir}/${_pkgname}-${pkgver}/src/lib/app/ sed -e 's|"qupzilla:start"|"https://chakraos.org/?welcome"|' \ -e 's|"showStatusBar", true|"showStatusBar", false|' \ -e 's|"showMenubar", true|"showMenubar", false|g' -i browserwindow.cpp - cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}/src/lib/plugins/" + cd ${srcdir}/${_pkgname}-${pkgver}/src/lib/plugins/ sed -e 's|"background", QString()|"file:///usr/share/pixmaps/start-white.png", QString()|' \ -e 's|"backsize", "auto"|"backsize", "contain"|' -i speeddial.cpp - #patch -p4 -i ${srcdir}/0001-branded-speeddial.patch + patch -p4 -i ${srcdir}/0001-branded-speeddial.patch msg 'Applying preference patch' - cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}/src/lib/preferences/" + cd ${srcdir}/${_pkgname}-${pkgver}/src/lib/preferences/ sed -e 's|"homepage", QUrl(QSL("qupzilla:start"))|"homepage", QUrl(QSL("https://chakraos.org/?welcome"))|' \ -e 's|"showStatusBar", true|"showStatusBar", false|g' -i preferences.cpp msg 'Applying search engine patch...' - cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}/src/lib/opensearch/" + cd ${srcdir}/${_pkgname}-${pkgver}/src/lib/opensearch/ sed 's,\?q=\%s\&t=qupzilla,\?q=\%s\&t=chakra,g' -i searchenginesmanager.cpp } @@ -49,16 +48,15 @@ build() { export USE_WEBGL="true" export KDE_INTEGRATION="true" export ENABLE_OPACITY_EFFECT="true" - #export NO_X11="true" - cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}" + cd "${srcdir}/${_pkgname}-${pkgver}/" /usr/lib/qt5/bin/qmake make } -package() { - cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}" +package_qupzilla() { + cd "${srcdir}/${_pkgname}-${pkgver}" make INSTALL_ROOT="${pkgdir}" install install -Dm 644 "${srcdir}/start-white.png" "${pkgdir}/usr/share/pixmaps/start-white.png" -} +} diff --git a/qupzilla/PKGBUILD_webengine b/qupzilla/PKGBUILD_webengine new file mode 100644 index 000000000..b16251b2c --- /dev/null +++ b/qupzilla/PKGBUILD_webengine @@ -0,0 +1,64 @@ +# Maintainer: Bruce Liu + +_pkgname=QupZilla +pkgname='qupzilla' +pkgver=1.9.90 +_commit=a16c21b +pkgrel=1 +pkgdesc="A very fast open source browser based on WebKit core" +url="http://www.qupzilla.com" +arch=('x86_64') +license=('GPL3') +makedepends=('qt5-tools' 'kwallet') +depends=('qt5-webengine' 'qt5-script') +optdepends=('bash-completion: bash completion support' + 'kwallet: kf5 kwallet integration') +provides=('qupzilla-qt5') +conflicts=('qupzilla-qt5') +replaces=('qupzilla-qt5') +install=${pkgname}.install +categories=('network') +screenshot='http://www.qupzilla.com/screens/kde.png' +source=("https://github.com/QupZilla/QupZilla/tarball/master/QupZilla-qupzilla-${pkgver}.tar.gz" + '0001-branded-speeddial.patch' + 'start-white.png') +sha1sums=('54f760f18880f9b453e12152a425a9c7449efd1d' + '7ae942d114016e5971caffd8a5cef8e20495f127' + '6ec67993bda3054d4210cc08177b124f873774e3') + +prepare() { + msg 'Applying browserUI patch...' + cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}/src/lib/app/" + sed -e 's|"qupzilla:start"|"https://chakraos.org/?welcome"|' \ + -e 's|"showStatusBar", true|"showStatusBar", false|' \ + -e 's|"showMenubar", true|"showMenubar", false|g' -i browserwindow.cpp + cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}/src/lib/plugins/" + sed -e 's|"background", QString()|"file:///usr/share/pixmaps/start-white.png", QString()|' \ + -e 's|"backsize", "auto"|"backsize", "contain"|' -i speeddial.cpp + #patch -p4 -i ${srcdir}/0001-branded-speeddial.patch + msg 'Applying preference patch' + cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}/src/lib/preferences/" + sed -e 's|"homepage", QUrl(QSL("qupzilla:start"))|"homepage", QUrl(QSL("https://chakraos.org/?welcome"))|' \ + -e 's|"showStatusBar", true|"showStatusBar", false|g' -i preferences.cpp + msg 'Applying search engine patch...' + cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}/src/lib/opensearch/" + sed 's,\?q=\%s\&t=qupzilla,\?q=\%s\&t=chakra,g' -i searchenginesmanager.cpp +} + +build() { + export USE_WEBGL="true" + export KDE_INTEGRATION="true" + export ENABLE_OPACITY_EFFECT="true" + #export NO_X11="true" + + cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}" + /usr/lib/qt5/bin/qmake + make + +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}" + make INSTALL_ROOT="${pkgdir}" install + install -Dm 644 "${srcdir}/start-white.png" "${pkgdir}/usr/share/pixmaps/start-white.png" +}