From 7f6fd7f47a133a99c4ce8931fb32d6d7573a683a Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Tue, 31 Aug 2021 18:49:08 +0200
Subject: [PATCH] Backend: Update Go build tags after upgrading to 1.17

---
 internal/classify/gen.go                     | 1 +
 internal/maps/gen.go                         | 1 +
 internal/maps/osm/categories_test.go         | 1 +
 internal/maps/osm/location_test.go           | 1 +
 internal/maps/osm/name_test.go               | 1 +
 pkg/fastwalk/fastwalk_dirent_fileno.go       | 1 +
 pkg/fastwalk/fastwalk_dirent_ino.go          | 1 +
 pkg/fastwalk/fastwalk_dirent_namlen_bsd.go   | 1 +
 pkg/fastwalk/fastwalk_dirent_namlen_linux.go | 4 ++--
 pkg/fastwalk/fastwalk_portable.go            | 1 +
 pkg/fastwalk/fastwalk_unix.go                | 1 +
 pkg/txt/gen_countries.go                     | 1 +
 pkg/txt/gen_stopwords.go                     | 1 +
 13 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/internal/classify/gen.go b/internal/classify/gen.go
index 087f90b56..4b19cb9cd 100644
--- a/internal/classify/gen.go
+++ b/internal/classify/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // This generates stopwords.go by running "go generate"
diff --git a/internal/maps/gen.go b/internal/maps/gen.go
index c32efe2f5..52b698ce1 100644
--- a/internal/maps/gen.go
+++ b/internal/maps/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // This generates countries.go by running "go generate"
diff --git a/internal/maps/osm/categories_test.go b/internal/maps/osm/categories_test.go
index 551384372..bb3cb9b9b 100644
--- a/internal/maps/osm/categories_test.go
+++ b/internal/maps/osm/categories_test.go
@@ -1,3 +1,4 @@
+//go:build osm
 // +build osm
 
 package osm
diff --git a/internal/maps/osm/location_test.go b/internal/maps/osm/location_test.go
index 0cfe2f6eb..5c848fa35 100644
--- a/internal/maps/osm/location_test.go
+++ b/internal/maps/osm/location_test.go
@@ -1,3 +1,4 @@
+//go:build osm
 // +build osm
 
 package osm
diff --git a/internal/maps/osm/name_test.go b/internal/maps/osm/name_test.go
index 72df078ad..e09bbcb28 100644
--- a/internal/maps/osm/name_test.go
+++ b/internal/maps/osm/name_test.go
@@ -1,3 +1,4 @@
+//go:build osm
 // +build osm
 
 package osm
diff --git a/pkg/fastwalk/fastwalk_dirent_fileno.go b/pkg/fastwalk/fastwalk_dirent_fileno.go
index ccffec5ad..d58595dbd 100644
--- a/pkg/fastwalk/fastwalk_dirent_fileno.go
+++ b/pkg/fastwalk/fastwalk_dirent_fileno.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build freebsd || openbsd || netbsd
 // +build freebsd openbsd netbsd
 
 package fastwalk
diff --git a/pkg/fastwalk/fastwalk_dirent_ino.go b/pkg/fastwalk/fastwalk_dirent_ino.go
index ab7fbc0a9..ea02b9ebf 100644
--- a/pkg/fastwalk/fastwalk_dirent_ino.go
+++ b/pkg/fastwalk/fastwalk_dirent_ino.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (linux || darwin) && !appengine
 // +build linux darwin
 // +build !appengine
 
diff --git a/pkg/fastwalk/fastwalk_dirent_namlen_bsd.go b/pkg/fastwalk/fastwalk_dirent_namlen_bsd.go
index a3b26a7ba..d5c9c321e 100644
--- a/pkg/fastwalk/fastwalk_dirent_namlen_bsd.go
+++ b/pkg/fastwalk/fastwalk_dirent_namlen_bsd.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build darwin || freebsd || openbsd || netbsd
 // +build darwin freebsd openbsd netbsd
 
 package fastwalk
diff --git a/pkg/fastwalk/fastwalk_dirent_namlen_linux.go b/pkg/fastwalk/fastwalk_dirent_namlen_linux.go
index e880d358b..c82e57df8 100644
--- a/pkg/fastwalk/fastwalk_dirent_namlen_linux.go
+++ b/pkg/fastwalk/fastwalk_dirent_namlen_linux.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux
-// +build !appengine
+//go:build linux && !appengine
+// +build linux,!appengine
 
 package fastwalk
 
diff --git a/pkg/fastwalk/fastwalk_portable.go b/pkg/fastwalk/fastwalk_portable.go
index b0d6327a9..085d31160 100644
--- a/pkg/fastwalk/fastwalk_portable.go
+++ b/pkg/fastwalk/fastwalk_portable.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build appengine || (!linux && !darwin && !freebsd && !openbsd && !netbsd)
 // +build appengine !linux,!darwin,!freebsd,!openbsd,!netbsd
 
 package fastwalk
diff --git a/pkg/fastwalk/fastwalk_unix.go b/pkg/fastwalk/fastwalk_unix.go
index 5901a8f61..e4edb5cde 100644
--- a/pkg/fastwalk/fastwalk_unix.go
+++ b/pkg/fastwalk/fastwalk_unix.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (linux || darwin || freebsd || openbsd || netbsd) && !appengine
 // +build linux darwin freebsd openbsd netbsd
 // +build !appengine
 
diff --git a/pkg/txt/gen_countries.go b/pkg/txt/gen_countries.go
index 89f134ad0..37e3b36e0 100644
--- a/pkg/txt/gen_countries.go
+++ b/pkg/txt/gen_countries.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // This generates countries.go by running "go generate"
diff --git a/pkg/txt/gen_stopwords.go b/pkg/txt/gen_stopwords.go
index 0d89c0c45..dfcfbd082 100644
--- a/pkg/txt/gen_stopwords.go
+++ b/pkg/txt/gen_stopwords.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // This generates stopwords.go by running "go generate"