Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:rhabacker:branches:windows:mingw:win64
mingw64-libqt4
qt-merge-static-and-shared-library-trees.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File qt-merge-static-and-shared-library-trees.patch of Package mingw64-libqt4
--- usr/i686-w64-mingw32/sys-root/mingw/include/QtCore/qconfig.h.orig 2011-12-25 21:03:37.022018831 +0100 +++ usr/i686-w64-mingw32/sys-root/mingw/include/QtCore/qconfig.h 2011-12-25 21:13:50.704976445 +0100 @@ -26,6 +26,14 @@ #ifndef QT_BOOTSTRAPPED +#if defined(QT_NODLL) +#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER) +# undef QT_BUILTIN_GIF_READER +#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER) +# define QT_BUILTIN_GIF_READER 1 +#endif +#endif + #if defined(QT_NO_ALSA) && defined(QT_ALSA) # undef QT_NO_ALSA #elif !defined(QT_NO_ALSA) && !defined(QT_ALSA) @@ -80,6 +88,7 @@ # define QT_NO_ICD #endif +#if !defined(QT_NODLL) #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG) # undef QT_NO_IMAGEFORMAT_JPEG #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG) @@ -97,6 +106,7 @@ #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF) # define QT_NO_IMAGEFORMAT_TIFF #endif +#endif #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY) # undef QT_NO_INOTIFY @@ -176,6 +186,14 @@ # define QT_NO_SYSTEMSEMAPHORE #endif +#if defined(QT_NODLL) +#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT) +# undef QT_NO_WEBKIT +#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT) +# define QT_NO_WEBKIT +#endif +#endif + #if defined(QT_NO_ZLIB) && defined(QT_ZLIB) # undef QT_NO_ZLIB #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB) --- usr/i686-w64-mingw32/sys-root/mingw/include/Qt/qconfig.h.orig 2011-12-25 21:03:13.349289762 +0100 +++ usr/i686-w64-mingw32/sys-root/mingw/include/Qt/qconfig.h 2011-12-25 21:06:37.386579371 +0100 @@ -26,6 +26,14 @@ #ifndef QT_BOOTSTRAPPED +#if defined(QT_NODLL) +#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER) +# undef QT_BUILTIN_GIF_READER +#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER) +# define QT_BUILTIN_GIF_READER 1 +#endif +#endif + #if defined(QT_NO_ALSA) && defined(QT_ALSA) # undef QT_NO_ALSA #elif !defined(QT_NO_ALSA) && !defined(QT_ALSA) @@ -80,6 +88,7 @@ # define QT_NO_ICD #endif +#if !defined(QT_NODLL) #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG) # undef QT_NO_IMAGEFORMAT_JPEG #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG) @@ -97,6 +106,7 @@ #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF) # define QT_NO_IMAGEFORMAT_TIFF #endif +#endif #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY) # undef QT_NO_INOTIFY @@ -176,6 +186,14 @@ # define QT_NO_SYSTEMSEMAPHORE #endif +#if defined(QT_NODLL) +#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT) +# undef QT_NO_WEBKIT +#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT) +# define QT_NO_WEBKIT +#endif +#endif + #if defined(QT_NO_ZLIB) && defined(QT_ZLIB) # undef QT_NO_ZLIB #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB) --- usr/i686-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/qconfig.pri.orig 2011-12-25 21:09:01.616032758 +0100 +++ usr/i686-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/qconfig.pri 2011-12-25 21:12:14.685003350 +0100 @@ -2,7 +2,11 @@ CONFIG += cross_compile def_files_disabled exceptions rtti no_mocdepend release stl qt_no_framework QT_ARCH = windows QT_EDITION = OpenSource -QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl shared ipv6 getaddrinfo system-jpeg system-png png system-tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl concurrent xmlpatterns multimedia audio-backend svg script scripttools declarative release +contains(CONFIG, static) { + QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl static ipv6 getaddrinfo system-jpeg jpeg mng system-png png gif system-tiff tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl concurrent xmlpatterns multimedia audio-backend svg script scripttools declarative release +} else { + QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl shared ipv6 getaddrinfo system-jpeg system-png png system-tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl concurrent xmlpatterns multimedia audio-backend svg script scripttools declarative release +} #versioning QT_VERSION = 4.8.5 --- usr/i686-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf.orig 2011-12-26 02:29:56.365208473 +0100 +++ usr/i686-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf 2011-12-26 02:31:03.650208601 +0100 @@ -6,6 +6,10 @@ } } +contains(CONFIG, static) { + QMAKE_LFLAGS += -static +} + # Now load the global default_post load(default_post) --- usr/i686-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/qt_functions.prf.orig 2011-12-26 21:24:32.448207664 +0100 +++ usr/i686-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/qt_functions.prf 2012-04-19 16:21:25.437111396 +0200 @@ -71,7 +71,7 @@ export(TARGET.CAPABILITY) } isEmpty(LINKAGE) { - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { + if(!debug_and_release|build_pass):!static:CONFIG(debug, debug|release) { win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug } @@ -83,6 +83,17 @@ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX} } LIBS += $$LINKAGE + win32:CONFIG(static) { + isEqual(LIB_NAME, QtCore) { + LIBS += $$QMAKE_LIBS_CORE + } else:isEqual(LIB_NAME, QtGui) { + LIBS += $$QMAKE_LIBS_GUI + } else:isEqual(LIB_NAME, QtNetwork) { + LIBS += $$QMAKE_LIBS_NETWORK + } else:isEqual(LIB_NAME, QtOpenGL) { + LIBS += $$QMAKE_LIBS_OPENGL + } + } export(LIBS) export(INCLUDEPATH) export(QMAKE_FRAMEWORKPATH) --- usr/x86_64-w64-mingw32/sys-root/mingw/include/QtCore/qconfig.h.orig 2011-12-25 21:03:37.022018831 +0100 +++ usr/x86_64-w64-mingw32/sys-root/mingw/include/QtCore/qconfig.h 2011-12-25 21:13:50.704976445 +0100 @@ -26,6 +26,14 @@ #ifndef QT_BOOTSTRAPPED +#if defined(QT_NODLL) +#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER) +# undef QT_BUILTIN_GIF_READER +#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER) +# define QT_BUILTIN_GIF_READER 1 +#endif +#endif + #if defined(QT_NO_ALSA) && defined(QT_ALSA) # undef QT_NO_ALSA #elif !defined(QT_NO_ALSA) && !defined(QT_ALSA) @@ -80,6 +88,7 @@ # define QT_NO_ICD #endif +#if !defined(QT_NODLL) #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG) # undef QT_NO_IMAGEFORMAT_JPEG #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG) @@ -97,6 +106,7 @@ #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF) # define QT_NO_IMAGEFORMAT_TIFF #endif +#endif #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY) # undef QT_NO_INOTIFY @@ -176,6 +186,14 @@ # define QT_NO_SYSTEMSEMAPHORE #endif +#if defined(QT_NODLL) +#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT) +# undef QT_NO_WEBKIT +#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT) +# define QT_NO_WEBKIT +#endif +#endif + #if defined(QT_NO_ZLIB) && defined(QT_ZLIB) # undef QT_NO_ZLIB #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB) --- usr/x86_64-w64-mingw32/sys-root/mingw/include/Qt/qconfig.h.orig 2011-12-25 21:03:13.349289762 +0100 +++ usr/x86_64-w64-mingw32/sys-root/mingw/include/Qt/qconfig.h 2011-12-25 21:06:37.386579371 +0100 @@ -26,6 +26,14 @@ #ifndef QT_BOOTSTRAPPED +#if defined(QT_NODLL) +#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER) +# undef QT_BUILTIN_GIF_READER +#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER) +# define QT_BUILTIN_GIF_READER 1 +#endif +#endif + #if defined(QT_NO_ALSA) && defined(QT_ALSA) # undef QT_NO_ALSA #elif !defined(QT_NO_ALSA) && !defined(QT_ALSA) @@ -80,6 +88,7 @@ # define QT_NO_ICD #endif +#if !defined(QT_NODLL) #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG) # undef QT_NO_IMAGEFORMAT_JPEG #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG) @@ -97,6 +106,7 @@ #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF) # define QT_NO_IMAGEFORMAT_TIFF #endif +#endif #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY) # undef QT_NO_INOTIFY @@ -176,6 +186,14 @@ # define QT_NO_SYSTEMSEMAPHORE #endif +#if defined(QT_NODLL) +#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT) +# undef QT_NO_WEBKIT +#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT) +# define QT_NO_WEBKIT +#endif +#endif + #if defined(QT_NO_ZLIB) && defined(QT_ZLIB) # undef QT_NO_ZLIB #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB) --- usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/qconfig.pri.orig 2011-12-25 21:09:01.616032758 +0100 +++ usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/qconfig.pri 2011-12-25 21:12:14.685003350 +0100 @@ -2,7 +2,11 @@ CONFIG += cross_compile def_files_disabled exceptions rtti no_mocdepend release stl qt_no_framework QT_ARCH = windows QT_EDITION = OpenSource -QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl shared ipv6 getaddrinfo system-jpeg system-png png system-tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl concurrent xmlpatterns multimedia audio-backend svg script scripttools declarative release +contains(CONFIG, static) { + QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl static ipv6 getaddrinfo system-jpeg jpeg mng system-png png gif system-tiff tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl concurrent xmlpatterns multimedia audio-backend svg script scripttools declarative release +} else { + QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl shared ipv6 getaddrinfo system-jpeg system-png png system-tiff no-freetype system-zlib gnu-libiconv dbus dbus-linked openssl concurrent xmlpatterns multimedia audio-backend svg script scripttools declarative release +} #versioning QT_VERSION = 4.8.6 --- usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf.orig 2011-12-26 02:29:56.365208473 +0100 +++ usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf 2011-12-26 02:31:03.650208601 +0100 @@ -6,6 +6,10 @@ } } +contains(CONFIG, static) { + QMAKE_LFLAGS += -static +} + # Now load the global default_post load(default_post) --- usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/qt_functions.prf.orig 2011-12-26 21:24:32.448207664 +0100 +++ usr/x86_64-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/qt_functions.prf 2012-04-19 16:21:25.437111396 +0200 @@ -71,7 +71,7 @@ export(TARGET.CAPABILITY) } isEmpty(LINKAGE) { - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { + if(!debug_and_release|build_pass):!static:CONFIG(debug, debug|release) { win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug } @@ -83,6 +83,17 @@ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX} } LIBS += $$LINKAGE + win32:CONFIG(static) { + isEqual(LIB_NAME, QtCore) { + LIBS += $$QMAKE_LIBS_CORE + } else:isEqual(LIB_NAME, QtGui) { + LIBS += $$QMAKE_LIBS_GUI + } else:isEqual(LIB_NAME, QtNetwork) { + LIBS += $$QMAKE_LIBS_NETWORK + } else:isEqual(LIB_NAME, QtOpenGL) { + LIBS += $$QMAKE_LIBS_OPENGL + } + } export(LIBS) export(INCLUDEPATH) export(QMAKE_FRAMEWORKPATH)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
