From 6a10bf4d9832eda13c0811bd45011c6adc72fc9e Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Mon, 31 Jan 2022 21:21:48 +1100
Subject: [PATCH] [linux] Better Go 1.16 support

---
 v2/internal/appng/app_darwin.go                      | 1 +
 v2/internal/appng/app_default_darwin.go              | 1 +
 v2/internal/appng/app_default_linux.go               | 1 +
 v2/internal/appng/app_default_windows.go             | 1 +
 v2/internal/appng/app_linux.go                       | 1 +
 v2/internal/appng/app_windows.go                     | 1 +
 v2/internal/frontend/desktop/desktop_darwin.go       | 1 +
 v2/internal/frontend/desktop/desktop_windows.go      | 1 +
 v2/internal/frontend/desktop/windows/dialog.go       | 1 +
 v2/internal/frontend/desktop/windows/keys.go         | 1 +
 v2/internal/frontend/desktop/windows/menu.go         | 1 +
 v2/internal/frontend/devserver/devserver.go          | 1 +
 v2/internal/frontend/runtime/ipc_websocket.go        | 1 +
 v2/internal/frontend/runtime/runtime_dev_desktop.go  | 1 +
 v2/internal/frontend/runtime/runtime_prod_desktop.go | 1 +
 15 files changed, 15 insertions(+)

diff --git a/v2/internal/appng/app_darwin.go b/v2/internal/appng/app_darwin.go
index b6f5a16a..66677040 100644
--- a/v2/internal/appng/app_darwin.go
+++ b/v2/internal/appng/app_darwin.go
@@ -1,4 +1,5 @@
 //go:build darwin && !bindings
+// +build darwin,!bindings
 
 package appng
 
diff --git a/v2/internal/appng/app_default_darwin.go b/v2/internal/appng/app_default_darwin.go
index 4cde8521..fb40af69 100644
--- a/v2/internal/appng/app_default_darwin.go
+++ b/v2/internal/appng/app_default_darwin.go
@@ -1,4 +1,5 @@
 //go:build !dev && !production && !bindings && darwin
+// +build !dev,!production,!bindings,darwin
 
 package appng
 
diff --git a/v2/internal/appng/app_default_linux.go b/v2/internal/appng/app_default_linux.go
index ec54dd10..257230e1 100644
--- a/v2/internal/appng/app_default_linux.go
+++ b/v2/internal/appng/app_default_linux.go
@@ -1,4 +1,5 @@
 //go:build !dev && !production && !bindings && linux
+// +build !dev,!production,!bindings,linux
 
 package appng
 
diff --git a/v2/internal/appng/app_default_windows.go b/v2/internal/appng/app_default_windows.go
index 64ac79aa..59174e83 100644
--- a/v2/internal/appng/app_default_windows.go
+++ b/v2/internal/appng/app_default_windows.go
@@ -1,4 +1,5 @@
 //go:build !dev && !production && !bindings && windows
+// +build !dev,!production,!bindings,windows
 
 package appng
 
diff --git a/v2/internal/appng/app_linux.go b/v2/internal/appng/app_linux.go
index a268da51..e336964f 100644
--- a/v2/internal/appng/app_linux.go
+++ b/v2/internal/appng/app_linux.go
@@ -1,4 +1,5 @@
 //go:build linux && !bindings
+// +build linux,!bindings
 
 package appng
 
diff --git a/v2/internal/appng/app_windows.go b/v2/internal/appng/app_windows.go
index 50540e3c..93830714 100644
--- a/v2/internal/appng/app_windows.go
+++ b/v2/internal/appng/app_windows.go
@@ -1,4 +1,5 @@
 //go:build windows && !bindings
+// +build windows,!bindings
 
 package appng
 
diff --git a/v2/internal/frontend/desktop/desktop_darwin.go b/v2/internal/frontend/desktop/desktop_darwin.go
index fbf977fd..c02c0cdb 100644
--- a/v2/internal/frontend/desktop/desktop_darwin.go
+++ b/v2/internal/frontend/desktop/desktop_darwin.go
@@ -1,4 +1,5 @@
 //go:build darwin
+// +build darwin
 
 package desktop
 
diff --git a/v2/internal/frontend/desktop/desktop_windows.go b/v2/internal/frontend/desktop/desktop_windows.go
index f3c8e05d..f9a680aa 100644
--- a/v2/internal/frontend/desktop/desktop_windows.go
+++ b/v2/internal/frontend/desktop/desktop_windows.go
@@ -1,4 +1,5 @@
 //go:build windows
+// +build windows
 
 package desktop
 
diff --git a/v2/internal/frontend/desktop/windows/dialog.go b/v2/internal/frontend/desktop/windows/dialog.go
index eb774722..f2bb7bf1 100644
--- a/v2/internal/frontend/desktop/windows/dialog.go
+++ b/v2/internal/frontend/desktop/windows/dialog.go
@@ -1,4 +1,5 @@
 //go:build windows
+// +build windows
 
 package windows
 
diff --git a/v2/internal/frontend/desktop/windows/keys.go b/v2/internal/frontend/desktop/windows/keys.go
index 8c2c39bd..bec6eea4 100644
--- a/v2/internal/frontend/desktop/windows/keys.go
+++ b/v2/internal/frontend/desktop/windows/keys.go
@@ -1,4 +1,5 @@
 //go:build windows
+// +build windows
 
 package windows
 
diff --git a/v2/internal/frontend/desktop/windows/menu.go b/v2/internal/frontend/desktop/windows/menu.go
index 82f5421e..c82581c1 100644
--- a/v2/internal/frontend/desktop/windows/menu.go
+++ b/v2/internal/frontend/desktop/windows/menu.go
@@ -1,4 +1,5 @@
 //go:build windows
+// +build windows
 
 package windows
 
diff --git a/v2/internal/frontend/devserver/devserver.go b/v2/internal/frontend/devserver/devserver.go
index 3dcb84c5..29a0332a 100644
--- a/v2/internal/frontend/devserver/devserver.go
+++ b/v2/internal/frontend/devserver/devserver.go
@@ -1,4 +1,5 @@
 //go:build dev
+// +build dev
 
 // Package devserver provides a web-based frontend so that
 // it is possible to run a Wails app in a browsers.
diff --git a/v2/internal/frontend/runtime/ipc_websocket.go b/v2/internal/frontend/runtime/ipc_websocket.go
index e0b5ca1f..f8722ed3 100644
--- a/v2/internal/frontend/runtime/ipc_websocket.go
+++ b/v2/internal/frontend/runtime/ipc_websocket.go
@@ -1,4 +1,5 @@
 //go:build dev
+// +build dev
 
 package runtime
 
diff --git a/v2/internal/frontend/runtime/runtime_dev_desktop.go b/v2/internal/frontend/runtime/runtime_dev_desktop.go
index c0dcb1fc..222b84f9 100644
--- a/v2/internal/frontend/runtime/runtime_dev_desktop.go
+++ b/v2/internal/frontend/runtime/runtime_dev_desktop.go
@@ -1,4 +1,5 @@
 //go:build dev || bindings || (!dev && !production && !bindings)
+// +build dev bindings !dev,!production,!bindings
 
 package runtime
 
diff --git a/v2/internal/frontend/runtime/runtime_prod_desktop.go b/v2/internal/frontend/runtime/runtime_prod_desktop.go
index feba8a84..5460e719 100644
--- a/v2/internal/frontend/runtime/runtime_prod_desktop.go
+++ b/v2/internal/frontend/runtime/runtime_prod_desktop.go
@@ -1,4 +1,5 @@
 //go:build production && desktop
+// +build production,desktop
 
 package runtime