diff --git a/manifest/armv7l/w/wxwidgets.filelist b/manifest/armv7l/w/wxwidgets.filelist index cfe253e0b..964771a09 100644 --- a/manifest/armv7l/w/wxwidgets.filelist +++ b/manifest/armv7l/w/wxwidgets.filelist @@ -1,4 +1,4 @@ -# Total size: 28112903 +# Total size: 28112902 /usr/local/bin/wx-config /usr/local/bin/wxrc /usr/local/bin/wxrc-3.3 diff --git a/manifest/x86_64/w/wxwidgets.filelist b/manifest/x86_64/w/wxwidgets.filelist index 6c5f4e450..b614bc245 100644 --- a/manifest/x86_64/w/wxwidgets.filelist +++ b/manifest/x86_64/w/wxwidgets.filelist @@ -1,4 +1,4 @@ -# Total size: 36910995 +# Total size: 36910994 /usr/local/bin/wx-config /usr/local/bin/wxrc /usr/local/bin/wxrc-3.3 @@ -742,61 +742,61 @@ /usr/local/include/wx-3.3/wx/xtixml.h /usr/local/include/wx-3.3/wx/zipstrm.h /usr/local/include/wx-3.3/wx/zstream.h -/usr/local/lib/cmake/wxWidgets/wxWidgetsConfig.cmake -/usr/local/lib/cmake/wxWidgets/wxWidgetsConfigVersion.cmake -/usr/local/lib/cmake/wxWidgets/wxWidgetsTargets-release.cmake -/usr/local/lib/cmake/wxWidgets/wxWidgetsTargets.cmake -/usr/local/lib/libwx_baseu-3.3.so -/usr/local/lib/libwx_baseu-3.3.so.1 -/usr/local/lib/libwx_baseu-3.3.so.1.0.0 -/usr/local/lib/libwx_baseu_net-3.3.so -/usr/local/lib/libwx_baseu_net-3.3.so.1 -/usr/local/lib/libwx_baseu_net-3.3.so.1.0.0 -/usr/local/lib/libwx_baseu_xml-3.3.so -/usr/local/lib/libwx_baseu_xml-3.3.so.1 -/usr/local/lib/libwx_baseu_xml-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_adv-3.3.so -/usr/local/lib/libwx_gtk3u_adv-3.3.so.1 -/usr/local/lib/libwx_gtk3u_adv-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_aui-3.3.so -/usr/local/lib/libwx_gtk3u_aui-3.3.so.1 -/usr/local/lib/libwx_gtk3u_aui-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_core-3.3.so -/usr/local/lib/libwx_gtk3u_core-3.3.so.1 -/usr/local/lib/libwx_gtk3u_core-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_gl-3.3.so -/usr/local/lib/libwx_gtk3u_gl-3.3.so.1 -/usr/local/lib/libwx_gtk3u_gl-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_html-3.3.so -/usr/local/lib/libwx_gtk3u_html-3.3.so.1 -/usr/local/lib/libwx_gtk3u_html-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_media-3.3.so -/usr/local/lib/libwx_gtk3u_media-3.3.so.1 -/usr/local/lib/libwx_gtk3u_media-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_propgrid-3.3.so -/usr/local/lib/libwx_gtk3u_propgrid-3.3.so.1 -/usr/local/lib/libwx_gtk3u_propgrid-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_qa-3.3.so -/usr/local/lib/libwx_gtk3u_qa-3.3.so.1 -/usr/local/lib/libwx_gtk3u_qa-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_ribbon-3.3.so -/usr/local/lib/libwx_gtk3u_ribbon-3.3.so.1 -/usr/local/lib/libwx_gtk3u_ribbon-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_richtext-3.3.so -/usr/local/lib/libwx_gtk3u_richtext-3.3.so.1 -/usr/local/lib/libwx_gtk3u_richtext-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_stc-3.3.so -/usr/local/lib/libwx_gtk3u_stc-3.3.so.1 -/usr/local/lib/libwx_gtk3u_stc-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_webview-3.3.so -/usr/local/lib/libwx_gtk3u_webview-3.3.so.1 -/usr/local/lib/libwx_gtk3u_webview-3.3.so.1.0.0 -/usr/local/lib/libwx_gtk3u_xrc-3.3.so -/usr/local/lib/libwx_gtk3u_xrc-3.3.so.1 -/usr/local/lib/libwx_gtk3u_xrc-3.3.so.1.0.0 -/usr/local/lib/wx/3.3.1/web-extensions/webkit2_extu-3.3.1.so -/usr/local/lib/wx/config/gtk3-unicode-3.3 -/usr/local/lib/wx/include/gtk3-unicode-3.3/wx/setup.h +/usr/local/lib64/cmake/wxWidgets/wxWidgetsConfig.cmake +/usr/local/lib64/cmake/wxWidgets/wxWidgetsConfigVersion.cmake +/usr/local/lib64/cmake/wxWidgets/wxWidgetsTargets-release.cmake +/usr/local/lib64/cmake/wxWidgets/wxWidgetsTargets.cmake +/usr/local/lib64/libwx_baseu-3.3.so +/usr/local/lib64/libwx_baseu-3.3.so.1 +/usr/local/lib64/libwx_baseu-3.3.so.1.0.0 +/usr/local/lib64/libwx_baseu_net-3.3.so +/usr/local/lib64/libwx_baseu_net-3.3.so.1 +/usr/local/lib64/libwx_baseu_net-3.3.so.1.0.0 +/usr/local/lib64/libwx_baseu_xml-3.3.so +/usr/local/lib64/libwx_baseu_xml-3.3.so.1 +/usr/local/lib64/libwx_baseu_xml-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_adv-3.3.so +/usr/local/lib64/libwx_gtk3u_adv-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_adv-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_aui-3.3.so +/usr/local/lib64/libwx_gtk3u_aui-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_aui-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_core-3.3.so +/usr/local/lib64/libwx_gtk3u_core-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_core-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_gl-3.3.so +/usr/local/lib64/libwx_gtk3u_gl-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_gl-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_html-3.3.so +/usr/local/lib64/libwx_gtk3u_html-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_html-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_media-3.3.so +/usr/local/lib64/libwx_gtk3u_media-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_media-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_propgrid-3.3.so +/usr/local/lib64/libwx_gtk3u_propgrid-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_propgrid-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_qa-3.3.so +/usr/local/lib64/libwx_gtk3u_qa-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_qa-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_ribbon-3.3.so +/usr/local/lib64/libwx_gtk3u_ribbon-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_ribbon-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_richtext-3.3.so +/usr/local/lib64/libwx_gtk3u_richtext-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_richtext-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_stc-3.3.so +/usr/local/lib64/libwx_gtk3u_stc-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_stc-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_webview-3.3.so +/usr/local/lib64/libwx_gtk3u_webview-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_webview-3.3.so.1.0.0 +/usr/local/lib64/libwx_gtk3u_xrc-3.3.so +/usr/local/lib64/libwx_gtk3u_xrc-3.3.so.1 +/usr/local/lib64/libwx_gtk3u_xrc-3.3.so.1.0.0 +/usr/local/lib64/wx/3.3.1/web-extensions/webkit2_extu-3.3.1.so +/usr/local/lib64/wx/config/gtk3-unicode-3.3 +/usr/local/lib64/wx/include/gtk3-unicode-3.3/wx/setup.h /usr/local/share/locale/af/LC_MESSAGES/wxstd-3.3.mo /usr/local/share/locale/an/LC_MESSAGES/wxstd-3.3.mo /usr/local/share/locale/ar/LC_MESSAGES/wxstd-3.3.mo diff --git a/packages/wxwidgets.rb b/packages/wxwidgets.rb index ec2a84f94..ae2f7eecd 100644 --- a/packages/wxwidgets.rb +++ b/packages/wxwidgets.rb @@ -3,7 +3,7 @@ require 'buildsystems/cmake' class Wxwidgets < CMake description 'wxWidgets is a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base.' homepage 'https://www.wxwidgets.org/' - version '3.3.1' + version '3.3.1-1' license 'GPL-2' compatibility 'aarch64 armv7l x86_64' source_url "https://github.com/wxWidgets/wxWidgets/releases/download/v#{version.split('-')[0]}/wxWidgets-#{version.split('-')[0]}.tar.bz2" @@ -11,9 +11,9 @@ class Wxwidgets < CMake binary_compression 'tar.zst' binary_sha256({ - aarch64: '3a69d22b0391c911c71464b16ff901fe6c7fdc71107e439b5bd611db20d4b659', - armv7l: '3a69d22b0391c911c71464b16ff901fe6c7fdc71107e439b5bd611db20d4b659', - x86_64: 'c5b98f0700ec08bee27543d19de32a14f8c0b16a4284b0256028f7c36a45258c' + aarch64: 'e9b9c9eb0e30a906bd2a80bcde9a43c7fe0588e9763f2f040d9dc42591e68805', + armv7l: 'e9b9c9eb0e30a906bd2a80bcde9a43c7fe0588e9763f2f040d9dc42591e68805', + x86_64: '407295bab738f459f781999b51215142fcdf73dfc67118276d6299e04b1946ab' }) depends_on 'at_spi2_core' # R @@ -84,12 +84,25 @@ class Wxwidgets < CMake -DwxUSE_LIBMSPACK=ON \ -DwxUSE_PRIVATE_FONTS=ON \ -DwxUSE_GTKPRINT=ON \ - -DwxUSE_STD_STRING_CONV_IN_WXSTRING=ON\ + -DwxUSE_STD_STRING_CONV_IN_WXSTRING=ON \ -DwxUSE_WEBVIEW=ON" cmake_install_extras do - Dir.chdir "#{CREW_DEST_PREFIX}/bin" do - FileUtils.ln_sf "#{CREW_LIB_PREFIX}/wx/config/gtk3-unicode-#{version.sub(/\.\d+$/, '')}", 'wx-config' + # Fixes CMake Warning: + # Manually-specified variables were not used by the project: + # + # CMAKE_INSTALL_LIBDIR + if ARCH.eql?('x86_64') + Dir["#{CREW_DEST_PREFIX}/lib/**/*"].each do |lib| + lib64 = lib.sub("#{CREW_DEST_PREFIX}/lib", CREW_DEST_LIB_PREFIX) + if File.directory?(lib) + FileUtils.mkdir_p lib64 + else + FileUtils.mv lib, lib64 + end + end end + FileUtils.ln_sf "#{CREW_LIB_PREFIX}/wx/config/gtk3-unicode-#{version.split('-')[0].sub(/\.\d+$/, '')}", "#{CREW_DEST_PREFIX}/bin/wx-config" + FileUtils.ln_sf "#{CREW_PREFIX}/bin/wxrc-#{version.split('-')[0].sub(/\.\d+$/, '')}", "#{CREW_DEST_PREFIX}/bin/wxrc" end end diff --git a/tests/package/w/wxwidgets b/tests/package/w/wxwidgets new file mode 100755 index 000000000..fe42892ac --- /dev/null +++ b/tests/package/w/wxwidgets @@ -0,0 +1,2 @@ +#!/bin/bash +for b in $(crew files wxwidgets | grep /usr/local/bin); do $b -h 2>&1; done