Hello Rafael,
The cad/qucs-s port is currently showing wrong behaviors when the
simulator is run ("Wrong document version" message is always issued when
trying to open a schematic, some components seem to be missing, etc.)
After a quick double check, I found that it got broken after your
modifications related to upcoming ninja 1.9.0 release (which I don't see
in the tree yet), see [1].
By the way, I see "Maintainer timeout" in your commit comment, but
actually I didn't receive any heads-up (it could be because I changed my
e-mail address in that timeframe and maybe you sent a message that I've
never received).
I'm not an expert of ninja (actually, all cmake world is a bit obscure
to me...), I can only report that at least PACKAGE_VERSION variable is
not propagating correctly through the sub-dirs (there could be other
hitches, the port is very complex and it's not easy to test all the
functions), so I can't propose a definite solution.
The enclosed diff simply reverts the patches that you added/modified,
but it is of course only a temporary workaround.
Any hints?
[1] https://marc.info/?l=openbsd-ports&m=156060814707307&w=2
--
Alessandro De Laurenzis
[mailto:jus...@atlantide.mooo.com]
Web: http://www.atlantide.mooo.com
LinkedIn: http://it.linkedin.com/in/delaurenzis
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/qucs-s/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 14 Mar 2020 06:39:03 -0000 1.6
+++ Makefile 19 Jul 2020 08:29:29 -0000
@@ -4,6 +4,7 @@ COMMENT = an universal GUI for SPICE and
V = 0.0.22
DISTNAME = qucs-s-${V}
+REVISION = 0
CATEGORIES = cad
HOMEPAGE = https://ra3xdh.github.io/
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 22 Jun 2019 20:18:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2019/06/22 20:18:00 rsadowski Exp $
-
-Fix build with Ninja 1.9.0.
-Create only one custom target to generate config.h to avoid duplicate ninja
-rules.
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -40,6 +40,16 @@ INCLUDE( ${QT_USE_FILE} )
-
- ADD_DEFINITIONS(${QT_DEFINITIONS})
-
-+# configure the header config.h
-+CONFIGURE_FILE (
-+ "${PROJECT_SOURCE_DIR}/config.h.cmake"
-+ "${PROJECT_SOURCE_DIR}/config.h"
-+)
-+SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/config.h PROPERTIES GENERATED 1)
-+ADD_CUSTOM_TARGET(
-+ generate_config_header
-+ DEPENDS ${PROJECT_SOURCE_DIR}/config.h
-+)
-
- ADD_SUBDIRECTORY( qucs )
- ADD_SUBDIRECTORY( qucs-activefilter )
Index: patches/patch-contrib_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/cad/qucs-s/patches/patch-contrib_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-contrib_CMakeLists_txt
--- patches/patch-contrib_CMakeLists_txt 22 Jun 2019 20:18:00 -0000 1.2
+++ patches/patch-contrib_CMakeLists_txt 19 Jul 2020 08:29:29 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-contrib_CMakeLists_txt,v 1.2 2019/06/22 20:18:00 rsadowski Exp $
-fix man install directory
+Fix man install directory
Index: contrib/CMakeLists.txt
--- contrib/CMakeLists.txt.orig
Index: patches/patch-qucs-activefilter_CMakeLists_txt
===================================================================
RCS file: patches/patch-qucs-activefilter_CMakeLists_txt
diff -N patches/patch-qucs-activefilter_CMakeLists_txt
--- patches/patch-qucs-activefilter_CMakeLists_txt 22 Jun 2019 20:18:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-qucs-activefilter_CMakeLists_txt,v 1.1 2019/06/22 20:18:00 rsadowski Exp $
-
-Fix build with Ninja 1.9.0.
-Create only one custom target to generate config.h to avoid duplicate ninja
-rules.
-
-Index: qucs-activefilter/CMakeLists.txt
---- qucs-activefilter/CMakeLists.txt.orig
-+++ qucs-activefilter/CMakeLists.txt
-@@ -27,13 +27,8 @@ IF(NOT WIN32)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register ")
- ENDIF()
-
--#configure the header config.h
--CONFIGURE_FILE (
-- "${PROJECT_SOURCE_DIR}/../config.h.cmake"
-- "${PROJECT_BINARY_DIR}/config.h"
--)
--
- INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
-+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
-
- FIND_PACKAGE( Qt4 REQUIRED )
- SET( QT_USE_QTGUI TRUE )
-@@ -91,6 +86,7 @@ ADD_EXECUTABLE(${QUCS_NAME}activefilter MACOSX_BUNDLE
- ${RESOURCES_SRCS} )
-
- TARGET_LINK_LIBRARIES(${QUCS_NAME}activefilter ${QT_LIBRARIES})
-+ADD_DEPENDENCIES(${QUCS_NAME}activefilter generate_config_header)
-
- INSTALL(TARGETS ${QUCS_NAME}activefilter
- BUNDLE DESTINATION bin COMPONENT Runtime
Index: patches/patch-qucs-attenuator_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/cad/qucs-s/patches/patch-qucs-attenuator_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-qucs-attenuator_CMakeLists_txt
--- patches/patch-qucs-attenuator_CMakeLists_txt 22 Jun 2019 20:18:00 -0000 1.2
+++ patches/patch-qucs-attenuator_CMakeLists_txt 19 Jul 2020 08:29:29 -0000
@@ -1,34 +1,11 @@
$OpenBSD: patch-qucs-attenuator_CMakeLists_txt,v 1.2 2019/06/22 20:18:00 rsadowski Exp $
-Fix build with Ninja 1.9.0.
-Create only one custom target to generate config.h to avoid duplicate ninja
-rules.
+Fix man install directory
Index: qucs-attenuator/CMakeLists.txt
--- qucs-attenuator/CMakeLists.txt.orig
+++ qucs-attenuator/CMakeLists.txt
-@@ -17,12 +17,6 @@ SET(CMAKE_BUILD_TYPE Debug)
-
- ADD_DEFINITIONS( -DHAVE_CONFIG_H )
-
--# configure the header config.h
--CONFIGURE_FILE (
-- "${PROJECT_SOURCE_DIR}/../config.h.cmake"
-- "${PROJECT_BINARY_DIR}/config.h"
--)
--
- INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
-
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") # enable warning level
-@@ -76,6 +70,7 @@ ADD_EXECUTABLE( qucsattenuator MACOSX_BUNDLE WIN32
- ${RESOURCES_SRCS} )
-
- TARGET_LINK_LIBRARIES( qucsattenuator ${QT_LIBRARIES} )
-+ADD_DEPENDENCIES(qucsattenuator generate_config_header)
-
- #INSTALL (TARGETS qucsattenuator DESTINATION bin)
- #
-@@ -105,7 +100,7 @@ INSTALL(TARGETS ${PROJECT_NAME}
+@@ -105,7 +105,7 @@ INSTALL(TARGETS ${PROJECT_NAME}
# man pages
IF(NOT WITH_SPICE)
Index: patches/patch-qucs-filter_CMakeLists_txt
===================================================================
RCS file: patches/patch-qucs-filter_CMakeLists_txt
diff -N patches/patch-qucs-filter_CMakeLists_txt
--- patches/patch-qucs-filter_CMakeLists_txt 22 Jun 2019 20:18:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-qucs-filter_CMakeLists_txt,v 1.1 2019/06/22 20:18:00 rsadowski Exp $
-
-Fix build with Ninja 1.9.0.
-Create only one custom target to generate config.h to avoid duplicate ninja
-rules.
-
-Index: qucs-filter/CMakeLists.txt
---- qucs-filter/CMakeLists.txt.orig
-+++ qucs-filter/CMakeLists.txt
-@@ -20,13 +20,9 @@ set(PROJECT_DOMAIN_SECOND "org")
- ADD_DEFINITIONS( -DHAVE_CONFIG_H )
-
-
--# configure the header config.h
--CONFIGURE_FILE (
-- "${PROJECT_SOURCE_DIR}/../config.h.cmake"
-- "${PROJECT_BINARY_DIR}/config.h"
--)
-
- INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
-+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
-
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") # enable warning level
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ") # enable C++11
-@@ -112,7 +108,7 @@ ADD_EXECUTABLE(${QUCS_NAME}filter MACOSX_BUNDLE WIN32
- ${RESOURCES_SRCS} )
-
- TARGET_LINK_LIBRARIES(${QUCS_NAME}filter ${QT_LIBRARIES})
--
-+ADD_DEPENDENCIES(${QUCS_NAME}filter generate_config_header)
- INSTALL(TARGETS ${QUCS_NAME}filter
- BUNDLE DESTINATION bin COMPONENT Runtime
- RUNTIME DESTINATION bin COMPONENT Runtime
Index: patches/patch-qucs-lib_CMakeLists_txt
===================================================================
RCS file: patches/patch-qucs-lib_CMakeLists_txt
diff -N patches/patch-qucs-lib_CMakeLists_txt
--- patches/patch-qucs-lib_CMakeLists_txt 22 Jun 2019 20:18:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-qucs-lib_CMakeLists_txt,v 1.1 2019/06/22 20:18:00 rsadowski Exp $
-
-Fix build with Ninja 1.9.0.
-Create only one custom target to generate config.h to avoid duplicate ninja
-rules.
-
-Index: qucs-lib/CMakeLists.txt
---- qucs-lib/CMakeLists.txt.orig
-+++ qucs-lib/CMakeLists.txt
-@@ -19,13 +19,9 @@ set(PROJECT_DOMAIN_SECOND "org")
-
- ADD_DEFINITIONS( -DHAVE_CONFIG_H )
-
--# configure the header config.h
--CONFIGURE_FILE (
-- "${PROJECT_SOURCE_DIR}/../config.h.cmake"
-- "${PROJECT_BINARY_DIR}/config.h"
--)
-
- INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR} "../qucs" )
-+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
-
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") # enable warning level
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ") # enable C++11
-@@ -79,6 +75,7 @@ ADD_EXECUTABLE(${QUCS_NAME}lib MACOSX_BUNDLE WIN32
- ${RESOURCES_SRCS} )
-
- TARGET_LINK_LIBRARIES(${QUCS_NAME}lib ${QT_LIBRARIES})
-+ADD_DEPENDENCIES(${QUCS_NAME}lib generate_config_header)
-
- INSTALL(TARGETS ${QUCS_NAME}lib
- BUNDLE DESTINATION bin COMPONENT Runtime
Index: patches/patch-qucs_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/cad/qucs-s/patches/patch-qucs_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-qucs_CMakeLists_txt
--- patches/patch-qucs_CMakeLists_txt 22 Jun 2019 20:18:00 -0000 1.2
+++ patches/patch-qucs_CMakeLists_txt 19 Jul 2020 08:29:29 -0000
@@ -1,36 +1,11 @@
$OpenBSD: patch-qucs_CMakeLists_txt,v 1.2 2019/06/22 20:18:00 rsadowski Exp $
-Fix build with Ninja 1.9.0.
-Create only one custom target to generate config.h to avoid duplicate ninja
-rules.
-
-fix man install directory
+Fix man install directory
Index: qucs/CMakeLists.txt
--- qucs/CMakeLists.txt.orig
+++ qucs/CMakeLists.txt
-@@ -75,12 +75,6 @@ IF(NOT HAVE_QTABWIDGET_SETMOVABLE)
- MESSAGE("QTabWidget::setMovable() not available, feature disabled.")
- ENDIF()
-
--# configure the header config.h
--CONFIGURE_FILE (
-- "${PROJECT_SOURCE_DIR}/../config.h.cmake"
-- "${PROJECT_BINARY_DIR}/config.h"
--)
--
- INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
-
-@@ -249,6 +243,7 @@ ADD_EXECUTABLE( ${QUCS_NAME} MACOSX_BUNDLE WIN32
- # Tell CMake which libraries we need to link our executable against.
- #
- TARGET_LINK_LIBRARIES( ${QUCS_NAME} components diagrams dialogs paintings extsimkernels spicecomponents ${QT_LIBRARIES} )
-+ADD_DEPENDENCIES(${QUCS_NAME} generate_config_header)
-
- #
- # Prepare the installation
-@@ -318,7 +313,7 @@ ENDIF()
+@@ -318,7 +318,7 @@ ENDIF()
INSTALL( FILES ${SCRIPTS} DESTINATION bin/ )
