diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 7e379fc..e16f141 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-18.04 env: - VARNAM_UPSTREAM: https://varnam.subinsb.com + VARNAM_UPSTREAM: https://varnamproject.com steps: - uses: actions/checkout@v2 @@ -31,7 +31,7 @@ jobs: - name: Build GoVarnam-IBus Engine run: | sudo apt install libgtk-3-dev libcairo2-dev libglib2.0-dev - make ubuntu-18 + make ubuntu-14 make release - name: Archive production artifacts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d4d334..54f12ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: - name: Build GoVarnam-IBus Engine run: | sudo apt install libgtk-3-dev libcairo2-dev libglib2.0-dev - make ubuntu-18 + make ubuntu-14 make release - name: Upload Release Binary diff --git a/Makefile b/Makefile index 38e2ace..ac82f71 100644 --- a/Makefile +++ b/Makefile @@ -26,11 +26,13 @@ ubuntu-14: $(MAKE) ibus-xml $(MAKE) install-script +# Won't work ubuntu-18: go build -tags "pango_1_42,gtk_3_22,glib_2_66,cairo_1_15" -ldflags "-s -w" -o ${BIN} . $(MAKE) ibus-xml $(MAKE) install-script +# Won't work ubuntu-20: go build -ldflags "-s -w" -o ${BIN} . $(MAKE) ibus-xml diff --git a/README.md b/README.md index 96d945d..1f2c091 100644 --- a/README.md +++ b/README.md @@ -14,23 +14,19 @@ See instructions in website: https://varnamproject.github.io/download/linux ### Building -Install dependencies: +* Install dependencies: ```bash sudo apt install libgtk-3-dev libcairo2-dev libglib2.0-dev ``` -For Ubuntu 18.04 & others with old GTK versions, [special build params](https://github.com/gotk3/gotk3/issues/693) are required: +* Build + ``` -go build -tags pango_1_42,gtk_3_22 . +make ubuntu-14 ``` -You can achieve the above with `make ubuntu-18`. This build will be **usable in majority of GNU/Linux distributions**. -You can also compile with latest GTK version with : -```bash -go build . -``` -or `make ubuntu-20` +The preferences dialog depends on GTK. The above command will build for **GTK 3.10** which means it'll work on Ubuntu 14.04 and later versions. ### Setup