Unverified Commit 90a43ddb authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

lxterminal: 0.4.0 -> 0.4.1 (#395043)

parents 71308a31 6ec0c6ff

pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
diff --git a/src/lxterminal.c b/src/lxterminal.c

index 015f5e4..32e3b68 100644

--- a/src/lxterminal.c

+++ b/src/lxterminal.c

@@ -1210,6 +1210,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch

     vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);

     ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0);

     vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);

+    vte_regex_unref(dingus1);

+    vte_regex_unref(dingus2);

 #else

     GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL);

     GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL);

@@ -1217,9 +1219,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch

     vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);

     ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0);

     vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);

-#endif

     g_regex_unref(dingus1);

     g_regex_unref(dingus2);

+#endif

 

     /* Create a horizontal box inside an event box as the toplevel for the tab label. */

     term->tab = gtk_event_box_new();

pkgs/by-name/lx/lxterminal/package.nix

+7 −8
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ 
  pcre2,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "lxterminal";

  version = "0.4.0";

  version = "0.4.1";



  src = fetchFromGitHub {

    owner = "lxde";

    repo = "lxterminal";

    rev = version;

    sha256 = "sha256-bCF/V6yFe4vKqVMOtNlwYyw/ickj1LFuFn4IyypwIg0=";

    tag = finalAttrs.version;

    sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U=";

  };



  configureFlags = [
@@ -54,7 +54,6 @@ stdenv.mkDerivation rec { 
  ];



  patches = [

    ./fix-gcc14-pr122.patch # manual port of https://github.com/lxde/lxterminal/pull/122

    ./respect-xml-catalog-files-var.patch

  ];
@@ -73,10 +72,10 @@ stdenv.mkDerivation rec { 
      desktop-independent VTE-based terminal emulator for LXDE without any

      unnecessary dependencies.

    '';

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

    license = lib.licenses.gpl2;

    homepage = "https://www.lxde.org/";

    license = lib.licenses.gpl2Only;

    maintainers = [ lib.maintainers.pbsds ];

    platforms = lib.platforms.linux;

    mainProgram = "lxterminal";

  };

}
 
})