Attachment 155968 Details for Bug 199682 – libkml.diff

[patch] libkml.diff

libkml.diff (text/plain), 8.18 KB, created by Mathieu Arnold on 2015-04-25 09:39:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2015-04-25 09:39:00 UTC

Size: 8.18 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 384688)
>+++ Makefile	(working copy)
>@@ -14,6 +14,7 @@
> 
> BUILD_DEPENDS=	${LOCALBASE}/bin/curl-config:${PORTSDIR}/ftp/curl \
> 		${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat2
>+LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
> 
> OPTIONS_DEFINE=	SWIG
> 
>Index: files/patch-src_kml_base_Makefile.in
>===================================================================
>--- files/patch-src_kml_base_Makefile.in	(revision 0)
>+++ files/patch-src_kml_base_Makefile.in	(working copy)
>@@ -0,0 +1,63 @@
>+--- src/kml/base/Makefile.in.orig	2015-04-25 08:51:41 UTC
>++++ src/kml/base/Makefile.in
>+@@ -69,8 +69,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
>+ libLTLIBRARIES_INSTALL = $(INSTALL)
>+ LTLIBRARIES = $(lib_LTLIBRARIES)
>+ libkmlbase_la_DEPENDENCIES =  \
>+-	$(top_builddir)/third_party/libminizip.la \
>+-	$(top_builddir)/third_party/liburiparser.la
>++	$(top_builddir)/third_party/libminizip.la
>+ am_libkmlbase_la_OBJECTS = attributes.lo csv_splitter.lo date_time.lo \
>+ 	expat_handler_ns.lo expat_parser.lo file.lo file_posix.lo \
>+ 	math_util.lo mimetypes.lo referent.lo string_util.lo \
>+@@ -160,7 +159,6 @@ math_util_test_LINK = $(LIBTOOL) --tag=C
>+ am_net_cache_test_OBJECTS = net_cache_test-net_cache_test.$(OBJEXT)
>+ net_cache_test_OBJECTS = $(am_net_cache_test_OBJECTS)
>+ net_cache_test_DEPENDENCIES = libkmlbase.la \
>+-	$(top_builddir)/third_party/liburiparser.la \
>+ 	$(top_builddir)/third_party/libgtest.la
>+ net_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
>+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
>+@@ -201,7 +199,6 @@ am_uri_parser_test_OBJECTS =  \
>+ 	uri_parser_test-uri_parser_test.$(OBJEXT)
>+ uri_parser_test_OBJECTS = $(am_uri_parser_test_OBJECTS)
>+ uri_parser_test_DEPENDENCIES = libkmlbase.la \
>+-	$(top_builddir)/third_party/liburiparser.la \
>+ 	$(top_builddir)/third_party/libgtest.la
>+ uri_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
>+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
>+@@ -443,7 +440,6 @@ top_srcdir = @top_srcdir@
>+ AM_CPPFLAGS = -I$(top_srcdir)/src \
>+               -I$(top_srcdir)/third_party/boost_1_34_1 \
>+               -I$(top_srcdir)/third_party/googletest-r108/include \
>+-              -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
>+               -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
>+ 
>+ @GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter  -fno-rtti
>+@@ -470,7 +466,7 @@ libkmlbase_la_SOURCES = \
>+ 
>+ libkmlbase_la_LIBADD = \
>+ 	$(top_builddir)/third_party/libminizip.la \
>+-	$(top_builddir)/third_party/liburiparser.la
>++	-luriparser
>+ 
>+ 
>+ # These header files will be installed in $(includedir)/kml/base
>+@@ -551,7 +547,7 @@ math_util_test_LDADD = libkmlbase.la \
>+ net_cache_test_SOURCES = net_cache_test.cc
>+ net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
>+ net_cache_test_LDADD = libkmlbase.la \
>+-        $(top_builddir)/third_party/liburiparser.la \
>++        -luriparser \
>+ 	$(top_builddir)/third_party/libgtest.la
>+ 
>+ referent_test_SOURCES = referent_test.cc
>+@@ -577,7 +573,7 @@ time_util_test_LDADD = libkmlbase.la \
>+ uri_parser_test_SOURCES = uri_parser_test.cc
>+ uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
>+ uri_parser_test_LDADD = libkmlbase.la \
>+-        $(top_builddir)/third_party/liburiparser.la \
>++        -luriparser \
>+ 	$(top_builddir)/third_party/libgtest.la
>+ 
>+ util_test_SOURCES = util_test.cc
>
>Property changes on: files/patch-src_kml_base_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_kml_base_file__posix.cc
>===================================================================
>--- files/patch-src_kml_base_file__posix.cc	(revision 384688)
>+++ files/patch-src_kml_base_file__posix.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- src/kml/base/file_posix.cc.orig	2010-01-14 00:16:30.000000000 +0000
>+--- src/kml/base/file_posix.cc.orig	2010-01-14 00:16:30 UTC
> +++ src/kml/base/file_posix.cc
> @@ -29,6 +29,7 @@
>  #include "kml/base/file.h"
>Index: files/patch-src_swig_Makefile.in
>===================================================================
>--- files/patch-src_swig_Makefile.in	(revision 0)
>+++ files/patch-src_swig_Makefile.in	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/swig/Makefile.in.orig	2015-04-25 08:51:41 UTC
>++++ src/swig/Makefile.in
>+@@ -289,8 +289,7 @@ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+ SUBDIRS = java python
>+ AM_CPPFLAGS = -I$(top_srcdir)/src \
>+-	      -I$(top_srcdir)/third_party/boost_1_34_1 \
>+-	      -I$(top_srcdir)/third_party/uriparser-0.7.5/include
>++	      -I$(top_srcdir)/third_party/boost_1_34_1
>+ 
>+ COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \
>+              $(top_builddir)/src/kml/dom/libkmldom.la \
>
>Property changes on: files/patch-src_swig_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-third__party_Makefile.in
>===================================================================
>--- files/patch-third__party_Makefile.in	(revision 0)
>+++ files/patch-third__party_Makefile.in	(working copy)
>@@ -0,0 +1,44 @@
>+--- third_party/Makefile.in.orig	2015-04-25 08:59:24 UTC
>++++ third_party/Makefile.in
>+@@ -108,10 +108,8 @@ CXXLD = $(CXX)
>+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
>+ 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
>+ 	$(LDFLAGS) -o $@
>+-SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
>+-	$(liburiparser_la_SOURCES)
>+-DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
>+-	$(liburiparser_la_SOURCES)
>++SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) 
>++DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) 
>+ libboostconfigcompilerincludeHEADERS_INSTALL = $(INSTALL_HEADER)
>+ libboostconfigincludeHEADERS_INSTALL = $(INSTALL_HEADER)
>+ libboostconfigno_tr1includeHEADERS_INSTALL = $(INSTALL_HEADER)
>+@@ -261,11 +259,10 @@ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+ uriparser = uriparser-0.7.5
>+ AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
>+-	      -I$(top_srcdir)/third_party/$(uriparser)/include \
>+ 	      -I$(top_srcdir)/third_party/googletest-r108 \
>+ 	      -I$(top_srcdir)/third_party/googletest-r108/include
>+ 
>+-lib_LTLIBRARIES = libminizip.la liburiparser.la
>++lib_LTLIBRARIES = libminizip.la
>+ noinst_LTLIBRARIES = libgtest.la
>+ libminizip_la_SOURCES = \
>+ 	zlib-1.2.3/contrib/minizip/unzip.c \
>+@@ -418,15 +415,6 @@ EXTRA_DIST = \
>+ 	$(googletest)/include/gtest/internal/gtest-port.h \
>+ 	$(googletest)/include/gtest/internal/gtest-string.h \
>+ 	$(googletest)/include/gtest/internal/gtest-type-util.h \
>+-	$(uriparser)/COPYING \
>+-	$(uriparser).win32/debug/uriparser.lib \
>+-	$(uriparser).win32/release/uriparser.lib \
>+-	$(uriparser)/include/uriparser/Uri.h \
>+-	$(uriparser)/include/uriparser/UriBase.h \
>+-	$(uriparser)/include/uriparser/UriDefsAnsi.h \
>+-	$(uriparser)/include/uriparser/UriDefsConfig.h \
>+-	$(uriparser)/include/uriparser/UriDefsUnicode.h \
>+-	$(uriparser)/include/uriparser/UriIp4.h \
>+ 	zlib-1.2.3/zconf.h \
>+ 	zlib-1.2.3/zlib.h \
>+ 	zlib-1.2.3/contrib/minizip/crypt.h \
>
>Property changes on: files/patch-third__party_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 384688)
>+++ pkg-plist	(working copy)
>@@ -178,8 +178,4 @@
> lib/libminizip.so
> lib/libminizip.so.0
> lib/libminizip.so.0.0.0
>-lib/liburiparser.a
>-lib/liburiparser.so
>-lib/liburiparser.so.1
>-lib/liburiparser.so.1.0.5
> @dir lib/libkml

Actions: View | Diff

Attachments on bug 199682: 155968