svn commit: r453001 - in head/x11-toolkits/qtermwidget: . files

[Steve Wills]

Author: swills
Date: Fri Oct 27 15:45:45 2017
New Revision: 453001
URL: https://svnweb.freebsd.org/changeset/ports/453001

Log:
  x11-toolkits/qtermwidget: Update to 0.8.0
  
  While here, set maintainer to maintainer of other lxqt related ports, Jesper
  Schmitz Mouridsen <jesper at schmitz.computer>
  
  PR:		223221
  Submitted by:	Olivier Duchateau <duchateau.olivier at gmail.com>
  Approved by:	Jason Bacon <bacon4000 at gmail.com> (maintainer)

Added:
  head/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt   (contents, props changed)
Deleted:
  head/x11-toolkits/qtermwidget/files/patch-cmake_create__pkgconfig__file.cmake
Modified:
  head/x11-toolkits/qtermwidget/Makefile
  head/x11-toolkits/qtermwidget/distinfo
  head/x11-toolkits/qtermwidget/pkg-plist

Modified: head/x11-toolkits/qtermwidget/Makefile
==============================================================================
--- head/x11-toolkits/qtermwidget/Makefile	Fri Oct 27 15:41:50 2017	(r453000)
+++ head/x11-toolkits/qtermwidget/Makefile	Fri Oct 27 15:45:45 2017	(r453001)
@@ -2,29 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	qtermwidget
-PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTVERSION=	0.8.0
 CATEGORIES=	x11-toolkits
+MASTER_SITES=	LXQT
 
-MAINTAINER=	bacon4000 at gmail.com
+MAINTAINER=	jesper at schmitz.computer
 COMMENT=	Terminal widget for QTerminal
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource compiler:c++11-lang pkgconfig
+USES=	cmake:outsource compiler:c++11-lang gettext-runtime lxqt \
+	pkgconfig tar:xz
 USE_LDCONFIG=	yes
-USE_QT5=	buildtools_build core gui qmake_build widgets
+USE_QT5=	buildtools_build core gui qmake_build linguisttools widgets
+USE_LXQT=	buildtools
 
-CMAKE_ARGS+=	-DBUILD_DESIGNER_PLUGIN:BOOL=OFF -DUSE_QT5:BOOL=ON
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	lxde
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-DHAVE_UTEMPTER
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11-toolkits/qtermwidget/distinfo
==============================================================================
--- head/x11-toolkits/qtermwidget/distinfo	Fri Oct 27 15:41:50 2017	(r453000)
+++ head/x11-toolkits/qtermwidget/distinfo	Fri Oct 27 15:45:45 2017	(r453001)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475432266
-SHA256 (lxde-qtermwidget-0.7.0_GH0.tar.gz) = be389104ff3fd15c99946a6108058bfb0a5a2c7b484c6d13f156f14793d2c985
-SIZE (lxde-qtermwidget-0.7.0_GH0.tar.gz) = 196949
+TIMESTAMP = 1508769806
+SHA256 (lxqt/qtermwidget-0.8.0.tar.xz) = ef01c2a2bedff008578b65efd47b3fff8e542dfcdf9779b547533c9c75825169
+SIZE (lxqt/qtermwidget-0.8.0.tar.xz) = 160904

Added: head/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt	Fri Oct 27 15:45:45 2017	(r453001)
@@ -0,0 +1,33 @@
+--- CMakeLists.txt.orig	2017-10-21 19:01:23 UTC
++++ CMakeLists.txt
+@@ -6,6 +6,7 @@ include(GNUInstallDirs)
+ include(GenerateExportHeader)
+ include(CMakePackageConfigHelpers)
+ include(CheckFunctionExists)
++include(CheckIncludeFile)
+ 
+ set(REQUIRED_QT_VERSION "5.6")
+ set(LXQTBT_MINIMUM_VERSION "0.4.0")
+@@ -112,6 +113,7 @@ message(STATUS "Translations will be ins
+ set(QTERMWIDGET_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${QTERMWIDGET_LIBRARY_NAME}")
+ 
+ CHECK_FUNCTION_EXISTS(updwtmpx HAVE_UPDWTMPX)
++CHECK_INCLUDE_FILE(utempter.h HAVE_UTEMPTER)
+ 
+ qt5_wrap_cpp(MOCS ${HDRS})
+ qt5_wrap_ui(UI_SRCS ${UI})
+@@ -160,6 +162,14 @@ if(HAVE_UPDWTMPX)
+     )
+ endif()
+ 
++if(HAVE_UTEMPTER)
++    target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME}
++        PRIVATE
++            "HAVE_UTEMPTER"
++    )
++    target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} ulog)
++endif()
++
+ if (UTF8PROC_FOUND)
+     target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME}
+         PRIVATE

Modified: head/x11-toolkits/qtermwidget/pkg-plist
==============================================================================
--- head/x11-toolkits/qtermwidget/pkg-plist	Fri Oct 27 15:41:50 2017	(r453000)
+++ head/x11-toolkits/qtermwidget/pkg-plist	Fri Oct 27 15:45:45 2017	(r453001)
@@ -1,14 +1,19 @@
+include/qtermwidget5/Emulation.h
 include/qtermwidget5/Filter.h
 include/qtermwidget5/qtermwidget.h
+include/qtermwidget5/qtermwidget_export.h
 lib/libqtermwidget5.so
 lib/libqtermwidget5.so.0
-lib/libqtermwidget5.so.0.7.0
+lib/libqtermwidget5.so.%%VERSION%%
 libdata/pkgconfig/qtermwidget5.pc
+share/cmake/qtermwidget5/qtermwidget5-config-version.cmake
 share/cmake/qtermwidget5/qtermwidget5-config.cmake
-share/cmake/qtermwidget5/qtermwidget5_use.cmake
+share/cmake/qtermwidget5/qtermwidget5-targets-%%CMAKE_BUILD_TYPE%%.cmake
+share/cmake/qtermwidget5/qtermwidget5-targets.cmake
 %%DATADIR%%5/color-schemes/BlackOnLightYellow.schema
 %%DATADIR%%5/color-schemes/BlackOnRandomLight.colorscheme
 %%DATADIR%%5/color-schemes/BlackOnWhite.schema
+%%DATADIR%%5/color-schemes/BreezeModified.colorscheme
 %%DATADIR%%5/color-schemes/DarkPastels.colorscheme
 %%DATADIR%%5/color-schemes/GreenOnBlack.colorscheme
 %%DATADIR%%5/color-schemes/Linux.colorscheme