Update www/otter-browser to 1.0.02 and fix Qt5.15 breakage. This update
only makes sense with the Qt5.15 update together. (Please see ports@)

OK?

diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
index f62105fa1a0..37524d9805c 100644
--- a/www/otter-browser/Makefile
+++ b/www/otter-browser/Makefile
@@ -2,8 +2,7 @@
 
 COMMENT =      browser aiming to recreate classic Opera (12.x) UI using Qt5
 
-DISTNAME =     otter-browser-1.0.01
-REVISION =     2
+DISTNAME =     otter-browser-1.0.02
 
 CATEGORIES =   www
 
@@ -17,11 +16,10 @@ EXTRACT_SUFX =      .tar.bz2
 # GPLv3+
 PERMIT_PACKAGE =       Yes
 
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Multimedia Qt5Network Qt5Positioning
-WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5Svg Qt5WebChannel
-WANTLIB += Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets Qt5XmlPatterns
-WANTLIB += c hunspell-1.7 m
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
+WANTLIB += Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
+WANTLIB += Qt5Quick Qt5Svg Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
+WANTLIB += Qt5Widgets Qt5XmlPatterns c hunspell-1.7 m
 
 MODULES =      devel/cmake x11/qt5
 
diff --git a/www/otter-browser/distinfo b/www/otter-browser/distinfo
index 28b914bd5d8..f531103038d 100644
--- a/www/otter-browser/distinfo
+++ b/www/otter-browser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (otter-browser-1.0.01.tar.bz2) = 
CG15d7yoIcpiSmywSaSldtuFfOhV+oujWlccoevzxrA=
-SIZE (otter-browser-1.0.01.tar.bz2) = 3189343
+SHA256 (otter-browser-1.0.02.tar.bz2) = 
2s0+Kz+VBFtvH44/NWlruPk7EAyCjVm/woEcSLik70E=
+SIZE (otter-browser-1.0.02.tar.bz2) = 3246991
diff --git a/www/otter-browser/patches/patch-cmake_FindHunspell_cmake 
b/www/otter-browser/patches/patch-cmake_FindHunspell_cmake
deleted file mode 100644
index a8e7a6dc138..00000000000
--- a/www/otter-browser/patches/patch-cmake_FindHunspell_cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-cmake_FindHunspell_cmake,v 1.1 2020/10/09 19:11:34 rsadowski 
Exp $
-
-Index: cmake/FindHunspell.cmake
---- cmake/FindHunspell.cmake.orig
-+++ cmake/FindHunspell.cmake
-@@ -12,7 +12,7 @@ IF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES)
- ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES)
- 
- FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx)
--FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6 hunspell-1.5 hunspell)
-+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 
hunspell)
- 
- # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if
- # all listed variables are TRUE
diff --git 
a/www/otter-browser/patches/patch-src_modules_windows_web_StartPageWidget_cpp 
b/www/otter-browser/patches/patch-src_modules_windows_web_StartPageWidget_cpp
new file mode 100644
index 00000000000..893fdf0102d
--- /dev/null
+++ 
b/www/otter-browser/patches/patch-src_modules_windows_web_StartPageWidget_cpp
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/modules/windows/web/StartPageWidget.cpp
+--- src/modules/windows/web/StartPageWidget.cpp.orig
++++ src/modules/windows/web/StartPageWidget.cpp
+@@ -39,6 +39,7 @@
+ #include <QtCore/QtMath>
+ #include <QtGui/QDrag>
+ #include <QtGui/QGuiApplication>
++#include <QtGui/QPainterPath>
+ #include <QtGui/QMouseEvent>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPixmapCache>
diff --git a/www/otter-browser/pkg/PLIST b/www/otter-browser/pkg/PLIST
index c9daf505418..21447899ba0 100644
--- a/www/otter-browser/pkg/PLIST
+++ b/www/otter-browser/pkg/PLIST
@@ -26,6 +26,7 @@ share/otter-browser/locale/otter-browser_fi.qm
 share/otter-browser/locale/otter-browser_fr.qm
 share/otter-browser/locale/otter-browser_gl.qm
 share/otter-browser/locale/otter-browser_he.qm
+share/otter-browser/locale/otter-browser_hi_IN.qm
 share/otter-browser/locale/otter-browser_hr.qm
 share/otter-browser/locale/otter-browser_hu.qm
 share/otter-browser/locale/otter-browser_id.qm

Reply via email to