diff --git a/common/shlibs b/common/shlibs index 9c2060bc45a..da7f2739dc5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1561,26 +1561,7 @@ libfprint.so.0 libfprint0-1.0_1 libfprint-2.so.2 libfprint-1.90.7_1 libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1 -libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1 -libwx_base_xml-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2_html-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2_aui-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2_core-3.0.so.0 wxWidgets-3.0.0_1 -libwx_base_net-3.0.so.0 wxWidgets-3.0.0_1 -libwx_base-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_gl-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_stc-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_adv-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_qa-3.0.so.0 wxWidgets-3.0.0_1 libwx_baseu_net-3.0.so.0 wxWidgets-common-3.0.4_1 -libwx_gtk2u_core-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_richtext-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_propgrid-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_html-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_xrc-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_aui-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_ribbon-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_media-3.0.so.0 wxWidgets-3.0.1_1 libmspack.so.0 libmspack-0.4alpha_1 libslim.so.1.3.6 slim-1.3.6_1 libmediaart-2.0.so.0 libmediaart-1.9.1_1 diff --git a/srcpkgs/wxWidgets-devel b/srcpkgs/wxWidgets-devel deleted file mode 120000 index 0e979bb789d..00000000000 --- a/srcpkgs/wxWidgets-devel +++ /dev/null @@ -1 +0,0 @@ -wxWidgets \ No newline at end of file diff --git a/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch deleted file mode 100644 index bb93f0a2615..00000000000 --- a/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch +++ /dev/null @@ -1,18 +0,0 @@ -Taken from -https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch - -diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp ---- a/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 -+++ b/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 -@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con - msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), - lib.c_str(), progName.c_str(), prog.c_str()); - -- wxLogFatalError(msg.c_str()); -- -- // normally wxLogFatalError doesn't return -- return false; -+ wxLogWarning(msg.c_str()); - } - #undef wxCMP - diff --git a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch deleted file mode 100644 index 5ec31ebaceb..00000000000 --- a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naur Makefile.in Makefile.in ---- a/Makefile.in 2014-10-06 23:33:44.000000000 +0200 -+++ b/Makefile.in 2014-11-19 10:48:18.752319058 +0100 -@@ -15279,9 +15279,11 @@ - - install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___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_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install - $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) -+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin3.m4) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) - $(DYLIB_RPATH_INSTALL) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - for f in setup.h $(RCDEFS_H); do \ -@@ -16177,7 +16179,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 -@@ -16185,7 +16187,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - -@@ -16202,7 +16204,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/msw/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - -diff -Naur build/bakefiles/wx.bkl build/bakefiles/wx.bkl ---- a/build/bakefiles/wx.bkl 2014-10-06 23:33:44.000000000 +0200 -+++ b/build/bakefiles/wx.bkl 2014-11-19 10:32:21.692283955 +0100 -@@ -137,7 +137,7 @@ - - - $(SRCDIR)/locale -- wxstd -+ wxstd$(WX_RELEASE_NODOT) - - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW -diff -Naur src/common/translation.cpp src/common/translation.cpp ---- a/src/common/translation.cpp 2014-10-06 23:33:44.000000000 +0200 -+++ b/src/common/translation.cpp 2014-11-19 11:02:21.067788665 +0100 -@@ -1471,7 +1471,7 @@ - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not -diff -Naur utils/wxrc/Makefile.in utils/wxrc/Makefile.in ---- a/utils/wxrc/Makefile.in 2014-10-06 23:33:44.000000000 +0200 -+++ b/utils/wxrc/Makefile.in 2014-11-19 10:49:55.410110669 +0100 -@@ -125,7 +125,6 @@ - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template deleted file mode 100644 index 480c3e15e35..00000000000 --- a/srcpkgs/wxWidgets/template +++ /dev/null @@ -1,66 +0,0 @@ -# Template file for 'wxWidgets' -pkgname=wxWidgets -version=3.0.5.1 -revision=6 -build_style=gnu-configure -configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack - --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview" -hostmakedepends="pkg-config" -makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-devel - libXinerama-devel libmspack-devel SDL2-devel glu-devel - gstreamer1-devel gst-plugins-base1-devel" -depends="wxWidgets-common>=${version}" -short_desc="WxWidgets GUI toolkit library (version 3)" -maintainer="Martin Riese " -license="WxWindows-exception-3.1" -homepage="https://www.wxwidgets.org/" -distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" -checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807 - -post_install() { - local _config="gtk2-unicode-3.0" - # 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 - # remove all occurrences of $XBPS_CROSS_TRIPLET - # wx-config: - # - mark this build as native build - # - ignore --host option; breaks configure scripts when - # cross compiling (isn’t necessary in our case anyway) - if [ -n "$CROSS_BUILD" ]; then - rename "${XBPS_CROSS_TRIPLET}-" "" \ - ${DESTDIR}/usr/lib/wx/config/* \ - ${DESTDIR}/usr/lib/wx/include/* - rename -- "-${XBPS_CROSS_TRIPLET}" "" ${DESTDIR}/usr/lib/* - - sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \ - -e "s/-${XBPS_CROSS_TRIPLET}//g" \ - -e "s,$XBPS_CROSS_BASE,,g" \ - ${DESTDIR}/usr/lib/wx/config/${_config} - - fi - sed -i -e 's,^bindir=.*,bindir=${exec_prefix}/bin,' \ - -e 's/is_cross() { .* }/is_cross() { false; }/g' \ - -e '/--\*=\*)/i --host=\*) continue;;' \ - -e "s,/usr/lib,\${exec_prefix}/lib,g" \ - ${DESTDIR}/usr/lib/wx/config/${_config} - ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0 - ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config -} - -wxWidgets-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${sourcepkg}-common-devel>=${version}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/bin - vmove "usr/lib/*.so" - vmove usr/lib/wx - } -} diff --git a/srcpkgs/wxWidgets/update b/srcpkgs/wxWidgets/update deleted file mode 100644 index 77e290e7e64..00000000000 --- a/srcpkgs/wxWidgets/update +++ /dev/null @@ -1,2 +0,0 @@ -# development version -ignore='3.1.*'