Dominique Leuenberger
fcac1ec496
- Add libproxy-force-bipr.patch: Force building pacrunner as module
This is required as libproxy, when building only one pacrunner,
links the module internal. But as we only temporarly disable
the mozjs, we do need to keep the webkit runner as an external
module.
- Also pass -DBIPR=0 to cmake, to enable the patch above.
- Temporaryly disable the mozjs pacrunner: it casues crashes due
to symbol conflicts in Firefox (bnc#759123):
+ Introduce build_mozjs defnies, currently set to 0
+ Conditionally build the pacrunner-mozjs package
+ conditionally buildrequire pkgconfig(mozjs185)
+ When not building mozjs pacrunner, obsolete the package by
libproxy1.
- Add libproxy-force-bipr.patch: Force building pacrunner as module
This is required as libproxy, when building only one pacrunner,
links the module internal. But as we only temporarly disable
the mozjs, we do need to keep the webkit runner as an external
module.
- Also pass -DBIPR=0 to cmake, to enable the patch above.
- Temporaryly disable the mozjs pacrunner: it casues crashes due
to symbol conflicts in Firefox (bnc#759123):
+ Introduce build_mozjs defnies, currently set to 0
+ Conditionally build the pacrunner-mozjs package
+ conditionally buildrequire pkgconfig(mozjs185)
+ When not building mozjs pacrunner, obsolete the package by
libproxy1.
OBS-URL: https://build.opensuse.org/request/show/124317
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=78
14 lines
638 B
Diff
14 lines
638 B
Diff
Index: libproxy-0.4.7/libproxy/cmake/modules.cmk
|
|
===================================================================
|
|
--- libproxy-0.4.7.orig/libproxy/cmake/modules.cmk
|
|
+++ libproxy-0.4.7/libproxy/cmake/modules.cmk
|
|
@@ -19,7 +19,7 @@ include(cmake/modules/pacrunner_natus.cm
|
|
include(cmake/modules/pacrunner_webkit.cmk)
|
|
|
|
# Build the pacrunner into libproxy unless we are building for multiple engines
|
|
-set(BIPR 1)
|
|
+set(BIPR 1 CACHE BOOL "Build internal pacrunner? (Always false when building more than one PR")
|
|
if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND))
|
|
set(BIPR 0)
|
|
endif()
|