gentoo auto-resync : 27:09:2022 - 03:09:13

7 files changed, 280 insertions, 0 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 939befdce5fc..b53efb2214bb 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 3e7402b0b691..bdc03a5e557c 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,4 +1,7 @@
+AUX kgraphviewer-2.4.3-highdpi.patch 577 BLAKE2B bfe4613b9e67cc01bde9ec7f9c9a827fc823f8cb016af2f27e12e75e5865ed847d745ac022deb799946ed1b13d01eeed5c9f9ba2c57f161c2d3ef2940c95469e SHA512 886f044b18a38fd5c73b17be8837af815ebaf82b277068502d16f5e3c64b0fb19b378c9773c408c8c62df52b7d1703c33bf2a662973f5e2fc4f3666a4d7f752d
+AUX kgraphviewer-2.4.3-obsolete-dep.patch 4965 BLAKE2B da1924881e582840e533eed3069274b23ea1a335975d1bbe01627970f64ed46b37f1610b0cefb2d7916b500caf1799eb5b52ee6f954c3acd8dc306affc554d2e SHA512 a43b19dbc068f03011b126b1950cd84b58b784c17464ed2b96042a40ccd36c55e7a4806a7ea5092f392db3fdb4e06777eef2dd046a191db75b3a1a207043ebcd
 AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
 EBUILD kgraphviewer-2.4.3-r1.ebuild 1134 BLAKE2B 98138f2be42b6e006d96576dac964717aafbcae7eaf222cde033791b6cfac6131ead11ecc81d68675e154448e9064b1b2fa19d714cabccb41daa27ca92544ccf SHA512 9da0a9b995323a44bc274838b33a16eaafd4584a4f54249ccaed1b638c762599dfb915a50a3207a5abf970a49b26b5d6af3cb40978f4266f488482bcdabfbabc
+EBUILD kgraphviewer-2.4.3-r2.ebuild 1100 BLAKE2B 9b7ea5ed1ee2e554da59560ed1ad45ca7fab968f0ada2c8ca8beea90492b6ab1533b1db2fcab1834de1abe98a85b191c393d9673eea03be06d366de40b865a2b SHA512 d64ea73b37764172361ba3a14cf636cd243aeb2b64ef1b1d9f55c2e29627c6f5777f2ce9a24deabccc8def3cae64a30f22b2e4d7a599bbbbdf06e985c500a494
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch
new file mode 100644
index 000000000000..8b31d40fb157
--- /dev/null
+++ b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch
@@ -0,0 +1,24 @@
+From 9961c92736abfc6d0aedea9c4e7c679e1fd564d2 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 7 Mar 2022 19:49:21 +0100
+Subject: [PATCH] Enable highdpi pixmaps
+
+---
+ src/main.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 32ad115..271e61f 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -38,6 +38,7 @@
+ 
+ int main(int argc, char **argv)
+ {
++  QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+   QApplication app(argc, argv);
+ 
+   KLocalizedString::setApplicationDomain("kgraphviewer");
+-- 
+GitLab
+
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch
new file mode 100644
index 000000000000..76fa878bc364
--- /dev/null
+++ b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch
@@ -0,0 +1,121 @@
+From a6f0587d8cbbb246c33423d19f2aabf6ea9d7417 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 8 May 2022 16:59:25 +0200
+Subject: [PATCH] Remove pointless/broken icons
+
+The distribute-horizontal-page icon doesn't serve any apparent purpose
+
+The portrait/landscape icons don't exist in any theme
+
+(cherry picked from commit 7b214252ec5f486912944d987581f207c7b03681)
+---
+ CMakeLists.txt                          |  1 -
+ src/part/CMakeLists.txt                 |  2 +-
+ src/part/KgvPageLayoutSize.cpp          | 10 ----------
+ src/part/simpleprintingpagesetup.cpp    |  4 ----
+ src/part/simpleprintingpagesetupbase.ui | 10 ----------
+ 5 files changed, 1 insertion(+), 26 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd715d2..238a9dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     DocTools
+     Parts
+     WidgetsAddons
+-    IconThemes
+ )
+ 
+ find_package(Boost 1.36 REQUIRED)
+diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
+index 0e70be8..922e5c5 100644
+--- a/src/part/CMakeLists.txt
++++ b/src/part/CMakeLists.txt
+@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} )
+ 
+ add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS})
+ 
+-target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
++target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
+ 
+ set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer )
+ 
+diff --git a/src/part/KgvPageLayoutSize.cpp b/src/part/KgvPageLayoutSize.cpp
+index bb8b3d1..4053a20 100644
+--- a/src/part/KgvPageLayoutSize.cpp
++++ b/src/part/KgvPageLayoutSize.cpp
+@@ -42,7 +42,6 @@
+ #include <QHBoxLayout>
+ #include <QGridLayout>
+ #include <QPixmap>
+-#include <KIconTheme>
+ #include "klocalizedstring.h"
+ 
+ KgvPageLayoutSize::KgvPageLayoutSize(
+@@ -148,19 +147,10 @@ KgvPageLayoutSize::KgvPageLayoutSize(
+ //     m_orientGroup->setInsideSpacing( KDialog::spacingHint() );
+     grid1->addWidget( m_orientGroup, 2, 0 );
+ 
+-    const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small);
+-    QLabel* lbPortrait = new QLabel( m_orientGroup );
+-    lbPortrait->setPixmap( QPixmap( QIcon::fromTheme( "koPortrait" ).pixmap(iconSize, iconSize) ) );
+-    lbPortrait->setMaximumWidth( lbPortrait->pixmap()->width() );
+-    lay3->addWidget(lbPortrait);
+     QRadioButton* rbPortrait = new QRadioButton( i18n("&Portrait"), m_orientGroup );
+     lay3->addWidget(rbPortrait);
+     m_orientButtons.addButton(rbPortrait);
+   
+-    QLabel* lbLandscape = new QLabel( m_orientGroup );
+-    lbLandscape->setPixmap( QPixmap( QIcon::fromTheme( "koLandscape" ).pixmap(iconSize, iconSize) ) );
+-    lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() );
+-    lay3->addWidget(lbLandscape);
+     QRadioButton* rbLandscape = new QRadioButton( i18n("La&ndscape"), m_orientGroup );
+     lay3->addWidget(rbLandscape);
+     m_orientGroup->setLayout(lay3);
+diff --git a/src/part/simpleprintingpagesetup.cpp b/src/part/simpleprintingpagesetup.cpp
+index 9882fbf..cd707b9 100644
+--- a/src/part/simpleprintingpagesetup.cpp
++++ b/src/part/simpleprintingpagesetup.cpp
+@@ -57,7 +57,6 @@
+ #include <QPixmap>
+ #include <QVBoxLayout>
+ #include <klocalizedstring.h>
+-#include <KIconTheme>
+ #include <iostream>
+ 
+ namespace KGraphViewer
+@@ -109,9 +108,6 @@ KGVSimplePrintingPageSetup::KGVSimplePrintingPageSetup(
+ 	connect(m_contents->printPreviewButton, &QPushButton::clicked,
+                 this, &KGVSimplePrintingPageSetup::slotPrintPreview);
+ 
+-	m_contents->iconLabel->setFixedWidth(32+6);
+-    const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small);
+-  m_contents->iconLabel->setPixmap(QIcon::fromTheme("distribute-horizontal-page").pixmap(iconSize, iconSize));
+ 	m_contents->headerTitleFontButton->setText(i18n("Font..."));
+ 	m_contents->headerTitleFontButton->setWhatsThis(i18n("Changes font for title text."));
+ 	connect(m_contents->headerTitleFontButton, &QPushButton::clicked,
+diff --git a/src/part/simpleprintingpagesetupbase.ui b/src/part/simpleprintingpagesetupbase.ui
+index ddc6ee0..719a7d6 100644
+--- a/src/part/simpleprintingpagesetupbase.ui
++++ b/src/part/simpleprintingpagesetupbase.ui
+@@ -157,16 +157,6 @@
+        </item>
+       </layout>
+      </item>
+-     <item>
+-      <widget class="QLabel" name="iconLabel">
+-       <property name="text">
+-        <string/>
+-       </property>
+-       <property name="alignment">
+-        <set>Qt::AlignVCenter</set>
+-       </property>
+-      </widget>
+-     </item>
+      <item>
+       <widget class="QGroupBox" name="groupBox4">
+        <property name="title">
+-- 
+2.37.3
+
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
new file mode 100644
index 000000000000..51254ef0da56
--- /dev/null
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Graphviz dot graph file viewer"
+HOMEPAGE="https://apps.kde.org/kgraphviewer"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=media-gfx/graphviz-2.30
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-set-startupwmclass.patch"
+	"${FILESDIR}/${P}-highdpi.patch"
+	"${FILESDIR}/${P}-obsolete-dep.patch"
+)
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 4188f4ca0b37..97d397d1ed35 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,4 +1,6 @@
 AUX 0.30.16-optional-wayland.patch 2111 BLAKE2B 9d928c8b449792b198314c9f169dc2ddfddb97efbf43bf888a6e00fc47e9f60635f8d482a6b227335e0e7ef028e663b8b959a18658ba300ceb925704e977b8cb SHA512 4b6e00823a4cd271ba72b382b35694737d6944cbb123465da4243a16cb5cf6bbf3a8d3ecc707ded6e74df47ac76c5ebe1f789aebfc7c4a7b0ecd8e926d32c120
 DIST shotwell-0.30.16.tar.xz 6532812 BLAKE2B caa2ff2f4536d8f04900d7ba7c583b7ec0d0244d6253bc17971e2b4e04aa3790b17e932b3367e1be40d4a0bb566bab31396aa5dfdb6dbb5c9803272cd7f94e97 SHA512 4ed725a34b1663b9cb63dcd13c98795fb2ea9a5d79ee4541276bc9dc2f607ce6466cc9c983bab55e7418e69eef3d1598846aeb6750f00927663756bd11d9a084
+DIST shotwell-0.30.17.tar.xz 6533460 BLAKE2B 58ec94f21bf465dcc19760f40235db7d2ad7d00c214802cd3ad6cfd67cb1088a5999f183c8ae36398e492a1b387e6ea717a9b8d0f31f4ef369e67c10150ae57a SHA512 f680b6f58538fb7b584594d00da7fe997dbc766583a5b5a85943b3df905dbc7192d3e7b5c7b47b6bd1221280995aaba878ea1afff9b042995bf30fbcbce5f7ea
 EBUILD shotwell-0.30.16.ebuild 1947 BLAKE2B 2989733092e2ebdc07978fc2c0e4cf7a6228afd6e7e552e5e2e2552e9b2e0162543cbd168573f220ae488693a86f811d92a7b778872ed1f9e5c9d52f0911dfe7 SHA512 cd39afa12c9cd0329fbe4074a1a6f2380dbd7bd68bfc8695a18b7c43aaf72170582bedc8c6a1482e22fca2165c673ffebaf6d3caead0889f79dc67b4b36338eb
+EBUILD shotwell-0.30.17.ebuild 1922 BLAKE2B 8fdb19955cbddde52faaa29a2bd2440b460c2750ff687904cf8a922739d9beffe0fd6064add2e07d32531b9ebaf0e284e0fd8670e64e8e69b3e0418a15d54b54 SHA512 144a38af74dc67a54862d6c86536329a2ef3b48a6de8e314612bcede5ab03bd96c338ad75ef36196d61a52066d09e2403aafd7ff0d9cbc082e5085630f73728b
 MISC metadata.xml 685 BLAKE2B 60a7448a9542a8663c25966bfa7dae2bbd50fb727795300e6483ea39147521b2d6ebd3c4dd894c553cbd94df18f4e39e1d88359d9da346a02cb7a02709d19f11 SHA512 da9730037e4d473898cfa537446b9ea3dae77bb915c54df139738a4e19b824ff273c36c2e3a43f421d91e2de09789843ccc84bd4cb4bcda258eee37fd9dec425
diff --git a/media-gfx/shotwell/shotwell-0.30.17.ebuild b/media-gfx/shotwell/shotwell-0.30.17.ebuild
new file mode 100644
index 000000000000..850f6a2458ae
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.30.17.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+IUSE="opencv udev wayland"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3[wayland?]
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8
+	>=net-libs/webkit-gtk-2.26:4
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=dev-libs/libgudev-145:= )
+	>=media-libs/gexiv2-0.10.4
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16:=
+	dev-libs/libgdata
+	>=app-crypt/gcr-3:=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-2.3.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:2.4[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr[vala]
+"
+
+PATCHES=( "${FILESDIR}"/0.30.16-optional-wayland.patch )
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity-support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		-Dextra-plugins=true
+		#trace
+		#measure
+		-Ddupe-detection=true
+		$(meson_use udev)
+		-Dinstall-apport-hook=false
+		$(meson_use opencv face-detection)
+		-Dfatal_warnings=false
+		$(meson_use wayland)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}