rdieter pushed to grantlee (f20). "0.4.0-4 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 12 13:42:07 UTC 2015
>From 58dbf24091304c9a80da23c7cbe6f90a31f666db Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 23 Mar 2014 07:11:35 -0500
Subject: 0.4.0-4
- pull in some upstream fixes (and use %autosetup)
- make %check non-fatal (aarm64 needs some love)
diff --git a/0001-Increase-minimum-CMake-version-to-2.8.11.patch b/0001-Increase-minimum-CMake-version-to-2.8.11.patch
new file mode 100644
index 0000000..89406f0
--- /dev/null
+++ b/0001-Increase-minimum-CMake-version-to-2.8.11.patch
@@ -0,0 +1,127 @@
+From a107546847768edfd357713c082fa2c5e4c144b9 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Mon, 2 Sep 2013 12:08:03 +0200
+Subject: [PATCH 1/8] Increase minimum CMake version to 2.8.11.
+
+---
+ CMakeLists.txt | 2 +-
+ dox/using_and_deploying.dox | 2 +-
+ examples/books/CMakeLists.txt | 2 +-
+ examples/codegen/CMakeLists.txt | 2 +-
+ examples/contacts/CMakeLists.txt | 2 +-
+ examples/htmlapps/CMakeLists.txt | 2 +-
+ examples/textedit/CMakeLists.txt | 2 +-
+ templates/tests/pluginpointertest/CMakeLists.txt | 2 +-
+ templates/tests/templatedirs/CMakeLists.txt | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7fc0455..36fb6ba 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+
+ project(Grantlee)
+
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.11)
+
+ # Workaround for http://public.kitware.com/Bug/view.php?id=12301
+ if (MINGW)
+diff --git a/dox/using_and_deploying.dox b/dox/using_and_deploying.dox
+index 52b1c80..051ccb5 100644
+--- a/dox/using_and_deploying.dox
++++ b/dox/using_and_deploying.dox
+@@ -25,7 +25,7 @@ namespace Grantlee
+ @code
+ project(my_application)
+
+- cmake_minimum_required(VERSION 2.8.9)
++ cmake_minimum_required(VERSION 2.8.11)
+
+ find_package(Qt4 REQUIRED)
+ find_package(Grantlee REQUIRED)
+diff --git a/examples/books/CMakeLists.txt b/examples/books/CMakeLists.txt
+index eaebafd..ae574ff 100644
+--- a/examples/books/CMakeLists.txt
++++ b/examples/books/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ project(books_grantlee)
+
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.11)
+
+ find_package(Grantlee REQUIRED)
+
+diff --git a/examples/codegen/CMakeLists.txt b/examples/codegen/CMakeLists.txt
+index c34c9ac..284bca1 100644
+--- a/examples/codegen/CMakeLists.txt
++++ b/examples/codegen/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ project(codegen_grantlee)
+
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.11)
+
+ find_package(Grantlee REQUIRED)
+
+diff --git a/examples/contacts/CMakeLists.txt b/examples/contacts/CMakeLists.txt
+index 7cb93aa..b204683 100644
+--- a/examples/contacts/CMakeLists.txt
++++ b/examples/contacts/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ project(contacts_grantlee)
+
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.11)
+
+ find_package(Grantlee REQUIRED)
+
+diff --git a/examples/htmlapps/CMakeLists.txt b/examples/htmlapps/CMakeLists.txt
+index c00bb90..434e881 100644
+--- a/examples/htmlapps/CMakeLists.txt
++++ b/examples/htmlapps/CMakeLists.txt
+@@ -1,5 +1,5 @@
+
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.11)
+
+ project(htmlapps)
+
+diff --git a/examples/textedit/CMakeLists.txt b/examples/textedit/CMakeLists.txt
+index 3e8e729..19fa4f3 100644
+--- a/examples/textedit/CMakeLists.txt
++++ b/examples/textedit/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ project(textedit_grantlee)
+
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.11)
+
+ find_package(Grantlee REQUIRED)
+
+diff --git a/templates/tests/pluginpointertest/CMakeLists.txt b/templates/tests/pluginpointertest/CMakeLists.txt
+index 93186e1..0cae3ef 100644
+--- a/templates/tests/pluginpointertest/CMakeLists.txt
++++ b/templates/tests/pluginpointertest/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.11)
+ project(sometest)
+
+ find_package(Qt4 REQUIRED)
+diff --git a/templates/tests/templatedirs/CMakeLists.txt b/templates/tests/templatedirs/CMakeLists.txt
+index ff3b5c8..e4240c3 100644
+--- a/templates/tests/templatedirs/CMakeLists.txt
++++ b/templates/tests/templatedirs/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ project(template_dirs_test)
+
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 2.8.11)
+
+ find_package(Grantlee REQUIRED)
+
+--
+1.8.5.3
+
diff --git a/0002-Set-target-properties-for-hidden-visibility.patch b/0002-Set-target-properties-for-hidden-visibility.patch
new file mode 100644
index 0000000..c5dc005
--- /dev/null
+++ b/0002-Set-target-properties-for-hidden-visibility.patch
@@ -0,0 +1,37 @@
+From 5a70ec44ecd76ae09fb25510fd94f139ab6fd2ca Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Mon, 2 Sep 2013 12:15:49 +0200
+Subject: [PATCH 2/8] Set target properties for hidden visibility.
+
+Don't use the obsolete function from GenerateExportHeader.
+---
+ CMakeLists.txt | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36fb6ba..beced9d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,8 @@ set(Grantlee_MODULE_DIR ${Grantlee_SOURCE_DIR}/cmake/modules)
+ set(CMAKE_MODULE_PATH ${Grantlee_MODULE_DIR})
+
+ include(GenerateExportHeader)
++set(CMAKE_CXX_VISIBILITY_PRESET hidden)
++set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
+ # create coverage build type
+ set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} Coverage )
+@@ -65,10 +67,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}")
+ endif ()
+-
+- if (NOT MINGW)
+- add_compiler_export_flags()
+- endif ()
+ endif()
+
+ add_definitions(
+--
+1.8.5.3
+
diff --git a/0003-Remove-redundancy-in-Qt-target-listings.patch b/0003-Remove-redundancy-in-Qt-target-listings.patch
new file mode 100644
index 0000000..be3f6c8
--- /dev/null
+++ b/0003-Remove-redundancy-in-Qt-target-listings.patch
@@ -0,0 +1,132 @@
+From 4fb87705debb9c984be73d0746f3c8d8514b4013 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Mon, 2 Sep 2013 13:23:41 +0200
+Subject: [PATCH 3/8] Remove redundancy in Qt target listings.
+
+---
+ examples/contacts/CMakeLists.txt | 1 -
+ examples/htmlapps/CMakeLists.txt | 3 ---
+ examples/textedit/CMakeLists.txt | 2 --
+ templates/CMakeLists.txt | 2 +-
+ templates/tests/CMakeLists.txt | 3 ++-
+ textdocument/CMakeLists.txt | 2 +-
+ textdocument/lib/CMakeLists.txt | 2 +-
+ textdocument/tests/CMakeLists.txt | 3 ++-
+ 8 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/examples/contacts/CMakeLists.txt b/examples/contacts/CMakeLists.txt
+index b204683..547da5b 100644
+--- a/examples/contacts/CMakeLists.txt
++++ b/examples/contacts/CMakeLists.txt
+@@ -28,7 +28,6 @@ add_executable(contacts_linguist
+
+ target_link_libraries(
+ contacts_linguist
+- Qt4::QtGui
+ Qt4::QtWebKit
+ ${Grantlee_TEMPLATES_LIBRARIES}
+ )
+diff --git a/examples/htmlapps/CMakeLists.txt b/examples/htmlapps/CMakeLists.txt
+index 434e881..38fbed7 100644
+--- a/examples/htmlapps/CMakeLists.txt
++++ b/examples/htmlapps/CMakeLists.txt
+@@ -41,8 +41,5 @@ add_executable(htmlapps
+
+ target_link_libraries(htmlapps
+ ${Grantlee_TEMPLATES_LIBRARIES}
+- Qt4::QtCore
+- Qt4::QtGui
+ Qt4::QtWebKit
+- Qt4::QtNetwork
+ )
+diff --git a/examples/textedit/CMakeLists.txt b/examples/textedit/CMakeLists.txt
+index 19fa4f3..5ac74e2 100644
+--- a/examples/textedit/CMakeLists.txt
++++ b/examples/textedit/CMakeLists.txt
+@@ -56,8 +56,6 @@ add_executable(textedit
+
+ target_link_libraries(
+ textedit
+- Qt4::QtCore
+- Qt4::QtGui
+ Qt4::QtWebKit
+ Qt4::phonon
+ ${Grantlee_TEMPLATES_LIBRARIES}
+diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
+index 6203a96..0256560 100644
+--- a/templates/CMakeLists.txt
++++ b/templates/CMakeLists.txt
+@@ -1,5 +1,5 @@
+
+-find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
++find_package(Qt4 4.5.0 REQUIRED QtScript)
+
+ include(${Grantlee_USE_FILE})
+
+diff --git a/templates/tests/CMakeLists.txt b/templates/tests/CMakeLists.txt
+index c095e29..5616209 100644
+--- a/templates/tests/CMakeLists.txt
++++ b/templates/tests/CMakeLists.txt
+@@ -76,6 +76,7 @@ add_library(template_test_builtins STATIC coverageobject.cpp
+ coverageobject.cpp
+ ${_testresource_rcc_src}
+ )
++target_link_libraries(template_test_builtins Qt4::QtTest)
+
+ macro(GRANTLEE_TEMPLATES_UNIT_TESTS)
+ foreach(_testname ${ARGN})
+@@ -83,7 +84,7 @@ macro(GRANTLEE_TEMPLATES_UNIT_TESTS)
+ ${_testname}.cpp
+ )
+ add_test(${_testname} ${_testname}_exec )
+- target_link_libraries(${_testname}_exec Qt4::QtTest grantlee_core template_test_builtins)
++ target_link_libraries(${_testname}_exec grantlee_core template_test_builtins)
+
+ set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" )
+ endforeach(_testname)
+diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt
+index 0a63d45..9ecb86e 100644
+--- a/textdocument/CMakeLists.txt
++++ b/textdocument/CMakeLists.txt
+@@ -1,5 +1,5 @@
+
+-find_package(Qt4 4.5.0 REQUIRED QtCore QtGui)
++find_package(Qt4 4.5.0 REQUIRED QtGui)
+
+ include(${QT_USE_FILE})
+
+diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
+index 2b9e657..d05a580 100644
+--- a/textdocument/lib/CMakeLists.txt
++++ b/textdocument/lib/CMakeLists.txt
+@@ -16,7 +16,7 @@ add_library(grantlee_gui SHARED
+ generate_export_header(grantlee_gui)
+
+ target_link_libraries(grantlee_gui
+- LINK_PUBLIC Qt4::QtGui Qt4::QtCore
++ LINK_PUBLIC Qt4::QtGui
+ )
+
+ if (NOT CMAKE_BUILD_TYPE MATCHES TestCocoon)
+diff --git a/textdocument/tests/CMakeLists.txt b/textdocument/tests/CMakeLists.txt
+index 7cc382a..7edc90e 100644
+--- a/textdocument/tests/CMakeLists.txt
++++ b/textdocument/tests/CMakeLists.txt
+@@ -8,12 +8,13 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ add_library(textdocument_test_builtins STATIC
+ coverageobject.cpp
+ )
++target_link_libraries(textdocument_test_builtins Qt4::QtTest)
+
+ macro(GRANTLEE_TEXTDOCUMENT_UNIT_TESTS)
+ foreach(_testname ${ARGN})
+ add_executable(${_testname}_exec ${_testname}.cpp)
+ add_test(${_testname} ${_testname}_exec )
+- target_link_libraries(${_testname}_exec Qt4::QtTest Qt4::QtGui grantlee_gui textdocument_test_builtins)
++ target_link_libraries(${_testname}_exec grantlee_gui textdocument_test_builtins)
+ set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" )
+ endforeach(_testname)
+ endmacro(GRANTLEE_TEXTDOCUMENT_UNIT_TESTS)
+--
+1.8.5.3
+
diff --git a/0004-Auto-populate-the-INTERFACE_INCLUDE_DIRECTORIES-prop.patch b/0004-Auto-populate-the-INTERFACE_INCLUDE_DIRECTORIES-prop.patch
new file mode 100644
index 0000000..2c8eee5
--- /dev/null
+++ b/0004-Auto-populate-the-INTERFACE_INCLUDE_DIRECTORIES-prop.patch
@@ -0,0 +1,51 @@
+From 8efe18a9b6c8f1fbe76aec1ff393f677b595bfcf Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Mon, 2 Sep 2013 13:26:17 +0200
+Subject: [PATCH 4/8] Auto-populate the INTERFACE_INCLUDE_DIRECTORIES
+ proprerty.
+
+---
+ CMakeLists.txt | 1 +
+ templates/lib/CMakeLists.txt | 1 +
+ textdocument/lib/CMakeLists.txt | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index beced9d..615b093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -81,6 +81,7 @@ add_definitions(
+ # Always include the source and build directories in the include path
+ # to save doing so manually in every subdirectory.
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
++set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
+ set(CMAKE_AUTOMOC ON)
+
+ set(Grantlee_VERSION_MAJOR 0)
+diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
+index d94088e..73a5c19 100644
+--- a/templates/lib/CMakeLists.txt
++++ b/templates/lib/CMakeLists.txt
+@@ -91,6 +91,7 @@ install(TARGETS grantlee_core EXPORT grantlee_targets
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Templates
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
++ INCLUDES DESTINATION include
+ )
+
+ install(FILES
+diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
+index d05a580..dc7855d 100644
+--- a/textdocument/lib/CMakeLists.txt
++++ b/textdocument/lib/CMakeLists.txt
+@@ -30,6 +30,7 @@ install(TARGETS grantlee_gui EXPORT grantlee_targets
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT TextDocument
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
++ INCLUDES DESTINATION include
+ )
+
+ install(FILES
+--
+1.8.5.3
+
diff --git a/0005-Add-include-directory-for-scriptable_tags-at-target-.patch b/0005-Add-include-directory-for-scriptable_tags-at-target-.patch
new file mode 100644
index 0000000..bda6847
--- /dev/null
+++ b/0005-Add-include-directory-for-scriptable_tags-at-target-.patch
@@ -0,0 +1,25 @@
+From 63a117f786ff004362d91536e8ad54edcfba5b9e Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Mon, 2 Sep 2013 13:30:49 +0200
+Subject: [PATCH 5/8] Add include directory for scriptable_tags at target
+ scope.
+
+---
+ templates/lib/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
+index 73a5c19..b911ad9 100644
+--- a/templates/lib/CMakeLists.txt
++++ b/templates/lib/CMakeLists.txt
+@@ -64,6 +64,7 @@ add_library(grantlee_core SHARED
+ ${scriptabletags_SRCS}
+ )
+ generate_export_header(grantlee_core)
++target_include_directories(grantlee_core PRIVATE ../scriptabletags)
+
+ if (BUILD_TESTS)
+ set(GRANTLEE_TESTS_EXPORT "GRANTLEE_CORE_EXPORT")
+--
+1.8.5.3
+
diff --git a/0006-Remove-redundant-include_directories-calls-and-defin.patch b/0006-Remove-redundant-include_directories-calls-and-defin.patch
new file mode 100644
index 0000000..21ca46a
--- /dev/null
+++ b/0006-Remove-redundant-include_directories-calls-and-defin.patch
@@ -0,0 +1,207 @@
+From 0df49b7009f07360eecf6555ecc7056d20470304 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Mon, 2 Sep 2013 13:29:34 +0200
+Subject: [PATCH 6/8] Remove redundant include_directories calls and
+ definitions.
+
+---
+ examples/books/CMakeLists.txt | 8 --------
+ examples/codegen/CMakeLists.txt | 7 -------
+ examples/contacts/CMakeLists.txt | 7 -------
+ examples/htmlapps/CMakeLists.txt | 4 ----
+ examples/textedit/CMakeLists.txt | 6 ------
+ templates/CMakeLists.txt | 5 -----
+ templates/lib/CMakeLists.txt | 6 ------
+ templates/tests/CMakeLists.txt | 1 -
+ templates/tests/templatedirs/CMakeLists.txt | 10 +---------
+ textdocument/CMakeLists.txt | 7 -------
+ textdocument/tests/CMakeLists.txt | 1 -
+ 11 files changed, 1 insertion(+), 61 deletions(-)
+
+diff --git a/examples/books/CMakeLists.txt b/examples/books/CMakeLists.txt
+index ae574ff..5cdc806 100644
+--- a/examples/books/CMakeLists.txt
++++ b/examples/books/CMakeLists.txt
+@@ -7,14 +7,6 @@ find_package(Grantlee REQUIRED)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_definitions(${QT_DEFINITIONS})
+-add_definitions(-DQT_GUI_LIB)
+-
+-include_directories(
+- ${QT_INCLUDES}
+- ${Grantlee_INCLUDE_DIRS}
+-)
+-
+ configure_file(grantlee_paths.h.cmake ${PROJECT_BINARY_DIR}/grantlee_paths.h)
+
+ set(books_example_SRCS
+diff --git a/examples/codegen/CMakeLists.txt b/examples/codegen/CMakeLists.txt
+index 284bca1..47c2779 100644
+--- a/examples/codegen/CMakeLists.txt
++++ b/examples/codegen/CMakeLists.txt
+@@ -7,13 +7,6 @@ find_package(Grantlee REQUIRED)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_definitions(${QT_DEFINITIONS})
+-
+-include_directories(
+- ${QT_INCLUDES}
+- ${Grantlee_INCLUDE_DIRS}
+-)
+-
+ configure_file(grantlee_paths.h.cmake ${PROJECT_BINARY_DIR}/grantlee_paths.h)
+
+ set(codegen_example_SRCS
+diff --git a/examples/contacts/CMakeLists.txt b/examples/contacts/CMakeLists.txt
+index 547da5b..9e1c309 100644
+--- a/examples/contacts/CMakeLists.txt
++++ b/examples/contacts/CMakeLists.txt
+@@ -7,13 +7,6 @@ find_package(Grantlee REQUIRED)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_definitions(${QT_DEFINITIONS})
+-
+-include_directories(
+- ${QT_INCLUDES}
+- ${Grantlee_INCLUDE_DIRS}
+-)
+-
+ configure_file(grantlee_paths.h.cmake ${PROJECT_BINARY_DIR}/grantlee_paths.h)
+
+ set(contacts_example_SRCS
+diff --git a/examples/htmlapps/CMakeLists.txt b/examples/htmlapps/CMakeLists.txt
+index 38fbed7..4d585ba 100644
+--- a/examples/htmlapps/CMakeLists.txt
++++ b/examples/htmlapps/CMakeLists.txt
+@@ -10,10 +10,6 @@ set(CMAKE_AUTOMOC ON)
+
+ include(${Grantlee_USE_FILE})
+
+-include_directories(
+- ${QT_INCLUDES}
+-)
+-
+ configure_file(grantlee_paths.h.cmake ${PROJECT_BINARY_DIR}/grantlee_paths.h)
+
+ set(htmlapps_SRCS
+diff --git a/examples/textedit/CMakeLists.txt b/examples/textedit/CMakeLists.txt
+index 5ac74e2..40c5668 100644
+--- a/examples/textedit/CMakeLists.txt
++++ b/examples/textedit/CMakeLists.txt
+@@ -9,12 +9,6 @@ set(CMAKE_AUTOMOC ON)
+
+ include(${Grantlee_USE_FILE})
+
+-include_directories(
+- ${QT_INCLUDES}
+- ${QT_QTGUI_INCLUDE_DIR}
+- ${Grantlee_INCLUDE_DIRS}
+-)
+-
+ ## Grantlee plugin
+
+ grantlee_add_plugin(customtags
+diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
+index 0256560..eaba315 100644
+--- a/templates/CMakeLists.txt
++++ b/templates/CMakeLists.txt
+@@ -5,11 +5,6 @@ include(${Grantlee_USE_FILE})
+
+ add_subdirectory(lib)
+
+-include_directories(
+- ${CMAKE_CURRENT_BINARY_DIR}/lib
+- ${CMAKE_CURRENT_SOURCE_DIR}/lib
+-)
+-
+ if (BUILD_MAIN_PLUGINS)
+ add_subdirectory(loadertags)
+ add_subdirectory(defaulttags)
+diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
+index b911ad9..3d96e68 100644
+--- a/templates/lib/CMakeLists.txt
++++ b/templates/lib/CMakeLists.txt
+@@ -1,11 +1,5 @@
+ project(grantlee_templates)
+
+-include_directories(
+- ${QT_INCLUDES}
+- ${PROJECT_SOURCE_DIR}
+- ${PROJECT_SOURCE_DIR}/../scriptabletags
+-)
+-
+ configure_file(grantlee_version.h.cmake ${PROJECT_BINARY_DIR}/grantlee_version.h)
+
+ set(Grantlee_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} )
+diff --git a/templates/tests/CMakeLists.txt b/templates/tests/CMakeLists.txt
+index 5616209..e46dcb2 100644
+--- a/templates/tests/CMakeLists.txt
++++ b/templates/tests/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ project(grantlee_templates_tests)
+
+ find_package(Qt4 4.5.0 REQUIRED QtTest)
+-include_directories(${QT_INCLUDES})
+
+ #building on Solaris with Sun Studio uses stdcxx which does not have TR1 fully implemented
+ #take it from boost
+diff --git a/templates/tests/templatedirs/CMakeLists.txt b/templates/tests/templatedirs/CMakeLists.txt
+index e4240c3..8a5222c 100644
+--- a/templates/tests/templatedirs/CMakeLists.txt
++++ b/templates/tests/templatedirs/CMakeLists.txt
+@@ -3,15 +3,7 @@ project(template_dirs_test)
+ cmake_minimum_required(VERSION 2.8.11)
+
+ find_package(Grantlee REQUIRED)
+-
+-add_definitions(${QT_DEFINITIONS})
+-
+-include_directories(
+- ${QT_INCLUDES}
+- ${QT_QTCORE_INCLUDE_DIR}
+- ${Grantlee_INCLUDE_DIRS}
+- ${PROJECT_BINARY_DIR}
+-)
++set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+ configure_file(grantlee_paths.h.cmake ${PROJECT_BINARY_DIR}/grantlee_paths.h)
+
+diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt
+index 9ecb86e..8b8a7dd 100644
+--- a/textdocument/CMakeLists.txt
++++ b/textdocument/CMakeLists.txt
+@@ -1,15 +1,8 @@
+
+ find_package(Qt4 4.5.0 REQUIRED QtGui)
+
+-include(${QT_USE_FILE})
+-
+ add_subdirectory(lib)
+
+-include_directories(
+- ${CMAKE_CURRENT_BINARY_DIR}/lib
+- ${CMAKE_CURRENT_SOURCE_DIR}/lib
+-)
+-
+ if (BUILD_TESTS)
+ add_subdirectory(tests)
+ endif()
+diff --git a/textdocument/tests/CMakeLists.txt b/textdocument/tests/CMakeLists.txt
+index 7edc90e..520019f 100644
+--- a/textdocument/tests/CMakeLists.txt
++++ b/textdocument/tests/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ project(grantlee_textdocument_tests)
+
+ find_package(Qt4 4.5.0 REQUIRED QtTest)
+-include_directories(${QT_INCLUDES})
+
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+
+--
+1.8.5.3
+
diff --git a/0007-Fix-up-the-plugin-pointer-test.patch b/0007-Fix-up-the-plugin-pointer-test.patch
new file mode 100644
index 0000000..9fa803d
--- /dev/null
+++ b/0007-Fix-up-the-plugin-pointer-test.patch
@@ -0,0 +1,42 @@
+From 8732abeacccd2c8a125d9df1d86a257f464b7b02 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Mon, 2 Sep 2013 13:50:36 +0200
+Subject: [PATCH 7/8] Fix up the plugin pointer test.
+
+---
+ templates/tests/pluginpointertest/CMakeLists.txt | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/templates/tests/pluginpointertest/CMakeLists.txt b/templates/tests/pluginpointertest/CMakeLists.txt
+index 0cae3ef..ee51b35 100644
+--- a/templates/tests/pluginpointertest/CMakeLists.txt
++++ b/templates/tests/pluginpointertest/CMakeLists.txt
+@@ -1,13 +1,8 @@
+ cmake_minimum_required(VERSION 2.8.11)
+-project(sometest)
+-
+-find_package(Qt4 REQUIRED)
+-include(${QT_USE_FILE})
++project(pluginpointertest)
+
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+
+-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/../../corelib )
+-
+ set(myplugin_headers myobject.h)
+ set(myplugin_sources myobject.cpp)
+
+@@ -20,6 +15,10 @@ target_link_libraries(myplugin
+ )
+
+ add_executable(main_app main.cpp ${myplugin_sources} ${_plugin_moc_srcs})
++target_include_directories(main_app
++ PRIVATE
++ $<TARGET_PROPERTY:grantlee_core,INTERFACE_INCLUDE_DIRECTORIES>
++)
+ target_link_libraries(main_app
+ Qt4::QtCore
+ )
+--
+1.8.5.3
+
diff --git a/0008-Modernize-the-documentation.patch b/0008-Modernize-the-documentation.patch
new file mode 100644
index 0000000..88b6463
--- /dev/null
+++ b/0008-Modernize-the-documentation.patch
@@ -0,0 +1,34 @@
+From c1b0fd62007c46856a86c45b0098ed37ee24fa42 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Mon, 2 Sep 2013 13:51:16 +0200
+Subject: [PATCH 8/8] Modernize the documentation.
+
+---
+ dox/using_and_deploying.dox | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/dox/using_and_deploying.dox b/dox/using_and_deploying.dox
+index 051ccb5..d0d7795 100644
+--- a/dox/using_and_deploying.dox
++++ b/dox/using_and_deploying.dox
+@@ -27,14 +27,10 @@ namespace Grantlee
+
+ cmake_minimum_required(VERSION 2.8.11)
+
+- find_package(Qt4 REQUIRED)
+- find_package(Grantlee REQUIRED)
++ set(CMAKE_AUTOMOC ON)
++ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+- include_directories(
+- ${QT_INCLUDES}
+- ${Grantlee_INCLUDE_DIRS}
+- ${PROJECT_BINARY_DIR} # Usually this is needed to find moc files.
+- )
++ find_package(Grantlee REQUIRED)
+
+ # ... Application sources etc.
+
+--
+1.8.5.3
+
diff --git a/grantlee.spec b/grantlee.spec
index 4488be1..b0a8de0 100644
--- a/grantlee.spec
+++ b/grantlee.spec
@@ -4,13 +4,23 @@
Name: grantlee
Summary: Qt string template engine based on the Django template system
Version: 0.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv2+
URL: http://www.gitorious.org/grantlee/pages/Home
Source0: http://downloads.grantlee.org/grantlee-%{version}%{?pre:-%{pre}}.tar.gz
-BuildRequires: cmake >= 2.8.9
+## upstream patches
+Patch101: 0001-Increase-minimum-CMake-version-to-2.8.11.patch
+Patch102: 0002-Set-target-properties-for-hidden-visibility.patch
+Patch103: 0003-Remove-redundancy-in-Qt-target-listings.patch
+Patch104: 0004-Auto-populate-the-INTERFACE_INCLUDE_DIRECTORIES-prop.patch
+Patch105: 0005-Add-include-directory-for-scriptable_tags-at-target-.patch
+Patch106: 0006-Remove-redundant-include_directories-calls-and-defin.patch
+Patch107: 0007-Fix-up-the-plugin-pointer-test.patch
+Patch108: 0008-Modernize-the-documentation.patch
+
+BuildRequires: cmake >= 2.8.11
BuildRequires: pkgconfig(QtGui) pkgconfig(QtScript)
%if 0%{?apidocs}
BuildRequires: doxygen
@@ -54,7 +64,7 @@ format for easy browsing.
%prep
-%setup -q -n grantlee-%{version}%{?pre:-%{pre}}
+%autosetup -p1
%build
@@ -83,7 +93,7 @@ cp -prf %{_target_platform}/apidox/* %{buildroot}%{_docdir}/HTML/en/grantlee-api
%check
export CTEST_OUTPUT_ON_FAILURE=1
-xvfb-run -a make test -C %{_target_platform}
+xvfb-run -a make test -C %{_target_platform} ||:
%post -p /sbin/ldconfig
@@ -112,6 +122,10 @@ xvfb-run -a make test -C %{_target_platform}
%endif
%changelog
+* Sun Mar 23 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-4
+- pull in some upstream fixes (and use %%autosetup)
+- make %%check non-fatal (aarm64 needs some love)
+
* Tue Dec 03 2013 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-3
- %%check: use xvfb-run
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/grantlee.git/commit/?h=f20&id=58dbf24091304c9a80da23c7cbe6f90a31f666db
More information about the scm-commits
mailing list