CVS commit: pkgsrc/biology/molsketch

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Tue Apr 18 08:49:22 UTC 2023

Modified Files:
        pkgsrc/biology/molsketch: Makefile PLIST distinfo
Added Files:
        pkgsrc/biology/molsketch/patches: patch-libmolsketch_CMakeLists.txt
            patch-molsketch_CMakeLists.txt patch-obabeliface_CMakeLists.txt

Log Message:
biology/molsketch: update to 0.8.0

Unfortunately, I had to spend quite a while updating the code to Qt 6 and also
building a release pipeline. Therefore, there are just some minor improvements
in 0.8.0, but the atom label rendering received a pretty complete overhaul.
This fixes issues like including superscripts in selections.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/biology/molsketch/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/biology/molsketch/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/biology/molsketch/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/biology/molsketch/patches/patch-libmolsketch_CMakeLists.txt \
    pkgsrc/biology/molsketch/patches/patch-molsketch_CMakeLists.txt \
    pkgsrc/biology/molsketch/patches/patch-obabeliface_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/biology/molsketch/Makefile
diff -u pkgsrc/biology/molsketch/Makefile:1.11 pkgsrc/biology/molsketch/Makefile:1.12
--- pkgsrc/biology/molsketch/Makefile:1.11      Mon Apr  3 20:20:46 2023
+++ pkgsrc/biology/molsketch/Makefile   Tue Apr 18 08:49:21 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2023/04/03 20:20:46 nros Exp $
+# $NetBSD: Makefile,v 1.12 2023/04/18 08:49:21 pin Exp $
 
-DISTNAME=      Molsketch-0.7.3-src
+DISTNAME=      Molsketch-0.8.0-src
 PKGNAME=       ${DISTNAME:S/-src//:tl}
-PKGREVISION=   3
 CATEGORIES=    biology
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=molsketch/}
 
@@ -16,7 +15,7 @@ USE_TOOLS=    pkg-config
 USE_CMAKE=     yes
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++17
 
 CMAKE_ARGS+=   -DMSK_PREFIX=${PREFIX:Q}
 CMAKE_ARGS+=   -DMSK_INSTALL_PREFIX=${PREFIX:Q}

Index: pkgsrc/biology/molsketch/PLIST
diff -u pkgsrc/biology/molsketch/PLIST:1.2 pkgsrc/biology/molsketch/PLIST:1.3
--- pkgsrc/biology/molsketch/PLIST:1.2  Tue Mar  9 13:54:28 2021
+++ pkgsrc/biology/molsketch/PLIST      Tue Apr 18 08:49:21 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/03/09 13:54:28 pin Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/04/18 08:49:21 pin Exp $
 bin/molsketch
 include/libmolsketch/TextInputItem.h
 include/libmolsketch/abstractxmlobject.h
@@ -34,6 +34,7 @@ include/libmolsketch/actions/rotateactio
 include/libmolsketch/actions/textaction.h
 include/libmolsketch/actions/transformcommand.h
 include/libmolsketch/actions/zlevelaction.h
+include/libmolsketch/alignment.h
 include/libmolsketch/arrow.h
 include/libmolsketch/arrowpopup.h
 include/libmolsketch/atom.h
@@ -46,6 +47,10 @@ include/libmolsketch/constants.h
 include/libmolsketch/coordinatedelegate.h
 include/libmolsketch/coordinatemodel.h
 include/libmolsketch/coordinatetableview.h
+include/libmolsketch/core/coreatom.h
+include/libmolsketch/core/corebond.h
+include/libmolsketch/core/coremolecule.h
+include/libmolsketch/debuggable.h
 include/libmolsketch/electronsystem.h
 include/libmolsketch/element.h
 include/libmolsketch/elementalignment.h
@@ -57,6 +62,7 @@ include/libmolsketch/graphicsitem.h
 include/libmolsketch/grid.h
 include/libmolsketch/helptextemptydock.h
 include/libmolsketch/helptextonemptylabel.h
+include/libmolsketch/iconutils.h
 include/libmolsketch/librarymodel.h
 include/libmolsketch/libraryview.h
 include/libmolsketch/lonepair.h
@@ -67,6 +73,13 @@ include/libmolsketch/moleculepopup.h
 include/libmolsketch/molscene.h
 include/libmolsketch/molview.h
 include/libmolsketch/neighboralignment.h
+include/libmolsketch/painting/paintable.h
+include/libmolsketch/painting/paintableaggregate.h
+include/libmolsketch/painting/regulartextbox.h
+include/libmolsketch/painting/stackedtextbox.h
+include/libmolsketch/painting/textbox.h
+include/libmolsketch/painting/textfield.h
+include/libmolsketch/painting/textline.h
 include/libmolsketch/propertiesdock.h
 include/libmolsketch/propertieswidget.h
 include/libmolsketch/qtdeprecations.h
@@ -91,39 +104,6 @@ include/libmolsketch/xmlobjectinterface.
 lib/libmolsketch.so
 lib/libobabeliface.so
 share/applications/molsketch.desktop
-share/doc/molsketch/cs/advanced.html
-share/doc/molsketch/cs/basic.html
-share/doc/molsketch/cs/faq.html
-share/doc/molsketch/cs/features.html
-share/doc/molsketch/cs/files.html
-share/doc/molsketch/cs/index.html
-share/doc/molsketch/cs/install.html
-share/doc/molsketch/cs/molsketch.adp
-share/doc/molsketch/cs/overview.html
-share/doc/molsketch/cs/thank.html
-share/doc/molsketch/en/about.html
-share/doc/molsketch/en/advanced.html
-share/doc/molsketch/en/basic.html
-share/doc/molsketch/en/faq.html
-share/doc/molsketch/en/features.html
-share/doc/molsketch/en/files.html
-share/doc/molsketch/en/index.html
-share/doc/molsketch/en/install.html
-share/doc/molsketch/en/molsketch.adp
-share/doc/molsketch/en/molsketch.qch
-share/doc/molsketch/en/overview.html
-share/doc/molsketch/en/thank.html
-share/doc/molsketch/molsketch.qhc
-share/doc/molsketch/nl/advanced.html
-share/doc/molsketch/nl/basic.html
-share/doc/molsketch/nl/faq.html
-share/doc/molsketch/nl/features.html
-share/doc/molsketch/nl/files.html
-share/doc/molsketch/nl/index.html
-share/doc/molsketch/nl/install.html
-share/doc/molsketch/nl/molsketch.adp
-share/doc/molsketch/nl/overview.html
-share/doc/molsketch/nl/thank.html
 share/icons/hicolor/scalable/apps/molsketch.svg
 share/icons/hicolor/scalable/mimetypes/application-x-molsketch-molecule.svg
 share/icons/hicolor/scalable/mimetypes/application-x-molsketch.svg

Index: pkgsrc/biology/molsketch/distinfo
diff -u pkgsrc/biology/molsketch/distinfo:1.6 pkgsrc/biology/molsketch/distinfo:1.7
--- pkgsrc/biology/molsketch/distinfo:1.6       Tue Oct 18 18:26:01 2022
+++ pkgsrc/biology/molsketch/distinfo   Tue Apr 18 08:49:21 2023
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.6 2022/10/18 18:26:01 pin Exp $
+$NetBSD: distinfo,v 1.7 2023/04/18 08:49:21 pin Exp $
 
-BLAKE2s (Molsketch-0.7.3-src.tar.gz) = a98e419f9855b5acd2f88faf6c01241518b67fad7a88d8f33539961dec8578be
-SHA512 (Molsketch-0.7.3-src.tar.gz) = 6910374864e1bcc19ededd7a2ee13f7c58595097504b8f0da8ee05f435ba95d6f335fbc7b26a344fc0f3782a58771213833cbaa53530e0fa62041945c1e3ab33
-Size (Molsketch-0.7.3-src.tar.gz) = 1907771 bytes
+BLAKE2s (Molsketch-0.8.0-src.tar.gz) = 506c2e637e9f90222cc04e122138efc3cf678365429fbf3039dff1e42ba5afdb
+SHA512 (Molsketch-0.8.0-src.tar.gz) = 0b1adca5beb1d33c52ed1c0f5f26d7af3ce80d441b69961e8941e4954d775c59b1fd9100d0b60b021016d4b7df9ed72036ee210be337f9a5510fa9c7b6c99b22
+Size (Molsketch-0.8.0-src.tar.gz) = 1852026 bytes
+SHA1 (patch-libmolsketch_CMakeLists.txt) = 44dab7ed708a102a3e607114683b57c813b6fd5f
+SHA1 (patch-molsketch_CMakeLists.txt) = 97938942238df038b74587a77568feb5c6b336e2
+SHA1 (patch-obabeliface_CMakeLists.txt) = 7933a188cf56fbdea943d364050f432ee29413bb

Added files:

Index: pkgsrc/biology/molsketch/patches/patch-libmolsketch_CMakeLists.txt
diff -u /dev/null pkgsrc/biology/molsketch/patches/patch-libmolsketch_CMakeLists.txt:1.1
--- /dev/null   Tue Apr 18 08:49:22 2023
+++ pkgsrc/biology/molsketch/patches/patch-libmolsketch_CMakeLists.txt  Tue Apr 18 08:49:21 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-libmolsketch_CMakeLists.txt,v 1.1 2023/04/18 08:49:21 pin Exp $
+
+Update C++ standard from 14 to 17 for CMake.
+https://github.com/hvennekate/Molsketch/commit/2726563113a3db1af0c667ec496a8569fa8ea8cd
+
+--- libmolsketch/CMakeLists.txt.orig   2023-04-14 16:04:22.000000000 +0000
++++ libmolsketch/CMakeLists.txt
+@@ -24,7 +24,7 @@ else(MSK_STATIC_LIB)
+         add_library(molsketch_LIB SHARED ${libmolsketch_SRCS} ${libmolsketch_UIS_H} ${libmolsketch_QM})
+ endif(MSK_STATIC_LIB)
+ set_target_properties(molsketch_LIB PROPERTIES OUTPUT_NAME "molsketch")
+-set_property(TARGET molsketch_LIB PROPERTY CXX_STANDARD 14)
++set_property(TARGET molsketch_LIB PROPERTY CXX_STANDARD 17)
+ target_link_libraries(molsketch_LIB ${QT_LIBRARIES})
+ 
+ # Install the executable and the library
Index: pkgsrc/biology/molsketch/patches/patch-molsketch_CMakeLists.txt
diff -u /dev/null pkgsrc/biology/molsketch/patches/patch-molsketch_CMakeLists.txt:1.1
--- /dev/null   Tue Apr 18 08:49:22 2023
+++ pkgsrc/biology/molsketch/patches/patch-molsketch_CMakeLists.txt     Tue Apr 18 08:49:21 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-molsketch_CMakeLists.txt,v 1.1 2023/04/18 08:49:21 pin Exp $
+
+Update C++ standard from 14 to 17 for CMake.
+https://github.com/hvennekate/Molsketch/commit/2726563113a3db1af0c667ec496a8569fa8ea8cd
+
+--- molsketch/CMakeLists.txt.orig      2023-04-14 16:04:22.000000000 +0000
++++ molsketch/CMakeLists.txt
+@@ -33,7 +33,7 @@ link_directories(${CMAKE_BINARY_DIR}/lib
+ set(APP_ICON_RESOURCE_WINDOWS "${CMAKE_CURRENT_SOURCE_DIR}/images/molsketch.ico")
+ add_executable(molsketch ${molsketch_SRCS} ${molsketch_UIS_H} ${molsketch_MOC_HDRS} ${APP_ICON_RESOURCE_WINDOWS})
+ install(TARGETS molsketch DESTINATION ${MSK_INSTALL_BINS})
+-set_property(TARGET molsketch PROPERTY CXX_STANDARD 14)
++set_property(TARGET molsketch PROPERTY CXX_STANDARD 17)
+ set_property(TARGET molsketch PROPERTY INSTALL_RPATH ${MSK_INSTALL_LIBS})
+ target_link_libraries(molsketch molsketch_LIB)
+ foreach(package ${Qt5RequiredPackages})
Index: pkgsrc/biology/molsketch/patches/patch-obabeliface_CMakeLists.txt
diff -u /dev/null pkgsrc/biology/molsketch/patches/patch-obabeliface_CMakeLists.txt:1.1
--- /dev/null   Tue Apr 18 08:49:22 2023
+++ pkgsrc/biology/molsketch/patches/patch-obabeliface_CMakeLists.txt   Tue Apr 18 08:49:21 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-obabeliface_CMakeLists.txt,v 1.1 2023/04/18 08:49:21 pin Exp $
+
+Update C++ standard from 14 to 17 for CMake.
+https://github.com/hvennekate/Molsketch/commit/2726563113a3db1af0c667ec496a8569fa8ea8cd
+
+--- obabeliface/CMakeLists.txt.orig    2023-04-14 16:04:22.000000000 +0000
++++ obabeliface/CMakeLists.txt
+@@ -17,7 +17,7 @@ include_directories(${OPENBABEL_INCLUDE_
+ # Create the obabeliface library
+ add_library(obabeliface_LIB SHARED ${obabeliface_SRCS})
+ set_target_properties(obabeliface_LIB PROPERTIES OUTPUT_NAME "obabeliface")
+-set_property(TARGET obabeliface_LIB PROPERTY CXX_STANDARD 14)
++set_property(TARGET obabeliface_LIB PROPERTY CXX_STANDARD 17)
+ if(WIN32 OR WIN64)
+         set_target_properties(obabeliface_LIB PROPERTIES PREFIX "")
+ endif(WIN32 OR WIN64)