- Add patch to not bother checking qt4 bugs:
* kde5-configure-checks.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=555
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
aa76021f42
commit
98cba2ce94
102
kde5-configure-checks.patch
Normal file
102
kde5-configure-checks.patch
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index fd06712066a4..e904fe3c29cc 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -10841,97 +10841,6 @@ the root of your Qt installation by exporting QT5DIR before running "configure".
|
||||||
|
[
|
||||||
|
QT5_HAVE_GLIB=1
|
||||||
|
AC_DEFINE(QT5_HAVE_GLIB,1)
|
||||||
|
- QT5_GLIB_CFLAGS=$(printf '%s' "$QT5_GLIB_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
|
||||||
|
- FilterLibs "${QT5_GLIB_LIBS}"
|
||||||
|
- QT5_GLIB_LIBS="${filteredlibs}"
|
||||||
|
-
|
||||||
|
- qt5_fix_warning=
|
||||||
|
-
|
||||||
|
- AC_LANG_PUSH([C++])
|
||||||
|
- # tst_exclude_socket_notifiers.moc:70:28: runtime error: member access within address 0x60d00000bb20 which does not point to an object of type 'QO
|
||||||
|
- # 0x60d00000bb20: note: object is of type 'QObjectPrivate'
|
||||||
|
- # 02 00 80 3a 90 8a 4e d2 3a 00 00 00 f0 b4 b9 a7 ff 7f 00 00 00 00 00 00 00 00 00 00 20 d8 4e d2
|
||||||
|
- # ^~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
- # vptr for 'QObjectPrivate'
|
||||||
|
- save_CXX=$CXX
|
||||||
|
- CXX=$(printf %s "$CXX" \
|
||||||
|
- | sed -e 's/-fno-sanitize-recover\(=[[0-9A-Za-z,_-]]*\)*//')
|
||||||
|
- save_CXXFLAGS=$CXXFLAGS
|
||||||
|
- CXXFLAGS="$CXXFLAGS $QT5_CFLAGS"
|
||||||
|
- save_LIBS=$LIBS
|
||||||
|
- LIBS="$LIBS $QT5_LIBS"
|
||||||
|
- AC_MSG_CHECKING([whether Qt has fixed ExcludeSocketNotifiers])
|
||||||
|
- # Prepare meta object data
|
||||||
|
- TSTBASE="tst_exclude_socket_notifiers"
|
||||||
|
- TSTMOC="${SRC_ROOT}/vcl/unx/qt5/${TSTBASE}"
|
||||||
|
- ln -fs "${TSTMOC}.hxx"
|
||||||
|
- $MOC5 "${TSTBASE}.hxx" -o "${TSTBASE}.moc"
|
||||||
|
-
|
||||||
|
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||||
|
-#include <cstdlib>
|
||||||
|
-#include "tst_exclude_socket_notifiers.moc"
|
||||||
|
-
|
||||||
|
-int main(int argc, char *argv[])
|
||||||
|
-{
|
||||||
|
- QCoreApplication app(argc, argv);
|
||||||
|
- exit(tst_processEventsExcludeSocket());
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
- ]])],[
|
||||||
|
- AC_MSG_RESULT([yes])
|
||||||
|
- ],[
|
||||||
|
- AC_MSG_RESULT([no])
|
||||||
|
- AC_MSG_WARN([native Qt5 file pickers will be disabled at runtime])
|
||||||
|
- if test -z "$qt5_fix_warning"; then
|
||||||
|
- add_warning "native QT5 file pickers will be disabled at runtime, Qt5 fixes needed"
|
||||||
|
- fi
|
||||||
|
- qt5_fix_warning=1
|
||||||
|
- add_warning " https://bugreports.qt-project.org/browse/QTBUG-37380 (needed)"
|
||||||
|
- ])
|
||||||
|
-
|
||||||
|
- # Remove meta object data
|
||||||
|
- rm -f "${TSTBASE}."*
|
||||||
|
-
|
||||||
|
- AC_MSG_CHECKING([whether Qt avoids QClipboard recursion caused by posted events])
|
||||||
|
- # Prepare meta object data
|
||||||
|
- TSTBASE="tst_exclude_posted_events"
|
||||||
|
- TSTMOC="${SRC_ROOT}/vcl/unx/qt5/${TSTBASE}"
|
||||||
|
- ln -fs "${TSTMOC}.hxx"
|
||||||
|
- $MOC5 "${TSTBASE}.hxx" -o "${TSTBASE}.moc"
|
||||||
|
-
|
||||||
|
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||||
|
-#include <cstdlib>
|
||||||
|
-#include "tst_exclude_posted_events.moc"
|
||||||
|
-
|
||||||
|
-int main(int argc, char *argv[])
|
||||||
|
-{
|
||||||
|
- QCoreApplication app(argc, argv);
|
||||||
|
- exit(tst_excludePostedEvents());
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
- ]])],[
|
||||||
|
- AC_MSG_RESULT([yes])
|
||||||
|
- ],[
|
||||||
|
- AC_MSG_RESULT([no])
|
||||||
|
- AC_MSG_WARN([native QT5 file pickers will be disabled at runtime])
|
||||||
|
- if test -z "$qt5_fix_warning"; then
|
||||||
|
- add_warning "native QT5 file pickers will be disabled at runtime, Qt5 fixes needed"
|
||||||
|
- fi
|
||||||
|
- qt5_fix_warning=1
|
||||||
|
- add_warning " https://bugreports.qt-project.org/browse/QTBUG-34614 (needed)"
|
||||||
|
- ])
|
||||||
|
-
|
||||||
|
- # Remove meta object data
|
||||||
|
- rm -f "${TSTBASE}."*
|
||||||
|
-
|
||||||
|
- if test -n "$qt5_fix_warning"; then
|
||||||
|
- add_warning " https://bugreports.qt-project.org/browse/QTBUG-38585 (recommended)"
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- LIBS=$save_LIBS
|
||||||
|
- CXXFLAGS=$save_CXXFLAGS
|
||||||
|
- CXX=$save_CXX
|
||||||
|
- AC_LANG_POP([C++])
|
||||||
|
],
|
||||||
|
AC_MSG_WARN([[No Glib found, Qt5 support will not use native file pickers!]])
|
||||||
|
)
|
||||||
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 29 14:16:30 UTC 2017 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Add patch to not bother checking qt4 bugs:
|
||||||
|
* kde5-configure-checks.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 29 11:55:23 UTC 2017 - tchvatal@suse.com
|
Wed Nov 29 11:55:23 UTC 2017 - tchvatal@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -84,6 +84,7 @@ Patch1: scp2-user-config-suse.diff
|
|||||||
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
|
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
|
||||||
Patch4: nlpsolver-no-broken-help.diff
|
Patch4: nlpsolver-no-broken-help.diff
|
||||||
Patch5: mediawiki-no-broken-help.diff
|
Patch5: mediawiki-no-broken-help.diff
|
||||||
|
Patch6: kde5-configure-checks.patch
|
||||||
# try to save space by using hardlinks
|
# try to save space by using hardlinks
|
||||||
Patch990: install-with-hardlinks.diff
|
Patch990: install-with-hardlinks.diff
|
||||||
BuildRequires: %{name}-share-linker
|
BuildRequires: %{name}-share-linker
|
||||||
@ -918,6 +919,7 @@ Provides additional %{langname} translations and resources for %{project}. \
|
|||||||
%endif
|
%endif
|
||||||
%patch4
|
%patch4
|
||||||
%patch5
|
%patch5
|
||||||
|
%patch6 -p1
|
||||||
%patch990 -p1
|
%patch990 -p1
|
||||||
|
|
||||||
# Disable some of the failing tests (some are random)
|
# Disable some of the failing tests (some are random)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user