Bug#1020495: Patch to build network-manager-strongswan against GTK 4, too

2023-06-11 Thread Ian Jackson
Harald Dunkel writes ("Re: Patch to build network-manager-strongswan against 
GTK 4, too"):
> this is intended as a bug fix for both Bookworm and Trixie. N-m-s is
> severely restricted for Gnome desktop without this fix. There is no
> newer upstream version yet.

OK, I will review it for trixie.

Would you check the stable release policy for the update to bookworm ?

Ian.

-- 
Ian JacksonThese opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.



Bug#1020495: Patch to build network-manager-strongswan against GTK 4, too

2023-06-11 Thread Harald Dunkel

Hi Ian,

this is intended as a bug fix for both Bookworm and Trixie. N-m-s is
severely restricted for Gnome desktop without this fix. There is no
newer upstream version yet.

The git commit is 9af28ccd2176633d95a3c15edee2518ce4e7e0c6 on
https://salsa.debian.org/debian/network-manager-strongswan, tagged
debian/1.6.0-2.


Thank you very much

Harri



OpenPGP_signature
Description: OpenPGP digital signature


Bug#1020495: Patch to build network-manager-strongswan against GTK 4, too

2023-06-11 Thread Ian Jackson
Harald Dunkel writes ("Re: Patch to build network-manager-strongswan against 
GTK 4, too"):
> I have to appologize for not checking my bug reports. There is no
> excuse for that. I am very sorry.
> 
> I have applied Moritz' patch to the source repository on Salsa and
> verified the GUI using Gnome on Bookworm. The error message is
> gone now.
> 
> @Ian, if you have some spare minutes, would you mind to upload the
> fixed version 1.6.0-2, if it looks OK to you? There are no source
> code changes, just a modified configure command line and some
> additional dependencies. Janitor made changes to the debian directory
> on Salsa as well. Included.

FTAOD you intend this for trixie ?

AFAICT from the mails on d-d-a I could upload now and it will be
processed "in due course".

Can you confirm the precise git commit hash you intend to release?

Thanks,
Ian.

-- 
Ian JacksonThese opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.



Bug#1020495: Patch to build network-manager-strongswan against GTK 4, too

2023-06-11 Thread Harald Dunkel
Hi folks,

I have to appologize for not checking my bug reports. There is no
excuse for that. I am very sorry.

I have applied Moritz' patch to the source repository on Salsa and
verified the GUI using Gnome on Bookworm. The error message is
gone now.

@Ian, if you have some spare minutes, would you mind to upload the
fixed version 1.6.0-2, if it looks OK to you? There are no source
code changes, just a modified configure command line and some
additional dependencies. Janitor made changes to the debian directory
on Salsa as well. Included.


Thank you very much

Harri



Bug#1020495: Patch to build network-manager-strongswan against GTK 4, too

2023-05-23 Thread Moritz Schlarb

Control: tags -1 + patch

Hi everyone,

the attached patch actually builds against GTK 4.
The previous version contained support for that, but didn't actually 
build for it.


Regards,
--
Moritz Schlarb
Unix und Cloud
Zentrum für Datenverarbeitung
Johannes Gutenberg-Universität Mainz

OpenPGP-Fingerprint: DF01 2247 BFC6
 5501 AFF2 8445 0C24 B841 C7DD BAAF
commit f77d5441f5d5014265473a4e76d368c3c2288165
Author: Moritz Schlarb 
Date:   Tue May 23 15:08:02 2023 +0200

Build editor component with GTK 4 too

Since the editor plugin contains logic to decide whether to load the
GTK 3 or GTK 4 version at runtime, this makes strongswan connections
editable from both nm-connection-editor as well as Gnome Settings.

Closes: #1020495
Closes: #1036607

diff --git a/debian/control b/debian/control
index fc236e2..a1fb9a0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,12 @@ Maintainer: Harald Dunkel 
 Build-Depends: debhelper-compat (= 13)
 	, network-manager-dev (>= 1.14)
 	, libnma-dev (>= 1.8)
+	, libnma-gtk4-dev (>= 1.8)
 	, libnm-dev (>= 1.14)
 	, libdbus-glib-1-dev
 	, libgtk-3-dev
+	, libgtk-4-dev
+	, libgtk-4-bin
 	, libsecret-1-dev
 	, automake
 	, gnome-common
diff --git a/debian/rules b/debian/rules
index e41c840..d4ac4e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --without-libnm-glib --with-charon=/usr/lib/ipsec/charon-nm --libexecdir="\$$(prefix)/lib/NetworkManager"
+	dh_auto_configure -- --with-gtk4 --without-libnm-glib --with-charon=/usr/lib/ipsec/charon-nm --libexecdir="\$$(prefix)/lib/NetworkManager"
 
 override_dh_clean:
 	dh_clean -XNetworkManager-strongswan.metainfo.xml nm-strongswan-service.name


OpenPGP_signature
Description: OpenPGP digital signature