From befd8aa730c327d52ebc2dc93608bf33cc31b885 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 14 Jan 2019 21:33:56 +0000
Subject: Mon Jan 14 21:33:56 UTC 2019

a/aaa_terminfo-6.1_20190112-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20190114_bc65650-noarch-1.txz:  Upgraded.
l/gtk+3-3.24.3-x86_64-1.txz:  Upgraded.
l/libunwind-1.3.1-x86_64-1.txz:  Upgraded.
l/ncurses-6.1_20190112-x86_64-1.txz:  Upgraded.
x/xterm-343-x86_64-1.txz:  Upgraded.
xap/blueman-2.0.8-x86_64-1.txz:  Upgraded.
---
 source/l/gtk+3/gtk+3.SlackBuild                    |  7 +---
 ....e3a1593a0984cc0156ec1892a46af8f256a64878.patch | 42 ----------------------
 source/l/gtk+3/gtk.typo.fix.diff                   | 11 ------
 source/l/libunwind/libunwind.SlackBuild            |  2 +-
 4 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch
 delete mode 100644 source/l/gtk+3/gtk.typo.fix.diff

(limited to 'source')

diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild
index 7d880bde7..8e9207371 100755
--- a/source/l/gtk+3/gtk+3.SlackBuild
+++ b/source/l/gtk+3/gtk+3.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gtk+3
 VERSION=${VERSION:-$(echo gtk+-*.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,11 +77,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/gtk.typo.fix.diff.gz | patch -p1 --verbose || exit 1
-
-# Fix segfault:
-zcat $CWD/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch.gz | patch -p1 --verbose || exit 1
-
 # Regenerate ./configure:
 libtoolize --copy --force
 autoreconf -vif
diff --git a/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch b/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch
deleted file mode 100644
index 99806d194..000000000
--- a/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001
-From: Daniel Boles <dboles.src@gmail.com>
-Date: Thu, 13 Dec 2018 17:20:13 +0100
-Subject: [PATCH] x11: Fix deprecation macro use
-
-G_GNUC_END_IGNORE_DEPRECATIONS terminates the if statement and does not
-consider the following block to be part of the if. So that block was
-always taken irregardless of the pattern.
-
-Fixes #1280
----
- gdk/x11/gdkwindow-x11.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 97ada6d739..764e39495f 100644
---- a/gdk/x11/gdkwindow-x11.c
-+++ b/gdk/x11/gdkwindow-x11.c
-@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow      *window,
-   double r, g, b, a;
-   cairo_surface_t *surface;
-   cairo_matrix_t matrix;
-+  cairo_pattern_t *parent_relative_pattern;
- 
-   if (GDK_WINDOW_DESTROYED (window))
-     return;
-@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow      *window,
-     }
- 
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
--  if (pattern == gdk_x11_get_parent_relative_pattern ())
-+  parent_relative_pattern = gdk_x11_get_parent_relative_pattern ();
- G_GNUC_END_IGNORE_DEPRECATIONS
-+
-+  if (pattern == parent_relative_pattern)
-     {
-       GdkWindow *parent;
- 
--- 
-2.18.1
-
-
diff --git a/source/l/gtk+3/gtk.typo.fix.diff b/source/l/gtk+3/gtk.typo.fix.diff
deleted file mode 100644
index b966dca50..000000000
--- a/source/l/gtk+3/gtk.typo.fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./docs/tools/shooter.c.orig	2018-12-12 11:46:09.000000000 -0600
-+++ ./docs/tools/shooter.c	2018-12-13 18:28:54.613869535 -0600
-@@ -170,7 +170,7 @@
-       y_orig = 0;
-     }
- 
--  if (x_orig + width > gdk_screen_get_width (gdk_screen_get_dfeault ()))
-+  if (x_orig + width > gdk_screen_get_width (gdk_screen_get_default ()))
-     width = gdk_screen_width () - x_orig;
- 
-   if (y_orig + height > gdk_screen_get_height (gdk_screen_get_default ()))
diff --git a/source/l/libunwind/libunwind.SlackBuild b/source/l/libunwind/libunwind.SlackBuild
index eb247e2f9..28f1ddd52 100755
--- a/source/l/libunwind/libunwind.SlackBuild
+++ b/source/l/libunwind/libunwind.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libunwind
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-- 
cgit v1.2.3