gentoo auto-resync : 13:07:2022 - 13:36:46

3 files changed, 66 insertions, 3 deletions

diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index f317f15cb628..172a18ddc67d 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,6 +1,7 @@
 AUX 0.30.15-opencv4-compatibility.patch 2253 BLAKE2B 5120413e34f1638e777a3c737a5cf3664049c907e7a641354d7b222611f5d84ff51632b4903dd1587c3407773816bf259c2b682936b301ad3184a250e9bb9127 SHA512 5346bd1360a423c38e833cd9d52798aea4fef0f49519316023fa6c94a424cfc7db2e5468303e03e8bdaad756ed05fe40f3cdf9168d3042f3ca0ac669fd02bde6
+AUX 0.30.16-optional-wayland.patch 2111 BLAKE2B 9d928c8b449792b198314c9f169dc2ddfddb97efbf43bf888a6e00fc47e9f60635f8d482a6b227335e0e7ef028e663b8b959a18658ba300ceb925704e977b8cb SHA512 4b6e00823a4cd271ba72b382b35694737d6944cbb123465da4243a16cb5cf6bbf3a8d3ecc707ded6e74df47ac76c5ebe1f789aebfc7c4a7b0ecd8e926d32c120
 DIST shotwell-0.30.15.tar.xz 6533632 BLAKE2B a973c22f06b2c05561db72974fa8f8a72006e4795ca282bd7c94e99f1b59c411917a30dd00b896cf606b80596c1510fe50e81c1a1c8fa6b98bcd75f8b25c5769 SHA512 aded4c8ec015546cb64189cc1a85b6bc233861367ec514cce041607a1deec9d69687f26e448865783c686813c1caec78df17c29d38c4296c4a255ff20c7cde0e
 DIST shotwell-0.30.16.tar.xz 6532812 BLAKE2B caa2ff2f4536d8f04900d7ba7c583b7ec0d0244d6253bc17971e2b4e04aa3790b17e932b3367e1be40d4a0bb566bab31396aa5dfdb6dbb5c9803272cd7f94e97 SHA512 4ed725a34b1663b9cb63dcd13c98795fb2ea9a5d79ee4541276bc9dc2f607ce6466cc9c983bab55e7418e69eef3d1598846aeb6750f00927663756bd11d9a084
 EBUILD shotwell-0.30.15.ebuild 1910 BLAKE2B 414fb09249cb5354982841ed268d8ccb58b7ecdc460132489c71aea275bc42c31a5e645d1f7081c4cc9240576920941ff93b10b47c1337bab37da5875ec5bbc5 SHA512 3666499bfaf923981fc5965e06f23a871006c11ea8d93b630bcf3d75a86f2640a3a75c485800c37af36cb12a9107176675adea83f65db84e2ebfd6903194ac0b
-EBUILD shotwell-0.30.16.ebuild 1851 BLAKE2B 7e7533f9ec6cbb20c584ab471b253d91a99f8cbfb06df0e15221c61de53a906fd36a450433dccaf4affb358439a47eea693c032787781f4f7f1bc3f2da7b2b66 SHA512 4b18c69f31167a13ba1936e78fd3f6f492e1987d1a8187b45256e041bd9966d74fa43690acf120f67c96921175783e068d9c49e67c1ac6316bde062d8133886e
+EBUILD shotwell-0.30.16.ebuild 1950 BLAKE2B 37ac6c5510d225b82a2ab003e68a7577b12a742ca137da062639f73b417c67dc5bb1e4a55eb7bec9159d4fbdd2327cfc6b60ecb17739f4ec20c3e376e06f1ed8 SHA512 c89d9e6c9d126f4b9430d3200cb86dcfa39d6bc2ae4e5a03d6467373d21eb036fd9d6becbebf7bb2a41d1e11ca12566c4f42e0ccc1b98a6148330b0f2b74b252
 MISC metadata.xml 685 BLAKE2B 60a7448a9542a8663c25966bfa7dae2bbd50fb727795300e6483ea39147521b2d6ebd3c4dd894c553cbd94df18f4e39e1d88359d9da346a02cb7a02709d19f11 SHA512 da9730037e4d473898cfa537446b9ea3dae77bb915c54df139738a4e19b824ff273c36c2e3a43f421d91e2de09789843ccc84bd4cb4bcda258eee37fd9dec425
diff --git a/media-gfx/shotwell/files/0.30.16-optional-wayland.patch b/media-gfx/shotwell/files/0.30.16-optional-wayland.patch
new file mode 100644
index 000000000000..5cc82e67dc7d
--- /dev/null
+++ b/media-gfx/shotwell/files/0.30.16-optional-wayland.patch
@@ -0,0 +1,59 @@
+Make wayland backend optional
+
+* Unfortunately, upstream is hostile to making wayland optional:
+  https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/57#note_1500284
+
+See: https://bugs.gentoo.org/836831
+
+--- a/meson.build
++++ b/meson.build
+@@ -64,7 +64,14 @@
+ libraw = dependency('libraw', version : '>= 0.13.2')
+ libexif = dependency('libexif', version : '>= 0.6.16')
+ unity = dependency('unity', required : false)
+-gdk = [ dependency('gdk-x11-3.0'), dependency('gdk-wayland-3.0') ]
++gdk = [ dependency('gdk-x11-3.0') ]
++add_global_arguments(['--define=HAVE_X11_BACKEND'],
++                     language : 'vala')
++if get_option('wayland')
++  gdk += [dependency('gdk-wayland-3.0')]
++  add_global_arguments(['--define=HAVE_WAYLAND_BACKEND'],
++                       language : 'vala')
++endif
+ 
+ unity_available = false
+ if unity.found() and get_option('unity-support')
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -8,3 +8,4 @@
+ option('install-apport-hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
+ option('face-detection', type:'boolean', value:false, description: 'Enable face detection and recognition features')
+ option('fatal_warnings', type:'boolean', value:false)
++option('wayland', type: 'boolean', value: true, description: 'Enable Wayland support')
+--- a/src/Portal.vala
++++ b/src/Portal.vala
+@@ -53,6 +53,7 @@
+     private static async string get_parent_window () {
+         var window = AppWindow.get_instance().get_window ();
+ 
++#if HAVE_WAYLAND_BACKEND
+         if (window is Gdk.Wayland.Window) {
+             var handle = "wayland:";
+             ((Gdk.Wayland.Window) window).export_handle ((w, h) => {
+@@ -61,9 +62,14 @@
+             });
+             yield;
+             return handle;
+-        } else if (window is Gdk.X11.Window) {
++        } else
++#endif
++#if HAVE_X11_BACKEND
++        if (window is Gdk.X11.Window) {
+             return "x11:%x".printf ((uint) ((Gdk.X11.Window) window).get_xid ());
+-        } else {
++        } else
++#endif
++        {
+             warning ("Could not get parent window");
+             return "";
+         }
diff --git a/media-gfx/shotwell/shotwell-0.30.16.ebuild b/media-gfx/shotwell/shotwell-0.30.16.ebuild
index cd09860b7b42..e5ed861303a2 100644
--- a/media-gfx/shotwell/shotwell-0.30.16.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.16.ebuild
@@ -13,10 +13,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
-IUSE="opencv udev"
+IUSE="opencv udev wayland"
 
 DEPEND="
-	>=x11-libs/gtk+-3.22.0:3
+	>=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
@@ -52,6 +52,8 @@ BDEPEND="
 	app-crypt/gcr[vala]
 "
 
+PATCHES=( "${FILESDIR}"/0.30.16-optional-wayland.patch )
+
 src_prepare() {
 	default
 	vala_setup
@@ -70,6 +72,7 @@ src_configure() {
 		-Dinstall-apport-hook=false
 		$(meson_use opencv face-detection)
 		-Dfatal_warnings=false
+		$(meson_use wayland)
 	)
 	meson_src_configure
 }