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

Force LIBmarblewidget-qt5_VERSION in cmake set_target_properties

Browse Source 
This should avoid random bulk build issues. I think renaming library name
(OUTPUT_NAME marblewidget-qt5) is a problem here. Let's wait and see.
This commit is contained in:
rsadowski 2021-03-15 15:59:21 +00:00
parent c8fe49abf7
commit a9dc6f3112
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/kde-applications/marble/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2021/01/23 18:10:28 rsadowski Exp $
# $OpenBSD: Makefile,v 1.17 2021/03/15 15:59:21 rsadowski Exp $
COMMENT = virtual globe and world atlas
DISTNAME = marble-${VERSION}
PKGNAME = marble-kf5-${VERSION}
CATEGORIES = geo
REVISION = 0
HOMEPAGE = https://marble.kde.org/
@ -74,6 +75,11 @@ CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_libwlocate=ON \
TEST_IS_INTERACTIVE = X11
SUBST_VARS += LIBmarblewidget-qt5_VERSION
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/lib/marble/CMakeLists.txt
post-extract:
rm ${WRKSRC}/data/mwdbii/{PISLAND.PNT,PLAKE.PNT}.orig

12
x11/kde-applications/marble/patches/patch-src_lib_marble_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_lib_marble_CMakeLists_txt,v 1.1.1.1 2018/11/21 06:50:04 rsadowski Exp $
$OpenBSD: patch-src_lib_marble_CMakeLists_txt,v 1.2 2021/03/15 15:59:21 rsadowski Exp $
Index: src/lib/marble/CMakeLists.txt
--- src/lib/marble/CMakeLists.txt.orig
@ -19,3 +19,13 @@ Index: src/lib/marble/CMakeLists.txt
endif()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config-phonon.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-phonon.h)
@@ -437,8 +438,7 @@ set_target_properties(marblewidget PROPERTIES
if (NOT (CMAKE_SYSTEM_NAME STREQUAL Android))
set_target_properties(marblewidget PROPERTIES
- VERSION ${MARBLE_LIB_VERSION}
- SOVERSION ${MARBLE_ABI_VERSION}
+ VERSION ${LIBmarblewidget-qt5_VERSION}
)
endif()