kf: Make it work with gcc4, sync with OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1034 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2006-12-14 12:05:29 +00:00
parent da317b2442
commit 9ee3d34189
2 changed files with 37 additions and 6 deletions

View File

@@ -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;
/**

View File

@@ -1,15 +1,16 @@
LICENSE = "GPL"
DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth libglade"
DESCRIPTION = "Kf is a GTK+ instant messaging client."
PR = "r2"
LICENSE = "GPL"
DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth"
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"
export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"