[oe-commits] org.oe.dev gnome-common: 2.4.0 -> 2.18.0 + associated cleanup (from Poky)

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 068146008b7c87a1880b72e17b5b0c1b302a5129
ViewMTN: http://monotone.openembedded.org/revision.psp?id=068146008b7c87a1880b72e17b5b0c1b302a5129
Files:
1
packages/gnome/gnome-common
packages/gnome/gnome-common-2.18.0
packages/gnome/gnome-common_2.4.0.bb
packages/gnome/gnome-common_2.18.0.bb
classes/gnome.bbclass
packages/eds/eds-dbus_svn.bb
packages/gnome/gnome-common-2.18.0/omf.patch
Diffs:

#
# mt diff -re7cc52213db5e6315a468ba763aa847f68af5ab9 -r068146008b7c87a1880b72e17b5b0c1b302a5129
#
# 
# 
# rename "packages/gnome/gnome-common"
#     to "packages/gnome/gnome-common-2.18.0"
# 
# rename "packages/gnome/gnome-common_2.4.0.bb"
#     to "packages/gnome/gnome-common_2.18.0.bb"
# 
# patch "classes/gnome.bbclass"
#  from [bdcbc14ad016e658c7d7fd24567face5d878b0da]
#    to [32562f23ed1d1abec396b659b9a6f79394f5b0be]
# 
# patch "packages/eds/eds-dbus_svn.bb"
#  from [4ad062f134d11e7678d1fc86cddf519497c8a2ae]
#    to [b3aebc974d37ac917a96f3942fee385049c61d38]
# 
# patch "packages/gnome/gnome-common-2.18.0/omf.patch"
#  from [1598d7b5700f538dab8aa8c08dc180b52cab7cbd]
#    to [64482903485c278eb01e08a2f700ca93963875a8]
# 
# patch "packages/gnome/gnome-common_2.18.0.bb"
#  from [1520a8a1e79b7a32d00303332285f009cfa8c196]
#    to [7f6e44a0209c62cfeb9770d1df72704757bc2ebe]
# 
============================================================
--- classes/gnome.bbclass	bdcbc14ad016e658c7d7fd24567face5d878b0da
+++ classes/gnome.bbclass	32562f23ed1d1abec396b659b9a6f79394f5b0be
@@ -13,8 +13,6 @@ inherit autotools pkgconfig gconf
 
 inherit autotools pkgconfig gconf
 
-EXTRA_AUTORECONF += "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
-
 gnome_stage_includes() {
 	autotools_stage_includes
 }
============================================================
--- packages/eds/eds-dbus_svn.bb	4ad062f134d11e7678d1fc86cddf519497c8a2ae
+++ packages/eds/eds-dbus_svn.bb	b3aebc974d37ac917a96f3942fee385049c61d38
@@ -1,10 +1,10 @@ PV = "1.4.0+svn${SRCDATE}"
 DESCRIPTION = "Evolution database backend server"
 HOMEPAGE = "http://projects.o-hand.com/eds"
 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 @@ EXTRA_OECONF = "--without-openldap --wit
 
 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"
============================================================
--- packages/gnome/gnome-common-2.18.0/omf.patch	1598d7b5700f538dab8aa8c08dc180b52cab7cbd
+++ packages/gnome/gnome-common-2.18.0/omf.patch	64482903485c278eb01e08a2f700ca93963875a8
@@ -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)
  
============================================================
--- packages/gnome/gnome-common_2.4.0.bb	1520a8a1e79b7a32d00303332285f009cfa8c196
+++ packages/gnome/gnome-common_2.18.0.bb	7f6e44a0209c62cfeb9770d1df72704757bc2ebe
@@ -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}
 }