diff --git a/devel/injeqt/Makefile b/devel/injeqt/Makefile index dbbc93da4afe..c60b27ffefc4 100644 --- a/devel/injeqt/Makefile +++ b/devel/injeqt/Makefile @@ -2,29 +2,25 @@ # $FreeBSD$ PORTNAME= injeqt -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= devel MAINTAINER= pawel@FreeBSD.org COMMENT= Dependency injection framework for Qt LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= vogel -USES= cmake compiler:c++11-lib -USE_QT5= buildtools_build core qmake_build +USES= cmake compiler:c++11-lib pathfix +USE_QT5= core buildtools_build qmake_build testlib_build USE_LDCONFIG= yes CMAKE_ARGS= -DDISABLE_EXAMPLES:BOOL=ON \ - -DDISABLE_TESTS:BOOL=ON + -DDISABLE_COVERAGE:BOOL=ON -PLIST_SUB= VERSION=${PORTVERSION} - -post-patch: - @${REINPLACE_CMD} '/pkgconfig/ s|LIBDIR}|PREFIX}/libdata|; s|-Werror||' \ - ${WRKSRC}/CMakeLists.txt +PLIST_SUB= VERSION=${PORTVERSION:R} .include diff --git a/devel/injeqt/distinfo b/devel/injeqt/distinfo index ae080d645785..0e323ea1a0a6 100644 --- a/devel/injeqt/distinfo +++ b/devel/injeqt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1469215541 -SHA256 (vogel-injeqt-1.1.0_GH0.tar.gz) = a5e125ab3e8c9f7139fccbce22d772b01c4e1af074dea3bbb1ddb4379a42cb16 -SIZE (vogel-injeqt-1.1.0_GH0.tar.gz) = 74112 +TIMESTAMP = 1493238065 +SHA256 (vogel-injeqt-1.2.0_GH0.tar.gz) = 77540cedb0b26affe993dd18124d796059e34c80a51d9ae6433fdff1860db135 +SIZE (vogel-injeqt-1.2.0_GH0.tar.gz) = 73787 diff --git a/devel/injeqt/files/patch-src_internal_provider-by-default-constructor.h b/devel/injeqt/files/patch-src_internal_provider-by-default-constructor.h new file mode 100644 index 000000000000..79f01296cf6d --- /dev/null +++ b/devel/injeqt/files/patch-src_internal_provider-by-default-constructor.h @@ -0,0 +1,19 @@ +--- src/internal/provider-by-default-constructor.h.orig 2017-04-27 17:04:46 UTC ++++ src/internal/provider-by-default-constructor.h +@@ -77,14 +77,14 @@ class INJEQT_INTERNAL_API provider_by_default_construc + /** + * @return empty set of object - this provider does not require another object to instantiate + */ +- virtual types required_types() const { return types{}; } ++ virtual types required_types() const override { return types{}; } + + /** + * @return true + * + * Objects created by injector will have its dependencies resolved. + */ +- virtual bool require_resolving() const; ++ virtual bool require_resolving() const override; + + /** + * @return constructor object passed in constructor