Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

wxWidgets3.1: Update to version 3.1.7; and,

Browse Source 
Use disable-permissive and use "build-${MSYSTEM}"
instead of "build-${CARCH}". And, change "mv" to "cp"
with "rm".
This commit is contained in:
Tim Stahlhut
2022-06-08 12:04:28 -04:00
parent 156641b66e
commit 0c0152ace0
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mingw-w64-wxWidgets3.1/PKGBUILD
View File

@@ -18,7 +18,7 @@ _wx_buildver=
pkgbase=mingw-w64-${_basename}${_wx_basever}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}${_wx_basever}"
pkgver=${_wx_basever}.6
pkgver=${_wx_basever}.7
pkgrel=1
pkgdesc="A C++ library that lets developers create applications for Windows, Linux and UNIX (mingw-w64)"
arch=('any')
@@ -47,7 +47,7 @@ source=(
# This is needed to build clang samples in check step
010-wxWidgets-3.1.6-Redo-manifest-filename-logic.patch
)
sha256sums=('4980e86c6494adcd527a41fc0a4e436777ba41d1893717d7b7176c59c2061c25'
sha256sums=('3d666e47d86192f085c84089b850c90db7a73a5d26b684b617298d89dce84f19'
'2b3b183a6a76ad539abc49a41033aa923c13b395c0e55189ba962068781c7135'
'4a4828f0c9cdc638cffde6a30b5dfb14283719acc9e89e19de8ec2d5a80a5aec'
'b30100e03f350e14060923781c3c7979735cc81996a13012bef980a23eb3d20b')
@@ -114,8 +114,8 @@ build() {
#echo "_debug_options := ${_debug_options[@]}"
[[ -d "${srcdir}"/build-${CARCH}-shared ]] && rm -rf "${srcdir}"/build-${CARCH}-shared
mkdir -p "${srcdir}"/build-${CARCH}-shared && cd "${srcdir}"/build-${CARCH}-shared
[[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
../${_basename}-${pkgver}${_wx_buildver}/configure \
--prefix=${MINGW_PREFIX} \
@@ -126,7 +126,7 @@ build() {
--enable-shared \
--enable-std_string \
--enable-iff \
--enable-permissive \
--disable-permissive \
--enable-unicode \
--enable-graphics_ctx \
--enable-graphics-d2d \
@@ -144,8 +144,8 @@ build() {
make #VERBOSE=1
[[ -d "${srcdir}"/build-${CARCH}-static ]] && rm -rf "${srcdir}"/build-${CARCH}-static
mkdir -p "${srcdir}"/build-${CARCH}-static && cd "${srcdir}"/build-${CARCH}-static
[[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
../${_basename}-${pkgver}${_wx_buildver}/configure \
--prefix=${MINGW_PREFIX} \
@@ -156,7 +156,7 @@ build() {
--disable-shared \
--enable-std_string \
--enable-iff \
--enable-permissive \
--disable-permissive \
--enable-unicode \
--enable-graphics_ctx \
--enable-graphics-d2d \
@@ -175,9 +175,9 @@ build() {
}
check() {
# cd "${srcdir}/build-${CARCH}-shared/tests" && make -k --jobs=1 || true
# cd "${srcdir}/build-${MSYSTEM}-shared/tests" && make -k --jobs=1 || true
cd "${srcdir}/build-${CARCH}-shared/samples" && make -k --jobs=1 || true
cd "${srcdir}/build-${MSYSTEM}-shared/samples" && make -k --jobs=1 || true
}
package() {
@@ -195,10 +195,10 @@ package() {
"${MINGW_PACKAGE_PREFIX}-zlib"
)
cd "${srcdir}"/build-${CARCH}-static
cd "${srcdir}"/build-${MSYSTEM}-static
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build-${CARCH}-shared
cd "${srcdir}"/build-${MSYSTEM}-shared
make DESTDIR="${pkgdir}" install
# Replace real full path with psuedo full path;
@@ -208,16 +208,18 @@ package() {
sed -s "s|-L${MINGW_PREFIX_WIN}/lib|-L${MINGW_PREFIX}/lib|g" -i "${pkgdir}${MINGW_PREFIX}/lib/wx/config/msw-unicode-${_wx_basever}"
sed -s "s|-L${MINGW_PREFIX_WIN}/lib|-L${MINGW_PREFIX}/lib|g" -i "${pkgdir}${MINGW_PREFIX}/lib/wx/config/msw-unicode-static-${_wx_basever}"
# Rename files
mv ${pkgdir}${MINGW_PREFIX}/bin/wx-config{,-${_wx_basever}}
mv ${pkgdir}${MINGW_PREFIX}/share/aclocal/wxwin.m4 ${pkgdir}${MINGW_PREFIX}/share/aclocal/wxwin${_wx_basever}.m4
# create wx-config copy with version file suffix
cp ${pkgdir}${MINGW_PREFIX}/bin/wx-config{,-${_wx_basever}}
# Add missing exe file extension (Likely bug in wxWidgets makefile)
mv ${pkgdir}${MINGW_PREFIX}/bin/wxrc-${_wx_basever} ${pkgdir}${MINGW_PREFIX}/bin/wxrc-${_wx_basever}.exe
# create wxwin.m4 copy with version file suffix
cp ${pkgdir}${MINGW_PREFIX}/share/aclocal/wxwin.m4 ${pkgdir}${MINGW_PREFIX}/share/aclocal/wxwin${_wx_basever}.m4
# Remove conflicting files; that were copied to new names.
rm -f ${pkgdir}${MINGW_PREFIX}/bin/wx-config
rm -f ${pkgdir}${MINGW_PREFIX}/share/aclocal/wxwin.m4
# Remove conflicting files; that do NOT need to be renamed.
rm -f ${pkgdir}${MINGW_PREFIX}/bin/wxrc.exe
rm -f ${pkgdir}${MINGW_PREFIX}/bin/wx-config
# Remove conflicting files; that I have no idea how to rename
rm -fr ${pkgdir}${MINGW_PREFIX}/share/bakefile