diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-03-05 15:34:09 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-03-05 15:34:09 +0000 |
| commit | 21919ceb5461fd8100c33d8030b4ebd7c046a92d (patch) | |
| tree | 393edcfd357c936f783fbc1d830c735a84fa4a77 | |
| parent | dea55824a681effd4b0d84a7f194b21606a228a2 (diff) | |
| parent | 2fb51c1a7ca0f0336a590095484aaf8643f79032 (diff) | |
| download | openembedded-21919ceb5461fd8100c33d8030b4ebd7c046a92d.tar.gz | |
merge of '069961becc44a86c25703ae2d26de30fba398c72'
and 'e9838ae7ae6df69bb3ed71e9decb1b41fe4f6050'
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/libsexy/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libsexy/files/libsexy-pkgconfig-fixes.patch | 15 | ||||
| -rw-r--r-- | packages/libsexy/libsexy.inc | 3 | ||||
| -rw-r--r-- | packages/libsexy/libsexy_0.1.11.bb | 2 | ||||
| -rw-r--r-- | packages/xoo/xoo_svn.bb | 2 |
6 files changed, 20 insertions, 4 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a666b42a65..b5a04deab8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -154,5 +154,5 @@ SRCREV_pn-webkit-gtk ?= "30762" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" -SRCREV_pn-xoo ?= "1623" +SRCREV_pn-xoo ?= "1971" diff --git a/packages/libsexy/files/.mtn2git_empty b/packages/libsexy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsexy/files/.mtn2git_empty diff --git a/packages/libsexy/files/libsexy-pkgconfig-fixes.patch b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch new file mode 100644 index 0000000000..331b24bf1b --- /dev/null +++ b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch @@ -0,0 +1,15 @@ +Index: libsexy-0.1.11/libsexy.pc.in +=================================================================== +--- libsexy-0.1.11.orig/libsexy.pc.in 2005-11-10 10:21:18.000000000 +0000 ++++ libsexy-0.1.11/libsexy.pc.in 2008-03-05 14:36:39.000000000 +0000 +@@ -6,7 +6,8 @@ + Name: libsexy + Description: Doing naughty things to good widgets + Version: @VERSION@ +-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@ +-Cflags: -I${includedir} @PACKAGE_CFLAGS@ + ++Requires: pango glib-2.0 gtk+-2.0 libxml ++Libs: -L${libdir} -lsexy ++Cflags: -I${includedir} + diff --git a/packages/libsexy/libsexy.inc b/packages/libsexy/libsexy.inc index 522b7e0d63..27816c0800 100644 --- a/packages/libsexy/libsexy.inc +++ b/packages/libsexy/libsexy.inc @@ -5,7 +5,8 @@ SECTION = "x11/libs" DEPENDS = "gtk+ enchant libxml2" -SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz" +SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \ + file://libsexy-pkgconfig-fixes.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb index 042ea757e9..91784ffb49 100644 --- a/packages/libsexy/libsexy_0.1.11.bb +++ b/packages/libsexy/libsexy_0.1.11.bb @@ -1,2 +1,2 @@ require libsexy.inc -PR = "r0" +PR = "r1" diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb index 231122194b..e9cd7ee9b7 100644 --- a/packages/xoo/xoo_svn.bb +++ b/packages/xoo/xoo_svn.bb @@ -3,7 +3,7 @@ It is intended for embedded developers that want to simulate a target device \ (with an accurate display size, working hardware buttons, etc) on a desktop machine." HOMEPAGE = "http://projects.o-hand.com/xoo" LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxtst gtk+ libglade" +DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat" PV = "0.7+svnr${SRCREV}" PR = "r1" |