From b83effbea5a27f27ae7b494421fa394865f63c85 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 30 Apr 2020 22:11:21 +0200 Subject: [PATCH] wxWidgets: update to 3.0.5. --- srcpkgs/wxWidgets/patches/wxGTK-collision.patch | 16 +++++++++------- srcpkgs/wxWidgets/template | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch index 0128f032e2e..001b4cd1392 100644 --- a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch +++ b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch @@ -15,15 +15,17 @@ diff -Naur Makefile.in Makefile.in $(DYLIB_RPATH_INSTALL) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx for f in setup.h $(RCDEFS_H); do \ -@@ -16145,7 +16147,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config +--- Makefile.in.orig 2020-04-30 21:43:35.176560163 +0200 ++++ Makefile.in 2020-04-30 21:45:48.927132300 +0200 +@@ -16177,7 +16177,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config + $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config - (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale @@ -16153,7 +16155,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template index 32b1d919697..00be9070895 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,7 +1,7 @@ # Template file for 'wxWidgets' pkgname=wxWidgets -version=3.0.4 -revision=9 +version=3.0.5 +revision=1 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview" build_style=gnu-configure @@ -15,7 +15,7 @@ maintainer="Martin Riese " license="wxWindows" homepage="https://www.wxwidgets.org/" distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" -checksum=96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0 +checksum=8aacd56b462f42fb6e33b4d8f5d40be5abc3d3b41348ea968aa515cc8285d813 post_install() { # remove files that are already in wxWidgets-common