Hello community,
here is the log from the commit of package yast2-x11
checked in at Fri Nov 7 03:15:28 CET 2008.
--------
--- yast2-x11/yast2-x11.changes 2008-09-23 11:53:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-x11/yast2-x11.changes 2008-11-07 02:24:11.095808000 +0100
@@ -1,0 +2,19 @@
+Fri Nov 7 02:27:35 CET 2008 - jdsn@suse.de
+
+- fix deadlock in x11 dialogs (bnc#440281)
+- set PreferredMode (bnc#402581)
+- disable autoYaST mode for unsupported architectures (bnc#439612)
+- more verbose logging
+- 2.17.8
+
+-------------------------------------------------------------------
+Thu Nov 6 23:26:31 CET 2008 - jdsn@suse.de
+
+- adding more verbose loggin to x11 proposal
+
+-------------------------------------------------------------------
+Wed Nov 5 19:18:52 CET 2008 - jdsn@suse.de
+
+- string fixes for x11 proposal
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-x11-2.17.7.tar.bz2
New:
----
yast2-x11-2.17.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-x11.spec ++++++
--- /var/tmp/diff_new_pack.J30378/_old 2008-11-07 03:14:47.000000000 +0100
+++ /var/tmp/diff_new_pack.J30378/_new 2008-11-07 03:14:47.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-x11 (Version 2.17.7)
+# spec file for package yast2-x11 (Version 2.17.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-x11
-Version: 2.17.7
+Version: 2.17.8
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-x11-2.17.7.tar.bz2
+Source0: yast2-x11-2.17.8.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer qt3-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
%ifnarch s390 s390x
@@ -52,7 +52,7 @@
Marcus Schaefer
%prep
-%setup -n yast2-x11-2.17.7
+%setup -n yast2-x11-2.17.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -88,6 +88,16 @@
/usr/share/YaST2/schema/autoyast/rnc/*.rnc
%doc %{prefix}/share/doc/packages/yast2-x11
%changelog
+* Fri Nov 07 2008 jdsn@suse.de
+- fix deadlock in x11 dialogs (bnc#440281)
+- set PreferredMode (bnc#402581)
+- disable autoYaST mode for unsupported architectures (bnc#439612)
+- more verbose logging
+- 2.17.8
+* Thu Nov 06 2008 jdsn@suse.de
+- adding more verbose loggin to x11 proposal
+* Wed Nov 05 2008 jdsn@suse.de
+- string fixes for x11 proposal
* Tue Sep 23 2008 jdsn@suse.de
- reenabling setPrimaryChip call due to (bnc#427371)
- 2.17.7
@@ -98,7 +108,7 @@
* Thu Sep 11 2008 jdsn@suse.de
- fix for no BusID setting (bnc#381644)
- 2.17.5
-* Sat Sep 06 2008 jdsn@suse.de
+* Fri Sep 05 2008 jdsn@suse.de
- consistent look of x11 proposal with others (bnc#327435)
- removed a wrong CloseDialog that crashed the installation
- 2.17.4
@@ -108,7 +118,7 @@
* Mon Sep 01 2008 jdsn@suse.de
- fixed type conversion in autoYaST setup (bnc#418648)
- 2.17.2
-* Sat Aug 30 2008 jdsn@suse.de
+* Fri Aug 29 2008 jdsn@suse.de
- tablet configuration support during installation (fate#302888)
- make sure traversal has numeric value (bnc#388259)
- consistent dialogs for proposal changes
@@ -125,7 +135,7 @@
* Fri May 16 2008 jsrain@suse.cz
- added categories Settings and System into desktop file
(bnc #382778)
-* Fri May 09 2008 jdsn@suse.de
+* Thu May 08 2008 jdsn@suse.de
- 2.15.12
- option to enable Xgl via AutoYaST (fate#302572) (bnc#177709)
- switching to strings with proper abbreviations
@@ -327,16 +337,16 @@
* Thu Sep 23 2004 nashif@suse.de
- Fixed setting of windowmanager/displaymanager
- Fixed setting monitor device to configured one in monitor dialog
-* Mon Sep 13 2004 nashif@suse.de
+* Sun Sep 12 2004 nashif@suse.de
- Added schema file
-* Mon Sep 13 2004 nashif@suse.de
+* Sun Sep 12 2004 nashif@suse.de
- Removed unused variables (height, width, frequency) from autoyast
map
- In clone mode, read the suggest file if its available and create
a cloned configuration.
* Tue Aug 31 2004 ms@suse.de
- include proofread msgid's
-* Tue Aug 31 2004 nashif@suse.de
+* Mon Aug 30 2004 nashif@suse.de
- use modified flag (#43904)
* Thu Aug 26 2004 nashif@suse.de
- During autoinstall, run X11 as an additional workflow step
@@ -344,7 +354,7 @@
* Fri Aug 13 2004 msvec@suse.cz
- fixed parallel build
- 2.10.4
-* Tue Aug 10 2004 nashif@suse.de
+* Mon Aug 09 2004 nashif@suse.de
- Export Display settings(frequencies) correctly
* Thu Aug 05 2004 jsuchome@suse.cz
- removed live_eval mode (nashif)
@@ -388,7 +398,7 @@
- Fixed for new wizard
* Wed Mar 10 2004 kkaempf@suse.de
- fix typing
-* Wed Mar 10 2004 ms@suse.de
+* Tue Mar 09 2004 ms@suse.de
- removed very old pacs requirement from Display.ycp
- removed switch2mesasoft call from XProposal
* Sun Mar 07 2004 kkaempf@suse.de
@@ -599,7 +609,7 @@
* Wed Jun 19 2002 ms@suse.de
- add function checkRemoteControl() to be called to setup the
state of the change button for remote login sessions
-* Mon Jun 10 2002 ms@suse.de
+* Sun Jun 09 2002 ms@suse.de
- add new versions of X11 workflow to YaST2 CVS head
make use of SaX2 modules to build X11 configuration workflow within YaST2
* Tue May 28 2002 arvin@suse.de
++++++ yast2-x11-2.17.7.tar.bz2 -> yast2-x11-2.17.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.7/configure new/yast2-x11-2.17.8/configure
--- old/yast2-x11-2.17.7/configure 2008-09-24 15:40:11.000000000 +0200
+++ new/yast2-x11-2.17.8/configure 2008-11-07 02:26:00.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-x11 2.17.7.
+# Generated by GNU Autoconf 2.61 for yast2-x11 2.17.8.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-x11'
PACKAGE_TARNAME='yast2-x11'
-PACKAGE_VERSION='2.17.7'
-PACKAGE_STRING='yast2-x11 2.17.7'
+PACKAGE_VERSION='2.17.8'
+PACKAGE_STRING='yast2-x11 2.17.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1438,7 +1438,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-x11 2.17.7 to adapt to many kinds of systems.
+\`configure' configures yast2-x11 2.17.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-x11 2.17.7:";;
+ short | recursive ) echo "Configuration of yast2-x11 2.17.8:";;
esac
cat <<\_ACEOF
@@ -1615,7 +1615,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-x11 configure 2.17.7
+yast2-x11 configure 2.17.8
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1629,7 +1629,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-x11 $as_me 2.17.7, which was
+It was created by yast2-x11 $as_me 2.17.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2450,7 +2450,7 @@
# Define the identity of the package.
PACKAGE='yast2-x11'
- VERSION='2.17.7'
+ VERSION='2.17.8'
cat >>confdefs.h <<_ACEOF
@@ -2678,7 +2678,7 @@
-VERSION="2.17.7"
+VERSION="2.17.8"
RPMNAME="yast2-x11"
MAINTAINER="J. Daniel Schmidt "
@@ -21389,7 +21389,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-x11 $as_me 2.17.7, which was
+This file was extended by yast2-x11 $as_me 2.17.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21442,7 +21442,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-x11 config.status 2.17.7
+yast2-x11 config.status 2.17.8
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.7/configure.in new/yast2-x11-2.17.8/configure.in
--- old/yast2-x11-2.17.7/configure.in 2008-09-24 15:39:54.000000000 +0200
+++ new/yast2-x11-2.17.8/configure.in 2008-11-07 02:25:45.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-x11, 2.17.7, http://bugs.opensuse.org/, yast2-x11)
+AC_INIT(yast2-x11, 2.17.8, http://bugs.opensuse.org/, yast2-x11)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.7"
+VERSION="2.17.8"
RPMNAME="yast2-x11"
MAINTAINER="J. Daniel Schmidt "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.7/src/autoyast/modules/AutoinstX11.ycp new/yast2-x11-2.17.8/src/autoyast/modules/AutoinstX11.ycp
--- old/yast2-x11-2.17.7/src/autoyast/modules/AutoinstX11.ycp 2008-09-01 20:03:34.000000000 +0200
+++ new/yast2-x11-2.17.8/src/autoyast/modules/AutoinstX11.ycp 2008-11-07 02:03:55.000000000 +0100
@@ -213,6 +213,17 @@
} else {
XLib::deactivate3D();
}
+ // set the PreferredMode (bnc#402581)
+ string colorDepth = tostring(colors);
+ y2milestone("Trying to set X11 PreferredMode to: %1 @ %2", resolution, colorDepth);
+ if ( XLib::setPreferredMode(resolution, colorDepth) )
+ {
+ y2milestone("Sucessfully set the PreferredMode for X11");
+ }
+ else
+ {
+ y2error("Failed to set the PreferredMode for X11.");
+ }
boolean status = XLib::writeConfiguration();
return status;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.7/src/autoyast/proposal/x11_auto.ycp new/yast2-x11-2.17.8/src/autoyast/proposal/x11_auto.ycp
--- old/yast2-x11-2.17.7/src/autoyast/proposal/x11_auto.ycp 2007-05-21 16:01:20.000000000 +0200
+++ new/yast2-x11-2.17.8/src/autoyast/proposal/x11_auto.ycp 2008-11-07 02:17:21.000000000 +0100
@@ -25,6 +25,7 @@
textdomain "x11";
import "AutoinstX11";
+import "Arch";
include "x11/autoDialog.ycp";
@@ -49,9 +50,17 @@
y2debug("param=%1", param);
//=================================
+// check if this hardware supports X11 configuration (bnc#439612)
+//---------------------------------
+if ( ! Arch::x11_setup_needed() ) {
+ y2milestone("On this architecture no automatic X11 setup is supported. Thus no autoYaST configuration will be created or written.");
+ ret = false;
+}
+
+//=================================
// Import configuration
//---------------------------------
-if (func == "Import") {
+else if (func == "Import") {
ret = AutoinstX11::Import(param);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.7/src/dialog/x11Dialog.ycp new/yast2-x11-2.17.8/src/dialog/x11Dialog.ycp
--- old/yast2-x11-2.17.7/src/dialog/x11Dialog.ycp 2008-09-05 22:27:35.000000000 +0200
+++ new/yast2-x11-2.17.8/src/dialog/x11Dialog.ycp 2008-11-07 01:27:04.000000000 +0100
@@ -51,6 +51,7 @@
define string setupColors ( string currentRes, string currentDepth )
{ // rewritten due to consistency with setupDisplaySize
+ y2milestone("Called setupColors with resolution(%1) and colorDepth(%2)", currentRes, currentDepth);
string topic = XMessages::colorDepth;
UI::OpenDialog( `MarginBox( 0.5, 0.5,
`VBox(
@@ -86,10 +87,14 @@
color = (string) UI::QueryWidget(`id(`depth), `Value);
- if (! XLib::hasValidColorResolutionSetup (color,currentRes))
+ // let the user cancel the dialog with cancel (bnc#440281)
+ if ( ret == `ok )
{
- warnInvalidColorResolution();
- ret = nil;
+ if (! XLib::hasValidColorResolutionSetup (color,currentRes))
+ {
+ warnInvalidColorResolution();
+ ret = nil;
+ }
}
} until ( ret == `ok || ret == `cancel);
@@ -109,6 +114,7 @@
define string setupResolutions (list reslist, string currentText, string currentColor)
{ // rewritten to be consistent with
+ y2milestone("Called setupResolution with reslist(%1) and resolution(%2) and color(%3).", reslist, currentText, currentColor);
string topic = XMessages::resolution;
UI::OpenDialog( `MarginBox( 0.5, 0.5,
`VBox(
@@ -132,11 +138,17 @@
ret = UI::UserInput();
res = (string) UI::QueryWidget(`id(`resitem), `Value);
- if (! XLib::hasValidColorResolutionSetup(currentColor, res))
+
+ // let the user cancel the dialog with cancel (bnc#440281)
+ if ( ret == `ok )
{
- warnInvalidColorResolution();
- ret = nil;
+ if (! XLib::hasValidColorResolutionSetup(currentColor, res))
+ {
+ warnInvalidColorResolution();
+ ret = nil;
+ }
}
+
} until (ret == `ok || ret == `cancel);
UI::CloseDialog();
@@ -152,6 +164,7 @@
{
// function rewritten because of (bnc#331664) and (bnc#399411)
+ y2milestone("Called setupDisplaySize with traversal(%1) and ratio(%2)", currentTraversal, currentRatio);
string topic1 = XMessages::selectDisplayTraversal;
string topic2 = XMessages::selectDisplayRatio;
// offer some common display settings
@@ -324,6 +337,8 @@
//--------------------------------
define list<string> setupTablet ( map data, string currentVendor, string currentModel )
{
+ y2debug("Called setupTablet with data(%1)", data);
+ y2milestone("Called setupTablet with vendor(%1) and model(%2)", currentVendor, currentModel);
any ret = nil;
list<string> result = [];
list<string> vendorList = [];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.7/src/proposal/x11_proposal.ycp new/yast2-x11-2.17.8/src/proposal/x11_proposal.ycp
--- old/yast2-x11-2.17.7/src/proposal/x11_proposal.ycp 2008-09-18 15:10:08.000000000 +0200
+++ new/yast2-x11-2.17.8/src/proposal/x11_proposal.ycp 2008-11-07 02:04:01.000000000 +0100
@@ -121,6 +121,26 @@
string tabletName = (string) XLib::getTabletModel();
string tabletVendor= (string) XLib::getTabletVendor();
+ // add more verbose logging
+ y2milestone("Reading libsax data finished.");
+ y2milestone("Creating proposal summary with the following data:");
+ y2milestone("%1", $[
+ "resolution" : resolution,
+ "colorDepth" : colorDepth,
+ "cardName" : cardName,
+ "monitorName" : monitorName,
+ "has3D" : has3D,
+ "isFbdevBased" : isFbdevBased,
+ "is3DCard" : is3DCard,
+ "isNoteBook" : isNoteBook,
+ "isNoteBookHW" : isNoteBookHW,
+ "extVGAactive" : extVGAactive,
+ "monitorSize" : monitorSize,
+ "monitorInch" : monitorInch,
+ "tabletName" : tabletName,
+ "tabletVendor" : tabletVendor
+ ]);
+
//======================================
// Prepare proposal
//--------------------------------------
@@ -170,13 +190,13 @@
// open sublist for display settings
proposal = proposal + LI + XMessages::displaySettings
+ UL + LI
- + XMessages::monitor + " " + monitorName + " (change</a>)"
+ + XMessages::monitor + " " + monitorName + " (" + _("change") +" </a>)"
+ IL + LI
- + XMessages::Size + " " + monitorSizeStr + " (change</a>)"
+ + XMessages::Size + " " + monitorSizeStr + " (" + _("change") + "</a>)"
+ IL + LI
- + XMessages::resolution + " " + resolution + " (change</a>)"
+ + XMessages::resolution + " " + resolution + " (" + _("change") + "</a>)"
+ IL + LI
- + XMessages::colorDepth + " " + colorDepth + " bit - " + colorCount + " (change</a>)"
+ + XMessages::colorDepth + " " + colorDepth + " bit - " + colorCount + " (" + _("change") + "</a>)"
+ IL ;
// sublist still open here - following items are within "display settings" section
@@ -189,7 +209,7 @@
status = XMessages::activated;
}
proposal = proposal + LI
- + XMessages::acceleration + " " + status + " (change</a>)"
+ + XMessages::acceleration + " " + status + " (" + _("change") + "</a>)"
+ IL ;
}
@@ -200,7 +220,7 @@
if (extVGAactive) { status = XMessages::activated; }
proposal = proposal + LI
- + XMessages::externalvga + " " + status + " (change</a>"
+ + XMessages::externalvga + " " + status + " (" + _("change") + "</a>)"
+ IL;
}
else
@@ -379,6 +399,19 @@
XLib::setKernelFrameBufferMode (mode);
}
}
+
+ // set the PreferredMode (bnc#402581)
+ string resolution = (string) XLib::getActiveResolution();
+ string colorDepth = (string) XLib::getActiveColorDepth();
+ y2milestone("Trying to set X11 PreferredMode to: %1 @ %2", resolution, colorDepth);
+ if ( XLib::setPreferredMode(resolution, colorDepth) )
+ {
+ y2milestone("Sucessfully set the PreferredMode for X11");
+ }
+ else
+ {
+ y2error("Failed to set the PreferredMode for X11.");
+ }
boolean success = XLib::writeConfiguration();
ret = $[ "success" : success ];
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.7/src/XLib.pm new/yast2-x11-2.17.8/src/XLib.pm
--- old/yast2-x11-2.17.7/src/XLib.pm 2008-09-23 11:52:26.000000000 +0200
+++ new/yast2-x11-2.17.8/src/XLib.pm 2008-11-07 00:33:30.000000000 +0100
@@ -131,6 +131,37 @@
return $status;
}
#==========================================
+# setPreferredMode
+# set the selected resolution and color depth the user selected (bnc#402581)
+#------------------------------------------
+BEGIN{ $TYPEINFO{setPreferredMode} = ["function", "boolean", "string", "string"]; }
+sub setPreferredMode {
+ my $class = shift;
+ my $resolution = shift;
+ my $colorDepth = shift;
+ my $mCard = new SaX::SaXManipulateCard ( $section{Card} );
+ $mCard->selectCard(0);
+
+ # if card driver is fbdev do not set preferred mode
+ if ( $mCard->getCardDriver() eq "fbdev" )
+ { return 0; }
+
+ # check if the values are valid
+ if ( $resolution !~ /^\d+x\d+$/ ||
+ $colorDepth !~ /^\d+$/ )
+ { return 0; }
+
+ # really set the preferred mode
+ my $mDesktop = new SaX::SaXManipulateDesktop (
+ $section{Desktop},$section{Card},$section{Path}
+ );
+ $mDesktop->selectDesktop(0);
+ $mDesktop->setPreferredMode( $resolution );
+ $mDesktop->setColorDepth( $colorDepth );
+
+ return 1;
+}
+#==========================================
# testConfiguration
#------------------------------------------
BEGIN{ $TYPEINFO{testConfiguration} = ["function","boolean"]; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.7/VERSION new/yast2-x11-2.17.8/VERSION
--- old/yast2-x11-2.17.7/VERSION 2008-09-23 11:52:45.000000000 +0200
+++ new/yast2-x11-2.17.8/VERSION 2008-11-07 02:24:18.000000000 +0100
@@ -1 +1 @@
-2.17.7
+2.17.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org