Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gajim: update to 1.3.3
@ 2021-10-13  2:03 chili-b
  2021-10-13  2:06 ` [PR PATCH] [Updated] " chili-b
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: chili-b @ 2021-10-13  2:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages gajim
https://github.com/void-linux/void-packages/pull/33514

gajim: update to 1.3.3
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
-->
Had to change the `wrksrc` for `gajim` to `gajim-gajim-${version}` to match the top-level directory in the archive. This should be noted as it might be an error by the Gajim developers and could have to be reversed for a future release. Also bumped the version of `python3-nbxmpp` to `2.0.4` as Gajim 1.3.3 depends on that version.

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

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

From 579284b1a0860b5868fd48c7087274d69c8da006 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 21:57:53 -0400
Subject: [PATCH] gajim: update to 1.3.3

---
 srcpkgs/gajim/template          | 7 ++++---
 srcpkgs/python3-nbxmpp/template | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 49eda2f31542..198f85e1b5f1 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,7 +1,8 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.3.2
-revision=2
+version=1.3.3
+revision=1
+wrksrc="gajim-gajim-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
@@ -13,7 +14,7 @@ license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=70ea462b3f3c3b3c0b8d3129fae912d24062e77a8cce80781f69e8f43eda5fee
+checksum=ddbcbe6aaf36c238e0ca7503034ed0870a5b059a96e9a4f973409ecdeec4678c
 # Does not find gdk, introspection typelib
 # even wtih gdk-pixbuf in checkdepends
 make_check=no
diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index 332b88092708..ee4065b441fe 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=2.0.2
-revision=2
+version=2.0.4
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 #changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=a3863671ab88992d3ea5d475b25c88ffe18aa1030c9ce980e1014470d4760291
+checksum=2cc967808fe73d01adee59c084d17bf5f1d27e33e98ed4f2467a1e7c638457e8
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

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

* Re: [PR PATCH] [Updated] gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
@ 2021-10-13  2:06 ` chili-b
  2021-10-15  4:07 ` ericonr
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: chili-b @ 2021-10-13  2:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages gajim
https://github.com/void-linux/void-packages/pull/33514

gajim: update to 1.3.3
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
-->
Had to change the `wrksrc` for `gajim` to `gajim-gajim-${version}` to match the top-level directory in the archive. This should be noted as it might be an error by the Gajim developers and could have to be reversed for a future release. Also bumped the version of `python3-nbxmpp` to `2.0.4` as Gajim 1.3.3 depends on that version.

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

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

From 46a005e7dca5b02076afc5aa922293cfbb910fe1 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:05:42 -0400
Subject: [PATCH 1/2] gajim: update to 1.3.3

---
 srcpkgs/gajim/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 49eda2f31542..198f85e1b5f1 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,7 +1,8 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.3.2
-revision=2
+version=1.3.3
+revision=1
+wrksrc="gajim-gajim-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
@@ -13,7 +14,7 @@ license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=70ea462b3f3c3b3c0b8d3129fae912d24062e77a8cce80781f69e8f43eda5fee
+checksum=ddbcbe6aaf36c238e0ca7503034ed0870a5b059a96e9a4f973409ecdeec4678c
 # Does not find gdk, introspection typelib
 # even wtih gdk-pixbuf in checkdepends
 make_check=no

From e484cb200dd99f2bb3c4ecbd4758c2f847c6a2ef Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:06:04 -0400
Subject: [PATCH 2/2] python3-nbxmpp: update to 2.0.4

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

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index 332b88092708..ee4065b441fe 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=2.0.2
-revision=2
+version=2.0.4
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 #changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=a3863671ab88992d3ea5d475b25c88ffe18aa1030c9ce980e1014470d4760291
+checksum=2cc967808fe73d01adee59c084d17bf5f1d27e33e98ed4f2467a1e7c638457e8
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

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

* Re: gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
  2021-10-13  2:06 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-15  4:07 ` ericonr
  2021-10-15 18:43 ` teldra
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-10-15  4:07 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33514#issuecomment-943968528

Comment:
@teldra LGTM, ok for you?

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

* Re: gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
  2021-10-13  2:06 ` [PR PATCH] [Updated] " chili-b
  2021-10-15  4:07 ` ericonr
@ 2021-10-15 18:43 ` teldra
  2021-10-17 19:13 ` thesnallygaster
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: teldra @ 2021-10-15 18:43 UTC (permalink / raw)
  To: ml

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

New comment by teldra on void-packages repository

https://github.com/void-linux/void-packages/pull/33514#issuecomment-944518875

Comment:
LGTM but i did not test it.. I am short on time and ressources. :(

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

* Re: gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
                   ` (2 preceding siblings ...)
  2021-10-15 18:43 ` teldra
@ 2021-10-17 19:13 ` thesnallygaster
  2021-10-18 22:48 ` [PR PATCH] [Updated] " chili-b
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: thesnallygaster @ 2021-10-17 19:13 UTC (permalink / raw)
  To: ml

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

New comment by thesnallygaster on void-packages repository

https://github.com/void-linux/void-packages/pull/33514#issuecomment-945178805

Comment:
As I'm using gajim daily I thought I might as well contribute so I went through both packages and found out a few things.

Both python3-Pillow and python3-cairo could be added as they're actually used for some things, I couldn't find anything on python3-distro though.
python3-idna and libsoup should be moved to depends of python3-nbxmpp (both stated as runtime dep there; see [here](https://dev.gajim.org/gajim/python-nbxmpp#runtime-requirements); gajim won't start if python3-nbxmpp doesn't find python3-idna, ask me how I know).
python3-pyasn1 can be removed as it's not used since at least 2018 (see [here](https://dev.gajim.org/gajim/gajim/-/issues/7841#note_189706)), python3-cssutils can also be removed as it's been replaced with python3-css-parser like 2 years ago (see [here](https://dev.gajim.org/gajim/gajim/-/commit/afbfb63a000b6c1baf2445ac5d794d5b39024495)).
Oh, and python3-openssl should be moved to depends of gajim.

Everything running just fine after those changes, no weird warnings or anything.

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

* Re: [PR PATCH] [Updated] gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
                   ` (3 preceding siblings ...)
  2021-10-17 19:13 ` thesnallygaster
@ 2021-10-18 22:48 ` chili-b
  2021-10-18 22:48 ` chili-b
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: chili-b @ 2021-10-18 22:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages gajim
https://github.com/void-linux/void-packages/pull/33514

gajim: update to 1.3.3
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
-->
Had to change the `wrksrc` for `gajim` to `gajim-gajim-${version}` to match the top-level directory in the archive. This should be noted as it might be an error by the Gajim developers and could have to be reversed for a future release. Also bumped the version of `python3-nbxmpp` to `2.0.4` as Gajim 1.3.3 depends on that version.

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

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

From 0ee89871f2dbf32530d0fe7cdb1209f26ea92755 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:05:42 -0400
Subject: [PATCH 1/2] gajim: update to 1.3.3

---
 srcpkgs/gajim/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 49eda2f31542..5756279c0528 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,19 +1,20 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.3.2
-revision=2
+version=1.3.3
+revision=1
+wrksrc="gajim-gajim-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
-depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
- python3-precis-i18n python3-keyring python3-cssutils python3-packaging
- python3-css-parser python3-idna farstream python3-dbus libsoup"
+depends="python3-gobject python3-nbxmpp python3-setuptools python3-Pillow
+ python3-cairo python3-precis-i18n python3-keyring python3-css-parser
+ python3-packaging python3-css-parser farstream python3-dbus python3-openssl"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=70ea462b3f3c3b3c0b8d3129fae912d24062e77a8cce80781f69e8f43eda5fee
+checksum=ddbcbe6aaf36c238e0ca7503034ed0870a5b059a96e9a4f973409ecdeec4678c
 # Does not find gdk, introspection typelib
 # even wtih gdk-pixbuf in checkdepends
 make_check=no

From 841f830fc536e03a375f347662a75ce74c7ed950 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:06:04 -0400
Subject: [PATCH 2/2] python3-nbxmpp: update to 2.0.4

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

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index 332b88092708..ee4065b441fe 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=2.0.2
-revision=2
+version=2.0.4
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 #changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=a3863671ab88992d3ea5d475b25c88ffe18aa1030c9ce980e1014470d4760291
+checksum=2cc967808fe73d01adee59c084d17bf5f1d27e33e98ed4f2467a1e7c638457e8
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

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

* Re: gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
                   ` (4 preceding siblings ...)
  2021-10-18 22:48 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-18 22:48 ` chili-b
  2021-10-18 22:51 ` [PR PATCH] [Updated] " chili-b
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: chili-b @ 2021-10-18 22:48 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33514#issuecomment-946226952

Comment:
> As I'm using gajim daily I thought I might as well contribute so I went through both packages and found out a few things.
> 
> Both python3-Pillow and python3-cairo could be added as they're actually used for some things, I couldn't find anything on python3-distro though. python3-idna and libsoup should be moved to depends of python3-nbxmpp (both stated as runtime dep there; see [here](https://dev.gajim.org/gajim/python-nbxmpp#runtime-requirements); gajim won't start if python3-nbxmpp doesn't find python3-idna, ask me how I know). python3-pyasn1 can be removed as it's not used since at least 2018 (see [here](https://dev.gajim.org/gajim/gajim/-/issues/7841#note_189706)), python3-cssutils can also be removed as it's been replaced with python3-css-parser like 2 years ago (see [here](https://dev.gajim.org/gajim/gajim/-/commit/afbfb63a000b6c1baf2445ac5d794d5b39024495)). Oh, and python3-openssl should be moved to depends of gajim.
> 
> Everything running just fine after those changes, no weird warnings or anything.

I've applied these changes and everything works fine

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

* Re: [PR PATCH] [Updated] gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
                   ` (5 preceding siblings ...)
  2021-10-18 22:48 ` chili-b
@ 2021-10-18 22:51 ` chili-b
  2021-10-19  2:09 ` chili-b
  2021-10-25  1:24 ` [PR PATCH] [Merged]: " ericonr
  8 siblings, 0 replies; 10+ messages in thread
From: chili-b @ 2021-10-18 22:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages gajim
https://github.com/void-linux/void-packages/pull/33514

gajim: update to 1.3.3
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
-->
Had to change the `wrksrc` for `gajim` to `gajim-gajim-${version}` to match the top-level directory in the archive. This should be noted as it might be an error by the Gajim developers and could have to be reversed for a future release. Also bumped the version of `python3-nbxmpp` to `2.0.4` as Gajim 1.3.3 depends on that version.

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

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

From 0ee89871f2dbf32530d0fe7cdb1209f26ea92755 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:05:42 -0400
Subject: [PATCH 1/2] gajim: update to 1.3.3

---
 srcpkgs/gajim/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 49eda2f31542..5756279c0528 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,19 +1,20 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.3.2
-revision=2
+version=1.3.3
+revision=1
+wrksrc="gajim-gajim-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
-depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
- python3-precis-i18n python3-keyring python3-cssutils python3-packaging
- python3-css-parser python3-idna farstream python3-dbus libsoup"
+depends="python3-gobject python3-nbxmpp python3-setuptools python3-Pillow
+ python3-cairo python3-precis-i18n python3-keyring python3-css-parser
+ python3-packaging python3-css-parser farstream python3-dbus python3-openssl"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=70ea462b3f3c3b3c0b8d3129fae912d24062e77a8cce80781f69e8f43eda5fee
+checksum=ddbcbe6aaf36c238e0ca7503034ed0870a5b059a96e9a4f973409ecdeec4678c
 # Does not find gdk, introspection typelib
 # even wtih gdk-pixbuf in checkdepends
 make_check=no

From f71992a0a77c91acf9d120db27a6f7c1aae527f5 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:06:04 -0400
Subject: [PATCH 2/2] python3-nbxmpp: update to 2.0.4

---
 srcpkgs/python3-nbxmpp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index 332b88092708..e1ea0667bb57 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=2.0.2
-revision=2
+version=2.0.4
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-gobject python3-openssl python3-precis-i18n python3-idna"
+depends="python3-gobject python3-openssl python3-precis-i18n python3-idna libsoup"
 checkdepends="${depends} python3-wheel python3-pylint python3-coverage libsoup"
 short_desc="Non blocking Jabber/XMPP module"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 #changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=a3863671ab88992d3ea5d475b25c88ffe18aa1030c9ce980e1014470d4760291
+checksum=2cc967808fe73d01adee59c084d17bf5f1d27e33e98ed4f2467a1e7c638457e8
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

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

* Re: [PR PATCH] [Updated] gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
                   ` (6 preceding siblings ...)
  2021-10-18 22:51 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-19  2:09 ` chili-b
  2021-10-25  1:24 ` [PR PATCH] [Merged]: " ericonr
  8 siblings, 0 replies; 10+ messages in thread
From: chili-b @ 2021-10-19  2:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages gajim
https://github.com/void-linux/void-packages/pull/33514

gajim: update to 1.3.3
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
-->
Had to change the `wrksrc` for `gajim` to `gajim-gajim-${version}` to match the top-level directory in the archive. This should be noted as it might be an error by the Gajim developers and could have to be reversed for a future release. Also bumped the version of `python3-nbxmpp` to `2.0.4` as Gajim 1.3.3 depends on that version.

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

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

From 1c59442d72f2da2740c2349ae5f1aba0c24060f7 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:05:42 -0400
Subject: [PATCH 1/2] gajim: update to 1.3.3

---
 srcpkgs/gajim/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 49eda2f31542..ff3278df8e66 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,19 +1,20 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.3.2
-revision=2
+version=1.3.3
+revision=1
+wrksrc="gajim-gajim-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
-depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
- python3-precis-i18n python3-keyring python3-cssutils python3-packaging
- python3-css-parser python3-idna farstream python3-dbus libsoup"
+depends="python3-gobject python3-nbxmpp python3-setuptools python3-Pillow
+ python3-cairo python3-precis-i18n python3-keyring python3-packaging
+ python3-css-parser farstream python3-dbus python3-openssl"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=70ea462b3f3c3b3c0b8d3129fae912d24062e77a8cce80781f69e8f43eda5fee
+checksum=ddbcbe6aaf36c238e0ca7503034ed0870a5b059a96e9a4f973409ecdeec4678c
 # Does not find gdk, introspection typelib
 # even wtih gdk-pixbuf in checkdepends
 make_check=no

From e4a8179702a24ab94cba465befd4660eacb10140 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Tue, 12 Oct 2021 22:06:04 -0400
Subject: [PATCH 2/2] python3-nbxmpp: update to 2.0.4

---
 srcpkgs/python3-nbxmpp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index 332b88092708..e1ea0667bb57 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=2.0.2
-revision=2
+version=2.0.4
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-gobject python3-openssl python3-precis-i18n python3-idna"
+depends="python3-gobject python3-openssl python3-precis-i18n python3-idna libsoup"
 checkdepends="${depends} python3-wheel python3-pylint python3-coverage libsoup"
 short_desc="Non blocking Jabber/XMPP module"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 #changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=a3863671ab88992d3ea5d475b25c88ffe18aa1030c9ce980e1014470d4760291
+checksum=2cc967808fe73d01adee59c084d17bf5f1d27e33e98ed4f2467a1e7c638457e8
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

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

* Re: [PR PATCH] [Merged]: gajim: update to 1.3.3
  2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
                   ` (7 preceding siblings ...)
  2021-10-19  2:09 ` chili-b
@ 2021-10-25  1:24 ` ericonr
  8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-10-25  1:24 UTC (permalink / raw)
  To: ml

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

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

gajim: update to 1.3.3
https://github.com/void-linux/void-packages/pull/33514

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

#### General
- [ ] 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
-->
Had to change the `wrksrc` for `gajim` to `gajim-gajim-${version}` to match the top-level directory in the archive. This should be noted as it might be an error by the Gajim developers and could have to be reversed for a future release. Also bumped the version of `python3-nbxmpp` to `2.0.4` as Gajim 1.3.3 depends on that version.

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

end of thread, other threads:[~2021-10-25  1:24 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-13  2:03 [PR PATCH] gajim: update to 1.3.3 chili-b
2021-10-13  2:06 ` [PR PATCH] [Updated] " chili-b
2021-10-15  4:07 ` ericonr
2021-10-15 18:43 ` teldra
2021-10-17 19:13 ` thesnallygaster
2021-10-18 22:48 ` [PR PATCH] [Updated] " chili-b
2021-10-18 22:48 ` chili-b
2021-10-18 22:51 ` [PR PATCH] [Updated] " chili-b
2021-10-19  2:09 ` chili-b
2021-10-25  1:24 ` [PR PATCH] [Merged]: " ericonr

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).