diff options
| author | Michael Krelin <hacker@klever.net> | 2008-08-22 18:19:28 +0000 |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2008-08-22 18:19:28 +0000 |
| commit | 395bad7a8b5c4131304e586c51c03289a3dbeab9 (patch) | |
| tree | e1c9becf32e1f0b3c7d28d371adf81785c6b37fa | |
| parent | a67cb0ff5cf6670a151b7583ac078b72b7ccb836 (diff) | |
| parent | a946cedfaf47d6891a8aedf0983e1df877edacd6 (diff) | |
merge of '793123b8aee6579f62157a3bbd186814b632fadf'
and 'fb519bd271114f10438a7eb00519a410dfecab92'
| -rw-r--r-- | packages/avahi/mango-lassi_git.bb | 12 | ||||
| -rw-r--r-- | packages/gtk+/gtk+-native-1.2_1.2.10.bb | 4 | ||||
| -rw-r--r-- | packages/libgphoto2/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libgphoto2/libgphoto2_2.1.4.bb (renamed from packages/gphoto2/libgphoto2_2.1.4.bb) | 0 | ||||
| -rw-r--r-- | packages/libgphoto2/libgphoto2_2.1.5.bb (renamed from packages/gphoto2/libgphoto2_2.1.5.bb) | 0 | ||||
| -rw-r--r-- | packages/libgphoto2/libgphoto2_2.1.6.bb (renamed from packages/gphoto2/libgphoto2_2.1.6.bb) | 0 | ||||
| -rw-r--r-- | packages/libgphoto2/libgphoto2_2.4.0.bb (renamed from packages/gphoto2/libgphoto2_2.4.0.bb) | 0 |
7 files changed, 8 insertions, 8 deletions
diff --git a/packages/avahi/mango-lassi_git.bb b/packages/avahi/mango-lassi_git.bb index 99fd617ec9..5d240c2c14 100644 --- a/packages/avahi/mango-lassi_git.bb +++ b/packages/avahi/mango-lassi_git.bb @@ -1,16 +1,14 @@ -DESCRIPTION = "Input sharing, the avahi way" +ESCRIPTION = "Input sharing, the avahi way" DEPENDS = "avahi-ui libglade libnotify" -PV = "0.0+git${SRCDATE}" +SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93" +PV = "0.0+${PR}+gitr${SRCREV}" SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http" +S = "${WORKDIR}/git" -S = "${WORKDIR}/${PN}" - -do_compile_prepend() { - export CFLAGS="-Wall -Wextra -W -O0 -g -pipe -Wno-unused-parameter `pkg-config --cflags dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-ui avahi-glib avahi-client libnotify libglade-2.0` `pkg-config --libs dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-glib avahi-client avahi-ui libnotify libglade-2.0`" -} +inherit autotools do_install() { install -d ${D}${bindir} diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb index 232bfa4768..f5ad1a58ab 100644 --- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb +++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb @@ -4,8 +4,10 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-1.2 jpeg libpng libxext" -PR = "r0" +PR = "r1" + +FILESPATH =+ "${FILE_DIRNAME}/gtk+-1.2-1.2.10:" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \ file://gtk+1.2-reconf-fix;patch=1 \ file://no-xwc;patch=1" diff --git a/packages/libgphoto2/.mtn2git_empty b/packages/libgphoto2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libgphoto2/.mtn2git_empty diff --git a/packages/gphoto2/libgphoto2_2.1.4.bb b/packages/libgphoto2/libgphoto2_2.1.4.bb index fed7c41e40..fed7c41e40 100644 --- a/packages/gphoto2/libgphoto2_2.1.4.bb +++ b/packages/libgphoto2/libgphoto2_2.1.4.bb diff --git a/packages/gphoto2/libgphoto2_2.1.5.bb b/packages/libgphoto2/libgphoto2_2.1.5.bb index 67efc38785..67efc38785 100644 --- a/packages/gphoto2/libgphoto2_2.1.5.bb +++ b/packages/libgphoto2/libgphoto2_2.1.5.bb diff --git a/packages/gphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb index ad57ba8cf1..ad57ba8cf1 100644 --- a/packages/gphoto2/libgphoto2_2.1.6.bb +++ b/packages/libgphoto2/libgphoto2_2.1.6.bb diff --git a/packages/gphoto2/libgphoto2_2.4.0.bb b/packages/libgphoto2/libgphoto2_2.4.0.bb index c6f63374cc..c6f63374cc 100644 --- a/packages/gphoto2/libgphoto2_2.4.0.bb +++ b/packages/libgphoto2/libgphoto2_2.4.0.bb |