Mailinglist Archive: opensuse-commit (793 mails)

< Previous Next >
commit gfxboot for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 15 Sep 2009 01:33:57 +0200
  • Message-id: <20090914233357.3550661B3@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package gfxboot for openSUSE:Factory
checked in at Tue Sep 15 01:33:57 CEST 2009.



--------
--- gfxboot/gfxboot.changes 2009-09-09 16:16:32.000000000 +0200
+++ gfxboot/gfxboot.changes 2009-09-14 16:45:50.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Sep 14 16:45:42 CEST 2009 - snwint@xxxxxxx
+
+- fix some nasm warnings
+- updated 11.2 openSUSE theme (bnc #538949)
+- added network config dialog
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
gfxboot-4.1.22.tar.bz2

New:
----
gfxboot-4.1.23.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gfxboot.spec ++++++
--- /var/tmp/diff_new_pack.BPdsGr/_old 2009-09-15 01:32:24.000000000 +0200
+++ /var/tmp/diff_new_pack.BPdsGr/_new 2009-09-15 01:32:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gfxboot (Version 4.1.22)
+# spec file for package gfxboot (Version 4.1.23)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -27,10 +27,10 @@
Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools
perl-HTML-Parser
AutoReqProv: on
Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX
-Version: 4.1.22
-Release: 2
+Version: 4.1.23
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: gfxboot-4.1.22.tar.bz2
+Source: gfxboot-4.1.23.tar.bz2
Source1: openSUSE.tar.bz2
Source2: SLED.tar.bz2
Source3: SLES.tar.bz2

++++++ SLED.tar.bz2 ++++++

++++++ SLES.tar.bz2 ++++++

++++++ gfxboot-4.1.22.tar.bz2 -> gfxboot-4.1.23.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gfxboot-4.1.22/Changelog new/gfxboot-4.1.23/Changelog
--- old/gfxboot-4.1.22/Changelog 2009-09-09 16:14:21.000000000 +0200
+++ new/gfxboot-4.1.23/Changelog 2009-09-14 16:34:49.000000000 +0200
@@ -1,3 +1,8 @@
+14/9/2009: v4.1.23
+ - fix some nasm warnings
+ - updated 11.2 openSUSE theme (bnc #538949)
+ - added network config dialog
+
9/9/2009: v4.1.22
- allow empty menus
- added new gfxtest script
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gfxboot-4.1.22/VERSION new/gfxboot-4.1.23/VERSION
--- old/gfxboot-4.1.22/VERSION 2009-07-02 15:47:30.000000000 +0200
+++ new/gfxboot-4.1.23/VERSION 2009-09-09 16:38:33.000000000 +0200
@@ -1 +1 @@
-4.1.22
+4.1.23
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gfxboot-4.1.22/bincode.asm
new/gfxboot-4.1.23/bincode.asm
--- old/gfxboot-4.1.22/bincode.asm 2009-07-10 14:47:57.000000000 +0200
+++ new/gfxboot-4.1.23/bincode.asm 2009-09-09 16:34:04.000000000 +0200
@@ -284,7 +284,7 @@
chr.x_advance dw 0
chr.type db 0 ; 0 = bitmap, 1: gray scale

-chr.gray_values
+chr.gray_values:
%assign i 0
%rep cbm_max_gray + 1
db (i * 255)/cbm_max_gray
@@ -677,13 +677,13 @@


%macro gfx_enter 0
- call gfx_enter
+ call _gfx_enter
bits 32
%endmacro


%macro gfx_leave 0
- call gfx_leave
+ call _gfx_leave
bits 16
%endmacro

@@ -1738,7 +1738,7 @@

bits 16

-gfx_enter:
+_gfx_enter:
pop word [cs:tmp_var_0]

push fs
@@ -1764,7 +1764,7 @@

bits 32

-gfx_leave:
+_gfx_leave:
pm_leave

call use_old_stack
@@ -3413,7 +3413,7 @@
set_mode_80:
and word [gfx_mode],0
stc
-set_mode_90
+set_mode_90:
ret

mode_init:
@@ -13354,7 +13354,7 @@
shld edx,eax,3
shl eax,3
jmp utf8_enc_60
-utf8_enc_40
+utf8_enc_40:
inc ecx
cmp eax,4000000h
jae utf8_enc_50

++++++ openSUSE.tar.bz2 ++++++
Files old/themes/openSUSE/data-boot/back.jpg and
new/themes/openSUSE/data-boot/back.jpg differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/themes/openSUSE/data-boot/gfxboot.cfg
new/themes/openSUSE/data-boot/gfxboot.cfg
--- old/themes/openSUSE/data-boot/gfxboot.cfg 2009-07-02 15:47:40.000000000
+0200
+++ new/themes/openSUSE/data-boot/gfxboot.cfg 2009-09-14 14:28:08.000000000
+0200
@@ -90,7 +90,7 @@
; upper left corner
mainmenu.pos=220,163
; main menu selection bar transparency (0..255)
-mainmenu.bar.transparency=120
+mainmenu.bar.transparency=150
; boot option input field position
bootopt.pos=263,490
; background image
Files old/themes/openSUSE/data-install/back.jpg and
new/themes/openSUSE/data-install/back.jpg differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/themes/openSUSE/data-install/gfxboot.cfg
new/themes/openSUSE/data-install/gfxboot.cfg
--- old/themes/openSUSE/data-install/gfxboot.cfg 2009-07-02
15:47:30.000000000 +0200
+++ new/themes/openSUSE/data-install/gfxboot.cfg 2009-09-14
14:25:07.000000000 +0200
@@ -35,7 +35,7 @@
; minimal main menu selection bar width
mainmenu.bar.minwidth=300
; main menu selection bar transparency (0..255)
-mainmenu.bar.transparency=100
+mainmenu.bar.transparency=150
; main menu colors
mainmenu.bar.color=0xffffff
mainmenu.normal.fg=0xffffff
Files old/themes/openSUSE/data-install/welcome.jpg and
new/themes/openSUSE/data-install/welcome.jpg differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/themes/openSUSE/src/bsplash.inc
new/themes/openSUSE/src/bsplash.inc
--- old/themes/openSUSE/src/bsplash.inc 2009-07-10 14:38:51.000000000 +0200
+++ new/themes/openSUSE/src/bsplash.inc 2009-09-14 14:25:15.000000000 +0200
@@ -223,7 +223,7 @@
/b2_text_tmp b2_text imgsize 0 0 moveto savescreen def
% /b2_spot_tmp b2_spot imgsize 0 0 moveto savescreen def

- 600 160 moveto
+ 560 120 moveto
/b2_orig b2_text imgsize savescreen def
/b2_buf b2_text imgsize savescreen def

@@ -286,7 +286,7 @@
0 0 moveto
0xffffff b2_text_tmp b2_buf blend

- 600 160 moveto b2_buf restorescreen
+ 560 120 moveto b2_buf restorescreen

false

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 2009-08-07 11:51:02.000000000 +0200
+++ new/themes/openSUSE/src/common.inc 2009-09-14 16:30:43.000000000 +0200
@@ -462,6 +462,34 @@
} if
} if

+ xmenu.net {
+ xmenu.install {
+ net.config_type .undef ne {
+ xmenu.install .xm_current get dup .inst_cdrom eq exch .inst_hd eq or {
+ % TODO: add netsetup=XXX
+ } {
+ net.config_type .net_static eq {
+ input.net.static 0 get dup "" ne {
+ "hostip=%s " bc.cmd dup length add sprintf
+ } { pop } ifelse
+ input.net.static 1 get dup "" ne {
+ "netmask=%s " bc.cmd dup length add sprintf
+ } { pop } ifelse
+ input.net.static 2 get dup "" ne {
+ "gateway=%s " bc.cmd dup length add sprintf
+ } { pop } ifelse
+ input.net.static 3 get dup "" ne {
+ "nameserver=%s " bc.cmd dup length add sprintf
+ } { pop } ifelse
+ input.net.static 4 get dup "" ne {
+ "domain=%s " bc.cmd dup length add sprintf
+ } { pop } ifelse
+ } if
+ } ifelse
+ } if
+ } if
+ } if
+
% add user-supplied options

bc.cmd exch .inp_buf get strcat " " strcat pop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/themes/openSUSE/src/dia_install.inc
new/themes/openSUSE/src/dia_install.inc
--- old/themes/openSUSE/src/dia_install.inc 2009-07-02 15:47:30.000000000
+0200
+++ new/themes/openSUSE/src/dia_install.inc 2009-09-14 15:24:27.000000000
+0200
@@ -12,12 +12,13 @@

% install types
/.inst_cdrom 0 def
-/.inst_slp 1 def
-/.inst_ftp 2 def
-/.inst_http 3 def
-/.inst_nfs 4 def
-/.inst_smb 5 def
-/.inst_hd 6 def
+/.inst_hd 1 def
+/.inst_slp 2 def
+/.inst_ftp 3 def
+/.inst_http 4 def
+/.inst_nfs 5 def
+/.inst_smb 6 def
+/.inst_net_setup 7 def

/install.last .inst_cdrom def

@@ -42,11 +43,16 @@
xmenu .xm_current install.last put

% see install types (.inst_*)
- xmenu .xm_list [ is_dvd { "DVD" } { "CD-ROM" } ifelse "SLP" "FTP" "HTTP"
"NFS" "SMB / CIFS" /txt_harddisk ] put
+ xmenu .xm_list [ is_dvd { "DVD" } { "CD-ROM" } ifelse /txt_harddisk
"\x09SLP" "FTP" "HTTP" "NFS" "SMB / CIFS" "\x09\x09Network Setup " ] put

xmenu .xm_title /txt_install_source put

+ /install.submenu.idx xmenu .xm_list get length 1 sub def
+
install.set.install.option
+
+ % needed in case menu is only attached to install menu
+ net.init
} def


@@ -58,16 +64,20 @@
/install.update {
/xmenu xmenu.install def

- xmenu .xm_current get dup .inst_cdrom eq exch .inst_slp eq or {
- /install.last xmenu .xm_current get def
+ xmenu .xm_current get install.submenu.idx eq {
+ xmenu .xm_current over .xm_last get put
+ panel.net
+ } {
+ xmenu .xm_current get dup .inst_cdrom eq exch .inst_slp eq or {
+ /install.last xmenu .xm_current get def

- install.set.install.option
+ install.set.install.option

- /window.action actRedrawPanel def
- } {
- install.dialog
- }
- ifelse
+ /window.action actRedrawPanel def
+ } {
+ install.dialog
+ } ifelse
+ } ifelse

} def

@@ -109,6 +119,8 @@
/xmenu xmenu.install def

pmenu.panel.update
+
+ xmenu.net .xm_panel_x xmenu.install .xm_panel_x get put
} def


diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/themes/openSUSE/src/dia_lang.inc
new/themes/openSUSE/src/dia_lang.inc
--- old/themes/openSUSE/src/dia_lang.inc 2009-07-02 15:47:40.000000000
+0200
+++ new/themes/openSUSE/src/dia_lang.inc 2009-09-09 16:51:52.000000000
+0200
@@ -199,7 +199,7 @@

/lang.submenu.keyboard.buf 64 string def
/lang.submenu.keyboard {
- /txt_keyboard exec "\x09%s" lang.submenu.keyboard.buf sprintf
+ /txt_keyboard exec "\x09\x09%s" lang.submenu.keyboard.buf sprintf
lang.submenu.keyboard.buf
} def

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/themes/openSUSE/src/dia_net.inc
new/themes/openSUSE/src/dia_net.inc
--- old/themes/openSUSE/src/dia_net.inc 1970-01-01 01:00:00.000000000 +0100
+++ new/themes/openSUSE/src/dia_net.inc 2009-09-14 16:02:50.000000000 +0200
@@ -0,0 +1,134 @@
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+%
+% network setup dialogs.
+%
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Some global vars.
+%
+/.net_no 0 def
+/.net_dhcp 1 def
+/.net_static 2 def
+
+/net.default .net_no def
+/net.config_type .undef def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Build menu list.
+%
+% ( ) ==> ( )
+%
+/net.init {
+ /xmenu.net .xm_size array def
+
+ /xmenu xmenu.net def
+
+ xmenu .xm_list [ "No Network" "DHCP" "Static" ] put
+
+ xmenu .xm_title "Network Setup" put
+
+ xmenu .xm_current net.default put
+
+ /input.net.static [ 5 { 127 string } repeat ] def
+
+ % just once (see install.init)
+ /net.init { } def
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Update network selection menu.
+%
+% ( ) ==> ( )
+%
+/net.update {
+ /xmenu xmenu.net def
+
+ /net.config_type xmenu .xm_current get def
+
+ xmenu .xm_current get .net_static eq {
+ net.dialog
+ } if
+
+ /window.action actRedrawPanel def
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Show net selection menu.
+%
+% ( ) => ( )
+%
+/panel.net {
+ "net" help.setcontext
+
+ window.xmenu
+ dup .xmenu xmenu.net put
+ dup .xmenu.update /net.update put
+ dup window.init
+ window.show
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Return width of panel entry.
+%
+% ( ) => ( width )
+%
+/panel.net.width {
+ /xmenu xmenu.net def
+
+ pmenu.width
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Redraw panel entry.
+%
+% ( panel ) => ( )
+%
+/panel.net.update {
+ /xmenu xmenu.net def
+
+ pmenu.panel.update
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/net.dialog {
+ /dia window.dialog def
+
+ dia .text "" put
+
+ dia .title "Static Network Config" put
+
+ % ip, netmask, gateway, dns nameserver, domain
+
+ % Must all be of same size!
+ dia .ed.list 5 array put
+ dia .ed.buffer.list input.net.static put
+ dia .ed.text.list [ "Host IP\n" "Netmask\n" "Gateway\n" "Nameserver\n"
"Domain\n" ] put
+
+ dia .ed.focus 0 put
+ dia .ed.width 300 put
+
+ dia .buttons [
+ button.ok button.default actNothing button.setaction
+ button.cancel button.notdefault /net.static.abort button.setaction
+ config.rtl { exch } if
+ ] put
+
+ dia window.init
+ dia window.show
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/net.static.abort {
+ xmenu.net .xm_current over .xm_last get put
+ actNothing
+} def
+
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 2009-07-02 15:47:40.000000000 +0200
+++ new/themes/openSUSE/src/main.bc 2009-09-14 14:57:48.000000000 +0200
@@ -22,6 +22,7 @@
%% include dia_kernelopts.inc
%% include dia_keymap.inc
%% include dia_restore.inc
+%% include dia_net.inc
%% include panel.inc
%% include keytables.inc
%% include locale.inc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/themes/openSUSE/src/window.inc
new/themes/openSUSE/src/window.inc
--- old/themes/openSUSE/src/window.inc 2009-07-02 15:47:40.000000000 +0200
+++ new/themes/openSUSE/src/window.inc 2009-09-14 15:59:20.000000000 +0200
@@ -302,7 +302,7 @@

dup keyEnter eq has_buttons and {
window.buttons window.findselected
- over over get 7 get /window.action exch def get
+ over over get 7 get /window.action exch exec def get
dup button.press 100000 usleep
window.action actNoClose and {
window.action dialog.specialaction { button.show } if
@@ -370,7 +370,7 @@
has_buttons {
dup window.findkey dup 0 ge {
window.buttons exch
- over over get 7 get /window.action exch def get
+ over over get 7 get /window.action exch exec def get
dup button.press 100000 usleep
window.action actNoClose and {
window.action dialog.specialaction { button.show } if
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/themes/openSUSE/src/xmenu.inc
new/themes/openSUSE/src/xmenu.inc
--- old/themes/openSUSE/src/xmenu.inc 2009-07-02 15:47:30.000000000 +0200
+++ new/themes/openSUSE/src/xmenu.inc 2009-09-14 14:40:20.000000000 +0200
@@ -318,12 +318,19 @@

setcolor
moveto
- show.rtl
- config.rtl {
- xmenu.pos.x 8 add xmenu.pos.y moveto "\u25c0" show
+
+ dup 0 get '\x09' eq {
+ 1 add
+ show.rtl
+ config.rtl {
+ xmenu.pos.x 8 add xmenu.pos.y moveto 2 add "\u25c0" show
+ } {
+ xmenu.pos.x xmenu.width add 8 sub xmenu.pos.y 2 add moveto "\u25b6"
showright1
+ } ifelse
} {
- xmenu.pos.x xmenu.width add 8 sub xmenu.pos.y moveto "\u25b6"
showright1
+ show.rtl
} ifelse
+
} {
show.rtl
} ifelse

++++++ upstream.tar.bz2 ++++++


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >