diff --git a/srcpkgs/qupzilla1/patches/musl-execinfo.patch b/srcpkgs/qupzilla1/patches/musl-execinfo.patch deleted file mode 100644 index b9ace1257b4..00000000000 --- a/srcpkgs/qupzilla1/patches/musl-execinfo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/main/main.cpp 2015-01-26 15:26:15.000000000 +0100 -+++ src/main/main.cpp 2015-07-06 09:35:37.741814165 +0200 -@@ -22,7 +22,7 @@ - #include // For QT_REQUIRE_VERSION - #include - --#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__) -+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(__FreeBSD__) || defined(__HAIKU__) - #include - #include - -@@ -166,7 +166,7 @@ - QApplication::setGraphicsSystem(QSL("raster")); - #endif - --#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) -+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(__FreeBSD__) - signal(SIGSEGV, qupzilla_signal_handler); - #endif - diff --git a/srcpkgs/qupzilla1/patches/qt-5.10.patch b/srcpkgs/qupzilla1/patches/qt-5.10.patch deleted file mode 100644 index b1d054378f3..00000000000 --- a/srcpkgs/qupzilla1/patches/qt-5.10.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/sweord/qupzilla/commit/5bdd369c9514d481cf3d0761a383e087cead97c9 - ---- src/lib/webtab/searchtoolbar.ui -+++ src/lib/webtab/searchtoolbar.ui -@@ -64,9 +64,6 @@ - 0 - - -- -- Ctrl+Shift+G -- - - true - -@@ -80,9 +77,6 @@ - 0 - - -- -- Ctrl+G -- - - true - ---- src/lib/webtab/searchtoolbar.cpp.orig -+++ src/lib/webtab/searchtoolbar.cpp -@@ -35,7 +35,9 @@ - - ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton)); - ui->next->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowDown)); -+ ui->next->setShortcut(QKeySequence("Ctrl+G")); - ui->previous->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowUp)); -+ ui->previous->setShortcut(QKeySequence("Ctrl+Shift+G")); - - connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide())); - connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(findNext())); diff --git a/srcpkgs/qupzilla1/patches/qt-5.11.patch b/srcpkgs/qupzilla1/patches/qt-5.11.patch deleted file mode 100644 index 0b083aa073f..00000000000 --- a/srcpkgs/qupzilla1/patches/qt-5.11.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/adblock/adblockmanager.cpp 2015-11-11 16:13:24.000000000 +0100 -+++ src/lib/adblock/adblockmanager.cpp 2019-05-14 15:22:20.780352476 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - //#define ADBLOCK_DEBUG - diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template deleted file mode 100644 index e72f0f95897..00000000000 --- a/srcpkgs/qupzilla1/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template file for 'qupzilla1' -pkgname=qupzilla1 -version=1.8.9 -revision=16 -wrksrc="QupZilla-${version}" -build_style=qmake -hostmakedepends="pkg-config" -makedepends="qt5-script-devel qt5-tools-devel qt5-webkit-devel - qt5-x11extras-devel hunspell-devel" -depends="qt5-plugin-sqlite" -short_desc="Lightweight multiplatform browser" -maintainer="Jürgen Buchmüller " -license="GPL-3.0-or-later" -homepage="https://qupzilla.com/" -distfiles="https://github.com/QupZilla/qupzilla/releases/download/v${version}/QupZilla-${version}.tar.xz" -checksum=620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac -conflicts="qupzilla>=0" - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools" - hostmakedepends+=" qt5-script-devel" - hostmakedepends+=" qt5-tools-devel" - hostmakedepends+=" qt5-webkit-devel" - hostmakedepends+=" qt5-x11extras-devel" -fi - -do_build() { - # Avoid disable_parallel_build=yes by re-running make once - make ${makejobs} ${make_build_args} ${make_build_target} \ - CC="$CC" CXX="$CXX" LINK="$CXX" || \ - make ${makejobs} ${make_build_args} ${make_build_target} \ - CC="$CC" CXX="$CXX" LINK="$CXX" -} diff --git a/srcpkgs/qupzilla1/update b/srcpkgs/qupzilla1/update deleted file mode 100644 index 19da2736875..00000000000 --- a/srcpkgs/qupzilla1/update +++ /dev/null @@ -1,2 +0,0 @@ -site=http://github.com/QupZilla/qupzilla/tags/ -pattern='\K1\.[89]+\.[\d]+' diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index c4dc2785068..7091b354b4c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=29 +revision=30 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -200,6 +200,7 @@ replaces=" python3-pyPEG2<=2.15.2_7 qimageblitz<=0.0.6_4 qucs<=0.0.19_2 + qupzilla1<=1.8.9_16 qt<=4.8.7_29 qt-designer<=4.8.7_29 qt-designer-devel<=4.8.7_29