[oe-commits] org.oe.dev kf: patch to make it buildable with gcc4 - close #1523

[Enodr commit]

kf: patch to make it buildable with gcc4 - close #1523

Author: Enodr
Branch: org.openembedded.dev
Revision: 2b846c98b736c8a2d18ac511f3b833bcb404f408
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2b846c98b736c8a2d18ac511f3b833bcb404f408
Files:
1
packages/kf/files/gcc4.patch
packages/kf/kf_0.5.4.1.bb
Diffs:

#
# mt diff -rb2521ddf7e798d79e5d8d18be1513bf0945cb051 -r2b846c98b736c8a2d18ac511f3b833bcb404f408
#
# 
# 
# add_file "packages/kf/files/gcc4.patch"
#  content [b93842d89b9669fc73db246bcd0d2ee16108f85a]
# 
# patch "packages/kf/kf_0.5.4.1.bb"
#  from [964749e5cfeb0a0b083f07604194777bc005fb5f]
#    to [91ce46340c8199b19403f58a43db90837bb8f2c8]
# 
============================================================
--- packages/kf/files/gcc4.patch	b93842d89b9669fc73db246bcd0d2ee16108f85a
+++ packages/kf/files/gcc4.patch	b93842d89b9669fc73db246bcd0d2ee16108f85a
@@ -0,0 +1,30 @@
+Index: kf-0.5.4.1/src/jispman.c
+===================================================================
+--- kf-0.5.4.1.orig/src/jispman.c	2006-12-03 15:33:47.000000000 +0100
++++ kf-0.5.4.1/src/jispman.c	2006-12-03 15:35:01.000000000 +0100
+@@ -25,12 +25,6 @@
+ #include "emoticons.h"
+ #include "kf.h"
+ 
+-struct _KfJispManager {
+-	GHashTable *jisps;	/** A hash-table of all JISP pachages managed by this object, indexed by their filename */
+-	GList *patterns;	/** A list of patterns */
+-};
+-
+-
+ /**
+  * \brief create a new instance of KfJispManager
+  * \return a new instance of KfJispManager
+Index: kf-0.5.4.1/src/jispman.h
+===================================================================
+--- kf-0.5.4.1.orig/src/jispman.h	2006-12-03 15:33:47.000000000 +0100
++++ kf-0.5.4.1/src/jispman.h	2006-12-03 15:34:37.000000000 +0100
+@@ -25,6 +25,8 @@
+ #include "jisp.h"
+ 
+ typedef struct _KfJispManager {
++        GHashTable *jisps;      /** A hash-table of all JISP pachages managed by this object, indexed by their filename */
++        GList *patterns;        /** A list of patterns */
+ } KfJispManager;
+ 
+ /**
============================================================
--- packages/kf/kf_0.5.4.1.bb	964749e5cfeb0a0b083f07604194777bc005fb5f
+++ packages/kf/kf_0.5.4.1.bb	91ce46340c8199b19403f58a43db90837bb8f2c8
@@ -1,15 +1,16 @@
+DESCRIPTION = "Kf is a GTK+ instant messaging client."
 LICENSE = "GPL"
 DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth"
-DESCRIPTION = "Kf is a GTK+ instant messaging client."
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
-           file://fix-desktop-file.patch;patch=0"
+           file://fix-desktop-file.patch;patch=0 \
+           file://gcc4.patch;patch=1"
 
 inherit autotools pkgconfig
 
-export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
+EXTRA_OECONF = "--disable-binreloc"
 
-EXTRA_OECONF = "--disable-binreloc"
+export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"