ugdb: include Cargo.lock in patches, fix oniguruma linking

This commit is contained in:
Jan Christian Grünhage 2023-04-08 20:11:12 +02:00 committed by classabbyamp
parent 49243574e6
commit eff016d208
4 changed files with 67 additions and 22 deletions

View file

@ -0,0 +1,51 @@
From 9f9fd4ec05587aae2b65a20fadabccb02c593ce2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 7 Feb 2022 18:52:43 +0100
Subject: [PATCH 1/2] unbreak i128 support
---
Cargo.lock | 5 +++--
Cargo.toml | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 73e90fb..1b0c1e9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -418,9 +418,9 @@ dependencies = [
[[package]]
name = "parse_int"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f96500577cfa0a3bad8a88a3c4daa66684828af2e7d349012fa7fc3c725f0c"
+checksum = "2d695b79916a2c08bcff7be7647ab60d1402885265005a6658ffe6d763553c5a"
dependencies = [
"num-traits 0.2.14",
]
@@ -792,6 +792,7 @@ dependencies = [
"log",
"nix",
"nom",
+ "num-traits 0.2.14",
"parse_int",
"rand 0.3.23",
"structopt",
diff --git a/Cargo.toml b/Cargo.toml
index 235a30b..1bd3319 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,8 @@ json = "0.11"
rand = "0.3"
unix_socket = "0.5"
unicode-segmentation = "1.2"
-parse_int = "0.5"
+parse_int = "0.6"
+num-traits = { version = "0.2", features = ["i128"] }
unsegen = "0.3"
unsegen_signals = "0.3"
--
2.40.0

View file

@ -1,14 +1,17 @@
commit db6e990cc46d69526beae930e0048f65d5510c34
Author: q66 <daniel@octaforge.org>
Date: Tue Aug 10 18:52:51 2021 +0200
From 1add8448a097566dab2463f9383f6dccaf307bdd Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 10 Aug 2021 18:52:51 +0200
Subject: [PATCH 2/2] fix build on platforms without 64-bit atomics
fix build on platforms without 64-bit atomics
---
src/main.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index ccfccab..fe2b52c 100644
index 5af4b8b..17e0ab3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -284,7 +284,7 @@ struct MpscTimer {
@@ -256,7 +256,7 @@ struct MpscTimer {
next_sender: Option<Sender<Event>>,
sender: Sender<Event>,
evt_fn: Box<dyn Fn() -> Event>,
@ -17,7 +20,7 @@ index ccfccab..fe2b52c 100644
}
impl MpscTimer {
@@ -293,7 +293,7 @@ impl MpscTimer {
@@ -265,7 +265,7 @@ impl MpscTimer {
next_sender: Some(sender.clone()),
sender,
evt_fn,
@ -26,3 +29,6 @@ index ccfccab..fe2b52c 100644
}
}
--
2.40.0

View file

@ -1,14 +0,0 @@
Bump some versions to get num-traits support for i128.
--- a/Cargo.toml
+++ b/Cargo.toml:wq
@@ -28,7 +28,8 @@
rand = "0.3"
unix_socket = "0.5"
unicode-segmentation = "1.2"
-parse_int = "0.5"
+parse_int = "0.6"
+ndarray = "0.15.4"
unsegen = "0.3"
unsegen_signals = "0.3"

View file

@ -1,8 +1,10 @@
# Template file for 'ugdb'
pkgname=ugdb
version=0.1.11
revision=2
revision=3
build_style=cargo
hostmakedepends="pkg-config"
makedepends="oniguruma-devel"
checkdepends="gdb"
short_desc="Alternative TUI for gdb"
maintainer="Érico Nogueira <ericonr@disroot.org>"