From e1abf539afcc870a7ccc1aaa2805771ab08ce472 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Oct 2010 10:36:54 -0700
Subject: free42-vga_1.4.41.bb: Fix compilation issues.

It was not having glib-2.0 paths correct and BCD_MATH was not passed
into makefile

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/free42/files/free42-bcd-gtk-only.patch | 26 ++++++++------------------
 recipes/free42/free42-vga_1.4.41.bb            | 19 ++++++++++---------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/recipes/free42/files/free42-bcd-gtk-only.patch b/recipes/free42/files/free42-bcd-gtk-only.patch
index 571785f36f..3288ce9ba4 100644
--- a/recipes/free42/files/free42-bcd-gtk-only.patch
+++ b/recipes/free42/files/free42-bcd-gtk-only.patch
@@ -1,27 +1,17 @@
---- free42-orig/gtk/Makefile	2007-01-06 09:37:55.000000000 -0800
-+++ free42gtk/gtk/Makefile	2007-09-02 23:54:34.000000000 -0700
-@@ -35,20 +35,14 @@
- 	core_math2.o core_phloat.o core_sto_rcl.o core_tables.o \
- 	core_variables.o
- 
--ifdef BCD_MATH
- CXXFLAGS += -DBCD_MATH
- SRCS += bcdfloat.cc bcd.cc bcdmath.cc
- OBJS += bcdfloat.o bcd.o bcdmath.o
- EXE = free42dec
--else
--EXE = free42bin
--endif
- 
- $(EXE): $(OBJS)
- 	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
+Index: free42/gtk/Makefile
+===================================================================
+--- free42.orig/gtk/Makefile
++++ free42/gtk/Makefile
+@@ -57,8 +57,6 @@ ifdef OLPC
+ 	rm -rf Free42.activity
+ endif
  
 -$(SRCS): symlinks
 -
  .cc.o:
  	$(CXX) $(CXXFLAGS) -c -o $@ $<
  
-@@ -64,74 +58,18 @@
+@@ -74,74 +72,18 @@ keymap2cc: keymap2cc.cc
  keymap.cc: keymap2cc keymap.txt
  	./keymap2cc
  
diff --git a/recipes/free42/free42-vga_1.4.41.bb b/recipes/free42/free42-vga_1.4.41.bb
index 1d4ab8fec8..cb39ccb51f 100644
--- a/recipes/free42/free42-vga_1.4.41.bb
+++ b/recipes/free42/free42-vga_1.4.41.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Free42 RPN Calculator"
 HOMEPAGE = "http://free42.sf.net"
 SECTION = "openmoko/applications"
 DEPENDS = "gtk+"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/free42/free42.tgz;name=archive \
            http://sense.net/zc/free42/42c_skins.tgz;name=skins \
@@ -14,13 +14,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/free42/free42.tgz;name=archive \
 S = "${WORKDIR}/free42"
 
 TARGET_CXXFLAGS_append = " -fsigned-char"
-TARGET_CXXFLAGS_append += "-DVERSION=\\"${PV}\\" -DBCD_MATH"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/gtk-2.0"
-TARGET_CXXFLAGS_append += "-I${STAGING_LIBDIR}/gtk-2.0/include"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/cairo"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/glib-2.0"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/pango-1.0"
-TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/atk-1.0"
+TARGET_CXXFLAGS_append = " -DVERSION=\\"${PV}\\" -DBCD_MATH"
+TARGET_CXXFLAGS_append = " -I${STAGING_INCDIR}/gtk-2.0"
+TARGET_CXXFLAGS_append = " -I${STAGING_LIBDIR}/gtk-2.0/include"
+TARGET_CXXFLAGS_append = " -I${STAGING_INCDIR}/cairo"
+TARGET_CXXFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0"
+TARGET_CXXFLAGS_append = " -I${STAGING_LIBDIR}/glib-2.0/include"
+TARGET_CXXFLAGS_append = " -I${STAGING_INCDIR}/pango-1.0"
+TARGET_CXXFLAGS_append = " -I${STAGING_INCDIR}/atk-1.0"
 
 do_compile() {
         cp -fv ${S}/common/* ${S}/gtk
@@ -29,7 +30,7 @@ do_compile() {
         cd ${S}/gtk/
         ${BUILD_CXX} -o skin2cc skin2cc.cc ${BUILD_CXXFLAGS}
         ${BUILD_CXX} -o keymap2cc keymap2cc.cc ${BUILD_CXXFLAGS}
-        oe_runmake
+        oe_runmake -e BCD_MATH=1
 }
 
 do_install() {
-- 
cgit 1.2.3-korg