summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-21 13:19:48 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-21 17:24:50 +0100
commit12c019aeb89427b34cb79e86184719cc1c6031dc (patch)
tree17561ba6daa2627b217e1f780e31836393fd7f0d /kde-apps/gwenview
parentprofiles: Last-rite kde-apps/dolphin-plugins (diff)
downloadgentoo-12c019aeb89427b34cb79e86184719cc1c6031dc.tar.gz
gentoo-12c019aeb89427b34cb79e86184719cc1c6031dc.tar.bz2
gentoo-12c019aeb89427b34cb79e86184719cc1c6031dc.zip
kde-apps: Drop KDE Applications 18.08.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'kde-apps/gwenview')
-rw-r--r--kde-apps/gwenview/Manifest1
-rw-r--r--kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch160
-rw-r--r--kde-apps/gwenview/gwenview-18.08.3-r1.ebuild112
3 files changed, 0 insertions, 273 deletions
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 6853cfab4eaf..ae3c3d4ca6df 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,2 +1 @@
-DIST gwenview-18.08.3.tar.xz 6178192 BLAKE2B 0b25bdd64398f7ef1310598daad07374ca56383578fd67a8e36e348e78e1d818335fe4d630cc733e7a1eb13eaafca268426aea5afbb44195106742c50587c74d SHA512 0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce
DIST gwenview-18.12.3.tar.xz 5714316 BLAKE2B 911a1ab5950f63382fdda471bea5160241ce579a5dd9c925a0cdd6f729188a8d52a41653bc9a746d3f3a692f087bd22faaa815c824f4422cbaf640cbb0773d11 SHA512 4105ef3529170e7c92cbbdca4bfb31f0fa4220979ce808f86d23aac0a2fdd9f59d927f87a7909e2d1641defd97bd31e1142075f30d526c7d1b29e8afe314fd51
diff --git a/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch b/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
deleted file mode 100644
index bf66688a6b91..000000000000
--- a/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From a00eecc78507f48843f719f32e80ae8805a34c15 Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <a.volkov@rusbitech.ru>
-Date: Tue, 7 Aug 2018 23:59:15 +0300
-Subject: Make dependency on KActivities optional
-
-Reviewers: #gwenview, rkflx
-
-Reviewed By: #gwenview, rkflx
-
-Subscribers: asturmlechner, rkflx
-
-Differential Revision: https://phabricator.kde.org/D14512
----
- CMakeLists.txt | 4 +++-
- app/CMakeLists.txt | 5 ++++-
- app/viewmainpage.cpp | 19 ++++++++++++++++---
- config-gwenview.h.cmake | 1 +
- 4 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e3e412..810813a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,7 +71,6 @@ add_definitions(-DPHONON_LIB_SONAME=\"${PHONON_LIB_SONAME}\")
-
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
- KIO
-- Activities
- ItemModels
- I18n
- DocTools
-@@ -80,6 +79,9 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
- IconThemes
- Notifications
- )
-+find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
-+ Activities
-+)
-
- ## Dependencies
- find_package(JPEG)
-diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
-index 5fe34d6..0d24360 100644
---- a/app/CMakeLists.txt
-+++ b/app/CMakeLists.txt
-@@ -78,11 +78,14 @@ add_executable(gwenview ${gwenview_SRCS})
-
- target_link_libraries(gwenview
- KF5::ItemModels
-- KF5::Activities
- KF5::Notifications
- gwenviewlib
- )
-
-+if (KF5Activities_FOUND)
-+ target_link_libraries(gwenview KF5::Activities)
-+endif()
-+
- target_link_libraries(gwenview LINK_INTERFACE_LIBRARIES KF5::KIOCore Qt5::Core)
-
- if (KF5Kipi_FOUND)
-diff --git a/app/viewmainpage.cpp b/app/viewmainpage.cpp
-index fa06e80..480d3c2 100644
---- a/app/viewmainpage.cpp
-+++ b/app/viewmainpage.cpp
-@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- */
- #include "viewmainpage.h"
-+#include "config-gwenview.h"
-
- // Qt
- #include <QCheckBox>
-@@ -35,8 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #include <KMessageBox>
- #include <KModelIndexProxyMapper>
- #include <KToggleAction>
--#include <KActivities/ResourceInstance>
- #include <KSqueezedTextLabel>
-+#ifdef KF5Activities_FOUND
-+#include <KActivities/ResourceInstance>
-+#endif
-
- // Local
- #include "fileoperations.h"
-@@ -132,7 +135,9 @@ struct ViewMainPagePrivate
- // Activity Resource events reporting needs to be above KPart,
- // in the shell itself, to avoid problems with other MDI applications
- // that use this KPart
-+#ifdef KF5Activities_FOUND
- QHash<DocumentView*, KActivities::ResourceInstance*> mActivityResources;
-+#endif
-
- bool mCompareMode;
- ZoomMode::Enum mZoomMode;
-@@ -250,7 +255,9 @@ struct ViewMainPagePrivate
- QObject::connect(view, &DocumentView::videoFinished, mSlideShow, &SlideShow::resumeAndGoToNextUrl);
-
- mDocumentViews << view;
-+#ifdef KF5Activities_FOUND
- mActivityResources.insert(view, new KActivities::ResourceInstance(q->window()->winId(), view));
-+#endif
-
- return view;
- }
-@@ -269,7 +276,9 @@ struct ViewMainPagePrivate
- QObject::disconnect(view, nullptr, mSlideShow, nullptr);
-
- mDocumentViews.removeOne(view);
-+#ifdef KF5Activities_FOUND
- mActivityResources.remove(view);
-+#endif
- mDocumentViewContainer->deleteView(view);
- }
-
-@@ -344,8 +353,10 @@ struct ViewMainPagePrivate
- }
- if (oldView) {
- oldView->setCurrent(false);
-+#ifdef KF5Activities_FOUND
- Q_ASSERT(mActivityResources.contains(oldView));
- mActivityResources.value(oldView)->notifyFocusedOut();
-+#endif
- }
- view->setCurrent(true);
- mDocumentViewController->setView(view);
-@@ -358,10 +369,10 @@ struct ViewMainPagePrivate
- // *before* listing /foo (because it matters less to the user)
- mThumbnailBar->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Current);
- }
--
-+#ifdef KF5Activities_FOUND
- Q_ASSERT(mActivityResources.contains(view));
- mActivityResources.value(view)->notifyFocusedIn();
--
-+#endif
- QObject::connect(view, &DocumentView::currentToolChanged,
- q, &ViewMainPage::updateFocus);
- }
-@@ -701,7 +712,9 @@ void ViewMainPage::openUrls(const QList<QUrl>& allUrls, const QUrl &currentUrl)
- DocumentView* view = it.value();
- DocumentView::Setup savedSetup = d->mDocumentViewContainer->savedSetup(url);
- view->openUrl(url, d->mZoomMode == ZoomMode::Individual && savedSetup.valid ? savedSetup : setup);
-+#ifdef KF5Activities_FOUND
- d->mActivityResources.value(view)->setUri(url);
-+#endif
- }
-
- // Init views
-diff --git a/config-gwenview.h.cmake b/config-gwenview.h.cmake
-index 29a5a60..369442a 100644
---- a/config-gwenview.h.cmake
-+++ b/config-gwenview.h.cmake
-@@ -6,3 +6,4 @@
- #cmakedefine HAVE_X11 ${HAVE_X11}
- #cmakedefine HAVE_FITS ${HAVE_FITS}
- #cmakedefine HAVE_QTDBUS ${HAVE_QTDBUS}
-+#cmakedefine KF5Activities_FOUND 1
---
-cgit v0.11.2
diff --git a/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild b/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild
deleted file mode 100644
index 3b88c8c471d0..000000000000
--- a/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.54.0"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="
- https://www.kde.org/applications/graphics/gwenview/
- https://userbase.kde.org/Gwenview
-"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtopengl)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- media-gfx/exiv2:=
- media-libs/lcms:2
- media-libs/libpng:0=
- media-libs/phonon[qt5(+)]
- virtual/jpeg:0
- activities? ( $(add_frameworks_dep kactivities) )
- fits? ( sci-libs/cfitsio )
- kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
- mpris? ( $(add_qt_dep qtdbus) )
- raw? ( $(add_kdeapps_dep libkdcraw) )
- semantic-desktop? (
- $(add_frameworks_dep baloo)
- $(add_frameworks_dep kfilemetadata)
- )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- $(add_frameworks_dep kwindowsystem)
- $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
- $(add_frameworks_dep kimageformats)
- $(add_qt_dep qtimageformats)
- kipi? ( media-plugins/kipi-plugins:5 )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-18.07.90-activities-optional.patch"
- "${FILESDIR}/${PN}-18.12.1-exiv2-0.27.patch"
-)
-
-src_prepare() {
- kde5_src_prepare
- if ! use mpris; then
- # FIXME: upstream a better solution
- sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package activities KF5Activities)
- $(cmake-utils_use_find_package fits CFitsio)
- $(cmake-utils_use_find_package kipi KF5Kipi)
- $(cmake-utils_use_find_package raw KF5KDcraw)
- $(cmake-utils_use_find_package X X11)
- )
-
- if use semantic-desktop; then
- mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
- else
- mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
- fi
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
- elog "For SVG support, install kde-apps/svgpart:${SLOT}"
- fi
-}