diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 2ebadbf..00e3b3c 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -86,12 +86,6 @@ Source10: macros.qt5-qtbase # support multilib optflags Patch2: qtbase-multilib_optflags.patch -# borrowed from opensuse -# track private api via properly versioned symbols -# downside: binaries produced with these differently-versioned symbols are no longer -# compatible with qt-project.org's Qt binary releases. -Patch8: tell-the-truth-about-private-api.patch - # upstreamable patches # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) Patch50: qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch @@ -398,9 +392,6 @@ Qt5 libraries used for drawing widgets and OpenGL items. ## upstream fixes -# omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter -%patch8 -p1 - %patch50 -p1 -b .QT_VERSION_CHECK # FIXME/TODO : rebase or drop -- rdieter #patch51 -p1 -b .hidpi_scale_at_192 diff --git a/tell-the-truth-about-private-api.patch b/tell-the-truth-about-private-api.patch deleted file mode 100644 index 2dbced4..0000000 --- a/tell-the-truth-about-private-api.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index e6a0d97..cf93041 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -216,9 +216,9 @@ android: CONFIG += qt_android_deps no_linker_version_script - QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript - - internal_module { -- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };" -+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };" - } else { -- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ -+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \ - " qt_private_api_tag*;" - - private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES