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-2.18.0/.mtn2git_empty b/packages/gnome/gnome-common-2.18.0/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gnome/gnome-common-2.18.0/omf.patch b/packages/gnome/gnome-common-2.18.0/omf.patch
new file mode 100644 (file)
index 0000000..0d85b00
--- /dev/null
+++ b/packages/gnome/gnome-common-2.18.0/omf.patch
@@ -0,0 +1,13 @@
+--- gnome-common-2.4.0/doc-build/omf.make      2003-05-24 08:16:25.000000000 -0700
++++ gnome-common-2.4.0.new/doc-build/omf.make  2004-11-15 14:01:12.185155192 -0700
+@@ -43,7 +43,9 @@
+ install-data-hook-omf:
+       $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+       for file in $(omffile); do \
+-              $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++              if [ -f $$file.out ]; then \
++                      $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++              fi; \
+       done
+       -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 

diff --git a/packages/gnome/gnome-common/.mtn2git_empty b/packages/gnome/gnome-common/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/gnome/gnome-common/omf.patch b/packages/gnome/gnome-common/omf.patch
deleted file mode 100644 (file)
index 334425e..0000000
--- a/packages/gnome/gnome-common/omf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome-common-2.4.0/doc-build/omf.make      2003-05-24 08:16:25.000000000 -0700
-+++ gnome-common-2.4.0.new/doc-build/omf.make  2004-11-15 14:01:12.185155192 -0700
-@@ -43,7 +43,9 @@
- install-data-hook-omf:
-       $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-       for file in $(omffile); do \
--              $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+              if [ -f $$file.out ]; then \
-+                      $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+              fi; \
-       done
-       -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 

diff --git a/packages/gnome/gnome-common_2.18.0.bb b/packages/gnome/gnome-common_2.18.0.bb
new file mode 100644 (file)
index 0000000..2991db8
--- /dev/null
+++ b/packages/gnome/gnome-common_2.18.0.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r0"
+DESCRIPTION = "Common macros for building GNOME applications"
+inherit gnome
+
+# The omf.make file failed if scrollkeeper doesn't happen to be
+# installed
+
+SRC_URI += "file://omf.patch;patch=1"
+
+EXTRA_AUTORECONF = ""
+DEPENDS = ""
+
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = ""
+
+do_stage () {
+       rm -rf ${STAGE_TEMP}
+       mkdir -p ${STAGE_TEMP}
+       make DESTDIR="${STAGE_TEMP}" install
+       cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+       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}
+}

diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.4.0.bb
deleted file mode 100644 (file)
index fc67bf9..0000000
--- a/packages/gnome/gnome-common_2.4.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-PR = "r0"
-DESCRIPTION = "Common macros for building GNOME applications"
-inherit gnome
-
-# The omf.make file failed if scrollkeeper doesn't happen to be
-# installed
-
-SRC_URI += "file://omf.patch;patch=1"
-
-EXTRA_AUTORECONF = ""
-DEPENDS = ""
-
-FILES_${PN} += "${datadir}/aclocal"
-FILES_${PN}-dev = ""
-
-do_stage () {
-       rm -rf ${STAGE_TEMP}
-       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
-       rm -rf ${STAGE_TEMP}
-}