From nobody Sun Dec 26 17:10:47 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 32740192796C; Sun, 26 Dec 2021 17:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JMS474q5Bz3G8L; Sun, 26 Dec 2021 17:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7958F64F3; Sun, 26 Dec 2021 17:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BQHAlEd049683; Sun, 26 Dec 2021 17:10:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BQHAlUo049682; Sun, 26 Dec 2021 17:10:47 GMT (envelope-from git) Date: Sun, 26 Dec 2021 17:10:47 GMT Message-Id: <202112261710.1BQHAlUo049682@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f4b8dff84ea0 - main - www/firefox: replace 571ee96df4f6 with upstream fix List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4b8dff84ea0209aa4571d66c4a3516b479cdfed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640538647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rn8dOaAVZVjMHZNUnk9rm1fLCBftjbnrKj9QMIecK3Y=; b=UBRCWzj6pYzeyJgYypoL75Xbl2C4L1vajP7cXgiM3TF7MHhQGfSNAORXE8jp6W1g4ZK+12 ENc2XZ9zXmq7Vl6avQb282NBSNl86kfsLI9mIr6TloZ0OUQ/Zo2ahTq2JTd18ammv/Jy2n 7yiRKKw0Kga7E6XrYiWjylfY775/FBzqKqwzBOtTaUvtrFZr+Mm0Ix4mhO0016rnXjrir0 yfqmLNCa3wyE+mKpAApe3aE99+9YDOIMMq13eulYnQ+pb2aSvWYi7e4ysp8gitnyzR4iNI uUi+aiUH2OYjaGdAgDFnOcFCgxGl/+i6a4mf6DBAwpcJymxYo1LWYIbefyrRGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640538647; a=rsa-sha256; cv=none; b=ce2KvcJ4jo2kPs77p6XxdImODUJ+AGVvtST7+enW6S5NGlGKlKHyeU4kE4f3S+LWytNf0w kqRovy+1PCZbY9EFhr6Yg3c95A8AYMO2FIYV2z3HPRY4JZNiQFnbBADJEnz2SSlQMbceWP WR8BZgd7om0Tj+WxfQ9rZhWJoVQAQk2fGYvCTs9pZKKFE+y2bgVAIq3M2/p9Zk4JJHD9A/ bHC27HAUjWqHoObpHeKPBmH6EDxd6k+ZgIUNz6ioUptvjQgWHMIU35C6htjeTIMm7aTBhC S11zr0LPfXtYwC+NTKc7YrSXlgQbJavHPLLe7fcHMVzbNOHs/4G3rJGTwWXfGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4b8dff84ea0209aa4571d66c4a3516b479cdfed commit f4b8dff84ea0209aa4571d66c4a3516b479cdfed Author: Jan Beich AuthorDate: 2021-12-26 16:17:30 +0000 Commit: Jan Beich CommitDate: 2021-12-26 17:09:28 +0000 www/firefox: replace 571ee96df4f6 with upstream fix Rename the patch to facilitate pruning on update. --- .../files/{patch-wayland-1.20 => patch-bug1745560} | 17 +++++++++-------- .../files/{patch-wayland-1.20 => patch-bug1745560} | 17 +++++++++-------- .../files/{patch-wayland-1.20 => patch-bug1745560} | 17 +++++++++-------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/mail/thunderbird/files/patch-wayland-1.20 b/mail/thunderbird/files/patch-bug1745560 similarity index 68% rename from mail/thunderbird/files/patch-wayland-1.20 rename to mail/thunderbird/files/patch-bug1745560 index 99218fbbb63d..15cfb73d5fae 100644 --- a/mail/thunderbird/files/patch-wayland-1.20 +++ b/mail/thunderbird/files/patch-bug1745560 @@ -1,3 +1,5 @@ +https://hg.mozilla.org/mozilla-central/rev/f7e2cf808d30 + ld: warning: undefined symbol: wl_proxy_marshal_flags >>> referenced by Unified_cpp_gfx_gl0.cpp >>> objdir/gfx/gl/Unified_cpp_gfx_gl0.o:(mozilla::gl::DeleteWaylandGLSurface(void*)) @@ -7,19 +9,18 @@ ld: warning: undefined symbol: wl_proxy_marshal_flags >>> objdir/gfx/layers/Unified_cpp_gfx_layers1.o:(mozilla::layers::NativeLayerRootWayland::CommitToScreen(mozilla::detail::BaseAutoLock const&)) >>> referenced 84 more times ---- widget/gtk/mozwayland/mozwayland.c.orig 2021-09-27 22:47:59 UTC +diff --git widget/gtk/mozwayland/mozwayland.c widget/gtk/mozwayland/mozwayland.c +index 7a448e6321e2..1a86468b4f3d 100644 +--- widget/gtk/mozwayland/mozwayland.c +++ widget/gtk/mozwayland/mozwayland.c -@@ -40,6 +40,13 @@ MOZ_EXPORT void wl_event_queue_destroy(struct wl_event - - MOZ_EXPORT void wl_proxy_marshal(struct wl_proxy* p, uint32_t opcode, ...) {} +@@ -200,3 +200,10 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; } + MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, + struct wl_list* other) {} ++ +MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags( + struct wl_proxy* proxy, uint32_t opcode, + const struct wl_interface* interface, uint32_t version, uint32_t flags, + ...) { + return NULL; +} -+ - MOZ_EXPORT void wl_proxy_marshal_array(struct wl_proxy* p, uint32_t opcode, - union wl_argument* args) {} - diff --git a/www/firefox-esr/files/patch-wayland-1.20 b/www/firefox-esr/files/patch-bug1745560 similarity index 68% rename from www/firefox-esr/files/patch-wayland-1.20 rename to www/firefox-esr/files/patch-bug1745560 index 99218fbbb63d..15cfb73d5fae 100644 --- a/www/firefox-esr/files/patch-wayland-1.20 +++ b/www/firefox-esr/files/patch-bug1745560 @@ -1,3 +1,5 @@ +https://hg.mozilla.org/mozilla-central/rev/f7e2cf808d30 + ld: warning: undefined symbol: wl_proxy_marshal_flags >>> referenced by Unified_cpp_gfx_gl0.cpp >>> objdir/gfx/gl/Unified_cpp_gfx_gl0.o:(mozilla::gl::DeleteWaylandGLSurface(void*)) @@ -7,19 +9,18 @@ ld: warning: undefined symbol: wl_proxy_marshal_flags >>> objdir/gfx/layers/Unified_cpp_gfx_layers1.o:(mozilla::layers::NativeLayerRootWayland::CommitToScreen(mozilla::detail::BaseAutoLock const&)) >>> referenced 84 more times ---- widget/gtk/mozwayland/mozwayland.c.orig 2021-09-27 22:47:59 UTC +diff --git widget/gtk/mozwayland/mozwayland.c widget/gtk/mozwayland/mozwayland.c +index 7a448e6321e2..1a86468b4f3d 100644 +--- widget/gtk/mozwayland/mozwayland.c +++ widget/gtk/mozwayland/mozwayland.c -@@ -40,6 +40,13 @@ MOZ_EXPORT void wl_event_queue_destroy(struct wl_event - - MOZ_EXPORT void wl_proxy_marshal(struct wl_proxy* p, uint32_t opcode, ...) {} +@@ -200,3 +200,10 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; } + MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, + struct wl_list* other) {} ++ +MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags( + struct wl_proxy* proxy, uint32_t opcode, + const struct wl_interface* interface, uint32_t version, uint32_t flags, + ...) { + return NULL; +} -+ - MOZ_EXPORT void wl_proxy_marshal_array(struct wl_proxy* p, uint32_t opcode, - union wl_argument* args) {} - diff --git a/www/firefox/files/patch-wayland-1.20 b/www/firefox/files/patch-bug1745560 similarity index 68% rename from www/firefox/files/patch-wayland-1.20 rename to www/firefox/files/patch-bug1745560 index 99218fbbb63d..15cfb73d5fae 100644 --- a/www/firefox/files/patch-wayland-1.20 +++ b/www/firefox/files/patch-bug1745560 @@ -1,3 +1,5 @@ +https://hg.mozilla.org/mozilla-central/rev/f7e2cf808d30 + ld: warning: undefined symbol: wl_proxy_marshal_flags >>> referenced by Unified_cpp_gfx_gl0.cpp >>> objdir/gfx/gl/Unified_cpp_gfx_gl0.o:(mozilla::gl::DeleteWaylandGLSurface(void*)) @@ -7,19 +9,18 @@ ld: warning: undefined symbol: wl_proxy_marshal_flags >>> objdir/gfx/layers/Unified_cpp_gfx_layers1.o:(mozilla::layers::NativeLayerRootWayland::CommitToScreen(mozilla::detail::BaseAutoLock const&)) >>> referenced 84 more times ---- widget/gtk/mozwayland/mozwayland.c.orig 2021-09-27 22:47:59 UTC +diff --git widget/gtk/mozwayland/mozwayland.c widget/gtk/mozwayland/mozwayland.c +index 7a448e6321e2..1a86468b4f3d 100644 +--- widget/gtk/mozwayland/mozwayland.c +++ widget/gtk/mozwayland/mozwayland.c -@@ -40,6 +40,13 @@ MOZ_EXPORT void wl_event_queue_destroy(struct wl_event - - MOZ_EXPORT void wl_proxy_marshal(struct wl_proxy* p, uint32_t opcode, ...) {} +@@ -200,3 +200,10 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; } + MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, + struct wl_list* other) {} ++ +MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags( + struct wl_proxy* proxy, uint32_t opcode, + const struct wl_interface* interface, uint32_t version, uint32_t flags, + ...) { + return NULL; +} -+ - MOZ_EXPORT void wl_proxy_marshal_array(struct wl_proxy* p, uint32_t opcode, - union wl_argument* args) {} -