diff options
| author | Philip Balister <philip@balister.org> | 2007-01-16 14:00:39 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-01-16 14:00:39 +0000 |
| commit | 16cb2f321befd4c69c9c938c2ec8386fcfb3336a (patch) | |
| tree | 6e982c0d515e646af48bb490dc1ee9b46abe2a65 | |
| parent | d5e5a592f1643820e29a35d0eee631d39d86c74a (diff) | |
| parent | b9ced4ac6df019db0d332ed7c206c6865c93c20e (diff) | |
merge of '3de88634fec14dacb930fd0e1946c97f51c4b9e2'
and '97ab5b547fe9949119532579fc794b04c0806389'
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 2 | ||||
| -rwxr-xr-x | packages/dates/dates_0.2.bb | 12 | ||||
| -rw-r--r-- | packages/eds/eds-dbus/fix-bindig-tool.patch | 22 | ||||
| -rw-r--r-- | packages/eds/eds-dbus_svn.bb | 2 |
4 files changed, 37 insertions, 1 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 866741479f..27e34856fd 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -22,7 +22,7 @@ SRCDATE_xxf86vmext ?= "20060814" SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" SRCDATE_fstests ?= "20061122" -SRCDATE_eds-dbus ?= "20061215" +SRCDATE_eds-dbus ?= "20070115" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" SRCDATE_matchbox-common ?= "20060612" diff --git a/packages/dates/dates_0.2.bb b/packages/dates/dates_0.2.bb new file mode 100755 index 0000000000..0870313df1 --- /dev/null +++ b/packages/dates/dates_0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Dates is a calendar application." +SECTION = "x11" +LICENSE = "LGPL" + +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" + +SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz" + +inherit autotools pkgconfig gtk-icon-cache + +FILES_${PN} += "${datadir}/pixmaps/dates.png" + diff --git a/packages/eds/eds-dbus/fix-bindig-tool.patch b/packages/eds/eds-dbus/fix-bindig-tool.patch new file mode 100644 index 0000000000..704df84f69 --- /dev/null +++ b/packages/eds/eds-dbus/fix-bindig-tool.patch @@ -0,0 +1,22 @@ +--- /tmp/Makefile.am 2007-01-16 13:56:57.000000000 +0100 ++++ trunk/calendar/libecal-dbus/Makefile.am 2007-01-16 13:57:40.045251000 +0100 +@@ -64,7 +64,7 @@ + dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ + + %-bindings.h: ../libedata-cal-dbus/%.xml +- dbus-binding-tool --mode=glib-client --output=$@ $^ ++ dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^ + + BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED) + CLEANFILES = $(BUILT_SOURCES) +--- /tmp/Makefile.am 2007-01-16 14:05:49.000000000 +0100 ++++ trunk/calendar/libedata-cal-dbus/Makefile.am 2007-01-16 14:06:15.865251000 +0100 +@@ -90,7 +90,7 @@ + dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ + + %-bindings.h: %.xml +- dbus-binding-tool --mode=glib-client --output=$@ $^ ++ dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^ + + + DBUS_BINDINGS = e-data-cal-factory-bindings.h e-data-cal-bindings.h e-data-cal-view-bindings.h diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index 3cffebc37e..79af6ae10d 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -11,7 +11,9 @@ SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://no_libedataserverui-20060126.patch;patch=1;maxdate=20061214 \ file://no_libedataserverui.patch;patch=1;mindate=20061215 \ file://disable_orbit.patch;patch=1;maxdate=20061214 \ + file://fix-bindig-tool.patch;patch=1;maxdate=20061223 \ file://iconv-detect.h" + S = "${WORKDIR}/trunk" inherit autotools pkgconfig |