gnome-common: 2.4.0 -> 2.18.0 + associated cleanup (from Poky)

diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index 8643989..5623357 100644 (file)
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -13,8 +13,6 @@ FILES_${PN} += "${datadir}/application-registry ${datadir}/mime-info \
 
 inherit autotools pkgconfig gconf
 
-EXTRA_AUTORECONF += "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
-
 gnome_stage_includes() {
        autotools_stage_includes
 }

diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index 4b38c8e..46d3a4c 100644 (file)
--- 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
similarity index 100%
rename from packages/gnome/gnome-common/.mtn2git_empty
rename to 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
similarity index 82%
rename from packages/gnome/gnome-common/omf.patch
rename to packages/gnome/gnome-common-2.18.0/omf.patch
index 334425e..0d85b00 100644 (file)
--- 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
similarity index 68%
rename from packages/gnome/gnome-common_2.4.0.bb
rename to packages/gnome/gnome-common_2.18.0.bb
index fc67bf9..2991db8 100644 (file)
--- 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}
 }