Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/21 10:56:50-07:00 amd.com!jcrouse
gnome-common_2.4.0.bb:
  No longer requres scrollkeeper
omf.patch:
  Patch to remove scrollkeeper dependancy

2005/02/21 10:53:41-07:00 amd.com!jcrouse
firefox_1.0.bb:
  add fix for 64 bit ickiness
jsautocfg.h, firefox-cc-fix.patch:
  Hand crafted files - replace the automatically generated one
nasm_0.98.38.bb:
  add x86_64 to the compatible host list

2005/02/21 10:47:34-07:00 amd.com!jcrouse
xfce.bbclass:
  change source repo and add packaging info
Many files:
  Add XFCE 4.2.0

2005/02/21 10:39:50-07:00 amd.com!jcrouse
guile-native_1.6.4.bb:
  add AMD64 bit fixes to guile
guile-amd64.patch:
  new file
gpdf_2.8.0.bb:
  Add omf.make fix for gftp

BKrev: 421a2b0emv8E6lWfEOpXxE6h9MBOPg

26 files changed, 92 insertions, 1 deletions

diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index e69de29bb2..02e9559fbc 100644
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -0,0 +1,26 @@
+# xfce.oeclass
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+# Global class to make it easier to maintain XFCE packages
+
+HOMEPAGE="http://www.xfce.org"
+LICENSE="LGPL-2"
+
+SRC_URI="http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz"
+
+# Most, but not *all* packages use pkgconfig, so we can't include it here
+# too
+
+inherit autotools
+
+EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/"
+
+# FIXME:  Put icons in their own package too?
+
+PACKAGES += "${PN}-mcs-plugins ${PN}-panel-plugins"
+
+FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*"
+FILES_${PN}-panel-plugins += "${libdir}/xfce4/panel-plugins/*.so*"
+FILES_${PN}-doc += " ${datadir}/xfce4/doc"
+FILES_${PN}-mcs-plugins="${libdir}/xfce4/mcs-plugins/*.so"
diff --git a/packages/gnome/gnome-common/omf.patch b/packages/gnome/gnome-common/omf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/gnome-common/omf.patch
diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.4.0.bb
index e69de29bb2..8722cfd02e 100644
--- a/packages/gnome/gnome-common_2.4.0.bb
+++ b/packages/gnome/gnome-common_2.4.0.bb
@@ -0,0 +1,27 @@
+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 -a ${STAGE_TEMP}/usr/bin/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
+	cp -a ${STAGE_TEMP}/usr/share/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
+	cp -a ${STAGE_TEMP}/usr/share/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal
+	rm -rf ${STAGE_TEMP}
+}
diff --git a/packages/gpdf/gpdf_2.8.0.bb b/packages/gpdf/gpdf_2.8.0.bb
index e69de29bb2..be94c73645 100644
--- a/packages/gpdf/gpdf_2.8.0.bb
+++ b/packages/gpdf/gpdf_2.8.0.bb
@@ -0,0 +1,17 @@
+LICENSE = GPL
+SECTION = "x11/utils"
+PR = "r0"
+
+inherit gnome
+
+DEPENDS = "gtk+ libgnomeui libbonoboui gnome-vfs gconf gettext libglade \
+	libgnomeprint libgnomeprintui gnome-common"
+
+EXTRA_OECONF = "--disable-schemas-install"
+
+SRC_URI += "file://aclocal-lossage.patch;patch=1 \
+	file://desktop.patch;patch=1"
+
+do_configure_prepend () {
+	cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}/help
+}
diff --git a/packages/guile/guile-amd64.patch b/packages/guile/guile-amd64.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/guile/guile-amd64.patch
diff --git a/packages/guile/guile-native_1.6.4.bb b/packages/guile/guile-native_1.6.4.bb
index 39dcaff63e..9457d054b0 100644
--- a/packages/guile/guile-native_1.6.4.bb
+++ b/packages/guile/guile-native_1.6.4.bb
@@ -1,7 +1,8 @@
 SECTION = "unknown"
 LICENSE = "GPL"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz"
+SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
+	   file://guile-amd64.patch;patch=1"
 
 inherit autotools native
 
diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb b/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb
diff --git a/packages/libxfce4util/libxfce4util_4.2.0.bb b/packages/libxfce4util/libxfce4util_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxfce4util/libxfce4util_4.2.0.bb
diff --git a/packages/libxfcegui4/libxfcegui4_4.2.0.bb b/packages/libxfcegui4/libxfcegui4_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxfcegui4/libxfcegui4_4.2.0.bb
diff --git a/packages/mozilla/firefox-1.0/firefox-cc-fix.patch b/packages/mozilla/firefox-1.0/firefox-cc-fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/firefox-1.0/firefox-cc-fix.patch
diff --git a/packages/mozilla/firefox-1.0/jsautocfg.h b/packages/mozilla/firefox-1.0/jsautocfg.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/firefox-1.0/jsautocfg.h
diff --git a/packages/mozilla/firefox_1.0.bb b/packages/mozilla/firefox_1.0.bb
index f893d9756f..9e34c3d4fa 100644
--- a/packages/mozilla/firefox_1.0.bb
+++ b/packages/mozilla/firefox_1.0.bb
@@ -2,7 +2,10 @@ PR = "r0"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
+	file://firefox-cc-fix.patch;patch=1 \
+	file://jsautocfg.h \
 	file://extensions-hack.patch;patch=1"
+
 S = "${WORKDIR}/mozilla"
 
 inherit mozilla
diff --git a/packages/nasm/nasm_0.98.38.bb b/packages/nasm/nasm_0.98.38.bb
index e69de29bb2..8edabcde1e 100644
--- a/packages/nasm/nasm_0.98.38.bb
+++ b/packages/nasm/nasm_0.98.38.bb
@@ -0,0 +1,17 @@
+SECTION = "devel"
+DESCRIPTION = "General-purpose x86 assembler"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)'
+LICENSE = "GPL"
+SECTION = "dev-lang"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/nasm/nasm-${PV}.tar.bz2"
+
+inherit autotools
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -d ${D}/${datadir}/man/man1
+
+	oe_runmake 'INSTALLROOT=${D}' install
+}
diff --git a/packages/xfcalendar/xfcalendar_4.2.0.bb b/packages/xfcalendar/xfcalendar_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfcalendar/xfcalendar_4.2.0.bb
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb
diff --git a/packages/xfce-utils/xfce-utils_4.2.0.bb b/packages/xfce-utils/xfce-utils_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfce-utils/xfce-utils_4.2.0.bb
diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb b/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb
diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb b/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb
diff --git a/packages/xfce4-panel/xfce4-panel_4.2.0.bb b/packages/xfce4-panel/xfce4-panel_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfce4-panel/xfce4-panel_4.2.0.bb
diff --git a/packages/xfdesktop/xfdesktop_4.2.0.bb b/packages/xfdesktop/xfdesktop_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfdesktop/xfdesktop_4.2.0.bb
diff --git a/packages/xffm/xffm-4.2.0/link.patch b/packages/xffm/xffm-4.2.0/link.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xffm/xffm-4.2.0/link.patch
diff --git a/packages/xffm/xffm_4.2.0.bb b/packages/xffm/xffm_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xffm/xffm_4.2.0.bb
diff --git a/packages/xfprint/xfprint_4.2.0.bb b/packages/xfprint/xfprint_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfprint/xfprint_4.2.0.bb
diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
diff --git a/packages/xfwm4/xfwm4_4.2.0.bb b/packages/xfwm4/xfwm4_4.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfwm4/xfwm4_4.2.0.bb