Merge pull request #334 from peterzen/systray-deps-fix

Fix getlantern/systray deps

Author: peterzen

.github/workflows/app.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.14']
+        go: [ '1.17']
     defaults:
       run:
         shell: bash
@@ -25,7 +25,7 @@ jobs:
           go-version: ${{ matrix.go }}
 
     - name: install deps
-      run: sudo apt-get update && sudo apt-get install -y -q --no-install-recommends libwebkit2gtk-4.0-dev libgtk-3-dev libcairo2-dev libglib2.0-dev libappindicator3-dev libappindicator3-0.1-cil-dev
+      run: sudo apt-get update && sudo apt-get install -y -q --no-install-recommends libwebkit2gtk-4.0-dev libgtk-3-dev libglib2.0-dev libappindicator3-dev libayatana-appindicator3-dev
 
     - name: build
       run: go build -v

.github/workflows/build-linux.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.14']
+        go: [ '1.17']
         node-version: [12.x]
 
     steps:
@@ -32,10 +32,10 @@ jobs:
           go-version: ${{ matrix.go }}
 
     - name: install deps
-      run: sudo apt-get update && sudo apt-get install -y -q --no-install-recommends libwebkit2gtk-4.0-dev libgtk-3-dev libcairo2-dev libglib2.0-dev libappindicator3-dev libappindicator3-0.1-cil-dev
+      run: sudo apt-get update && sudo apt-get install -y -q --no-install-recommends libwebkit2gtk-4.0-dev libgtk-3-dev libglib2.0-dev libappindicator3-dev libayatana-appindicator3-dev
 
     - name: Build
       run: |
-        go get -u github.com/markbates/pkger/cmd/pkger
+        go install github.com/markbates/pkger/cmd/pkger@v0.17.1
         ./build-linux.sh
 

Dockerfile

@@ -22,27 +22,31 @@ RUN yarn install
 COPY ./frontend/  /src/frontend/
 RUN yarn --verbose build
 
-# stage II - Go build & packaging
-FROM golang:1.17-buster AS golangbuild
+# Stage II - Go build & packaging
+FROM golang:1.17-bullseye AS golangbuild
 
 RUN go install github.com/markbates/pkger/cmd/pkger@v0.17.1
 
 RUN apt-get update && apt-get install -y -q --no-install-recommends \
 	gcc \
-	libwebkit2gtk-4.0-dev \
 	libgtk-3-dev \
 	libglib2.0-dev \
-	libappindicator3-dev
+	libwebkit2gtk-4.0-dev \
+	libayatana-appindicator3-dev
+
+# Workaround to get `getlantern/systray` to compile on Debian bullseye.  This is neccessary 
+# until the dependency is fixed upstream.
+RUN cp /usr/lib/x86_64-linux-gnu/pkgconfig/ayatana-appindicator3-0.1.pc /usr/lib/x86_64-linux-gnu/pkgconfig/appindicator3-0.1.pc
 
 WORKDIR /src
-#COPY --from=nodebuilder /root/deps ./deps
 COPY ./app/ ./app/
 COPY --from=nodebuilder /src/frontend/dist/ ./app/www/
 COPY ./build-linux.sh .
 
+# expensive step to compile gotk3 - let docker cache
+WORKDIR /src/app/
+RUN go get -v
+
+WORKDIR /src
 ENV NO_FRONTEND_BUILD yes
 RUN ./build-linux.sh
-
-# WORKDIR /src/app/
-# RUN go build -v -tags=legacy_appindicator
-

README.md

@@ -60,16 +60,16 @@ By default, `dcrwallet` listens on port 9111 (mainnet) or 19111 (testnet).  The
 	libgtk-3-dev \
 	libcairo2-dev \
 	libglib2.0-dev \
-	libappindicator3-dev \
-	libayatana-appindicator3-dev \
-	libappindicator3-0.1-cil-dev
+	libayatana-appindicator3-dev 
 ```
 
+On Debian Buster, you'll need to install `libappindicator3-dev` instead of `libayatana-appindicator3-dev` for the time being.
+
 `./build-linux.sh`
 
-There is an experimental `Dockerfile` to build without having to install  dependencies:
+There is an experimental `Dockerfile` to build without having to install the dev dependencies:
 
-`docker build  -t decred/dcrwalletgui .`
+`docker build -t user/kohola .`
 
 ### MacOS
 

app/go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/decred/dcrwallet/wallet v1.3.0
 	github.com/gen2brain/beeep v0.0.0-20200420150314-13046a26d502
 	github.com/gen2brain/dlgs v0.0.0-20200211102745-b9c2664df42f
-	github.com/getlantern/systray v1.1.0
+	github.com/getlantern/systray v1.2.0
 	github.com/go-resty/resty/v2 v2.2.0
 	github.com/golang/protobuf v1.4.2
 	github.com/lxn/win v0.0.0-20210218163916-a377121e959e

app/go.sum

@@ -161,8 +161,8 @@ github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0F
 github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
 github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
 github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
-github.com/getlantern/systray v1.1.0 h1:U0wCEqseLi2ok1fE6b88gJklzriavPJixZysZPkZd/Y=
-github.com/getlantern/systray v1.1.0/go.mod h1:AecygODWIsBquJCJFop8MEQcJbWFfw/1yWbVabNgpCM=
+github.com/getlantern/systray v1.2.0 h1:MsAdOcmOnm4V+r3HFONDszdZeoj7E3q2dEvsPdsxXtI=
+github.com/getlantern/systray v1.2.0/go.mod h1:AecygODWIsBquJCJFop8MEQcJbWFfw/1yWbVabNgpCM=
 github.com/go-resty/resty/v2 v2.2.0 h1:vgZ1cdblp8Aw4jZj3ZsKh6yKAlMg3CHMrqFSFFd+jgY=
 github.com/go-resty/resty/v2 v2.2.0/go.mod h1:nYW/8rxqQCmI3bPz9Fsmjbr2FBjGuR2Mzt6kDh3zZ7w=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=