aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-09-02 09:59:50 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-09-02 09:59:50 +0000
commita18bd6c9aa2b5c246860a89a7cedffa3825fccef (patch)
tree1085dec5de3a7413c1c52ee57024a3e2dc44918c /packages
parent7cbee4efc718590c6efe9fa9b24f7d7a9a9d98a7 (diff)
downloadopenembedded-a18bd6c9aa2b5c246860a89a7cedffa3825fccef.tar.gz
openembedded-a18bd6c9aa2b5c246860a89a7cedffa3825fccef.tar.bz2
openembedded-a18bd6c9aa2b5c246860a89a7cedffa3825fccef.zip
gnome-common: 2.4.0 -> 2.18.0 + associated cleanup (from Poky)
Diffstat (limited to 'packages')
-rw-r--r--packages/eds/eds-dbus_svn.bb4
-rw-r--r--packages/gnome/gnome-common-2.18.0/.mtn2git_empty (renamed from packages/gnome/gnome-common/.mtn2git_empty)0
-rw-r--r--packages/gnome/gnome-common-2.18.0/omf.patch (renamed from packages/gnome/gnome-common/omf.patch)2
-rw-r--r--packages/gnome/gnome-common_2.18.0.bb (renamed from packages/gnome/gnome-common_2.4.0.bb)7
4 files changed, 6 insertions, 7 deletions
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index 4b38c8e552..46d3a4c450 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
DEPENDS = "intltool-native libglade glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool"
PV = "1.4.0+svn${SRCDATE}"
-PR = "r5"
+PR = "r6"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
file://no_libdb.patch;patch=1 \
@@ -21,8 +21,6 @@ LDFLAGS += "-lpthread"
EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
-acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
-
PACKAGES =+ "libcamel-collateral libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev"
FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
diff --git a/packages/gnome/gnome-common/.mtn2git_empty b/packages/gnome/gnome-common-2.18.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/gnome-common/.mtn2git_empty
+++ b/packages/gnome/gnome-common-2.18.0/.mtn2git_empty
diff --git a/packages/gnome/gnome-common/omf.patch b/packages/gnome/gnome-common-2.18.0/omf.patch
index 334425e4b2..0d85b001e0 100644
--- a/packages/gnome/gnome-common/omf.patch
+++ b/packages/gnome/gnome-common-2.18.0/omf.patch
@@ -9,5 +9,5 @@
+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ fi; \
done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.18.0.bb
index fc67bf9243..2991db81c7 100644
--- a/packages/gnome/gnome-common_2.4.0.bb
+++ b/packages/gnome/gnome-common_2.18.0.bb
@@ -20,8 +20,9 @@ do_stage () {
mkdir -p ${STAGE_TEMP}
make DESTDIR="${STAGE_TEMP}" install
cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
- install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
- cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
- cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal
+ install -d ${STAGING_DATADIR}/gnome-common
+ install -d ${STAGING_DATADIR}/aclocal
+ cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
+ cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
rm -rf ${STAGE_TEMP}
}