diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-19 13:03:25 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-19 13:03:25 +0000 |
| commit | 8997c7132b2f2c681a25869862787bbfcb2a1baf (patch) | |
| tree | 7f15448c06eb96a1115fe9c1ae31e81c65822f39 /packages/eds | |
| parent | 378b7ec5b0c5dd38ec0d7d4e69c4078e6c22acca (diff) | |
| parent | 4085ace5b4bea5cfbf73db10fdadc05b68108afa (diff) | |
merge of '1df6d041b2c60bf99f158bc629911c2bd43cb76b'
and 'f5f0e13e97c221bdaa5281f17bf2ce322fc3ea4b'
Diffstat (limited to 'packages/eds')
| -rw-r--r-- | packages/eds/eds-dbus/no_libedataserverui-20060126.patch | 13 | ||||
| -rw-r--r-- | packages/eds/eds-dbus/no_libedataserverui.patch | 4 | ||||
| -rw-r--r-- | packages/eds/eds-dbus_svn.bb | 12 |
3 files changed, 20 insertions, 9 deletions
diff --git a/packages/eds/eds-dbus/no_libedataserverui-20060126.patch b/packages/eds/eds-dbus/no_libedataserverui-20060126.patch new file mode 100644 index 0000000000..bb6f78d9f7 --- /dev/null +++ b/packages/eds/eds-dbus/no_libedataserverui-20060126.patch @@ -0,0 +1,13 @@ +Index: Makefile.am +=================================================================== +--- trunk/Makefile.am (revision 306) ++++ trunk/Makefile.am (working copy) +@@ -16,7 +16,7 @@ + endif + + if ENABLE_DBUS +-SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po ++SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po + else + SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po + endif diff --git a/packages/eds/eds-dbus/no_libedataserverui.patch b/packages/eds/eds-dbus/no_libedataserverui.patch index bb6f78d9f7..766c547a56 100644 --- a/packages/eds/eds-dbus/no_libedataserverui.patch +++ b/packages/eds/eds-dbus/no_libedataserverui.patch @@ -6,8 +6,8 @@ Index: Makefile.am endif if ENABLE_DBUS --SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po -+SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po +-SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui docs art po ++SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) docs art po else SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po endif diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index e56b41e595..b97ed984bc 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -1,18 +1,17 @@ DESCRIPTION = "Evolution database backend server" HOMEPAGE = "http://projects.o-hand.com/eds" LICENSE = "LGPL" -DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib" +DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool" PV = "1.4.0+svn${SRCDATE}" -PR = "r17" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://no_libdb.patch;patch=1 \ file://no_iconv_test.patch;patch=1 \ - file://no_libedataserverui.patch;patch=1 \ - file://disable_orbit.patch;patch=1;maxdate=20060126 \ + 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://iconv-detect.h" - S = "${WORKDIR}/trunk" inherit autotools pkgconfig @@ -38,7 +37,6 @@ FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \ do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} " do_stage () { - autotools_stage_all + autotools_stage_all } - |