Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
dd02b039
Commit
dd02b039
authored
7 months ago
by
mio
Committed by
Celeste
7 months ago
Browse files
Options
Downloads
Patches
Plain Diff
community/blackbox-terminal: fix build with gcc 14
parent
3b3b0f21
No related branches found
No related tags found
1 merge request
!70838
community/blackbox-terminal: fix build with gcc 14
Pipeline
#254517
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
community/blackbox-terminal/APKBUILD
+5
-2
5 additions, 2 deletions
community/blackbox-terminal/APKBUILD
community/blackbox-terminal/gcc14.patch
+31
-0
31 additions, 0 deletions
community/blackbox-terminal/gcc14.patch
with
36 additions
and
2 deletions
community/blackbox-terminal/APKBUILD
+
5
−
2
View file @
dd02b039
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Maintainer: knuxify <knuxify@gmail.com>
# Maintainer: knuxify <knuxify@gmail.com>
pkgname
=
blackbox-terminal
pkgname
=
blackbox-terminal
pkgver
=
0.14.0
pkgver
=
0.14.0
pkgrel
=
0
pkgrel
=
1
pkgdesc
=
"A beautiful GTK 4 terminal"
pkgdesc
=
"A beautiful GTK 4 terminal"
url
=
"https://gitlab.gnome.org/raggesilver/blackbox"
url
=
"https://gitlab.gnome.org/raggesilver/blackbox"
arch
=
"all"
arch
=
"all"
...
@@ -21,7 +21,9 @@ makedepends="
...
@@ -21,7 +21,9 @@ makedepends="
vte3-dev
vte3-dev
"
"
subpackages
=
"
$pkgname
-lang
$pkgname
-dbg"
subpackages
=
"
$pkgname
-lang
$pkgname
-dbg"
source
=
"https://gitlab.gnome.org/raggesilver/blackbox/-/archive/v
$pkgver
/blackbox-v
$pkgver
.tar.gz"
source
=
"https://gitlab.gnome.org/raggesilver/blackbox/-/archive/v
$pkgver
/blackbox-v
$pkgver
.tar.gz
gcc14.patch
"
builddir
=
"
$srcdir
/blackbox-v
$pkgver
"
builddir
=
"
$srcdir
/blackbox-v
$pkgver
"
build
()
{
build
()
{
...
@@ -42,4 +44,5 @@ package() {
...
@@ -42,4 +44,5 @@ package() {
sha512sums
=
"
sha512sums
=
"
aec6c4f553e13cd732befb3a61236ad67cf610b5a85e280107cbf0c17fdc7c139bb66d22eb24eeeef71f496ae228b44d4bfbaa1376e82b1e16beb91740ad556c blackbox-v0.14.0.tar.gz
aec6c4f553e13cd732befb3a61236ad67cf610b5a85e280107cbf0c17fdc7c139bb66d22eb24eeeef71f496ae228b44d4bfbaa1376e82b1e16beb91740ad556c blackbox-v0.14.0.tar.gz
3bf2d8a1752f107734f9af40a125f17218076b8614c6c5c51c75d272e2e03193b0f747aded6ec1576eb0dbd1c89913eaca07108cdba889fe8138f33e1b41643a gcc14.patch
"
"
This diff is collapsed.
Click to expand it.
community/blackbox-terminal/gcc14.patch
0 → 100644
+
31
−
0
View file @
dd02b039
Source: https://gitlab.gnome.org/raggesilver/blackbox/-/merge_requests/143
diff --git a/src/widgets/ColorSchemeThumbnail.vala b/src/widgets/ColorSchemeThumbnail.vala
index 2e1e57e028f5d187ae6396240069b03617265176..8c73e3d69f3e18943cf6536e5ede106806b8ee14 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 3d88970ad5f19e1eceb2aa67f44c044f3e15a7ec..1a5d06bc944592ff3bd8f73afa6109a54c099885 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;
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment