[gentoo-commits] repo/gentoo:master commit in: app-doc/zeal/files/, app-doc/zeal/

[Andreas Sturmlechner]

commit:     51445441811d370d4870454f8c8dd708f11602c2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 13:15:28 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 17:48:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51445441

app-doc/zeal: Drop 0.6.1

Closes: https://bugs.gentoo.org/709844
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-doc/zeal/Manifest                              |  1 -
 ...s-enforce-static-linking-of-internal-libs.patch | 81 ----------------------
 app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch        | 21 ------
 app-doc/zeal/zeal-0.6.1.ebuild                     | 55 ---------------
 4 files changed, 158 deletions(-)

diff --git a/app-doc/zeal/Manifest b/app-doc/zeal/Manifest
index 94dd8252864..ff4a3054c4a 100644
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@@ -1,2 +1 @@
-DIST zeal-0.6.1.tar.gz 1063963 BLAKE2B 72f38aac8275cea8da214962b568ff3f634c6c8499a73f506a6b63d947f87bb0b13bf6a0821d7803ccf09689744a79ebf8659ebe1d6ae07863662cb6a017c5ee SHA512 5b1a129980000c0fc8516e2c7d6c4a8de4adde7054ff8d9635e3be35441ad3ef0539746bbe1ca8abce7e6fb3d20c825b57661c3f8cd059ef1480db65ff81f3d9
 DIST zeal-0.6.1_p20200815.tar.gz 1180048 BLAKE2B 22a6ee7985516f2204de0603374944c101fa77339a6c83b8a33633fa51e25890f39d672f3d804adb8c41b9ffc2ad7971ce16f90dacb1160f1868ed3f8768aad2 SHA512 fa08c88a40f2f75847db4950c2b027262304bb8b63b95d497786fa2c3a90aa0c488fc3ebe494afe70353a2dd93a181bf2d8fa752a7241e572045c6728ea99f2d

diff --git a/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch b/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch
deleted file mode 100644
index 137959b7ca2..00000000000
--- a/app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From b08ff87378dab3e6255864d2749e17b71210e7bd Mon Sep 17 00:00:00 2001
-From: Henning Schild <henning@×××××××.de>
-Date: Sat, 9 Mar 2019 16:35:52 +0100
-Subject: [PATCH] libs: enforce static linking of internal libs
-
-Since the application binary is the only file installed and the libs are
-not used by anyone else, make sure they are always static. Otherwise
-cmake can make them shared and those shared libs will be missing after
-install.
-
-Signed-off-by: Henning Schild <henning@×××××××.de>
----
- src/libs/core/CMakeLists.txt                 | 2 +-
- src/libs/registry/CMakeLists.txt             | 2 +-
- src/libs/ui/CMakeLists.txt                   | 2 +-
- src/libs/ui/qxtglobalshortcut/CMakeLists.txt | 2 +-
- src/libs/util/CMakeLists.txt                 | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/libs/core/CMakeLists.txt b/src/libs/core/CMakeLists.txt
-index cd212bb..3bd7371 100644
---- a/src/libs/core/CMakeLists.txt
-+++ b/src/libs/core/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(Core
-+add_library(Core STATIC
-     application.cpp
-     applicationsingleton.cpp
-     extractor.cpp
-diff --git a/src/libs/registry/CMakeLists.txt b/src/libs/registry/CMakeLists.txt
-index 3372711..977919d 100644
---- a/src/libs/registry/CMakeLists.txt
-+++ b/src/libs/registry/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(Registry
-+add_library(Registry STATIC
-     cancellationtoken.h
-     docset.cpp
-     docsetmetadata.cpp
-diff --git a/src/libs/ui/CMakeLists.txt b/src/libs/ui/CMakeLists.txt
-index 1fe12ef..27a4877 100644
---- a/src/libs/ui/CMakeLists.txt
-+++ b/src/libs/ui/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(Ui_FORMS
-     settingsdialog.ui
- )
- 
--add_library(Ui
-+add_library(Ui STATIC
-     aboutdialog.cpp
-     docsetlistitemdelegate.cpp
-     docsetsdialog.cpp
-diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
-index 8b1b0ef..1776839 100644
---- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
-+++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
-@@ -19,7 +19,7 @@ elseif(WIN32)
-     )
- endif()
- 
--add_library(QxtGlobalShortcut ${QxtGlobalShortcut_SOURCES})
-+add_library(QxtGlobalShortcut STATIC ${QxtGlobalShortcut_SOURCES})
- 
- find_package(Qt5Gui REQUIRED)
- target_link_libraries(QxtGlobalShortcut Qt5::Gui)
-diff --git a/src/libs/util/CMakeLists.txt b/src/libs/util/CMakeLists.txt
-index d4ab871..ad0e9ec 100644
---- a/src/libs/util/CMakeLists.txt
-+++ b/src/libs/util/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # Nothing to moc here, so avoid empty build units.
- set(CMAKE_AUTOMOC OFF)
- 
--add_library(Util
-+add_library(Util STATIC
-     plist.cpp
-     sqlitedatabase.cpp
-     version.cpp
--- 
-2.19.2
-

diff --git a/app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch b/app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch
deleted file mode 100644
index 45459b8c367..00000000000
--- a/app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 064aaa05d6a3ba4ba3cf648199a3109aba2f41fe Mon Sep 17 00:00:00 2001
-From: Dmitry Atamanov <data-man@××××××××××××××××××××.com>
-Date: Sun, 26 Apr 2020 02:26:53 +0500
-Subject: [PATCH] fix(ui): fix compilation error with Qt 5.15 (#1218)
-
----
- src/libs/ui/searchitemdelegate.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libs/ui/searchitemdelegate.cpp b/src/libs/ui/searchitemdelegate.cpp
-index 464e4859..4a9c473b 100644
---- a/src/libs/ui/searchitemdelegate.cpp
-+++ b/src/libs/ui/searchitemdelegate.cpp
-@@ -27,6 +27,7 @@
- #include <QFontMetrics>
- #include <QHelpEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QToolTip>
- 
- using namespace Zeal::WidgetUi;

diff --git a/app-doc/zeal/zeal-0.6.1.ebuild b/app-doc/zeal/zeal-0.6.1.ebuild
deleted file mode 100644
index 6fe0106f71e..00000000000
--- a/app-doc/zeal/zeal-0.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Offline documentation browser inspired by Dash"
-HOMEPAGE="https://zealdocs.org/"
-SRC_URI="https://github.com/zealdocs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vanilla"
-
-DEPEND="
-	app-arch/libarchive
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/extra-cmake-modules:5
-	>=x11-libs/xcb-util-keysyms-0.3.9
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-libs-enforce-static-linking-of-internal-libs.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_prepare() {
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch" )
-	fi
-	cmake_src_prepare
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}