diff options
| author | soenke | 2019-12-13 01:41:32 +0100 |
|---|---|---|
| committer | soenke | 2019-12-13 01:41:32 +0100 |
| commit | fc9abc744338a7090917d86e27472fcf42d53c78 (patch) | |
| tree | 09ac8e825fea01afac431d13bc41c86a7ef818a7 /prevent_gtk3_linking.patch | |
| parent | c254009aa858223971c4ea3bded5f20390ea44cb (diff) | |
| download | aur-fc9abc744338a7090917d86e27472fcf42d53c78.tar.gz | |
updated to 1.5.8 and added patches if boath opencv and opencv2-opt are installed
Diffstat (limited to 'prevent_gtk3_linking.patch')
| -rw-r--r-- | prevent_gtk3_linking.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/prevent_gtk3_linking.patch b/prevent_gtk3_linking.patch new file mode 100644 index 000000000000..d99d3b000ad2 --- /dev/null +++ b/prevent_gtk3_linking.patch @@ -0,0 +1,35 @@ +--- a/cmakemodules/script_wxwidgets.cmake ++++ b/cmakemodules/script_wxwidgets.cmake +@@ -17,20 +17,20 @@ + ENDIF(UNIX) + + # Select wx toolkit options, like GTK2 vs GTK3, etc. + if(UNIX) + # If available, prefer gtk3: +- execute_process( +- COMMAND wx-config --selected-config --toolkit=gtk3 +- RESULT_VARIABLE ret +- OUTPUT_QUIET +- ) +- if(ret EQUAL "0") +- message(STATUS "wxWidgets: Found gtk3 version, using it.") +- set(wxWidgets_CONFIG_OPTIONS_DEFAULT "--toolkit=gtk3") +- else() +- message(STATUS "wxWidgets: No gtk3 version found, falling back to default (likely gtk2)") +- endif() +- unset(ret) ++# execute_process( ++# COMMAND wx-config --selected-config --toolkit=gtk3 ++# RESULT_VARIABLE ret ++# OUTPUT_QUIET ++# ) ++# if(ret EQUAL "0") ++# message(STATUS "wxWidgets: Found gtk3 version, using it.") ++# set(wxWidgets_CONFIG_OPTIONS_DEFAULT "--toolkit=gtk3") ++# else() ++# message(STATUS "wxWidgets: No gtk3 version found, falling back to default (likely gtk2)") ++# endif() ++# unset(ret) + + set(wxWidgets_CONFIG_OPTIONS "${wxWidgets_CONFIG_OPTIONS_DEFAULT}" ON STRING "wxWidgets toolkit options") + endif() |