diff options
Diffstat (limited to 'packages')
35 files changed, 103 insertions, 47 deletions
diff --git a/packages/dosbox/dosbox_0.72.bb b/packages/dosbox/dosbox_0.72.bb index 01a2166328..930a2c31b0 100644 --- a/packages/dosbox/dosbox_0.72.bb +++ b/packages/dosbox/dosbox_0.72.bb @@ -1,2 +1,6 @@ require dosbox.inc +PR = "r1" + +SRC_URI += "file://gcc-4.3.patch;patch=1" + diff --git a/packages/dosbox/files/gcc-4.3.patch b/packages/dosbox/files/gcc-4.3.patch new file mode 100644 index 0000000000..bacefd420c --- /dev/null +++ b/packages/dosbox/files/gcc-4.3.patch @@ -0,0 +1,45 @@ +diff -ur /tmp/dosbox-0.72/src/dos/cdrom_image.cpp dosbox-0.72/src/dos/cdrom_image.cpp +--- /tmp/dosbox-0.72/src/dos/cdrom_image.cpp 2007-08-22 13:54:35.000000000 +0200 ++++ dosbox-0.72/src/dos/cdrom_image.cpp 2008-03-06 21:30:00.000000000 +0100 +@@ -23,7 +23,7 @@ + #include <cstdio> + #include <fstream> + #include <iostream> +-#include <limits.h> ++#include <limits> + #include <sstream> + #include <vector> + #include <sys/stat.h> +diff -ur /tmp/dosbox-0.72/src/hardware/gameblaster.cpp dosbox-0.72/src/hardware/gameblaster.cpp +--- /tmp/dosbox-0.72/src/hardware/gameblaster.cpp 2007-01-10 11:17:37.000000000 +0100 ++++ dosbox-0.72/src/hardware/gameblaster.cpp 2008-03-06 21:31:32.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "hardware.h" + #include "setup.h" + #include "pic.h" ++#include <cstring> + + #define LEFT 0x00 + #define RIGHT 0x01 +diff -ur /tmp/dosbox-0.72/src/hardware/tandy_sound.cpp dosbox-0.72/src/hardware/tandy_sound.cpp +--- /tmp/dosbox-0.72/src/hardware/tandy_sound.cpp 2007-06-29 20:21:12.000000000 +0200 ++++ dosbox-0.72/src/hardware/tandy_sound.cpp 2008-03-06 21:32:02.000000000 +0100 +@@ -28,6 +28,7 @@ + #include "setup.h" + #include "pic.h" + #include "dma.h" ++#include <cstring> + + #define DAC_CLOCK 3570000 + #define MAX_OUTPUT 0x7fff +diff -ur /tmp/dosbox-0.72/src/shell/shell_cmds.cpp dosbox-0.72/src/shell/shell_cmds.cpp +--- /tmp/dosbox-0.72/src/shell/shell_cmds.cpp 2007-08-17 19:58:46.000000000 +0200 ++++ dosbox-0.72/src/shell/shell_cmds.cpp 2008-03-06 21:32:47.000000000 +0100 +@@ -27,6 +27,7 @@ + #include "regs.h" + #include "../dos/drives.h" + #include "support.h" ++#include <cstdlib> + + static SHELL_Cmd cmd_list[]={ + { "CHDIR", 1, &DOS_Shell::CMD_CHDIR, "SHELL_CMD_CHDIR_HELP"}, diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb index 5850183b89..46ade701a3 100644 --- a/packages/e17/e-wm_svn.bb +++ b/packages/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.043+svnr${SRCREV}" -PR = "r11" +PR = "r13" inherit e update-alternatives diff --git a/packages/efl1/ecore-native_svn.bb b/packages/efl1/ecore-native_svn.bb index f84c6581d0..2fc383b367 100644 --- a/packages/efl1/ecore-native_svn.bb +++ b/packages/efl1/ecore-native_svn.bb @@ -1,7 +1,7 @@ require ecore.inc inherit native DEPENDS = "eet-native evas-native" -PR = "r1" +PR = "r2" EXTRA_OECONF = "\ --enable-ecore-txt \ diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 0ca1fc0899..9784d5cd8e 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -4,6 +4,7 @@ DEPENDS = "curl eet evas tslib libxtst libxcomposite libxinerama libxscrnsaver l # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" PV = "0.9.9.043+svnr${SRCREV}" +PR = "r1" inherit efl diff --git a/packages/efl1/ecore_svn.bb b/packages/efl1/ecore_svn.bb index ce237ffbc1..018a8e7124 100644 --- a/packages/efl1/ecore_svn.bb +++ b/packages/efl1/ecore_svn.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r3" +PR = "r4" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl1/edb_svn.bb b/packages/efl1/edb_svn.bb index 3c4cc9d0c2..4f8143ae87 100644 --- a/packages/efl1/edb_svn.bb +++ b/packages/efl1/edb_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edb is the Enlightenment database library" LICENSE = "MIT BSD" DEPENDS = "zlib" PV = "1.0.5.043+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl1/edbus_svn.bb b/packages/efl1/edbus_svn.bb index d200054a39..16b19e9619 100644 --- a/packages/efl1/edbus_svn.bb +++ b/packages/efl1/edbus_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" DEPENDS = "dbus ecore" LICENSE = "MIT BSD" PV = "0.5.0.043+svnr${SRCREV}" -PR = "r2" +PR = "r3" inherit efl diff --git a/packages/efl1/edje-native_svn.bb b/packages/efl1/edje-native_svn.bb index 238bfd00dc..d71d38de99 100644 --- a/packages/efl1/edje-native_svn.bb +++ b/packages/efl1/edje-native_svn.bb @@ -1,6 +1,6 @@ require edje_${PV}.bb inherit native -PR = "r1" +PR = "r2" DEPENDS = "evas-native ecore-native eet-native embryo-native" diff --git a/packages/efl1/edje_svn.bb b/packages/efl1/edje_svn.bb index ec481911d6..664e965dcc 100644 --- a/packages/efl1/edje_svn.bb +++ b/packages/efl1/edje_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" PV = "0.5.0.043+svnr${SRCREV}" -PR = "r3" +PR = "r4" inherit efl diff --git a/packages/efl1/eet_svn.bb b/packages/efl1/eet_svn.bb index 379a0420a1..e801a543e7 100644 --- a/packages/efl1/eet_svn.bb +++ b/packages/efl1/eet_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "EET is the Enlightenment data storage library" DEPENDS = "zlib jpeg openssl" LICENSE = "MIT BSD" PV = "1.0.1+svnr${SRCREV}" -PR = "r2" +PR = "r3" inherit efl diff --git a/packages/efl1/eflpp_svn.bb b/packages/efl1/eflpp_svn.bb index ff12d72001..4942f5c548 100644 --- a/packages/efl1/eflpp_svn.bb +++ b/packages/efl1/eflpp_svn.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/" LICENSE = "LGPL" DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0" PV = "0.1.0+svnr${SRCREV}" +PR = "r1" inherit efl diff --git a/packages/efl1/efreet_svn.bb b/packages/efl1/efreet_svn.bb index a802912730..37e9443d37 100644 --- a/packages/efl1/efreet_svn.bb +++ b/packages/efl1/efreet_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment freedesktop.org library" DEPENDS = "ecore" LICENSE = "MIT BSD" PV = "0.5.0.043+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl1/embryo_svn.bb b/packages/efl1/embryo_svn.bb index 42cb2f53a9..956ff77fb3 100644 --- a/packages/efl1/embryo_svn.bb +++ b/packages/efl1/embryo_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Enlightenment C-like scripting language for Edje" LICENSE = "MIT BSD" PV = "0.9.9.043+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl1/emotion_svn.bb b/packages/efl1/emotion_svn.bb index e30239fc5d..c1d3ff347a 100644 --- a/packages/efl1/emotion_svn.bb +++ b/packages/efl1/emotion_svn.bb @@ -3,7 +3,7 @@ LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" PV = "0.1.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" inherit efl diff --git a/packages/efl1/engrave_svn.bb b/packages/efl1/engrave_svn.bb index cc90f5a48e..3dc5e332a2 100644 --- a/packages/efl1/engrave_svn.bb +++ b/packages/efl1/engrave_svn.bb @@ -3,5 +3,6 @@ LICENSE = "MIT" # also requires yacc and lex on host DEPENDS = "evas ecore" PV = "0.0.0+svnr${SRCREV}" +PR = "r1" inherit efl diff --git a/packages/efl1/enhance_svn.bb b/packages/efl1/enhance_svn.bb index 6bec1176d1..dd09256655 100644 --- a/packages/efl1/enhance_svn.bb +++ b/packages/efl1/enhance_svn.bb @@ -2,5 +2,6 @@ DESCRIPTION = "Enhance translates between glade .xml files and ETK" LICENSE = "MIT" DEPENDS = "exml" PV = "0.0.0+svnr${SRCREV}" +PR = "r1" inherit efl diff --git a/packages/efl1/epdf_svn.bb b/packages/efl1/epdf_svn.bb index eb4b91a8c2..02f8553976 100644 --- a/packages/efl1/epdf_svn.bb +++ b/packages/efl1/epdf_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" LICENSE = "MIT BSD" DEPENDS = "poppler evas ecore etk ewl" PV = "0.1.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl1/epeg_svn.bb b/packages/efl1/epeg_svn.bb index 61213fe599..25ea7fa0b9 100644 --- a/packages/efl1/epeg_svn.bb +++ b/packages/efl1/epeg_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Epeg is a small library for handling thumbnails." LICENSE = "MIT" DEPENDS = "jpeg" PV = "0.9.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl1/epsilon_svn.bb b/packages/efl1/epsilon_svn.bb index 055901b19d..1da8d11b42 100644 --- a/packages/efl1/epsilon_svn.bb +++ b/packages/efl1/epsilon_svn.bb @@ -4,7 +4,7 @@ LICENSE = "MIT BSD" # can also depend on xine for movie thumbnails DEPENDS = "libpng evas ecore edje perl-native" PV = "0.3.0.012+svnr${SRCREV}" -PR = "r1" +PR = "r3" inherit efl diff --git a/packages/efl1/esmart_svn.bb b/packages/efl1/esmart_svn.bb index bb88310a5e..d0983e0765 100644 --- a/packages/efl1/esmart_svn.bb +++ b/packages/efl1/esmart_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT BSD" DEPENDS = "evas ecore edje imlib2 epsilon libtool" PV = "0.9.0.043+svnr${SRCREV}" -PR = "r1" +PR = "r3" inherit efl diff --git a/packages/efl1/etk_svn.bb b/packages/efl1/etk_svn.bb index cf7520d6f0..5c47c406d2 100644 --- a/packages/efl1/etk_svn.bb +++ b/packages/efl1/etk_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foun DEPENDS = "evas ecore edje" LICENSE = "MIT" PV = "0.1.0.042+svnr${SRCREV}" -PR = "r2" +PR = "r4" inherit efl diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 243dc55439..f1a2660d9a 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -3,6 +3,8 @@ LICENSE = "MIT BSD" # can also depend on valgrind, libsdl-x11, directfb DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig" PV = "0.9.9.043+svnr${SRCREV}" +PR = "r1" + inherit efl diff --git a/packages/efl1/evas_svn.bb b/packages/efl1/evas_svn.bb index 35192b7ed3..a94ae1fc35 100644 --- a/packages/efl1/evas_svn.bb +++ b/packages/efl1/evas_svn.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r2" +PR = "r3" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl1/evolve_svn.bb b/packages/efl1/evolve_svn.bb index fad6671675..e38df93e24 100644 --- a/packages/efl1/evolve_svn.bb +++ b/packages/efl1/evolve_svn.bb @@ -2,6 +2,6 @@ DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language" LICENSE = "MIT" DEPENDS = "etk evolve-native" PV = "0.0.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl1/ewl_svn.bb b/packages/efl1/ewl_svn.bb index af490dda46..336d3edf2f 100644 --- a/packages/efl1/ewl_svn.bb +++ b/packages/efl1/ewl_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightened Widget Library" DEPENDS = "evas ecore edje emotion efreet epsilon" LICENSE = "MIT BSD" PV = "0.5.2.042+svnr${SRCREV}" -PR = "r1" +PR = "r3" inherit efl diff --git a/packages/efl1/exml_svn.bb b/packages/efl1/exml_svn.bb index aaf37c7ca6..363a23d7f1 100644 --- a/packages/efl1/exml_svn.bb +++ b/packages/efl1/exml_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Exml is a generic XML parser wrapper." LICENSE = "MIT" DEPENDS = "libxml2 libxslt ecore" PV = "0.1.1+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl diff --git a/packages/efl1/imlib2_svn.bb b/packages/efl1/imlib2_svn.bb index 39932d74fe..ad4df41c5e 100644 --- a/packages/efl1/imlib2_svn.bb +++ b/packages/efl1/imlib2_svn.bb @@ -4,7 +4,7 @@ LICENSE = "BSD" DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" PROVIDES = "virtual/imlib2" PV = "1.4.1.001+svnr${SRCREV}" -PR = "r3" +PR = "r4" inherit efl diff --git a/packages/kexecboot/linux-kexecboot.inc b/packages/kexecboot/linux-kexecboot.inc index 96c7489fb6..93207e4332 100644 --- a/packages/kexecboot/linux-kexecboot.inc +++ b/packages/kexecboot/linux-kexecboot.inc @@ -5,10 +5,11 @@ SRC_URI = "file://defconfig" DONT_CHECK_KERNELSIZE = "" INITRAMFS_IMAGE = "initramfs-kexecboot-image" -# uncomment the following lines if you use u-boot as bootloader -#KERNEL_IMAGETYPE_c7x0="uImage" -#KERNEL_IMAGETYPE_akita="uImage" -#KERNEL_IMAGETYPE_spitz="uImage" +CMDLINE = "console=ttyS0,115200n8 console=tty1" +CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1" +CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" PACKAGES = "" PROVIDES = "" diff --git a/packages/kexecboot/linux-kexecboot_2.6.24.bb b/packages/kexecboot/linux-kexecboot_2.6.24.bb index 2b2a73b0b5..903245ef7f 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.24.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.24.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "-1" diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb index d42ba94c17..3a8727155a 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.26.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" diff --git a/packages/linux/linux-2.6.25/mpc8313e-rdb/defconfig b/packages/linux/linux-2.6.25/mpc8313e-rdb/defconfig index ad941808ae..e85fe12572 100644 --- a/packages/linux/linux-2.6.25/mpc8313e-rdb/defconfig +++ b/packages/linux/linux-2.6.25/mpc8313e-rdb/defconfig @@ -82,7 +82,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y @@ -505,8 +505,7 @@ CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set +# CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set @@ -560,7 +559,7 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m -# CONFIG_NET_ACT_NAT is not set +CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m CONFIG_NET_CLS_IND=y @@ -1216,7 +1215,7 @@ CONFIG_SPI_SPIDEV=m CONFIG_SPI_TLE62X0=m # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set -CONFIG_HWMON=y +CONFIG_HWMON=m # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADM1021 is not set @@ -1459,7 +1458,7 @@ CONFIG_SND_USB_AUDIO=m # # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y -CONFIG_HID=y +CONFIG_HID=m # CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set @@ -1717,8 +1716,8 @@ CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set -CONFIG_AUTOFS4_FS=y -# CONFIG_FUSE_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems @@ -1729,9 +1728,9 @@ CONFIG_AUTOFS4_FS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_NTFS_FS=m @@ -1834,7 +1833,7 @@ CONFIG_LDM_PARTITION=y # CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -1851,14 +1850,14 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set -CONFIG_NLS_CODEPAGE_932=y +# CONFIG_NLS_CODEPAGE_932 is not set # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set -CONFIG_NLS_ISO8859_8=y +# CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -1868,10 +1867,10 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_9 is not set # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set +CONFIG_NLS_ISO8859_15=m # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set +CONFIG_NLS_UTF8=m # CONFIG_DLM is not set # diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index 7c87c43b9a..6992747e7b 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r5" +PR = "r6" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am index 50149563ac..e274289672 100644 --- a/packages/webkit/webkit-gtk/GNUmakefile.am +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -448,7 +448,8 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile # Files that will be distributed EXTRA_DIST = \ $(javascriptcore_dist) \ - $(webcore_dist) + $(webcore_dist) \ + symbols.filter # Files that will be cleaned MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac index 21f72661ec..579891cbe0 100644 --- a/packages/webkit/webkit-gtk/configure.ac +++ b/packages/webkit/webkit-gtk/configure.ac @@ -6,7 +6,7 @@ m4_define([webkit_micro_version], [2]) AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) -AC_CONFIG_HEADERS([aconfig.h]) +AC_CONFIG_HEADERS([autotoolsconfig.h]) WEBKIT_MAJOR_VERSION=webkit_major_version WEBKIT_MINOR_VERSION=webkit_minor_version |