Accepting request 17751 from X11:XOrg

Copy from X11:XOrg/xorg-x11-server based on submit request 17751 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/17751
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=137

0001-config-don-t-shutdown-the-libhal-ctx-if-it-failed-to.patch

@@ -0,0 +1,61 @@
+From e9600d53af7bf72faef29dc5bfaa617b9bb1850c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 14 Aug 2009 09:48:45 +1000
+Subject: [PATCH] config: don't shutdown the libhal ctx if it failed to initialize.
+
+---
+ config/hal.c |   21 +++++++++++----------
+ 1 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/config/hal.c b/config/hal.c
+index 59bff66..28f55a0 100644
+--- a/config/hal.c
++++ b/config/hal.c
+@@ -489,13 +489,13 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
+ 
+     if (!libhal_ctx_set_dbus_connection(info->hal_ctx, info->system_bus)) {
+         LogMessage(X_ERROR, "config/hal: couldn't associate HAL context with bus\n");
+-        goto out_ctx;
++        goto out_err;
+     }
+     if (!libhal_ctx_init(info->hal_ctx, &error)) {
+         LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n",
+ 		   error.name ? error.name : "unknown error",
+ 		   error.message ? error.message : "null");
+-        goto out_ctx;
++        goto out_err;
+     }
+     if (!libhal_device_property_watch_all(info->hal_ctx, &error)) {
+         LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n",
+@@ -526,19 +526,20 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
+ out_ctx:
+     dbus_error_free(&error);
+ 
+-    if (info->hal_ctx) {
+-        if (!libhal_ctx_shutdown(info->hal_ctx, &error)) {
+-            LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
+-		       error.name ? error.name : "unknown error",
+-		       error.message ? error.message : "null");
+-            dbus_error_free(&error);
+-        }
+-        libhal_ctx_free(info->hal_ctx);
++    if (!libhal_ctx_shutdown(info->hal_ctx, &error)) {
++        LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
++                error.name ? error.name : "unknown error",
++                error.message ? error.message : "null");
++        dbus_error_free(&error);
+     }
+ 
+ out_err:
+     dbus_error_free(&error);
+ 
++    if (info->hal_ctx) {
++        libhal_ctx_free(info->hal_ctx);
++    }
++
+     info->hal_ctx = NULL;
+     info->system_bus = NULL;
+ 
+-- 
+1.6.3.rc1.2.g0164.dirty
+

xorg-x11-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 14 02:33:19 CEST 2009 - sndirsch@suse.de
+
+- 0001-config-don-t-shutdown-the-libhal-ctx-if-it-failed-to.patch
+  * no longer need to revert commit c941479 (bnc #528397, bfo #23213)
+
 -------------------------------------------------------------------
 Tue Aug 11 22:23:26 CEST 2009 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -33,7 +33,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        49
+Release:        50
 License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -117,6 +117,7 @@ Patch144:       keyrelease-1.5.2.diff
 Patch145:       driver-autoconfig.diff
 Patch147:       truetype_fontpath.diff
 Patch148:       commit-c941479.diff
+Patch149:       0001-config-don-t-shutdown-the-libhal-ctx-if-it-failed-to.patch
 # Moblin
 Patch161:       libdri_noPanoramiXExtension_symbol.patch
 Patch162:       cache-xkbcomp-output-for-fast-start-up.patch
@@ -258,7 +259,8 @@ popd
 %patch145 -p0
 %patch147 -p0
 ### Bug #528397
-%patch148 -p1 -R
+#%patch148 -p1 -R
+%patch149 -p1
 %patch161 -p1
 %patch162 -p1
 %if %moblin