From b8d031fea1dceade295a9c5f5565148422f22b48 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Mon, 3 Sep 2018 17:17:15 +0200 Subject: [PATCH] gnome-terminal: update to 3.30.0. --- .../gnome-terminal/patches/fix-W_EXITCODE.patch | 17 +++++++++++++++++ srcpkgs/gnome-terminal/template | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch diff --git a/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch b/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch new file mode 100644 index 00000000000..47f906e2997 --- /dev/null +++ b/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch @@ -0,0 +1,17 @@ +Source: https://mail-archives.apache.org/mod_mbox/mesos-reviews/201610.mbox/%3C20161014170728.1720.54446@reviews.apache.org%3E +Upstream: No +Reason: fixes compilation with musl that doesn't define W* macros. + +--- src/terminal.c ++++ src/terminal.c +@@ -47,6 +47,10 @@ + GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) + #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) + ++#ifndef W_EXITCODE ++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) ++#endif ++ + /* Wait-for-exit helper */ + + typedef struct { diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 8a5f5197c00..bf555eb3e90 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,9 +1,9 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.28.2 +version=3.30.0 revision=1 build_style=gnu-configure -configure_args="--disable-static --with-nautilus-extension --disable-migration" +configure_args="--disable-static --with-nautilus-extension" hostmakedepends="appdata-tools glib-devel intltool itstool pkg-config" makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel @@ -14,5 +14,5 @@ maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Terminal" license="GPL-2.0-or-later, GFDL-1.3-only" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=a283dca4980eecf9184a55aac03fef99f85748461ff190423a2253f3b4557279 +checksum=19d516bc0ba0b2aa8670673105c051b492ff8d401a435e86af0638bc600f6f54 lib32disabled=yes