Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Thu Aug 13 17:34:28 CEST 2009.
--------
--- xorg-x11/xorg-x11.changes 2009-08-03 22:42:46.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2009-08-11 17:45:50.000000000 +0200
@@ -1,0 +2,20 @@
+Tue Aug 11 17:35:03 CEST 2009 - sndirsch@suse.de
+
+- xrandr 1.3.1
+ * The last couple of fixes hanged long enough to be declared
+ good, and at least the server grab fix is important enough
+ to justify a release.
+
+-------------------------------------------------------------------
+Tue Aug 11 05:59:40 CEST 2009 - sndirsch@suse.de
+
+- mkfontscale-skip_symlinks.diff
+ * skip also broken symlinks (bnc #529815)
+
+-------------------------------------------------------------------
+Sat Aug 8 12:13:15 CEST 2009 - sndirsch@suse.de
+
+- xdm-consolekit.diff
+ * adds consolekit support for xdm (Takashi Iwai, bnc #528829)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xrandr-1.3.0.tar.bz2
New:
----
xdm-consolekit.diff
xrandr-1.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.22ljcP/_old 2009-08-13 17:32:27.000000000 +0200
+++ /var/tmp/diff_new_pack.22ljcP/_new 2009-08-13 17:32:27.000000000 +0200
@@ -26,7 +26,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 26
+Release: 27
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -115,7 +115,7 @@
Source74: xpr-1.0.2.tar.bz2
Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2
Source76: xprop-1.0.4.tar.bz2
-Source77: xrandr-1.3.0.tar.bz2
+Source77: xrandr-1.3.1.tar.bz2
Source78: xrdb-1.0.5.tar.bz2
Source79: xrefresh-X11R7.1-1.0.2.tar.bz2
Source80: xrx-1.0.3.tar.bz2
@@ -168,6 +168,7 @@
Patch53: xconsole-no-stropts.patch
Patch54: xinit-client-session.patch
Patch55: xset-spurious-xprint.patch
+Patch56: xdm-consolekit.diff
%description
This package contains the X.Org core and sample applications.
@@ -300,6 +301,7 @@
patch -d xvidtune-* -p0 -s < %PATCH21
patch -d xfs-* -p0 -s < %PATCH47
patch -d mkfontscale-* -p1 -s < %PATCH48
+patch -d xdm-* -p1 -s < %PATCH56
%build
++++++ mkfontscale-skip_symlinks.diff ++++++
--- /var/tmp/diff_new_pack.22ljcP/_old 2009-08-13 17:32:28.000000000 +0200
+++ /var/tmp/diff_new_pack.22ljcP/_new 2009-08-13 17:32:28.000000000 +0200
@@ -19,7 +19,7 @@
xlfd = NULL;
if (xl) {
-@@ -836,6 +839,31 @@ doDirectory(char *dirname_given, int num
+@@ -836,6 +839,35 @@ doDirectory(char *dirname_given, int num
filename = dsprintf("%s%s", dirname, entry->d_name);
@@ -37,6 +37,10 @@
+
+ canon_dirname = canonicalize_file_name (dirname);
+ canon_fname = canonicalize_file_name (filename);
++ /* skip broken symlinks (Novell Bug #529815) */
++ if (!canon_fname) {
++ continue;
++ }
+ base_strlen = strlen (strrchr (canon_fname, '/'));
+
+ strncpy (base_canon_fname, canon_fname, strlen(canon_fname) - base_strlen);
++++++ xdm-consolekit.diff ++++++
---
configure.ac | 14 ++++++++
dm.h | 3 +
resource.c | 13 +++++++
session.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
xdm.man.cpp | 6 +++
5 files changed, 135 insertions(+), 1 deletion(-)
--- a/configure.ac
+++ b/configure.ac
@@ -362,6 +362,20 @@
AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
+# ConsoleKit support
+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
+ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
+if test x"$USE_CONSOLEKIT" != xno; then
+ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
+ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
+ if test x"$USE_CONSOLEKIT" = xyes; then
+ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
+ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS"
+ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
+ fi
+fi
+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
+
#
# XDM
#
--- a/session.c
+++ b/session.c
@@ -66,6 +66,11 @@
#endif
#endif /* USE_PAM */
+#ifdef USE_CONSOLEKIT
+#include
+#include
+#endif
+
#ifdef __SCO__
#include
#endif
@@ -472,6 +477,95 @@
}
}
+#ifdef USE_CONSOLEKIT
+
+static CkConnector *connector;
+
+static int openCKSession(struct verify_info *verify, struct display *d)
+{
+ int ret;
+ DBusError error;
+ char *remote_host_name = "";
+ dbus_bool_t is_local;
+ char *display_name = "";
+ char *display_device = "";
+ char devtmp[16];
+
+ if (!use_consolekit)
+ return 1;
+
+ is_local = d->displayType.location == Local;
+ if (d->peerlen > 0 && d->peer)
+ remote_host_name = d->peer;
+ if (d->name)
+ display_name = d->name;
+ /* how can we get the corresponding tty at best...? */
+ if (d->windowPath) {
+ display_device = strchr(d->windowPath, ':');
+ if (display_device && display_device[1])
+ display_device++;
+ else
+ display_device = d->windowPath;
+ snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
+ display_device = devtmp;
+ }
+
+ connector = ck_connector_new();
+ if (!connector) {
+ LogOutOfMem("ck_connector");
+ return 0;
+ }
+
+ dbus_error_init(&error);
+ ret = ck_connector_open_session_with_parameters(
+ connector, &error,
+ "unix-user", &verify->uid,
+ "x11-display", &display_name,
+ "x11-display-device", &display_device,
+ "remote-host-name", &remote_host_name,
+ "is-local", &is_local,
+ NULL);
+ if (!ret) {
+ if (dbus_error_is_set(&error)) {
+ LogError("Dbus error: %s\n", error.message);
+ dbus_error_free(&error);
+ } else {
+ LogError("ConsoleKit error\n");
+ }
+ ck_connector_unref(connector);
+ connector = NULL;
+ return 0;
+ }
+
+ verify->userEnviron = setEnv(verify->userEnviron,
+ "XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
+ return 1;
+}
+
+static void closeCKSession(void)
+{
+ DBusError error;
+
+ if (!connector)
+ return;
+
+ dbus_error_init(&error);
+ if (!ck_connector_close_session(connector, &error)) {
+ if (dbus_error_is_set(&error)) {
+ LogError("Dbus error: %s\n", error.message);
+ dbus_error_free(&error);
+ } else {
+ LogError("ConsoleKit close error\n");
+ }
+ }
+ ck_connector_unref(connector);
+ connector = NULL;
+}
+#else
+#define openCKSession(v,d) 1
+#define closeCKSession()
+#endif
+
void
SessionExit (struct display *d, int status, int removeAuth)
{
@@ -486,6 +580,8 @@
}
#endif
+ closeCKSession();
+
/* make sure the server gets reset after the session is over */
if (d->serverPid >= 2 && d->resetSignal)
kill (d->serverPid, d->resetSignal);
@@ -568,6 +664,10 @@
#ifdef USE_PAM
if (pamh) pam_open_session(pamh, 0);
#endif
+
+ if (!openCKSession(verify, d))
+ return 0;
+
switch (pid = fork ()) {
case 0:
CleanUpChild ();
--- a/dm.h
+++ b/dm.h
@@ -325,6 +325,9 @@
extern char *prngdSocket;
extern int prngdPort;
#endif
+#ifdef USE_CONSOLEKIT
+extern int use_consolekit;
+#endif
extern char *greeterLib;
extern char *willing;
--- a/resource.c
+++ b/resource.c
@@ -68,6 +68,9 @@
char *prngdSocket;
int prngdPort;
#endif
+#ifdef USE_CONSOLEKIT
+int use_consolekit;
+#endif
char *greeterLib;
char *willing;
@@ -258,6 +261,10 @@
"false"} ,
{ "willing", "Willing", DM_STRING, &willing,
""} ,
+#ifdef USE_CONSOLEKIT
+{ "consoleKit", "ConsoleKit", DM_BOOL, (char **) &use_consolekit,
+ "true"} ,
+#endif
};
# define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0])
@@ -440,7 +447,11 @@
{"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL },
{"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL },
{"-daemon", ".daemonMode", XrmoptionNoArg, "true" },
-{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" }
+{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" },
+#ifdef USE_CONSOLEKIT
+{"-consolekit", ".consoleKit", XrmoptionNoArg, "true" },
+{"-noconsolekit", ".consoleKit", XrmoptionNoArg, "false" }
+#endif
};
static int originalArgc;
--- a/xdm.man.cpp
+++ b/xdm.man.cpp
@@ -51,6 +51,8 @@
] [
.B \-session
.I session_program
+] [
+.B \-noconsolekit
]
.SH DESCRIPTION
.I Xdm
@@ -218,6 +220,10 @@
.IP "\fB\-xrm\fP \fIresource_specification\fP"
Allows an arbitrary resource to be specified, as in most
X Toolkit applications.
+.IP "\fB\-noconsolekit\fP"
+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
+resource.
+This suppresses the session management using ConsoleKit.
.SH RESOURCES
At many stages the actions of
.I xdm
++++++ xrandr-1.3.0.tar.bz2 -> xrandr-1.3.1.tar.bz2 ++++++
++++ 2213 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.3.0/ChangeLog new/xrandr-1.3.1/ChangeLog
--- old/xrandr-1.3.0/ChangeLog 2009-04-01 17:02:53.000000000 +0200
+++ new/xrandr-1.3.1/ChangeLog 2009-08-11 16:43:22.000000000 +0200
@@ -1,3 +1,74 @@
+commit 713a8ea5646f7c893b52afeb3c2443b21b837e46
+Author: Matthias Hopf
+Date: Tue Aug 11 16:11:39 2009 +0200
+
+ Bump to 1.3.1
+
+ Also finally bump xrandr requirement to 1.3
+
+commit b9166441bdb08ef76b9c6712da5902b0dcbf03f3
+Author: Federico Mena Quintero
+Date: Mon Jul 20 16:44:52 2009 -0500
+
+ bfo#22864 - grab the server around all modifications to CRTCs
+
+ We were not grabbed while disabling the CRTCs that should be off, so other clients could think
+ that there was an intermediate stage with no enabled outputs.
+
+ Signed-off-by: Federico Mena Quintero
+
+commit 68d5134142e3c616f3996c7ea8d08c887ce56118
+Author: Éric Piel
+Date: Tue Jul 14 21:36:32 2009 +0200
+
+ xrandr: Document --nograb option
+
+ Op 08-07-09 15:19, Matthias Hopf schreef:
+ > On Jul 07, 09 22:02:51 +0200, Éric Piel wrote:
+ >> Op 21-05-09 13:23, Éric Piel schreef:
+ >>> This documents the --nograb option with whichever I could understand of
+ >>> the advantages and drawbacks of grabbing the screen.
+ >>>
+ >>> Also fixes the formatting in the xrandr 1.3 options.
+ >> Please review and apply.
+ >
+ > Please resend as attachment.
+ >
+ Please find attached the git patch.
+
+ Thanks,
+ Eric
+
+ >From 34e7c1036ba0e0d7827563deaffea9371031fa0b Mon Sep 17 00:00:00 2001
+ From: Eric Piel
+ Date: Thu, 21 May 2009 13:01:52 +0200
+ Subject: [PATCH] xrandr: Document --nograb option
+
+ This documents the --nograb option with whichever I could understand of
+ the advantages and drawback of grabbing the screen.
+
+ Also fixes the formatting in the xrandr 1.3 options
+
+commit 73e38a31e5b7c68f8f3227a47d98ec55097999c7
+Author: Matthias Hopf
+Date: Mon Jul 6 18:30:05 2009 +0200
+
+ Fix missing prototype warning.
+
+commit 3408ca77af6a45b15b89bdd1ce9d5aac9646f6b8
+Author: Matthias Hopf
+Date: Mon Jul 6 18:28:23 2009 +0200
+
+ Report program version as well with --version.
+
+ This has bitten us too often already (the infamous uncloning bug).
+
+commit 47502f66f7c51ad575d63f28de49f285c4de7062
+Author: Adam Jackson
+Date: Wed Apr 1 11:03:10 2009 -0400
+
+ xrandr 1.3.0
+
commit beb228842c77fab4a446e028dd501a01f0fb3fd3
Author: Adam Jackson
Date: Tue Feb 17 13:45:32 2009 -0500
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.3.0/configure.ac new/xrandr-1.3.1/configure.ac
--- old/xrandr-1.3.0/configure.ac 2009-04-01 17:02:30.000000000 +0200
+++ new/xrandr-1.3.1/configure.ac 2009-08-11 16:10:04.000000000 +0200
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xrandr,[1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr)
+AC_INIT(xrandr,[1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -37,7 +37,7 @@
AC_CHECK_LIB(m,floor)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.99.3 xrender x11)
+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3 xrender x11)
XRANDR_CFLAGS="$CWARNFLAGS $XRANDR_CFLAGS"
AC_SUBST(XRANDR_CFLAGS)
AC_SUBST(XRANDR_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.3.0/xrandr.c new/xrandr-1.3.1/xrandr.c
--- old/xrandr-1.3.0/xrandr.c 2009-04-01 17:01:55.000000000 +0200
+++ new/xrandr-1.3.1/xrandr.c 2009-08-11 16:02:32.000000000 +0200
@@ -37,6 +37,8 @@
#include
#include
+#include "config.h"
+
#if RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 2)
#define HAS_RANDR_1_2 1
#endif
@@ -1436,6 +1438,15 @@
int c;
/*
+ * Hold the server grabbed while messing with
+ * the screen so that apps which notice the resize
+ * event and ask for xinerama information from the server
+ * receive up-to-date information
+ */
+ if (grab_server)
+ XGrabServer (dpy);
+
+ /*
* Turn off any crtcs which are to be disabled or which are
* larger than the target size
*/
@@ -1482,15 +1493,6 @@
}
/*
- * Hold the server grabbed while messing with
- * the screen so that apps which notice the resize
- * event and ask for xinerama information from the server
- * receive up-to-date information
- */
- if (grab_server)
- XGrabServer (dpy);
-
- /*
* Set the screen size
*/
screen_apply ();
@@ -1628,7 +1630,7 @@
/*
* Test whether 'crtc' can be used for 'output'
*/
-Bool
+static Bool
check_crtc_for_output (crtc_t *crtc, output_t *output)
{
int c;
@@ -2521,6 +2523,8 @@
if (setit && !setit_1_2)
query_1 = True;
}
+ if (version)
+ printf("xrandr program version " VERSION "\n");
dpy = XOpenDisplay (display_name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.3.0/xrandr.man new/xrandr-1.3.1/xrandr.man
--- old/xrandr-1.3.0/xrandr.man 2009-02-17 19:36:48.000000000 +0100
+++ new/xrandr-1.3.1/xrandr.man 2009-08-11 16:02:32.000000000 +0200
@@ -112,6 +112,10 @@
xrandr will display the current state of the system.
.IP "\-\-dryrun"
Performs all the actions specified except that no changes are made.
+.IP "\-\-nograb"
+Apply the modifications without grabbing the screen. It avoids to block other
+applications during the update but it might also cause some applications that
+detect screen resize to receive old values.
.IP "\-d, \-display \fIname\fP"
This option selects the X display to use. Note this refers to the X
screen abstraction, not the monitor (or output).
@@ -171,6 +175,7 @@
As a special argument, instead of
passing a matrix, one can pass the string \fInone\fP, in which case the default
values are used (a unit matrix without filter).
+.RE
.IP "\-\-scale \fIx\fPx\fIy\fP"
Changes the dimensions of the output picture. Values superior to 1 will lead to
a compressed screen (screen dimension bigger than the dimension of the output
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org