Merge 012432b282 into 62aee50dcb

CHANGELOG.md

@@ -3,6 +3,7 @@
 * Bumped minimum Go version to 1.21.
 * Added 8-letter code pairing support to provisioning API.
 * Added more bugs to fix later.
+* Renamed default branch from `master` to `main`.
 
 # v0.10.5 (2023-12-16)
 

README.md

@@ -11,8 +11,7 @@ All setup and usage instructions are located on [docs.mau.fi]. Some quick links:
 * Basic usage: [Authentication](https://docs.mau.fi/bridges/go/whatsapp/authentication.html)
 
 ### Features & Roadmap
-[ROADMAP.md](https://github.com/mautrix/whatsapp/blob/master/ROADMAP.md)
-contains a general overview of what is supported by the bridge.
+[ROADMAP.md](ROADMAP.md) contains a general overview of what is supported by the bridge.
 
 ## Discussion
 Matrix room: [#whatsapp:maunium.net](https://matrix.to/#/#whatsapp:maunium.net)

build.sh

@@ -1,2 +1,26 @@
 #!/bin/sh
+
+CGO_EXTRA_CPPFLAGS=""
+CGO_EXTRA_LDFLAGS=""
+if [ `uname` = "FreeBSD" ] ; then
+    CGO_EXTRA_CPPFLAGS="-I/usr/local/include"
+    CGO_EXTRA_LDFLAGS="-L/usr/local/lib"
+fi
+
+if [ -n "${CGO_EXTRA_CPPFLAGS}" ] ; then
+    if [ -z "${CGO_CPPFLAGS}" ] ; then
+        export CGO_CPPFLAGS="${CGO_EXTRA_CPPFLAGS}"
+    else
+        export CGO_CPPFLAGS="${CGO_CPPFLAGS} ${CGO_EXTRA_CPPFLAGS}"
+    fi
+fi
+
+if [ -n "${CGO_EXTRA_LDFLAGS}" ] ; then
+    if [ -z "${CGO_LDFLAGS}" ] ; then
+        export CGO_LDFLAGS="${CGO_EXTRA_LDFLAGS}"
+    else
+        export CGO_LDFLAGS="${CGO_LDFLAGS} ${CGO_EXTRA_LDFLAGS}"
+    fi
+fi
+
 go build -ldflags "-X main.Tag=$(git describe --exact-match --tags 2>/dev/null) -X main.Commit=$(git rev-parse HEAD) -X 'main.BuildTime=`date '+%b %_d %Y, %H:%M:%S'`'" "$@"

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/tidwall/gjson v1.17.1
 	go.mau.fi/util v0.4.1-0.20240311141448-53cb04950f7e
 	go.mau.fi/webp v0.1.0
-	go.mau.fi/whatsmeow v0.0.0-20240311200223-e9bca1903462
+	go.mau.fi/whatsmeow v0.0.0-20240312193055-9b989e1cc696
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
 	golang.org/x/image v0.15.0
 	golang.org/x/net v0.22.0

go.sum

@@ -73,8 +73,8 @@ go.mau.fi/util v0.4.1-0.20240311141448-53cb04950f7e h1:e1jDj/MjleSS5r9DMRbuCZYKy
 go.mau.fi/util v0.4.1-0.20240311141448-53cb04950f7e/go.mod h1:jOAREC/go8T6rGic01cu6WRa90xi9U4z3QmDjRf8xpo=
 go.mau.fi/webp v0.1.0 h1:BHObH/DcFntT9KYun5pDr0Ot4eUZO8k2C7eP7vF4ueA=
 go.mau.fi/webp v0.1.0/go.mod h1:e42Z+VMFrUMS9cpEwGRIor+lQWO8oUAyPyMtcL+NMt8=
-go.mau.fi/whatsmeow v0.0.0-20240311200223-e9bca1903462 h1:QOGjCIh2WEfkgX/38KLjnNof79GWx0T+KLrhTHiws3s=
-go.mau.fi/whatsmeow v0.0.0-20240311200223-e9bca1903462/go.mod h1:lQHbhaG/fI+6hfGqz5Vzn2OBJBEZ05H0kCP6iJXriN4=
+go.mau.fi/whatsmeow v0.0.0-20240312193055-9b989e1cc696 h1:F9ytx1yzfoclCS4DoEqQb1M0E5XpcX2j5dX8bIZjGFE=
+go.mau.fi/whatsmeow v0.0.0-20240312193055-9b989e1cc696/go.mod h1:lQHbhaG/fI+6hfGqz5Vzn2OBJBEZ05H0kCP6iJXriN4=
 go.mau.fi/zeroconfig v0.1.2 h1:DKOydWnhPMn65GbXZOafgkPm11BvFashZWLct0dGFto=
 go.mau.fi/zeroconfig v0.1.2/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70=
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=