Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: x-unikey-1.0.4
@ 2021-08-08  7:55 linhvng
  2021-08-08  7:58 ` linhvng
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: linhvng @ 2021-08-08  7:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]

There is a new pull request by linhvng against master on the void-packages repository

https://github.com/linhvng/void-packages master
https://github.com/void-linux/void-packages/pull/32405

New package: x-unikey-1.0.4
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32405.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32405.patch --]
[-- Type: text/x-diff, Size: 3286 bytes --]

From 03d09e2501a3b4c95904e08b32dd842b1f840997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linh=20Nguy=E1=BB=85n?= <linhvng.2212@gmail.com>
Date: Sun, 8 Aug 2021 03:42:29 -0400
Subject: [PATCH] New package: x-unikey-1.0.4

---
 .../patch-src_ukengine_mactab.cpp.patch        | 11 +++++++++++
 .../patch-src_ukengine_usrkeymap.cpp.patch     | 18 ++++++++++++++++++
 .../patches/patch-src_xim_install.sh.patch     |  8 ++++++++
 srcpkgs/x-unikey/template                      | 15 +++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
 create mode 100644 srcpkgs/x-unikey/template

diff --git a/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch b/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
new file mode 100644
index 000000000000..4bb7988bb542
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
@@ -0,0 +1,11 @@
+--- a/src/ukengine/mactab.cpp 2006-04-09 11:46:02 UTC
++++ b/src/ukengine/mactab.cpp
+@@ -287,7 +287,7 @@
+   char key[MAX_MACRO_KEY_LEN];
+
+   // Parse the input item
+-  char * pos = strchr(item, ':');
++  const char * pos = strchr(item, ':');
+   if (pos == NULL)
+     return -1;
+   int keyLen = (int)(pos - item);
diff --git a/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch b/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
new file mode 100644
index 000000000000..88e5d81e1b8b
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
@@ -0,0 +1,18 @@
+--- a/src/ukengine/usrkeymap.cpp 2006-04-08 19:31:40.000000000 -0400
++++ b/src/ukengine/usrkeymap.cpp
+@@ -25,6 +25,7 @@
+ #include <iostream>
+ using namespace std;
+
++#include <cstring>
+ #include <ctype.h>
+ #include "usrkeymap.h"
+
+@@ -262,4 +263,4 @@
+             return i;
+     }
+     return -1;
+-}
+\ No newline at end of file
++}
+
diff --git a/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch b/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
new file mode 100644
index 000000000000..27c5ed4f9339
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
@@ -0,0 +1,8 @@
+--- a/src/xim/install.sh 2018-08-25 14:18:57 UTC
++++ b/src/xim/install.sh
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0
+ echo 
+ echo "To use UniKey, certain environment variables must be set."
+ echo "Do you want to set these variables in /etc/profile? (y/N)
diff --git a/srcpkgs/x-unikey/template b/srcpkgs/x-unikey/template
new file mode 100644
index 000000000000..689941c07653
--- /dev/null
+++ b/srcpkgs/x-unikey/template
@@ -0,0 +1,15 @@
+# Template file for 'x-unikey'
+pkgname=x-unikey
+version=1.0.4
+revision=1
+build_style=gnu-configure
+makedepends="libX11-devel"
+short_desc="Vietnamese input method for X"
+maintainer="Linh Nguyễn <linhvng.2212@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://www.unikey.org"
+distfiles="${SOURCEFORGE_SITE}/unikey/${pkgname}-${version}.tar.bz2"
+checksum=aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9
+
+CFLAGS+="-g -O2 -Wno-narrowing"
+CXXFLAGS+="-g -O2 -Wno-narrowing"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
@ 2021-08-08  7:58 ` linhvng
  2021-08-08  7:59 ` linhvng
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: linhvng @ 2021-08-08  7:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by linhvng on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#issuecomment-894759111

Comment:
The patches follow what FreeBSD maintainer did to compile the package in FreeBSD. I currently use it on my x86_64-glibc laptop :smiley: 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
  2021-08-08  7:58 ` linhvng
@ 2021-08-08  7:59 ` linhvng
  2021-08-08  8:43 ` [PR REVIEW] " sgn
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: linhvng @ 2021-08-08  7:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

New comment by linhvng on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#issuecomment-894759111

Comment:
The patches follow what FreeBSD maintainer did to compile the package in FreeBSD. Here is the link to this package on FreeBSD: https://cgit.freebsd.org/ports/tree/vietnamese/x-unikey

I currently use it on my x86_64-glibc laptop :smiley: 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR REVIEW] New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
  2021-08-08  7:58 ` linhvng
  2021-08-08  7:59 ` linhvng
@ 2021-08-08  8:43 ` sgn
  2021-08-08  8:52 ` sgn
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2021-08-08  8:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#discussion_r684739061

Comment:
`-g -O2` is set by `xbps-src`, I'll add a patch for musl, too.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR REVIEW] New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (2 preceding siblings ...)
  2021-08-08  8:43 ` [PR REVIEW] " sgn
@ 2021-08-08  8:52 ` sgn
  2021-08-08  9:08 ` linhvng
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2021-08-08  8:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#discussion_r684740188

Comment:
Most of them are `GPL-2.0-or-later`, some files are licensed under `MIT`.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR REVIEW] New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (3 preceding siblings ...)
  2021-08-08  8:52 ` sgn
@ 2021-08-08  9:08 ` linhvng
  2021-08-08  9:28 ` [PR PATCH] [Updated] " linhvng
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: linhvng @ 2021-08-08  9:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New review comment by linhvng on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#discussion_r684742157

Comment:
sorry, it's my first time adding a package and tracking down the license :sweat_smile: thought it was GPL2 because of the COPYING file... what license should i change it to?

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (4 preceding siblings ...)
  2021-08-08  9:08 ` linhvng
@ 2021-08-08  9:28 ` linhvng
  2021-08-08  9:30 ` linhvng
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: linhvng @ 2021-08-08  9:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]

There is an updated pull request by linhvng against master on the void-packages repository

https://github.com/linhvng/void-packages master
https://github.com/void-linux/void-packages/pull/32405

New package: x-unikey-1.0.4
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32405.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32405.patch --]
[-- Type: text/x-diff, Size: 3276 bytes --]

From 9946ed245b209a51c84124b6623215c217802417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linh=20Nguy=E1=BB=85n?= <linhvng.2212@gmail.com>
Date: Sun, 8 Aug 2021 03:42:29 -0400
Subject: [PATCH] New package: x-unikey-1.0.4

---
 .../patch-src_ukengine_mactab.cpp.patch        | 11 +++++++++++
 .../patch-src_ukengine_usrkeymap.cpp.patch     | 18 ++++++++++++++++++
 .../patches/patch-src_xim_install.sh.patch     |  8 ++++++++
 srcpkgs/x-unikey/template                      | 15 +++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
 create mode 100644 srcpkgs/x-unikey/template

diff --git a/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch b/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
new file mode 100644
index 000000000000..4bb7988bb542
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
@@ -0,0 +1,11 @@
+--- a/src/ukengine/mactab.cpp 2006-04-09 11:46:02 UTC
++++ b/src/ukengine/mactab.cpp
+@@ -287,7 +287,7 @@
+   char key[MAX_MACRO_KEY_LEN];
+
+   // Parse the input item
+-  char * pos = strchr(item, ':');
++  const char * pos = strchr(item, ':');
+   if (pos == NULL)
+     return -1;
+   int keyLen = (int)(pos - item);
diff --git a/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch b/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
new file mode 100644
index 000000000000..88e5d81e1b8b
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
@@ -0,0 +1,18 @@
+--- a/src/ukengine/usrkeymap.cpp 2006-04-08 19:31:40.000000000 -0400
++++ b/src/ukengine/usrkeymap.cpp
+@@ -25,6 +25,7 @@
+ #include <iostream>
+ using namespace std;
+
++#include <cstring>
+ #include <ctype.h>
+ #include "usrkeymap.h"
+
+@@ -262,4 +263,4 @@
+             return i;
+     }
+     return -1;
+-}
+\ No newline at end of file
++}
+
diff --git a/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch b/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
new file mode 100644
index 000000000000..27c5ed4f9339
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
@@ -0,0 +1,8 @@
+--- a/src/xim/install.sh 2018-08-25 14:18:57 UTC
++++ b/src/xim/install.sh
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0
+ echo 
+ echo "To use UniKey, certain environment variables must be set."
+ echo "Do you want to set these variables in /etc/profile? (y/N)
diff --git a/srcpkgs/x-unikey/template b/srcpkgs/x-unikey/template
new file mode 100644
index 000000000000..d544fafa03f0
--- /dev/null
+++ b/srcpkgs/x-unikey/template
@@ -0,0 +1,15 @@
+# Template file for 'x-unikey'
+pkgname=x-unikey
+version=1.0.4
+revision=1
+build_style=gnu-configure
+makedepends="libX11-devel"
+short_desc="Vietnamese input method for X"
+maintainer="Linh Nguyễn <linhvng.2212@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.unikey.org"
+distfiles="${SOURCEFORGE_SITE}/unikey/${pkgname}-${version}.tar.bz2"
+checksum=aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9
+
+CFLAGS+="-Wno-narrowing"
+CXXFLAGS+="-Wno-narrowing"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (5 preceding siblings ...)
  2021-08-08  9:28 ` [PR PATCH] [Updated] " linhvng
@ 2021-08-08  9:30 ` linhvng
  2021-08-08 13:41 ` [PR PATCH] [Updated] " sgn
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: linhvng @ 2021-08-08  9:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New comment by linhvng on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#issuecomment-894769502

Comment:
- remove `-g -O2` from CFLAGS and CXXFLAGS
- update license to `GPL-2.0-or-later`

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (6 preceding siblings ...)
  2021-08-08  9:30 ` linhvng
@ 2021-08-08 13:41 ` sgn
  2021-08-08 13:44 ` sgn
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2021-08-08 13:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/linhvng/void-packages master
https://github.com/void-linux/void-packages/pull/32405

New package: x-unikey-1.0.4
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32405.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32405.patch --]
[-- Type: text/x-diff, Size: 4524 bytes --]

From cf2ef37b619554206f0563958439514fef548cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linh=20Nguy=E1=BB=85n?= <linhvng.2212@gmail.com>
Date: Sun, 8 Aug 2021 03:42:29 -0400
Subject: [PATCH] New package: x-unikey-1.0.4

Close: #32405
---
 .../patch-src_ukengine_mactab.cpp.patch       | 11 +++++++
 .../patch-src_ukengine_usrkeymap.cpp.patch    | 18 ++++++++++
 .../patches/patch-src_xim_install.sh.patch    |  8 +++++
 srcpkgs/x-unikey/patches/wait-any.patch       | 15 +++++++++
 srcpkgs/x-unikey/template                     | 33 +++++++++++++++++++
 5 files changed, 85 insertions(+)
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
 create mode 100644 srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
 create mode 100644 srcpkgs/x-unikey/patches/wait-any.patch
 create mode 100644 srcpkgs/x-unikey/template

diff --git a/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch b/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
new file mode 100644
index 000000000000..4bb7988bb542
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_ukengine_mactab.cpp.patch
@@ -0,0 +1,11 @@
+--- a/src/ukengine/mactab.cpp 2006-04-09 11:46:02 UTC
++++ b/src/ukengine/mactab.cpp
+@@ -287,7 +287,7 @@
+   char key[MAX_MACRO_KEY_LEN];
+
+   // Parse the input item
+-  char * pos = strchr(item, ':');
++  const char * pos = strchr(item, ':');
+   if (pos == NULL)
+     return -1;
+   int keyLen = (int)(pos - item);
diff --git a/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch b/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
new file mode 100644
index 000000000000..88e5d81e1b8b
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_ukengine_usrkeymap.cpp.patch
@@ -0,0 +1,18 @@
+--- a/src/ukengine/usrkeymap.cpp 2006-04-08 19:31:40.000000000 -0400
++++ b/src/ukengine/usrkeymap.cpp
+@@ -25,6 +25,7 @@
+ #include <iostream>
+ using namespace std;
+
++#include <cstring>
+ #include <ctype.h>
+ #include "usrkeymap.h"
+
+@@ -262,4 +263,4 @@
+             return i;
+     }
+     return -1;
+-}
+\ No newline at end of file
++}
+
diff --git a/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch b/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
new file mode 100644
index 000000000000..27c5ed4f9339
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/patch-src_xim_install.sh.patch
@@ -0,0 +1,8 @@
+--- a/src/xim/install.sh 2018-08-25 14:18:57 UTC
++++ b/src/xim/install.sh
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0
+ echo 
+ echo "To use UniKey, certain environment variables must be set."
+ echo "Do you want to set these variables in /etc/profile? (y/N)
diff --git a/srcpkgs/x-unikey/patches/wait-any.patch b/srcpkgs/x-unikey/patches/wait-any.patch
new file mode 100644
index 000000000000..5aa57fa5cdaf
--- /dev/null
+++ b/srcpkgs/x-unikey/patches/wait-any.patch
@@ -0,0 +1,15 @@
+Index: x-unikey-1.0.4/src/gui/gui.c
+===================================================================
+--- x-unikey-1.0.4.orig/src/gui/gui.c
++++ x-unikey-1.0.4/src/gui/gui.c
+@@ -40,6 +40,10 @@
+ #include "uksync.h"
+ #include "guiopt.h"
+ 
++#ifndef WAIT_ANY
++#define WAIT_ANY -1
++#endif
++
+ #define PROG_NAME "Unikey XIM Simple GUI"
+ 
+ /* using global variables is a very bad way of communication. Must do something better!!! */
diff --git a/srcpkgs/x-unikey/template b/srcpkgs/x-unikey/template
new file mode 100644
index 000000000000..421d38eeac84
--- /dev/null
+++ b/srcpkgs/x-unikey/template
@@ -0,0 +1,33 @@
+# Template file for 'x-unikey'
+pkgname=x-unikey
+version=1.0.4
+revision=1
+build_style=gnu-configure
+makedepends="libX11-devel"
+short_desc="Vietnamese input method for X"
+maintainer="Linh Nguyễn <linhvng.2212@gmail.com>"
+license="GPL-2.0-or-later, MIT"
+homepage="https://www.unikey.org"
+distfiles="${SOURCEFORGE_SITE}/unikey/${pkgname}-${version}.tar.bz2"
+checksum=aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9
+
+CFLAGS="-Wno-narrowing"
+CXXFLAGS="-Wno-narrowing"
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	broken="built and run, can't type Vietnamese"
+fi
+
+post_install() {
+	head -30 src/IMdkit/i18nIMProto.c >dec-hp-sun.license
+	vlicense dec-hp-sun.license
+
+	vdoc doc/keymap-syntax
+	vdoc doc/manual
+	vdoc doc/unikey-manual-0.9.pdf
+	vsconf doc/options
+	vsconf doc/ukmacro
+	vsconf doc/unikeyrc
+	vcopy doc/im-samples usr/share/examples/$pkgname
+	rm -r $DESTDIR/usr/share/examples/$pkgname/im-samples/CVS
+}

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (7 preceding siblings ...)
  2021-08-08 13:41 ` [PR PATCH] [Updated] " sgn
@ 2021-08-08 13:44 ` sgn
  2021-08-08 14:54 ` linhvng
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2021-08-08 13:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#issuecomment-894800108

Comment:
I've fixed the build for musl libc, however, it's hung when typing.

Anyway, just out of curiosity, have you tried another input framework?
I'm not really sure if it's worth to include this package for 1 user. :-p 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (8 preceding siblings ...)
  2021-08-08 13:44 ` sgn
@ 2021-08-08 14:54 ` linhvng
  2021-08-08 16:22 ` sgn
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: linhvng @ 2021-08-08 14:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1009 bytes --]

New comment by linhvng on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#issuecomment-894809534

Comment:
> I've fixed the build for musl libc, however, it's hung when typing.
> 
> Anyway, just out of curiosity, have you tried another input framework?
> I'm not really sure if it's worth to include this package for 1 user. :-p

I have tried fcitx but it puts my CPU to 100% for some reasons; I was using fluxbox and the tray icon for fcitx keeps flashing in the toolbar, which makes me suspect fluxbox might be trying to update/refresh the toolbar along with fcitx tray icon too much, thus pushing the CPU usage...

Your reason is totally understandable, it is a niche tool after all and the fact that it's broken on musl doesn't help either :sweat_smile:

I'm totally happy with keeping it in my forked repo and I'll try to bother you again when I get it to work on musl once I get my hand on more hardware :laughing: It's been a pleasant working with you :hugs: 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (9 preceding siblings ...)
  2021-08-08 14:54 ` linhvng
@ 2021-08-08 16:22 ` sgn
  2021-08-08 17:45 ` linhvng
  2021-08-09  2:24 ` [PR PATCH] [Closed]: " sgn
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2021-08-08 16:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#issuecomment-894821107

Comment:
> > I've fixed the build for musl libc, however, it's hung when typing.
> > Anyway, just out of curiosity, have you tried another input framework?
> > I'm not really sure if it's worth to include this package for 1 user. :-p
> 
> I have tried fcitx but it puts my CPU to 100% for some reasons; I was using fluxbox and the tray icon for fcitx keeps flashing in the toolbar, which makes me suspect fluxbox might be trying to update/refresh the toolbar along with fcitx tray icon too much, thus pushing the CPU usage...

Hm, weird, I've installed fluxbox to try, and fcitx's resource consumption is pretty normal for me.
Anyway, I would recommend using `fcitx5` instead, there's `fcitx5-m17n` to type Vietnamese.

In my experience, `fcitx5` is a lot better than `fcitx`.
I also hear good feedback on `ibus-bamboo`.

> 
> Your reason is totally understandable, it is a niche tool after all and the fact that it's broken on musl doesn't help either sweat_smile
> 
> I'm totally happy with keeping it in my forked repo and I'll try to bother you again when I get it to work on musl once I get my hand on more hardware laughing It's been a pleasant working with you hugs



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (10 preceding siblings ...)
  2021-08-08 16:22 ` sgn
@ 2021-08-08 17:45 ` linhvng
  2021-08-09  2:24 ` [PR PATCH] [Closed]: " sgn
  12 siblings, 0 replies; 14+ messages in thread
From: linhvng @ 2021-08-08 17:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New comment by linhvng on void-packages repository

https://github.com/void-linux/void-packages/pull/32405#issuecomment-894831118

Comment:
I didn't know about `ibus-bamboo`, it works flawlessly! Thank you very much! :clinking_glasses: I'm more than happy to have the pull request closed if you are :smile: 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Closed]: New package: x-unikey-1.0.4
  2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
                   ` (11 preceding siblings ...)
  2021-08-08 17:45 ` linhvng
@ 2021-08-09  2:24 ` sgn
  12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2021-08-09  2:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1441 bytes --]

There's a closed pull request on the void-packages repository

New package: x-unikey-1.0.4
https://github.com/void-linux/void-packages/pull/32405

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2021-08-09  2:24 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-08  7:55 [PR PATCH] New package: x-unikey-1.0.4 linhvng
2021-08-08  7:58 ` linhvng
2021-08-08  7:59 ` linhvng
2021-08-08  8:43 ` [PR REVIEW] " sgn
2021-08-08  8:52 ` sgn
2021-08-08  9:08 ` linhvng
2021-08-08  9:28 ` [PR PATCH] [Updated] " linhvng
2021-08-08  9:30 ` linhvng
2021-08-08 13:41 ` [PR PATCH] [Updated] " sgn
2021-08-08 13:44 ` sgn
2021-08-08 14:54 ` linhvng
2021-08-08 16:22 ` sgn
2021-08-08 17:45 ` linhvng
2021-08-09  2:24 ` [PR PATCH] [Closed]: " sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).