rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix libglvnd-1.3.4 FTBFS (#2002416)

Browse Source 
and validate configure results (ibase, egl-x11 so far)
This commit is contained in:
Rex Dieter 2021-09-10 10:55:39 -05:00
parent 5d0996d3b9
commit 1930ef87d4
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qt5-qtbase.spec
View File

@ -111,6 +111,9 @@ Patch54: qtbase-qmake_LFLAGS.patch
# don't use relocatable heuristics to guess prefix when using -no-feature-relocatable # don't use relocatable heuristics to guess prefix when using -no-feature-relocatable
Patch55: qtbase-everywhere-src-5.14.2-no_relocatable.patch Patch55: qtbase-everywhere-src-5.14.2-no_relocatable.patch
# fix FTBFS against libglvnd-1.3.4+
Patch56: qtbase-everywhere-src-5.15.2-libglvnd.patch
# drop -O3 and make -O2 by default # drop -O3 and make -O2 by default
Patch61: qt5-qtbase-cxxflag.patch Patch61: qt5-qtbase-cxxflag.patch
@ -392,6 +395,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
%patch53 -p1 -b .qt5gui_cmake_isystem_includes %patch53 -p1 -b .qt5gui_cmake_isystem_includes
%patch54 -p1 -b .qmake_LFLAGS %patch54 -p1 -b .qmake_LFLAGS
%patch55 -p1 -b .no_relocatable %patch55 -p1 -b .no_relocatable
%patch56 -p1 -b .libglvnd
%patch61 -p1 -b .qt5-qtbase-cxxflag %patch61 -p1 -b .qt5-qtbase-cxxflag
%if 0%{?fedora} < 35 %if 0%{?fedora} < 35
%patch63 -p1 -b .firebird %patch63 -p1 -b .firebird
@ -486,7 +490,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
-shared \ -shared \
-accessibility \ -accessibility \
%{?dbus}%{!?dbus:-dbus-runtime} \ %{?dbus}%{!?dbus:-dbus-runtime} \
%{?egl:-egl} \ %{?egl:-egl -eglfs} \
-fontconfig \ -fontconfig \
-glib \ -glib \
-gtk \ -gtk \
@ -522,6 +526,16 @@ export MAKEFLAGS="%{?_smp_mflags}"
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}"
# Validate config results
for config_test in egl-x11 ibase ; do
config_result="$(grep ^cache.${config_test}.result config.cache | cut -d= -f2 | tr -d ' ')"
if [ "${config_result}" != "true" ]; then
echo "${config_test} detection failed"
config_failed=1
fi
done
if [ ${config_failed} -eq 1 ]; then exit 1; fi
# ensure qmake build using optflags (which can happen if not munging qmake.conf defaults) # ensure qmake build using optflags (which can happen if not munging qmake.conf defaults)
make clean -C qmake make clean -C qmake
%make_build -C qmake all binary \ %make_build -C qmake all binary \
@ -1076,6 +1090,8 @@ fi
%changelog %changelog
* Tue Sep 07 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-24 * Tue Sep 07 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-24
- refresh kde-5.15-rollup patch - refresh kde-5.15-rollup patch
- validate configure results (base, egl-x11)
- fix libglvnd-1.3.4 FTBFS (#2002416)
* Tue Sep 07 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-23 * Tue Sep 07 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-23
- (re)enable ibase - (re)enable ibase

15
qtbase-everywhere-src-5.15.2-libglvnd.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up qtbase-everywhere-src-5.15.2/src/gui/configure.json.libglvnd qtbase-everywhere-src-5.15.2/src/gui/configure.json
--- qtbase-everywhere-src-5.15.2/src/gui/configure.json.libglvnd 2020-10-27 03:02:11.000000000 -0500
+++ qtbase-everywhere-src-5.15.2/src/gui/configure.json 2021-09-10 10:05:53.610312223 -0500
@@ -847,9 +847,9 @@
],
"include": [ "EGL/egl.h", "X11/Xlib.h" ],
"main": [
- "Display *dpy = EGL_DEFAULT_DISPLAY;",
+ "Display *dpy = reinterpret_cast<Display *>(EGL_DEFAULT_DISPLAY);",
"EGLNativeDisplayType egldpy = XOpenDisplay(\"\");",
- "dpy = egldpy;",
+ "dpy = reinterpret_cast<Display *>(egldpy);",
"EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);",
"XDestroyWindow(dpy, w);",
"XCloseDisplay(dpy);"