Skip to content

Commit

Permalink
mingw-w64-wxwidgets-git: Add package
Browse files Browse the repository at this point in the history
  • Loading branch information
stahta01 committed Nov 20, 2024
1 parent 881afd0 commit 4465c14
Show file tree
Hide file tree
Showing 3 changed files with 1,001 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- wxWidgets-3.0.2/wx-config.in.orig 2015-12-12 14:49:36.241974800 +0000
+++ wxWidgets-3.0.2/wx-config.in 2015-12-12 14:53:06.242503400 +0000
@@ -401,6 +401,7 @@

# Determine the base directories we require.
prefix=${input_option_prefix-${this_prefix:-@prefix@}}
+prefix=$(cygpath -m ${prefix})
exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
wxconfdir="@libdir@/wx/config"

Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
From 68d9676bc0c56ff0112c1ced8061eb75871834a3 Mon Sep 17 00:00:00 2001
From: Tim Stahlhut <[email protected]>
Date: Sat, 1 Jun 2019 19:10:57 -0400
Subject: Remove WX_LIBS_STATIC support

---
wxwin.m4 | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/wxwin.m4 b/wxwin.m4
index 68cf880fb6..a4d93a21de 100644
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -145,15 +145,15 @@ dnl WX_CONFIG_CHECK(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS
dnl [, WX-OPTIONAL-LIBS]]]]])
dnl
-dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
-dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
-dnl environment variable to override the default name of the wx-config script
-dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
+dnl Test for wxWidgets, and define WX_C*FLAGS and WX_LIBS
+dnl Set WX_CONFIG_NAME environment variable to override
+dnl the default name of the wx-config script to use.
+dnl Set WX_CONFIG_PATH to specify the full path to wx-config - in this
dnl case the macro won't even waste time on tests for its existence.
dnl
dnl Optional WX-LIBS argument contains comma- or space-separated list of
-dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
-dnl and WX_LIBS_STATIC will contain flags to link with all of the core
+dnl wxWidgets libraries to link against. If it is not specified then
+dnl WX_LIBS will contain flags to link with all of the core
dnl wxWidgets libraries.
dnl
dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
@@ -248,18 +248,6 @@ AC_DEFUN([WX_CONFIG_CHECK],
fi
WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4 $wx_optional_libs`

- dnl is this even still appropriate? --static is a real option now
- dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
- dnl what the user actually wants, making this redundant at best.
- dnl For now keep it in case anyone actually used it in the past.
- AC_MSG_CHECKING([for wxWidgets static library])
- WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 $wx_optional_libs 2>/dev/null`
- if test "x$WX_LIBS_STATIC" = "x"; then
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(yes)
- fi
-
dnl starting with version 2.2.6 wx-config has --cppflags argument
wx_has_cppflags=""
if test $wx_config_major_version -gt 2; then
@@ -329,7 +317,6 @@ AC_DEFUN([WX_CONFIG_CHECK],
WX_CPPFLAGS=""
WX_CXXFLAGS=""
WX_LIBS=""
- WX_LIBS_STATIC=""
WX_RESCOMP=""

if test ! -z "$5"; then
@@ -365,7 +352,6 @@ AC_DEFUN([WX_CONFIG_CHECK],
WX_CPPFLAGS=""
WX_CXXFLAGS=""
WX_LIBS=""
- WX_LIBS_STATIC=""
WX_RESCOMP=""

ifelse([$3], , :, [$3])
@@ -378,7 +364,6 @@ AC_DEFUN([WX_CONFIG_CHECK],
AC_SUBST(WX_CFLAGS_ONLY)
AC_SUBST(WX_CXXFLAGS_ONLY)
AC_SUBST(WX_LIBS)
- AC_SUBST(WX_LIBS_STATIC)
AC_SUBST(WX_VERSION)
AC_SUBST(WX_RESCOMP)

--
Loading

0 comments on commit 4465c14

Please sign in to comment.