diff options
| -rw-r--r-- | packages/kf/files/gcc4.patch | 30 | ||||
| -rwxr-xr-x | packages/kf/kf_0.5.4.1.bb | 11 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1.inc | 1 |
3 files changed, 37 insertions, 5 deletions
diff --git a/packages/kf/files/gcc4.patch b/packages/kf/files/gcc4.patch new file mode 100644 index 0000000000..58727ea0e0 --- /dev/null +++ b/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/packages/kf/kf_0.5.4.1.bb b/packages/kf/kf_0.5.4.1.bb index 4cfd685f43..f171bb8b81 100755 --- a/packages/kf/kf_0.5.4.1.bb +++ b/packages/kf/kf_0.5.4.1.bb @@ -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" +export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1.inc b/packages/opie-mediaplayer1/opie-mediaplayer1.inc index 8a13486f5d..7c20be565b 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1.inc +++ b/packages/opie-mediaplayer1/opie-mediaplayer1.inc @@ -2,6 +2,7 @@ DESCRIPTION = "The classic Opie media player" SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" +DEPENDS = "libqtaux2" RDEPENDS = "opie-mediaplayer2-skin-default" RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" |