Update tea-qt to 50.0.4 (Qt4 to Qt5 switch)

Tweaks from sthen@, input and OK landry.
2020-02-21 15:32:07 +00:00 · 2020-02-21 15:32:07 +00:00 · b1737954fd
commit b1737954fd
parent 3cef1e2512
7 changed files with 62 additions and 51 deletions
--- a/editors/teaqt/Makefile
+++ b/editors/teaqt/Makefile
@ -1,33 +1,40 @@
-# $OpenBSD: Makefile,v 1.26 2019/07/12 20:46:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2020/02/21 15:32:07 rsadowski Exp $

-COMMENT =	powerful and simple qt4 editor
+COMMENT =	powerful and simple Qt editor
+
+GH_ACCOUNT =	psemiletov
+GH_PROJECT =	tea-qt
+GH_TAGNAME =	50.0.4

-V =		33.3.0
-REVISION =	2
-DISTNAME =	tea-${V}
-PKGNAME =	teaqt-${V}
 CATEGORIES =	editors x11
-MASTER_SITES =	http://semiletov.org/tea/dloads/ \
-		${MASTER_SITE_SOURCEFORGE:=tea-editor/}
-EXTRACT_SUFX =	.tar.bz2

 HOMEPAGE =	http://semiletov.org/tea/

 # GPLv3
 PERMIT_PACKAGE =	Yes

-LIB_DEPENDS =	textproc/aspell/core
-WANTLIB += c m pthread ${COMPILER_LIBCXX} z QtGui QtXml aspell
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
+WANTLIB += aspell c djvulibre hunspell-1.6 m poppler-qt5 z

-COMPILER =		base-clang ports-gcc base-gcc
+MODULES =	devel/cmake \
+		x11/qt5

-MODULES =	devel/qmake x11/qt4
-CONFIGURE_ENV =	USE_ASPELL=true USE_HUNSPELL=false
+LIB_DEPENDS =	graphics/djvulibre \
+		print/poppler,-qt5 \
+		textproc/aspell/core \
+		textproc/hunspell
+
+RUN_DEPENDS =	devel/desktop-file-utils \
+		x11/gtk+3,-guic
+
+
+CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="${CFLAGS} \
+				-I${LOCALBASE}/include" \
+			-DCMAKE_CXX_FLAGS="${CXXFLAGS} \
+				-I${LOCALBASE}/include" \
+			-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} \
+				-L${LOCALBASE}/lib"

 NO_TEST =	Yes

-do-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/bin/tea ${PREFIX}/bin/tea
-
 .include <bsd.port.mk>
--- a/editors/teaqt/distinfo
+++ b/editors/teaqt/distinfo
@ -1,2 +1,2 @@
-SHA256 (tea-33.3.0.tar.bz2) = FNVAzWgluUvSLmVbJiZFj9XGEefEzDEk/X2a8+t/Xqg=
-SIZE (tea-33.3.0.tar.bz2) = 310901
+SHA256 (tea-qt-50.0.4.tar.gz) = INH/whj203ijOvrExOtlIDYwWnI8O0Ce4q+8Tum9Hs4=
+SIZE (tea-qt-50.0.4.tar.gz) = 504276
--- a/editors/teaqt/patches/patch-CMakeLists_txt
+++ b/editors/teaqt/patches/patch-CMakeLists_txt
@ -0,0 +1,25 @@
+$OpenBSD: patch-CMakeLists_txt,v 1.1 2020/02/21 15:32:07 rsadowski Exp $
+
+Fix install path
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -181,11 +181,11 @@ endif()
+ 
+ 
+ install (TARGETS tea DESTINATION bin)
+-install (FILES ${tea_ICONSVG} DESTINATION share/icons/hicolor/scalable/apps)
+-install (FILES ${tea_ICONPNG32} DESTINATION share/icons/hicolor/32x32/apps)
+-install (FILES ${tea_ICONPNG48} DESTINATION share/icons/hicolor/48x48/apps)
+-install (FILES ${tea_ICONPNG64} DESTINATION share/icons/hicolor/64x64/apps)
+-install (FILES ${tea_ICONPNG128} DESTINATION share/icons/hicolor/128x128/apps)
+install (FILES ${tea_ICONSVG} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
+install (FILES ${tea_ICONPNG32} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps)
+install (FILES ${tea_ICONPNG48} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
+install (FILES ${tea_ICONPNG64} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps)
+install (FILES ${tea_ICONPNG128} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps)
+ 
+-install (FILES ${tea_DESKTOP} DESTINATION share/applications)
+install (FILES ${tea_DESKTOP} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ 
--- a/editors/teaqt/patches/patch-spellchecker_cpp
+++ b/editors/teaqt/patches/patch-spellchecker_cpp
@ -1,13 +0,0 @@
-$OpenBSD: patch-spellchecker_cpp,v 1.3 2012/11/22 10:45:46 landry Exp $
--- spellchecker.cpp.orig	Tue Aug 28 21:01:31 2012
-+++ spellchecker.cpp	Thu Nov 22 11:37:32 2012
-@@ -79,9 +79,6 @@ CSpellchecker::CSpellchecker (const QString &lang, con
- 
- CSpellchecker::~CSpellchecker()
- {
-  if (speller)
-     delete_aspell_speller (speller);
-
-   if (spell_config)
-      delete_aspell_config (spell_config);
- 
--- a/editors/teaqt/patches/patch-src_pro
+++ b/editors/teaqt/patches/patch-src_pro
@ -1,16 +0,0 @@
-$OpenBSD: patch-src_pro,v 1.3 2012/11/22 10:45:46 landry Exp $
--- src.pro.orig	Tue Aug 28 21:01:31 2012
-+++ src.pro	Thu Nov 22 11:37:32 2012
-@@ -138,12 +138,10 @@ DISTFILES += ChangeLog \
- 
- unix:  {
- contains(USE_ASPELL,true){
-exists("/usr/include/aspell.h") { 
-     message ("ASpell enabled")
-     LIBS += -laspell
-     DEFINES += ASPELL_ENABLE
-     DEFINES += SPELLCHECK_ENABLE
-}
- }
- }
- 
--- a/editors/teaqt/pkg/DESCR
+++ b/editors/teaqt/pkg/DESCR
@ -1,3 +1,3 @@
-TEA is a powerful and simple-in-use QT-based text editor with syntax
+TEA is a powerful and simple-in-use Qt-based text editor with syntax
 highlighting.  TEA can also open Openoffice.org Writer and Microsoft
 Word 2007 files.
--- a/editors/teaqt/pkg/PLIST
+++ b/editors/teaqt/pkg/PLIST
@ -1,2 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/04/20 10:29:05 giovanni Exp $
+@comment $OpenBSD: PLIST,v 1.2 2020/02/21 15:32:07 rsadowski Exp $
@bin bin/tea
+share/applications/tea.desktop
+share/icons/hicolor/128x128/apps/tea.png
+share/icons/hicolor/32x32/apps/tea.png
+share/icons/hicolor/48x48/apps/tea.png
+share/icons/hicolor/64x64/apps/tea.png
+share/icons/hicolor/scalable/apps/tea.svg
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor