1
0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 20:22:38 +01:00

gui-apps/blackbox: new ebuild

This commit is contained in:
2024-08-21 21:51:33 +02:00
parent c672bc42d2
commit a4a67eb3fd
6 changed files with 229 additions and 0 deletions

View File

@@ -0,0 +1,43 @@
From 2f45717f1c18f710d9b9fbf21830027c8f0794e7 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 24 Feb 2024 14:57:55 +0000
Subject: [PATCH] Drop usage of return*_if_fail() to avoid return-mismatch
error of C compiler
---
src/widgets/ColorSchemeThumbnail.vala | 2 +-
src/widgets/Window.vala | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/widgets/ColorSchemeThumbnail.vala b/src/widgets/ColorSchemeThumbnail.vala
index 2e1e57e..8c73e3d 100644
--- a/src/widgets/ColorSchemeThumbnail.vala
+++ b/src/widgets/ColorSchemeThumbnail.vala
@@ -125,7 +125,7 @@ public class Terminal.ColorSchemePreviewPaintable : GLib.Object, Gdk.Paintable {
private async void load_image () {
var file_content = ColorSchemeThumbnailProvider.apply_scheme (this.scheme);
- return_if_fail (file_content != null);
+ if (file_content == null) return;
try {
this.handler = new Rsvg.Handle.from_data (file_content);
diff --git a/src/widgets/Window.vala b/src/widgets/Window.vala
index 1388685..abdc8fd 100644
--- a/src/widgets/Window.vala
+++ b/src/widgets/Window.vala
@@ -38,10 +38,7 @@ public struct Terminal.Padding {
}
public static Padding from_variant (Variant vari) {
- return_val_if_fail (
- vari.check_format_string ("(uuuu)", false),
- Padding.zero ()
- );
+ if (!vari.check_format_string ("(uuuu)", false)) return Padding.zero ();
var iter = vari.iterator ();
uint top = 0, right = 0, bottom = 0, left = 0;
--
GitLab

View File

@@ -0,0 +1,53 @@
From b9e1662ece1baaf57d141ad045e316dffcbf53a4 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Thu, 20 Jul 2023 00:01:26 -0500
Subject: [PATCH] Rename executable to blackbox-terminal
This is to avoid file conflicts with the blackbox window manager, which
is already packaged in several Linux distros.
---
com.raggesilver.BlackBox.json | 2 +-
data/com.raggesilver.BlackBox.desktop.in | 2 +-
src/meson.build | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/com.raggesilver.BlackBox.json b/com.raggesilver.BlackBox.json
index 86e0a5d..030c22f 100644
--- a/com.raggesilver.BlackBox.json
+++ b/com.raggesilver.BlackBox.json
@@ -3,7 +3,7 @@
"runtime": "org.gnome.Platform",
"runtime-version": "45",
"sdk": "org.gnome.Sdk",
- "command": "blackbox",
+ "command": "blackbox-terminal",
"finish-args": [
"--filesystem=host",
"--filesystem=xdg-run/gvfsd",
diff --git a/data/com.raggesilver.BlackBox.desktop.in b/data/com.raggesilver.BlackBox.desktop.in
index 28f3b55..1d45a17 100644
--- a/data/com.raggesilver.BlackBox.desktop.in
+++ b/data/com.raggesilver.BlackBox.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=Black Box
-Exec=blackbox
+Exec=blackbox-terminal
Terminal=false
Type=Application
Categories=GNOME;GTK;System;TerminalEmulator;
diff --git a/src/meson.build b/src/meson.build
index 8891f58..47d03f1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -75,7 +75,7 @@ if get_option('blackbox_is_flatpak')
add_project_arguments('-D', 'BLACKBOX_IS_FLATPAK', language: 'vala')
endif
-executable('blackbox', blackbox_sources, config_header,
+executable('blackbox-terminal', blackbox_sources, config_header,
vala_args: '--target-glib=2.50', dependencies: blackbox_deps,
install: true,
)
--
GitLab