File configure-qt4-fix-on-windows.patch of Package mingw32-gwenhywfar

Overview Repositories Revisions Requests Users Attributes Meta

File configure-qt4-fix-on-windows.patch of Package mingw32-gwenhywfar (Revision 8415e34961e909242f0621396fcf5d02)

Currently displaying revision 8415e34961e909242f0621396fcf5d02 , Show latest

diff -rubB gwenhywfar-4.20.1.orig/gui/qt4/gwengui-qt4-config.cmake.in gwenhywfar-4.20.1/gui/qt4/gwengui-qt4-config.cmake.in
--- gwenhywfar-4.20.1.orig/gui/qt4/gwengui-qt4-config.cmake.in	2018-05-02 22:05:40.000000000 +0200
+++ gwenhywfar-4.20.1/gui/qt4/gwengui-qt4-config.cmake.in	2018-10-08 18:08:40.577547675 +0200
@@ -44,7 +44,11 @@
 set_and_check(exec_prefix "@exec_prefix@")
 set_and_check(includedir "@includedir@")
 set_and_check(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS "@gwenhywfar_headerdir@")
-set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.so")
+if(WIN32)
+  set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.dll.a")
+else()
+  set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.so")
+endif()
 set(${CMAKE_FIND_PACKAGE_NAME}_FOUND true)
 
 if(${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT TARGET gwenhywfar::gui-qt4)
diff -rubB gwenhywfar-4.20.1.orig/m4/qt4.m4 gwenhywfar-4.20.1/m4/qt4.m4
--- gwenhywfar-4.20.1.orig/m4/qt4.m4	2018-05-02 22:05:40.000000000 +0200
+++ gwenhywfar-4.20.1/m4/qt4.m4	2018-10-08 18:14:09.442154965 +0200
@@ -112,7 +112,7 @@
 # Shared library suffix. On linux this was set as
 # shrext_cmds='.so'; but on darwin it is actually a text command.
 eval std_shrext=\"$shrext_cmds\"
-if test -n "${std_shrext}"; then
+if test -z "${std_shrext}"; then
    std_shrext='.so'
 fi
 
@@ -121,6 +121,8 @@
 # This is the name of the qt library to search for.
 if test "x$OSYSTEM" = "xosx"; then
    qt_searchname="lib${qt_libname}.4.dylib"
+elif test "x$host" = "xi686-w64-mingw32" || test "x$host" = "xx86_64-w64-mingw32"; then
+   qt_searchname="lib${qt_libname}4${std_shrext}.a"
 else
    qt_searchname="lib${qt_libname}${std_shrext}.4"
 fi
@@ -129,8 +131,12 @@
 if test -z "$qt4_libs"; then
    AQ_SEARCH_FOR_PATH([$qt_searchname],[$local_qt4_libs])
    if test -n "$found_dir" ; then
+     if test "x$host" = "xi686-w64-mingw32" || test "x$host" = "xx86_64-w64-mingw32"; then
+       qt4_libs="-L$found_dir -l${qt_libname}4 -lQtCore4 -no-undefined"
+     else
      qt4_libs="-L$found_dir -l${qt_libname} -lQtCore"
    fi
+   fi
 fi
 
 if test -n "$qt4_libs"; then

Places

File configure-qt4-fix-on-windows.patch of Package mingw32-gwenhywfar (Revision 8415e34961e909242f0621396fcf5d02)

Places