diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-12-14 12:05:29 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-12-14 12:05:29 +0000 |
| commit | 9ee3d34189e9cde88e8b060d23313c00749c9885 (patch) | |
| tree | c324b076e753fb6a3d1191746fb37a71fa357088 /meta | |
| parent | da317b2442e90e1152bb521bead18f0a5eee803e (diff) | |
| download | openembedded-core-9ee3d34189e9cde88e8b060d23313c00749c9885.tar.gz openembedded-core-9ee3d34189e9cde88e8b060d23313c00749c9885.tar.bz2 openembedded-core-9ee3d34189e9cde88e8b060d23313c00749c9885.zip | |
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.patch | 30 | ||||
| -rwxr-xr-x | meta/packages/kf/kf_0.5.4.1.bb | 13 |
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 @@ +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; + + /** 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 @@ -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" + |