Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 653078 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-12 / +12 lines)
Line  Link Here
0
-- /config.tests/xml2/xml2.pro
0
++ /config.tests/xml2/xml2.pro
Lines 1-3 Link Here
1
SOURCES = xml2.cpp
1
SOURCES = xml2.cpp
2
CONFIG += link_pkgconfig
2
CONFIG += link_pkgconfig
3
PKGCONFIG += libxml-2.0
3
PKGCONFIG += libxml-2.0-catalogless
4
-- /configure.json
4
++ /configure.json
Lines 118-124 Link Here
118
        "webengine-libxml2": {
118
        "webengine-libxml2": {
119
            "label": "libxml2 and libxslt",
119
            "label": "libxml2 and libxslt",
120
            "sources": [
120
            "sources": [
121
                { "type": "pkgConfig", "args": "libxml-2.0 libxslt" }
121
                { "type": "pkgConfig", "args": "libxml-2.0-catalogless libxslt-catalogless" }
122
            ]
122
            ]
123
        },
123
        },
124
        "webengine-jsoncpp": {
124
        "webengine-jsoncpp": {
125
-- /src/3rdparty/chromium/build/linux/unbundle/libxml.gn
125
++ /src/3rdparty/chromium/build/linux/unbundle/libxml.gn
Lines 5-11 Link Here
5
import("//build/config/linux/pkg_config.gni")
5
import("//build/config/linux/pkg_config.gni")
6
6
7
pkg_config("system_libxml") {
7
pkg_config("system_libxml") {
8
  packages = [ "libxml-2.0" ]
8
  packages = [ "libxml-2.0-catalogless" ]
9
}
9
}
10
10
11
static_library("libxml") {
11
static_library("libxml") {
12
-- /src/3rdparty/chromium/build/linux/unbundle/libxslt.gn
12
++ /src/3rdparty/chromium/build/linux/unbundle/libxslt.gn
Lines 5-11 Link Here
5
import("//build/config/linux/pkg_config.gni")
5
import("//build/config/linux/pkg_config.gni")
6
6
7
pkg_config("system_libxslt") {
7
pkg_config("system_libxslt") {
8
  packages = [ "libxslt" ]
8
  packages = [ "libxslt-catalogless" ]
9
}
9
}
10
10
11
source_set("libxslt") {
11
source_set("libxslt") {
12
-- /src/3rdparty/chromium/third_party/libxml/BUILD.gn
12
++ /src/3rdparty/chromium/third_party/libxml/BUILD.gn
Lines 249-255 Link Here
249
if (use_system_libxml) {
249
if (use_system_libxml) {
250
  import("//build/config/linux/pkg_config.gni")
250
  import("//build/config/linux/pkg_config.gni")
251
  pkg_config("system_libxml") {
251
  pkg_config("system_libxml") {
252
    packages = [ "libxml-2.0" ]
252
    packages = [ "libxml-2.0-catalogless" ]
253
  }
253
  }
254
  source_set("libxml") {
254
  source_set("libxml") {
255
    sources = [
255
    sources = [
256
-- /src/3rdparty/chromium/third_party/libxslt/BUILD.gn
256
++ /src/3rdparty/chromium/third_party/libxslt/BUILD.gn
Lines 109-115 Link Here
109
if (use_system_libxslt) {
109
if (use_system_libxslt) {
110
  import("//build/config/linux/pkg_config.gni")
110
  import("//build/config/linux/pkg_config.gni")
111
  pkg_config("system_libxslt") {
111
  pkg_config("system_libxslt") {
112
    packages = [ "libxslt" ]
112
    packages = [ "libxslt-catalogless" ]
113
  }
113
  }
114
  source_set("libxslt") {
114
  source_set("libxslt") {
115
    public_configs = [ ":system_libxslt" ]
115
    public_configs = [ ":system_libxslt" ]

Return to bug 653078