From 4322b33ba127939c2bc82e3fc7c54bba15f9d8d3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 4 Sep 2018 20:30:22 +0200
Subject: [PATCH] wxWidgets: remove files that are split into the new -common
 package

---
 srcpkgs/wxWidgets/template | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index 4c9310def56..5e3fd4f1e9b 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,14 +1,15 @@
 # Template file for 'wxWidgets'
 pkgname=wxWidgets
 version=3.0.4
-revision=7
+revision=8
 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
- --with-libnotify --enable-mediactrl"
+ --with-libnotify --enable-mediactrl --with-gtk=2"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-devel
  libXinerama-devel libmspack-devel SDL2-devel glu-devel webkitgtk2-devel
  gstreamer1-devel gst-plugins-base1-devel"
+depends="wxWidgets-common>=${version}"
 short_desc="The wxWidgets GUI toolkit library (version 3)"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="wxWindows"
@@ -16,17 +17,28 @@ homepage="https://www.wxwidgets.org/"
 distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2"
 checksum=96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0
 
+post_install() {
+	# remove files that are already in wxWidgets-common
+	rm -f ${DESTDIR}/usr/lib/libwx_baseu*
+	rm -rf ${DESTDIR}/usr/bin/wxrc*
+	rm -rf ${DESTDIR}/usr/share
+	find ${DESTDIR}/usr/include -type f -not -name tabartgtk.h \
+		-not -name fontdlgg.h -not -name notifmsg.h -exec rm -f {} \;
+	for f in "" generic gtk; do
+		rm ${DESTDIR}/usr/include/wx-3.0/wx/$f/notifmsg.h
+	done
+}
+
 wxWidgets-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${sourcepkg}-common-devel>=${version}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove usr/share
 		vmove usr/bin
+		vmove "usr/lib/*.so"
 		vmove usr/lib/wx
+
 		ln -sf wx-config-3.0 ${PKGDESTDIR}/usr/bin/wx-config
-		ln -sf wxrc-3.0 ${PKGDESTDIR}/usr/bin/wxrc
 
 		# remove all occurrences of $XBPS_CROSS_TRIPLET
 		# wx-config: