Hello community, here is the log from the commit of package gfxboot for openSUSE:Leap:15.2 checked in at 2020-06-04 16:01:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/gfxboot (Old) and /work/SRC/openSUSE:Leap:15.2/.gfxboot.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gfxboot" Thu Jun 4 16:01:09 2020 rev:64 rq:810294 version:4.5.69 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/gfxboot/gfxboot.changes 2020-05-12 11:31:51.487676022 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.gfxboot.new.3606/gfxboot.changes 2020-06-04 16:01:15.802957808 +0200 @@ -1,0 +2,8 @@ +Wed May 27 16:23:58 UTC 2020 - [email protected] + +- merge gh#openSUSE/gfxboot#46 +- add F8-shortcut for language selection (jsc#SLE-12810, jsc#SLE-12479) +- actual implementation of language switch +- 4.5.69 + +-------------------------------------------------------------------- Old: ---- gfxboot-4.5.68.tar.xz New: ---- gfxboot-4.5.69.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.a2iOQt/_old 2020-06-04 16:01:16.682960835 +0200 +++ /var/tmp/diff_new_pack.a2iOQt/_new 2020-06-04 16:01:16.686960849 +0200 @@ -17,7 +17,7 @@ Name: gfxboot -Version: 4.5.68 +Version: 4.5.69 Release: 0 Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX License: GPL-2.0+ ++++++ KDE.tar.xz ++++++ ++++++ SLED.tar.xz ++++++ ++++++ SLES.tar.xz ++++++ ++++++ examples.tar.xz ++++++ ++++++ gfxboot-4.5.68.tar.xz -> gfxboot-4.5.69.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.68/VERSION new/gfxboot-4.5.69/VERSION --- old/gfxboot-4.5.68/VERSION 2020-05-02 21:51:45.000000000 +0200 +++ new/gfxboot-4.5.69/VERSION 2020-05-27 18:23:58.000000000 +0200 @@ -1 +1 @@ -4.5.68 +4.5.69 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.68/changelog new/gfxboot-4.5.69/changelog --- old/gfxboot-4.5.68/changelog 2020-05-02 21:51:45.000000000 +0200 +++ new/gfxboot-4.5.69/changelog 2020-05-27 18:23:58.000000000 +0200 @@ -1,3 +1,8 @@ +2020-05-27: 4.5.69 + - merge gh#openSUSE/gfxboot#46 + - add F8-shortcut for language selection (jsc#SLE-12810, jsc#SLE-12479) + - actual implementation of language switch + 2020-04-14: 4.5.68 - Translated using Weblate (Indonesian) - Translated using Weblate (Swedish) ++++++ openSUSE.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/common.inc new/themes/openSUSE/src/common.inc --- old/themes/openSUSE/src/common.inc 2020-05-02 21:51:45.000000000 +0200 +++ new/themes/openSUSE/src/common.inc 2020-05-27 18:23:58.000000000 +0200 @@ -1305,7 +1305,7 @@ moveto setcolor } if - dup keyF8 eq syslinux and { + dup keyF11 eq syslinux and { kroete.file .undef eq { /kroete.file "kroete.dat" findfile def } if kroete.file kroete.dir idle /kroete.dir kroete.dir 1 xor def @@ -1341,7 +1341,7 @@ moveto setcolor } if - dup keyShiftF8 eq debug 3 ge and { + dup keyShiftF11 eq debug 3 ge and { currentcolor debug 1 and { white } { black } ifelse setcolor currentpoint 300 0 moveto @@ -1375,10 +1375,6 @@ /debug debug 1 add def } if - dup keyShiftF11 eq { - 400 0 moveto "ani_%04d.jpg" play_movie - } if - dup keyShiftF1 eq { /transp transp 0x10 sub 0 max def @@ -1415,47 +1411,6 @@ } if - dup keyF11 eq debug 1 ge and { - - /dit { - dup 0xff and rand 0xff and gt { 0xff add } if - 8 shr - } def - - /c13.r rand 0x7f00 and def - /c02_13.r rand 0x7f00 and c13.r sub def - /c23.r rand 0x7f00 and def - /c01_23.r rand 0x7f00 and c23.r sub def - /c13.g rand 0x7f00 and def - /c02_13.g rand 0x7f00 and c13.g sub def - /c23.g rand 0x7f00 and def - /c01_23.g rand 0x7f00 and c23.g sub def - /c13.b rand 0x7f00 and def - /c02_13.b rand 0x7f00 and c13.b sub def - /c23.b rand 0x7f00 and def - /c01_23.b rand 0x7f00 and c23.b sub def - - screen.size /h exch def /w exch def - - 0 1 screen.size exch pop { - 0 1 screen.size pop { - over moveto - - currentpoint c01_23.r mul h div exch c02_13.r mul w div add c13.r add c23.r add - dit 0 max 0xff min 16 shl - currentpoint c01_23.g mul h div exch c02_13.g mul w div add c13.g add c23.g add - dit 0 max 0xff min 8 shl - currentpoint c01_23.b mul h div exch c02_13.b mul w div add c13.b add c23.b add - dit 0 max 0xff min add add - - setcolor putpixel - } for - pop - } for - - pop 0 - } if - dup keyF12 eq debug 6 ge and { % mouse support testing @@ -1775,6 +1730,7 @@ /keymap.default "keymap" "" gfxconfig.set.str /config.addopt.lang "addopt.lang" false gfxconfig.set.bool /config.addopt.keytable "addopt.keytable" false gfxconfig.set.bool +/config.extralang.locales "extralang.locales" [ ] gfxconfig.set.array_str % default value for initrd size (in bytes) /config.initrd.size "initrd.size" 0 gfxconfig.set.int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_extralang.inc new/themes/openSUSE/src/dia_extralang.inc --- old/themes/openSUSE/src/dia_extralang.inc 1970-01-01 01:00:00.000000000 +0100 +++ new/themes/openSUSE/src/dia_extralang.inc 2020-05-27 18:23:58.000000000 +0200 @@ -0,0 +1,85 @@ +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% +% extra language switch button +% +% Iterate through the locales in config.extralang.locales array. +% +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Initialize. +% +% ( ) ==> ( ) +% +/extralang.init { + /extralang.current 0 def +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Get index in language menu. +% +% ( ) ==> ( ) +% +/extralang.index { + 0 1 lang.items length 1 sub { + lang.items over get config.extralang.locales extralang.current get eq { return } { pop } ifelse + } for + 0 +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Get language name. +% +% ( ) ==> ( ) +% +/extralang.name { + config.extralang.locales extralang.current get lang.getdefname +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Set a new language. +% +% ( ) ==> ( ) +% +/extralang.update { + xmenu.lang .xm_current extralang.index put + lang.update +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Activate selected language. +% +% And also move to next language in list. +% +% ( ) => ( ) +% +/panel.extralang { + extralang.update + % go to next language + /extralang.current extralang.current 1 add config.extralang.locales length mod def +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Return width of panel entry. +% +% ( ) => ( width ) +% +/panel.extralang.width { + extralang.name strsize pop +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Redraw panel entry. +% +% ( panel ) => ( ) +% +/panel.extralang.update { + panel.text.moveto + extralang.name show.rtl +} def diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/gfxboot.cfg new/themes/openSUSE/src/gfxboot.cfg --- old/themes/openSUSE/src/gfxboot.cfg 2020-05-02 21:51:45.000000000 +0200 +++ new/themes/openSUSE/src/gfxboot.cfg 2020-05-27 18:23:58.000000000 +0200 @@ -166,7 +166,7 @@ autodown=1 ; F-key assignments ; value can be one of: lang, video, install, kernelopts, dud, bits, keymap, -; profile, restore, otheropts +; profile, restore, otheropts, extralang ; note1: 'bits' is only shown on x86_64, 'profile' only when a file 'profile' ; exists, 'restore' only when there is a boot entry 'restore' ; note2: F1 is always help, F9 enables speech output, F10 exits gfxboot @@ -176,12 +176,16 @@ key.F5=kernelopts key.F6=dud key.F7=bits +key.F8=extralang ; add 'lang' option with current locale addopt.lang=1 ; add 'keytable' option with current keymap addopt.keytable=1 ; initrd size in bytes (fallback for progress bar) initrd.size=0 +; languages to use for extralang option +; use locale in long form (e.g. en_US) +extralang.locales=zh_CN,en_US [boot] ; show welcome animation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/main.bc new/themes/openSUSE/src/main.bc --- old/themes/openSUSE/src/main.bc 2020-05-02 21:51:45.000000000 +0200 +++ new/themes/openSUSE/src/main.bc 2020-05-27 18:23:58.000000000 +0200 @@ -25,6 +25,7 @@ %% include dia_restore.inc %% include dia_net.inc %% include dia_otheropts.inc +%% include dia_extralang.inc %% include panel.inc %% include keytables.inc %% include locale.inc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/panel.inc new/themes/openSUSE/src/panel.inc --- old/themes/openSUSE/src/panel.inc 2020-05-02 21:51:45.000000000 +0200 +++ new/themes/openSUSE/src/panel.inc 2020-05-27 18:23:58.000000000 +0200 @@ -170,6 +170,7 @@ dup "otheropts" eq { pop [ /panel.otheropts /panel.otheropts.width /panel.otheropts.update /otheropts.init ] return } if dup "dud" eq { pop [ /panel.dud /panel.dud.width /panel.dud.update /dud.init ] return } if dup "keymap" eq { pop [ /panel.keymap /panel.keymap.width /panel.keymap.update /keymap.init ] return } if + dup "extralang" eq { pop [ /panel.extralang /panel.extralang.width /panel.extralang.update /extralang.init ] return } if dup "bits" eq { pop .undef ++++++ upstream.tar.xz ++++++
