diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-12-26 19:44:44 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-12-26 19:44:44 +1100 |
| commit | 9dcad82d145761bc4841075371386387758ebf34 (patch) | |
| tree | 1b0d1374fa9c7cd7bfcd460d748fc961ddb333cd /dev-libs | |
| parent | c0fc5d1e5a077b980de6426955f9bd313271e1dd (diff) | |
| download | kde-9dcad82d145761bc4841075371386387758ebf34.tar.gz kde-9dcad82d145761bc4841075371386387758ebf34.tar.bz2 kde-9dcad82d145761bc4841075371386387758ebf34.zip | |
[dev-libs/grantlee] Slot headers and require virtual X for tests.
Package-Manager: portage-2.2.15
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-slot.patch | 40 | ||||
| -rw-r--r-- | dev-libs/grantlee/grantlee-9999.ebuild | 10 |
2 files changed, 48 insertions, 2 deletions
diff --git a/dev-libs/grantlee/files/grantlee-slot.patch b/dev-libs/grantlee/files/grantlee-slot.patch new file mode 100644 index 00000000000..814fb9d63b9 --- /dev/null +++ b/dev-libs/grantlee/files/grantlee-slot.patch @@ -0,0 +1,40 @@ +Install headers to a custom location to permit slotting with Qt4 version. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 45f8673..7832a3b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6 + set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) + set( PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/grantlee/${Grantlee_MAJOR_MINOR_VERSION_STRING} ) + set( BIN_INSTALL_DIR bin ) +-set( INCLUDE_INSTALL_DIR include ) ++set( INCLUDE_INSTALL_DIR include/grantlee5 ) + set( DATA_INSTALL_DIR share/apps ) + + # set up RPATH/install_name_dir +diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt +index 789205c..7045449 100644 +--- a/templates/lib/CMakeLists.txt ++++ b/templates/lib/CMakeLists.txt +@@ -79,6 +79,7 @@ add_library(Grantlee5::Templates ALIAS Grantlee_Templates) + generate_export_header(Grantlee_Templates) + set_property(TARGET Grantlee_Templates PROPERTY EXPORT_NAME Templates) + target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) ++target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") + + if (BUILD_TESTS) + set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT") +diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt +index 14163db..7c609f9 100644 +--- a/textdocument/lib/CMakeLists.txt ++++ b/textdocument/lib/CMakeLists.txt +@@ -24,7 +24,7 @@ add_library(Grantlee_TextDocument SHARED + generate_export_header(Grantlee_TextDocument) + add_library(Grantlee::TextDocument ALIAS Grantlee_TextDocument) + set_property(TARGET Grantlee_TextDocument PROPERTY EXPORT_NAME TextDocument) +- ++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") + + target_link_libraries(Grantlee_TextDocument + LINK_PUBLIC Qt5::Gui diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild index e3efb8b749b..c9cc332c132 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -4,14 +4,15 @@ EAPI=5 -inherit cmake-utils git-r3 +VIRTUALX_REQUIRED="test" +inherit cmake-utils virtualx git-r3 DESCRIPTION="C++ string template engine based on the Django template system" HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home" EGIT_REPO_URI=( "git://gitorious.org/grantlee/${PN}" ) LICENSE="LGPL-2.1" -SLOT="0" +SLOT="5" KEYWORDS="" IUSE="debug doc test" @@ -29,6 +30,7 @@ DOCS=( AUTHORS CHANGELOG README ) PATCHES=( "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" + "${FILESDIR}/${PN}-slot.patch" ) src_configure() { @@ -45,6 +47,10 @@ src_compile() { use doc && cmake-utils_src_compile docs } +src_test() { + VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake +} + src_install() { use doc && HTML_DOCS=("${BUILD_DIR}/apidox/") |