From 4c9bbd22c0622d35583f12b04d34fee364a36dc6 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 28 Aug 2025 21:57:37 +0800
Subject: [PATCH] =?UTF-8?q?yelp:=2042.2=20=E2=86=92=2042.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/yelp/-/compare/42.2...42.3

Ported to meson.
---
 pkgs/by-name/ye/yelp/cve-2025-3155.patch | 101 -----------------------
 pkgs/by-name/ye/yelp/package.nix         |  65 ++++++++-------
 2 files changed, 35 insertions(+), 131 deletions(-)
 delete mode 100644 pkgs/by-name/ye/yelp/cve-2025-3155.patch

diff --git a/pkgs/by-name/ye/yelp/cve-2025-3155.patch b/pkgs/by-name/ye/yelp/cve-2025-3155.patch
deleted file mode 100644
index 3cdcfaeef332..000000000000
--- a/pkgs/by-name/ye/yelp/cve-2025-3155.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/data/xslt/mal2html.xsl.in b/data/xslt/mal2html.xsl.in
-index 9e44b734..0a74da55 100644
---- a/data/xslt/mal2html.xsl.in
-+++ b/data/xslt/mal2html.xsl.in
-@@ -19,6 +19,11 @@
- <xsl:param name="mal.link.prefix" select="'xref:'"/>
- <xsl:param name="mal.link.extension" select="''"/>
- 
-+<xsl:template name="html.head.top.custom">
-+  <xsl:param name="node" select="."/>
-+  <meta http-equiv="Content-Security-Policy" content="default-src bogus-ghelp: bogus-gnome-help: bogus-help: bogus-help-list: bogus-info: bogus-man: ; script-src 'nonce-{$html.csp.nonce}'; style-src 'nonce-{$html.csp.nonce}'; "/>
-+</xsl:template>
-+
- <xsl:template name="mal.link.target.custom">
-   <xsl:param name="node" select="."/>
-   <xsl:param name="action" select="$node/@action"/>
-diff --git a/data/xslt/man2html.xsl.in b/data/xslt/man2html.xsl.in
-index 676ce3eb..56bc1f5c 100644
---- a/data/xslt/man2html.xsl.in
-+++ b/data/xslt/man2html.xsl.in
-@@ -131,7 +131,7 @@
-   the correct styling and a single character which we measure the
-   width of and update each sheet as required.
- -->
--<script type="text/javascript" language="javascript">
-+<script type="text/javascript" language="javascript" nonce="{$html.csp.nonce}">
- <xsl:text>
- $(document).ready (function () {
-   var div = document.getElementById("invisible-char");
-diff --git a/data/xslt/yelp-common.xsl.in b/data/xslt/yelp-common.xsl.in
-index 0c1ec9bb..421fc02d 100644
---- a/data/xslt/yelp-common.xsl.in
-+++ b/data/xslt/yelp-common.xsl.in
-@@ -15,6 +15,13 @@
- <xsl:param name="html.syntax.highlight" select="true()"/>
- <xsl:param name="html.js.root" select="'file://@XSL_JSDIR@/'"/>
- 
-+<xsl:param name="html.csp.nonce" select="yelp:generate_nonce()"/>
-+
-+<xsl:template name="html.head.top.custom">
-+  <xsl:param name="node" select="."/>
-+  <meta http-equiv="Content-Security-Policy" content="default-src bogus-ghelp: bogus-gnome-help: bogus-help: bogus-help-list: bogus-info: bogus-man: ; script-src 'nonce-{$html.csp.nonce}'; style-src 'unsafe-inline'; "/>
-+</xsl:template>
-+
- <xsl:template name="html.js.mathjax">
-   <xsl:param name="node" select="."/>
-   <xsl:if test="$node//mml:*[1]">
-diff --git a/libyelp/yelp-transform.c b/libyelp/yelp-transform.c
-index e74eb463..2ce1d05b 100644
---- a/libyelp/yelp-transform.c
-+++ b/libyelp/yelp-transform.c
-@@ -71,6 +71,8 @@ static void      xslt_yelp_cache            (xsltTransformContextPtr  ctxt,
-                                              xsltStylePreCompPtr      comp);
- static void      xslt_yelp_aux              (xmlXPathParserContextPtr ctxt,
-                                              int                      nargs);
-+static void      xslt_yelp_generate_nonce   (xmlXPathParserContextPtr ctxt,
-+                                             int                      nargs);
- 
- enum {
-     PROP_0,
-@@ -412,6 +414,10 @@ transform_run (YelpTransform *transform)
-                              BAD_CAST "input",
-                              BAD_CAST YELP_NAMESPACE,
-                              (xmlXPathFunction) xslt_yelp_aux);
-+    xsltRegisterExtFunction (priv->context,
-+                         BAD_CAST "generate_nonce",
-+                         BAD_CAST YELP_NAMESPACE,
-+                         (xmlXPathFunction) xslt_yelp_generate_nonce);
- 
-     priv->output = xsltApplyStylesheetUser (priv->stylesheet,
-                                             priv->input,
-@@ -607,3 +613,16 @@ xslt_yelp_aux (xmlXPathParserContextPtr ctxt, int nargs)
-     xsltExtensionInstructionResultRegister (tctxt, ret);
-     valuePush (ctxt, ret);
- }
-+
-+static void
-+xslt_yelp_generate_nonce (xmlXPathParserContextPtr ctxt, int nargs)
-+{
-+    GRand* rand;
-+    gchar* nonce_str;
-+
-+    rand = g_rand_new ();
-+    nonce_str = g_strdup_printf("%08x%08x", g_rand_int (rand), g_rand_int (rand));
-+    xmlXPathReturnString (ctxt, xmlStrdup ((xmlChar *) nonce_str));
-+    g_free(nonce_str);
-+    g_rand_free(rand);
-+}
-diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
-index 32ae131e..d544c5df 100644
---- a/libyelp/yelp-view.c
-+++ b/libyelp/yelp-view.c
-@@ -971,7 +971,7 @@ view_external_uri (YelpView *view,
- 
-     if (app_info)
-       {
--        if (!strstr (g_app_info_get_executable (app_info), "yelp"))
-+        if (!strstr (g_app_info_get_executable (app_info), "yelp") && !strstr (struri, "%3C") && !strstr (struri, "%3E"))
-           {
-             GList l;
- 
diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix
index 726a31d418b8..ca376a4359f5 100644
--- a/pkgs/by-name/ye/yelp/package.nix
+++ b/pkgs/by-name/ye/yelp/package.nix
@@ -1,57 +1,62 @@
 {
-  lib,
   stdenv,
-  gettext,
+  lib,
   fetchurl,
-  webkitgtk_4_1,
+  gettext,
+  itstool,
+  meson,
+  ninja,
   pkg-config,
+  wrapGAppsHook3,
+  bzip2,
+  glib,
   gtk3,
   libhandy,
-  glib,
-  gnome,
-  adwaita-icon-theme,
-  sqlite,
-  itstool,
   libxml2,
   libxslt,
-  gst_all_1,
-  wrapGAppsHook3,
+  sqlite,
+  webkitgtk_4_1,
+  xz,
   yelp-xsl,
+  gnome,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yelp";
-  version = "42.2";
+  version = "42.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp/${lib.versions.major version}/yelp-${version}.tar.xz";
-    hash = "sha256-osX9B4epCJxyLMZr0Phc33CI2HDntsyFeZ+OW/+erEs=";
+    url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz";
+    hash = "sha256-JszEImeanmp6OqCD2Q/Ns0f18jAL4+AUMaMNDN0qiaM=";
   };
 
   nativeBuildInputs = [
-    pkg-config
     gettext
     itstool
+    meson
+    ninja
+    pkg-config
     wrapGAppsHook3
   ];
 
   buildInputs = [
+    bzip2
+    glib
     gtk3
     libhandy
-    glib
-    webkitgtk_4_1
-    sqlite
     libxml2
     libxslt
+    sqlite
+    webkitgtk_4_1
+    xz
     yelp-xsl
-    adwaita-icon-theme
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
   ];
 
-  patches = [
-    ./cve-2025-3155.patch
-  ];
+  postPatch = ''
+    chmod +x src/link-gnome-help.sh data/domains/gen_yelp_xml.sh
+    patchShebangs src/link-gnome-help.sh
+    patchShebangs data/domains/gen_yelp_xml.sh
+  '';
 
   passthru = {
     updateScript = gnome.updateScript {
@@ -59,11 +64,11 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://apps.gnome.org/Yelp/";
-    description = "Help viewer in Gnome";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
+    description = "Help viewer for GNOME";
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
-}
+})