rpms/PackageKit
7
0
Fork 1
Code Issues Pull Requests Releases Activity

fix gsd crash

Browse Source
This commit is contained in:
Matthias Clasen 2012-01-20 00:06:15 -05:00
parent c3babeb879
commit 530b0a6091
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PackageKit.spec
View File

@ -3,7 +3,7 @@
Summary: Package management service
Name: PackageKit
Version: 0.7.2
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.packagekit.org
Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@ -14,6 +14,9 @@ Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch
# Fedora specific: the yum backend doesn't do time estimation correctly
Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=44965
Patch2: null-is-not-a-string.patch
Requires: PackageKit-glib = %{version}-%{release}
Requires: PackageKit-backend
Requires: shared-mime-info
@ -243,6 +246,7 @@ user to restart the computer or remove and re-insert the device.
%setup -q
%patch0 -p1 -b .fedora
%patch1 -p1 -b .no-time
%patch2 -p1 -b .null
%build
%configure \
@ -454,6 +458,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/pkgconfig/packagekit-plugin.pc
%changelog
* Fri Jan 20 2012 Matthias Clasen <mclasen@redhat.com> - 0.7.2-2
- Fix gnome-settings-daemon crashes
* Tue Jan 17 2012 Richard Hughes <rhughes@redhat.com> - 0.7.2-1
- New upstream release.
- Remove upstreamed patches

22
null-is-not-a-string.patch Normal file
View File

@ -0,0 +1,22 @@
diff -up PackageKit-0.7.2/lib/packagekit-glib2/pk-control.c.null PackageKit-0.7.2/lib/packagekit-glib2/pk-control.c
--- PackageKit-0.7.2/lib/packagekit-glib2/pk-control.c.null 2012-01-20 00:02:52.422053263 -0500
+++ PackageKit-0.7.2/lib/packagekit-glib2/pk-control.c 2012-01-20 00:04:04.368050690 -0500
@@ -1175,12 +1175,12 @@ pk_control_set_proxy2_async (PkControl *
state->res = g_object_ref (res);
state->control = g_object_ref (control);
state->parameters = g_variant_new ("(ssssss)",
- proxy_http,
- proxy_https,
- proxy_ftp,
- proxy_socks,
- no_proxy,
- pac);
+ proxy_http ? proxy_http : "",
+ proxy_https ? proxy_https : "",
+ proxy_ftp ? proxy_ftp : "",
+ proxy_socks ? proxy_socks : "",
+ no_proxy ? no_proxy : "",
+ pac ? pac : "");
if (cancellable != NULL)
state->cancellable = g_object_ref (cancellable);