Accepting request 144939 from Base:System

- Add polkit-libmozjs.patch: dlopen libmozjs185.so.1.0 instead of
  libmozjs185.so, which is packaged in the -devel package
  (bnc#793562) (forwarded request 144912 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/144939
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/polkit?expand=0&rev=40
This commit is contained in:
Stephan Kulow 2012-12-14 09:40:22 +00:00 committed by Git OBS Bridge
commit a13c1aaf08
3 changed files with 38 additions and 0 deletions

28
polkit-libmozjs.patch Normal file
View File

@ -0,0 +1,28 @@
From a6747362693a91f8cfa3bd5e619cf91e2e03941b Mon Sep 17 00:00:00 2001
From: David Zeuthen <zeuthen@gmail.com>
Date: Thu, 15 Nov 2012 15:09:06 +0000
Subject: Don't require libmozjs185 devel packages for polkit rules to work
The SO-name rules for SpiderMonkey are a little bit weird and we were
opening wrong file. This problem was reported in
https://bugs.freedesktop.org/show_bug.cgi?id=57146
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
---
diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c
index 034edc4..e4aa46b 100644
--- a/src/polkitbackend/polkitbackendjsauthority.c
+++ b/src/polkitbackend/polkitbackendjsauthority.c
@@ -238,7 +238,7 @@ djs_init (PolkitBackendJsAuthority *authority)
guint n;
const gchar *library_name;
- library_name = "libmozjs185.so";
+ library_name = "libmozjs185.so.1.0";
module = g_module_open (library_name, 0);
if (module == NULL)
goto out;
--
cgit v0.9.0.2-2-gbebe

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Dec 10 07:45:47 UTC 2012 - dimstar@opensuse.org
- Add polkit-libmozjs.patch: dlopen libmozjs185.so.1.0 instead of
libmozjs185.so, which is packaged in the -devel package
(bnc#793562)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 15 21:31:19 UTC 2012 - dimstar@opensuse.org Thu Nov 15 21:31:19 UTC 2012 - dimstar@opensuse.org

View File

@ -39,6 +39,8 @@ Patch1: polkit-suid_flags.patch
Patch2: polkit-no-systemd.patch Patch2: polkit-no-systemd.patch
# PATCH-FIX-UPSTREAM polkit-link-gmodule.patch dimstar@opensuse.org -- Link against gmodule-2.0. Patch taken from upstream git. # PATCH-FIX-UPSTREAM polkit-link-gmodule.patch dimstar@opensuse.org -- Link against gmodule-2.0. Patch taken from upstream git.
Patch3: polkit-link-gmodule.patch Patch3: polkit-link-gmodule.patch
# PATCH-FIX-UPSTREAM polkit-libmozjs.patch bnc#793562 fdo#57146 dimstar@opensuse.org -- dlopen libmozjs185.so.1.0 instead of libmozjs185.so, taken from upstream git.
Patch4: polkit-libmozjs.patch
# needed for patch1 # needed for patch1
BuildRequires: autoconf BuildRequires: autoconf
# needed for patch1 # needed for patch1
@ -129,6 +131,7 @@ This package provides the GObject Introspection bindings for PolicyKit.
%patch2 -p1 %patch2 -p1
%endif %endif
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
export V=1 export V=1