Merge remote-tracking branch 'main/master'

Makefile

@@ -20,7 +20,7 @@ PREFIX=/usr
 engine_name=bamboo
 ibus_e_name=ibus-engine-$(engine_name)
 pkg_name=ibus-$(engine_name)
-version=0.6.8
+version=0.7.0
 
 engine_dir=$(PREFIX)/share/$(pkg_name)
 ibus_dir=$(PREFIX)/share/ibus
@@ -33,7 +33,7 @@ rpm_src_tar=$(rpm_src_dir)/$(tar_file)
 tar_options_src=--transform "s/^\./$(pkg_name)-$(version)/" --exclude={"*.tar.gz",".git",".idea"} .
 
 build:
-	GOPATH=$(CURDIR) go build -ldflags="-s -w" -o $(ibus_e_name) ibus-$(engine_name)
+	GOPATH=$(CURDIR) GO111MODULE=off go build -ldflags="-s -w" -o $(ibus_e_name) ibus-$(engine_name)
 
 clean:
 	rm -f ibus-engine-* *_linux *_cover.html go_test_* go_build_* test *.gz test

archlinux/PKGBUILD-git

@@ -17,7 +17,7 @@
 #
 # Maintainer: Luong Thanh Lam <[email protected]>
 pkgname=ibus-bamboo-git
-pkgver=0.6.8
+pkgver=0.7.0
 pkgrel=1
 pkgdesc='A Vietnamese IME for IBus'
 arch=(any)

archlinux/PKGBUILD-release

@@ -17,7 +17,7 @@
 #
 # Maintainer: Luong Thanh Lam <[email protected]>
 pkgname=ibus-bamboo
-pkgver=0.6.8
+pkgver=0.7.0
 pkgrel=1
 pkgdesc='A Vietnamese IME for IBus'
 arch=(any)

bamboo.xml

@@ -22,7 +22,7 @@
     <name>org.freedesktop.IBus.bamboo</name>
     <description>Vietnamese input engine for IBus</description>
     <exec>/usr/lib/ibus-engine-bamboo --ibus</exec>
-    <version>0.6.8</version>
+    <version>0.7.0</version>
     <author>Luong Thanh Lam &lt;[email protected]&gt;</author>
     <license>GPLv3</license>
     <homepage>https://github.com/BambooEngine/ibus-bamboo/</homepage>

debian/changelog

@@ -1,3 +1,15 @@
+ibus-bamboo (0.7.0-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Luong Thanh Lam <[email protected]>  Sun, 14 Mar 2021 09:21:06 +0700
+
+ibus-bamboo (0.6.8-2) stable; urgency=medium
+
+  * New upstream release
+
+ -- Luong Thanh Lam <[email protected]>  Sun, 31 Jan 2021 09:21:06 +0700
+
 ibus-bamboo (0.6.8-1) stable; urgency=medium
 
   * New upstream release

debian/control

@@ -20,7 +20,7 @@ Section: utils
 Priority: extra
 Maintainer: Luong Thanh Lam <[email protected]>
 Build-Depends: debhelper, golang, libx11-dev, libxtst-dev
-Standards-Version: 0.6.8
+Standards-Version: 0.7.0
 Homepage: https://github.com/BambooEngine/ibus-bamboo
 
 Package: ibus-bamboo

ibus-bamboo.dsc

@@ -4,12 +4,12 @@ Format: 1.0
 Source: ibus-bamboo
 Binary: ibus-bamboo
 Architecture: any
-Version: 0.6.8-0
+Version: 0.7.0-0
 Maintainer: Luong Thanh Lam <[email protected]>
 Homepage: https://github.com/BambooEngine/ibus-bamboo
 Build-Depends: debhelper, golang, libx11-dev, libxt-dev, libxtst-dev
 Files:
- 0 0 ibus-bamboo-0.6.8.tar.gz
+ 0 0 ibus-bamboo-0.7.0.tar.gz
 
 -----BEGIN PGP SIGNATURE-----
 

ibus-bamboo.spec

@@ -4,7 +4,7 @@
 %define ibus_comp_dir /usr/share/ibus/component
 
 Name: ibus-bamboo
-Version: 0.6.8
+Version: 0.7.0
 Release: 1%{?dist}
 Summary: A Vietnamese input method for IBus
 

src/github.com/dkolbly/wl-scanner/LICENSE

@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2016, sternix
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/github.com/dkolbly/wl-scanner/README.md

@@ -0,0 +1,60 @@
+wl-scanner
+==========
+
+The `wl-scanner` project is designed parse and generate Go client code
+from a wayland protocol file.
+
+In its base form, it produces the `client.go` code in
+`github.com/dkolbly/wl` from the canonical definition of the wayland
+protocol at
+https://cgit.freedesktop.org/wayland/wayland/plain/protocol/wayland.xml
+
+It is similar in concept to the wayland-scanner tool which was
+developed for generating the C client library.
+
+This is a hobby project intended to help people understand the
+wayland.xml protocol file and the generation go code, as well as to
+help build client libraries for protocols around Wayland.
+
+## Usage
+
+```
+go get github.com/dkolbly/wl-scanner
+
+# generate a client for the base protocol
+wl-scanner -source https://cgit.freedesktop.org/wayland/wayland/plain/protocol/wayland.xml \
+           -output $GOPATH/src/github.com/dkolbly/wl/client.go
+
+# generate a client for the xdg-shell protocol
+wl-scanner -pkg xdg \
+           -source https://raw.githubusercontent.com/wayland-project/wayland-protocols/master/stable/xdg-shell/xdg-shell.xml \
+           -output $GOPATH/src/github.com/dkolbly/wl/xdg/shell.go
+```
+
+### Unstable Protocols
+
+Unstable protocols can be generated in a way that makes it relatively
+easy to upgrade to newer versions of the protocol, under the assumption
+that changes are relatively small.  This is done by stripping the "_vN" suffix,
+as for example:
+
+```
+wl-scanner -pkg zxdg \
+           -source https://raw.githubusercontent.com/wayland-project/wayland-protocols/master/unstable/xdg-shell/xdg-shell-unstable-v6.xml \
+           -output $GOPATH/src/github.com/dkolbly/wl/xdg-unstable-v6/shell.go
+```
+
+The `zxdg` package name is preserved, but this can be imported in the client application
+as:
+
+```
+import (
+	xdg "github.com/dkolbly/wl/xdg-unstable-v6"
+)
+```
+
+and then most code will hopefully be able to port from one major
+change to another.  Obviously, mileage will vary depending on the
+extent of the change.
+
+

src/github.com/dkolbly/wl-scanner/TODO

@@ -0,0 +1,2 @@
+allow-null
+bitfield