From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- app-doc/zeal/Manifest | 7 +- ...s-enforce-static-linking-of-internal-libs.patch | 81 ---------------------- app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch | 21 ------ ...al-0.6.1_p20200815-fix-sidebar-static-lib.patch | 25 +++++++ app-doc/zeal/zeal-0.6.1.ebuild | 55 --------------- app-doc/zeal/zeal-0.6.1_p20200815.ebuild | 54 +++++++++++++++ 6 files changed, 82 insertions(+), 161 deletions(-) delete mode 100644 app-doc/zeal/files/0001-libs-enforce-static-linking-of-internal-libs.patch delete mode 100644 app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch create mode 100644 app-doc/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch delete mode 100644 app-doc/zeal/zeal-0.6.1.ebuild create mode 100644 app-doc/zeal/zeal-0.6.1_p20200815.ebuild (limited to 'app-doc/zeal') diff --git a/app-doc/zeal/Manifest b/app-doc/zeal/Manifest index e97cddebf71f..2a52c7c1d94c 100644 --- a/app-doc/zeal/Manifest +++ b/app-doc/zeal/Manifest @@ -1,6 +1,5 @@ -AUX 0001-libs-enforce-static-linking-of-internal-libs.patch 2648 BLAKE2B e4293669e6744dab5d3eec08fbedc4b99474d74a54bbcaf5765f66e5360006b0ed48c0f3eb8dd1cf255a2f12740401a4cd2e57d886d71aa075b6830f1931b022 SHA512 f654f6df58ae04361efa8957c492c076e340623e8634dc95aae2a016f59d74f88b9fdfbf6b97197344c7d5767e33c79f0cee197fbc6bb383b14b494c2ba9c877 AUX 0002-settings-disable-checking-for-updates-by-default.patch 1080 BLAKE2B 07b40bdd13fe6e7a4efa24a17a1b734be50ec8e289c74278ae3f718c05388a4b36b064922798c4ec2e4f69e9dd49f3cd24d39c98adb0274914b28fcd42016a36 SHA512 bd5e7369bc5878df9c6dff093d710e73b8ed1a4e2c3a6927a26f5fbf97725fd695a90f197bf46d229b38a16c40e19308f8e058fd9819177c62cd7fbaae7e370d -AUX zeal-0.6.1-qt-5.15.patch 683 BLAKE2B dbb965ede1a2dcaa53826b9986ef9191aadd7ea39464280f7194913ef72295cb4e16579f2b1ff8440c1970897134a1f822d7133ee7dad2eea52813bbaa03b938 SHA512 6e4eac48fa1fc0239228fa32cdc317921d1283b60a9bc9202c6630ed0dd1ed25b7ead7527b09b1657154235ed25ebd8b226784bbd9970e72038676e08c37c68d -DIST zeal-0.6.1.tar.gz 1063963 BLAKE2B 72f38aac8275cea8da214962b568ff3f634c6c8499a73f506a6b63d947f87bb0b13bf6a0821d7803ccf09689744a79ebf8659ebe1d6ae07863662cb6a017c5ee SHA512 5b1a129980000c0fc8516e2c7d6c4a8de4adde7054ff8d9635e3be35441ad3ef0539746bbe1ca8abce7e6fb3d20c825b57661c3f8cd059ef1480db65ff81f3d9 -EBUILD zeal-0.6.1.ebuild 1097 BLAKE2B 6d17dc11a9c659dca5578bb88b0625cb05715d7652105525771f5e2118bf325d7b4e86e12c38394651dd42f78ec1b7e45b01cdbd28f043ce0bd7cfdb0c766260 SHA512 d48a38ba167819fe1cd1156407dac0cda4a70dc91cd8991267059c9376dca094bcb237629eef164df627041a7b58c4edc74907d8c0f5bfe580ce5841bc1eda61 +AUX zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch 742 BLAKE2B 6c104f3f9708a53e2d19699f38a28f0298808014f0be49aad14f2aee58636528be6d2174ea3d68065cb76f1c8b27091a6cd45d259f2e1418a59ad1e63ea9d1e0 SHA512 0d1e7a7b61670ced6b873537a1bd5a73e8c84572bfec0692477c7d59803b93a9b79fb42bc90f368284acc66583164d0a0482ecd34cb02617a82b6c402dbfd46a +DIST zeal-0.6.1_p20200815.tar.gz 1180048 BLAKE2B 22a6ee7985516f2204de0603374944c101fa77339a6c83b8a33633fa51e25890f39d672f3d804adb8c41b9ffc2ad7971ce16f90dacb1160f1868ed3f8768aad2 SHA512 fa08c88a40f2f75847db4950c2b027262304bb8b63b95d497786fa2c3a90aa0c488fc3ebe494afe70353a2dd93a181bf2d8fa752a7241e572045c6728ea99f2d +EBUILD zeal-0.6.1_p20200815.ebuild 1141 BLAKE2B 1e3bf52a721656f38c21a0157933d5a584cf7be9268f4be6aa51e9cf75dc9f2e2238550a478f9b2d6d72dbb3ce27d24eab6de23bf76a7557603c79bd859624f9 SHA512 2ee1095e30cad8652cf42d1c7674854bb427b5701e80215d6b14cfa2fb9b071d5b4d8b79db6c6a880109204f4dc94accddfb5ead3f6b2dec8ea01b56f2a76a4d MISC metadata.xml 248 BLAKE2B 1aab3497019b5dbc0563a1c5d3b36895673a4e01b83c65f0bc6c59f155be25e3c9f1dfd6fc5043b237cdfae57a3525c948683514752c27eb5240f94a978f2177 SHA512 437593c3c8e8a5de6bb06fc44ad03380f187808ec08c7dfdc478f3b1d815ca6b79fdc818473c6d3a8f909714b6d2f51a5bb63c9f5f7e54501d99a5baa30b6a21 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 137959b7ca28..000000000000 --- 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 -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 ---- - 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 45459b8c3678..000000000000 --- 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 -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 - #include - #include -+#include - #include - - using namespace Zeal::WidgetUi; diff --git a/app-doc/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch b/app-doc/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch new file mode 100644 index 000000000000..0a5a8f69be2d --- /dev/null +++ b/app-doc/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch @@ -0,0 +1,25 @@ +From b48ee895ce7fc1db1dce20dac5115ec4c60f75fa Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 18 Aug 2020 15:03:59 +0200 +Subject: [PATCH] sidebar: Add missing STATIC keyword (similar to #1085) + +Fixes unresolved soname dependency after install. + +Signed-off-by: Andreas Sturmlechner +--- + src/libs/sidebar/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libs/sidebar/CMakeLists.txt b/src/libs/sidebar/CMakeLists.txt +index 4332b8f..dc6be0e 100644 +--- a/src/libs/sidebar/CMakeLists.txt ++++ b/src/libs/sidebar/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_library(Sidebar ++add_library(Sidebar STATIC + container.cpp + proxyview.cpp + view.cpp +-- +2.28.0 + 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 6fe0106f71ea..000000000000 --- 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 -} diff --git a/app-doc/zeal/zeal-0.6.1_p20200815.ebuild b/app-doc/zeal/zeal-0.6.1_p20200815.ebuild new file mode 100644 index 000000000000..8eb1fa958270 --- /dev/null +++ b/app-doc/zeal/zeal-0.6.1_p20200815.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +COMMIT=994cc5f6b6bfffddd5faaaafdb4fed483c38188f +inherit cmake xdg-utils + +DESCRIPTION="Offline documentation browser inspired by Dash" +HOMEPAGE="https://zealdocs.org/" +SRC_URI="https://github.com/zealdocs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + app-arch/libarchive:= + dev-db/sqlite:3 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtwebchannel:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + kde-frameworks/extra-cmake-modules:5 + x11-libs/libX11 + x11-libs/libxcb:= + >=x11-libs/xcb-util-keysyms-0.3.9 +" +RDEPEND="${DEPEND} + x11-themes/hicolor-icon-theme +" + +S="${WORKDIR}/${PN}-${COMMIT}" + +PATCHES=( + "${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch" + "${FILESDIR}/${P}-fix-sidebar-static-lib.patch" +) + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} -- cgit v1.2.3