From 65cbf0f0ec0d8a08388c6ecd29c7d9828fdfa313 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Fri, 27 Oct 2017 15:45:45 +0000 Subject: [PATCH] x11-toolkits/qtermwidget: Update to 0.8.0 While here, set maintainer to maintainer of other lxqt related ports, Jesper Schmitz Mouridsen PR: 223221 Submitted by: Olivier Duchateau Approved by: Jason Bacon (maintainer) --- x11-toolkits/qtermwidget/Makefile | 25 +++++--------- x11-toolkits/qtermwidget/distinfo | 6 ++-- .../qtermwidget/files/patch-CMakeLists.txt | 33 +++++++++++++++++++ .../patch-cmake_create__pkgconfig__file.cmake | 10 ------ x11-toolkits/qtermwidget/pkg-plist | 9 +++-- 5 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 x11-toolkits/qtermwidget/files/patch-CMakeLists.txt delete mode 100644 x11-toolkits/qtermwidget/files/patch-cmake_create__pkgconfig__file.cmake diff --git a/x11-toolkits/qtermwidget/Makefile b/x11-toolkits/qtermwidget/Makefile index 62fc482bc514..ba7a161bf939 100644 --- a/x11-toolkits/qtermwidget/Makefile +++ b/x11-toolkits/qtermwidget/Makefile @@ -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@gmail.com +MAINTAINER= jesper@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 - -.if ${OPSYS} == FreeBSD -CFLAGS+= -DHAVE_UTEMPTER -.endif - -.include +.include diff --git a/x11-toolkits/qtermwidget/distinfo b/x11-toolkits/qtermwidget/distinfo index eb0747a868d1..eada5d6cfc26 100644 --- a/x11-toolkits/qtermwidget/distinfo +++ b/x11-toolkits/qtermwidget/distinfo @@ -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 diff --git a/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt b/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..660f0184d68b --- /dev/null +++ b/x11-toolkits/qtermwidget/files/patch-CMakeLists.txt @@ -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 diff --git a/x11-toolkits/qtermwidget/files/patch-cmake_create__pkgconfig__file.cmake b/x11-toolkits/qtermwidget/files/patch-cmake_create__pkgconfig__file.cmake deleted file mode 100644 index 2a478ea2d530..000000000000 --- a/x11-toolkits/qtermwidget/files/patch-cmake_create__pkgconfig__file.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake/create_pkgconfig_file.cmake.orig 2014-10-21 15:47:40 UTC -+++ cmake/create_pkgconfig_file.cmake -@@ -25,5 +25,6 @@ macro (create_pkgconfig_file name desc r - "\n" - ) - -- install(FILES ${_pkgfname} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+ # Use libdata rather than CMAKE_INSTALL_LIBDIR for pkgconfig on FreeBSD -+ install(FILES ${_pkgfname} DESTINATION libdata/pkgconfig) - endmacro() diff --git a/x11-toolkits/qtermwidget/pkg-plist b/x11-toolkits/qtermwidget/pkg-plist index c135cd06a410..02e7e9332016 100644 --- a/x11-toolkits/qtermwidget/pkg-plist +++ b/x11-toolkits/qtermwidget/pkg-plist @@ -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