rev 20979 - kde-extras/kchmviewer/trunk/debian/patches

[Andrey Rahmatullin]

Author: wrar
Date: 2018-01-07 17:41:01 +0000 (Sun, 07 Jan 2018)
New Revision: 20979

Added:
   kde-extras/kchmviewer/trunk/debian/patches/fix_lib_order.patch
Modified:
   kde-extras/kchmviewer/trunk/debian/patches/series
Log:
Fix --as-needed builds.



Added: kde-extras/kchmviewer/trunk/debian/patches/fix_lib_order.patch
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/fix_lib_order.patch	                        (rev 0)
+++ kde-extras/kchmviewer/trunk/debian/patches/fix_lib_order.patch	2018-01-07 17:41:01 UTC (rev 20979)
@@ -0,0 +1,38 @@
+Description: Link libebook.a before its deps.
+ This fixes --as-needed builds.
+Author: Andrey Rahmatullin <wrar at debian.org>
+Last-Update: 2018-01-07
+
+diff -up kchmviewer-7.7/src/src.pro.orig kchmviewer-7.7/src/src.pro
+--- kchmviewer-7.7/src/src.pro.orig	2018-01-07 21:56:29.426952743 +0500
++++ kchmviewer-7.7/src/src.pro	2018-01-07 21:57:05.154453185 +0500
+@@ -40,7 +40,6 @@ SOURCES += config.cpp \
+     textencodings.cpp \
+     treeitem_toc.cpp \
+     treeitem_index.cpp
+-LIBS += -lchm -lzip
+ TARGET = ../bin/kchmviewer
+ CONFIG += threads \
+     warn_on \
+@@ -67,9 +66,6 @@ QT += webkit \
+     webkitwidgets \
+     printsupport
+ 
+-linux-g++*:{
+-    LIBS += -lX11
+-}
+ 
+ # This is used by cross-build on 64-bit when building a 32-bit version
+ linux-g++-32: {
+@@ -112,6 +108,11 @@ unix:!macx: {
+     POST_TARGETDEPS += ../lib/libebook/libebook.a
+ }
+ 
++LIBS += -lchm -lzip
++linux-g++*:{
++    LIBS += -lX11
++}
++
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     # Qt 5
+         QT += webkit webkitwidgets

Modified: kde-extras/kchmviewer/trunk/debian/patches/series
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/series	2018-01-07 16:55:40 UTC (rev 20978)
+++ kde-extras/kchmviewer/trunk/debian/patches/series	2018-01-07 17:41:01 UTC (rev 20979)
@@ -1,2 +1,3 @@
 disable_check_new_version.patch
 force_qtwebkit.diff
+fix_lib_order.patch