Attachment 159192 Details for Bug 201854 – textproc_xqilla.diff

[patch] textproc_xqilla.diff

textproc_xqilla.diff (text/plain), 10.23 KB, created by tkato432 on 2015-07-24 18:39:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-07-24 18:39:07 UTC

Size: 10.23 KB

patch

obsolete

>diff -urN /usr/ports/textproc/xqilla/Makefile textproc/xqilla/Makefile
>--- /usr/ports/textproc/xqilla/Makefile	2015-03-27 04:58:00.053970000 +0900
>+++ textproc/xqilla/Makefile	2015-07-25 00:00:00.000000000 +0900
>@@ -2,11 +2,10 @@
> # $FreeBSD: head/textproc/xqilla/Makefile 382310 2015-03-26 14:01:57Z marino $
> 
> PORTNAME=	xqilla
>-PORTVERSION=	2.3.0
>-PORTREVISION=	3
>+PORTVERSION=	2.3.2
> PORTEPOCH=	1
> CATEGORIES=	textproc
>-MASTER_SITES=	SF
>+MASTER_SITES=	SF/${PORTNAME}
> DISTNAME=	XQilla-${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -15,31 +14,38 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3
>+LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
>+		libtidy.so:${PORTSDIR}/www/tidy-lib
> 
>-USES=		gmake libtool
>-USE_LDCONFIG=	yes
>+USES=		libtool
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-PORTDOCS=	*
>+CONFIGURE_ARGS=	--with-xerces=${LOCALBASE} \
>+		--with-faxpp=no \
>+		--with-tidy=${LOCALBASE}
> INSTALL_TARGET=	install-strip
>+USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFINE=	DOCS
>+OPTIONS_DEFINE=		DOXYGEN
> 
>-MAKE_JOBS_UNSAFE=	yes
>+DOCYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
>+   			dot:${PORTSDIR}/graphics/graphviz
>+DOCYGEN_ALL_TARGET=	all docs
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
>-    		dot:${PORTSDIR}/graphics/graphviz
>-
>-post-build:
>-	cd ${WRKSRC} && ${MAKE_CMD} docs
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		's|[[:blank:]]-R$$(xerces_lib)||' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e \
>+		's|[[:blank:]]-R$$with_.*"|"|' ${WRKSRC}/configure
> 
> post-install:
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \*-api ${STAGEDIR}${DOCSDIR}
>+.if ${PORT_OPTIONS:MDOXYGEN}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "*-api" \
>+		${STAGEDIR}${DOCSDIR})
>+	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S|${PREFIX}/||} \
>+		! -type d >> ${TMPPLIST})
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/textproc/xqilla/distinfo textproc/xqilla/distinfo
>--- /usr/ports/textproc/xqilla/distinfo	2014-06-21 17:39:56.000000000 +0900
>+++ textproc/xqilla/distinfo	2015-07-25 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (XQilla-2.3.0.tar.gz) = 60e163cbbbe2900f999ee863bfa5a63d913b1d6e2ea17376302d565d2e9e1bc7
>-SIZE (XQilla-2.3.0.tar.gz) = 7409736
>+SHA256 (XQilla-2.3.2.tar.gz) = 5ae0aed4091521d5c2f541093e02a81ebe55a9087ba735f80b110068584e217c
>+SIZE (XQilla-2.3.2.tar.gz) = 16163811
>diff -urN /usr/ports/textproc/xqilla/files/patch-gcc-werror textproc/xqilla/files/patch-gcc-werror
>--- /usr/ports/textproc/xqilla/files/patch-gcc-werror	2014-06-21 17:39:56.000000000 +0900
>+++ textproc/xqilla/files/patch-gcc-werror	1970-01-01 09:00:00.000000000 +0900
>@@ -1,69 +0,0 @@
>---- ./include/xqilla/runtime/ResultImpl.hpp.orig	2011-08-12 09:38:56.000000000 +0200
>-+++ ./include/xqilla/runtime/ResultImpl.hpp	2011-08-12 09:50:47.000000000 +0200
>-@@ -58,7 +58,7 @@
>-   Result *resultPointer_;
>- 
>- private:
>--  ResultImpl(const ResultImpl &) {};
>-+  ResultImpl(const ResultImpl &) : LocationInfo() {};
>-   ResultImpl &operator=(const ResultImpl &) { return *this; };
>- };
>- 
>---- include/xqilla/events/EventSerializer.hpp.orig	2011-08-12 09:54:35.000000000 +0200
>-+++ include/xqilla/events/EventSerializer.hpp	2011-08-12 09:54:51.000000000 +0200
>-@@ -37,7 +37,9 @@
>-                   XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgMemoryManager);
>-   ~EventSerializer();
>- 
>--  virtual void setLocationInfo(const LocationInfo *location) {}
>-+  virtual void setLocationInfo(const LocationInfo *location) {
>-+	  (void) location;
>-+  }
>- 
>-   virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding);
>-   virtual void endDocumentEvent();
>---- ./include/xqilla/simple-api/XQillaConfiguration.hpp.orig	2011-08-12 09:56:32.000000000 +0200
>-+++ ./include/xqilla/simple-api/XQillaConfiguration.hpp	2011-08-12 09:56:51.000000000 +0200
>-@@ -52,9 +52,13 @@
>- 
>-   virtual URIResolver *createDefaultURIResolver(XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager *memMgr) = 0;
>- 
>--  virtual void populateStaticContext(StaticContext *context) {}
>-+  virtual void populateStaticContext(StaticContext *context) {
>-+	  (void) context;
>-+  }
>- 
>--  virtual void populateDynamicContext(DynamicContext *context) {}
>-+  virtual void populateDynamicContext(DynamicContext *context) {
>-+	  (void) context;
>-+  }
>- 
>-   virtual void testInterrupt() {}
>- };
>---- include/xqilla/events/EventHandler.hpp.orig	2010-01-13 16:40:36.000000000 +0100
>-+++ include/xqilla/events/EventHandler.hpp	2011-08-12 10:12:55.000000000 +0200
>-@@ -35,7 +35,9 @@
>- 
>-   /** Recieves a LocationInfo object that is owned by the caller, and will be
>-       updated with the current location information as the parse progresses. */
>--  virtual void setLocationInfo(const LocationInfo *location) {}
>-+  virtual void setLocationInfo(const LocationInfo *location) {
>-+	  (void) location;
>-+  }
>- 
>-   /** Handles a document node as an event */
>-   virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding) = 0;
>-@@ -61,7 +63,12 @@
>-   virtual void namespaceEvent(const XMLCh *prefix, const XMLCh *uri) = 0;
>-   /** Handles an atomic item as an event */
>-   virtual void atomicItemEvent(AnyAtomicType::AtomicObjectType type, const XMLCh *value,
>--                               const XMLCh *typeURI, const XMLCh *typeName) {}
>-+                               const XMLCh *typeURI, const XMLCh *typeName) {
>-+	  (void) type;
>-+	  (void) value;
>-+	  (void) typeURI;
>-+	  (void) typeName;
>-+  }
>-   /** Called when all events have been reported */
>-   virtual void endEvent() = 0;
>- };
>diff -urN /usr/ports/textproc/xqilla/files/patch-include__xqilla__events__EventHandler.hpp textproc/xqilla/files/patch-include__xqilla__events__EventHandler.hpp
>--- /usr/ports/textproc/xqilla/files/patch-include__xqilla__events__EventHandler.hpp	1970-01-01 09:00:00.000000000 +0900
>+++ textproc/xqilla/files/patch-include__xqilla__events__EventHandler.hpp	2015-07-25 00:00:00.000000000 +0900
>@@ -0,0 +1,27 @@
>+--- include/xqilla/events/EventHandler.hpp.orig	2015-05-18 17:38:59 UTC
>++++ include/xqilla/events/EventHandler.hpp
>+@@ -33,7 +33,9 @@ public:
>+ 
>+   /** Recieves a LocationInfo object that is owned by the caller, and will be
>+       updated with the current location information as the parse progresses. */
>+-  virtual void setLocationInfo(const LocationInfo *location) {}
>++  virtual void setLocationInfo(const LocationInfo *location) {
>++	  (void) location;
>++  }
>+ 
>+   /** Handles a document node as an event */
>+   virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding) = 0;
>+@@ -59,7 +61,12 @@ public:
>+   virtual void namespaceEvent(const XMLCh *prefix, const XMLCh *uri) = 0;
>+   /** Handles an atomic item as an event */
>+   virtual void atomicItemEvent(AnyAtomicType::AtomicObjectType type, const XMLCh *value,
>+-                               const XMLCh *typeURI, const XMLCh *typeName) {}
>++                               const XMLCh *typeURI, const XMLCh *typeName) {
>++	  (void) type;
>++	  (void) value;
>++	  (void) typeURI;
>++	  (void) typeName;
>++  }
>+   /** Called when all events have been reported */
>+   virtual void endEvent() = 0;
>+ };
>diff -urN /usr/ports/textproc/xqilla/files/patch-include__xqilla__events__EventSerializer.hpp textproc/xqilla/files/patch-include__xqilla__events__EventSerializer.hpp
>--- /usr/ports/textproc/xqilla/files/patch-include__xqilla__events__EventSerializer.hpp	1970-01-01 09:00:00.000000000 +0900
>+++ textproc/xqilla/files/patch-include__xqilla__events__EventSerializer.hpp	2015-07-25 00:00:00.000000000 +0900
>@@ -0,0 +1,13 @@
>+--- include/xqilla/events/EventSerializer.hpp.orig	2015-05-18 17:38:59 UTC
>++++ include/xqilla/events/EventSerializer.hpp
>+@@ -35,7 +35,9 @@ public:
>+                   XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgMemoryManager);
>+   ~EventSerializer();
>+ 
>+-  virtual void setLocationInfo(const LocationInfo *location) {}
>++  virtual void setLocationInfo(const LocationInfo *location) {
>++	  (void) location;
>++  }
>+ 
>+   virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding);
>+   virtual void endDocumentEvent();
>diff -urN /usr/ports/textproc/xqilla/files/patch-include__xqilla__runtime__ResultImpl.hpp textproc/xqilla/files/patch-include__xqilla__runtime__ResultImpl.hpp
>--- /usr/ports/textproc/xqilla/files/patch-include__xqilla__runtime__ResultImpl.hpp	1970-01-01 09:00:00.000000000 +0900
>+++ textproc/xqilla/files/patch-include__xqilla__runtime__ResultImpl.hpp	2015-07-25 00:00:00.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- include/xqilla/runtime/ResultImpl.hpp.orig	2015-05-18 17:38:59 UTC
>++++ include/xqilla/runtime/ResultImpl.hpp
>+@@ -59,7 +59,7 @@ protected:
>+   Result *resultPointer_;
>+ 
>+ private:
>+-  ResultImpl(const ResultImpl &) {};
>++  ResultImpl(const ResultImpl &) : LocationInfo() {};
>+   ResultImpl &operator=(const ResultImpl &) { return *this; };
>+ };
>+ 
>diff -urN /usr/ports/textproc/xqilla/files/patch-include__xqilla__simple-api__XQillaConfiguration.hpp textproc/xqilla/files/patch-include__xqilla__simple-api__XQillaConfiguration.hpp
>--- /usr/ports/textproc/xqilla/files/patch-include__xqilla__simple-api__XQillaConfiguration.hpp	1970-01-01 09:00:00.000000000 +0900
>+++ textproc/xqilla/files/patch-include__xqilla__simple-api__XQillaConfiguration.hpp	2015-07-25 00:00:00.000000000 +0900
>@@ -0,0 +1,18 @@
>+--- include/xqilla/simple-api/XQillaConfiguration.hpp.orig	2015-05-18 17:38:59 UTC
>++++ include/xqilla/simple-api/XQillaConfiguration.hpp
>+@@ -53,9 +53,13 @@ public:
>+ 
>+   virtual ASTToXML *createASTToXML() = 0;
>+ 
>+-  virtual void populateStaticContext(StaticContext *context) {}
>++  virtual void populateStaticContext(StaticContext *context) {
>++	  (void) context;
>++  }
>+ 
>+-  virtual void populateDynamicContext(DynamicContext *context) {}
>++  virtual void populateDynamicContext(DynamicContext *context) {
>++	  (void) context;
>++  }
>+ 
>+   virtual void testInterrupt() {}
>+ };
>diff -urN /usr/ports/textproc/xqilla/pkg-plist textproc/xqilla/pkg-plist
>--- /usr/ports/textproc/xqilla/pkg-plist	2014-11-16 02:08:00.000000000 +0900
>+++ textproc/xqilla/pkg-plist	2015-07-25 00:00:00.000000000 +0900
>@@ -394,5 +394,5 @@
> include/xqilla/xqts/TestSuiteRunner.hpp
> lib/libxqilla.a
> lib/libxqilla.so
>-lib/libxqilla.so.6
>-lib/libxqilla.so.6.0.0
>+lib/libxqilla.so.4
>+lib/libxqilla.so.4.2.0

Actions: View | Diff

Attachments on bug 201854: 159192 | 160800