From 7afb6b519fedb7767a4aac3341159ed0ef7f3821 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Fri, 22 Jun 2018 19:41:56 +0000 Subject: [PATCH] x11-toolkits/qtermwidget: Update to 0.9.0 PR: 228507 Submitted by: Jesper Schmitz Mouridsen (maintainer) --- x11-toolkits/qtermwidget/Makefile | 4 +-- x11-toolkits/qtermwidget/distinfo | 6 ++-- .../qtermwidget/files/patch-CMakeLists.txt | 33 ------------------- x11-toolkits/qtermwidget/pkg-plist | 10 +++--- 4 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 x11-toolkits/qtermwidget/files/patch-CMakeLists.txt diff --git a/x11-toolkits/qtermwidget/Makefile b/x11-toolkits/qtermwidget/Makefile index 4a08113ca4f5..16a2bae9a229 100644 --- a/x11-toolkits/qtermwidget/Makefile +++ b/x11-toolkits/qtermwidget/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qtermwidget -PORTVERSION= 0.8.0 +PORTVERSION= 0.9.0 CATEGORIES= x11-toolkits MASTER_SITES= LXQT @@ -20,5 +20,5 @@ USES= cmake:outsource compiler:c++11-lang gettext-runtime lxqt \ USE_LDCONFIG= yes USE_QT5= buildtools_build core gui qmake_build linguisttools widgets USE_LXQT= buildtools - +CMAKE_ARGS+= -DQTERMWIDGET_USE_UTEMPTER=ON .include diff --git a/x11-toolkits/qtermwidget/distinfo b/x11-toolkits/qtermwidget/distinfo index eada5d6cfc26..5a2de5185e04 100644 --- a/x11-toolkits/qtermwidget/distinfo +++ b/x11-toolkits/qtermwidget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508769806 -SHA256 (lxqt/qtermwidget-0.8.0.tar.xz) = ef01c2a2bedff008578b65efd47b3fff8e542dfcdf9779b547533c9c75825169 -SIZE (lxqt/qtermwidget-0.8.0.tar.xz) = 160904 +TIMESTAMP = 1527343100 +SHA256 (lxqt/qtermwidget-0.9.0.tar.xz) = e39ce62fec18112634630654f41f08f4be4638bcf0bebbc89d71c9aefdfa38b0 +SIZE (lxqt/qtermwidget-0.9.0.tar.xz) = 166976 diff --git a/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt b/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt deleted file mode 100644 index 660f0184d68b..000000000000 --- a/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 diff --git a/x11-toolkits/qtermwidget/pkg-plist b/x11-toolkits/qtermwidget/pkg-plist index 02e7e9332016..850f222ae74c 100644 --- a/x11-toolkits/qtermwidget/pkg-plist +++ b/x11-toolkits/qtermwidget/pkg-plist @@ -2,14 +2,14 @@ include/qtermwidget5/Emulation.h include/qtermwidget5/Filter.h include/qtermwidget5/qtermwidget.h include/qtermwidget5/qtermwidget_export.h +lib/cmake/qtermwidget5/qtermwidget5-config-version.cmake +lib/cmake/qtermwidget5/qtermwidget5-config.cmake +lib/cmake/qtermwidget5/qtermwidget5-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/qtermwidget5/qtermwidget5-targets.cmake lib/libqtermwidget5.so lib/libqtermwidget5.so.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-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 @@ -19,6 +19,8 @@ share/cmake/qtermwidget5/qtermwidget5-targets.cmake %%DATADIR%%5/color-schemes/Linux.colorscheme %%DATADIR%%5/color-schemes/Solarized.colorscheme %%DATADIR%%5/color-schemes/SolarizedLight.colorscheme +%%DATADIR%%5/color-schemes/Tango.colorscheme +%%DATADIR%%5/color-schemes/Ubuntu.colorscheme %%DATADIR%%5/color-schemes/WhiteOnBlack.schema %%DATADIR%%5/color-schemes/historic/BlackOnLightColor.schema %%DATADIR%%5/color-schemes/historic/DarkPicture.schema