From 2a8b2eba309a73a177e79a88be0b024f642cc350 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Jun 2018 21:22:04 +0000
Subject: Mon Jun 25 21:22:04 UTC 2018

a/eudev-3.2.5-x86_64-4.txz:  Rebuilt.
  Added a couple more modules to watchdog.conf.
l/fribidi-1.0.4-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_3-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-60.1.0esr-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html
  (* Security fix *)
xap/network-manager-applet-1.8.14-x86_64-1.txz:  Upgraded.
xap/rxvt-unicode-9.22-x86_64-5.txz:  Rebuilt.
  Recompiled against perl-5.28.0.
xfce/Thunar-1.8.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
xfce/xfce4-pulseaudio-plugin-0.4.1-x86_64-1.txz:  Upgraded.
xfce/xfce4-screenshooter-1.9.2-x86_64-1.txz:  Upgraded.
xfce/xfce4-taskmanager-1.2.1-x86_64-1.txz:  Upgraded.
xfce/xfdesktop-4.12.4-x86_64-3.txz:  Rebuilt.
  Rebuilt after upgrading to Thunar-1.8.1.
---
 source/xap/mozilla-firefox/mozilla-firefox.SlackBuild       |  4 ++--
 source/xap/network-manager-applet/fix-double-free.diff      | 13 -------------
 .../network-manager-applet.SlackBuild                       |  5 +----
 source/xap/rxvt-unicode/rxvt-unicode.SlackBuild             |  2 +-
 4 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 source/xap/network-manager-applet/fix-double-free.diff

(limited to 'source/xap')

diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index ce18567fe..149de510b 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -188,7 +188,7 @@ tar xvf $CWD/firefox-$VERSION.source.tar.?z || exit 1
 mv * ..
 cd ..
 rm -rf firefox-unpack
-cd firefox-$VERSION || exit 1
+cd firefox-$RELEASEVER || exit 1
 
 # Prevent failures building gkrust by suppressing useless warnings:
 sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \
@@ -200,7 +200,7 @@ zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
 # Fetch localization, if requested
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1256955
 if [ ! -z $MOZLOCALIZE ]; then
-  LOC_URL="http://ftp.mozilla.org/pub/firefox/candidates/$VERSION-candidates/build1/l10n_changesets.txt"
+  LOC_URL="http://ftp.mozilla.org/pub/firefox/candidates/$RELEASEVER-candidates/build1/l10n_changesets.txt"
   LOC_COMMIT=$(wget -q -O - $LOC_URL | grep ^$MOZLOCALIZE | cut -d\  -f2)
   hg clone https://hg.mozilla.org/l10n-central/$MOZLOCALIZE -r $LOC_COMMIT
 fi
diff --git a/source/xap/network-manager-applet/fix-double-free.diff b/source/xap/network-manager-applet/fix-double-free.diff
deleted file mode 100644
index 45db62ffd..000000000
--- a/source/xap/network-manager-applet/fix-double-free.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/src/ap-menu-item.c w/src/ap-menu-item.c
-index 92953c04..7d614f45 100644
---- i/src/ap-menu-item.c
-+++ w/src/ap-menu-item.c
-@@ -327,7 +327,6 @@ finalize (GObject *object)
- 	g_free (priv->ssid_string);
- 
- 	g_slist_free_full (priv->dupes, g_free);
--	g_slist_free (priv->dupes);
- 
- 	G_OBJECT_CLASS (nm_network_menu_item_parent_class)->finalize (object);
- }
-
diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
index 000691c36..d987223be 100755
--- a/source/xap/network-manager-applet/network-manager-applet.SlackBuild
+++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=network-manager-applet
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -76,9 +76,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix crash:
-zcat $CWD/fix-double-free.diff.gz | patch -p1 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild
index dcca86a80..437ec3ea2 100755
--- a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild
+++ b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rxvt-unicode
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-- 
cgit v1.2.3-65-gdbad