diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-07 13:11:10 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-07 13:13:56 +0200 |
| commit | 7cbedf3430ced5ab1a3f66a3ad401ccc75fe3371 (patch) | |
| tree | 84fd5340b5873464a7aec37449668e4b64841453 /dev-embedded/ponyprog/files | |
| parent | e2b7a6e1f367d473880f5a5466f0712eebfe4e53 (diff) | |
| download | gentoo-7cbedf3430ced5ab1a3f66a3ad401ccc75fe3371.tar.gz gentoo-7cbedf3430ced5ab1a3f66a3ad401ccc75fe3371.tar.bz2 gentoo-7cbedf3430ced5ab1a3f66a3ad401ccc75fe3371.zip | |
dev-embedded/ponyprog: EAPI-8 bump, revert bundle qhexedit2
See also: https://github.com/gentoo/gentoo/pull/19870
Add missing dependencies.
Rebase 3.1.2-fix-build-system.patch on 3.1.2.
Bug: https://bugs.gentoo.org/696626
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-embedded/ponyprog/files')
| -rw-r--r-- | dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch | 17 | ||||
| -rw-r--r-- | dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch | 47 |
2 files changed, 47 insertions, 17 deletions
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch deleted file mode 100644 index 9f4e44d69267..000000000000 --- a/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/CMakeLists.txt.old 2020-02-15 13:35:28.308010048 +0100 -+++ b/CMakeLists.txt 2020-02-15 13:37:06.726655159 +0100 -@@ -42,14 +42,6 @@ - OPTION (USE_PROFILER "Include in binary file profiling information" OFF) - - --IF(${USE_DEBUGGER}) -- SET(CMAKE_BUILD_TYPE Debug) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall") --ELSE() -- SET(CMAKE_BUILD_TYPE Release) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall") --ENDIF() -- - MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}") - - INCLUDE(CheckIncludeFile) diff --git a/dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch new file mode 100644 index 000000000000..aefbd707d585 --- /dev/null +++ b/dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch @@ -0,0 +1,47 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,7 @@ + PROJECT(ponyprog) + + # Configure CMake ... +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) +-# CMAKE_POLICY(SET CMP0003 OLD) +-# CMAKE_POLICY(SET CMP0015 OLD) ++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) + + # set the Qt version to 4 or 5 + OPTION (USE_QT5 "Using of Qt5 version for compiling" ON) +@@ -52,15 +50,7 @@ + OPTION (USE_PROFILER "Include in binary file profiling information" OFF) + + +- +-IF(${USE_DEBUGGER}) +- SET(CMAKE_BUILD_TYPE Debug) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall") +-ELSE() +- SET(CMAKE_BUILD_TYPE Release) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall") +-ENDIF() +- ++ADD_COMPILE_OPTIONS("-Wall") + MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}") + + INCLUDE(CheckIncludeFile) +@@ -202,7 +192,6 @@ + SET ( UI_HEADERS_DIR temp ) + SET ( UI_SOURCES_DIR temp ) + +-ADD_SUBDIRECTORY(qhexedit2/src) + ADD_SUBDIRECTORY(SrcPony) + + INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ ) +@@ -265,6 +254,8 @@ + MESSAGE(STATUS "QT LIBRARIES: ${QT_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5Core_LIBRARIES}") + ENDIF() + ++TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} qhexedit) ++ + ADD_CUSTOM_TARGET (tags + COMMAND ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |