Attachment #193716 for bug #228507

View | Details | Raw Unified | Return to bug 228507
Collapse All | Expand All

Lines 1-7 Link Here

(-)Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= qtermwidget	3	PORTNAME= qtermwidget
4	PORTVERSION= 0.8.0	4	PORTVERSION= 0.9.0
5	CATEGORIES= x11-toolkits	5	CATEGORIES= x11-toolkits
6	MASTER_SITES= LXQT	6	MASTER_SITES= LXQT
7		7
Lines 16-20 Link Here
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17	USE_QT5= buildtools_build core gui qmake_build linguisttools widgets	17	USE_QT5= buildtools_build core gui qmake_build linguisttools widgets
18	USE_LXQT= buildtools	18	USE_LXQT= buildtools
19		19	CMAKE_ARGS+= -DQTERMWIDGET_USE_UTEMPTER=ON
20	.include <bsd.port.mk>	20	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1508769806	1	TIMESTAMP = 1527343100
2	SHA256 (lxqt/qtermwidget-0.8.0.tar.xz) = ef01c2a2bedff008578b65efd47b3fff8e542dfcdf9779b547533c9c75825169	2	SHA256 (lxqt/qtermwidget-0.9.0.tar.xz) = e39ce62fec18112634630654f41f08f4be4638bcf0bebbc89d71c9aefdfa38b0
3	SIZE (lxqt/qtermwidget-0.8.0.tar.xz) = 160904	3	SIZE (lxqt/qtermwidget-0.9.0.tar.xz) = 166976




--- 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

Lines 2-15 Link Here

(-)pkg-plist (-4 / +6 lines)
2	include/qtermwidget5/Filter.h	2	include/qtermwidget5/Filter.h
3	include/qtermwidget5/qtermwidget.h	3	include/qtermwidget5/qtermwidget.h
4	include/qtermwidget5/qtermwidget_export.h	4	include/qtermwidget5/qtermwidget_export.h
		5	lib/cmake/qtermwidget5/qtermwidget5-config-version.cmake
		6	lib/cmake/qtermwidget5/qtermwidget5-config.cmake
		7	lib/cmake/qtermwidget5/qtermwidget5-targets-%%CMAKE_BUILD_TYPE%%.cmake
		8	lib/cmake/qtermwidget5/qtermwidget5-targets.cmake
5	lib/libqtermwidget5.so	9	lib/libqtermwidget5.so
6	lib/libqtermwidget5.so.0	10	lib/libqtermwidget5.so.0
7	lib/libqtermwidget5.so.%%VERSION%%	11	lib/libqtermwidget5.so.%%VERSION%%
8	libdata/pkgconfig/qtermwidget5.pc	12	libdata/pkgconfig/qtermwidget5.pc
9	share/cmake/qtermwidget5/qtermwidget5-config-version.cmake
10	share/cmake/qtermwidget5/qtermwidget5-config.cmake
11	share/cmake/qtermwidget5/qtermwidget5-targets-%%CMAKE_BUILD_TYPE%%.cmake
12	share/cmake/qtermwidget5/qtermwidget5-targets.cmake
13	%%DATADIR%%5/color-schemes/BlackOnLightYellow.schema	13	%%DATADIR%%5/color-schemes/BlackOnLightYellow.schema
14	%%DATADIR%%5/color-schemes/BlackOnRandomLight.colorscheme	14	%%DATADIR%%5/color-schemes/BlackOnRandomLight.colorscheme
15	%%DATADIR%%5/color-schemes/BlackOnWhite.schema	15	%%DATADIR%%5/color-schemes/BlackOnWhite.schema
Lines 19-24 Link Here
19	%%DATADIR%%5/color-schemes/Linux.colorscheme	19	%%DATADIR%%5/color-schemes/Linux.colorscheme
20	%%DATADIR%%5/color-schemes/Solarized.colorscheme	20	%%DATADIR%%5/color-schemes/Solarized.colorscheme
21	%%DATADIR%%5/color-schemes/SolarizedLight.colorscheme	21	%%DATADIR%%5/color-schemes/SolarizedLight.colorscheme
		22	%%DATADIR%%5/color-schemes/Tango.colorscheme
		23	%%DATADIR%%5/color-schemes/Ubuntu.colorscheme
22	%%DATADIR%%5/color-schemes/WhiteOnBlack.schema	24	%%DATADIR%%5/color-schemes/WhiteOnBlack.schema
23	%%DATADIR%%5/color-schemes/historic/BlackOnLightColor.schema	25	%%DATADIR%%5/color-schemes/historic/BlackOnLightColor.schema
24	%%DATADIR%%5/color-schemes/historic/DarkPicture.schema	26	%%DATADIR%%5/color-schemes/historic/DarkPicture.schema

Return to bug 228507

Lines 1-33 Link Here

(-)files/patch-CMakeLists.txt (-33 lines)
1	--- CMakeLists.txt.orig 2017-10-21 19:01:23 UTC
2	+++ CMakeLists.txt
3	@@ -6,6 +6,7 @@ include(GNUInstallDirs)
4	include(GenerateExportHeader)
5	include(CMakePackageConfigHelpers)
6	include(CheckFunctionExists)
7	+include(CheckIncludeFile)
8
9	set(REQUIRED_QT_VERSION "5.6")
10	set(LXQTBT_MINIMUM_VERSION "0.4.0")
11	@@ -112,6 +113,7 @@ message(STATUS "Translations will be ins
12	set(QTERMWIDGET_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${QTERMWIDGET_LIBRARY_NAME}")
13
14	CHECK_FUNCTION_EXISTS(updwtmpx HAVE_UPDWTMPX)
15	+CHECK_INCLUDE_FILE(utempter.h HAVE_UTEMPTER)
16
17	qt5_wrap_cpp(MOCS ${HDRS})
18	qt5_wrap_ui(UI_SRCS ${UI})
19	@@ -160,6 +162,14 @@ if(HAVE_UPDWTMPX)
20	)
21	endif()
22
23	+if(HAVE_UTEMPTER)
24	+ target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME}
25	+ PRIVATE
26	+ "HAVE_UTEMPTER"
27	+ )
28	+ target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} ulog)
29	+endif()
30	+
31	if (UTF8PROC_FOUND)
32	target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME}
33	PRIVATE