From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] astroid: build with guri and webkit2gtk-4.1
Date: Fri, 01 Mar 2024 00:15:16 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-49013@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1324 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages astroid
https://github.com/void-linux/void-packages/pull/49013
astroid: build with guri and webkit2gtk-4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@bitmeise Can you test this and verify if it works for you?
<!--
#### 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/49013.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-astroid-49013.patch --]
[-- Type: text/x-diff, Size: 4688 bytes --]
From 28800d52b935e3b397a2b0b374f0ea4bedcc80a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 29 Feb 2024 15:13:22 -0800
Subject: [PATCH] astroid: build with guri and webkit2gtk-4.1
---
srcpkgs/astroid/patches/webkit2gtk41.patch | 95 ++++++++++++++++++++++
srcpkgs/astroid/template | 4 +-
2 files changed, 97 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/astroid/patches/webkit2gtk41.patch
diff --git a/srcpkgs/astroid/patches/webkit2gtk41.patch b/srcpkgs/astroid/patches/webkit2gtk41.patch
new file mode 100644
index 00000000000000..d25ca7163a6911
--- /dev/null
+++ b/srcpkgs/astroid/patches/webkit2gtk41.patch
@@ -0,0 +1,95 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6eb00cf..1a2ea30 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,11 +95,10 @@ endif()
+
+ pkg_check_modules (GTKMM3 REQUIRED gtkmm-3.0>=3.10)
+ pkg_check_modules (GLIBMM2 REQUIRED glibmm-2.4)
+-pkg_check_modules (WEBKIT2GTK REQUIRED webkit2gtk-4.0>=2.22)
++pkg_check_modules (WEBKIT2GTK REQUIRED webkit2gtk-4.1>=2.22)
+ pkg_check_modules (SASS REQUIRED libsass)
+ pkg_check_modules (GIOMM2 REQUIRED giomm-2.4)
+-pkg_check_modules (GIOUNIX REQUIRED gio-unix-2.0)
+-pkg_check_modules (LIBSOUP REQUIRED libsoup-2.4)
++pkg_check_modules (GIOUNIX REQUIRED gio-unix-2.0>=2.66)
+
+ string (REGEX REPLACE "([0-9]+\.[0-9]+)\.[0-9]+" "\\1" GMIME_MAJOR_MINOR ${Notmuch_GMIME_VERSION})
+ pkg_check_modules (GMIME REQUIRED gmime-${GMIME_MAJOR_MINOR}>=${Notmuch_GMIME_VERSION})
+@@ -167,7 +166,6 @@ add_compile_options (
+ ${GLIBMM2_CFLAGS}
+ ${GIOMM2_CFLAGS}
+ ${GIOUNIX_CFLAGS}
+- ${LIBSOUP_CFLAGS}
+ ${GMIME_CFLAGS}
+ ${WEBKIT2GTK_CFLAGS}
+ ${VTE2_CFLAGS}
+@@ -337,7 +335,6 @@ target_link_libraries (
+ ${GLIBMM2_LDFLAGS}
+ ${GIOMM2_LDFLAGS}
+ ${GIOUINX_LDFLAGS}
+- ${LIBSOUP_LDFLAGS}
+ ${GMIME_LDFLAGS}
+ ${VTE2_LDFLAGS}
+ ${SASS_LDFLAGS}
+diff --git a/src/astroid.cc b/src/astroid.cc
+index 3d5dc9f..5402c81 100644
+--- a/src/astroid.cc
++++ b/src/astroid.cc
+@@ -6,6 +6,8 @@
+ # include <gtkmm.h>
+ # include <gtkmm/window.h>
+
++# include <glib.h>
++
+ /* program options */
+ # include <boost/program_options.hpp>
+ # include <boost/filesystem.hpp>
+@@ -53,8 +55,6 @@
+ # include <gmime/gmime.h>
+ # include <utils/gmime/gmime-compat.h>
+
+-# include <libsoup/soup.h>
+-
+ using namespace std;
+ using namespace boost::filesystem;
+
+@@ -550,15 +550,16 @@ namespace Astroid {
+
+ MainWindow * mw = (MainWindow*) get_windows ()[0];
+
+- SoupURI *uri = soup_uri_new(url.c_str());
++ GUriFlags guriflags = (GUriFlags)(G_URI_FLAGS_HAS_PASSWORD | G_URI_FLAGS_ENCODED_PATH | G_URI_FLAGS_ENCODED_QUERY | G_URI_FLAGS_ENCODED_FRAGMENT | G_URI_FLAGS_SCHEME_NORMALIZE | G_URI_FLAGS_PARSE_RELAXED);
++ GUri *guri = g_uri_parse (url.c_str(), guriflags, NULL);
+
+- if (SOUP_URI_IS_VALID(uri)) {
++ if (guri) {
+ /* we got an mailto url */
+ ustring from, to, cc, bcc, subject, body;
+
+- to = soup_uri_decode (soup_uri_get_path (uri));
++ to = g_uri_unescape_string (g_uri_get_path (guri), NULL);
+
+- const char * soup_query = soup_uri_get_query (uri);
++ const char * soup_query = g_uri_get_query (guri);
+ if (soup_query) {
+ std::istringstream query_string (soup_query);
+ std::string keyval;
+@@ -568,7 +569,7 @@ namespace Astroid {
+ ustring key = keyval.substr (0, pos);
+ key = key.lowercase ();
+
+- ustring val = soup_uri_decode (keyval.substr (pos+1).c_str());
++ ustring val = g_uri_unescape_string (keyval.substr (pos+1).c_str(), NULL);
+
+ if (key == "from") {
+ from = ustring (val);
+@@ -591,7 +592,7 @@ namespace Astroid {
+ mw->add_mode (new EditMessage (mw, url));
+ }
+
+- soup_uri_free (uri);
++ g_uri_unref (guri);
+ }
+
+ int Astroid::hint_level () {
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 02d7743130fb39..d29371f3c35c1f 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -5,9 +5,9 @@ revision=13
build_style=cmake
build_helper=gir
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
-makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
+makedepends="libnotmuch-devel gtkmm-devel libwebkit2gtk41-devel libsass-devel
gmime3-devel boost-devel protobuf-devel vte3-devel gobject-introspection
- libpeas-devel libsoup-devel"
+ libpeas-devel"
checkdepends="gnupg notmuch w3m cmark xvfb-run"
short_desc="Graphical threads-with-tags style email client for Notmuch"
maintainer="Ameise <ameise@bitparlament.de>"
next reply other threads:[~2024-02-29 23:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-29 23:15 oreo639 [this message]
2024-03-01 17:51 ` bitmeise
2024-03-01 21:32 ` [PR PATCH] [Updated] " oreo639
2024-03-01 21:33 ` oreo639
2024-03-01 21:34 ` oreo639
2024-03-01 21:46 ` oreo639
2024-03-02 9:15 ` bitmeise
2024-03-02 9:33 ` oreo639
2024-03-02 9:33 ` oreo639
2024-03-02 9:34 ` oreo639
2024-03-02 9:35 ` oreo639
2024-03-02 9:37 ` oreo639
2024-06-01 1:50 ` github-actions
2024-06-01 8:31 ` oreo639
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-49013@inbox.vuxu.org \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).