[PR PATCH] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[PR PATCH] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

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

https://github.com/hsnfirdaus/void-packages nm-openvpn
https://github.com/void-linux/void-packages/pull/38942

NetworkManager-openvpn :  update to 1.8.18 + gtk4 support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)


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

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

From 9d45c420aab57be0f174d5f09a84cf20c1d4bbdc Mon Sep 17 00:00:00 2001
From: Muhammad Hasan Firdaus <hasanteam008@gmail.com>
Date: Sat, 27 Aug 2022 18:41:47 +0700
Subject: [PATCH] NetworkManager-openvpn :  update to 1.8.18 + gtk4 support

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

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index c5f431c1c26c..1f5bcfa3268f 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.16
+version=1.8.18
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-gtk4"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8920de09c7ae5f1f520c83f844455db8faec31427350268fe2dd95b860f91fb5
+checksum=53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

Re: [PR PATCH] [Updated] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

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

https://github.com/hsnfirdaus/void-packages nm-openvpn
https://github.com/void-linux/void-packages/pull/38942

NetworkManager-openvpn :  update to 1.8.18 + gtk4 support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)


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

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

From 9d45c420aab57be0f174d5f09a84cf20c1d4bbdc Mon Sep 17 00:00:00 2001
From: Muhammad Hasan Firdaus <hasanteam008@gmail.com>
Date: Sat, 27 Aug 2022 18:41:47 +0700
Subject: [PATCH] NetworkManager-openvpn :  update to 1.8.18 + gtk4 support

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

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index c5f431c1c26c..1f5bcfa3268f 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.16
+version=1.8.18
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-gtk4"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8920de09c7ae5f1f520c83f844455db8faec31427350268fe2dd95b860f91fb5
+checksum=53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

Re: [PR PATCH] [Updated] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

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

https://github.com/hsnfirdaus/void-packages nm-openvpn
https://github.com/void-linux/void-packages/pull/38942

NetworkManager-openvpn :  update to 1.8.18 + gtk4 support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)


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

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

From 9d45c420aab57be0f174d5f09a84cf20c1d4bbdc Mon Sep 17 00:00:00 2001
From: Muhammad Hasan Firdaus <hasanteam008@gmail.com>
Date: Sat, 27 Aug 2022 18:41:47 +0700
Subject: [PATCH 1/2] NetworkManager-openvpn :  update to 1.8.18 + gtk4 support

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

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index c5f431c1c26c..1f5bcfa3268f 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,18 +1,18 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.16
+version=1.8.18
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-gtk4"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8920de09c7ae5f1f520c83f844455db8faec31427350268fe2dd95b860f91fb5
+checksum=53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From e91c45f75f4e6b967166f5dd78ca76c4c436858d Mon Sep 17 00:00:00 2001
From: Muhammad Hasan Firdaus <hasanteam008@gmail.com>
Date: Mon, 28 Nov 2022 19:07:24 +0700
Subject: [PATCH 2/2] adjust vseed

---
 srcpkgs/NetworkManager-openvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 1f5bcfa3268f..67db80103dfa 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -18,7 +18,7 @@ lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"
 
 post_extract() {
-	sed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
+	vsed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
 		shared/nm-service-defines.h
 }
 

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[kruceter]

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1328978741

Comment:
@hsnfirdaus, squash these two commits together. Do not forget to alter the commit message the way I asked you to.

Re: [PR PATCH] [Updated] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

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

https://github.com/hsnfirdaus/void-packages nm-openvpn
https://github.com/void-linux/void-packages/pull/38942

NetworkManager-openvpn :  update to 1.8.18 + gtk4 support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)


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

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

From a58899cd274bcb578e8ab57f41dc452438a7bf3c Mon Sep 17 00:00:00 2001
From: Muhammad Hasan Firdaus <hasanteam008@gmail.com>
Date: Mon, 28 Nov 2022 19:22:06 +0700
Subject: [PATCH] NetworkManager-openvpn: update to 1.8.18, add gtk4 support.

---
 srcpkgs/NetworkManager-openvpn/template | 10 +++++-----
 srcpkgs/qt6-3d/template                 |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index c5f431c1c26c..67db80103dfa 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,24 +1,24 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.16
+version=1.8.18
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-gtk4"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8920de09c7ae5f1f520c83f844455db8faec31427350268fe2dd95b860f91fb5
+checksum=53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"
 
 post_extract() {
-	sed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
+	vsed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
 		shared/nm-service-defines.h
 }
 
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
-checksum=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

New comment by hsnfirdaus on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1328991243

Comment:
@kruceter should i resolve this conflict too?

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[kruceter]

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1328997535

Comment:
> should i resolve this conflict too?

Rebase your branch with recent changes from master.

```
git checkout master
git pull --rebase upstream master
git rebase master nm-openvpn
```

Push again after that.

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[kruceter]

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1328997535

Comment:
> should i resolve this conflict too?

Rebase your branch with recent changes from master.

```
git checkout master
git pull --rebase upstream master
git rebase master nm-openvpn
```

Push again after that.

By chance, you may encounter a conflict with qt6-3d (spotted on my side while trying to rebase your branch for testing build). You can just run `git rebase --skip`.

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[kruceter]

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1328997535

Comment:
> should i resolve this conflict too?

Rebase your branch with recent changes from master.

```
git checkout master
git pull --rebase upstream master
git rebase master nm-openvpn
```

Push again after that.

By chance, you may encounter a conflict with qt6-3d (spotted on my side while trying to rebase your branch for testing build). You can just run `git rebase --skip` if you encounter this conflict.

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

New comment by hsnfirdaus on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329055725

Comment:
> ```
> git rebase master nm-openvpn
> ```

@kruceter how about this message when i run it: 
```
...
Rebasing (131/160618)
Rebasing (132/160618)
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
error: could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs.
```

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

New comment by hsnfirdaus on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329055725

Comment:
> ```
> git rebase master nm-openvpn
> ```

@kruceter how about this message when i run it: 
```
...
Rebasing (131/160618)
Rebasing (132/160618)
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
error: could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs.
```

When i skip it, it give smillar message to other rebase process...

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

New comment by hsnfirdaus on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329055725

Comment:
> ```
> git rebase master nm-openvpn
> ```

@kruceter how about this message when i run it: 
```
...
Rebasing (131/160618)
Rebasing (132/160618)
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
error: could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 16ae7bdf63... Added a .gitignore file to ignore default created dirs.
```

When i skip it, it give smillar message to next commit rebase...

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[kruceter]

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329068461

Comment:
Try to skip them all, @hsnfirdaus.

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329072054

Comment:
You don't have to update your master branch for this. Just simply running `git pull --rebase upstream master` on this branch would be enough. You will probably get a conflict about qt6-3d which you will have to remove because it shouldn't be in this PR.

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

New comment by hsnfirdaus on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329087330

Comment:
> You don't have to update your master branch for this. Just simply running `git pull --rebase upstream master` on this branch would be enough. You will probably get a conflict about qt6-3d which you will have to remove because it shouldn't be in this PR.

![image](https://user-images.githubusercontent.com/38871578/204288640-22b97916-7e44-43ea-997f-15a9a4b527a9.png)
Well, i still get that conflict message, when i try to skip another commit make this conflict again...

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329090698

Comment:
That's an issue in your checkout because you modified .gitignore for some reason, but it's not in a commit. Abort this, make sure you don't need your local changes (git diff), remove them (git restore .) and try again.

Re: [PR PATCH] [Updated] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

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

https://github.com/hsnfirdaus/void-packages nm-openvpn
https://github.com/void-linux/void-packages/pull/38942

NetworkManager-openvpn :  update to 1.8.18 + gtk4 support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)


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

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

From 52c965bc30e12def873e7c0eb9d2c4e7ed639728 Mon Sep 17 00:00:00 2001
From: Muhammad Hasan Firdaus <hasanteam008@gmail.com>
Date: Mon, 28 Nov 2022 20:37:23 +0700
Subject: [PATCH] NetworkManager-openvpn: update to 1.8.18, add gtk4 support.

---
 srcpkgs/NetworkManager-openvpn/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index c5f431c1c26c..1771aea763d2 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,27 +1,27 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.16
+version=1.8.18
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-gtk4"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8920de09c7ae5f1f520c83f844455db8faec31427350268fe2dd95b860f91fb5
+checksum=53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"
 
 post_extract() {
-	sed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
+	vsed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
 		shared/nm-service-defines.h
 }
 
 pre_configure() {
 	autoreconf -fi
-}
+}
\ No newline at end of file

Re: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

New comment by hsnfirdaus on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329109999

Comment:
> That's an issue in your checkout because you modified .gitignore for some reason, but it's not in a commit. Abort this, make sure you don't need your local changes (git diff), remove them (git restore .) and try again.

Well i ended up this conflict by re clone my repo and rebase...

Thank you @paper42 @kruceter 

Re: [PR REVIEW] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#discussion_r1033556694

Comment:
don't delete the end of the line here

Re: [PR REVIEW] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#discussion_r1033556976

Comment:
```suggestion
distfiles="${GNOME_SITE}/NetworkManager-openvpn/${version%.*}/NetworkManager-openvpn-${version}.tar.xz"
```

Re: [PR PATCH] [Updated] NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[hsnfirdaus]

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

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

https://github.com/hsnfirdaus/void-packages nm-openvpn
https://github.com/void-linux/void-packages/pull/38942

NetworkManager-openvpn :  update to 1.8.18 + gtk4 support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)


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

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

From c4b25d17e1e0aca4b5ecedcea2c9698c0e8bcce3 Mon Sep 17 00:00:00 2001
From: Muhammad Hasan Firdaus <hasanteam008@gmail.com>
Date: Mon, 28 Nov 2022 20:44:21 +0700
Subject: [PATCH] NetworkManager-openvpn: update to 1.8.18, add gtk4 support.

---
 srcpkgs/NetworkManager-openvpn/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index c5f431c1c26c..6b6a064b2296 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,24 +1,24 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.16
+version=1.8.18
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-gtk4"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel"
 depends="openvpn"
 short_desc="NetworkManager VPN plugin for OpenVPN"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8920de09c7ae5f1f520c83f844455db8faec31427350268fe2dd95b860f91fb5
+distfiles="${GNOME_SITE}/NetworkManager-openvpn/${version%.*}/NetworkManager-openvpn-${version}.tar.xz"
+checksum=53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"
 
 post_extract() {
-	sed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
+	vsed -i 's/\(#define NM_OPENVPN_\(USER\|GROUP\)\).*/\1 "_nm_openvpn"/' \
 		shared/nm-service-defines.h
 }
 

Re: [PR PATCH] [Merged]: NetworkManager-openvpn : update to 1.8.18 + gtk4 support

[paper42]

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

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

NetworkManager-openvpn :  update to 1.8.18 + gtk4 support
https://github.com/void-linux/void-packages/pull/38942

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

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)