From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- kde-apps/gwenview/Manifest | 5 +- .../gwenview-18.07.90-activities-optional.patch | 160 +++++++++++++++++++++ kde-apps/gwenview/gwenview-18.08.1.ebuild | 111 ++++++++++++++ kde-apps/gwenview/metadata.xml | 5 +- 4 files changed, 279 insertions(+), 2 deletions(-) create mode 100644 kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch create mode 100644 kde-apps/gwenview/gwenview-18.08.1.ebuild (limited to 'kde-apps/gwenview') diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest index d07de916befd..aa2ae4a3f444 100644 --- a/kde-apps/gwenview/Manifest +++ b/kde-apps/gwenview/Manifest @@ -1,3 +1,6 @@ +AUX gwenview-18.07.90-activities-optional.patch 5078 BLAKE2B 692a743c319a9498de88af97b113e123ec445322f55513fcae58d4c556b29c23f0b2586e292900fb8e233c5cd2b33a7f76cf759b0c0ad119efb7daa7c290263c SHA512 2afd6fe89d1b455723d15f38866a476f8872e45d0548c36432f4b08d6404d02c4c03f78bfa60ec7dbddad022fef32283155b3ce27a9a8b16c4b753246b301106 DIST gwenview-18.04.3.tar.xz 6055876 BLAKE2B 5202dcfe597ad1da7d5b18124ec357239a26a30c20d83c37bc7258e0ad4232b53081a8e050017850ea6eeb02fe0d88f90b90b0029e364929375d3e09dc8bf7fd SHA512 a1c36a05e4ae3ee9aff74f4a56eb10c2c27aa89e10886d14dd6753e42329653550e8716965156ec5f50915e320224757bf52d1178986ef10d039e3c622c01a7f +DIST gwenview-18.08.1.tar.xz 6177620 BLAKE2B fc88c4798b931c187413ff8d61fecc537b02412eb42a16a95b0e1f181566475688c7ad6f5733a97d93f6e281fa6d0cd872548a4621275d2021e1e390d4a3dd3e SHA512 6fb57a1c872198fd8c7afdfc1df49be7b01a086d2e890479ded3ac0e0fe48748055c30e2678a9e7ad0141c5b7435db01aa03f8d4f11193a65eff42960474a732 EBUILD gwenview-18.04.3.ebuild 2413 BLAKE2B fec0d82754f8e01f85946c5d9dd3aaeba2d4b7b934327f8bfd37e3c7cc910dd675d3d5583110088a21a07e780e3a25cfa25f03cf4d866a0d0d05b535922b0ddf SHA512 2dc8646d06e47db59f8ca63b89d73a50b70e00ff33e9f8a04043017cf84579ab0406dfc44ca258fc8d722a2e3eb00da00583ac42895985280e380b9322366d64 -MISC metadata.xml 423 BLAKE2B 2e0463d65a7476da0e5a28420f235108b3367b9adfcda7fc2d47c1a5ae0e7f1ca49859d7ac213e3434c7d846c78af041d90da5767bf68e24be5a3e8eb80ad37b SHA512 19d70c59c116bfff13a062076e18d094d77ff06e30a01cc2c1439d464439616f2b758a250ff45c5a792926800906f1de8588a752317b7272e3a1223e543ff680 +EBUILD gwenview-18.08.1.ebuild 2793 BLAKE2B da1ad956c92a27c59455d2855c4fc3e0c388fe42384b28d659b13478e383a8b5d3f75950e1bfbdccdc0da40398c7e881134bd5b60743dc1876b8e2b004db1a60 SHA512 245fa50f796733d1f5bbfc57cc03fdaea39b28acd48df006045f24075e3f463dffdb43f565737d67bc8de78ba477aa39858d2ed65f33e7ab5ec47959a264cdcd +MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de 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 new file mode 100644 index 000000000000..bf66688a6b91 --- /dev/null +++ b/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch @@ -0,0 +1,160 @@ +From a00eecc78507f48843f719f32e80ae8805a34c15 Mon Sep 17 00:00:00 2001 +From: Alexander Volkov +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 +@@ -35,8 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + #include + #include + #include +-#include + #include ++#ifdef KF5Activities_FOUND ++#include ++#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 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& allUrls, const QUrl ¤tUrl) + 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.1.ebuild b/kde-apps/gwenview/gwenview-18.08.1.ebuild new file mode 100644 index 000000000000..2a5b51186bd8 --- /dev/null +++ b/kde-apps/gwenview/gwenview-18.08.1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="true" +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) +" + +PATCHES=( "${FILESDIR}/${PN}-18.07.90-activities-optional.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 ! has_version kde-apps/svgpart:${SLOT} ; then + elog "For SVG support, install kde-apps/svgpart:${SLOT}" + fi + + if use kipi && ! has_version media-plugins/kipi-plugins ; then + elog "Plugins for the KIPI interface can be found in media-plugins/kipi-plugins" + fi +} diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml index 5ac564950d36..0bca8f5e658e 100644 --- a/kde-apps/gwenview/metadata.xml +++ b/kde-apps/gwenview/metadata.xml @@ -6,7 +6,10 @@ Gentoo KDE Project + Enable kactivities support Enable support for NASA's sci-libs/cfitsio library - Support for the KDE Image Plugin Interface + Enable support for the KDE Image Plugin Interface + Enable support for MPRIS2 interface, requiring dev-qt/qtdbus as dependency. + -- cgit v1.2.3