Commit 7d927665 authored by Sigmanificient's avatar Sigmanificient
Browse files

lxde.lxsession: 0.5.5 -> 0.5.6

parent fd0e9bfa

pkgs/desktops/lxde/core/lxsession/default.nix

+19 −30
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchpatch,

  fetchFromGitHub,

  autoconf,

  automake,

  autoreconfHook,

  docbook_xml_dtd_412,

  docbook_xsl,

  intltool,
@@ -18,39 +16,26 @@ 
  vala,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "lxsession";

  version = "0.5.5";

  version = "0.5.6";



  src = fetchFromGitHub {

    owner = "lxde";

    repo = "lxsession";

    rev = version;

    sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d";

    tag = finalAttrs.version;

    hash = "sha256-3RnRF4oMCtZbIraHVqEPnkviAkELq7uYqyHY0uCf/lU=";

  };



  patches = [

    ./xmlcatalog_patch.patch



    # lxsession compilation is broken upstream as of GCC 14

    # https://sourceforge.net/p/lxde/bugs/973/

    (fetchpatch {

      name = "0001-Fix-build-on-GCC-14.patch";

      url = "https://sourceforge.net/p/lxde/bugs/973/attachment/0001-Fix-build-on-GCC-14.patch";

      hash = "sha256-lxF3HZy5uLK7Cfu8W1A03syZf7OWXpHiU2Fk+xBl39g=";

    })

  ];



  nativeBuildInputs = [

    autoconf

    automake

    docbook_xml_dtd_412

    docbook_xsl

    autoreconfHook

    intltool

    libxml2

    libxslt

    pkg-config

    wrapGAppsHook3

    docbook_xml_dtd_412

    docbook_xsl

  ];



  buildInputs = [
@@ -64,16 +49,20 @@ stdenv.mkDerivation rec { 
    "--enable-man"

    "--disable-buildin-clipboard"

    "--disable-buildin-polkit"

    "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"

  ];



  preConfigure = "./autogen.sh";

  postPatch = ''

    mkdir -p m4

  '';



  meta = with lib; {

  patches = [ ./repect-xml-catalog-file-var.patch ];



  meta = {

    homepage = "https://wiki.lxde.org/en/LXSession";

    description = "Classic LXDE session manager";

    license = licenses.gpl2Plus;

    maintainers = [ maintainers.shamilton ];

    platforms = platforms.linux;

    license = lib.licenses.gpl2Plus;

    maintainers = [ lib.maintainers.shamilton ];

    platforms = lib.platforms.linux;

    mainProgram = "lxsession";

  };

}
 
})

pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
--- a/acinclude.m4	2025-08-24 00:39:08.807857027 +0200

+++ b/acinclude.m4	2025-08-24 00:49:23.043780737 +0200

@@ -40,8 +40,8 @@

 [

   AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl

   AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])

-  if $jh_found_xmlcatalog && \

-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then

+  # empty argument forces libxml to use XML_CATALOG_FILES variable

+  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then

     AC_MSG_RESULT([found])

     ifelse([$3],,,[$3

 ])dnl

pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
diff --color -ur a/configure.ac b/configure.ac

--- a/configure.ac	2021-01-18 12:39:19.556844678 +0100

+++ b/configure.ac	2021-01-18 17:26:47.989410501 +0100

@@ -167,18 +167,7 @@

 AM_GLIB_GNU_GETTEXT

 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])

 

-if test x"$enable_man" = x"yes"; then

-	AC_PATH_PROG([XSLTPROC], [xsltproc])

-	if test -z "$XSLTPROC"; then

-		enable_man=no

-	fi

-

-	dnl check for DocBook DTD and stylesheets in the local catalog.

-	JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],

-		[DocBook XML DTD V4.1.2], [], enable_man=no)

-	JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],

-		[DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no)

-fi

+AC_PATH_PROG([XSLTPROC], [xsltproc])

 

 AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test "x$enable_man" != "xno")