Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2023-05-16 14:15:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation" Tue May 16 14:15:48 2023 rev:520 rq:1087181 version:4.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2023-04-04 21:17:20.736014164 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.1533/yast2-installation.changes 2023-05-16 14:21:48.149812385 +0200 @@ -1,0 +2,8 @@ +Thu May 11 16:44:38 UTC 2023 - Stefan Hundhammer <shundham...@suse.com> + +- Use a larger font for xterm during installation via X resources + (bsc#1211267) + Details: https://github.com/yast/yast-installation/pull/1085 + 4.6.3 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.6.2.tar.bz2 New: ---- yast2-installation-4.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.jhMFjg/_old 2023-05-16 14:21:48.849816388 +0200 +++ /var/tmp/diff_new_pack.jhMFjg/_new 2023-05-16 14:21:48.853816411 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.6.2 +Version: 4.6.3 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only ++++++ yast2-installation-4.6.2.tar.bz2 -> yast2-installation-4.6.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.6.2/package/yast2-installation.changes new/yast2-installation-4.6.3/package/yast2-installation.changes --- old/yast2-installation-4.6.2/package/yast2-installation.changes 2023-04-03 14:26:59.000000000 +0200 +++ new/yast2-installation-4.6.3/package/yast2-installation.changes 2023-05-15 10:18:51.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu May 11 16:44:38 UTC 2023 - Stefan Hundhammer <shundham...@suse.com> + +- Use a larger font for xterm during installation via X resources + (bsc#1211267) + Details: https://github.com/yast/yast-installation/pull/1085 + 4.6.3 + +------------------------------------------------------------------- Mon Apr 3 12:04:23 UTC 2023 - Ladislav Slezák <lsle...@suse.com> - yupdate - improved Live ISO detection, added "--force" option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.6.2/package/yast2-installation.spec new/yast2-installation-4.6.3/package/yast2-installation.spec --- old/yast2-installation-4.6.2/package/yast2-installation.spec 2023-04-03 14:26:59.000000000 +0200 +++ new/yast2-installation-4.6.3/package/yast2-installation.spec 2023-05-15 10:18:51.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.6.2 +Version: 4.6.3 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.6.2/startup/YaST2.call new/yast2-installation-4.6.3/startup/YaST2.call --- old/yast2-installation-4.6.2/startup/YaST2.call 2023-04-03 14:26:59.000000000 +0200 +++ new/yast2-installation-4.6.3/startup/YaST2.call 2023-05-15 10:18:51.000000000 +0200 @@ -179,6 +179,66 @@ } +function calculate_xterm_font_size() { +#------------------------------------------------------ +# Calculate an appropriate font size for xterm based on the DPI +# ($1) and set XTERM_FONT_SIZE accordingly. +# --- + + if [ -n "$XTERM_FONT_SIZE" ]; then + # Enable overriding the xterm font size from the command line or + # from an installation ISO boot parameter: + # + # Either boot the installation ISO with something like + # + # XTERM_FONT_SIZE=21 + # + # (which will end up in the environment) + # or start this script in DPI debugging mode with + # + # FAKE_MON_WIDTH_MM=200 XTERM_FONT_SIZE=21 ./YaST2.call + log "\tUsing XTERM_FONT_SIZE from environment: ${XTERM_FONT_SIZE}" + return + fi + + local DPI=${1:-96} + + if [ ${DPI:-0} -le 96 ]; then + XTERM_FONT_SIZE=10 + elif [ $DPI -le 192 ]; then + XTERM_FONT_SIZE=12 + else + XTERM_FONT_SIZE=14 + fi + + export XTERM_FONT_SIZE + log "\tXTERM_FONT_SIZE: $XTERM_FONT_SIZE for $DPI dpi" +} + + +function add_x11_resources() { +#------------------------------------------------------ +# Add some X resources for xterm to /root/.Xdefaults +# +# Notice that this file is only used if nothing has been +# loaded into the X server with 'xrdb' yet. +# --- + + local RESOURCE_FILE=/root/.Xdefaults + XTERM_FONT_SIZE=${XTERM_FONT_SIZE:-12} + log "\tAdding X resources for xterm to $RESOURCE_FILE" + + cat >>$RESOURCE_FILE <<EOF + +! Fonts for xterm during a YaST Qt UI installation +! (You can start an xterm with Ctrl-Shift-Alt X) +XTerm*faceName: DejaVu Sans Mono +XTerm*faceSize: $XTERM_FONT_SIZE + +EOF +} + + function prepare_for_x11 () { #------------------------------------------------------ # prepare X11 installation @@ -201,6 +261,8 @@ local DPI=`calculate_x11_dpi` # set_xft_dpi $DPI set_qt_scale_factor $DPI + calculate_xterm_font_size $DPI + add_x11_resources fi fi @@ -618,7 +680,9 @@ DPI=`calculate_x11_dpi` echo "DPI: $DPI" set_qt_scale_factor $DPI - env | grep "^QT_SCALE" + calculate_xterm_font_size $DPI + env | grep -E "^(QT_SCALE|XTERM)" + # add_x11_resources echo "Done." exit 1 fi
