[oe-commits] org.oe.dev fbreader: Use Zaurus patches for htcuniversal too, update patch to fix link problem.

[florian commit]

fbreader: Use Zaurus patches for htcuniversal too, update patch to fix link problem.

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: ab50357e49cac0db516d16c090278324f3999d80
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ab50357e49cac0db516d16c090278324f3999d80
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 -r2c9ccae78bdcde603c424453ee6e1c6df64a225b -rab50357e49cac0db516d16c090278324f3999d80
#
# 
# 
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
#  from [8b922bc76887bc8127d62d1af083f6868a493c90]
#    to [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [ecb0b59a9f10624f83793fcfa9429e2f50131a9f]
#    to [ffa657fea62b85620be6838f5166e8c9d3be06ee]
# 
============================================================
--- packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch	8b922bc76887bc8127d62d1af083f6868a493c90
+++ packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch	fc88b8e91f46ae81818e65b7ee832fc7b3db915f
@@ -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
++	UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget -liconv
  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	ecb0b59a9f10624f83793fcfa9429e2f50131a9f
+++ packages/fbreader/fbreader_0.8.2a.bb	ffa657fea62b85620be6838f5166e8c9d3be06ee
@@ -1,10 +1,10 @@ DEPENDS = "gtk+ enca expat bzip2 libgpew
 DESCRIPTION = "FBreader is an ebook reader"
 LICENSE = "GPL2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
-PR = "r4"
+PR = "r5"
 
 # The RESOLUTION is defined at compile time which makes
 # this package MACHINE specific.
@@ -20,6 +20,9 @@ SRC_URI_append_akita = "\
 SRC_URI_append_akita = "\
 		  file://zaurus-VGA.patch;patch=1"
 
+SRC_URI_append_htcuniversal = "\
+		  file://zaurus-VGA.patch;patch=1"
+
 # Set the defaults
 READER_RESOLUTION = "240x320"
 READER_ARCH	  = "openzaurus"
@@ -30,12 +33,15 @@ READER_RESOLUTION_akita = "640x480"
 READER_RESOLUTION_fic-gta01 = "480x640"
 READER_RESOLUTION_spitz = "640x480"
 READER_RESOLUTION_akita = "640x480"
+READER_RESOLUTION_htcuniversal = "640x480"
 
 FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
 
 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() {