[oe-commits] org.oe.dev merge of '080fcdca01d44047b988dbb0ff626190537f5cae'
oe commit
oe at amethyst.openembedded.net
Mon Sep 1 18:35:40 UTC 2008
merge of '080fcdca01d44047b988dbb0ff626190537f5cae'
and '22bb42838bf1d7404d344ae172f39130008bc2c7'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 81f284310c579e1cc823cf022df435bc74f0d384
ViewMTN: http://monotone.openembedded.org/revision/info/81f284310c579e1cc823cf022df435bc74f0d384
Files:
1
packages/clutter/clutter
packages/clutter/clutter-cairo
packages/clutter/clutter-gst
packages/clutter/moblin-proto
packages/clutter/table
packages/clutter/tidy
packages/hal/ohm
packages/telepathy/telepathy-gabble-0.7.8
packages/telepathy/telepathy-salut-0.3.4
classes/gtk-doc.bbclass
packages/clutter/aaina.inc
packages/clutter/aaina_svn.bb
packages/clutter/clutter/enable-tests-r2990.patch
packages/clutter/clutter/enable_tests-0.4.patch
packages/clutter/clutter/enable_tests-0.6.patch
packages/clutter/clutter/enable_tests.patch
packages/clutter/clutter-box2d.inc
packages/clutter/clutter-box2d_svn.bb
packages/clutter/clutter-cairo/enable_examples.patch
packages/clutter/clutter-cairo.inc
packages/clutter/clutter-cairo_svn.bb
packages/clutter/clutter-gst/autofoo-0.4.patch
packages/clutter/clutter-gst/autofoo.patch
packages/clutter/clutter-gst.inc
packages/clutter/clutter-gst_0.4svn.bb
packages/clutter/clutter-gst_svn.bb
packages/clutter/clutter_0.4svn.bb
packages/clutter/clutter_0.6svn.bb
packages/clutter/clutter_svn.bb
packages/clutter/moblin-proto/fix.patch
packages/clutter/moblin-proto/paths.patch
packages/clutter/moblin-proto_git.bb
packages/clutter/table/fixes.patch
packages/clutter/table.inc
packages/clutter/table_svn.bb
packages/clutter/tidy/autofoo.patch
packages/clutter/tidy/tidy-enable-tests.patch
packages/clutter/tidy.inc
packages/clutter/tidy_svn.bb
packages/hal/ohm/fix_configure.patch
packages/loudmouth/loudmouth_1.3.2.bb
packages/sugar/sugar-presence-service_0.82.1.bb
packages/telepathy/empathy_2.23.90.bb
packages/telepathy/libtelepathy_0.3.3.bb
packages/telepathy/telepathy-gabble-0.7.8/gabble.manager
packages/telepathy/telepathy-gabble_0.7.8.bb
packages/telepathy/telepathy-glib_0.7.14.bb
packages/telepathy/telepathy-mission-control_4.67.bb
packages/telepathy/telepathy-python_0.15.1.bb
packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff
packages/telepathy/telepathy-salut-0.3.4/salut.manager
packages/telepathy/telepathy-salut_0.3.4.bb
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/cairo/cairo_1.6.4.bb
packages/clutter/clutter.inc
packages/hal/ohm_git.bb
packages/intltool/intltool-native_0.40.3.bb
packages/sugar/sugar-base_0.82.0.bb
packages/xorg-lib/pixman/pixman-arm.patch
packages/xorg-lib/pixman_0.11.8.bb
packages/xorg-xserver/xserver-xorg_1.4.2.bb
packages/xorg-xserver/xserver-xorg_1.4.bb
packages/dcop/dcopidl-native_3.5.4.bb
packages/dcop/dcopidl-native_3.5.8.bb
packages/dcop/dcopidl2cpp-native_3.5.4.bb
packages/dcop/dcopidl2cpp-native_3.5.8.bb
Diffs:
#
# mt diff -r080fcdca01d44047b988dbb0ff626190537f5cae -r81f284310c579e1cc823cf022df435bc74f0d384
#
#
#
# add_dir "packages/clutter/clutter"
#
# add_dir "packages/clutter/clutter-cairo"
#
# add_dir "packages/clutter/clutter-gst"
#
# add_dir "packages/clutter/moblin-proto"
#
# add_dir "packages/clutter/table"
#
# add_dir "packages/clutter/tidy"
#
# add_dir "packages/hal/ohm"
#
# add_dir "packages/telepathy/telepathy-gabble-0.7.8"
#
# add_dir "packages/telepathy/telepathy-salut-0.3.4"
#
# add_file "classes/gtk-doc.bbclass"
# content [f3da6d129aae0683bb652927e407cf333512701b]
#
# add_file "packages/clutter/aaina.inc"
# content [bc249b320d2c09fafec382ea992b061a53602731]
#
# add_file "packages/clutter/aaina_svn.bb"
# content [aa8d62a2fe86afdfd2af55e8cb0c62f77b9e47af]
#
# add_file "packages/clutter/clutter/enable-tests-r2990.patch"
# content [966254bc832aaedeb5875a2e72e8095df2bf71b1]
#
# add_file "packages/clutter/clutter/enable_tests-0.4.patch"
# content [853e565bcea51be7b3ec9c536d537f7883268637]
#
# add_file "packages/clutter/clutter/enable_tests-0.6.patch"
# content [686cb824c28f61344827e5e412a79a25b0db7708]
#
# add_file "packages/clutter/clutter/enable_tests.patch"
# content [905a94aac0993709d284ebaaf0c00d73a34eddba]
#
# add_file "packages/clutter/clutter-box2d.inc"
# content [7c1983377e9c27e1fb3a402b3e17223f82ac32a3]
#
# add_file "packages/clutter/clutter-box2d_svn.bb"
# content [1fb625dc239ad8580efa47dc75948ed6567b359f]
#
# add_file "packages/clutter/clutter-cairo/enable_examples.patch"
# content [f6ef7b5d5a34b2dfcf39504db490345abc7ec154]
#
# add_file "packages/clutter/clutter-cairo.inc"
# content [cf8f5dbefd7794d1ad86abc4897052b632e877aa]
#
# add_file "packages/clutter/clutter-cairo_svn.bb"
# content [514931fe21e7521724614b42730c114c808a6c5d]
#
# add_file "packages/clutter/clutter-gst/autofoo-0.4.patch"
# content [1ac70534e2388c80f40e4af02e40f2c61cca43a0]
#
# add_file "packages/clutter/clutter-gst/autofoo.patch"
# content [85a60bf11393a1bf64909f55cb6596c6e928b248]
#
# add_file "packages/clutter/clutter-gst.inc"
# content [d9a754ee52a97c60567291b23f486a6c60ec2e99]
#
# add_file "packages/clutter/clutter-gst_0.4svn.bb"
# content [b695755cdaa1623a865238e5e96dbda2508d4a49]
#
# add_file "packages/clutter/clutter-gst_svn.bb"
# content [55f783dc761528e6eb302f4c7128c8c2466c1840]
#
# add_file "packages/clutter/clutter_0.4svn.bb"
# content [870ab6e6f3d207bd08c793c68653a28497f46119]
#
# add_file "packages/clutter/clutter_0.6svn.bb"
# content [81632b8c58de4341896b3371c8932826f115c579]
#
# add_file "packages/clutter/clutter_svn.bb"
# content [592e1062bcda8ab79a1c8979430870033a95d942]
#
# add_file "packages/clutter/moblin-proto/fix.patch"
# content [ea065704404168aa9eb0cf1c92ee5b8e3eeb02e8]
#
# add_file "packages/clutter/moblin-proto/paths.patch"
# content [3a1b267025433f73bd3ab26f16c0a03a6da23e23]
#
# add_file "packages/clutter/moblin-proto_git.bb"
# content [064a16e0061bab0e3fb72a07f8e135b0218cc6d5]
#
# add_file "packages/clutter/table/fixes.patch"
# content [22db0b4a763f91daf2d92943cd9134ad02d3ed64]
#
# add_file "packages/clutter/table.inc"
# content [5ade70e9dbf19b3c274e82e750625eb4e0d4030b]
#
# add_file "packages/clutter/table_svn.bb"
# content [9acf283fb724913bc08402f1e14edbea50f57cb6]
#
# add_file "packages/clutter/tidy/autofoo.patch"
# content [3ac397981741139af6f2773250364a8a3889490a]
#
# add_file "packages/clutter/tidy/tidy-enable-tests.patch"
# content [e9b56fb96aa38bf9fa19058a7e16f4671d8998f9]
#
# add_file "packages/clutter/tidy.inc"
# content [1d340f46c524662824eff9397200fbd31d5b4a14]
#
# add_file "packages/clutter/tidy_svn.bb"
# content [5e82cf17591e5afbe19c1b0afd1b80279a1077c1]
#
# add_file "packages/hal/ohm/fix_configure.patch"
# content [d503535cd8a73236bd7e63a77b71a1f3c0673402]
#
# add_file "packages/loudmouth/loudmouth_1.3.2.bb"
# content [141b9adf1e925c52cf9ba27be1961196c34ad598]
#
# add_file "packages/sugar/sugar-presence-service_0.82.1.bb"
# content [800a343241aecf663934f063533980b549c9440d]
#
# add_file "packages/telepathy/empathy_2.23.90.bb"
# content [ec37e7c84a6bb2e1fd943d29a4c8c59266043bd4]
#
# add_file "packages/telepathy/libtelepathy_0.3.3.bb"
# content [394bd38a1e74b5f54fac3400adbe22a19b7277bc]
#
# add_file "packages/telepathy/telepathy-gabble-0.7.8/gabble.manager"
# content [ca0952395cd017e0cababe55d3f100edd43d3cd5]
#
# add_file "packages/telepathy/telepathy-gabble_0.7.8.bb"
# content [89981eddba91e28ffcab41edeb348aabdb1a824b]
#
# add_file "packages/telepathy/telepathy-glib_0.7.14.bb"
# content [488ea77c03a9df921494f5d1bdc80e878d99a236]
#
# add_file "packages/telepathy/telepathy-mission-control_4.67.bb"
# content [f3f4534a2ab6662c4a229df2681eecf560d885e5]
#
# add_file "packages/telepathy/telepathy-python_0.15.1.bb"
# content [337dc44149aebc1554bcb6e930da136baa207cc1]
#
# add_file "packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff"
# content [f0cf85effcf35525c9c7c7bcbe9eb223f100e3c6]
#
# add_file "packages/telepathy/telepathy-salut-0.3.4/salut.manager"
# content [ac30c16f1ad75d30cd7be21a458e55ccc9fb9d94]
#
# add_file "packages/telepathy/telepathy-salut_0.3.4.bb"
# content [ee994c4d68369462cc3b3bec303f3277cc82039c]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [a88b28843d763c56d5d21f55bb7da235f6f094d1]
# to [0f717f4c8328c14f38918f81c4aec1f1ba98014a]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [c34c8224b196b903a1d16225d75c370673a6fbcc]
# to [f26ce611141232b0ce4d310873be5609dff97aee]
#
# patch "packages/cairo/cairo_1.6.4.bb"
# from [cec2e4d8ea74876596992f62b4b60dc92110eb99]
# to [f2a0d59df7b091a38351fbfd2a4909d5a320e919]
#
# patch "packages/clutter/clutter.inc"
# from [71a3128c8bc71e49422ab7557abefe27ef87295d]
# to [8157361a0697e11b7ffa62ba3f4c9e9ca68f36bf]
#
# patch "packages/hal/ohm_git.bb"
# from [d3df01f4d425f234e0cffc1cd255366453514a1e]
# to [637059e7407fe158e7af6d00961434bf3aee1629]
#
# patch "packages/intltool/intltool-native_0.40.3.bb"
# from [cebdd560e45a204a68a27a99d744f6f152398488]
# to [fce60a8f4e6783b5de5c669d6fefb3b02498c948]
#
# patch "packages/sugar/sugar-base_0.82.0.bb"
# from [3b5a6f1d3b9cad0a2372567fd8a37cb3ff35a428]
# to [752924beabb314108c93457e7a9ae3505e9ba428]
#
# patch "packages/xorg-lib/pixman/pixman-arm.patch"
# from [7945648f6d678de76999d8c9914b8d2d36a236dd]
# to [2e5ceda22b81048ed486a7500337adaa63e07f54]
#
# patch "packages/xorg-lib/pixman_0.11.8.bb"
# from [e6b5f49fa7a8d534a31ac6086683d05d6da68127]
# to [ce5dc627e34817412d9c49790f4102ba93057cdf]
#
# patch "packages/xorg-xserver/xserver-xorg_1.4.2.bb"
# from [4390a6545e73aa1015da701f862ee96c21cca2b6]
# to [bfac91f5fae3ca879600e9617161fd20d17d8953]
#
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
# from [bfac91f5fae3ca879600e9617161fd20d17d8953]
# to [fd1f1a70f93ec7612eda991a4b4dc504c23af13f]
#
============================================================
--- classes/gtk-doc.bbclass f3da6d129aae0683bb652927e407cf333512701b
+++ classes/gtk-doc.bbclass f3da6d129aae0683bb652927e407cf333512701b
@@ -0,0 +1,4 @@
+# We don't have gtk-doc so disable it
+do_configure_prepend() {
+ echo "EXTRA_DIST=">> ${S}/gtk-doc.make
+}
============================================================
--- packages/clutter/aaina.inc bc249b320d2c09fafec382ea992b061a53602731
+++ packages/clutter/aaina.inc bc249b320d2c09fafec382ea992b061a53602731
@@ -0,0 +1,12 @@
+DESCRIPTION = "Aaina Clutter Demo"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "GPL"
+
+DEPENDS = "clutter libxml2 gtk+ neon"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
+
============================================================
--- packages/clutter/aaina_svn.bb aa8d62a2fe86afdfd2af55e8cb0c62f77b9e47af
+++ packages/clutter/aaina_svn.bb aa8d62a2fe86afdfd2af55e8cb0c62f77b9e47af
@@ -0,0 +1,7 @@
+require aaina.inc
+
+PV = "0.3.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http"
+
+S = "${WORKDIR}/aaina"
============================================================
--- packages/clutter/clutter/enable-tests-r2990.patch 966254bc832aaedeb5875a2e72e8095df2bf71b1
+++ packages/clutter/clutter/enable-tests-r2990.patch 966254bc832aaedeb5875a2e72e8095df2bf71b1
@@ -0,0 +1,50 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter/tests/Makefile.am
+===================================================================
+--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100
++++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+ test-actors test-behave test-text test-entry test-project \
+ test-perspective test-rotate test-depth \
+ test-threads test-timeline test-timeline-dup-frames \
+@@ -17,8 +17,8 @@
+ test-invariants
+
+ if X11_TESTS
+-noinst_PROGRAMS += test-pixmap
+-noinst_PROGRAMS += test-devices
++bin_PROGRAMS += test-pixmap
++bin_PROGRAMS += test-devices
+ endif
+
+ INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
+@@ -73,4 +73,9 @@
+ test_invariants_SOURCES = test-invariants.c
+ test_devices_SOURCES = test-devices.c
+
++test_textdir = $(pkgdatadir)
++test_text_DATA = test-text.c
++test_actorsdir = $(pkgdatadir)
++test_actors_DATA = redhand.png
++
+ EXTRA_DIST = redhand.png test-script.json
+Index: clutter/tests/test-actors.c
+===================================================================
+--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100
++++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100
+@@ -195,7 +195,7 @@
+ /* Create a texture from file, then clone in to same resources */
+ if (i == 0)
+ {
+- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
+ &error)) == NULL)
+ {
+ g_error ("image load failed: %s", error->message);
============================================================
--- packages/clutter/clutter/enable_tests-0.4.patch 853e565bcea51be7b3ec9c536d537f7883268637
+++ packages/clutter/clutter/enable_tests-0.4.patch 853e565bcea51be7b3ec9c536d537f7883268637
@@ -0,0 +1,52 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter-0-4/tests/Makefile.am
+===================================================================
+--- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000
++++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+ test-actors test-behave test-text test-entry test-project \
+ test-boxes test-perspective test-rotate test-depth \
+ test-threads test-timeline
+@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c
+ test_threads_SOURCES = test-threads.c
+ test_timeline_SOURCES = test-timeline.c
+
++test_textdir = $(pkgdatadir)
++test_text_DATA = test-text.c
++test_actorsdir = $(pkgdatadir)
++test_actors_DATA = redhand.png
++
+ EXTRA_DIST = redhand.png
+Index: clutter-0-4/tests/test-actors.c
+===================================================================
+--- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000
++++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000
+@@ -143,7 +143,7 @@ main (int argc, char *argv[])
+ stage = clutter_stage_get_default ();
+ clutter_actor_set_size (stage, 800, 600);
+
+- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
+
+ if (!pixbuf)
+ g_error("pixbuf load failed");
+Index: clutter-0-4/tests/test-text.c
+===================================================================
+--- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000
++++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000
+@@ -27,7 +27,7 @@ main (int argc, char *argv[])
+
+ stage = clutter_stage_get_default ();
+
+- if (!g_file_get_contents ("test-text.c", &text, &size, NULL))
++ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL))
+ g_error("g_file_get_contents() of test-text.c failed");
+
+ clutter_actor_set_size (stage, 800, 600);
============================================================
--- packages/clutter/clutter/enable_tests-0.6.patch 686cb824c28f61344827e5e412a79a25b0db7708
+++ packages/clutter/clutter/enable_tests-0.6.patch 686cb824c28f61344827e5e412a79a25b0db7708
@@ -0,0 +1,40 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter-0-6/tests/Makefile.am
+===================================================================
+--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000
++++ clutter-0-6/tests/Makefile.am 2007-11-06 12:30:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+ test-actors test-behave test-text test-entry test-project \
+ test-boxes test-perspective test-rotate test-depth \
+ test-threads test-timeline test-score test-script
+@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c
+ test_score_SOURCES = test-score.c
+ test_script_SOURCES = test-script.c
+
++test_textdir = $(pkgdatadir)
++test_text_DATA = test-text.c
++test_actorsdir = $(pkgdatadir)
++test_actors_DATA = redhand.png
++
+ EXTRA_DIST = redhand.png test-script.json
+Index: clutter-0-6/tests/test-actors.c
+===================================================================
+--- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000
++++ clutter-0-6/tests/test-actors.c 2007-11-06 12:29:21.000000000 +0000
+@@ -143,7 +143,7 @@ main (int argc, char *argv[])
+ stage = clutter_stage_get_default ();
+ clutter_actor_set_size (stage, 800, 600);
+
+- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
+
+ if (!pixbuf)
+ g_error("pixbuf load failed");
+
============================================================
--- packages/clutter/clutter/enable_tests.patch 905a94aac0993709d284ebaaf0c00d73a34eddba
+++ packages/clutter/clutter/enable_tests.patch 905a94aac0993709d284ebaaf0c00d73a34eddba
@@ -0,0 +1,48 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter/tests/Makefile.am
+===================================================================
+--- clutter.orig/tests/Makefile.am 2008-04-25 16:45:17.000000000 +0100
++++ clutter/tests/Makefile.am 2008-04-25 16:47:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+ test-actors test-behave test-text test-entry test-project \
+ test-perspective test-rotate test-depth \
+ test-threads test-timeline test-timeline-dup-frames \
+@@ -14,7 +14,7 @@
+ test-cogl-tex-polygon test-stage-read-pixels
+
+ if X11_TESTS
+-noinst_PROGRAMS += test-pixmap
++bin_PROGRAMS += test-pixmap
+ endif
+
+ INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter
+@@ -61,4 +61,9 @@
+ test_cogl_offscreen_SOURCES = test-cogl-offscreen.c
+ test_stage_read_pixels_SOURCES = test-stage-read-pixels.c
+
++test_textdir = $(pkgdatadir)
++test_text_DATA = test-text.c
++test_actorsdir = $(pkgdatadir)
++test_actors_DATA = redhand.png
++
+ EXTRA_DIST = redhand.png test-script.json
+Index: clutter/tests/test-actors.c
+%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r22bb42838bf1d7404d344ae172f39130008bc2c7 -r81f284310c579e1cc823cf022df435bc74f0d384
#
#
#
# rename "packages/dcop/dcopidl-native_3.5.4.bb"
# to "packages/dcop/dcopidl-native_3.5.8.bb"
#
# rename "packages/dcop/dcopidl2cpp-native_3.5.4.bb"
# to "packages/dcop/dcopidl2cpp-native_3.5.8.bb"
#
# patch "packages/dcop/dcopidl-native_3.5.8.bb"
# from [1578e74d509d78b5e2e421c869dfcbbf69f3bdfc]
# to [aed120a55a7df8ad48c737277ece65ef2bfcb53d]
#
# patch "packages/dcop/dcopidl2cpp-native_3.5.8.bb"
# from [70114ba9db0b75943f6fab62b2fc49d1dd2b0cd3]
# to [bc28556b40dfb66faf9d5723e19a11065e2aab1a]
#
============================================================
--- packages/dcop/dcopidl-native_3.5.4.bb 1578e74d509d78b5e2e421c869dfcbbf69f3bdfc
+++ packages/dcop/dcopidl-native_3.5.8.bb aed120a55a7df8ad48c737277ece65ef2bfcb53d
@@ -4,9 +4,9 @@ DEPENDS = "uicmoc3-native"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 \
+SRC_URI = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2 \
file://dcopidl-compile.patch;patch=1 "
-S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl"
+S = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl"
inherit native qmake qt3e
============================================================
--- packages/dcop/dcopidl2cpp-native_3.5.4.bb 70114ba9db0b75943f6fab62b2fc49d1dd2b0cd3
+++ packages/dcop/dcopidl2cpp-native_3.5.8.bb bc28556b40dfb66faf9d5723e19a11065e2aab1a
@@ -4,10 +4,10 @@ DEPENDS = "uicmoc3-native"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 "
+SRC_URI = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2"
#\
# file://dcopidl-compile.patch;patch=1 "
-S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl2cpp"
+S = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl2cpp"
inherit native qmake qt3e
More information about the Openembedded-commits
mailing list