[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1108153: unblock: nom/0.1.5-7



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package nom, the current version in trixie is
seriously broken with ruby3 and does not work, so I´ve uploaded a fixed
version to unstable today:

nom (0.1.5-7) unstable; urgency=medium

  * Adjust for Ruby3 by using two patches from upstream. Closes: #1108142
    - replace exists method with exist.
    - make sure svg plot is not deleted.

 -- Holger Levsen <holger@debian.org>  Sat, 21 Jun 2025 14:54:44 +0200

[ Reason ]
see above. and I´ve not noticed before, because until recently I was using
nom from bookworm-backports...

[ Impact ]
see above :)

[ Tests ]
I´ve manually reviewed the diff and tested the package from sid in a
trixie environment.

[ Risks ]
rather none, nom in trixie is fully broken.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
Thanks for your work on trixie.

unblock nom/0.1.5-7


-- 
cheers,
	Holger

 ⢀⣴⠾⠻⢶⣦⠀
 ⣾⠁⢠⠒⠀⣿⡁  holger@(debian|reproducible-builds|layer-acht).org
 ⢿⡄⠘⠷⠚⠋⠀  OpenPGP: B8BF54137B09D35CF026FE9D 091AB856069AAA1C
 ⠈⠳⣄

The wrong Amazon is burning.
diff -Nru nom-0.1.5/debian/changelog nom-0.1.5/debian/changelog
--- nom-0.1.5/debian/changelog	2025-04-27 10:04:36.000000000 +0200
+++ nom-0.1.5/debian/changelog	2025-06-21 14:54:44.000000000 +0200
@@ -1,3 +1,11 @@
+nom (0.1.5-7) unstable; urgency=medium
+
+  * Adjust for Ruby3 by using two patches from upstream. Closes: #1108142
+    - replace exists method with exist.
+    - make sure svg plot is not deleted.
+
+ -- Holger Levsen <holger@debian.org>  Sat, 21 Jun 2025 14:54:44 +0200
+
 nom (0.1.5-6) unstable; urgency=medium
 
   * d/control: bump Standard-Version to 4.7.2, no changes needed.
diff -Nru nom-0.1.5/debian/patches/0002-adjust-for-Ruby3-replace-exists-method-with-exist.patch nom-0.1.5/debian/patches/0002-adjust-for-Ruby3-replace-exists-method-with-exist.patch
--- nom-0.1.5/debian/patches/0002-adjust-for-Ruby3-replace-exists-method-with-exist.patch	1970-01-01 01:00:00.000000000 +0100
+++ nom-0.1.5/debian/patches/0002-adjust-for-Ruby3-replace-exists-method-with-exist.patch	2025-06-21 13:09:34.000000000 +0200
@@ -0,0 +1,50 @@
+From d0d1c2d166198564aa71504bb6124ff18e7ab053 Mon Sep 17 00:00:00 2001
+From: Holger Levsen <holger@layer-acht.org>
+Date: Sat, 21 Jun 2025 12:58:40 +0200
+Subject: [PATCH] adjust for Ruby3: replace exists method with exist
+
+as described in https://github.com/blinry/nom/issues/19
+and fixed in https://github.com/blinry/nom/commit/79ba1df8d8f15e97ca57e7fd7d360f3427bc8761
+(though that commit has other changes too which we don't want right now)
+
+Signed-off-by: Holger Levsen <holger@layer-acht.org>
+---
+ lib/nom/config.rb | 2 +-
+ lib/nom/nom.rb    | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/nom/config.rb b/lib/nom/config.rb
+index 3703af0..b4f078a 100644
+--- a/lib/nom/config.rb
++++ b/lib/nom/config.rb
+@@ -6,7 +6,7 @@ module Nom
+             @file = file
+ 
+             @config = {}
+-            if File.exists? file
++            if File.exist? file
+                 @config = YAML.load_file(file, permitted_classes: [Date])
+             end
+ 
+diff --git a/lib/nom/nom.rb b/lib/nom/nom.rb
+index 86f4dfc..ff98bbc 100644
+--- a/lib/nom/nom.rb
++++ b/lib/nom/nom.rb
+@@ -16,12 +16,12 @@ module Nom
+             xdg_data = (ENV["XDG_DATA_HOME"] or File.join(Dir.home, ".local", "share"))
+             preferred_config_location = File.join(xdg_data, "nom")
+             [ preferred_config_location, File.join(Dir.home,".nom") ].each do |dir|
+-                if Dir.exists? dir
++                if Dir.exist? dir
+                     @nom_dir = dir
+                     break
+                 end
+             end
+-            if not @nom_dir or not Dir.exists? @nom_dir
++            if not @nom_dir or not Dir.exist? @nom_dir
+                 @nom_dir = preferred_config_location
+                 puts "Creating #{@nom_dir}"
+                 Dir.mkdir(@nom_dir)
+-- 
+2.47.2
+
diff -Nru nom-0.1.5/debian/patches/0003-Make-sure-svg-plot-is-not-deleted.patch nom-0.1.5/debian/patches/0003-Make-sure-svg-plot-is-not-deleted.patch
--- nom-0.1.5/debian/patches/0003-Make-sure-svg-plot-is-not-deleted.patch	1970-01-01 01:00:00.000000000 +0100
+++ nom-0.1.5/debian/patches/0003-Make-sure-svg-plot-is-not-deleted.patch	2025-06-21 13:13:10.000000000 +0200
@@ -0,0 +1,29 @@
+From ed7340c7439b49f952c9ede885dc8807641773e3 Mon Sep 17 00:00:00 2001
+From: Tobias Kunze <r@rixx.de>
+Date: Sat, 9 Nov 2024 10:55:28 +0100
+Subject: [PATCH] Make sure svg plot is not deleted
+
+needed for ruby3.3, taken from https://github.com/blinry/nom/pull/20
+
+---
+ lib/nom/nom.rb | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/lib/nom/nom.rb b/lib/nom/nom.rb
+index c9fb721..2c11951 100644
+--- a/lib/nom/nom.rb
++++ b/lib/nom/nom.rb
+@@ -190,9 +190,8 @@ module Nom
+             end
+             input_dat.close
+ 
+-            svg = Tempfile.new(["plot", ".svg"])
++            svg = Tempfile.create(["plot", ".svg"])
+             svg.close
+-            ObjectSpace.undefine_finalizer(svg) # prevent the svg file from being deleted
+ 
+             plt_erb = IO.read(File.join(File.dirname(File.expand_path(__FILE__)), "nom.plt.erb"))
+ 
+-- 
+2.47.2
+
diff -Nru nom-0.1.5/debian/patches/series nom-0.1.5/debian/patches/series
--- nom-0.1.5/debian/patches/series	2025-04-27 09:57:15.000000000 +0200
+++ nom-0.1.5/debian/patches/series	2025-06-21 13:11:10.000000000 +0200
@@ -1 +1,3 @@
 0001-Add-GPLv2-text-to-each-file-to-comply-with-the-pesky.patch
+0002-adjust-for-Ruby3-replace-exists-method-with-exist.patch
+0003-Make-sure-svg-plot-is-not-deleted.patch

Attachment: signature.asc
Description: PGP signature


Reply to: