[oe-commits] org.oe.dev fbreader: Get rid of iconv crap

[florian commit]

fbreader: Get rid of iconv crap

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: cbccca8149b8b90a6880335cea7514ce2a00e81f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cbccca8149b8b90a6880335cea7514ce2a00e81f
Files:
1
packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
packages/fbreader/fbreader_0.8.2a.bb
Diffs:

#
# mt diff -r289a0ae2ef5b937f19a659d56d37d2b368af059b -rcbccca8149b8b90a6880335cea7514ce2a00e81f
#
# 
# 
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
#  from [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
#    to [8b922bc76887bc8127d62d1af083f6868a493c90]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2]
#    to [d21eeca9a1bb496e84541d55957587838aaa33e9]
# 
============================================================
--- packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch	fc88b8e91f46ae81818e65b7ee832fc7b3db915f
+++ packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch	8b922bc76887bc8127d62d1af083f6868a493c90
@@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles
 +	UILIBS = -lqt-mt
  else
 -	UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
-+	UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget -liconv
++	UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
  endif
  
 -CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb	bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2
+++ packages/fbreader/fbreader_0.8.2a.bb	d21eeca9a1bb496e84541d55957587838aaa33e9
@@ -40,8 +40,6 @@ EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' 
 CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr"
 EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
 
-LDFLAGS_append = " -liconv"
-
 inherit pkgconfig
 
 do_configure() {