diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-sato/kf | |
parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
download | openembedded-core-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz openembedded-core-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.bz2 openembedded-core-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.zip |
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.
A number of recipes were modified since dependencies need to be
corrected.
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-sato/kf')
-rw-r--r-- | meta/recipes-sato/kf/files/fix-configure.patch | 25 | ||||
-rw-r--r-- | meta/recipes-sato/kf/files/fix-desktop-file.patch | 20 | ||||
-rw-r--r-- | meta/recipes-sato/kf/files/gcc4.patch | 30 | ||||
-rw-r--r-- | meta/recipes-sato/kf/kf_0.5.4.1.bb | 16 |
4 files changed, 0 insertions, 91 deletions
diff --git a/meta/recipes-sato/kf/files/fix-configure.patch b/meta/recipes-sato/kf/files/fix-configure.patch deleted file mode 100644 index fc1ad9a418..0000000000 --- a/meta/recipes-sato/kf/files/fix-configure.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in ---- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in 2005-04-27 19:42:49.000000000 +0100 -+++ kf-0.5.4.1/configure.in 2005-09-29 14:12:32.000000000 +0100 -@@ -27,7 +27,7 @@ - dnl AC_ARG_ENABLE(debug,) - - dnl modules needed for package --MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16" -+MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16 libxml-2.0" - dnl MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.15.1" - - dnl GtkSpell -@@ -60,9 +60,9 @@ - AC_DEFINE([HAVE_LM_CONNECTION_SET_JID],1,[We have lm_connection_set_jid]) - fi - --dnl XScreenSaver stuff... --AC_DEFINE([HAVE_XSCREENSAVER], [1], [Whether to support XScreenSaver extension]) --PACKAGE_LIBS="$PACKAGE_LIBS -lXss -L/usr/X11R6/lib" -+#dnl XScreenSaver stuff... -+#AC_DEFINE([HAVE_XSCREENSAVER], [1], [Whether to support XScreenSaver extension]) -+#PACKAGE_LIBS="$PACKAGE_LIBS -lXss -L/usr/X11R6/lib" - - AC_SUBST(PACKAGE_CFLAGS) - AC_SUBST(PACKAGE_LIBS) diff --git a/meta/recipes-sato/kf/files/fix-desktop-file.patch b/meta/recipes-sato/kf/files/fix-desktop-file.patch deleted file mode 100644 index 7a0f7d1bca..0000000000 --- a/meta/recipes-sato/kf/files/fix-desktop-file.patch +++ /dev/null @@ -1,20 +0,0 @@ -Common subdirectories: kf-0.5.4.1.orig/data and kf-0.5.4.1/data -diff -u kf-0.5.4.1.orig/kf.desktop kf-0.5.4.1/kf.desktop ---- kf-0.5.4.1.orig/kf.desktop 2005-04-19 22:08:44.000000000 +0100 -+++ kf-0.5.4.1/kf.desktop 2005-10-03 14:36:47.000000000 +0100 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 --Name=kf jabber client -+Name=Instant Messenger - Name[pl]=kf klient sieci jabber - Name[lt]=Pokalbių programa kf - GenericName=Instant Messenger -@@ -11,5 +11,6 @@ - Icon=kf.png - Terminal=false - Type=Application --Categories=GTK;Application;Network; -+Categories=GTK;PIM;Application;Network; - StartupNotify=true -+X-MB-SingleInstance=true diff --git a/meta/recipes-sato/kf/files/gcc4.patch b/meta/recipes-sato/kf/files/gcc4.patch deleted file mode 100644 index 58727ea0e0..0000000000 --- a/meta/recipes-sato/kf/files/gcc4.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/recipes-sato/kf/kf_0.5.4.1.bb b/meta/recipes-sato/kf/kf_0.5.4.1.bb deleted file mode 100644 index 2baa6d46f7..0000000000 --- a/meta/recipes-sato/kf/kf_0.5.4.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Kf is a GTK+ instant messaging client." -LICENSE = "GPL" -DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth libglade" -PR = "r4" - -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://gcc4.patch;patch=1" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-binreloc" - -export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" - |