> This is an update of Subsurface to 4.8.6.
>
> I've removed the patches to libdivecomputer commenting out AES as their
> files are "unlicensed", with a patch sitting upstream to put the actual
> license text in the files themselves.
>
> https://github.com/libdivecomputer/libdivecomputer/pulls
>
> One thing that happens now is that it segfaults on exit. I have no idea
> why, and my c++-fu is very weak. The backtrace isn't helpful to me. (I
> can provide it, if desired.) Everything else works: dive planning,
> interacting with dive computer, interacting with cloud storage.
I've downgraded this to 4.8.5, which doesn't exhibit the same segfault
on exit as 4.8.6.
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/subsurface/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile 8 Mar 2019 20:00:49 -0000 1.4
+++ Makefile 18 Jun 2019 21:32:06 -0000
@@ -5,7 +5,7 @@ USE_WXNEEDED = Yes
COMMENT = divelog program for recreational, tech, and free-divers
-VER = 4.8.2
+VER = 4.8.5
PKGNAME = subsurface-${VER}
DISTNAME = Subsurface-${VER}
REVISION = 0
@@ -68,7 +68,6 @@ post-extract:
rmdir ${WRKSRC}/libdivecomputer
mv ${WRKDIR}/libdivecomputer-subsurface-branch-${VER} \
${WRKSRC}/libdivecomputer
- rm ${WRKSRC}/libdivecomputer/src/aes.{c,h}
pre-configure:
cd ${WRKSRC}/libdivecomputer && mkdir build && \
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/subsurface/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 30 Sep 2018 14:32:59 -0000 1.2
+++ distinfo 18 Jun 2019 21:32:06 -0000
@@ -1,4 +1,4 @@
-SHA256 (Subsurface-4.8.2.tgz) = 3vEwhthhHf4Itocnzy5uCRTKRiEiq87N0P+ahbPB+bs=
-SHA256 (libdivecomputer-subsurface-branch-4.8.2.tgz) = HKSAHiZ2ivm7QTY7wXlx4knXcXvkFDZprCuqnIpV+Jg=
-SIZE (Subsurface-4.8.2.tgz) = 14852032
-SIZE (libdivecomputer-subsurface-branch-4.8.2.tgz) = 334792
+SHA256 (Subsurface-4.8.5.tgz) = dHAuxMu+ksIeEltpfHASUgrEzzcPHBuvOTNh4FpB67c=
+SHA256 (libdivecomputer-subsurface-branch-4.8.5.tgz) = 1F2kOfLlSS6aRFXz7Hiicly2llZb2egfM8JsQD6sxOc=
+SIZE (Subsurface-4.8.5.tgz) = 15063904
+SIZE (libdivecomputer-subsurface-branch-4.8.5.tgz) = 344513
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/misc/subsurface/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 14 Aug 2018 17:18:22 -0000 1.1.1.1
+++ patches/patch-CMakeLists_txt 18 Jun 2019 21:32:06 -0000
@@ -22,7 +22,7 @@ Index: CMakeLists.txt
SET(SUBSURFACE_TARGET_EXECUTABLE "DesktopExecutable" CACHE STRING "The type of application, DesktopExecutable or MobileExecutable")
LIST(APPEND SUBSURFACE_ACCEPTED_EXECUTABLES "DesktopExecutable" "MobileExecutable")
SET_PROPERTY(CACHE SUBSURFACE_TARGET_EXECUTABLE PROPERTY STRINGS ${SUBSURFACE_ACCEPTED_EXECUTABLES})
-@@ -122,7 +127,6 @@ include(pkgconfig_helper)
+@@ -123,7 +128,6 @@ include(pkgconfig_helper)
# if you think a module miss anything, take a look on the specific
# module file.
include(HandleFindGit2)
@@ -30,7 +30,7 @@ Index: CMakeLists.txt
if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable")
include(HandleFindGrantlee)
include(HandleUserManual)
-@@ -260,7 +264,7 @@ if(BLESUPPORT)
+@@ -267,7 +271,7 @@ if(BLESUPPORT)
endif()
#set up the subsurface_link_libraries variable
@@ -39,7 +39,7 @@ Index: CMakeLists.txt
qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc map-widget/qml/map-widget.qrc)
# include translations
-@@ -323,6 +327,9 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "Deskto
+@@ -335,6 +339,9 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "Deskto
add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES})
endif()
@@ -49,7 +49,7 @@ Index: CMakeLists.txt
if(FBSUPPORT)
set(FACEBOOK_INTEGRATION facebook_integration)
add_dependencies(facebook_integration subsurface_generated_ui)
-@@ -336,6 +343,7 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "Deskto
+@@ -348,6 +355,7 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "Deskto
subsurface_statistics
subsurface_models_desktop
subsurface_corelib
@@ -57,7 +57,7 @@ Index: CMakeLists.txt
${SUBSURFACE_LINK_LIBRARIES}
)
add_dependencies(subsurface_desktop_preferences subsurface_generated_ui)
-@@ -503,7 +511,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+@@ -520,7 +528,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
COMMAND ${MAKENSIS} ${WINDOWSSTAGING}/subsurface.nsi
DEPENDS fake_install
)
Index: patches/patch-desktop-widgets_mainwindow_cpp
===================================================================
RCS file: /cvs/ports/misc/subsurface/patches/patch-desktop-widgets_mainwindow_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-desktop-widgets_mainwindow_cpp
--- patches/patch-desktop-widgets_mainwindow_cpp 14 Aug 2018 17:18:22 -0000 1.1.1.1
+++ patches/patch-desktop-widgets_mainwindow_cpp 18 Jun 2019 21:32:06 -0000
@@ -3,15 +3,15 @@ $OpenBSD: patch-desktop-widgets_mainwind
Index: desktop-widgets/mainwindow.cpp
--- desktop-widgets/mainwindow.cpp.orig
+++ desktop-widgets/mainwindow.cpp
-@@ -244,7 +244,6 @@ MainWindow::MainWindow() : QMainWindow(),
+@@ -259,7 +259,6 @@ MainWindow::MainWindow() : QMainWindow(),
memset(©PasteDive, 0, sizeof(copyPasteDive));
memset(&what, 0, sizeof(what));
- updateManager = new UpdateManager(this);
- undoStack = new QUndoStack(this);
- QAction *undoAction = undoStack->createUndoAction(this, tr("&Undo"));
- QAction *redoAction = undoStack->createRedoAction(this, tr("&Redo"));
-@@ -1323,14 +1322,6 @@ void MainWindow::on_actionAboutSubsurface_triggered()
+ undoAction = Command::undoAction(this);
+ redoAction = Command::redoAction(this);
+ undoAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Z));
+@@ -1276,14 +1275,6 @@ void MainWindow::on_actionAboutSubsurface_triggered()
dlg.exec();
}
@@ -26,7 +26,7 @@ Index: desktop-widgets/mainwindow.cpp
void MainWindow::on_actionUserManual_triggered()
{
#ifndef NO_USERMANUAL
-@@ -1497,31 +1488,11 @@ void MainWindow::readSettings()
+@@ -1445,31 +1436,11 @@ void MainWindow::readSettings()
loadRecentFiles();
if (firstRun) {
Index: patches/patch-desktop-widgets_mainwindow_h
===================================================================
RCS file: /cvs/ports/misc/subsurface/patches/patch-desktop-widgets_mainwindow_h,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-desktop-widgets_mainwindow_h
--- patches/patch-desktop-widgets_mainwindow_h 14 Aug 2018 17:18:22 -0000 1.1.1.1
+++ patches/patch-desktop-widgets_mainwindow_h 18 Jun 2019 21:32:06 -0000
@@ -3,19 +3,19 @@ $OpenBSD: patch-desktop-widgets_mainwind
Index: desktop-widgets/mainwindow.h
--- desktop-widgets/mainwindow.h.orig
+++ desktop-widgets/mainwindow.h
-@@ -80,7 +80,6 @@ class MainWindow : public QMainWindow { (public)
- ProfileWidget2 *graphics() const;
- PlannerDetails *plannerDetails() const;
+@@ -71,7 +71,6 @@ class MainWindow : public QMainWindow { (public)
+ void cleanUpEmpty();
+ void setToolButtonsEnabled(bool enabled);
void printPlan();
- void checkSurvey();
void setApplicationState(const QByteArray& state);
void setStateProperties(const QByteArray& state, const PropertyList& tl, const PropertyList& tr, const PropertyList& bl,const PropertyList& br);
bool inPlanner();
-@@ -135,7 +134,6 @@ slots:
+@@ -130,7 +129,6 @@ slots:
void on_actionUserSurvey_triggered();
void on_actionDivePlanner_triggered();
void on_actionReplanDive_triggered();
- void on_action_Check_for_Updates_triggered();
void on_actionDiveSiteEdit_triggered();
- void current_dive_changed(int divenr);
+ void selectionChanged();
Index: patches/patch-desktop-widgets_mainwindow_ui
===================================================================
RCS file: /cvs/ports/misc/subsurface/patches/patch-desktop-widgets_mainwindow_ui,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-desktop-widgets_mainwindow_ui
--- patches/patch-desktop-widgets_mainwindow_ui 14 Aug 2018 17:18:22 -0000 1.1.1.1
+++ patches/patch-desktop-widgets_mainwindow_ui 18 Jun 2019 21:32:06 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-desktop-widgets_mainwind
Index: desktop-widgets/mainwindow.ui
--- desktop-widgets/mainwindow.ui.orig
+++ desktop-widgets/mainwindow.ui
-@@ -115,7 +115,6 @@
+@@ -114,7 +114,6 @@
<string>&Help</string>
</property>
<addaction name="actionAboutSubsurface"/>
@@ -11,7 +11,7 @@ Index: desktop-widgets/mainwindow.ui
<addaction name="actionUserSurvey"/>
<addaction name="actionUserManual"/>
</widget>
-@@ -414,11 +413,6 @@
+@@ -399,11 +398,6 @@
</property>
<property name="shortcut">
<string notr="true">F11</string>
Index: patches/patch-libdivecomputer_src_Makefile_am
===================================================================
RCS file: patches/patch-libdivecomputer_src_Makefile_am
diff -N patches/patch-libdivecomputer_src_Makefile_am
--- patches/patch-libdivecomputer_src_Makefile_am 14 Aug 2018 17:18:22 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-libdivecomputer_src_Makefile_am,v 1.1.1.1 2018/08/14 17:18:22 schwarze Exp $
-Remove obvious third-party files aes.c and aes.h
-that have no author information and no license.
-
-Index: libdivecomputer/src/Makefile.am
---- libdivecomputer/src/Makefile.am.orig
-+++ libdivecomputer/src/Makefile.am
-@@ -52,7 +52,6 @@ libdivecomputer_la_SOURCES = \
- hw_ostc.h hw_ostc.c hw_ostc_parser.c \
- hw_frog.h hw_frog.c \
- hw_ostc3.h hw_ostc3.c \
-- aes.h aes.c \
- cressi_edy.h cressi_edy.c cressi_edy_parser.c \
- cressi_leonardo.h cressi_leonardo.c cressi_leonardo_parser.c \
- zeagle_n2ition3.h zeagle_n2ition3.c \
Index: patches/patch-libdivecomputer_src_hw_ostc3_c
===================================================================
RCS file: patches/patch-libdivecomputer_src_hw_ostc3_c
diff -N patches/patch-libdivecomputer_src_hw_ostc3_c
--- patches/patch-libdivecomputer_src_hw_ostc3_c 14 Aug 2018 17:18:22 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-libdivecomputer_src_hw_ostc3_c,v 1.1.1.1 2018/08/14 17:18:22 schwarze Exp $
-Remove obvious third-party files aes.c and aes.h
-that have no author information and no license.
-
-Index: libdivecomputer/src/hw_ostc3.c
---- libdivecomputer/src/hw_ostc3.c.orig
-+++ libdivecomputer/src/hw_ostc3.c
-@@ -28,7 +28,6 @@
- #include "context-private.h"
- #include "device-private.h"
- #include "array.h"
--#include "aes.h"
- #include "platform.h"
-
- #define ISINSTANCE(device) dc_device_isinstance((device), &hw_ostc3_device_vtable)
-@@ -1122,7 +1121,9 @@ hw_ostc3_firmware_readfile3 (hw_ostc3_firmware_t *firm
- bytes += 16;
-
- // Load the iv for AES-FCB-mode
-- AES128_ECB_encrypt (iv, ostc3_key, tmpbuf);
-+ // AES128_ECB_encrypt (iv, ostc3_key, tmpbuf);
-+ ERROR (context, "No license for AES128_ECB_encrypt().");
-+ return DC_STATUS_UNSUPPORTED;
-
- for (addr = 0; addr < SZ_FIRMWARE; addr += 16, bytes += 16) {
- rc = hw_ostc3_firmware_readline (fp, context, bytes, encrypted, sizeof(encrypted));
-@@ -1137,7 +1138,9 @@ hw_ostc3_firmware_readfile3 (hw_ostc3_firmware_t *firm
- firmware->data[addr + i] = encrypted[i] ^ tmpbuf[i];
-
- // Run the next round of encryption
-- AES128_ECB_encrypt (encrypted, ostc3_key, tmpbuf);
-+ // AES128_ECB_encrypt (encrypted, ostc3_key, tmpbuf);
-+ ERROR (context, "No license for AES128_ECB_encrypt().");
-+ return DC_STATUS_UNSUPPORTED;
- }
-
- // This file format contains a tail with the checksum in
Index: patches/patch-scripts_get-version
===================================================================
RCS file: /cvs/ports/misc/subsurface/patches/patch-scripts_get-version,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-scripts_get-version
--- patches/patch-scripts_get-version 30 Sep 2018 14:32:59 -0000 1.2
+++ patches/patch-scripts_get-version 18 Jun 2019 21:32:06 -0000
@@ -9,7 +9,7 @@ Index: scripts/get-version
else
- cmd="git describe --abbrev=12"
- v0=$($cmd) || v0=$(cat .gitversion) || croak "odd; command '$cmd' failed"
-+ v0="v4.8.2"
++ v0="v4.8.5"
fi
# strip off the 'v' prefix, if any
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/misc/subsurface/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 14 Aug 2018 17:18:22 -0000 1.1.1.1
+++ pkg/PLIST 18 Jun 2019 21:32:06 -0000
@@ -66,7 +66,9 @@ share/subsurface/Documentation/images/Lo
share/subsurface/Documentation/images/LoadImage2_f20.jpg
share/subsurface/Documentation/images/LoadImage3b_f23.jpg
share/subsurface/Documentation/images/LoadImage3c_f23.jpg
+share/subsurface/Documentation/images/LoadImage4.jpg
share/subsurface/Documentation/images/LoadImage4_f20.jpg
+share/subsurface/Documentation/images/LoadImage5.jpg
share/subsurface/Documentation/images/LoadImage5_f20.jpg
share/subsurface/Documentation/images/LoadImage6_f20.jpg
share/subsurface/Documentation/images/Location1.jpg
@@ -82,6 +84,7 @@ share/subsurface/Documentation/images/Pl
share/subsurface/Documentation/images/Planner_OC_rec1.jpg
share/subsurface/Documentation/images/Planner_OC_rec2.jpg
share/subsurface/Documentation/images/Planner_pSCR.jpg
+share/subsurface/Documentation/images/Pref1.jpg
share/subsurface/Documentation/images/Pref1_f23.jpg
share/subsurface/Documentation/images/Pref2_f23.jpg
share/subsurface/Documentation/images/Pref3_f23.jpg
