revert qupzilla to use webkit, webengine is not ready, like the QTBUG-43008 bug prevent dragÂ&drop on html pages. Enable it again when Qt5.7 is available

This commit is contained in:
AlmAck 2016-03-22 21:52:04 +01:00
parent a300564b6d
commit d9e4489ed1
2 changed files with 78 additions and 16 deletions

View File

@ -2,15 +2,14 @@
_pkgname=QupZilla _pkgname=QupZilla
pkgname='qupzilla' pkgname='qupzilla'
pkgver=1.9.90 pkgver=1.8.9
_commit=a16c21b pkgrel=5
pkgrel=1
pkgdesc="A very fast open source browser based on WebKit core" pkgdesc="A very fast open source browser based on WebKit core"
url="http://www.qupzilla.com" url="http://www.qupzilla.com"
arch=('x86_64') arch=('x86_64')
license=('GPL3') license=('GPL3')
makedepends=('qt5-tools' 'kwallet') makedepends=('qt5-tools' 'kwallet')
depends=('qt5-webengine' 'qt5-script') depends=('qt5-webkit' 'qt5-script')
optdepends=('bash-completion: bash completion support' optdepends=('bash-completion: bash completion support'
'kwallet: kf5 kwallet integration') 'kwallet: kf5 kwallet integration')
provides=('qupzilla-qt5') provides=('qupzilla-qt5')
@ -19,29 +18,29 @@ replaces=('qupzilla-qt5')
install=${pkgname}.install install=${pkgname}.install
categories=('network') categories=('network')
screenshot='http://www.qupzilla.com/screens/kde.png' 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' '0001-branded-speeddial.patch'
'start-white.png') 'start-white.png')
sha1sums=('54f760f18880f9b453e12152a425a9c7449efd1d' sha1sums=('6a4613d6df5cfabe949e3a14ec8a5294005c1a78'
'7ae942d114016e5971caffd8a5cef8e20495f127' '7ae942d114016e5971caffd8a5cef8e20495f127'
'6ec67993bda3054d4210cc08177b124f873774e3') '6ec67993bda3054d4210cc08177b124f873774e3')
prepare() { prepare() {
msg 'Applying browserUI patch...' 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"|' \ sed -e 's|"qupzilla:start"|"https://chakraos.org/?welcome"|' \
-e 's|"showStatusBar", true|"showStatusBar", false|' \ -e 's|"showStatusBar", true|"showStatusBar", false|' \
-e 's|"showMenubar", true|"showMenubar", false|g' -i browserwindow.cpp -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()|' \ sed -e 's|"background", QString()|"file:///usr/share/pixmaps/start-white.png", QString()|' \
-e 's|"backsize", "auto"|"backsize", "contain"|' -i speeddial.cpp -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' 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"))|' \ 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 -e 's|"showStatusBar", true|"showStatusBar", false|g' -i preferences.cpp
msg 'Applying search engine patch...' 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 sed 's,\?q=\%s\&t=qupzilla,\?q=\%s\&t=chakra,g' -i searchenginesmanager.cpp
} }
@ -49,16 +48,15 @@ build() {
export USE_WEBGL="true" export USE_WEBGL="true"
export KDE_INTEGRATION="true" export KDE_INTEGRATION="true"
export ENABLE_OPACITY_EFFECT="true" export ENABLE_OPACITY_EFFECT="true"
#export NO_X11="true"
cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}" cd "${srcdir}/${_pkgname}-${pkgver}/"
/usr/lib/qt5/bin/qmake /usr/lib/qt5/bin/qmake
make make
} }
package() { package_qupzilla() {
cd "${srcdir}/${_pkgname}-${pkgname}-${_commit}" cd "${srcdir}/${_pkgname}-${pkgver}"
make INSTALL_ROOT="${pkgdir}" install make INSTALL_ROOT="${pkgdir}" install
install -Dm 644 "${srcdir}/start-white.png" "${pkgdir}/usr/share/pixmaps/start-white.png" install -Dm 644 "${srcdir}/start-white.png" "${pkgdir}/usr/share/pixmaps/start-white.png"
} }

View File

@ -0,0 +1,64 @@
# Maintainer: Bruce Liu <brli@users.sourceforge.net>
_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"
}