commit: c2463a05edd2dc97b3805022bfefbbb970fbafbd Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 28 16:02:07 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Nov 28 16:04:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2463a05
net-im/kadu: Remove last-rited package Closes: https://bugs.gentoo.org/737936 Closes: https://bugs.gentoo.org/750770 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-im/kadu/Manifest | 1 - net-im/kadu/files/kadu-4.3-compilation.patch | 23 ---- .../kadu/files/kadu-4.3-do-not-force-ccache.patch | 17 --- ...adu-4.3-find-x11-with-newer-cmake-modules.patch | 48 ------- net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch | 12 -- net-im/kadu/files/kadu-4.3-gcc7.patch | 10 -- net-im/kadu/kadu-4.3-r2.ebuild | 150 --------------------- net-im/kadu/metadata.xml | 15 --- profiles/package.mask | 5 - 9 files changed, 281 deletions(-) diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest deleted file mode 100644 index 01f168c5213..00000000000 --- a/net-im/kadu/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9 diff --git a/net-im/kadu/files/kadu-4.3-compilation.patch b/net-im/kadu/files/kadu-4.3-compilation.patch deleted file mode 100644 index b9cd0c58288..00000000000 --- a/net-im/kadu/files/kadu-4.3-compilation.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ruN kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp kadu-my/kadu-core/gui/widgets/avatar-painter.cpp ---- kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp 2017-01-24 22:36:21.000000000 +0100 -+++ kadu-my/kadu-core/gui/widgets/avatar-painter.cpp 2020-10-22 23:57:41.486490926 +0200 -@@ -22,6 +22,7 @@ - - #include <QtCore/QModelIndex> - #include <QtGui/QPainter> -+#include <QtGui/QPainterPath> - #include <QtGui/QPixmap> - #include <QtGui/QPixmapCache> - #include <QtWidgets/QStyleOptionViewItem> -diff -ruN kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp kadu-my/kadu-core/plugin/state/plugin-state.test.cpp ---- kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp 2017-01-24 22:36:21.000000000 +0100 -+++ kadu-my/kadu-core/plugin/state/plugin-state.test.cpp 2020-10-23 00:06:51.167189202 +0200 -@@ -34,7 +34,7 @@ - - void PluginStateTest::newTest() - { -- QCOMPARE(pluginStateToString(PluginState::New), {}); -+ QCOMPARE(pluginStateToString(PluginState::New), QString{}); - QCOMPARE(stringToPluginState(""), PluginState::New); - QCOMPARE(stringToPluginState("New"), PluginState::New); - QCOMPARE(stringToPluginState("Invalid"), PluginState::New); diff --git a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch deleted file mode 100644 index 2511f3c42b9..00000000000 --- a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ruN kadu-4.3/CMakeLists.txt my/CMakeLists.txt ---- kadu-4.3/CMakeLists.txt 2017-01-24 22:36:21.000000000 +0100 -+++ my/CMakeLists.txt 2017-11-03 03:00:07.005162047 +0100 -@@ -75,13 +75,6 @@ - endif () - endif () - --## CCache is cool stuff to improve compilation time --find_program (CCACHE_FOUND ccache) --if (CCACHE_FOUND) -- set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) -- set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) --endif (CCACHE_FOUND) -- - # Look above, DEBUG_ENABLED is always enabled in Debug configuration. - # Enable it in all configurations when ENABLE_DEVELOPER_BUILD is on. - if (ENABLE_DEVELOPER_BUILD) diff --git a/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch b/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch deleted file mode 100644 index ec44a0be7f5..00000000000 --- a/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ruN kadu-4.3/kadu-core/CMakeLists.txt my/kadu-core/CMakeLists.txt ---- kadu-4.3/kadu-core/CMakeLists.txt 2017-01-24 22:36:21.000000000 +0100 -+++ my/kadu-core/CMakeLists.txt 2019-11-22 02:05:51.381540018 +0100 -@@ -111,7 +111,7 @@ - list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES}) - - if (UNIX AND NOT APPLE) -- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes) -+ find_package (X11 REQUIRED COMPONENTS Xutil Xfixes) - if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND) - message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}") - else () -diff -ruN kadu-4.3/plugins/idle/CMakeLists.txt my/plugins/idle/CMakeLists.txt ---- kadu-4.3/plugins/idle/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100 -+++ my/plugins/idle/CMakeLists.txt 2019-11-22 02:06:57.503381610 +0100 -@@ -15,7 +15,7 @@ - ) - - if (UNIX AND NOT APPLE) -- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver) -+ find_package (X11 REQUIRED COMPONENTS Xutil Xscreensaver) - if (X11_Xscreensaver_FOUND) - message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}") - else () -diff -ruN kadu-4.3/plugins/pcspeaker/CMakeLists.txt my/plugins/pcspeaker/CMakeLists.txt ---- kadu-4.3/plugins/pcspeaker/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100 -+++ my/plugins/pcspeaker/CMakeLists.txt 2019-11-22 02:07:45.315719788 +0100 -@@ -15,7 +15,7 @@ - set (LIBRARIES "") - - if (UNIX AND NOT APPLE) -- find_package (X11 REQUIRED COMPONENTS X11) -+ find_package (X11 REQUIRED) - if (NOT X11_FOUND) - message (SEND_ERROR "Could NOT find X11") - endif () -diff -ruN kadu-4.3/plugins/screenshot/CMakeLists.txt my/plugins/screenshot/CMakeLists.txt ---- kadu-4.3/plugins/screenshot/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100 -+++ my/plugins/screenshot/CMakeLists.txt 2019-11-22 02:07:54.323972436 +0100 -@@ -30,7 +30,7 @@ - - if (UNIX AND NOT APPLE) - set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras) -- find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape) -+ find_package (X11 REQUIRED COMPONENTS Xext Xshape) - if (X11_Xshape_FOUND) - message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}") - else () diff --git a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch deleted file mode 100644 index bb171af5f41..00000000000 --- a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN kadu-4.3/cmake/KaduMacros.cmake my/cmake/KaduMacros.cmake ---- kadu-4.3/cmake/KaduMacros.cmake 2017-01-24 22:36:21.000000000 +0100 -+++ my/cmake/KaduMacros.cmake 2017-11-03 03:24:17.827054622 +0100 -@@ -221,7 +221,7 @@ - - if (NOT WIN32) - set_target_properties (${KADU_PLUGIN_NAME} PROPERTIES -- INSTALL_RPATH "${KADU_INSTALL_LIB_DIR}/kadu" -+ INSTALL_RPATH "${KADU_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}/kadu" - BUILD_WITH_INSTALL_RPATH TRUE - ) - endif () diff --git a/net-im/kadu/files/kadu-4.3-gcc7.patch b/net-im/kadu/files/kadu-4.3-gcc7.patch deleted file mode 100644 index 097157f98c7..00000000000 --- a/net-im/kadu/files/kadu-4.3-gcc7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h -+++ b/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h -@@ -20,6 +20,7 @@ - #pragma once - - #include <QtCore/QObject> -+#include <functional> - #include <map> - #include <set> - diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild deleted file mode 100644 index d2e585826dd..00000000000 --- a/net-im/kadu/kadu-4.3-r2.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils flag-o-matic gnome2-utils virtualx - -MY_P="${P/_/-}" - -DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client" -HOMEPAGE="http://www.kadu.net"; -SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"; - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -SLOT="0" -IUSE="+gadu mpd otr sdk speech spell xmpp" -REQUIRED_USE=" - || ( - gadu - xmpp - ) -" -COMMON_DEPEND=" - >=app-arch/libarchive-2.6[lzma] - >=dev-libs/injeqt-1.1.0 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXext - x11-libs/libXScrnSaver - gadu? ( >=net-libs/libgadu-1.12.2[threads] ) - mpd? ( media-libs/libmpdclient ) - otr? ( - >=dev-libs/libgcrypt-1.2.2:0 - >=net-libs/libotr-4.1.0 - ) - spell? ( app-text/enchant:0 ) - xmpp? ( - net-dns/libidn:* - >=net-libs/qxmpp-0.9.3-r1 - sys-libs/zlib - ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - speech? ( app-accessibility/powiedz ) -" - -PLUGINS=' -antistring -auto_hide -autoaway -autoresponder -autostatus -cenzor -chat_notify -config_wizard -docking -docking_notify -emoticons -exec_notify -ext_sound -filedesc -firewall -freedesktop_notify -hints -history -idle -imagelink -last_seen -mediaplayer -mprisplayer_mediaplayer -pcspeaker -screenshot -simpleview -single_window -sms -sound -sql_history -tabs -word_fix -' - -PATCHES=( - "${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch" - "${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch" - "${FILESDIR}/${PN}-4.3-gcc7.patch" - "${FILESDIR}/${PN}-4.3-find-x11-with-newer-cmake-modules.patch" - "${FILESDIR}/${PN}-4.3-compilation.patch" -) - -src_configure() { - # Filter out dangerous flags - filter-flags -fno-rtti - strip-unsupported-flags - - # Ensure -DQT_NO_DEBUG is added - append-cppflags -DQT_NO_DEBUG - - # Plugin selection - use gadu && PLUGINS+=' gadu_protocol' - use mpd && PLUGINS+=' mpd_mediaplayer' - use otr && PLUGINS+=' encryption_otr' - use speech && PLUGINS+=' speech' - use spell && PLUGINS+=' spellchecker' - use xmpp && PLUGINS+=' jabber_protocol' - - # Configure package - local mycmakeargs=( - -DCOMPILE_PLUGINS="${PLUGINS}" - -DENABLE_TESTS=OFF - -DNETWORK_IMPLEMENTATION="Qt" - -DINSTALL_SDK=$(usex sdk) - -DWITH_ENCHANT=$(usex spell) - ) - unset PLUGINS - - cmake-utils_src_configure -} - -src_test() { - virtx cmake-utils_src_test -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml deleted file mode 100644 index 6bf7f337086..00000000000 --- a/net-im/kadu/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Maciej Mrozowski</name> - </maintainer> - <use> - <flag name="gadu">Enables Gadu communication protocol</flag> - <flag name="mpd">Enables Music Player Daemon support</flag> - <flag name="otr">Enable char encryption via OTR library</flag> - <flag name="sdk">Install Kadu SDK (cmake module, API headers)</flag> - <flag name="speech">Enables speech module</flag> - </use> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index b82b580772f..1754dded6f3 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -477,11 +477,6 @@ gnome-base/orbit # Removal in 30 days. Bug #635592. games-strategy/asc -# Maciej Mrozowski <[email protected]> (2020-10-23) -# Crashes at startup - bug #750770, dead upstream - bug #737936 -# Removal in 30 days. -~net-im/kadu-4.3 - # David Seifert <[email protected]> (2020-10-21) # No releases in over 3 years, no more revdeps in tree # upstream mostly unresponsive to requests for proper
