Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 533614 Details for
Bug 653078
>dev-qt/qtwebengine-5.11.0_beta3 should disable XML catalogs at run time
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
libxslt-1.1.32-catalogless.patch
libxslt-1.1.32-catalogless.patch (text/plain), 11.06 KB, created by
Arfrever Frehtes Taifersar Arahesis
on 2018-05-28 06:47:47 UTC
(
hide
)
Description:
libxslt-1.1.32-catalogless.patch
Filename:
MIME Type:
Creator:
Arfrever Frehtes Taifersar Arahesis
Created:
2018-05-28 06:47:47 UTC
Size:
11.06 KB
patch
obsolete
>Install version of libxslt without support for XML catalogs. > >libxslt.so library is renamed to libxslt-catalogless.so. >libexslt.so library is renamed to libexslt-catalogless.so. >Versions of global defined symbols are renamed from LIBXML2* to LIBXML2_CATALOGLESS*. > >xsltproc executable is built, but is not installed. > >xslt-config script is renamed to xslt-catalogless-config. >libxslt.pc pkg-config file is renamed to libxslt-catalogless.pc. >libexslt.pc pkg-config file is renamed to libexslt-catalogless.pc. >xsltConf.sh file is renamed to xsltCataloglessConf.sh. > >--- /Makefile.am >+++ /Makefile.am >@@ -9,9 +9,9 @@ > DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests > > confexecdir=$(libdir) >-confexec_DATA = xsltConf.sh >+confexec_DATA = xsltCataloglessConf.sh > >-bin_SCRIPTS = xslt-config >+bin_SCRIPTS = xslt-catalogless-config > > dist-hook: cleanup libxslt.spec > touch $(distdir)/doc/*.xml >@@ -27,21 +27,21 @@ > win32/libxslt/libxslt_so.dsp win32/libxslt/xsltproc.dsp \ > $(CVS_EXTRA_DIST) > >-## We create xsltConf.sh here and not from configure because we want >+## We create xsltCataloglessConf.sh here and not from configure because we want > ## to get the paths expanded correctly. Macros like srcdir are given > ## the value NONE in configure if the user doesn't specify them (this > ## is an autoconf feature, not a bug). > >-xsltConf.sh: xsltConf.sh.in Makefile >+xsltCataloglessConf.sh: xsltConf.sh.in Makefile > ## Use sed and then mv to avoid problems if the user interrupts. > sed -e 's?\@XSLT_LIBDIR\@?$(XSLT_LIBDIR)?g' \ > -e 's?\@XSLT_INCLUDEDIR\@?$(XSLT_INCLUDEDIR)?g' \ > -e 's?\@VERSION\@?$(VERSION)?g' \ > -e 's?\@XSLT_LIBS\@?$(XSLT_LIBS) $(EXTRA_LIBS)?g' \ > < $(srcdir)/xsltConf.sh.in > xsltConf.tmp \ >- && mv xsltConf.tmp xsltConf.sh >+ && mv xsltConf.tmp xsltCataloglessConf.sh > >-CLEANFILES = xsltConf.sh >+CLEANFILES = xsltCataloglessConf.sh > > check-local: tests > >@@ -70,7 +70,7 @@ > > > pkgconfigdir=$(libdir)/pkgconfig >-pkgconfig_DATA = libxslt.pc libexslt.pc >+pkgconfig_DATA = libxslt-catalogless.pc libexslt-catalogless.pc > > m4datadir = $(datadir)/aclocal > m4data_DATA = libxslt.m4 >--- /configure.ac >+++ /configure.ac >@@ -436,15 +436,15 @@ > AC_SUBST(LIBXML_SRC) > > dnl >-dnl where is xml2-config >+dnl where is xml2-catalogless-config > dnl > > AC_SUBST(LIBXML_REQUIRED_VERSION) > if test "x$LIBXML_CONFIG_PREFIX" != "x" > then >- AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false], [${LIBXML_CONFIG_PREFIX}/bin]) >+ AC_PATH_TOOL([XML_CONFIG], [xml2-catalogless-config], [false], [${LIBXML_CONFIG_PREFIX}/bin]) > else >- AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false]) >+ AC_PATH_TOOL([XML_CONFIG], [xml2-catalogless-config], [false]) > fi > > dnl >@@ -481,7 +481,7 @@ > if cd $LIBXML_SRC > then > LIBXML_SRC=`pwd` >- XML_CONFIG="${LIBXML_SRC}/xml2-config" >+ XML_CONFIG="${LIBXML_SRC}/xml2-catalogless-config" > LIBXML_CFLAGS="-I${LIBXML_SRC}/include" > LIBXML_LIBS="-L${LIBXML_SRC} `$XML_CONFIG --libs`" > WITH_MODULES="`$XML_CONFIG --modules`" >@@ -497,13 +497,13 @@ > > if test "x$LIBXML_CONFIG_PREFIX" = "x" -a "x$LIBXML_LIBS" = "x" > then >- PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [ >- WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`" >+ PKG_CHECK_MODULES([LIBXML], [libxml-2.0-catalogless >= $LIBXML_REQUIRED_VERSION], [ >+ WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0-catalogless`" > ], [ ]) > fi > > dnl >-dnl make sure xml2-config is executable, >+dnl make sure xml2-catalogless-config is executable, > dnl test version and init our variables > dnl > >@@ -609,14 +609,14 @@ > > XSLT_LIBDIR='-L${libdir}' > XSLT_INCLUDEDIR='-I${includedir}' >-XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS" >+XSLT_LIBS="-lxslt-catalogless $LIBXML_LIBS $M_LIBS" > AC_SUBST(XSLT_LIBDIR) > AC_SUBST(XSLT_INCLUDEDIR) > AC_SUBST(XSLT_LIBS) > > EXSLT_LIBDIR='-L${libdir}' > EXSLT_INCLUDEDIR='-I${includedir}' >-EXSLT_LIBS="-lexslt $XSLT_LIBS $LIBGCRYPT_LIBS" >+EXSLT_LIBS="-lexslt-catalogless $XSLT_LIBS $LIBGCRYPT_LIBS" > AC_SUBST(EXSLT_LIBDIR) > AC_SUBST(EXSLT_INCLUDEDIR) > AC_SUBST(EXSLT_LIBS) >@@ -634,8 +634,8 @@ > > AC_CONFIG_FILES([ > Makefile >-libxslt.pc >-libexslt.pc >+libxslt-catalogless.pc:libxslt.pc.in >+libexslt-catalogless.pc:libexslt.pc.in > libxslt/Makefile > libxslt/xsltconfig.h > libxslt/xsltwin32config.h >@@ -673,7 +673,7 @@ > tests/exslt/crypto/Makefile > tests/plugins/Makefile > doc/Makefile >-xslt-config >+xslt-catalogless-config:xslt-config.in > libxslt.spec > ]) > >--- /doc/syms.xsl >+++ /doc/syms.xsl >@@ -15,19 +15,24 @@ > # Versions here are *fixed* to match the libxslt version > # at which the symbol was introduced. This ensures that > # a new client app requiring symbol foo() can't accidentally >-# run with old libxslt.so not providing foo() - the global >+# run with old libxslt-catalogless.so not providing foo() - the global > # soname version info can't enforce this since we never > # change the soname > # > > </xsl:text> > <xsl:apply-templates select="/symbols/release"/> >+ <xsl:text>LIBXML2_CATALOGLESS { >+ local: >+ *; >+}; >+</xsl:text> > </xsl:template> > > <xsl:template match="release"> > <xsl:variable name="prev" > select="preceding-sibling::release[position()=1]"/> >- <xsl:text>LIBXML2_</xsl:text> >+ <xsl:text>LIBXML2_CATALOGLESS_</xsl:text> > <xsl:value-of select="string(@version)"/> > <xsl:text> { > global: >@@ -44,16 +49,9 @@ > <xsl:apply-templates select="."/> > </xsl:for-each> > >- <xsl:if test="not($prev)"> >- <xsl:text> >- local: >- *; >-</xsl:text> >- </xsl:if> >- > <xsl:text>} </xsl:text> > <xsl:if test="$prev"> >- <xsl:text>LIBXML2_</xsl:text> >+ <xsl:text>LIBXML2_CATALOGLESS_</xsl:text> > <xsl:value-of select="$prev/@version"/> > </xsl:if> > <xsl:text>; >--- /libexslt/Makefile.am >+++ /libexslt/Makefile.am >@@ -4,7 +4,7 @@ > > AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS) > >-lib_LTLIBRARIES = libexslt.la >+lib_LTLIBRARIES = libexslt-catalogless.la > > exsltincdir = $(includedir)/libexslt > >@@ -14,7 +14,7 @@ > nodist_exsltinc_HEADERS = \ > exsltconfig.h > >-libexslt_la_SOURCES = \ >+libexslt_catalogless_la_SOURCES = \ > exslt.c \ > common.c \ > crypto.c \ >@@ -27,8 +27,8 @@ > libexslt.h \ > dynamic.c > >-libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS) >-libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO) >+libexslt_catalogless_la_LIBADD = $(top_builddir)/libxslt/libxslt-catalogless.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS) >+libexslt_catalogless_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO) > > man_MANS = libexslt.3 > >--- /libexslt.pc.in >+++ /libexslt.pc.in >@@ -4,9 +4,9 @@ > includedir=@includedir@ > > >-Name: libexslt >+Name: libexslt-catalogless > Version: @LIBEXSLT_VERSION@ >-Description: EXSLT Extension library >-Requires: libxml-2.0 >+Description: EXSLT Extension library using libXML library version 2 without Catalog support >+Requires: libxml-2.0-catalogless > Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@ > Cflags: @EXSLT_INCLUDEDIR@ >--- /libxslt/Makefile.am >+++ /libxslt/Makefile.am >@@ -2,7 +2,7 @@ > > AM_CFLAGS = $(LIBXML_CFLAGS) > >-lib_LTLIBRARIES = libxslt.la >+lib_LTLIBRARIES = libxslt-catalogless.la > > xsltincdir = $(includedir)/libxslt > >@@ -30,7 +30,7 @@ > nodist_xsltinc_HEADERS = \ > xsltconfig.h > >-libxslt_la_SOURCES = \ >+libxslt_catalogless_la_SOURCES = \ > attrvt.c \ > xslt.c \ > xsltlocale.c \ >@@ -53,7 +53,7 @@ > win32config.h \ > xsltwin32config.h.in \ > libxslt.h >-nodist_libxslt_la_SOURCES = \ >+nodist_libxslt_catalogless_la_SOURCES = \ > xsltwin32config.h > > if USE_VERSION_SCRIPT >@@ -62,8 +62,8 @@ > LIBXSLT_VERSION_SCRIPT = > endif > >-libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) >-libxslt_la_LDFLAGS = \ >+libxslt_catalogless_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) >+libxslt_catalogless_la_LDFLAGS = \ > $(WIN32_EXTRA_LDFLAGS) \ > $(LIBXSLT_VERSION_SCRIPT) \ > -version-info $(LIBXSLT_VERSION_INFO) >--- /libxslt.pc.in >+++ /libxslt.pc.in >@@ -4,9 +4,9 @@ > includedir=@includedir@ > > >-Name: libxslt >+Name: libxslt-catalogless > Version: @VERSION@ >-Description: XSLT library version 2. >-Requires: libxml-2.0 >+Description: XSLT library version 2 using libXML library version 2 without Catalog support. >+Requires: libxml-2.0-catalogless > Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@ > Cflags: @XSLT_INCLUDEDIR@ >--- /python/Makefile.am >+++ /python/Makefile.am >@@ -23,8 +23,8 @@ > > if WITH_PYTHON > mylibs = \ >- $(top_builddir)/libxslt/libxslt.la \ >- $(top_builddir)/libexslt/libexslt.la >+ $(top_builddir)/libxslt/libxslt-catalogless.la \ >+ $(top_builddir)/libexslt/libexslt-catalogless.la > > all-local: libxslt.py > >--- /tests/plugins/Makefile.am >+++ /tests/plugins/Makefile.am >@@ -20,7 +20,7 @@ > > xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) > xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c >-xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) >+xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt-catalogless.la $(EXTRA_LIBS) > xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) > > test-logall: >--- /xslt-config.in >+++ /xslt-config.in >@@ -9,7 +9,7 @@ > usage() > { > cat <<EOF >-Usage: xslt-config [OPTION]... >+Usage: xslt-catalogless-config [OPTION]... > > Known values for OPTION are: > >--- /xsltproc/Makefile.am >+++ /xsltproc/Makefile.am >@@ -3,9 +3,9 @@ > -I$(top_builddir)/libexslt > > EXTRA_PROGRAMS= >-bin_PROGRAMS = xsltproc $(XSLTPROCDV) >+noinst_PROGRAMS = xsltproc $(XSLTPROCDV) > >-noinst_PROGRAMS=testThreads >+noinst_PROGRAMS += testThreads > > AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS) > >@@ -18,25 +18,25 @@ > testThreads_DEPENDENCIES = $(DEPS) > testThreads_LDADD= $(THREAD_LIBS) $(LDADDS) > >-DEPS = $(top_builddir)/libxslt/libxslt.la \ >- $(top_builddir)/libexslt/libexslt.la >+DEPS = $(top_builddir)/libxslt/libxslt-catalogless.la \ >+ $(top_builddir)/libexslt/libexslt-catalogless.la > >-LDADDS = $(top_builddir)/libxslt/libxslt.la \ >- $(top_builddir)/libexslt/libexslt.la \ >+LDADDS = $(top_builddir)/libxslt/libxslt-catalogless.la \ >+ $(top_builddir)/libexslt/libexslt-catalogless.la \ > $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD) > > xsltproc_LDADD = $(LIBGCRYPT_LIBS) $(LDADDS) > > CLEANFILES = .memdump > >-$(top_builddir)/libxslt/libxslt.la: >- cd $(top_builddir)/libxslt && $(MAKE) libxslt.la >+$(top_builddir)/libxslt/libxslt-catalogless.la: >+ cd $(top_builddir)/libxslt && $(MAKE) libxslt-catalogless.la > >-$(top_builddir)/libexslt/libexslt.la: $(top_builddir)/libxslt/libxslt.la >- cd $(top_builddir)/libexslt && $(MAKE) libexslt.la >+$(top_builddir)/libexslt/libexslt-catalogless.la: $(top_builddir)/libxslt/libxslt-catalogless.la >+ cd $(top_builddir)/libexslt && $(MAKE) libexslt-catalogless.la > > xsltproc.dv: xsltproc.o >- $(CC) $(CFLAGS) -o xsltproc xsltproc.o ../libexslt/.libs/libexslt.a ../libxslt/.libs/libxslt.a $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) >+ $(CC) $(CFLAGS) -o xsltproc xsltproc.o ../libexslt/.libs/libexslt-catalogless.a ../libxslt/.libs/libxslt-cataloless.a $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) > > tests: testThreads > @echo > .memdump
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 653078
:
533606
|
533608
|
533610
|
533614
|
533616
|
533618
|
533620
|
533626
|
533630
|
535766
|
535768
|
535770
|
535832
|
535834