From 0a90b8f3dc27aa8428ad88d2546dac40631c3787 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 17 Mar 2018 07:18:06 +0000 Subject: [PATCH] fbreader: fix cross --- srcpkgs/fbreader/patches/cross.patch | 19 +++++++++++++++++++ srcpkgs/fbreader/template | 8 +------- 2 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/fbreader/patches/cross.patch diff --git a/srcpkgs/fbreader/patches/cross.patch b/srcpkgs/fbreader/patches/cross.patch new file mode 100644 index 00000000000..88495f32917 --- /dev/null +++ b/srcpkgs/fbreader/patches/cross.patch @@ -0,0 +1,19 @@ +--- makefiles/arch/desktop.mk.orig 2012-11-30 12:41:25.000000000 +0000 ++++ makefiles/arch/desktop.mk 2018-03-17 06:44:28.961588128 +0000 +@@ -7,13 +7,10 @@ + APPIMAGEDIR = $(INSTALLDIR)/share/pixmaps/%APPLICATION_NAME% + + +-CCACHE = $(shell if which ccache > /dev/null; then echo "ccache"; fi) #if ccache is not installed, do not use it +-CC = $(CCACHE) gcc +-AR = ar rsu +-LD = g++ ++AR := ${AR} rsu ++LD := ${CXX} + +-CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG +-LDFLAGS = ++CFLAGS += -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG + EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) + + ifeq "$(UI_TYPE)" "qt" diff --git a/srcpkgs/fbreader/template b/srcpkgs/fbreader/template index 2835e0429be..4028f6b757b 100644 --- a/srcpkgs/fbreader/template +++ b/srcpkgs/fbreader/template @@ -3,7 +3,7 @@ pkgname=fbreader version=0.99.4 revision=3 build_style=gnu-makefile -hostmakedepends="pkg-config" +hostmakedepends="pkg-config qt-host-tools" makedepends="fribidi-devel bzip2-devel expat-devel libcurl-devel libunibreak-devel sqlite-devel qt-devel zlib-devel" short_desc="An e-book reader" maintainer="Diogo Leal " @@ -17,12 +17,6 @@ if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then CXXFLAGS="-Wno-error=narrowing" fi -post_configure() { - sed -i makefiles/arch/desktop.mk \ - -e"s;^\(CFLAGS.*=.*\);& $CFLAGS;" \ - -e"s;^\(CXXFLAGS.*=.*\);& $CXXFLAGS;" \ - -e"s;^\(LDFLAGS.*=.*\);& $LDFLAGS;" -} do_build() { sed -e "s:-llinebreak:-lunibreak:" -i makefiles/config.mk zlibrary/text/Makefile make -j1 -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy