From 23f1f6f93256304eab76cd199408b71a649d82a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 1 May 2018 12:52:20 +0200 Subject: Fix FTBFS with ICU >= 58 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- kxsldbg/Makefile.am | 1 + kxsldbg/kxsldbgpart/Makefile.am | 2 +- kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am | 1 + kxsldbg/kxsldbgpart/libxsldbg/Makefile.am | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) (limited to 'kxsldbg') diff --git a/kxsldbg/Makefile.am b/kxsldbg/Makefile.am index cd95e4ef..2be49866 100644 --- a/kxsldbg/Makefile.am +++ b/kxsldbg/Makefile.am @@ -51,6 +51,7 @@ xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TD # set the include path for X, qt and KDE INCLUDES= $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes) +CXXFLAGS += $(ICU_CXXFLAGS) METASOURCES = AUTO diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am index 49df715a..b38d50f6 100644 --- a/kxsldbg/kxsldbgpart/Makefile.am +++ b/kxsldbg/kxsldbgpart/Makefile.am @@ -13,7 +13,7 @@ libkxsldbgpart_la_SOURCES = dummy.cpp SUBDIRS = libqtnotfier libxsldbg INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes) - +CXXFLAGS += $(ICU_CXXFLAGS) libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP libkxsldbgpart_la_LIBADD = libkxsldbgcommon.la $(LIB_TDEPARTS) diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am b/kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am index 82902c19..e55eb875 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am +++ b/kxsldbg/kxsldbgpart/libqtnotfier/Makefile.am @@ -6,3 +6,4 @@ libqtnotfier_la_METASOURCES = AUTO libqtnotfier_la_SOURCES = xsldbgthread.cpp xsldbgnotifier.cpp xsldbgevent.cpp xsldbgdebuggerbase.cpp qtnotifier2.cpp INCLUDES = $(XSLDBG_CFLAGS) $(all_includes) +CXXFLAGS += $(ICU_CXXFLAGS) diff --git a/kxsldbg/kxsldbgpart/libxsldbg/Makefile.am b/kxsldbg/kxsldbgpart/libxsldbg/Makefile.am index aaea2e53..330df2f7 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/Makefile.am +++ b/kxsldbg/kxsldbgpart/libxsldbg/Makefile.am @@ -8,5 +8,6 @@ libxsldbg_la_LIBADD = $(LIBXSLT_LIBS) libxsldbg_la_LDFLAGS = $(all_libraries) AM_CPPFLAGS = -DDOCS_PATH=\"$(DOCS_PATH)\" -I.. $(LIBXSLT_CFLAGS) $(all_includes) +CXXFLAGS += $(ICU_CXXFLAGS) KDE_OPTIONS= nofinal -- cgit v1.2.3