From b604e1b12779fec10d783a94ad147fcd81abbc54 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 7 Mar 2019 21:26:58 +0000
Subject: Thu Mar  7 21:26:58 UTC 2019

a/e2fsprogs-1.44.6-x86_64-1.txz:  Upgraded.
ap/man-pages-5.00-noarch-1.txz:  Upgraded.
ap/most-5.1.0-x86_64-1.txz:  Upgraded.
n/php-7.2.16-x86_64-1.txz:  Upgraded.
x/xf86-video-amdgpu-19.0.0-x86_64-1.txz:  Upgraded.
x/xf86-video-ati-19.0.0-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-60.5.3-x86_64-1.txz:  Upgraded.
xap/pavucontrol-4.0-x86_64-1.txz:  Upgraded.
---
 source/xap/pavucontrol/pavucontrol.SlackBuild       |  8 +++-----
 .../pavucontrol/replace-gtk-stock-lock-icon.diff    | 21 ---------------------
 source/xap/pavucontrol/slack-desc                   |  2 +-
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 source/xap/pavucontrol/replace-gtk-stock-lock-icon.diff

(limited to 'source/xap/pavucontrol')

diff --git a/source/xap/pavucontrol/pavucontrol.SlackBuild b/source/xap/pavucontrol/pavucontrol.SlackBuild
index 4c6bd025c..4bd9ca2c5 100755
--- a/source/xap/pavucontrol/pavucontrol.SlackBuild
+++ b/source/xap/pavucontrol/pavucontrol.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pavucontrol
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -67,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find -L . \
@@ -76,8 +76,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-zcat $CWD/replace-gtk-stock-lock-icon.diff.gz | patch -p1 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
diff --git a/source/xap/pavucontrol/replace-gtk-stock-lock-icon.diff b/source/xap/pavucontrol/replace-gtk-stock-lock-icon.diff
deleted file mode 100644
index cd8df10d1..000000000
--- a/source/xap/pavucontrol/replace-gtk-stock-lock-icon.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur pavucontrol-3.0.orig/src/pavucontrol.glade pavucontrol-3.0/src/pavucontrol.glade
---- pavucontrol-3.0.orig/src/pavucontrol.glade	2015-03-24 09:39:00.000000000 -0500
-+++ pavucontrol-3.0/src/pavucontrol.glade	2016-01-04 22:40:15.553206280 -0600
-@@ -312,7 +312,7 @@
-                               <object class="GtkImage" id="image18">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
--                                <property name="icon_name">stock_lock</property>
-+                                <property name="icon_name">security-medium</property>
-                                 <property name="icon-size">1</property>
-                               </object>
-                             </child>
-@@ -1474,7 +1474,7 @@
-                               <object class="GtkImage" id="image18">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
--                                <property name="icon_name">stock_lock</property>
-+                                <property name="icon_name">security-medium</property>
-                                 <property name="icon-size">1</property>
-                               </object>
-                             </child>
diff --git a/source/xap/pavucontrol/slack-desc b/source/xap/pavucontrol/slack-desc
index 2b33b87e3..71a4e6e7c 100644
--- a/source/xap/pavucontrol/slack-desc
+++ b/source/xap/pavucontrol/slack-desc
@@ -13,7 +13,7 @@ pavucontrol: PulseAudio sound server. In contrast to classic mixer tools, this o
 pavucontrol: allows you to control both the volume of hardware devices and of
 pavucontrol: each playback stream separately.
 pavucontrol:
-pavucontrol: Website: http://0pointer.de/lennart/projects/pavucontrol/
+pavucontrol: Homepage: https://freedesktop.org/software/pulseaudio/pavucontrol
 pavucontrol:
 pavucontrol:
 pavucontrol:
-- 
cgit v1.2.3