bump both wxbase and wxwidgets to 2.8.9 (current upstream stable
release), also 2.6.4 (the old stable) are also fixed.
close bug# 4038
plucked revisions from dev
d6af6dba9834b2c5eb9f897be65fe07603a9495f
e451e643804112f13df8ec67c5e1833a5c6771f9
290d13f5204ac50425e5a0fd373b84838a68cbc2
719de3c75109455b02f16d45f275877124af83ac
Regards
Gordon
#
# old_revision [a08ff125de73bc9f9ab0164500911b1a7f989210]
#
# rename "packages/wxbase/wxbase_2.6.2.bb"
# to "packages/wxwidgets/wxbase_2.6.4.bb"
#
# rename "packages/wxbase/wxbase_2.7+cvs.bb"
# to "packages/wxwidgets/wxbase_2.8.9.bb"
#
# rename "packages/wxwidgets/wxwidgets_2.6.3.bb"
# to "packages/wxwidgets/wxwidgets_2.8.9.bb"
#
# add_dir "packages/wxwidgets/wxbase-2.8.9"
#
# add_file "packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch"
# content [5075626f47ed117d4632a0e749dda9c6e00eb754]
#
# add_file "packages/wxwidgets/wxbase.inc"
# content [4738ec69cd6eb08328207aeec696ce949d662791]
#
# add_file "packages/wxwidgets/wxwidgets.inc"
# content [eccb35a8930a1ba389f737f0dba48b967cdee4b1]
#
# add_file "packages/wxwidgets/wxwidgets_2.6.4.bb"
# content [53e280a19decc87006f8d10412a482d67ada6c82]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [7d8ce8f11f206827761a94b9bc9f3b479a420035]
# to [452ad342c7ba8e2916e5db96aa70fdca6ae64cc7]
#
# patch "packages/wxwidgets/wxbase_2.6.4.bb"
# from [9a0349a002c487ae06200180300c12a4fe92ec39]
# to [cfd1c0469ead8760e67d21a3ee1b1b963f1ed0f9]
#
# patch "packages/wxwidgets/wxbase_2.8.9.bb"
# from [0aeb3fb06613533a94e4896159c46c2ca079e2d1]
# to [9758492e5bb100571343f1bad3f68048e606db3c]
#
# patch "packages/wxwidgets/wxwidgets_2.8.9.bb"
# from [fc1afd8d31bcfa1da4f98844e54b445e550ec02b]
# to [ae1f88cb8a91f0395b7105c031dd88471e2709c0]
#
============================================================
--- packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch 5075626f47ed117d4632a0e749dda9c6e00eb754
+++ packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch 5075626f47ed117d4632a0e749dda9c6e00eb754
@@ -0,0 +1,18 @@
+--- wxBase-2.8.9/Makefile.in.old 2008-09-22 10:13:30.000000000 -0500
++++ wxBase-2.8.9/Makefile.in 2008-09-22 10:17:44.000000000 -0500
+@@ -11339,13 +11339,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
+
+ ### Targets: ###
+
+-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
++all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+
+-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+ if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
============================================================
--- packages/wxwidgets/wxbase.inc 4738ec69cd6eb08328207aeec696ce949d662791
+++ packages/wxwidgets/wxbase.inc 4738ec69cd6eb08328207aeec696ce949d662791
@@ -0,0 +1,17 @@
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/";
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "zlib expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxBase-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure() {
+ oe_runconf
+}
============================================================
--- packages/wxwidgets/wxwidgets.inc eccb35a8930a1ba389f737f0dba48b967cdee4b1
+++ packages/wxwidgets/wxwidgets.inc eccb35a8930a1ba389f737f0dba48b967cdee4b1
@@ -0,0 +1,20 @@
+DESCRIPTION = "wxWidgets is a cross platform application framework utilizing native widgets."
+HOMEPAGE = "http://www.wxwidgets.org";
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "gtk+ jpeg tiff libpng zlib expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.gz"
+
+S = "${WORKDIR}/wxWidgets-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --enable-gpe "
+
+do_configure() {
+ oe_runconf
+}
+
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile"
============================================================
--- packages/wxwidgets/wxwidgets_2.6.4.bb 53e280a19decc87006f8d10412a482d67ada6c82
+++ packages/wxwidgets/wxwidgets_2.6.4.bb 53e280a19decc87006f8d10412a482d67ada6c82
@@ -0,0 +1,30 @@
+require wxwidgets.inc
+
+PR = "r0"
+
+LEAD_SONAME = "libwx_gtk2_core-2.6.so"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/wx-2.6/wx
+ cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
+ cp -pR lib/libwx* ${STAGING_LIBDIR}
+ cp -pR lib/wx ${STAGING_LIBDIR}
+ cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
+ cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal
+ ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
+ sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+ -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+ -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+ -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+ -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6
+}
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' install
+ ln -sf ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 ${D}${bindir}/wx-config
+ install -d ${D}${docdir}/${PN}-${PV}
+ install -m 644 -p CHANGES.txt ${D}${docdir}/${PN}-${PV}
+ install -m 644 -p COPYING.LIB ${D}${docdir}/${PN}-${PV}
+ install -m 644 -p LICENCE.txt ${D}${docdir}/${PN}-${PV}
+ install -m 644 -p README.txt ${D}${docdir}/${PN}-${PV}
+}
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 7d8ce8f11f206827761a94b9bc9f3b479a420035
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 452ad342c7ba8e2916e5db96aa70fdca6ae64cc7
@@ -1971,7 +1971,8 @@ PREFERRED_VERSION_wview-wxt510-mysql ?=
PREFERRED_VERSION_wview-vpro-mysql ?= "3.1.3"
PREFERRED_VERSION_wview-wxt510 ?= "3.1.3"
PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3"
-PREFERRED_VERSION_wxwidgets ?= "2.6.3"
+PREFERRED_VERSION_wxbase ?= "2.8.9"
+PREFERRED_VERSION_wxwidgets ?= "2.8.9"
PREFERRED_VERSION_x11perf ?= "1.4.1"
PREFERRED_VERSION_x11vnc ?= "0.9.3"
PREFERRED_VERSION_xaos ?= "3.2.3"
============================================================
--- packages/wxbase/wxbase_2.6.2.bb 9a0349a002c487ae06200180300c12a4fe92ec39
+++ packages/wxwidgets/wxbase_2.6.4.bb cfd1c0469ead8760e67d21a3ee1b1b963f1ed0f9
@@ -1,26 +1,11 @@
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/";
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
+require wxbase.inc
+PR = "r0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxBase-${PV}"
-
-inherit autotools pkgconfig
-
EXTRA_OECONF = "--enable-largefile"
-LEAD_SONAME = "libwx_base-2.6.so*"
+LEAD_SONAME = "libwx_base-2.6.so"
-do_configure() {
- oe_runconf
-}
-
do_stage() {
install -d ${STAGING_INCDIR}/wx-2.6/wx
cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
@@ -36,13 +21,9 @@ do_stage() {
-i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
}
-FILES_${PN} += " \
- ${libdir}/wx/config"
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile"
-FILES_${PN}-dev += " \
- ${libdir}/wx/include \
- ${datadir}/bakefile"
-
do_install() {
oe_runmake 'DESTDIR=${D}' install
ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
============================================================
--- packages/wxbase/wxbase_2.7+cvs.bb 0aeb3fb06613533a94e4896159c46c2ca079e2d1
+++ packages/wxwidgets/wxbase_2.8.9.bb 9758492e5bb100571343f1bad3f68048e606db3c
@@ -1,53 +1,36 @@
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/";
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
+require wxbase.inc
+DEFAULT_PREFERENCE = "-1"
-SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2";
-#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+PR = "r0"
-S = "${WORKDIR}/wxGTK"
+SRC_URI += "file://Makefile.in.patch;patch=1"
-inherit autotools pkgconfig
+EXTRA_OECONF = " --disable-gui \
+ --enable-largefile \
+ --enable-gpe \
+ --without-subdirs"
-EXTRA_OECONF = "--disable-gui --enable-largefile"
+LEAD_SONAME = "libwx_base-2.8.so"
-LEAD_SONAME = "libwx_base-2.7*"
-
-do_configure() {
- oe_runconf
-}
-
do_stage() {
- install -d ${STAGING_INCDIR}/wx-2.7/wx
- cp -pR include/wx ${STAGING_INCDIR}/wx-2.7
+ install -d ${STAGING_INCDIR}/wx-2.8/wx
+ cp -pR include/wx ${STAGING_INCDIR}/wx-2.8
cp -pR lib/libwx* ${STAGING_LIBDIR}
cp -pR lib/wx ${STAGING_LIBDIR}
- cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal
- ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
+ ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config
sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
-e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
-e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
-e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
- -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7
+ -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8
}
-FILES_${PN} += " \
- ${libdir}/wx/config"
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include"
-FILES_${PN}-dev += " \
- ${libdir}/wx/include \
- ${datadir}/bakefile"
-
do_install() {
oe_runmake 'DESTDIR=${D}' install
- ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
- install -d ${D}${docdir}/${PN}-${PV}
- install -m 644 -p docs/*.txt ${D}${docdir}/${PN}-${PV}
- install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV}
+ ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${D}${bindir}/wx-config
}
============================================================
--- packages/wxwidgets/wxwidgets_2.6.3.bb fc1afd8d31bcfa1da4f98844e54b445e550ec02b
+++ packages/wxwidgets/wxwidgets_2.8.9.bb ae1f88cb8a91f0395b7105c031dd88471e2709c0
@@ -1,17 +1,25 @@
-DESCRIPTION = "wxWidgets is a cross platform application framework utilizing native widgets."
-HOMEPAGE = "http://www.wxwidgets.org";
-SECTION = "x11/libs"
-LICENSE = "GPL"
-DEPENDS = "gtk+"
+require wxwidgets.inc
+
PR = "r0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.gz"
-S = "${WORKDIR}/wxWidgets-${PV}"
+LEAD_SONAME = "libwx_gtk2_core-2.8.so"
-inherit autotools pkgconfig
-
-do_configure() {
- oe_runconf
+do_stage() {
+ install -d ${STAGING_INCDIR}/wx-2.8/wx
+ cp -pR include/wx ${STAGING_INCDIR}/wx-2.8
+ cp -pR lib/libwx* ${STAGING_LIBDIR}
+ cp -pR lib/wx ${STAGING_LIBDIR}
+ cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
+ cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal
+ ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config
+ sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+ -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+ -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+ -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+ -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8
}
-#FIXME add sane packaging
+do_install() {
+ oe_runmake 'DESTDIR=${D}' install
+ ln -sf ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${D}${bindir}/wx-config
+}
_______________________________________________
Openembedded-stablebranch mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
