mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove libxml

This commit is contained in:
John-Mark Bell 2012-11-10 00:09:11 +00:00
parent 4d58ed6562
commit 617d655c7b
23 changed files with 30 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
!NetSurf/Resources/en/licence.html,faf
View File

@ -182,12 +182,6 @@ version.</p>
<span><a href="#png">PNG</a></span>
</dd>
<dt><a href="http://xmlsoft.org">libxml2</a></dt>
<dd>
<span>&copy; 1998&ndash;2009 Daniel Veillard</span>
<span><a href="#mit">MIT</a></span>
</dd>
<dt><a href="http://www.riscos.info/websvn/listing.php?repname=gccsdk&path=%2Ftrunk%2Fgcc4%2Frecipe%2Ffiles%2Fgcc%2Flibunixlib%2F&#a9586e56e500c7fdfb58279167b82472d">UnixLib</a></dt>
<dd>
<span>&copy; 1995&ndash;1999 Simon Callan, Nick Burrett, Nicholas Clark and

6
!NetSurf/Resources/it/licence.html,faf
View File

@ -174,12 +174,6 @@ dl.components > dd > span + span {
<span><a href="#png">PNG</a></span>
</dd>
<dt><a href="http://xmlsoft.org">libxml2</a></dt>
<dd>
<span>&copy; 1998&ndash;2009 Daniel Veillard</span>
<span><a href="#mit">MIT</a></span>
</dd>
<dt><a href="http://www.riscos.info/websvn/listing.php?repname=gccsdk&path=%2Ftrunk%2Fgcc4%2Frecipe%2Ffiles%2Fgcc%2Flibunixlib%2F&#a9586e56e500c7fdfb58279167b82472d">UnixLib</a></dt>
<dd>
<span>&copy; 1995&ndash;1999 Simon Callan, Nick Burrett, Nicholas Clark and

15
Docs/BUILDING-AmigaCross
View File

@ -49,21 +49,6 @@ CFLAGS="-DNO_FSEEKO" ./configure --prefix=/usr/local/amiga
make
make install
libxml
download the tarball from the project's homepage, untar in a storage directory /
download source from your distribution's repository
download the tarball from the project's homepage, untar in a storage directory /
download source from your distribution's repository
cd into the directory containing the configure file
$ ./configure --prefix=/usr/local/amiga --host=ppc-amigaos
$ make
[need glob.h / change logic in runtest.c]
$ make install
alternative
http://www.aminet.net/dev/lib/libxml.lha
regex [pre-compiled]
http://aminet.net/dev/lib/libregex-4.4.3.lha

15
Docs/BUILDING-AmigaOS
View File

@ -100,21 +100,6 @@
http://www.aminet.net/package/dev/lib/libmng_so
libxml2
---------
libxml2 is available from Aminet:
http://www.aminet.net/package/dev/lib/libxml2
The shared object version included with OS4.1 does work with NetSurf,
however the "ELF QuickFix" must be installed from Hyperion's website.
The shared object can then be enabled with the following command:
1> makelink sdk:local/newlib/lib/libxml2.so sobjs:libxml2-2.6.so soft
OpenSSL
---------

2
Docs/BUILDING-Cocoa
View File

@ -36,7 +36,7 @@
"pkg-config" tool is required. It can be installed either via fink, macports
or homebrew or from source.
OpenSSL, LibXML2, LibPNG, curl, iconv and zlib are provided by Mac OS X.
OpenSSL, LibPNG, curl, iconv and zlib are provided by Mac OS X.
The curl library provided by Mac OS X 10.6 causes a crash while fetching
https resources, so you should install version 7.21.4 (or newer) of libcurl

7
Docs/BUILDING-Framebuffer
View File

@ -218,7 +218,7 @@ Index: framebuffer/font_freetype.c
Debian-like OS:
$ apt-get install libcurl3-dev libxml2-dev libmng-dev
$ apt-get install libcurl3-dev libmng-dev
Recent OS versions might need libcurl4-dev instead of libcurl3-dev but
note that when it has not been built with OpenSSL, the SSL_CTX is not
@ -228,12 +228,11 @@ Index: framebuffer/font_freetype.c
Fedora:
$ yum install curl-devel libxml2-devel libmng-devel lcms-devel
$ yum install curl-devel libmng-devel lcms-devel
Other:
You'll need to install the development resources for libcurl3, libxml2 and
libmng.
You'll need to install the development resources for libcurl3 and libmng.
Note that if you don't require MNG or JNG image support, NetSurf can be
configured to use libpng instead of libmng. If you wish to do this, install

6
Docs/BUILDING-GTK
View File

@ -66,7 +66,7 @@
Debian-like OS:
$ apt-get install libglade2-dev libcurl3-dev libxml2-dev libmng-dev
$ apt-get install libglade2-dev libcurl3-dev libmng-dev
$ apt-get install librsvg2-dev liblcms1-dev libjpeg-dev
Recent OS versions might need libcurl4-dev instead of libcurl3-dev but
@ -82,13 +82,13 @@
Fedora:
$ yum install libglade2-devel curl-devel libxml2-devel libmng-devel
$ yum install libglade2-devel curl-devel libmng-devel
$ yum install librsvg2-devel lcms-devel
Other:
You'll need to install the development resources for libglade2, libcurl3,
libxml2, libmng and librsvg.
libmng and librsvg.
Note that if you don't require MNG or JNG image support, NetSurf can be
configured to use libpng instead of libmng. If you wish to do this, install

2
Docs/BUILDING-Monkey
View File

@ -62,7 +62,7 @@
Debian-like OS:
$ apt-get install libcurl3-dev libxml2-dev
$ apt-get install libcurl3-dev
Recent OS versions might need libcurl4-dev instead of libcurl3-dev but
note that when it has not been built with OpenSSL, the SSL_CTX is not

2
Docs/BUILDING-ROCross
View File

@ -46,8 +46,6 @@
$ ../autobuilder/build c-ares
$ ../autobuilder/build libxml2
$ ../autobuilder/build libssl0.9.8
$ ../autobuilder/build libcurl3

8
Docs/BUILDING-Windows
View File

@ -137,14 +137,6 @@ EOF
$ PATH=/usr/i586-mingw32msvc/bin/:$PATH make CC=i586-mingw32msvc-gcc RANLIB=i586-mingw32msvc-ranlib
$ sudo make install
libxml:
$ apt-get source libxml2
$ cd libxml2-2.7.6.dfsg
$ ./configure --prefix=/usr/i586-mingw32msvc/ --disable-shared --without-python --host=i586-mingw32msvc
$ make
$ sudo make install
libcurl:
$ wget http://curl.haxx.se/download/curl-7.26.0.tar.gz

8
amiga/Makefile.target
View File

@ -33,7 +33,7 @@ ifeq ($(HOST),amiga)
$(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
CFLAGS += -I /SDK/local/common/include/libpng12
LDFLAGS += -lxml2 -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl
LDFLAGS += -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl
LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
ifeq ($(NETSURF_USE_AMIGA_CAIRO),YES)
@ -51,10 +51,10 @@ else
$(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libcurl openssl)
CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl openssl)
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libdom libcss)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libdom libcss)
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
@ -106,7 +106,7 @@ AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle
AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
AMIGA_LIBRARIES := parserutils.library nsgif.library nsbmp.library iconv.library hubbub.library
AMIGA_LIBS := $(addprefix /Libs/,$(AMIGA_LIBRARIES))
AMIGA_SHARED_OBJS := libjpeg.so.12 libxml2.so.9 libcurl.so.7 librtmp.so.0 libsvgtiny.so.0 \
AMIGA_SHARED_OBJS := libjpeg.so.12 libcurl.so.7 librtmp.so.0 libsvgtiny.so.0 \
libssl.so.1.0.0 libcrypto.so.1.0.0 libcss.so.0 libwapcaplet.so.0 libpng12.so \
libdom.so.0 libhubbub.so.0 libtre.so.5 libintl.so
AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS))

2
amiga/iff_dr2d.c
View File

@ -333,7 +333,7 @@ bool ami_save_svg(struct hlcache_handle *c,char *filename)
/*
* This code can be compiled as a standalone program for testing etc.
* Use something like the following line:
* gcc -o svg2dr2d iff_dr2d.c -lauto -lsvgtiny -lxml2 -lpthread -lz -use-dynld
* gcc -o svg2dr2d iff_dr2d.c -lauto -lsvgtiny -lpthread -lz -use-dynld
* -DWITH_NS_SVG -DAMIGA_DR2D_STANDALONE -D__USE_INLINE__
*/
const char USED ver[] = "\0$VER: svg2dr2d 1.1 (18.05.2009)\0";

2
amiga/pkg/makepackage
View File

@ -24,7 +24,7 @@ makedir ram:NetSurf/Libs
copy libs:parserutils.library libs:nsgif.library libs:nsbmp.library libs:iconv.library libs:hubbub.library ram:NetSurf/Libs
; libs:css.library libs:wapcaplet.library
makedir ram:NetSurf/SObjs
copy sobjs:libjpeg.so.8 sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so sobjs:libdom.so.0 sobjs:libhubbub.so.0 ram:NetSurf/SObjs clone
copy sobjs:libjpeg.so.8 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so sobjs:libdom.so.0 sobjs:libhubbub.so.0 ram:NetSurf/SObjs clone
;sobjs:libhpdf-2.2.0.so.0.0
echo "Splitting Messages file"
perl utils/split-messages.pl de ami < resources/FatMessages >RAM:NetSurf/Resources/de/Messages

3
atari/Makefile.target
View File

@ -63,13 +63,12 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -I. -Dsmall $(WARNFLAGS) -Dnsatari \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
$(shell $(PKG_CONFIG) --cflags libhubbub libcss openssl ) \
$(shell $(PKG_CONFIG) --cflags libxml-2.0 ) \
$(shell $(PKG_CONFIG) --cflags libcurl )
LDFLAGS += -lcflib -lcurl
LDFLAGS += -lcss -lparserutils -ldom -lwapcaplet -lhubbub
LDFLAGS += -lssl -lcrypto
LDFLAGS += -lxml2 -lz -liconv -lcares -lHermes -lwindom -lgem -lm
LDFLAGS += -lz -liconv -lcares -lHermes -lwindom -lgem -lm
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib

34
atari/scripts/makelibs.sh
View File

@ -33,7 +33,6 @@ libcurlpkg="curl-7.25.0"
libfreetypepkg="freetype-2.4.9"
libhermespkg="Hermes-1.3.3"
libjpegpkg="jpeg-8b"
libxmlpkg="libxml2-2.7.8"
libparserutils_version=0.1.1
libwapcaplet_version=0.1.1
hubbub_version=0.1.2
@ -364,38 +363,6 @@ fi
cd ..
cd $libxmlpkg
$cleanup
if [ "$cross" = "1" ]
then
./configure --prefix="$prefix" \
--host="m68k-atari-mint" \
--without-python \
--without-threads \
--enable-ipv6=no \
--without-debug \
--without-http \
--without-ftp \
--without-legacy \
--without-docbook \
--without-catalog \
--without-regexps \
--without-schemas \
--without-schematron \
--without-sax1 \
--without-xpath \
--without-modules \
--without-c14n \
--without-pattern \
--without-push \
--with-iconv="$archlibdir" \
--with-zlib="$archlibdir"
make
make install DESTDIR="$userfs"
else
echo "no cross"
fi
cd ..
cd $libopensslpkg
$cleanup
@ -620,6 +587,5 @@ else
mv $srcpkgdir $archlibdir -v
fi
echo "please add symlink to libxml2/libxml within /usr/m68k-atari-mint/include"
echo "please add symlink to freetype2/freetype within /usr/m68k-atari-mint/include"
exit 0

4
beos/Makefile.target
View File

@ -9,7 +9,7 @@
# for Haiku
LDFLAGS += -L/boot/common/lib
# some people do *not* have libm...
LDFLAGS += -lxml2 -lcurl -liconv
LDFLAGS += -lcurl -liconv
LDFLAGS += -lssl -lcrypto -lcss -ldom -lparserutils -lhubbub -lwapcaplet
CFLAGS += -I. -O $(WARNFLAGS) -Dnsbeos \
@ -31,7 +31,6 @@
RESOURCES = $(RSRC_BEOS)
ifeq ($(HOST),beos)
CFLAGS += -I/boot/home/config/include \
-I/boot/home/config/include/libxml2 \
-I/boot/home/config/include/libmng \
-I/boot/home/config/include/hubbub \
-I/boot/home/config/include/libcss \
@ -42,7 +41,6 @@
ifneq ($(wildcard /boot/develop/lib/*/libnetwork.so),)
# Haiku
CFLAGS += -I/boot/common/include \
-I/boot/common/include/libxml2 \
-I/boot/common/include/libmng \
-I/boot/common/include/hubbub \
-I/boot/common/include/libcss \

7
cocoa/Makefile.target
View File

@ -5,9 +5,9 @@
POSTEXES += NetSurf.app
LDFLAGS += -L/usr/lib
LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libhubbub libcss libdom)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss libdom)
LDFLAGS += -L/usr/X11/lib
LDFLAGS += -lm -lxml2 -lcurl -liconv
LDFLAGS += -lm -lcurl -liconv
LDFLAGS += -lssl -lcrypto
CFLAGS += -I. -O $(WARNFLAGS) -Dnscocoa \
@ -16,7 +16,7 @@
CFLAGS += -g -Os -Wno-uninitialized
CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libhubbub libcss libdom)
CFLAGS += $(shell $(PKG_CONFIG) --cflags libhubbub libcss libdom)
# shut up zconf.h and zlib.h
#CFLAGS += -D_LARGEFILE64_SOURCE=1
@ -38,7 +38,6 @@ endif
CXXFLAGS := $(SDK_FLAGS) $(CXXFLAGS)
CFLAGS += -I/usr/X11/include
CFLAGS += -I/usr/include/libxml2
CFLAGS += -include cocoa/Prefix.pch
# VERSION_FULL := $(shell sed -n '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c)

5
framebuffer/Makefile.target
View File

@ -59,15 +59,12 @@ ifeq ($(HOST),mint)
LDFLAGS += $(shell curl-config --libs)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub openssl libcss)
# xml-config returns -lsocket which is not needed and does not
# exist on all systems. because of that - hardcoded reference to
# libxml-2.0 here.
LDFLAGS += -L/usr/lib/ -lz -liconv
LDFLAGS += -lm
else
CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libdom openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcss)
endif

2
gtk/Makefile.target
View File

@ -7,7 +7,7 @@
# GTK flag setup (using pkg-config)
# ----------------------------------------------------------------------------
LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libdom libcss)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom libcss)
LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl)
# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here

2
monkey/Makefile.target
View File

@ -8,7 +8,7 @@
# ----------------------------------------------------------------------------
LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libdom libcss)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom libcss)
LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl)
# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here

5
riscos/Makefile.target
View File

@ -8,10 +8,10 @@
# ----------------------------------------------------------------------------
ifeq ($(HOST),riscos)
LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lcares
LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lz -lm -lcurl -lcares
LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
else
LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcares libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcares libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libdom libcss)
endif
@ -43,7 +43,6 @@ CFLAGS += -I. $(WARNFLAGS) -Driscos \
-mpoke-function-name -fno-strict-aliasing
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include \
-I$(GCCSDK_INSTALL_ENV)/include/libxml2 \
-I$(GCCSDK_INSTALL_ENV)/include/libmng
ifeq ($(HOST),riscos)
CFLAGS += -I<OSLib$$Dir> -mthrowback

4
test/Makefile
View File

@ -1,6 +1,6 @@
CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
$(shell pkg-config --cflags libxml-2.0 libcurl)
LDFLAGS := $(shell pkg-config --libs libxml-2.0 libcurl) -lz
$(shell pkg-config --cflags libcurl)
LDFLAGS := $(shell pkg-config --libs libcurl) -lz
llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet)
llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet)

8
windows/Makefile.target
View File

@ -19,11 +19,11 @@
ifneq ($(PKG_CONFIG),)
CFLAGS += $(shell $(PKG_CONFIG) --cflags zlib libcares libcurl libhubbub \
libparserutils libdom libwapcaplet libxml-2.0)
LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl libcares \
libparserutils libdom libwapcaplet)
LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libcurl libcares \
libhubbub libparserutils libcss libdom libwapcaplet)
else
LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz
LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lcurl -lz
endif
LDFLAGS += -lssl -lcrypto -lregex -liconv \
@ -42,7 +42,7 @@
WSCFLAGS := -std=c99 \
$(WARNFLAGS) -I. \
-DCURL_STATICLIB -DLIBXML_STATIC -DCARES_STATICLIB -g
-DCURL_STATICLIB -DCARES_STATICLIB -g
CFLAGS += $(WSCFLAGS)
LDFLAGS += $(WSCFLAGS)