summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/bitbake/bitbake_1.8.2.bb7
-rw-r--r--packages/bitbake/bitbake_svn.bb4
-rw-r--r--packages/directfb/directfb_1.0.0.bb7
-rw-r--r--packages/directfb/files/getpagesize.patch16
-rw-r--r--packages/ecj/.mtn2git_empty (renamed from packages/libxfce4mcs/.mtn2git_empty)0
-rw-r--r--packages/ecj/ecj-native_3.2.2.bb17
-rw-r--r--packages/ecj/files/.mtn2git_empty (renamed from packages/libxfce4util/.mtn2git_empty)0
-rw-r--r--packages/ecj/files/ecj.sh3
-rw-r--r--packages/efl/evas.inc1
-rw-r--r--packages/efl/evas/pagesize.patch13
-rw-r--r--packages/gperf/.mtn2git_empty (renamed from packages/libxfcegui4/.mtn2git_empty)0
-rw-r--r--packages/gperf/files/.mtn2git_empty (renamed from packages/qmake/qmake2-native-2.00a/.mtn2git_empty)0
-rw-r--r--packages/gperf/files/autoreconf.patch435
-rw-r--r--packages/gperf/gperf-native_3.0.3.bb10
-rw-r--r--packages/gperf/gperf_3.0.3.bb8
-rw-r--r--packages/libopieobex/libopieobex0.inc1
-rw-r--r--packages/libopieobex/libopieobex0_cvs.bb1
-rw-r--r--packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb5
-rw-r--r--packages/libxfce4util/libxfce4util_4.3.99.2.bb22
-rw-r--r--packages/libxfcegui4/libxfcegui4_4.2.3.bb5
-rw-r--r--packages/libxfcegui4/libxfcegui4_4.3.99.2.bb5
-rw-r--r--packages/mozilla/minimo/minimo.patch843
-rw-r--r--packages/mozilla/minimo_0.016+cvs.bb150
-rw-r--r--packages/mozilla/minimo_cvs.bb178
-rw-r--r--packages/opie-irdaapplet/files/.mtn2git_empty (renamed from packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty)0
-rw-r--r--packages/opie-irdaapplet/files/learning-cpp.patch13
-rw-r--r--packages/opie-irdaapplet/opie-irdaapplet_cvs.bb4
-rw-r--r--packages/perl/liburi-perl-native_1.35.bb2
-rw-r--r--packages/perl/liburi-perl_1.35.bb10
-rw-r--r--packages/qmake/qmake2-native-2.01a/.mtn2git_empty (renamed from packages/xfce-mcs-manager/.mtn2git_empty)0
-rw-r--r--packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf (renamed from packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf)0
-rw-r--r--packages/qmake/qmake2-native_2.01a.bb (renamed from packages/qmake/qmake2-native_2.00a.bb)4
-rw-r--r--packages/uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty (renamed from packages/xfce-mcs-plugins/.mtn2git_empty)0
-rw-r--r--packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch (renamed from packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch)0
-rw-r--r--packages/uicmoc/uicmoc4-native_4.2.3.bb (renamed from packages/uicmoc/uicmoc4-native_4.1.1.bb)1
-rw-r--r--packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb5
-rw-r--r--packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb5
-rw-r--r--packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb5
-rw-r--r--packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb5
-rw-r--r--packages/xfce-utils/xfce-utils_4.3.99.2.bb6
-rw-r--r--packages/xfce/.mtn2git_empty (renamed from packages/xfce-utils/.mtn2git_empty)0
-rw-r--r--packages/xfce/exo_0.3.2.bb17
-rw-r--r--packages/xfce/gtk-xfce-engine_2.4.1.bb9
-rw-r--r--packages/xfce/libxfce4mcs.inc (renamed from packages/libxfce4mcs/libxfce4mcs.inc)0
-rw-r--r--packages/xfce/libxfce4mcs_4.4.1.bb (renamed from packages/libxfce4mcs/libxfce4mcs_4.2.2.bb)0
-rw-r--r--packages/xfce/libxfce4util.inc (renamed from packages/libxfce4util/libxfce4util.inc)13
-rw-r--r--packages/xfce/libxfce4util_4.4.1.bb (renamed from packages/libxfce4util/libxfce4util_4.2.2.bb)2
-rw-r--r--packages/xfce/libxfcegui4.inc (renamed from packages/libxfcegui4/libxfcegui4.inc)0
-rw-r--r--packages/xfce/libxfcegui4_4.4.1.bb (renamed from packages/libxfcegui4/libxfcegui4_4.2.2.bb)0
-rw-r--r--packages/xfce/mousepad_0.2.12.bb6
-rw-r--r--packages/xfce/orage_4.4.1.bb5
-rw-r--r--packages/xfce/thunar_0.8.0.bb15
-rw-r--r--packages/xfce/xfce-mcs-manager.inc (renamed from packages/xfce-mcs-manager/xfce-mcs-manager.inc)0
-rw-r--r--packages/xfce/xfce-mcs-manager_4.4.1.bb (renamed from packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb)0
-rw-r--r--packages/xfce/xfce-mcs-plugins.inc (renamed from packages/xfce-mcs-plugins/xfce-mcs-plugins.inc)0
-rw-r--r--packages/xfce/xfce-mcs-plugins_4.4.1.bb (renamed from packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb)0
-rw-r--r--packages/xfce/xfce-terminal_0.2.6.bb8
-rw-r--r--packages/xfce/xfce-utils.inc (renamed from packages/xfce-utils/xfce-utils.inc)0
-rw-r--r--packages/xfce/xfce-utils_4.4.1.bb (renamed from packages/xfce-utils/xfce-utils_4.2.2.bb)0
-rw-r--r--packages/xfce/xfce4-appfinder.inc (renamed from packages/xfce4-goodies/xfce4-appfinder.inc)0
-rw-r--r--packages/xfce/xfce4-appfinder_4.4.1.bb (renamed from packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb)0
-rw-r--r--packages/xfce/xfce4-dev-tools.inc12
-rw-r--r--packages/xfce/xfce4-dev-tools_4.4.0.bb1
-rw-r--r--packages/xfce/xfce4-icon-theme_4.4.1.bb6
-rw-r--r--packages/xfce/xfce4-mixer.inc (renamed from packages/xfce4-goodies/xfce4-mixer.inc)0
-rw-r--r--packages/xfce/xfce4-mixer_4.4.1.bb (renamed from packages/xfce4-goodies/xfce4-mixer_4.2.2.bb)0
-rw-r--r--packages/xfce/xfce4-panel.inc (renamed from packages/xfce4-panel/xfce4-panel.inc)0
-rw-r--r--packages/xfce/xfce4-panel_4.4.1.bb (renamed from packages/xfce4-panel/xfce4-panel_4.2.2.bb)0
-rw-r--r--packages/xfce/xfce4-session_4.4.1.bb4
-rw-r--r--packages/xfce/xfdesktop.inc (renamed from packages/xfdesktop/xfdesktop.inc)0
-rw-r--r--packages/xfce/xfdesktop_4.4.1.bb (renamed from packages/xfdesktop/xfdesktop_4.2.2.bb)0
-rw-r--r--packages/xfce/xfprint_4.4.1.bb (renamed from packages/xfprint/xfprint_4.2.0.bb)0
-rw-r--r--packages/xfce/xfwm4-themes.inc (renamed from packages/xfwm4-themes/xfwm4-themes.inc)0
-rw-r--r--packages/xfce/xfwm4-themes_4.4.1.bb (renamed from packages/xfwm4-themes/xfwm4-themes_4.2.2.bb)0
-rw-r--r--packages/xfce/xfwm4.inc (renamed from packages/xfwm4/xfwm4.inc)0
-rw-r--r--packages/xfce/xfwm4_4.4.1.bb (renamed from packages/xfwm4/xfwm4_4.2.2.bb)0
-rw-r--r--packages/xfce4-goodies/.mtn2git_empty0
-rw-r--r--packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb5
-rw-r--r--packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb5
-rw-r--r--packages/xfce4-panel/.mtn2git_empty0
-rw-r--r--packages/xfce4-panel/xfce4-panel_4.3.99.2.bb6
-rw-r--r--packages/xfdesktop/.mtn2git_empty0
-rw-r--r--packages/xfdesktop/xfdesktop_4.2.0.bb12
-rw-r--r--packages/xfdesktop/xfdesktop_4.3.99.2.bb6
-rw-r--r--packages/xfwm4-themes/.mtn2git_empty0
-rw-r--r--packages/xfwm4-themes/xfwm4-themes_4.2.0.bb18
-rw-r--r--packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb5
-rw-r--r--packages/xfwm4/.mtn2git_empty0
-rw-r--r--packages/xfwm4/xfwm4_4.2.0.bb22
-rw-r--r--packages/xfwm4/xfwm4_4.2.3.2.bb5
-rw-r--r--packages/xfwm4/xfwm4_4.3.99.2.bb5
-rw-r--r--packages/xorg-app/xdm_1.1.3.bb2
92 files changed, 1092 insertions, 888 deletions
diff --git a/packages/bitbake/bitbake_1.8.2.bb b/packages/bitbake/bitbake_1.8.2.bb
new file mode 100644
index 0000000000..a2cd3899a1
--- /dev/null
+++ b/packages/bitbake/bitbake_1.8.2.bb
@@ -0,0 +1,7 @@
+require bitbake.inc
+
+PR = "r0"
+
+SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz"
+
+S = "${WORKDIR}/bitbake-${PV}"
diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb
index d16471d405..247140b6c6 100644
--- a/packages/bitbake/bitbake_svn.bb
+++ b/packages/bitbake/bitbake_svn.bb
@@ -1,7 +1,7 @@
require bitbake.inc
-PV = "1.7.2+svn${SRCDATE}"
-PR = "r1"
+PV = "1.9.0+svn${SRCDATE}"
+PR = "r0"
# Don't use the tip of svn by default
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index 5effeb8de6..cbeede90ab 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -7,12 +7,13 @@ SECTION = "libs"
LICENSE = "LGPL"
HOMEPAGE = "http://directfb.org"
DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r2"
+PR = "r3"
RV = "1.0-0"
SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
- file://fix-pkgconfig-cflags.patch;patch=1 \
- file://mkdfiff.patch;patch=1"
+ file://fix-pkgconfig-specs.patch;patch=1 \
+ file://mkdfiff.patch;patch=1 \
+ file://getpagesize.patch;patch=1"
S = "${WORKDIR}/DirectFB-1.0.0"
diff --git a/packages/directfb/files/getpagesize.patch b/packages/directfb/files/getpagesize.patch
new file mode 100644
index 0000000000..256b8db290
--- /dev/null
+++ b/packages/directfb/files/getpagesize.patch
@@ -0,0 +1,16 @@
+diff --git a/lib/direct/system.c b/lib/direct/system.c
+index 8dd3f12..0731fa2 100644
+--- a/lib/direct/system.c
++++ b/lib/direct/system.c
+@@ -36,8 +36,9 @@
+
+ #if HAVE_ASM_PAGE_H
+ #include <asm/page.h>
+-#else
+-#define PAGE_SIZE sysconf( _SC_PAGESIZE )
++#endif
++#ifndef PAGE_SIZE
++# define PAGE_SIZE (getpagesize())
+ #endif
+
+
diff --git a/packages/libxfce4mcs/.mtn2git_empty b/packages/ecj/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxfce4mcs/.mtn2git_empty
+++ b/packages/ecj/.mtn2git_empty
diff --git a/packages/ecj/ecj-native_3.2.2.bb b/packages/ecj/ecj-native_3.2.2.bb
new file mode 100644
index 0000000000..8afa2653ca
--- /dev/null
+++ b/packages/ecj/ecj-native_3.2.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "JDT Core Batch Compiler"
+HOMEPAGE = "http://www.eclipse.org/"
+PRIORITY = "optional"
+SECTION = "devel"
+LICENSE = "EPL"
+PR = "r0"
+
+inherit native
+
+SRC_URI = "http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.2.2-200702121330/ecj.jar \
+ file://ecj.sh"
+
+do_stage() {
+ install -d ${STAGING_BINDIR_NATIVE}
+ install -m 755 ${S}/../ecj.jar ${STAGING_BINDIR_NATIVE}
+ install -m 755 ${S}/../ecj.sh ${STAGING_BINDIR_NATIVE}/ecj
+}
diff --git a/packages/libxfce4util/.mtn2git_empty b/packages/ecj/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxfce4util/.mtn2git_empty
+++ b/packages/ecj/files/.mtn2git_empty
diff --git a/packages/ecj/files/ecj.sh b/packages/ecj/files/ecj.sh
new file mode 100644
index 0000000000..75aa2c2287
--- /dev/null
+++ b/packages/ecj/files/ecj.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -Xmx512m -jar $0.jar "$@"
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index ceca03c0a8..5e34bb3014 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -13,6 +13,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
file://fix-configure.patch;patch=1 \
+ file://pagesize.patch;patch=1 \
${E_CVS};module=e17/libs/evas/m4;date=20060101"
S = "${WORKDIR}/evas-${PV}"
diff --git a/packages/efl/evas/pagesize.patch b/packages/efl/evas/pagesize.patch
new file mode 100644
index 0000000000..5efd16a96e
--- /dev/null
+++ b/packages/efl/evas/pagesize.patch
@@ -0,0 +1,13 @@
+diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c
+index e26c171..75e0743 100644
+--- a/src/modules/engines/fb/evas_fb_main.c
++++ b/src/modules/engines/fb/evas_fb_main.c
+@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode)
+ fb_cleanup();
+ exit(1);
+ }
+- mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK);
++ mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1);
+ mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset,
+ PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0);
+ if ((int)mode->mem == -1)
diff --git a/packages/libxfcegui4/.mtn2git_empty b/packages/gperf/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxfcegui4/.mtn2git_empty
+++ b/packages/gperf/.mtn2git_empty
diff --git a/packages/qmake/qmake2-native-2.00a/.mtn2git_empty b/packages/gperf/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qmake/qmake2-native-2.00a/.mtn2git_empty
+++ b/packages/gperf/files/.mtn2git_empty
diff --git a/packages/gperf/files/autoreconf.patch b/packages/gperf/files/autoreconf.patch
new file mode 100644
index 0000000000..432023067b
--- /dev/null
+++ b/packages/gperf/files/autoreconf.patch
@@ -0,0 +1,435 @@
+Index: gperf-3.0.3/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/configure.ac 2007-05-10 18:34:15.000000000 +0200
++++ gperf-3.0.3/configure.ac 2007-05-10 18:34:26.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(doc/gperf.1)
+ AC_PROG_MAKE_SET
+ AC_OBJEXT
+Index: gperf-3.0.3/doc/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/doc/configure.ac 2007-05-10 18:34:30.000000000 +0200
++++ gperf-3.0.3/doc/configure.ac 2007-05-10 18:34:37.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(gperf.1)
+ PACKAGE=gperf
+ AC_SUBST(PACKAGE)
+Index: gperf-3.0.3/lib/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/lib/configure.ac 2007-05-10 18:34:41.000000000 +0200
++++ gperf-3.0.3/lib/configure.ac 2007-05-10 18:34:46.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(hash.cc)
+ AC_PROG_MAKE_SET
+ dnl
+Index: gperf-3.0.3/src/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/src/configure.ac 2007-05-10 18:34:53.000000000 +0200
++++ gperf-3.0.3/src/configure.ac 2007-05-10 18:34:58.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(main.cc)
+ AC_CONFIG_HEADER(config.h)
+ AC_PROG_MAKE_SET
+Index: gperf-3.0.3/tests/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/tests/configure.ac 2007-05-10 18:35:03.000000000 +0200
++++ gperf-3.0.3/tests/configure.ac 2007-05-10 18:35:08.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(c-parse.gperf)
+ AC_PROG_MAKE_SET
+ dnl
+Index: gperf-3.0.3/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/acinclude.m4 2007-05-10 18:36:09.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
+Index: gperf-3.0.3/doc/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/doc/acinclude.m4 2007-05-10 18:36:11.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
+Index: gperf-3.0.3/lib/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/lib/acinclude.m4 2007-05-10 18:36:14.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
+Index: gperf-3.0.3/src/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/src/acinclude.m4 2007-05-10 18:36:12.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
+Index: gperf-3.0.3/tests/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/tests/acinclude.m4 2007-05-10 18:36:16.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
diff --git a/packages/gperf/gperf-native_3.0.3.bb b/packages/gperf/gperf-native_3.0.3.bb
new file mode 100644
index 0000000000..103d1aa3c2
--- /dev/null
+++ b/packages/gperf/gperf-native_3.0.3.bb
@@ -0,0 +1,10 @@
+require gperf_${PV}.bb
+
+S = "${WORKDIR}/gperf-${PV}"
+
+inherit native
+
+do_stage() {
+ install -d ${STAGING_BINDIR_NATIVE}
+ install ${S}/src/gperf ${STAGING_BINDIR_NATIVE}
+}
diff --git a/packages/gperf/gperf_3.0.3.bb b/packages/gperf/gperf_3.0.3.bb
new file mode 100644
index 0000000000..7abfb8fbfb
--- /dev/null
+++ b/packages/gperf/gperf_3.0.3.bb
@@ -0,0 +1,8 @@
+HOMEPAGE = "http://www.gnu.org/software/gperf"
+LICENSE = "GPL"
+SUMMARY = "Generate a perfect hash function from a set of keywords"
+
+SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz \
+ file://autoreconf.patch;patch=1"
+
+inherit autotools
diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc
index a93842f72c..3fe3d533e5 100644
--- a/packages/libopieobex/libopieobex0.inc
+++ b/packages/libopieobex/libopieobex0.inc
@@ -14,6 +14,7 @@ EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/opietooth"
do_install() {
install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
+ install -m 0644 ${WORKDIR}/pics/backup/check.png ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
}
diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index e5f1cb8bc9..471df694cb 100644
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,5 +1,6 @@
require libopieobex0.inc
PV = "${OPIE_CVS_PV}"
+PR = r1
SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
deleted file mode 100644
index 07d7a95ae1..0000000000
--- a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfce4mcs OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/libxfce4util/libxfce4util_4.3.99.2.bb b/packages/libxfce4util/libxfce4util_4.3.99.2.bb
deleted file mode 100644
index d1c29197d6..0000000000
--- a/packages/libxfce4util/libxfce4util_4.3.99.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require ${PN}.inc
-
-SRC_URI += "\
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-depends.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-features.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-python.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-xfce.m4"
-
-
-MACROS="m4/xdt*.m4"
-
-XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \
- i18n.h util.h xfce-kiosk.h libxfce4util-config.h \
- xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \
- xfce-fileutils.h xfce-rc.h xfce-utf8.h \
- xfce-license.h xfce-i18n.h libxfce4util-enum-types.h"
-
-do_configure_prepend() {
- install -m 0755 -d ${S}/m4/
- install -m 0644 ${WORKDIR}/xdt-*.m4 ${S}/m4/
-}
diff --git a/packages/libxfcegui4/libxfcegui4_4.2.3.bb b/packages/libxfcegui4/libxfcegui4_4.2.3.bb
deleted file mode 100644
index 2def53685a..0000000000
--- a/packages/libxfcegui4/libxfcegui4_4.2.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfcegui4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
deleted file mode 100644
index 2def53685a..0000000000
--- a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfcegui4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/mozilla/minimo/minimo.patch b/packages/mozilla/minimo/minimo.patch
index a1f9291167..8894ee7f45 100644
--- a/packages/mozilla/minimo/minimo.patch
+++ b/packages/mozilla/minimo/minimo.patch
@@ -1,567 +1,356 @@
Index: mozilla/content/html/content/src/nsFormSubmission.cpp
===================================================================
-RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v
-retrieving revision 1.46
-diff --context=3 -r1.46 nsFormSubmission.cpp
-*** mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46
---- mozilla/content/html/content/src/nsFormSubmission.cpp 21 Jul 2006 00:27:14 -0000
-***************
-*** 1315,1325 ****
- nsresult rv = NS_OK;
-
- nsCAutoString charset(aCharset);
-- // canonical name is passed so that we just have to check against
-- // *our* canonical names listed in charsetaliases.properties
-- if (charset.EqualsLiteral("ISO-8859-1")) {
-- charset.AssignLiteral("windows-1252");
-- }
-
- // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
- // MS IE/Opera).
---- 1315,1320 ----
+--- mozilla.orig/content/html/content/src/nsFormSubmission.cpp 2005-07-13 18:55:59.000000000 +0200
++++ mozilla/content/html/content/src/nsFormSubmission.cpp 2007-05-10 12:11:20.000000000 +0200
+@@ -1315,11 +1315,6 @@
+ nsresult rv = NS_OK;
+
+ nsCAutoString charset(aCharset);
+- // canonical name is passed so that we just have to check against
+- // *our* canonical names listed in charsetaliases.properties
+- if (charset.EqualsLiteral("ISO-8859-1")) {
+- charset.AssignLiteral("windows-1252");
+- }
+
+ // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
+ // MS IE/Opera).
Index: mozilla/embedding/base/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v
-retrieving revision 1.34.8.2
-diff --context=3 -r1.34.8.2 Makefile.in
-*** mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2
---- mozilla/embedding/base/Makefile.in 21 Jul 2006 00:27:14 -0000
-***************
-*** 43,48 ****
---- 43,49 ----
-
- MODULE = embed_base
- LIBRARY_NAME = embed_base_s
-+ EXPORT_LIBRARY = 1
- XPIDL_MODULE = embed_base
-
- include $(DEPTH)/config/autoconf.mk
+--- mozilla.orig/embedding/base/Makefile.in 2006-02-14 06:28:31.000000000 +0100
++++ mozilla/embedding/base/Makefile.in 2007-05-10 12:11:20.000000000 +0200
+@@ -43,6 +43,7 @@
+
+ MODULE = embed_base
+ LIBRARY_NAME = embed_base_s
++EXPORT_LIBRARY = 1
+ XPIDL_MODULE = embed_base
+
+ include $(DEPTH)/config/autoconf.mk
Index: mozilla/js/src/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
-retrieving revision 3.95.4.4
-diff --context=3 -r3.95.4.4 Makefile.in
-*** mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4
---- mozilla/js/src/Makefile.in 21 Jul 2006 00:27:14 -0000
-***************
-*** 46,51 ****
---- 46,52 ----
-
- MODULE = js
- LIBRARY_NAME = mozjs
-+ EXPORT_LIBRARY = 1
- LIB_IS_C_ONLY = 1
- GRE_MODULE = 1
-
+--- mozilla.orig/js/src/Makefile.in 2006-07-28 00:56:20.000000000 +0200
++++ mozilla/js/src/Makefile.in 2007-05-10 12:11:21.000000000 +0200
+@@ -46,6 +46,7 @@
+
+ MODULE = js
+ LIBRARY_NAME = mozjs
++EXPORT_LIBRARY = 1
+ LIB_IS_C_ONLY = 1
+ GRE_MODULE = 1
+
Index: mozilla/minimo/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/minimo/Makefile.in,v
-retrieving revision 1.1.2.2
-diff --context=3 -r1.1.2.2 Makefile.in
-*** mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2
---- mozilla/minimo/Makefile.in 21 Jul 2006 00:27:14 -0000
-***************
-*** 41,46 ****
-
- include $(DEPTH)/config/autoconf.mk
-
-! DIRS = config components chrome locales customization base
-
- include $(topsrcdir)/config/rules.mk
---- 41,46 ----
-
- include $(DEPTH)/config/autoconf.mk
-
-! DIRS = config chrome locales customization base
-
- include $(topsrcdir)/config/rules.mk
+--- mozilla.orig/minimo/Makefile.in 2006-07-24 21:40:53.000000000 +0200
++++ mozilla/minimo/Makefile.in 2007-05-10 12:13:46.000000000 +0200
+@@ -41,6 +41,6 @@
+
+ include $(DEPTH)/config/autoconf.mk
+
+-DIRS = config components chrome locales customization base extensions
++DIRS = config chrome locales customization base extensions
+
+ include $(topsrcdir)/config/rules.mk
Index: mozilla/minimo/base/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v
-retrieving revision 1.3.2.7
-diff --context=3 -r1.3.2.7 Makefile.in
-*** mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7
---- mozilla/minimo/base/Makefile.in 21 Jul 2006 00:27:14 -0000
-***************
-*** 95,101 ****
-
- # this should move into the toolkit!
- LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
-- CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
-
- ifdef WINCE
- RCINCLUDE = wince/SplashScreen.rc
---- 95,100 ----
-***************
-*** 139,148 ****
- endif
-
-
-- FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
-- FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
-- FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
--
- include $(topsrcdir)/config/static-config.mk
-
- EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
---- 138,143 ----
-***************
-*** 176,189 ****
- # (same as in mozilla/js/src/Makefile.in)
- ifdef WINCE
- LDFLAGS += -OPT:NOICF
- endif
-
-- export::
-- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
-- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
--
--
-- GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
-
- ifdef WINCE
- package::
---- 171,181 ----
- # (same as in mozilla/js/src/Makefile.in)
- ifdef WINCE
- LDFLAGS += -OPT:NOICF
-+ else
-+ # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
-+ LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
- endif
-
-
- ifdef WINCE
- package::
+--- mozilla.orig/minimo/base/Makefile.in 2006-08-09 17:42:26.000000000 +0200
++++ mozilla/minimo/base/Makefile.in 2007-05-10 12:11:21.000000000 +0200
+@@ -96,7 +96,6 @@
+
+ # this should move into the toolkit!
+ LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
+-CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
+
+ ifdef WINCE
+ RCINCLUDE = wince/SplashScreen.rc
+@@ -143,10 +142,6 @@
+ endif
+
+
+-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
+-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
+-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
+-
+ include $(topsrcdir)/config/static-config.mk
+
+ EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
+@@ -180,14 +175,11 @@
+ # (same as in mozilla/js/src/Makefile.in)
+ ifdef WINCE
+ LDFLAGS += -OPT:NOICF
++else
++# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
++LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
+ endif
+
+-export::
+- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
+- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
+-
+-
+-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
+
+ ifdef WINCE
+ package::
Index: mozilla/minimo/base/Minimo.cpp
===================================================================
-RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v
-retrieving revision 1.1.2.11
-diff --context=3 -r1.1.2.11 Minimo.cpp
-*** mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11
---- mozilla/minimo/base/Minimo.cpp 21 Jul 2006 00:27:15 -0000
-***************
-*** 781,789 ****
- CreateListenerWindow();
- #endif
-
-! #ifdef MOZ_WIDGET_GTK2
- gtk_set_locale();
- gtk_init(&argc, &argv);
- #endif
-
- #ifdef HACKY_PRE_LOAD_LIBRARY
---- 781,794 ----
- CreateListenerWindow();
- #endif
-
-! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-! #if defined(MOZ_WIDGET_GTK)
- gtk_set_locale();
-+ #endif
- gtk_init(&argc, &argv);
-+
-+ gtk_widget_set_default_visual(gdk_rgb_get_visual());
-+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
- #endif
-
- #ifdef HACKY_PRE_LOAD_LIBRARY
+--- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200
++++ mozilla/minimo/base/Minimo.cpp 2007-05-10 12:13:21.000000000 +0200
+@@ -813,6 +813,8 @@
+ #ifdef MOZ_WIDGET_GTK2
+ gtk_set_locale();
+ gtk_init(&argc, &argv);
++ gtk_widget_set_default_visual(gdk_rgb_get_visual());
++ gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
+ #endif
+
+ #ifdef HACKY_PRE_LOAD_LIBRARY
Index: mozilla/minimo/base/SplashScreen.cpp
===================================================================
-RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v
-retrieving revision 1.1.2.3
-diff --context=3 -r1.1.2.3 SplashScreen.cpp
-*** mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3
---- mozilla/minimo/base/SplashScreen.cpp 21 Jul 2006 00:27:15 -0000
-***************
-*** 180,188 ****
---- 180,203 ----
- void KillSplashScreen() {}
- void GetScreenSize(unsigned long* x, unsigned long* y)
- {
-+ #ifdef MOZ_WIDGET_GTK2
-+ GdkDisplay* display = gdk_display_get_default();
-+ if (display != NULL)
-+ {
-+ GdkScreen *screen;
-+ screen = gdk_display_get_default_screen(display);
-+ *x = gdk_screen_get_width(screen);
-+ *y = gdk_screen_get_height(screen);
-+ }
-+ else
-+ {
-+ #endif
- // we need to figure this out.
- *x = 240;
- *y = 320;
-+ #ifdef MOZ_WIDGET_GTK2
-+ }
-+ #endif
- }
-
-
-Index: mozilla/minimo/chrome/content/minimo.js
-===================================================================
-RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
-retrieving revision 1.9.2.90
-diff --context=3 -r1.9.2.90 minimo.js
-*** mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90
---- mozilla/minimo/chrome/content/minimo.js 21 Jul 2006 00:27:16 -0000
-***************
-*** 1313,1319 ****
- 43 const FIND_LINKS = 2;
- http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
- */
-! gBrowser.fastFind.find(vQuery,0);
- }
- } catch (e) {
- onErrorHandler(e);
---- 1313,1319 ----
- 43 const FIND_LINKS = 2;
- http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
- */
-! gBrowser.fastFind.find(vQuery,0,this.mHasFocus);
- }
- } catch (e) {
- onErrorHandler(e);
-***************
-*** 1324,1330 ****
-
- function DoBrowserFindNext() {
- try {
-! gBrowser.fastFind.findNext();
- } catch (e) {
- onErrorHandler(e);
- }
---- 1324,1330 ----
-
- function DoBrowserFindNext() {
- try {
-! gBrowser.fastFind.findNext(this.mHasFocus);
- } catch (e) {
- onErrorHandler(e);
- }
+--- mozilla.orig/minimo/base/SplashScreen.cpp 2006-08-21 21:00:24.000000000 +0200
++++ mozilla/minimo/base/SplashScreen.cpp 2007-05-10 12:11:22.000000000 +0200
+@@ -202,9 +202,24 @@
+ void KillSplashScreen() {}
+ void GetScreenSize(unsigned long* x, unsigned long* y)
+ {
++#ifdef MOZ_WIDGET_GTK2
++ GdkDisplay* display = gdk_display_get_default();
++ if (display != NULL)
++ {
++ GdkScreen *screen;
++ screen = gdk_display_get_default_screen(display);
++ *x = gdk_screen_get_width(screen);
++ *y = gdk_screen_get_height(screen);
++ }
++ else
++ {
++#endif
+ // we need to figure this out.
+ *x = 240;
+ *y = 320;
++#ifdef MOZ_WIDGET_GTK2
++ }
++#endif
+ }
+
+
Index: mozilla/minimo/config/linux_package.sh
===================================================================
-RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v
-retrieving revision 1.8.2.3
-diff --context=3 -r1.8.2.3 linux_package.sh
-*** mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3
---- mozilla/minimo/config/linux_package.sh 21 Jul 2006 00:27:16 -0000
-***************
-*** 29,37 ****
- cp -pRL bin/libnssckbi.so minimo
- cp -pRL bin/libsmime3.so minimo
- cp -pRL bin/libsoftokn3.so minimo
-- cp -pRL bin/libsoftokn3.chk minimo
- cp -pRL bin/libfreebl3.so minimo
-- cp -pRL bin/libfreebl3.chk minimo
- cp -pRL bin/libssl3.so minimo
-
- mkdir -p minimo/chrome
---- 29,35 ----
-***************
-*** 62,69 ****
- cp -pRL bin/components/nsHelperAppDlg.js minimo/components
- cp -pRL bin/components/nsProgressDialog.js minimo/components
-
-- cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
--
- mkdir -p minimo/greprefs
- cp -pRL bin/greprefs/* minimo/greprefs
-
---- 60,65 ----
-***************
-*** 80,86 ****
-
- echo Linking XPT files.
-
-! bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
-
- echo Chewing on chrome
-
---- 76,82 ----
-
- echo Linking XPT files.
-
-! host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
-
- echo Chewing on chrome
-
+--- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200
++++ mozilla/minimo/config/linux_package.sh 2007-05-10 12:11:22.000000000 +0200
+@@ -29,9 +29,7 @@
+ cp -pRL bin/libnssckbi.so minimo
+ cp -pRL bin/libsmime3.so minimo
+ cp -pRL bin/libsoftokn3.so minimo
+-cp -pRL bin/libsoftokn3.chk minimo
+ cp -pRL bin/libfreebl3.so minimo
+-cp -pRL bin/libfreebl3.chk minimo
+ cp -pRL bin/libssl3.so minimo
+
+ mkdir -p minimo/chrome
+@@ -62,8 +60,6 @@
+ cp -pRL bin/components/nsHelperAppDlg.js minimo/components
+ cp -pRL bin/components/nsProgressDialog.js minimo/components
+
+-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
+-
+ mkdir -p minimo/greprefs
+ cp -pRL bin/greprefs/* minimo/greprefs
+
+@@ -80,7 +76,7 @@
+
+ echo Linking XPT files.
+
+-bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
++host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
+
+ echo Chewing on chrome
+
Index: mozilla/profile/dirserviceprovider/src/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v
-retrieving revision 1.7
-diff --context=3 -r1.7 Makefile.in
-*** mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7
---- mozilla/profile/dirserviceprovider/src/Makefile.in 21 Jul 2006 00:27:16 -0000
-***************
-*** 44,49 ****
---- 44,50 ----
-
- MODULE = profdirserviceprovider
- LIBRARY_NAME = profdirserviceprovider_s
-+ EXPORT_LIBRARY = 1
- MOZILLA_INTERNAL_API = 1
-
- REQUIRES = xpcom \
+--- mozilla.orig/profile/dirserviceprovider/src/Makefile.in 2005-04-06 05:35:21.000000000 +0200
++++ mozilla/profile/dirserviceprovider/src/Makefile.in 2007-05-10 12:11:23.000000000 +0200
+@@ -44,6 +44,7 @@
+
+ MODULE = profdirserviceprovider
+ LIBRARY_NAME = profdirserviceprovider_s
++EXPORT_LIBRARY = 1
+ MOZILLA_INTERNAL_API = 1
+
+ REQUIRES = xpcom \
Index: mozilla/security/coreconf/Linux.mk
===================================================================
-RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
-retrieving revision 1.18.18.1
-diff --context=3 -r1.18.18.1 Linux.mk
-*** mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1
---- mozilla/security/coreconf/Linux.mk 21 Jul 2006 00:27:16 -0000
-***************
-*** 117,122 ****
---- 117,126 ----
- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
- CPU_ARCH = mips
- else
-+ ifeq ($(OS_TEST),arm)
-+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = arm
-+ else
- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
- CPU_ARCH = x86
- endif
-***************
-*** 133,138 ****
---- 137,143 ----
- endif
- endif
- endif
-+ endif
-
-
- LIBC_TAG = _glibc
+--- mozilla.orig/security/coreconf/Linux.mk 2006-02-03 23:26:36.000000000 +0100
++++ mozilla/security/coreconf/Linux.mk 2007-05-10 12:11:23.000000000 +0200
+@@ -117,6 +117,10 @@
+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = mips
+ else
++ifeq ($(OS_TEST),arm)
++ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
++ CPU_ARCH = arm
++else
+ OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+ CPU_ARCH = x86
+ endif
+@@ -133,6 +137,7 @@
+ endif
+ endif
+ endif
++endif
+
+
+ LIBC_TAG = _glibc
Index: mozilla/security/coreconf/arch.mk
===================================================================
-RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
-retrieving revision 1.17.14.2
-diff --context=3 -r1.17.14.2 arch.mk
-*** mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2
---- mozilla/security/coreconf/arch.mk 21 Jul 2006 00:27:16 -0000
-***************
-*** 60,77 ****
- 64BIT_TAG=
- endif
-
-! OS_ARCH := $(subst /,_,$(shell uname -s))
-
- #
- # Attempt to differentiate between sparc and x86 Solaris
- #
-
-! OS_TEST := $(shell uname -m)
-! ifeq ($(OS_TEST),i86pc)
-! OS_RELEASE := $(shell uname -r)_$(OS_TEST)
-! else
-! OS_RELEASE := $(shell uname -r)
-! endif
-
- #
- # Force the IRIX64 machines to use IRIX.
---- 60,73 ----
- 64BIT_TAG=
- endif
-
-! OS_ARCH := Linux
-
- #
- # Attempt to differentiate between sparc and x86 Solaris
- #
-
-! OS_TEST := arm
-! OS_RELEASE := 2.6
-
- #
- # Force the IRIX64 machines to use IRIX.
+--- mozilla.orig/security/coreconf/arch.mk 2006-02-03 23:26:36.000000000 +0100
++++ mozilla/security/coreconf/arch.mk 2007-05-10 12:11:24.000000000 +0200
+@@ -60,18 +60,14 @@
+ 64BIT_TAG=
+ endif
+
+-OS_ARCH := $(subst /,_,$(shell uname -s))
++OS_ARCH := Linux
+
+ #
+ # Attempt to differentiate between sparc and x86 Solaris
+ #
+
+-OS_TEST := $(shell uname -m)
+-ifeq ($(OS_TEST),i86pc)
+- OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+-else
+- OS_RELEASE := $(shell uname -r)
+-endif
++OS_TEST := arm
++OS_RELEASE := 2.6
+
+ #
+ # Force the IRIX64 machines to use IRIX.
Index: mozilla/toolkit/components/build/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v
-retrieving revision 1.24.2.10
-diff --context=3 -r1.24.2.10 Makefile.in
-*** mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10
---- mozilla/toolkit/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000
-***************
-*** 112,118 ****
- $(NULL)
-
- SHARED_LIBRARY_LIBS = \
-- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
- $(NULL)
-
- ifdef MOZ_XPINSTALL
---- 112,117 ----
+--- mozilla.orig/toolkit/components/build/Makefile.in 2006-07-13 22:08:29.000000000 +0200
++++ mozilla/toolkit/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
+@@ -112,7 +112,6 @@
+ $(NULL)
+
+ SHARED_LIBRARY_LIBS = \
+- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
+ $(NULL)
+
+ ifdef MOZ_XPINSTALL
Index: mozilla/toolkit/components/startup/src/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v
-retrieving revision 1.7
-diff --context=3 -r1.7 Makefile.in
-*** mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7
---- mozilla/toolkit/components/startup/src/Makefile.in 21 Jul 2006 00:27:17 -0000
-***************
-*** 43,48 ****
---- 43,49 ----
-
- MODULE = toolkitcomps
- LIBRARY_NAME = appstartup_s
-+ EXPORT_LIBRARY = 1
- FORCE_STATIC_LIB = 1
- LIBXUL_LIBRARY = 1
-
+--- mozilla.orig/toolkit/components/startup/src/Makefile.in 2005-07-27 22:42:44.000000000 +0200
++++ mozilla/toolkit/components/startup/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
+@@ -43,6 +43,7 @@
+
+ MODULE = toolkitcomps
+ LIBRARY_NAME = appstartup_s
++EXPORT_LIBRARY = 1
+ FORCE_STATIC_LIB = 1
+ LIBXUL_LIBRARY = 1
+
Index: mozilla/toolkit/xre/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v
-retrieving revision 1.48.2.3
-diff --context=3 -r1.48.2.3 Makefile.in
-*** mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3
---- mozilla/toolkit/xre/Makefile.in 21 Jul 2006 00:27:17 -0000
-***************
-*** 45,51 ****
-
- MODULE = xulapp
- LIBRARY_NAME = xulapp_s
-- EXPORT_LIBRARY = 1
- LIBXUL_LIBRARY = 1
-
- REQUIRES = \
---- 45,50 ----
-***************
-*** 176,189 ****
-
- include $(topsrcdir)/config/rules.mk
-
-- ifdef BUILD_STATIC_LIBS
-- export::
-- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
-- # embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
-- # FINAL_LINK_COMPS to keep the two lists in sync :-(
-- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
-- endif
--
- LOCAL_INCLUDES += \
- -I$(srcdir) \
- -I$(topsrcdir)/xpfe/bootstrap \
---- 175,180 ----
+--- mozilla.orig/toolkit/xre/Makefile.in 2007-02-06 08:13:20.000000000 +0100
++++ mozilla/toolkit/xre/Makefile.in 2007-05-10 12:11:27.000000000 +0200
+@@ -45,7 +45,6 @@
+
+ MODULE = xulapp
+ LIBRARY_NAME = xulapp_s
+-EXPORT_LIBRARY = 1
+ LIBXUL_LIBRARY = 1
+
+ REQUIRES = \
+@@ -180,14 +179,6 @@
+
+ include $(topsrcdir)/config/rules.mk
+
+-ifdef BUILD_STATIC_LIBS
+-export::
+- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
+-# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
+-# FINAL_LINK_COMPS to keep the two lists in sync :-(
+- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
+-endif
+-
+ LOCAL_INCLUDES += \
+ -I$(srcdir) \
+ -I$(topsrcdir)/xpfe/bootstrap \
Index: mozilla/xpcom/build/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
-retrieving revision 1.90.2.2
-diff --context=3 -r1.90.2.2 Makefile.in
-*** mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2
---- mozilla/xpcom/build/Makefile.in 21 Jul 2006 00:27:17 -0000
-***************
-*** 61,67 ****
- endif
-
- # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
-! #EXPORT_LIBRARY = 1
- GRE_MODULE = 1
- MOZILLA_INTERNAL_API = 1
-
---- 61,67 ----
- endif
-
- # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
-! EXPORT_LIBRARY = 1
- GRE_MODULE = 1
- MOZILLA_INTERNAL_API = 1
-
+--- mozilla.orig/xpcom/build/Makefile.in 2006-01-29 17:51:02.000000000 +0100
++++ mozilla/xpcom/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
+@@ -61,7 +61,7 @@
+ endif
+
+ # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
+-#EXPORT_LIBRARY = 1
++EXPORT_LIBRARY = 1
+ GRE_MODULE = 1
+ MOZILLA_INTERNAL_API = 1
+
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
===================================================================
-RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v
-retrieving revision 1.7
-diff --context=3 -r1.7 xptcstubs_arm.cpp
-*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 21 Jul 2006 00:27:17 -0000
-***************
-*** 45,53 ****
- #endif
-
- /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
-! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
-
-! static nsresult
- PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
- {
- #define PARAM_BUFFER_COUNT 16
---- 45,53 ----
- #endif
-
- /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
-! nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
-
-! nsresult
- PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
- {
- #define PARAM_BUFFER_COUNT 16
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2004-04-18 16:18:18.000000000 +0200
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2007-05-10 12:11:27.000000000 +0200
+@@ -45,9 +45,9 @@
+ #endif
+
+ /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
+-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
++nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+
+-static nsresult
++nsresult
+ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
+ {
+ #define PARAM_BUFFER_COUNT 16
Index: mozilla/xpfe/browser/src/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v
-retrieving revision 1.70
-diff --context=3 -r1.70 Makefile.in
-*** mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70
---- mozilla/xpfe/browser/src/Makefile.in 21 Jul 2006 00:27:17 -0000
-***************
-*** 44,49 ****
---- 44,50 ----
-
- MODULE = browser
- LIBRARY_NAME = mozbrwsr_s
-+ EXPORT_LIBRARY = 1
- FORCE_STATIC_LIB = 1
- LIBXUL_LIBRARY = 1
- MODULE_NAME = nsBrowserModule
+--- mozilla.orig/xpfe/browser/src/Makefile.in 2005-03-18 22:23:45.000000000 +0100
++++ mozilla/xpfe/browser/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
+@@ -44,6 +44,7 @@
+
+ MODULE = browser
+ LIBRARY_NAME = mozbrwsr_s
++EXPORT_LIBRARY = 1
+ FORCE_STATIC_LIB = 1
+ LIBXUL_LIBRARY = 1
+ MODULE_NAME = nsBrowserModule
Index: mozilla/xpfe/components/build/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v
-retrieving revision 1.69.8.1
-diff --context=3 -r1.69.8.1 Makefile.in
-*** mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1
---- mozilla/xpfe/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000
-***************
-*** 44,50 ****
-
- MODULE = appcomps
- LIBRARY_NAME = appcomps
-- EXPORT_LIBRARY = 1
- IS_COMPONENT = 1
- MODULE_NAME = application
- LIBXUL_LIBRARY = 1
---- 44,49 ----
+--- mozilla.orig/xpfe/components/build/Makefile.in 2005-09-27 02:15:25.000000000 +0200
++++ mozilla/xpfe/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
+@@ -44,7 +44,6 @@
+
+ MODULE = appcomps
+ LIBRARY_NAME = appcomps
+-EXPORT_LIBRARY = 1
+ IS_COMPONENT = 1
+ MODULE_NAME = application
+ LIBXUL_LIBRARY = 1
Index: mozilla/xpfe/components/filepicker/src/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v
-retrieving revision 1.9.8.1
-diff --context=3 -r1.9.8.1 Makefile.in
-*** mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1
---- mozilla/xpfe/components/filepicker/src/Makefile.in 21 Jul 2006 00:27:17 -0000
-***************
-*** 47,53 ****
- MODULE = filepicker
- LIBRARY_NAME = fileview
- SHORT_LIBNAME = fileview
-- EXPORT_LIBRARY = 1
- IS_COMPONENT = 1
- MODULE_NAME = nsFileViewModule
- MOZILLA_INTERNAL_API = 1
---- 47,52 ----
+--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in 2006-05-22 18:29:32.000000000 +0200
++++ mozilla/xpfe/components/filepicker/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
+@@ -47,7 +47,6 @@
+ MODULE = filepicker
+ LIBRARY_NAME = fileview
+ SHORT_LIBNAME = fileview
+-EXPORT_LIBRARY = 1
+ IS_COMPONENT = 1
+ MODULE_NAME = nsFileViewModule
+ MOZILLA_INTERNAL_API = 1
Index: mozilla/xpfe/components/find/src/Makefile.in
===================================================================
-RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v
-retrieving revision 1.37
-diff --context=3 -r1.37 Makefile.in
-*** mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37
---- mozilla/xpfe/components/find/src/Makefile.in 21 Jul 2006 00:27:17 -0000
-***************
-*** 45,51 ****
- MODULE = appcomps
- XPIDL_MODULE = mozfind
- LIBRARY_NAME = mozfind
-- EXPORT_LIBRARY = 1
- IS_COMPONENT = 1
- MODULE_NAME = nsFindComponent
- LIBXUL_LIBRARY = 1
---- 45,50 ----
+--- mozilla.orig/xpfe/components/find/src/Makefile.in 2005-03-18 22:23:46.000000000 +0100
++++ mozilla/xpfe/components/find/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
+@@ -45,7 +45,6 @@
+ MODULE = appcomps
+ XPIDL_MODULE = mozfind
+ LIBRARY_NAME = mozfind
+-EXPORT_LIBRARY = 1
+ IS_COMPONENT = 1
+ MODULE_NAME = nsFindComponent
+ LIBXUL_LIBRARY = 1
diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb
deleted file mode 100644
index ad44c0523e..0000000000
--- a/packages/mozilla/minimo_0.016+cvs.bb
+++ /dev/null
@@ -1,150 +0,0 @@
-DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
-SECTION = "x11/network"
-LICENSE = "MPL/GPL/LGPL"
-HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
-PRIORITY = "optional"
-
-DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+"
-
-CVSSVR="cvs-mirror.mozilla.org"
-BRTAG = "MOZILLA_1_8_BRANCH"
-MOZDATE = "20060720"
-
-PV = "0.016+cvs${MOZDATE}"
-PR = "r5"
-
-SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
- file://minimo.patch;patch=1 \
- file://bug-322806.diff;patch=1 \
- file://mozconfig file://minimo \
- file://eabi-fix.patch;patch=1 \
- file://eabi-fix2.patch;patch=1 \
- file://eabi-fix3.patch;patch=1 \
- file://minimo.desktop file://minimo.png"
-
-inherit autotools
-
-S = "${WORKDIR}/mozilla"
-
-export MOZCONFIG = "${WORKDIR}/mozconfig"
-
-export CROSS_COMPILE="1"
-export ac_cv_prog_HOST_CC="${BUILD_CC}"
-export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
-export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
-export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
-
-mozdir="${libdir}/mozilla-minimo"
-
-EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
-
-do_configure() {
- cd ${S}
- oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
- sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
-}
-
-do_compile() {
- cd ${S}
- oe_runmake -f client.mk build
-}
-
-do_install() {
- cd ${WORKDIR}
-
- install -d ${D}${bindir}
- install -m 0755 minimo ${D}${bindir}
-
- install -d ${D}${datadir}/applications
- install -m 0644 minimo.desktop ${D}${datadir}/applications
-
- install -d ${D}/${datadir}/pixmaps
- install -m 0644 minimo.png ${D}${datadir}/pixmaps
-
- cd ${S}
-
- ./minimo/config/linux_package.sh ${S} ${S}/minimo/config
-
- cd dist/minimo
-
- install -d ${D}${mozdir}
- install -m 0755 minimo ${D}${mozdir}
- install -m 0755 libfreebl3.so ${D}${mozdir}
- install -m 0755 libnspr4.so ${D}${mozdir}
- install -m 0755 libnss3.so ${D}${mozdir}
- install -m 0755 libnssckbi.so ${D}${mozdir}
- install -m 0755 libplc4.so ${D}${mozdir}
- install -m 0755 libplds4.so ${D}${mozdir}
- install -m 0755 libsmime3.so ${D}${mozdir}
- install -m 0755 libsoftokn3.so ${D}${mozdir}
- install -m 0755 libssl3.so ${D}${mozdir}
-
- install -d ${D}${mozdir}/chrome
- install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
- install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
- install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
- install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
- install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
- install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
- install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
- install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
- install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
- install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
- install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
- install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
- install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
- install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
-
- install -d ${D}${mozdir}/components
- install -m 0644 components/all.xpt ${D}${mozdir}/components
- install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
- install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
-
- install -d ${D}${mozdir}/greprefs
- install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
- install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
-
- install -d ${D}${mozdir}/res
- install -m 0644 res/forms.css ${D}${mozdir}/res
- install -m 0644 res/html.css ${D}${mozdir}/res
- install -m 0644 res/quirk.css ${D}${mozdir}/res
- install -m 0644 res/ua.css ${D}${mozdir}/res
- install -m 0644 res/arrow.gif ${D}${mozdir}/res
- install -m 0644 res/arrowd.gif ${D}${mozdir}/res
- install -m 0644 res/broken-image.gif ${D}${mozdir}/res
- install -m 0644 res/loading-image.gif ${D}${mozdir}/res
- install -m 0644 res/charsetData.properties ${D}${mozdir}/res
- install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
- install -m 0644 res/langGroups.properties ${D}${mozdir}/res
- install -m 0644 res/language.properties ${D}${mozdir}/res
- install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
-
- install -d ${D}${mozdir}/res/dtd
- install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
-
- install -d ${D}${mozdir}/res/entityTables
- install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
- install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
- install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
- install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
- install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
-
- install -d ${D}${mozdir}/res/fonts
- install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
- install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
-
- install -d ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
- install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
-}
-
-FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
-FILES_${PN} += "${mozdir}"
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 2d6744a6c1..834192ad0f 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -1,49 +1,151 @@
-DESCRIPTION = "A minimal version of the Mozilla web browser"
-HOMEPAGE="http://www.mozilla.org/projects/minimo/"
-SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \
- file://no-xmb.patch;patch=1 \
- file://host_ldflags_fix.patch;patch=1 \
- file://minimo.png file://minimo.desktop"
-S = "${WORKDIR}/mozilla"
-SECTION = "x11"
+DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
+SECTION = "x11/network"
+LICENSE = "MPL/GPL/LGPL"
+HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
PRIORITY = "optional"
-PV = "0.0+cvs${SRCDATE}"
-FILES_${PN} += "${libdir}/mozilla-minimo"
-PR = "r8"
-LICENSE = "MPL/LGPL/GPL"
-inherit mozilla
+DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native"
+
+CVSSVR="cvs-mirror.mozilla.org"
+BRTAG = "MOZILLA_1_8_BRANCH"
+MOZDATE = "20070510"
+
+PV = "0.02+cvs${MOZDATE}"
+PE = "1"
+
+SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
+ file://minimo.patch;patch=1 \
+ file://bug-322806.diff;patch=1 \
+ file://mozconfig file://minimo \
+ file://eabi-fix.patch;patch=1 \
+ file://eabi-fix2.patch;patch=1 \
+ file://eabi-fix3.patch;patch=1 \
+ file://minimo.desktop file://minimo.png"
+
+inherit autotools
+
+S = "${WORKDIR}/mozilla"
+
+export MOZCONFIG = "${WORKDIR}/mozconfig"
-EXTRA_OECONF += "--enable-application=minimo --disable-native-uconv"
-export MOZ_CO_PROJECT="minimo"
+export CROSS_COMPILE="1"
+export ac_cv_prog_HOST_CC="${BUILD_CC}"
+export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
+export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
+export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
+export HOST_LIBIDL_CONFIG = "libIDL-config-2"
-export MINIMO="1"
-export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}"
+mozdir="${libdir}/mozilla-minimo"
-require mozilla-cvs.inc
+EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
-do_compile () {
- mozilla_do_compile
+do_configure() {
+ cd ${S}
+ oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
+ sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
}
-mozdir="${D}${libdir}/mozilla-minimo"
+do_compile() {
+ cd ${S}
+ oe_runmake -f client.mk build
+}
+
+do_install() {
+ cd ${WORKDIR}
+
+ install -d ${D}${bindir}
+ install -m 0755 minimo ${D}${bindir}
+
+ install -d ${D}${datadir}/applications
+ install -m 0644 minimo.desktop ${D}${datadir}/applications
+
+ install -d ${D}/${datadir}/pixmaps
+ install -m 0644 minimo.png ${D}${datadir}/pixmaps
-do_install () {
- cd $MOZ_OBJDIR/minimo/base
- oe_runmake package
cd ${S}
- mkdir -p ${mozdir}
- cp -RL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/
- mkdir -p ${D}${datadir}/applications
- install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop
- mkdir -p ${D}${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/minimo.png ${D}${datadir}/pixmaps/minimo.png
- mkdir -p ${D}${bindir}
- echo "#!/bin/sh" > ${D}${bindir}/Minimo
- cat >>${D}${bindir}/Minimo << EOF
-cd ${libdir}/mozilla-minimo
-export LD_LIBRARY_PATH=${libdir}/mozilla-minimo
-exec ./minimo
-EOF
- chmod 755 ${D}${bindir}/Minimo
+
+ ./minimo/config/linux_package.sh ${S} ${S}/minimo/config
+
+ cd dist/minimo
+
+ install -d ${D}${mozdir}
+ install -m 0755 minimo ${D}${mozdir}
+ install -m 0755 libfreebl3.so ${D}${mozdir}
+ install -m 0755 libnspr4.so ${D}${mozdir}
+ install -m 0755 libnss3.so ${D}${mozdir}
+ install -m 0755 libnssckbi.so ${D}${mozdir}
+ install -m 0755 libplc4.so ${D}${mozdir}
+ install -m 0755 libplds4.so ${D}${mozdir}
+ install -m 0755 libsmime3.so ${D}${mozdir}
+ install -m 0755 libsoftokn3.so ${D}${mozdir}
+ install -m 0755 libssl3.so ${D}${mozdir}
+
+ install -d ${D}${mozdir}/chrome
+ install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
+ install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
+ install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
+ install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
+ install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
+ install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
+ install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
+ install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
+ install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
+ install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
+ install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
+ install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
+ install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
+ install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
+
+ install -d ${D}${mozdir}/components
+ install -m 0644 components/all.xpt ${D}${mozdir}/components
+ install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
+ install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
+
+ install -d ${D}${mozdir}/greprefs
+ install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
+ install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
+
+ install -d ${D}${mozdir}/res
+ install -m 0644 res/forms.css ${D}${mozdir}/res
+ install -m 0644 res/html.css ${D}${mozdir}/res
+ install -m 0644 res/quirk.css ${D}${mozdir}/res
+ install -m 0644 res/ua.css ${D}${mozdir}/res
+ install -m 0644 res/arrow.gif ${D}${mozdir}/res
+ install -m 0644 res/arrowd.gif ${D}${mozdir}/res
+ install -m 0644 res/broken-image.gif ${D}${mozdir}/res
+ install -m 0644 res/loading-image.gif ${D}${mozdir}/res
+ install -m 0644 res/charsetData.properties ${D}${mozdir}/res
+ install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
+ install -m 0644 res/langGroups.properties ${D}${mozdir}/res
+ install -m 0644 res/language.properties ${D}${mozdir}/res
+ install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
+
+ install -d ${D}${mozdir}/res/dtd
+ install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
+
+ install -d ${D}${mozdir}/res/entityTables
+ install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
+ install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
+ install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
+ install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
+ install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
+
+ install -d ${D}${mozdir}/res/fonts
+ install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
+ install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
+
+ install -d ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
+ install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
}
+
+FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
+FILES_${PN} += "${mozdir}"
diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty b/packages/opie-irdaapplet/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty
+++ b/packages/opie-irdaapplet/files/.mtn2git_empty
diff --git a/packages/opie-irdaapplet/files/learning-cpp.patch b/packages/opie-irdaapplet/files/learning-cpp.patch
new file mode 100644
index 0000000000..60e46fd133
--- /dev/null
+++ b/packages/opie-irdaapplet/files/learning-cpp.patch
@@ -0,0 +1,13 @@
+diff --git a/irda.cpp b/irda.cpp
+index d57104b..848ddb4 100644
+--- a/irda.cpp
++++ b/irda.cpp
+@@ -54,7 +54,7 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) :
+ setFixedHeight( AppLnk::smallIconSize() );
+ setFixedWidth( AppLnk::smallIconSize() );
+
+- if (m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ) == -1)
++ if ( ( m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ) ) == -1)
+ perror ( "failed grabbing IrDA socket" );
+
+ m_irdaOnPixmap =
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
index 539d4555e1..c841c50fe6 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
@@ -1,8 +1,10 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = r1
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/sounds \
- ${HANDHELDS_CVS};module=opie/apps"
+ ${HANDHELDS_CVS};module=opie/apps \
+ file://learning-cpp.patch;patch=1"
diff --git a/packages/perl/liburi-perl-native_1.35.bb b/packages/perl/liburi-perl-native_1.35.bb
new file mode 100644
index 0000000000..3cb7197d97
--- /dev/null
+++ b/packages/perl/liburi-perl-native_1.35.bb
@@ -0,0 +1,2 @@
+inherit native
+require liburi-perl_${PV}.bb
diff --git a/packages/perl/liburi-perl_1.35.bb b/packages/perl/liburi-perl_1.35.bb
new file mode 100644
index 0000000000..c62de2c0fa
--- /dev/null
+++ b/packages/perl/liburi-perl_1.35.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Manipulates and accesses URI strings"
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+#RDEPENDS += " libmime-base64-perl libnet-perl"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-${PV}.tar.gz"
+
+S = "${WORKDIR}/URI-${PV}"
+
+inherit cpan
diff --git a/packages/xfce-mcs-manager/.mtn2git_empty b/packages/qmake/qmake2-native-2.01a/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xfce-mcs-manager/.mtn2git_empty
+++ b/packages/qmake/qmake2-native-2.01a/.mtn2git_empty
diff --git a/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf
index d803f036fc..d803f036fc 100644
--- a/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf
+++ b/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf
diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.01a.bb
index 306891e9af..dab5b6a3b4 100644
--- a/packages/qmake/qmake2-native_2.00a.bb
+++ b/packages/qmake/qmake2-native_2.01a.bb
@@ -3,9 +3,8 @@ PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL QPL"
-PR = "r2"
-QTVER = "qt-x11-opensource-src-4.1.1"
+QTVER = "qt-x11-opensource-src-4.2.3"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://linux-oe-qmake.conf"
@@ -40,6 +39,7 @@ do_compile() {
do_stage() {
install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
+ install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
}
diff --git a/packages/xfce-mcs-plugins/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xfce-mcs-plugins/.mtn2git_empty
+++ b/packages/uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty
diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch
index 491edde370..491edde370 100644
--- a/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch
+++ b/packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch
diff --git a/packages/uicmoc/uicmoc4-native_4.1.1.bb b/packages/uicmoc/uicmoc4-native_4.2.3.bb
index 59bdd1bc40..341b092e29 100644
--- a/packages/uicmoc/uicmoc4-native_4.1.1.bb
+++ b/packages/uicmoc/uicmoc4-native_4.2.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
-PR = "r0"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb
deleted file mode 100644
index de5cf2b012..0000000000
--- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-manager OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb
deleted file mode 100644
index de5cf2b012..0000000000
--- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-manager OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb
deleted file mode 100644
index 02ad97e860..0000000000
--- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-plugins OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb
deleted file mode 100644
index 02ad97e860..0000000000
--- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-plugins OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce-utils/xfce-utils_4.3.99.2.bb b/packages/xfce-utils/xfce-utils_4.3.99.2.bb
deleted file mode 100644
index 472ba68a14..0000000000
--- a/packages/xfce-utils/xfce-utils_4.3.99.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfce-utils OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-PR = "r2"
-require ${PN}.inc
diff --git a/packages/xfce-utils/.mtn2git_empty b/packages/xfce/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xfce-utils/.mtn2git_empty
+++ b/packages/xfce/.mtn2git_empty
diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb
new file mode 100644
index 0000000000..6bf0e1292f
--- /dev/null
+++ b/packages/xfce/exo_0.3.2.bb
@@ -0,0 +1,17 @@
+
+DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+
+inherit pkgconfig xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2"
+
+# Note: Python checking is broken
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+ ${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so"
+FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*"
+FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug/exo-preferred-applications-settings.*"
diff --git a/packages/xfce/gtk-xfce-engine_2.4.1.bb b/packages/xfce/gtk-xfce-engine_2.4.1.bb
new file mode 100644
index 0000000000..bcfecaf53b
--- /dev/null
+++ b/packages/xfce/gtk-xfce-engine_2.4.1.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "XFCE theme for GTK"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/gtk-xfce-engine-${PV}.tar.bz2"
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
+ ${datadir}/themes/"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
diff --git a/packages/libxfce4mcs/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc
index 19268fc9b3..19268fc9b3 100644
--- a/packages/libxfce4mcs/libxfce4mcs.inc
+++ b/packages/xfce/libxfce4mcs.inc
diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb b/packages/xfce/libxfce4mcs_4.4.1.bb
index 07d7a95ae1..07d7a95ae1 100644
--- a/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb
+++ b/packages/xfce/libxfce4mcs_4.4.1.bb
diff --git a/packages/libxfce4util/libxfce4util.inc b/packages/xfce/libxfce4util.inc
index dbe6501e42..d5dd6d6565 100644
--- a/packages/libxfce4util/libxfce4util.inc
+++ b/packages/xfce/libxfce4util.inc
@@ -5,27 +5,22 @@
DESCRIPTION = "Basic utility library for Xfce4"
SECTION = "x11/libs"
LICENSE = "GPL"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 xfce4-dev-tools"
inherit xfce pkgconfig
-XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \
- i18n.h util.h xfce-kiosk.h libxfce4util-config.h \
- xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \
- xfce-fileutils.h xfce-rc.h"
-
MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
do_stage() {
install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
- for file in ${XFCE_HEADERS}; do
+ # The line below expands to the list of headers that native makefile
+ # would install. Complain and/or fix if it's not portable enough
+ for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do
install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
done
oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
- install -d ${STAGING_DATADIR}/aclocal/
- install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/
}
FILES_${PN}-dev += " ${datadir}/xfce4/m4"
diff --git a/packages/libxfce4util/libxfce4util_4.2.2.bb b/packages/xfce/libxfce4util_4.4.1.bb
index bc6443021f..70f5ddac93 100644
--- a/packages/libxfce4util/libxfce4util_4.2.2.bb
+++ b/packages/xfce/libxfce4util_4.4.1.bb
@@ -3,5 +3,3 @@
# Released under the MIT license (see packages/COPYING)
require ${PN}.inc
-PR = "r1"
-
diff --git a/packages/libxfcegui4/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc
index 714e365af4..714e365af4 100644
--- a/packages/libxfcegui4/libxfcegui4.inc
+++ b/packages/xfce/libxfcegui4.inc
diff --git a/packages/libxfcegui4/libxfcegui4_4.2.2.bb b/packages/xfce/libxfcegui4_4.4.1.bb
index 2def53685a..2def53685a 100644
--- a/packages/libxfcegui4/libxfcegui4_4.2.2.bb
+++ b/packages/xfce/libxfcegui4_4.4.1.bb
diff --git a/packages/xfce/mousepad_0.2.12.bb b/packages/xfce/mousepad_0.2.12.bb
new file mode 100644
index 0000000000..670a28dbd7
--- /dev/null
+++ b/packages/xfce/mousepad_0.2.12.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "Text editor for Xfce based on Leafpad"
+DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/mousepad-${PV}.tar.bz2"
diff --git a/packages/xfce/orage_4.4.1.bb b/packages/xfce/orage_4.4.1.bb
new file mode 100644
index 0000000000..b8f5284454
--- /dev/null
+++ b/packages/xfce/orage_4.4.1.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Calendar application for the Xfce Desktop Environment"
+DEPENDS = "libxfcegui4 exo libxml-parser-perl-native xfce4-panel xfce-mcs-manager"
+RREPLACES = "xfcalendar"
+
+inherit xfce
diff --git a/packages/xfce/thunar_0.8.0.bb b/packages/xfce/thunar_0.8.0.bb
new file mode 100644
index 0000000000..ea739e4cde
--- /dev/null
+++ b/packages/xfce/thunar_0.8.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "File manager for the Xfce Desktop Environment"
+DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm"
+
+inherit xfce
+
+SRC_URI = "http://thunar.xfce.org/download/sources/Thunar/0.8.0/Thunar-0.8.0.tar.bz2"
+
+S = "${WORKDIR}/Thunar-${PV}/"
+
+FILES_${PN} += "${libdir}/thunarx-1/*.so \
+ ${datadir}/dbus-1 \
+ ${datadir}/thumbnailers \
+ ${datadir}/Thunar \
+ ${datadir}/xfce4"
+FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/"
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc
index c50bf0ca64..c50bf0ca64 100644
--- a/packages/xfce-mcs-manager/xfce-mcs-manager.inc
+++ b/packages/xfce/xfce-mcs-manager.inc
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb
index de5cf2b012..de5cf2b012 100644
--- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb
+++ b/packages/xfce/xfce-mcs-manager_4.4.1.bb
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc
index b5b4505e98..b5b4505e98 100644
--- a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc
+++ b/packages/xfce/xfce-mcs-plugins.inc
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
index 02ad97e860..02ad97e860 100644
--- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb
+++ b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
diff --git a/packages/xfce/xfce-terminal_0.2.6.bb b/packages/xfce/xfce-terminal_0.2.6.bb
new file mode 100644
index 0000000000..07a8eb6eb5
--- /dev/null
+++ b/packages/xfce/xfce-terminal_0.2.6.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
+DEPENDS = "exo vte dbus-glib gtk+"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/Terminal-${PV}.tar.bz2"
+
+S = "${WORKDIR}/Terminal-${PV}"
diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce/xfce-utils.inc
index 0b191194d7..0b191194d7 100644
--- a/packages/xfce-utils/xfce-utils.inc
+++ b/packages/xfce/xfce-utils.inc
diff --git a/packages/xfce-utils/xfce-utils_4.2.2.bb b/packages/xfce/xfce-utils_4.4.1.bb
index 57909f2c2d..57909f2c2d 100644
--- a/packages/xfce-utils/xfce-utils_4.2.2.bb
+++ b/packages/xfce/xfce-utils_4.4.1.bb
diff --git a/packages/xfce4-goodies/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc
index 0d102f3bd0..0d102f3bd0 100644
--- a/packages/xfce4-goodies/xfce4-appfinder.inc
+++ b/packages/xfce/xfce4-appfinder.inc
diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb
index f7c97970d5..f7c97970d5 100644
--- a/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb
+++ b/packages/xfce/xfce4-appfinder_4.4.1.bb
diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc
new file mode 100644
index 0000000000..03f64e39e5
--- /dev/null
+++ b/packages/xfce/xfce4-dev-tools.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Xfce4 development tools"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+
+inherit xfce pkgconfig
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb
new file mode 100644
index 0000000000..bd54419686
--- /dev/null
+++ b/packages/xfce/xfce4-dev-tools_4.4.0.bb
@@ -0,0 +1 @@
+require ${PN}.inc
diff --git a/packages/xfce/xfce4-icon-theme_4.4.1.bb b/packages/xfce/xfce4-icon-theme_4.4.1.bb
new file mode 100644
index 0000000000..69d9dacbac
--- /dev/null
+++ b/packages/xfce/xfce4-icon-theme_4.4.1.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "Rodent vector icon theme used by XFCE"
+PACKAGE_ARCH = "all"
+
+inherit xfce
+
+FILES_${PN} += "${datadir}/xfce4"
diff --git a/packages/xfce4-goodies/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc
index a923489f32..a923489f32 100644
--- a/packages/xfce4-goodies/xfce4-mixer.inc
+++ b/packages/xfce/xfce4-mixer.inc
diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb b/packages/xfce/xfce4-mixer_4.4.1.bb
index 6dd3c0565b..6dd3c0565b 100644
--- a/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb
+++ b/packages/xfce/xfce4-mixer_4.4.1.bb
diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc
index e43807540e..e43807540e 100644
--- a/packages/xfce4-panel/xfce4-panel.inc
+++ b/packages/xfce/xfce4-panel.inc
diff --git a/packages/xfce4-panel/xfce4-panel_4.2.2.bb b/packages/xfce/xfce4-panel_4.4.1.bb
index 18dce6fa3c..18dce6fa3c 100644
--- a/packages/xfce4-panel/xfce4-panel_4.2.2.bb
+++ b/packages/xfce/xfce4-panel_4.4.1.bb
diff --git a/packages/xfce/xfce4-session_4.4.1.bb b/packages/xfce/xfce4-session_4.4.1.bb
new file mode 100644
index 0000000000..a572b80f55
--- /dev/null
+++ b/packages/xfce/xfce4-session_4.4.1.bb
@@ -0,0 +1,4 @@
+DESCRIPTION = "Calendar application for the Xfce Desktop Environment"
+DEPENDS = "libxfcegui4 libxfce4util xfce-mcs-manager dbus"
+
+inherit xfce
diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfce/xfdesktop.inc
index e3e64ef355..e3e64ef355 100644
--- a/packages/xfdesktop/xfdesktop.inc
+++ b/packages/xfce/xfdesktop.inc
diff --git a/packages/xfdesktop/xfdesktop_4.2.2.bb b/packages/xfce/xfdesktop_4.4.1.bb
index d7af836791..d7af836791 100644
--- a/packages/xfdesktop/xfdesktop_4.2.2.bb
+++ b/packages/xfce/xfdesktop_4.4.1.bb
diff --git a/packages/xfprint/xfprint_4.2.0.bb b/packages/xfce/xfprint_4.4.1.bb
index 7e349ce881..7e349ce881 100644
--- a/packages/xfprint/xfprint_4.2.0.bb
+++ b/packages/xfce/xfprint_4.4.1.bb
diff --git a/packages/xfwm4-themes/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc
index c60edc5b83..c60edc5b83 100644
--- a/packages/xfwm4-themes/xfwm4-themes.inc
+++ b/packages/xfce/xfwm4-themes.inc
diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb b/packages/xfce/xfwm4-themes_4.4.1.bb
index 9f67ad2ed9..9f67ad2ed9 100644
--- a/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb
+++ b/packages/xfce/xfwm4-themes_4.4.1.bb
diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfce/xfwm4.inc
index e7e5bc1862..e7e5bc1862 100644
--- a/packages/xfwm4/xfwm4.inc
+++ b/packages/xfce/xfwm4.inc
diff --git a/packages/xfwm4/xfwm4_4.2.2.bb b/packages/xfce/xfwm4_4.4.1.bb
index 2fc47e641e..2fc47e641e 100644
--- a/packages/xfwm4/xfwm4_4.2.2.bb
+++ b/packages/xfce/xfwm4_4.4.1.bb
diff --git a/packages/xfce4-goodies/.mtn2git_empty b/packages/xfce4-goodies/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfce4-goodies/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb
deleted file mode 100644
index f7c97970d5..0000000000
--- a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce4-appfinder build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb
deleted file mode 100644
index 6dd3c0565b..0000000000
--- a/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mixer-plugin OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce4-panel/.mtn2git_empty b/packages/xfce4-panel/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfce4-panel/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb b/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb
deleted file mode 100644
index 18dce6fa3c..0000000000
--- a/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfce4-panel OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-PR="r1"
-require ${PN}.inc
diff --git a/packages/xfdesktop/.mtn2git_empty b/packages/xfdesktop/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfdesktop/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfdesktop/xfdesktop_4.2.0.bb b/packages/xfdesktop/xfdesktop_4.2.0.bb
deleted file mode 100644
index 7a90487cc8..0000000000
--- a/packages/xfdesktop/xfdesktop_4.2.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# xfdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="xfce4 Desktop Background Manager"
-SECTION = "x11/base"
-DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2"
-
-inherit xfce
-PACKAGES += "xfdesktop-backdrops"
-
-FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*"
diff --git a/packages/xfdesktop/xfdesktop_4.3.99.2.bb b/packages/xfdesktop/xfdesktop_4.3.99.2.bb
deleted file mode 100644
index d7af836791..0000000000
--- a/packages/xfdesktop/xfdesktop_4.3.99.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-PR = "r1"
-require ${PN}.inc
diff --git a/packages/xfwm4-themes/.mtn2git_empty b/packages/xfwm4-themes/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfwm4-themes/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
deleted file mode 100644
index f133e9524c..0000000000
--- a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# xfwm4-themes OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="XFCE4 Window Manager Themes"
-SECTION = "x11/wm"
-
-inherit xfce
-
-# No ${PN} for this one
-PACKAGES=""
-
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
-
-python populate_packages_prepend () {
- themedir = bb.data.expand('${datadir}/xfwm4/themes', d)
- do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
diff --git a/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb b/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb
deleted file mode 100644
index 9f67ad2ed9..0000000000
--- a/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfwm4-themes OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfwm4/.mtn2git_empty b/packages/xfwm4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfwm4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfwm4/xfwm4_4.2.0.bb b/packages/xfwm4/xfwm4_4.2.0.bb
deleted file mode 100644
index e6fbd22b59..0000000000
--- a/packages/xfwm4/xfwm4_4.2.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="XFCE4 Window Manager"
-SECTION = "x11/wm"
-inherit xfce
-
-
-FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
-
-DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
-
-
-EXTRA_OECONF += " --enable-startup-notification"
-
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
-
-python populate_packages_prepend () {
- themedir = bb.data.expand('${datadir}/themes', d)
- do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
diff --git a/packages/xfwm4/xfwm4_4.2.3.2.bb b/packages/xfwm4/xfwm4_4.2.3.2.bb
deleted file mode 100644
index e1feff01f1..0000000000
--- a/packages/xfwm4/xfwm4_4.2.3.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfwm4/xfwm4_4.3.99.2.bb b/packages/xfwm4/xfwm4_4.3.99.2.bb
deleted file mode 100644
index e1feff01f1..0000000000
--- a/packages/xfwm4/xfwm4_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xorg-app/xdm_1.1.3.bb b/packages/xorg-app/xdm_1.1.3.bb
index 7b4195e3d8..5df9fdd7bf 100644
--- a/packages/xorg-app/xdm_1.1.3.bb
+++ b/packages/xorg-app/xdm_1.1.3.bb
@@ -3,6 +3,6 @@ PE = "1"
DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw"
EXTRA_OECONF += " --with-random-device=/dev/urandom"