From aa3411e241a201d53a2689766fe419f2756819f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:22:19 +0000 Subject: gentoo resync : 24.03.2019 --- kde-apps/gwenview/Manifest | 5 +- .../gwenview-18.07.90-activities-optional.patch | 160 --------------------- kde-apps/gwenview/gwenview-18.08.3-r1.ebuild | 112 --------------- kde-apps/gwenview/gwenview-18.12.3.ebuild | 2 +- 4 files changed, 2 insertions(+), 277 deletions(-) delete mode 100644 kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch delete mode 100644 kde-apps/gwenview/gwenview-18.08.3-r1.ebuild (limited to 'kde-apps/gwenview') diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest index f5afdc9d23fc..c6021226e836 100644 --- a/kde-apps/gwenview/Manifest +++ b/kde-apps/gwenview/Manifest @@ -1,7 +1,4 @@ -AUX gwenview-18.07.90-activities-optional.patch 5078 BLAKE2B 692a743c319a9498de88af97b113e123ec445322f55513fcae58d4c556b29c23f0b2586e292900fb8e233c5cd2b33a7f76cf759b0c0ad119efb7daa7c290263c SHA512 2afd6fe89d1b455723d15f38866a476f8872e45d0548c36432f4b08d6404d02c4c03f78bfa60ec7dbddad022fef32283155b3ce27a9a8b16c4b753246b301106 AUX gwenview-18.12.1-exiv2-0.27.patch 19132 BLAKE2B a0f390fa9a6f7037a46a8c2e53897e2290bee8284b5fc120c24445c2f37c16c4efb4dbd6d272e2df821ca70e49e74af86cf8a949176bd22e8ef6adbcd539db7a SHA512 327cf77dad47824321f62443a88f64bb519c9f8dfc850fbea5fbcfa1ea7ac0a596d925e2aa79f610f6d76118d9064d89ab106ea880972a5c31853a62ce9d9a87 -DIST gwenview-18.08.3.tar.xz 6178192 BLAKE2B 0b25bdd64398f7ef1310598daad07374ca56383578fd67a8e36e348e78e1d818335fe4d630cc733e7a1eb13eaafca268426aea5afbb44195106742c50587c74d SHA512 0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce DIST gwenview-18.12.3.tar.xz 5714316 BLAKE2B 911a1ab5950f63382fdda471bea5160241ce579a5dd9c925a0cdd6f729188a8d52a41653bc9a746d3f3a692f087bd22faaa815c824f4422cbaf640cbb0773d11 SHA512 4105ef3529170e7c92cbbdca4bfb31f0fa4220979ce808f86d23aac0a2fdd9f59d927f87a7909e2d1641defd97bd31e1142075f30d526c7d1b29e8afe314fd51 -EBUILD gwenview-18.08.3-r1.ebuild 2796 BLAKE2B 1dd07565a49f62404cbb4a62c581694fe8f08b85fcb9657d019f88798d5525f63e6e0c8fc5db7a07847e6464b4509c8297af261e92f00add97f588a999ef1f03 SHA512 063e74d260a436a37ae170d154550a99a56021ec5a4a81d6cdd4b4c480d0169bc46b3dfb742a14eb0b505cbca0b798f83704d200b3ef8978a7a16ead880526d9 -EBUILD gwenview-18.12.3.ebuild 2720 BLAKE2B f9cc65da660cecc4d8d63bd852956d83363dd8498af9f96deea75e28c6e56b35a35605c9a97ab6460faae557675ed2955b18d5da85f0a5a518dff85f17e8558f SHA512 f62eb4d7c884bd40f80d192fa1e03ef8ee5d0d4fed4a91f894d186cf106698d483edc40d3dc66c209aacc445ac674f8131525f6155b387a8d0142d25118a50f0 +EBUILD gwenview-18.12.3.ebuild 2718 BLAKE2B b96a85f6198df8b4eea738a7421b455d5803da0d40425d98c2481fe730ac01484038ca3f774db3b6e91c86c9bb8dc6daa5975ffff53d91c09a50808ac7561db6 SHA512 1a852d8192de77269841983cd2a6fa8b9942261a0dbfba60b56c58fcf406e27d94494d1a58560d46f54385abb336ece7f402866d7694ffa65911ca59fbf77e7e 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 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 -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.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 -} diff --git a/kde-apps/gwenview/gwenview-18.12.3.ebuild b/kde-apps/gwenview/gwenview-18.12.3.ebuild index d217e51792fe..f0a842eab07c 100644 --- a/kde-apps/gwenview/gwenview-18.12.3.ebuild +++ b/kde-apps/gwenview/gwenview-18.12.3.ebuild @@ -14,7 +14,7 @@ HOMEPAGE=" " LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="activities fits kipi +mpris raw semantic-desktop X" # requires running environment -- cgit v1.2.3