Hello community, here is the log from the commit of package screenfetch for openSUSE:Factory checked in at 2019-06-19 21:13:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screenfetch (Old) and /work/SRC/openSUSE:Factory/.screenfetch.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "screenfetch" Wed Jun 19 21:13:45 2019 rev:12 rq:710844 version:3.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/screenfetch/screenfetch.changes 2018-08-15 10:35:36.223986430 +0200 +++ /work/SRC/openSUSE:Factory/.screenfetch.new.4811/screenfetch.changes 2019-06-19 21:14:17.450855826 +0200 @@ -1,0 +2,6 @@ +Tue Jun 18 09:46:13 UTC 2019 - [email protected] + +- Add patch screenfetch-empty_fb_fix.patch Fix error when /proc/fb + is empty. (Backport from Master) + +------------------------------------------------------------------- New: ---- screenfetch-empty_fb_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screenfetch.spec ++++++ --- /var/tmp/diff_new_pack.RIgYtF/_old 2019-06-19 21:14:18.042856430 +0200 +++ /var/tmp/diff_new_pack.RIgYtF/_new 2019-06-19 21:14:18.046856433 +0200 @@ -1,7 +1,7 @@ # # spec file for package screenfetch # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -31,6 +31,7 @@ Recommends: scrot Recommends: xdpyinfo BuildArch: noarch +Patch1: screenfetch-empty_fb_fix.patch %description screenFetch is a "Bash Screenshot Information Tool". This handy Bash @@ -44,6 +45,7 @@ %prep %setup -q -n screenFetch-%{version} +%patch1 -p1 %build sed -i "s|%{_bindir}/env |/bin/|g" %{name}-dev ++++++ screenfetch-empty_fb_fix.patch ++++++ From: Joerg Frede ([email protected]) Date: Tue Jun 18 09:46:13 UTC 2019 Subject: Fix error when /proc/fb is empty Upstream: merged diff -Pdpru a/screenfetch-dev b/screenfetch-dev --- a/screenfetch-dev 2017-03-10 14:55:45.000000000 +0100 +++ b/screenfetch-dev 2019-06-18 11:39:45.404785234 +0200 @@ -1332,13 +1332,23 @@ detectgpu () { # Detect Intel GPU #works in dash # Run it only on Intel Processors if GPU is unknown DetectIntelGPU() { - gpu=$(awk '{print $2}' /proc/fb) + if [ -r /proc/fb ]; then + gpu=$(awk 'BEGIN {ORS = " &"} {$1="";print}' /proc/fb | sed -r s/'^\s+|\s*&$'//g) + fi case $gpu in - *intel*) gpu=intel ;; + *mfb) + gpu=$(lspci | grep -i vga | awk -F ": " '{print $2}') + ;; + *intel*) + gpu="intel" + ;; + *) + gpu="Not Found" + ;; esac - if [ $gpu = intel ]; then + if [[ "$gpu" = "intel" ]]; then #Detect CPU local CPU=$(uname -p | awk '{print $3}') CPU=${CPU#*'-'}; #Detect CPU number
