commit: e4666d7d4d50b8e017b2684578d67f4dc81679c7 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Dec 16 22:45:01 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Dec 16 23:03:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4666d7d
app-text/goldendict: Remove last-rited pkg Closes: https://bugs.gentoo.org/653100 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-text/goldendict/Manifest | 1 - .../files/goldendict-1.5.0-ffmpeg-4.patch | 167 --------------------- .../files/goldendict-1.5.0-qt-5.11.patch | 56 ------- ...endict-1.5.0-qtsingleapplication-unbundle.patch | 18 --- app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild | 93 ------------ app-text/goldendict/metadata.xml | 12 -- profiles/package.mask | 5 - 7 files changed, 352 deletions(-) diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest deleted file mode 100644 index 7a2da33f033..00000000000 --- a/app-text/goldendict/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST goldendict-1.5.0_rc2.tar.gz 19413751 BLAKE2B 17fb0140e6ce392800a05d36a41f2a42c813990eaecabf55f765d5583118be694e66c5438b90e46853070a782086422b533b0f653461dd81cecd23f2deec40b7 SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362 diff --git a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch deleted file mode 100644 index 6e6d03675a4..00000000000 --- a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001 -From: Abs62 <[email protected]> -Date: Fri, 30 Mar 2018 22:53:24 +0300 -Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978) - ---- - ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 62 insertions(+), 6 deletions(-) - -diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc -index ed1172bd..56e8f788 100644 ---- a/ffmpegaudio.cc -+++ b/ffmpegaudio.cc -@@ -91,6 +91,7 @@ struct DecoderContext - QByteArray audioData_; - QDataStream audioDataStream_; - AVFormatContext * formatContext_; -+ AVCodec * codec_; - AVCodecContext * codecContext_; - AVIOContext * avioContext_; - AVStream * audioStream_; -@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan - audioData_( audioData ), - audioDataStream_( audioData_ ), - formatContext_( NULL ), -+ codec_( NULL ), - codecContext_( NULL ), - avioContext_( NULL ), - audioStream_( NULL ), -@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString ) - return false; - } - -+#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 ) - unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE ); -+#else -+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE ); -+#endif - if ( !avioBuffer ) - { - errorString = QObject::tr( "av_malloc() failed." ); -@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString ) - // Find audio stream, use the first audio stream if available - for ( unsigned i = 0; i < formatContext_->nb_streams; i++ ) - { -+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 ) - if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO ) -+#else -+ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) -+#endif - { - audioStream_ = formatContext_->streams[i]; - break; -@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString ) - return false; - } - -+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 ) - codecContext_ = audioStream_->codec; -- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id ); -- if ( !codec ) -+ codec_ = avcodec_find_decoder( codecContext_->codec_id ); -+ if ( !codec_ ) - { - errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id ); - return false; - } -+#else -+ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id ); -+ if ( !codec_ ) -+ { -+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id ); -+ return false; -+ } -+ codecContext_ = avcodec_alloc_context3( codec_ ); -+ if ( !codecContext_ ) -+ { -+ errorString = QObject::tr( "avcodec_alloc_context3() failed." ); -+ return false; -+ } -+ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar ); -+#endif - -- ret = avcodec_open2( codecContext_, codec, NULL ); -+ ret = avcodec_open2( codecContext_, codec_, NULL ); - if ( ret < 0 ) - { - errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) ); - return false; - } - -- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name, -+ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name, - codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) ); - return true; - } -@@ -252,10 +278,13 @@ void DecoderContext::closeCodec() - - // Closing a codec context without prior avcodec_open2() will result in - // a crash in ffmpeg -- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec ) -+ if ( audioStream_ && codecContext_ && codec_ ) - { - audioStream_->discard = AVDISCARD_ALL; -- avcodec_close( audioStream_->codec ); -+ avcodec_close( codecContext_ ); -+#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 ) -+ avcodec_free_context( &codecContext_ ); -+#endif - } - - avformat_close_input( &formatContext_ ); -@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString ) - if ( packet.stream_index == audioStream_->index ) - { - AVPacket pack = packet; -+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 ) - int gotFrame = 0; - do - { -@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString ) - pack.data += len; - } - while( pack.size > 0 ); -+#else -+ int ret = avcodec_send_packet( codecContext_, &pack ); -+ /* read all the output frames (in general there may be any number of them) */ -+ while( ret >= 0 ) -+ { -+ ret = avcodec_receive_frame( codecContext_, frame); -+ -+ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 ) -+ break; -+ -+ playFrame( frame ); -+ } -+#endif - } - // av_free_packet() must be called after each call to av_read_frame() - #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 ) -@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString ) - #endif - } - -+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 ) - if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) && - codecContext_->codec->capabilities & CODEC_CAP_DELAY ) - { -@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString ) - playFrame( frame ); - } - } -+#else -+ /* flush the decoder */ -+ av_init_packet( &packet ); -+ int ret = avcodec_send_packet(codecContext_, &packet ); -+ while( ret >= 0 ) -+ { -+ ret = avcodec_receive_frame(codecContext_, frame); -+ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 ) -+ break; -+ playFrame( frame ); -+ } -+#endif - - #if LIBAVCODEC_VERSION_MAJOR < 54 - av_free( frame ); diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch deleted file mode 100644 index 247ec52931b..00000000000 --- a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001 -From: Abs62 <[email protected]> -Date: Tue, 10 Apr 2018 18:44:43 +0300 -Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991) - ---- - fulltextsearch.hh | 1 + - initializing.cc | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/fulltextsearch.hh b/fulltextsearch.hh -index da7e2943..adf9619f 100644 ---- a/fulltextsearch.hh -+++ b/fulltextsearch.hh -@@ -6,6 +6,7 @@ - #include <QRegExp> - #include <QAbstractListModel> - #include <QList> -+#include <QAction> - - #include "dictionary.hh" - #include "ui_fulltextsearch.h" -diff --git a/initializing.cc b/initializing.cc -index 0db6909b..59e605d6 100644 ---- a/initializing.cc -+++ b/initializing.cc -@@ -1,6 +1,7 @@ - /* This file is (c) 2008-2012 Konstantin Isakov <[email protected]> - * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */ - -+#include <QIcon> - #include "initializing.hh" - #include <QCloseEvent> - -From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001 -From: Perfect Gentleman <[email protected]> -Date: Wed, 11 Apr 2018 00:04:12 +0700 -Subject: [PATCH] Update groups_widgets.hh - -fixes https://github.com/goldendict/goldendict/issues/991 ---- - groups_widgets.hh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/groups_widgets.hh b/groups_widgets.hh -index ce442fa2..2064e3bb 100644 ---- a/groups_widgets.hh -+++ b/groups_widgets.hh -@@ -8,6 +8,7 @@ - - #include <vector> - -+#include <QAction> - #include <QListWidget> - #include <QSortFilterProxyModel> - diff --git a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch deleted file mode 100644 index 01fdb3b2a29..00000000000 --- a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/goldendict.pro -+++ b/goldendict.pro -@@ -36,7 +36,8 @@ - QT += sql - CONFIG += exceptions \ - rtti \ -- stl -+ stl \ -+ qtsingleapplication - OBJECTS_DIR = build - UI_DIR = build - MOC_DIR = build -@@ -632,5 +633,3 @@ - TS_OUT ~= s/.ts/.qm/g - PRE_TARGETDEPS += $$TS_OUT - --include( qtsingleapplication/src/qtsingleapplication.pri ) -- diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild deleted file mode 100644 index d8de7892396..00000000000 --- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=${PV^^} -MY_PV=${MY_PV/_/-} -inherit desktop qmake-utils - -DESCRIPTION="Feature-rich dictionary lookup program" -HOMEPAGE="http://goldendict.org/"; -SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug ffmpeg " - -RDEPEND=" - app-arch/bzip2 - >=app-text/hunspell-1.2:= - dev-libs/eb - dev-libs/lzo - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qthelp:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[qt5(+),X] - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - media-libs/libvorbis - media-libs/tiff:0 - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXtst - ffmpeg? ( - media-libs/libao - media-video/ffmpeg:0= - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" - "${FILESDIR}/${PN}-1.5.0-qt-5.11.patch" - "${FILESDIR}/${PN}-1.5.0-ffmpeg-4.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - default - - # disable git - sed -i \ - -e '/git describe/s/^/#/' \ - ${PN}.pro || die - - # fix installation path - sed -i \ - -e '/PREFIX = /s:/usr/local:/usr:' \ - ${PN}.pro || die - - # add trailing semicolon - sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die -} - -src_configure() { - local myconf=() - use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 ) - - eqmake5 "${myconf[@]}" -} - -src_install() { - dobin ${PN} - domenu redist/${PN}.desktop - doicon redist/icons/${PN}.png - - insinto /usr/share/apps/${PN}/locale - doins locale/*.qm - - insinto /usr/share/${PN}/help - doins help/*.qch -} diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml deleted file mode 100644 index 54e5ea46ce6..00000000000 --- a/app-text/goldendict/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Qt Project</name> - </maintainer> - <upstream> - <remote-id type="github">goldendict/goldendict</remote-id> - <remote-id type="sourceforge">goldendict</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 1e297b56875..8f8722297a0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -365,11 +365,6 @@ dev-util/eric # Removal in 30 days. net-news/quiterss -# Andreas Sturmlechner <[email protected]> (2020-11-17) -# Depends on deprecated QtWebKit, upstream did not make a release in 10 years -# (current RC2 is from 2016). Bugs #653100 and #734880. Removal in 30 days. -app-text/goldendict - # Jonas Stein <[email protected]> (2020-11-12) # Adobe will stop distributing Flash Player after 2020-12-31. # Masked for removal after 2020-12-31
