diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2024-02-29 19:11:19 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2024-02-29 20:59:50 +0100 |
| commit | 3009deed3c317c947fd3fb16191bf722f91c7aba (patch) | |
| tree | b52c4f47a69424a96f34ddc6d1851c1e1b09c51f /source/xfce/xfce4-terminal | |
| parent | cebf29a6c707c5090f031055f2a523aaa90ed365 (diff) | |
| download | current-3009deed3c317c947fd3fb16191bf722f91c7aba.tar.gz current-3009deed3c317c947fd3fb16191bf722f91c7aba.tar.xz | |
Thu Feb 29 19:11:19 UTC 202420240229191119
d/pahole-1.26-x86_64-1.txz: Upgraded.
l/Imath-3.1.11-x86_64-1.txz: Upgraded.
l/openjpeg-2.5.2-x86_64-1.txz: Upgraded.
x/ibus-anthy-1.5.16-x86_64-1.txz: Upgraded.
x/mesa-24.0.2-x86_64-1.txz: Upgraded.
x/pixman-0.43.4-x86_64-1.txz: Upgraded.
xfce/xfce4-panel-4.18.6-x86_64-1.txz: Upgraded.
xfce/xfce4-terminal-1.1.3-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
3 files changed, 1 insertions, 66 deletions
diff --git a/source/xfce/xfce4-terminal/177fda86451cdeaaea8ed409e6d711b670699a97.patch b/source/xfce/xfce4-terminal/177fda86451cdeaaea8ed409e6d711b670699a97.patch deleted file mode 100644 index d8074bde4..000000000 --- a/source/xfce/xfce4-terminal/177fda86451cdeaaea8ed409e6d711b670699a97.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 177fda86451cdeaaea8ed409e6d711b670699a97 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> -Date: Tue, 6 Feb 2024 18:14:04 +0100 -Subject: [PATCH] screen: Fix wrong assert - -It's always been wrong (or has been for a long time) but de3e7aac -revealed it, because now it's no longer disabled by building with ---disable-debug. - -Fixes: de3e7aac72fdcd3e62d69f37ec2570e5d668950a -Closes: #299 ---- - terminal/terminal-screen.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c -index 6e48b522..dc931ec7 100644 ---- a/terminal/terminal-screen.c -+++ b/terminal/terminal-screen.c -@@ -1892,7 +1892,7 @@ terminal_screen_paste_unsafe_text (TerminalScreen *screen, - { - GtkWidget *dialog; - -- g_return_if_fail (original_clipboard != GDK_SELECTION_CLIPBOARD && original_clipboard != GDK_SELECTION_PRIMARY); -+ g_return_if_fail (original_clipboard == GDK_SELECTION_CLIPBOARD || original_clipboard == GDK_SELECTION_PRIMARY); - - dialog = terminal_screen_unsafe_paste_dialog_new (screen, text); - gtk_widget_show_all (dialog); --- -GitLab - - diff --git a/source/xfce/xfce4-terminal/71ecd2a721b059394edcfb316a20ac9d46a7b2cd.patch b/source/xfce/xfce4-terminal/71ecd2a721b059394edcfb316a20ac9d46a7b2cd.patch deleted file mode 100644 index 0f55ea5db..000000000 --- a/source/xfce/xfce4-terminal/71ecd2a721b059394edcfb316a20ac9d46a7b2cd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 71ecd2a721b059394edcfb316a20ac9d46a7b2cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> -Date: Wed, 7 Feb 2024 16:10:05 +0100 -Subject: [PATCH] prefs-dialog: Fix wrong assert - -Related: #299 -Fixes: de3e7aac72fdcd3e62d69f37ec2570e5d668950a -Closes: #300 ---- - terminal/terminal-preferences-dialog.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c -index 86950b45..a1671400 100644 ---- a/terminal/terminal-preferences-dialog.c -+++ b/terminal/terminal-preferences-dialog.c -@@ -1893,7 +1893,7 @@ terminal_preferences_dialog_presets_changed (TerminalPreferencesDialog *dialog, - GValue src = { 0, }; - GValue dst = { 0, }; - -- g_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (widget)); -+ g_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (dialog)); - g_return_if_fail (GTK_IS_COMBO_BOX (widget)); - - combobox = GTK_COMBO_BOX (widget); --- -GitLab - - diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild index a4b252e74..fd8a38f83 100755 --- a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild +++ b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-terminal VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,10 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Apply a couple upstream fixes: -cat $CWD/177fda86451cdeaaea8ed409e6d711b670699a97.patch | patch -p1 --verbose || exit 1 -cat $CWD/71ecd2a721b059394edcfb316a20ac9d46a7b2cd.patch | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |