diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-sato/kf | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.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, 91 insertions, 0 deletions
diff --git a/meta/recipes-sato/kf/files/fix-configure.patch b/meta/recipes-sato/kf/files/fix-configure.patch new file mode 100644 index 0000000000..fc1ad9a418 --- /dev/null +++ b/meta/recipes-sato/kf/files/fix-configure.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in | ||
2 | --- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in 2005-04-27 19:42:49.000000000 +0100 | ||
3 | +++ kf-0.5.4.1/configure.in 2005-09-29 14:12:32.000000000 +0100 | ||
4 | @@ -27,7 +27,7 @@ | ||
5 | dnl AC_ARG_ENABLE(debug,) | ||
6 | |||
7 | dnl modules needed for package | ||
8 | -MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16" | ||
9 | +MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16 libxml-2.0" | ||
10 | dnl MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.15.1" | ||
11 | |||
12 | dnl GtkSpell | ||
13 | @@ -60,9 +60,9 @@ | ||
14 | AC_DEFINE([HAVE_LM_CONNECTION_SET_JID],1,[We have lm_connection_set_jid]) | ||
15 | fi | ||
16 | |||
17 | -dnl XScreenSaver stuff... | ||
18 | -AC_DEFINE([HAVE_XSCREENSAVER], [1], [Whether to support XScreenSaver extension]) | ||
19 | -PACKAGE_LIBS="$PACKAGE_LIBS -lXss -L/usr/X11R6/lib" | ||
20 | +#dnl XScreenSaver stuff... | ||
21 | +#AC_DEFINE([HAVE_XSCREENSAVER], [1], [Whether to support XScreenSaver extension]) | ||
22 | +#PACKAGE_LIBS="$PACKAGE_LIBS -lXss -L/usr/X11R6/lib" | ||
23 | |||
24 | AC_SUBST(PACKAGE_CFLAGS) | ||
25 | 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 new file mode 100644 index 0000000000..7a0f7d1bca --- /dev/null +++ b/meta/recipes-sato/kf/files/fix-desktop-file.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Common subdirectories: kf-0.5.4.1.orig/data and kf-0.5.4.1/data | ||
2 | diff -u kf-0.5.4.1.orig/kf.desktop kf-0.5.4.1/kf.desktop | ||
3 | --- kf-0.5.4.1.orig/kf.desktop 2005-04-19 22:08:44.000000000 +0100 | ||
4 | +++ kf-0.5.4.1/kf.desktop 2005-10-03 14:36:47.000000000 +0100 | ||
5 | @@ -1,6 +1,6 @@ | ||
6 | [Desktop Entry] | ||
7 | Encoding=UTF-8 | ||
8 | -Name=kf jabber client | ||
9 | +Name=Instant Messenger | ||
10 | Name[pl]=kf klient sieci jabber | ||
11 | Name[lt]=Pokalbių programa kf | ||
12 | GenericName=Instant Messenger | ||
13 | @@ -11,5 +11,6 @@ | ||
14 | Icon=kf.png | ||
15 | Terminal=false | ||
16 | Type=Application | ||
17 | -Categories=GTK;Application;Network; | ||
18 | +Categories=GTK;PIM;Application;Network; | ||
19 | StartupNotify=true | ||
20 | +X-MB-SingleInstance=true | ||
diff --git a/meta/recipes-sato/kf/files/gcc4.patch b/meta/recipes-sato/kf/files/gcc4.patch new file mode 100644 index 0000000000..58727ea0e0 --- /dev/null +++ b/meta/recipes-sato/kf/files/gcc4.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Index: 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 | ||
18 | Index: 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/recipes-sato/kf/kf_0.5.4.1.bb b/meta/recipes-sato/kf/kf_0.5.4.1.bb new file mode 100644 index 0000000000..2baa6d46f7 --- /dev/null +++ b/meta/recipes-sato/kf/kf_0.5.4.1.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | DESCRIPTION = "Kf is a GTK+ instant messaging client." | ||
2 | LICENSE = "GPL" | ||
3 | DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth libglade" | ||
4 | PR = "r4" | ||
5 | |||
6 | SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \ | ||
7 | file://fix-configure.patch;patch=1 \ | ||
8 | file://fix-desktop-file.patch;patch=0 \ | ||
9 | file://gcc4.patch;patch=1" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
12 | |||
13 | EXTRA_OECONF = "--disable-binreloc" | ||
14 | |||
15 | export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" | ||
16 | |||