summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-03-01 20:10:44 +0000
committer Eric Hameleers <alien@slackware.com>2021-03-02 08:59:52 +0100
commit07ac5d43e50cb2039f37b4e9447c4e52789c9fb2 (patch)
tree9b2ebc687d19203f8b4ebe1ab2a0b6c485454a3b /source/ap
parentfa458b65d9d4c5e933622574d999915ecda37a25 (diff)
downloadcurrent-07ac5d43e50cb2039f37b4e9447c4e52789c9fb2.tar.gz
current-07ac5d43e50cb2039f37b4e9447c4e52789c9fb2.tar.xz
Mon Mar 1 20:10:44 UTC 202120210301201044
a/e2fsprogs-1.46.2-x86_64-1.txz: Upgraded. a/etc-15.0-x86_64-14.txz: Rebuilt. /etc/hosts: added IPv6 loopback addresses. a/hwdata-0.345-noarch-1.txz: Upgraded. ap/hplip-3.20.6-x86_64-7.txz: Rebuilt. Fixed desktop file to show category and icon properly. Thanks to upnort and ArTourter. d/git-2.30.1-x86_64-3.txz: Rebuilt. Make sure the bash-completion file is installed in the proper location. Thanks to Robby Workman. d/python-setuptools-54.0.0-x86_64-1.txz: Upgraded. d/vala-0.50.4-x86_64-1.txz: Upgraded. l/imagemagick-7.0.11_2-x86_64-1.txz: Upgraded. l/python-pillow-8.1.1-x86_64-1.txz: Upgraded. n/network-scripts-15.0-noarch-13.txz: Rebuilt. Well, apparently there was a newer branch of this than the one that was sitting in my usual pending queue, so here it is. This also includes some additional documentation on the new features. NOTE: In order to use SLAAC to configure IPv6, you'll need to have USE_SLAAC[x]="yes" for the interface in rc.inet1.conf. This is to ensure that nobody is surprised to find their machine fully exposed to the internet - better safe than sorry. Thanks to Darren "Tadgy" Austin and Robby Workman. n/wireless_tools-30.pre9-x86_64-4.txz: Rebuilt. This package contains some updates to rc.wireless and rc.wireless.conf. Thanks to Darren "Tadgy" Austin. xfce/mousepad-0.5.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap')
-rw-r--r--source/ap/hplip/fix-desktop-file.patch13
-rwxr-xr-xsource/ap/hplip/hplip.SlackBuild5
2 files changed, 17 insertions, 1 deletions
diff --git a/source/ap/hplip/fix-desktop-file.patch b/source/ap/hplip/fix-desktop-file.patch
new file mode 100644
index 000000000..050e9aa85
--- /dev/null
+++ b/source/ap/hplip/fix-desktop-file.patch
@@ -0,0 +1,13 @@
+diff -Nur hplip-3.20.6.orig/hp-uiscan.desktop.in hplip-3.20.6/hp-uiscan.desktop.in
+--- hplip-3.20.6.orig/hp-uiscan.desktop.in 2020-06-09 06:20:52.000000000 -0500
++++ hplip-3.20.6/hp-uiscan.desktop.in 2021-02-28 23:02:12.015266747 -0600
+@@ -3,6 +3,7 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Name=hp-uiscan
++Name=HP Scan Utility
+ Exec=/usr/bin/hp-uiscan
+-Icon=/usr/share/icons/Humanity/devices/48/printer.svg
++Categories=Application;Utility;
++Icon=@abs_datadir@/hplip/data/images/128x128/hp_logo.png
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index ba5a1c5a2..a33b2c8a2 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=hplip
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -83,6 +83,9 @@ zcat $CWD/setup.py.lc_all.c.diff.gz | patch -p1 --verbose || exit 1
# Fix a few .py files lacking #!/usr/bin/python3:
zcat $CWD/hplip.python3.shebang.diff.gz | patch -p1 --verbose || exit 1
+# Fix the desktop file to show correct icon and category
+zcat $CWD/fix-desktop-file.patch.gz | patch -p1 --verbose || exit 1
+
# Choose correct options depending on whether PAM is installed:
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
unset SHADOW_OPTIONS