Accepting request 196570 from home:dimstar:branches:GNOME:Factory

- Add libproxy-pxgsettings-crash.patch: fix crash in pxgsettings
               when it's closing down (bnc#836576).  Wait for libproxy and
               libproxy plugins to fully build before accepting into G:F.

OBS-URL: https://build.opensuse.org/request/show/196570
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=102
This commit is contained in:
2013-08-27 18:17:10 +00:00
committed by Git OBS Bridge
parent 2cb942a339
commit de81afcb7f
5 changed files with 33 additions and 0 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 26 18:07:54 UTC 2013 - dimstar@opensuse.org
- Add libproxy-pxgsettings-crash.patch: fix crash in pxgsettings
when it's closing down (bnc#836576).
-------------------------------------------------------------------
Fri Aug 2 14:41:10 UTC 2013 - dimstar@opensuse.org

View File

@@ -43,6 +43,8 @@ Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz
# Script used for automatic snapshot updates
Source98: update-from-svn.sh
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-pxgsettings-crash.patch bnc#836576 dimstar@opensuse.org -- Fix crash when pxgsettings is closing, taken from svn.
Patch0: libproxy-pxgsettings-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -304,6 +306,7 @@ libproxy offers the following features: * extremely small core
%prep
%setup -q -n %{_sourcename}
%patch0
mkdir build
%build

View File

@@ -0,0 +1,15 @@
Index: libproxy/modules/pxgsettings.cpp
===================================================================
--- libproxy/modules/pxgsettings.cpp.orig
+++ libproxy/modules/pxgsettings.cpp
@@ -157,9 +157,7 @@ int main(int argc, char **argv) {
g_main_loop_run(loop);
// Cleanup
- while (G_IS_OBJECT(client)) {
- g_object_unref(client);
- }
+ g_object_unref(client);
g_io_channel_shutdown(inchan, FALSE, NULL);
g_io_channel_shutdown(outchan, FALSE, NULL);
g_io_channel_unref(inchan);

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 26 18:07:54 UTC 2013 - dimstar@opensuse.org
- Add libproxy-pxgsettings-crash.patch: fix crash in pxgsettings
when it's closing down (bnc#836576).
-------------------------------------------------------------------
Fri Aug 2 14:41:10 UTC 2013 - dimstar@opensuse.org

View File

@@ -43,6 +43,8 @@ Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz
# Script used for automatic snapshot updates
Source98: update-from-svn.sh
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-pxgsettings-crash.patch bnc#836576 dimstar@opensuse.org -- Fix crash when pxgsettings is closing, taken from svn.
Patch0: libproxy-pxgsettings-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -304,6 +306,7 @@ libproxy offers the following features: * extremely small core
%prep
%setup -q -n %{_sourcename}
%patch0
mkdir build
%build