summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-12-14 12:05:29 +0000
committerRichard Purdie <richard@openedhand.com>2006-12-14 12:05:29 +0000
commit9ee3d34189e9cde88e8b060d23313c00749c9885 (patch)
treec324b076e753fb6a3d1191746fb37a71fa357088 /meta
parentda317b2442e90e1152bb521bead18f0a5eee803e (diff)
downloadpoky-9ee3d34189e9cde88e8b060d23313c00749c9885.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/kf/files/gcc4.patch30
-rwxr-xr-xmeta/packages/kf/kf_0.5.4.1.bb13
2 files changed, 37 insertions, 6 deletions
diff --git a/meta/packages/kf/files/gcc4.patch b/meta/packages/kf/files/gcc4.patch
new file mode 100644
index 0000000000..58727ea0e0
--- /dev/null
+++ b/meta/packages/kf/files/gcc4.patch
@@ -0,0 +1,30 @@
1Index: kf-0.5.4.1/src/jispman.c
2===================================================================
3--- kf-0.5.4.1.orig/src/jispman.c 2006-12-03 15:33:47.000000000 +0100
4+++ kf-0.5.4.1/src/jispman.c 2006-12-03 15:35:01.000000000 +0100
5@@ -25,12 +25,6 @@
6 #include "emoticons.h"
7 #include "kf.h"
8
9-struct _KfJispManager {
10- GHashTable *jisps; /** A hash-table of all JISP pachages managed by this object, indexed by their filename */
11- GList *patterns; /** A list of patterns */
12-};
13-
14-
15 /**
16 * \brief create a new instance of KfJispManager
17 * \return a new instance of KfJispManager
18Index: kf-0.5.4.1/src/jispman.h
19===================================================================
20--- kf-0.5.4.1.orig/src/jispman.h 2006-12-03 15:33:47.000000000 +0100
21+++ kf-0.5.4.1/src/jispman.h 2006-12-03 15:34:37.000000000 +0100
22@@ -25,6 +25,8 @@
23 #include "jisp.h"
24
25 typedef struct _KfJispManager {
26+ GHashTable *jisps; /** A hash-table of all JISP pachages managed by this object, indexed by their filename */
27+ GList *patterns; /** A list of patterns */
28 } KfJispManager;
29
30 /**
diff --git a/meta/packages/kf/kf_0.5.4.1.bb b/meta/packages/kf/kf_0.5.4.1.bb
index cd4feffa6d..f171bb8b81 100755
--- a/meta/packages/kf/kf_0.5.4.1.bb
+++ b/meta/packages/kf/kf_0.5.4.1.bb
@@ -1,15 +1,16 @@
1LICENSE = "GPL"
2DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth libglade"
3DESCRIPTION = "Kf is a GTK+ instant messaging client." 1DESCRIPTION = "Kf is a GTK+ instant messaging client."
4PR = "r2" 2LICENSE = "GPL"
3DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth"
4PR = "r3"
5 5
6SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \ 6SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
7 file://fix-configure.patch;patch=1 \ 7 file://fix-configure.patch;patch=1 \
8 file://fix-desktop-file.patch;patch=0" 8 file://fix-desktop-file.patch;patch=0 \
9 file://gcc4.patch;patch=1"
9 10
10inherit autotools pkgconfig 11inherit autotools pkgconfig
11 12
12export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
13
14EXTRA_OECONF = "--disable-binreloc" 13EXTRA_OECONF = "--disable-binreloc"
15 14
15export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
16