diff --git a/x11-libs/wxgtk/wxgtk-3.1.5.recipe b/x11-libs/wxgtk/wxgtk-3.2.0.recipe similarity index 58% rename from x11-libs/wxgtk/wxgtk-3.1.5.recipe rename to x11-libs/wxgtk/wxgtk-3.2.0.recipe index d22d0c611..8c51d8290 100644 --- a/x11-libs/wxgtk/wxgtk-3.1.5.recipe +++ b/x11-libs/wxgtk/wxgtk-3.2.0.recipe @@ -11,30 +11,30 @@ COPYRIGHT="1998-2021 Julian Smart, Robert Roebling et al" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v$portVersion/wxWidgets-$portVersion.tar.bz2" -CHECKSUM_SHA256="d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224" +CHECKSUM_SHA256="356e9b55f1ae3d58ae1fed61478e9b754d46b820913e3bfbc971c50377c1903a" SOURCE_DIR="wxWidgets-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="5.0.0" +libVersion="0.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" wxgtk$secondaryArchSuffix = $portVersion - lib:libwx_baseu_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_baseu_net_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_baseu_xml_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_adv_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_aui_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_core_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_html_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_propgrid_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_qa_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_ribbon_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_richtext_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_stc_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_gtk3u_xrc_3.1$secondaryArchSuffix = $libVersionCompat + lib:libwx_baseu_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_baseu_net_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_baseu_xml_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_adv_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_aui_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_core_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_html_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_propgrid_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_qa_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_ribbon_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_richtext_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_stc_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_gtk3u_xrc_3.2$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -65,20 +65,20 @@ PROVIDES_devel=" wxgtk${secondaryArchSuffix}_devel = $portVersion cmd:wx_config$secondaryArchSuffix = $portVersion compat >= 3 cmd:wxrc$secondaryArchSuffix = $portVersion compat >= 3 - cmd:wxrc_3.1$secondaryArchSuffix = $portVersion compat >= 3 - devel:libwx_baseu_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_baseu_net_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_baseu_xml_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_adv_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_aui_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_core_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_html_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_propgrid_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_qa_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_ribbon_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_richtext_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_stc_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_gtk3u_xrc_3.1$secondaryArchSuffix = $libVersionCompat + cmd:wxrc_3.2$secondaryArchSuffix = $portVersion compat >= 3 + devel:libwx_baseu_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_baseu_net_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_baseu_xml_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_adv_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_aui_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_core_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_html_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_propgrid_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_qa_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_ribbon_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_richtext_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_stc_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_gtk3u_xrc_3.2$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" wxgtk$secondaryArchSuffix == $portVersion base @@ -131,19 +131,19 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage wxgtk$secondaryArchSuffix \ - "$libDir"/libwx_baseu-3.1.so.$libVersion \ - "$libDir"/libwx_baseu_net-3.1.so.$libVersion \ - "$libDir"/libwx_baseu_xml-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_adv-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_aui-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_core-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_html-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_propgrid-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_qa-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_ribbon-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_richtext-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_stc-3.1.so.$libVersion \ - "$libDir"/libwx_gtk3u_xrc-3.1.so.$libVersion + "$libDir"/libwx_baseu-3.2.so.$libVersion \ + "$libDir"/libwx_baseu_net-3.2.so.$libVersion \ + "$libDir"/libwx_baseu_xml-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_adv-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_aui-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_core-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_html-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_propgrid-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_qa-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_ribbon-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_richtext-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_stc-3.2.so.$libVersion \ + "$libDir"/libwx_gtk3u_xrc-3.2.so.$libVersion BUILD() { @@ -162,30 +162,30 @@ INSTALL() make install prepareInstalledDevelLibs \ - libwx_baseu-3.1 \ - libwx_baseu_net-3.1 \ - libwx_baseu_xml-3.1 \ - libwx_gtk3u_adv-3.1 \ - libwx_gtk3u_aui-3.1 \ - libwx_gtk3u_core-3.1 \ - libwx_gtk3u_html-3.1 \ - libwx_gtk3u_propgrid-3.1 \ - libwx_gtk3u_qa-3.1 \ - libwx_gtk3u_ribbon-3.1 \ - libwx_gtk3u_richtext-3.1 \ - libwx_gtk3u_stc-3.1 \ - libwx_gtk3u_xrc-3.1 + libwx_baseu-3.2 \ + libwx_baseu_net-3.2 \ + libwx_baseu_xml-3.2 \ + libwx_gtk3u_adv-3.2 \ + libwx_gtk3u_aui-3.2 \ + libwx_gtk3u_core-3.2 \ + libwx_gtk3u_html-3.2 \ + libwx_gtk3u_propgrid-3.2 \ + libwx_gtk3u_qa-3.2 \ + libwx_gtk3u_ribbon-3.2 \ + libwx_gtk3u_richtext-3.2 \ + libwx_gtk3u_stc-3.2 \ + libwx_gtk3u_xrc-3.2 # Install a header file that's been missed by make install?. cp include/wx/generic/clrpickerg.h \ - $includeDir/wx-3.1/wx/generic/ + $includeDir/wx-3.2/wx/generic/ # Remove the symlinked wx-config and put the real one there instead. rm $binDir/wx-config - mv $libDir/wx/config/gtk3-unicode-3.1 $binDir/wx-config + mv $libDir/wx/config/gtk3-unicode-3.2 $binDir/wx-config # Move setup.h to the main include directory. - mv $libDir/wx/include/gtk3-unicode-3.1/wx/setup.h $includeDir/wx-3.1/wx/ + mv $libDir/wx/include/gtk3-unicode-3.2/wx/setup.h $includeDir/wx-3.2/wx/ rm -rf $libDir/wx/