[PR PATCH] ibus: disable python2 support

[PR PATCH] ibus: disable python2 support

[paper42]

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

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

https://github.com/paper42/void-packages ibus-py2
https://github.com/void-linux/void-packages/pull/35252

ibus: disable python2 support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

@the-maldridge 

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

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

From 0690fd21d343b4ef203be3ae755b95568968a9e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 26 Jan 2022 18:16:55 +0100
Subject: [PATCH 1/2] ibus: disable python2 support

---
 srcpkgs/ibus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 49675ff3d6a5..f12d7ec92ed0 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,16 +1,16 @@
 # Template file for 'ibus'
 pkgname=ibus
 version=1.5.23
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-ui --enable-gtk3 --disable-tests
  --disable-schemas-compile --enable-memconf --enable-dconf
- --enable-wayland --enable-python2 --with-python=/usr/bin/python3
+ --enable-wayland --with-python=/usr/bin/python3
  $(vopt_enable dicts emoji-dict) $(vopt_enable dicts unicode-dict)
  --enable-introspection --enable-vala $(vopt_enable ibus_setup setup)"
 hostmakedepends="automake gettext-devel libtool pkg-config intltool dconf
- python3 python glib-devel $(vopt_if vala vala) python-gobject-devel
+ python3 glib-devel $(vopt_if vala vala)
  $(vopt_if dicts 'cldr-emoji-annotation unicode-character-database unicode-emoji')"
 makedepends="dconf-devel gtk+-devel hicolor-icon-theme iso-codes
  json-glib-devel libnotify-devel librsvg-devel python3-xdg

From 0a5d3b059b6505082e42c5a123d2b66ec2b05fb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 26 Jan 2022 18:16:57 +0100
Subject: [PATCH 2/2] ibus-hangul: fix dependencies

---
 srcpkgs/ibus-hangul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-hangul/template b/srcpkgs/ibus-hangul/template
index c8d2d96993fc..66f1dd552788 100644
--- a/srcpkgs/ibus-hangul/template
+++ b/srcpkgs/ibus-hangul/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--libexec=/usr/lib/ibus --with-python=/usr/bin/python3"
 hostmakedepends="gettext libtool pkg-config swig"
-makedepends="ibus-devel libhangul-devel python-gobject-devel"
+makedepends="ibus-devel libhangul-devel"
 depends="ibus librsvg python3-gobject"
 short_desc="Korean input engine for IBus"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

Re: ibus: disable python2 support

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/35252#issuecomment-1024903642

Comment:
An update would be nice since 1.5.25 is already out. Also can you review and take some changes from #29025?

Re: ibus: disable python2 support

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35252#issuecomment-1024973056

Comment:
> An update would be nice since 1.5.25 is already out. Also can you review and take some changes from #29025?

I didn't see your PR, but I can't properly test an update because I don't regularly use ibus.

Re: [PR PATCH] [Updated] ibus: disable python2 support

[paper42]

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

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

https://github.com/paper42/void-packages ibus-py2
https://github.com/void-linux/void-packages/pull/35252

ibus: disable python2 support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

@the-maldridge 

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

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

From b3f6439571a053b22ebf37eea3ef337b4befeaea Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 26 Jan 2022 18:16:55 +0100
Subject: [PATCH 1/2] ibus: disable python2 support

---
 srcpkgs/ibus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 49675ff3d6a5..f12d7ec92ed0 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,16 +1,16 @@
 # Template file for 'ibus'
 pkgname=ibus
 version=1.5.23
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-ui --enable-gtk3 --disable-tests
  --disable-schemas-compile --enable-memconf --enable-dconf
- --enable-wayland --enable-python2 --with-python=/usr/bin/python3
+ --enable-wayland --with-python=/usr/bin/python3
  $(vopt_enable dicts emoji-dict) $(vopt_enable dicts unicode-dict)
  --enable-introspection --enable-vala $(vopt_enable ibus_setup setup)"
 hostmakedepends="automake gettext-devel libtool pkg-config intltool dconf
- python3 python glib-devel $(vopt_if vala vala) python-gobject-devel
+ python3 glib-devel $(vopt_if vala vala)
  $(vopt_if dicts 'cldr-emoji-annotation unicode-character-database unicode-emoji')"
 makedepends="dconf-devel gtk+-devel hicolor-icon-theme iso-codes
  json-glib-devel libnotify-devel librsvg-devel python3-xdg

From 632ffa978e02b6964d8a723f57ae99a0074f049c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 26 Jan 2022 18:16:57 +0100
Subject: [PATCH 2/2] ibus-hangul: remove an unnecessary build dep

---
 srcpkgs/ibus-hangul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-hangul/template b/srcpkgs/ibus-hangul/template
index c8d2d96993fc..66f1dd552788 100644
--- a/srcpkgs/ibus-hangul/template
+++ b/srcpkgs/ibus-hangul/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--libexec=/usr/lib/ibus --with-python=/usr/bin/python3"
 hostmakedepends="gettext libtool pkg-config swig"
-makedepends="ibus-devel libhangul-devel python-gobject-devel"
+makedepends="ibus-devel libhangul-devel"
 depends="ibus librsvg python3-gobject"
 short_desc="Korean input engine for IBus"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

Re: [PR PATCH] [Merged]: ibus: disable python2 support

[paper42]

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

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

ibus: disable python2 support
https://github.com/void-linux/void-packages/pull/35252

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

@the-maldridge