Mercurial > mxe-octave

diff src/wxwidgets.mk @ 6304:c2b696402a1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wxwidgets: update to 3.2.0 * src/wxwidgets.mk: update version, remove old configure options * src/wxwidgets-1-fixes.patch: deleted file * dist-files.mk: remove ref to deleted file
author John Donoghue <john.donoghue@ieee.org>
date Sun, 10 Jul 2022 20:22:13 -0400
parents 3aad637952e6
children 33804a879cc4
line wrap: on
line diff
--- a/src/wxwidgets.mk	Sun Jul 10 20:22:12 2022 -0400
+++ b/src/wxwidgets.mk	Sun Jul 10 20:22:13 2022 -0400
@@ -3,8 +3,8 @@
 
 PKG             := wxwidgets
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.0.5.1
-$(PKG)_CHECKSUM := 406ac736f61d88a3a866aa501e01e408a642c6e7
+$(PKG)_VERSION  := 3.2.0
+$(PKG)_CHECKSUM := 412e6aad037417527fa79fda028c89df685aacbd
 $(PKG)_SUBDIR   := wxWidgets-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
 $(PKG)_URL      := https://github.com/wxWidgets/wxWidgets/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -12,7 +12,7 @@
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://github.com//wxWidgets/wxWidgets/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | grep -v '^3\.1' | $(SORT) -V | \
+    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | grep -v '^3\.1' | grep -v 'rc' | $(SORT) -V | \
     tail -1
 endef
 
@@ -21,10 +21,9 @@
     # build the wxWidgets variant without unicode support
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        $(ENABLE_SHARED_OR_STATIC) \
+	$(if $(BUILD_SHARED),,--disable-shared) \
         --prefix='$(HOST_PREFIX)' \
-        --enable-compat24 \
-        --enable-compat26 \
+        --enable-compat28 \
         --enable-gui \
         --disable-stl \
         --enable-threads \
@@ -41,20 +40,11 @@
         --with-expat=sys \
         --with-sdl \
         --without-gtk \
-        --without-motif \
-        --without-mac \
         --without-macosx-sdk \
-        --without-cocoa \
-        --without-wine \
-        --without-pm \
-        --without-microwin \
         --without-libxpm \
         --without-libmspack \
-        --without-gnomeprint \
         --without-gnomevfs \
-        --without-hildon \
         --without-dmalloc \
-        --without-odbc \
         LIBS=" `'$(MXE_PKG_CONFIG)' --libs-only-l libtiff-4`" \
         CXXFLAGS='-std=gnu++11' \
         CXXCPP='$(MXE_CXX) -E -std=gnu++11'
@@ -64,7 +54,5 @@
     $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS)  __install_wxrc___depname=
 
     $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)wx-config'
-    mv $(HOST_LIBDIR)/wxbase30*.dll $(HOST_BINDIR)/
-    mv $(HOST_LIBDIR)/wxmsw30*.dll $(HOST_BINDIR)/
 
 endef