cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ninja 1.9.0 obsolete workarounds

Browse Source 
Noticed by sthen@ and Alessandro De Laurenzis (qucs-s context)
This commit is contained in:
rsadowski 2020-07-20 14:55:51 +00:00
parent d7e14f7993
commit 75e3790003
3 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/digikam/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.67 2020/07/20 04:51:38 rsadowski Exp $
# $OpenBSD: Makefile,v 1.68 2020/07/20 14:55:51 rsadowski Exp $
COMMENT = KDE digital photo and video management utility
V = 7.0.0
DISTNAME = digikam-${V}
CATEGORIES = graphics
REVISION = 0
HOMEPAGE = https://www.digikam.org/

18
graphics/digikam/patches/patch-core_CMakeLists_txt
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-core_CMakeLists_txt,v 1.3 2020/05/15 15:54:25 rsadowski Exp $
Generate Info.plist only one time and create a dependency. Fixes a problem in
combination with Ninja v1.9.0 because of duplicate rules for generating
Info.plist.
Index: core/CMakeLists.txt
--- core/CMakeLists.txt.orig
+++ core/CMakeLists.txt
@@ -653,6 +653,8 @@ message(STATUS "")
if(DIGIKAM_CAN_BE_COMPILED)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/Info.plist.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+ add_custom_target(generate_info_header DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
# ==========================================================================
# Create git version header

24
graphics/digikam/patches/patch-core_showfoto_CMakeLists_txt
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-core_showfoto_CMakeLists_txt,v 1.2 2020/05/15 15:54:25 rsadowski Exp $
Use generated Info.plist dependency. Fixes a problem in combination with Ninja
v1.9.0 because of duplicate rules for generating Info.plist.
Index: core/showfoto/CMakeLists.txt
--- core/showfoto/CMakeLists.txt.orig
+++ core/showfoto/CMakeLists.txt
@@ -53,6 +53,7 @@ add_executable(showfoto ${showfoto_SRCS}
)
add_dependencies(showfoto digikam-gitversion)
+add_dependencies(showfoto generate_info_header)
# To fill plist XML file for OSX #####################################################
@@ -61,7 +62,6 @@ set(MACOSX_APP_DESCRIPTION "Stand alone Ph
set(MACOSX_BUNDLE_LONG_VERSION_STRING ${DIGIKAM_VERSION_STRING})
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${DIGIKAM_VERSION_SHORT})
set(MACOSX_BUNDLE_BUNDLE_VERSION ${DIGIKAM_VERSION_STRING})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/Info.plist.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
set_target_properties(showfoto PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
target_link_libraries(showfoto