diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-08-14 17:24:15 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-08-14 17:24:15 +0000 |
| commit | 0e7d6abf2db55df036eca588dd3a10c8f921e35b (patch) | |
| tree | f71672cddb406ea225bd9b14c971c704f2789c0c /packages/fbreader | |
| parent | 1c431a952e3a9e7b0b10f661606c8e9d58da531d (diff) | |
fbreader: Use Zaurus patches for htcuniversal too, update patch to fix link problem.
Diffstat (limited to 'packages/fbreader')
| -rw-r--r-- | packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch | 2 | ||||
| -rw-r--r-- | packages/fbreader/fbreader_0.8.2a.bb | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch index 858a713125..ecb60a2108 100644 --- a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch +++ b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch @@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles/arch/openzaurus.mk fbreader-0.8.2a/make + 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 diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb index 2419ccf4ae..52d7d86473 100644 --- a/packages/fbreader/fbreader_0.8.2a.bb +++ b/packages/fbreader/fbreader_0.8.2a.bb @@ -4,7 +4,7 @@ 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_spitz = "\ 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_STATUS = "release" 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() { |