From 524bfb91d3998dd0ae6c221aa306ec9299319f01 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 27 Jul 2018 00:40:53 -0500
Subject: user/qtermwidget: modernise, use libutempter instead of utmp

---
 user/qtermwidget/APKBUILD          | 26 ++++++++++++++------------
 user/qtermwidget/fix-linking.patch | 11 +++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 user/qtermwidget/fix-linking.patch

(limited to 'user/qtermwidget')

diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD
index 8539c6254..b315cefc4 100644
--- a/user/qtermwidget/APKBUILD
+++ b/user/qtermwidget/APKBUILD
@@ -2,20 +2,20 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=qtermwidget
 pkgver=0.9.0
-pkgrel=0
-pkgdesc="A Qt-based terminal widget, used in QTerminal"
-url="http://lxqt.org"
+pkgrel=1
+pkgdesc="Qt-based terminal widget, used in QTerminal"
+url="https://lxqt.org/"
 arch="all"
+options="!check"  # No test suite.
 license="GPL-2.0+"
 depends=""
-depends_dev=""
-makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev lxqt-build-tools>0.5.0 $depends_dev"
-install=""
+depends_dev="libutempter-dev"
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev
+	lxqt-build-tools>0.5.0 $depends_dev"
 subpackages="$pkgname-dev"
-source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidget-$pkgver.tar.xz"
-builddir="$srcdir/qtermwidget-$pkgver"
-# no tests
-options="!check"
+source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidget-$pkgver.tar.xz
+	fix-linking.patch
+	"
 
 build() {
 	cd "$builddir"
@@ -27,10 +27,11 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DPULL_TRANSLATIONS=False \
+		-DQTERMWIDGET_USE_UTEMPTER=True \
 		${CMAKE_CROSSOPTS} ..
 	make
 }
@@ -45,4 +46,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc  qtermwidget-0.9.0.tar.xz"
+sha512sums="fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc  qtermwidget-0.9.0.tar.xz
+f2d43f12479a3a3a01be9ebee9ce349b0f4e60b07dfc79e8666ed913d5682987f81b08a397ee8ca628c36f5770ddfe63f5abafa94dff6c1c1e090adc1637af35  fix-linking.patch"
diff --git a/user/qtermwidget/fix-linking.patch b/user/qtermwidget/fix-linking.patch
new file mode 100644
index 000000000..d084fd6f8
--- /dev/null
+++ b/user/qtermwidget/fix-linking.patch
@@ -0,0 +1,11 @@
+--- qtermwidget-0.9.0/CMakeLists.txt.old	2018-05-21 17:44:20.000000000 +0000
++++ qtermwidget-0.9.0/CMakeLists.txt	2018-07-27 05:39:37.390000000 +0000
+@@ -172,7 +172,7 @@
+         target_compile_definitions(${QTERMWIDGET_LIBRARY_NAME} PRIVATE
+                 "HAVE_UTEMPTER"
+         )
+-        target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} ulog)
++        target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} utempter)
+     endif()
+ endif()
+ 
-- 
cgit v1.2.3-70-g09d2