app-text/highlight-2.14.3-r100: remove hardcoded -llua from the Qt pr…

…oject Closes: https://bugs.gentoo.org/761511 Signed-off-by: Marek Szuba <[email protected]>
johu · Dec 24, 2020 · d352d70 · d352d70
1 parent 39b1188
commit d352d70
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch b/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch
@@ -0,0 +1,13 @@
+Unnecessary (the linker gets the right library from pkgconfig anyway)
+and breaks slotted Lua. See Bug #761511 for details.
+
+--- a/src/gui-qt/highlight.pro
++++ b/src/gui-qt/highlight.pro
+@@ -39,7 +39,6 @@
+ unix {
+     DESTDIR = ../
+     LIBS += -L.. -lhighlight
+-    LIBS += -llua
+     CONFIG += link_pkgconfig
+     PKGCONFIG += lua
+
diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
@@ -34,6 +34,10 @@ BDEPEND="
 	qt5? ( dev-qt/linguist-tools:5 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
+)
+
 myhlopts=(
 	"CXX=$(tc-getCXX)"
 	"AR=$(tc-getAR)"
@@ -60,8 +64,6 @@ src_prepare() {
 		-e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
 		"${S}"/extras/tcl/makefile \
 		"${S}"/extras/swig/makefile \
-		"${S}"/makefile \
-		"${S}"/src/makefile \
 		|| die "Failed to set Lua implementation"
 
 	# We set it via eqmake5, otherwise it forces clang...