gentoo auto-resync : 29:12:2024 - 06:30:44

5 files changed, 48 insertions, 2 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index df530ab7bd73..ca2558f7272e 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/wcm/Manifest b/gui-apps/wcm/Manifest
index 3245df75613f..5d68a57245e4 100644
--- a/gui-apps/wcm/Manifest
+++ b/gui-apps/wcm/Manifest
@@ -1,4 +1,5 @@
+AUX wcm-0.9.0-incompatible-pointer-types.patch 1413 BLAKE2B 48e300851c8745db32e1f3f2e6045fb333f09506fc2ae383852374db94f9d57fd2f1f7e8811bb2e199cc506cfdd1327a4995a7c641d68519af526d9713687bea SHA512 06ef03fe38b1b4d65d17cf5d9a732d5dd6757fe592fc1909e86dda815b57a5f4729882099e4802cad0cd31148b12e1a79a22ffe9da1fac3e428cd818d57817b0
 DIST wcm-0.9.0.tar.xz 434076 BLAKE2B 7f068dda1c256d930db57d8cd299652416c5a2357742e1cc3adddab98b143ff33219dcde7c94f951d456d8a4047ce606fd95ddf1a9b4b33f8e1de8997b67aeb5 SHA512 f6c240c38adcf6c464df2ba07f2cbaeecabaf16fcf6c92fa064e30989d9d9476422e2d58bbdc14c0b2232839b517ee2938cc795200e3cb1549c170c87df8050c
-EBUILD wcm-0.9.0.ebuild 1183 BLAKE2B 15e72fea1cf0965bb377520a49c65aa671573a4e268905aec0d19ed33799d087f87350888ac4db999170ee575138e747d307a5c367efac40ff786742dd8a95f4 SHA512 77a3f735cff512f7d51a450c49526fe9a4cf1be641196d3cb2ff2493f5e3d45b37096d5d3268fdbc7468f1ce30b15ce3f3fe5b1d08187dcf3be1dfa8feb26271
-EBUILD wcm-9999.ebuild 1185 BLAKE2B 04cd175dd0e3f65b1f17575874b9d406c60c58df822fee89eba4228d60ffb3c34f574abfd6a5631c8cbb5881e4c4610ec582f3f924df63e066cd70a7d9551981 SHA512 e1d58d22529a3219773beb5295a9da1e3600dc87c30ef48fe5616838d44ee68d275ffed54f4a25097ed2ad1d22fa4138ebe81f2cafaa2eb2e9a54ea16a9557e0
+EBUILD wcm-0.9.0.ebuild 1249 BLAKE2B dac895db0af838deba3350005c18122c92da9e6784a4dc59bd0b789ae0b6bc2a4e870c004ba0c8283a751bdc734f21ca58c9703abf153cd8322d5867d6b9ba3c SHA512 bea0b824cb3af7a94fb309537a0839cfad1db9e76485dec97c0f97380d274ed94093ba97e8474e8b4a820edba93739a7c87371bb1c4724907ff3350671152dd3
+EBUILD wcm-9999.ebuild 1258 BLAKE2B 0c571907b82446cf1fc8625b1d83ec680ca2e13e248d450cc28692171f7d48eaa1ec74cff449b3eede51995a5327c71eebbaea7df861df99cb17650f6e483716 SHA512 9d07fc07dd179ce156de9a5a2fbe4bcab414e6908f0a66f1fc24aee72330895e84f02c804ff3dd217318df0e33cff59f66380064bb0aa949693034ac349bfe57
 MISC metadata.xml 489 BLAKE2B c0a96b9b8d4e55da4e9862573204b94930e31d22f7ee984a0c60135ac7fe570623c6c1ae7235acf71dc72bd8f4f00a60fdf56a1e2a0b649632549c31b95098a5 SHA512 3a41165ccdfecfe2391a01829b8a354f2bc3e0231c252acf94cd90f4d6baf5849e33746e9e3a09b58712dff5bd1720bffe42980c8df361ef5d1c4bfdb9930ff8
diff --git a/gui-apps/wcm/files/wcm-0.9.0-incompatible-pointer-types.patch b/gui-apps/wcm/files/wcm-0.9.0-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..2b4c4e2d1d59
--- /dev/null
+++ b/gui-apps/wcm/files/wcm-0.9.0-incompatible-pointer-types.patch
@@ -0,0 +1,37 @@
+https://github.com/artizirk/wdisplays/pull/25
+https://bugs.gentoo.org/946954
+
+--- a/subprojects/wdisplays/src/outputs.c
++++ b/subprojects/wdisplays/src/outputs.c
+@@ -526,7 +526,7 @@
+ static const struct zwlr_output_manager_v1_listener output_manager_listener = {
+   .head = output_manager_handle_head,
+   .done = output_manager_handle_done,
+-  .finished = noop,
++  .finished = (void (*)(void *, struct zwlr_output_manager_v1 *))noop,
+ };
+ static void registry_handle_global(void *data, struct wl_registry *registry,
+     uint32_t name, const char *interface, uint32_t version) {
+@@ -553,7 +553,7 @@
+ 
+ static const struct wl_registry_listener registry_listener = {
+   .global = registry_handle_global,
+-  .global_remove = noop,
++  .global_remove = (void (*)(void *, struct wl_registry *, uint32_t))noop,
+ };
+ 
+ void wd_add_output_management_listener(struct wd_state *state, struct
+@@ -603,10 +603,10 @@
+ 
+ static const struct zxdg_output_v1_listener output_listener = {
+   .logical_position = output_logical_position,
+-  .logical_size = noop,
+-  .done = noop,
++  .logical_size = (void (*)(void *, struct zxdg_output_v1 *, int32_t,  int32_t))noop,
++  .done = (void (*)(void *, struct zxdg_output_v1 *))noop,
+   .name = output_name,
+-  .description = noop
++  .description = (void (*)(void *, struct zxdg_output_v1 *, const char *))noop
+ };
+ 
+ void wd_add_output(struct wd_state *state, struct wl_output *wl_output,
diff --git a/gui-apps/wcm/wcm-0.9.0.ebuild b/gui-apps/wcm/wcm-0.9.0.ebuild
index f49d1982ff82..9422667d1228 100644
--- a/gui-apps/wcm/wcm-0.9.0.ebuild
+++ b/gui-apps/wcm/wcm-0.9.0.ebuild
@@ -48,6 +48,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-incompatible-pointer-types.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/gui-apps/wcm/wcm-9999.ebuild b/gui-apps/wcm/wcm-9999.ebuild
index a2161dc88469..b314dd0dd63c 100644
--- a/gui-apps/wcm/wcm-9999.ebuild
+++ b/gui-apps/wcm/wcm-9999.ebuild
@@ -48,6 +48,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0-incompatible-pointer-types.patch
+)
+
 src_prepare() {
 	default