diff --git a/org.kde.Sdk.json b/org.kde.Sdk.json index 3cd2970..773d218 100644 --- a/org.kde.Sdk.json +++ b/org.kde.Sdk.json @@ -1,918 +1,910 @@ { "build-runtime": true, "id": "org.kde.Sdk", "id-platform": "org.kde.Platform", "branch": "5.12", "runtime": "org.freedesktop.Platform", "sdk": "org.freedesktop.Sdk", "runtime-version": "18.08", "sdk-extensions": ["org.freedesktop.Sdk.Debug", "org.freedesktop.Sdk.Locale", "org.freedesktop.Sdk.Docs"], "platform-extensions": ["org.freedesktop.Platform.Locale"], "inherit-extensions": [ "org.freedesktop.Platform.GL", "org.freedesktop.Platform.Timezones", "org.freedesktop.Platform.GStreamer", "org.freedesktop.Platform.Icontheme", "org.freedesktop.Platform.VAAPI.Intel", "org.freedesktop.Platform.html5-codecs", "org.gtk.Gtk3theme" ], "inherit-sdk-extensions": [ "org.freedesktop.Sdk.Extension" ], "add-extensions": { "org.kde.Sdk.Docs" : { "directory": "share/runtime/docs", "bundle": true, "autodelete": true, "no-autodownload": true }, "org.kde.KStyle" : { "directory": "share/runtime/lib/plugins/", "subdirectories": true, "no-autodownload": true, "version": "5.12", "merge-dirs": "styles", "download-if": "active-gtk-theme" }, "org.kde.PlatformTheme" : { "directory": "share/runtime/lib/plugins/", "subdirectories": true, "no-autodownload": true, "version": "5.12", "merge-dirs": "platformthemes", "//TODO": "This is currently only used for gnome platform plugin and should be its own extension point", "download-if": "on-xdg-desktop-GNOME;on-xdg-desktop-GNOME-classic" } }, "finish-args": [ "--env=GI_TYPELIB_PATH=/app/lib/girepository-1.0", "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:/usr/lib/gstreamer-1.0", "--env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share:/run/host/share", "--env=QT_PLUGIN_PATH=/app/lib64/plugins:/app/lib/plugins:/usr/share/runtime/lib/plugins", "--env=QML2_IMPORT_PATH=/app/lib64/qml:/app/lib/qml", "--env=KDE_FORK_SLAVES=1", "--env=DCONF_USER_CONFIG_DIR=.config/dconf", "--filesystem=xdg-config/kdeglobals:ro", "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro", "--talk-name=com.canonical.AppMenu.Registrar", "--talk-name=com.canonical.AppMenu.Registrar.*", "--sdk=org.kde.Sdk//5.12", "--runtime=org.kde.Platform//5.12" ], "cleanup": [ "/man", "/share/man", "/lib/systemd", "*.la"], "cleanup-commands": [ "/usr/libexec/freedesktop-post.sh" ], "cleanup-platform": [ "/share/runtime/docs", "/include", "/share/aclocal", "/share/pkgconfig", "/lib/pkgconfig", "*.a" ], "cleanup-platform-commands": [ "/usr/libexec/freedesktop-post.sh" ], "modules": [ { "name": "qt5-qtbase", "cleanup-platform": [ "/bin", "/mkspecs" ], "build-options" : { "arch" : { "x86_64" : { "config-opts" : [ "-reduce-relocations" ] }, "arm" : { "config-opts" : [ "-no-reduce-relocations", "-optimize-size", "-opengl es2" ] }, "aarch64" : { "config-opts" : [ "-no-reduce-relocations", "-optimize-size", "-opengl es2" ] } } }, "config-opts": [ "-confirm-license", "-opensource", "-shared", "-platform", "linux-g++", "-optimized-qmake", "-nomake", "examples", "-nomake", "tests", "-system-harfbuzz", "-system-sqlite", "-accessibility", "-dbus-linked", "-fontconfig", "-glib", "-icu", "-openssl-linked", "-no-pch", "-no-rpath", "-no-directfb", "-no-linuxfb", "-no-kms", "-no-cups", "-system-proxies", "-gtk", "-no-use-gold-linker", "-archdatadir", "/usr/lib/" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz", "sha256": "533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049" }, { "type": "patch", "path": "patch/qtbase-avoid-hardcoding-kernel-version.patch" }, { "type": "shell", "commands": [ "mv configure configure.qt" ] }, { "type": "script", "commands": [ "processed=`sed -e 's/--/-/g ; s/=/ /g' <<< $@`", "./configure.qt $processed" ], "dest-filename": "configure" } ] }, { "name": "qt5-qtdeclarative", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs", "lib/plugins/qmltooling" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtdeclarative-everywhere-src-5.12.1.tar.xz", "sha256": "a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409" } ] }, { "name": "qt5-qttools", "buildsystem": "qmake", "cleanup-platform": [ "/mkspecs", "/bin/assistant", "/bin/qhelpgenerator", "/bin/qcollectiongenerator", "/bin/qhelpconverter", "/bin/pixeltool", "/bin/designer", "/bin/lrelease", "/bin/lupdate", "/bin/lconvert", "/bin/linguist", "/bin/qdoc", "/bin/qtattributionsscanner", "/bin/qtplugininfo", "/bin/qtdiag", "/bin/qdbusviewer" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qttools-everywhere-src-5.12.1.tar.xz", "sha256": "ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3" } ] }, { "name": "qt5-qtscript", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtscript-everywhere-src-5.12.1.tar.xz", "sha256": "e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624" } ] }, { "name": "qt5-webchannel", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtwebchannel-everywhere-src-5.12.1.tar.xz", "sha256": "40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf" } ] }, { "name": "qt5-qtlocation", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtlocation-everywhere-src-5.12.1.tar.xz", "sha256": "8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50" } ] }, { "name": "qt5-qtwebengine", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "config-opts": [ "--", "-system-ffmpeg", "-webengine-proprietary-codecs", "-webengine-icu", "-webp" ], "modules": [ { "name": "pciutils", "no-autogen": true, "make-args": ["SHARED=no", "ZLIB=no", "PREFIX=/usr"], "post-install": [ "make install-pcilib", "make install-lib" ], "sources": [ { "type": "git", "url": "https://kernel.googlesource.com/pub/scm/utils/pciutils/pciutils", "branch": "v3.6.2" }, { "type": "shell", "commands": [ "sed -i 's@PREFIX=/usr/local@PREFIX=/usr@' Makefile" ] } ] }, { "name": "opus", "sources": [ { "type": "git", "url": "https://github.com/xiph/opus.git", "branch": "v1.2.1" } ] } ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtwebengine-everywhere-src-5.12.1.tar.xz", "sha256": "43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0" }, { "type": "patch", "path": "patch/qtwebengine-no-udev.patch" - }, - { - "type": "patch", - "path": "patch/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch" - }, - { - "type": "patch", - "path": "patch/qtwebengine-buildarm.patch" } ] }, { "name": "qt5-qtsvg", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtsvg-everywhere-src-5.12.1.tar.xz", "sha256": "5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8" } ] }, { "name": "qt5-qtx11extras", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtx11extras-everywhere-src-5.12.1.tar.xz", "sha256": "08fb1c40e1562d43087368a5efa39569fa1ad52b72d2360f9fc1fe18b00da366" } ] }, { "name": "qt5-qtmultimedia", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtmultimedia-everywhere-src-5.12.1.tar.xz", "sha256": "9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18" } ] }, { "name": "qt5-qtsensors", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtsensors-everywhere-src-5.12.1.tar.xz", "sha256": "ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4" } ] }, { "name": "qt5-qtquickcontrols", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtquickcontrols-everywhere-src-5.12.1.tar.xz", "sha256": "15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c" } ] }, { "name": "qt5-qtquickcontrols2", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtquickcontrols2-everywhere-src-5.12.1.tar.xz", "sha256": "caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7" } ] }, { "name": "qt5-qtgraphicaleffects", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz", "sha256": "2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7" } ] }, { "name": "qt5-qtxmlpatterns", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtxmlpatterns-everywhere-src-5.12.1.tar.xz", "sha256": "76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb" } ] }, { "name": "qt5-qtimageformats", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtimageformats-everywhere-src-5.12.1.tar.xz", "sha256": "0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421" } ] }, { "name": "qt5-connectivity", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtconnectivity-everywhere-src-5.12.1.tar.xz", "sha256": "0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c" } ] }, { "name": "qt5-wayland", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtwayland-everywhere-src-5.12.1.tar.xz", "sha256": "88f0507628b3697b0d59349d27b5e60a313a3138927722d6cf981089fff02553" } ] }, { "name": "qt5-virtualkeyboard", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz", "sha256": "a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683" } ] }, { "name": "qt5-qtserialport", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtserialport-everywhere-src-5.12.1.tar.xz", "sha256": "243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19" } ] }, { "name": "qt5-qtwebsockets", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtwebsockets-everywhere-src-5.12.1.tar.xz", "sha256": "2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79" } ] }, { "name": "qt5-qtcharts", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtcharts-everywhere-src-5.12.1.tar.xz", "sha256": "142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0" } ] }, { "name": "qt5-qt3d", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qt3d-everywhere-src-5.12.1.tar.xz", "sha256": "ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1" } ] }, { "name": "qt5-qtspeech", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", "url": "http://download.qt.io/archive/qt/5.12/5.12.1/submodules/qtspeech-everywhere-src-5.12.1.tar.xz", "sha256": "147524ba6f97c76784beb315ee939614b7a3b4eb1a6417cc0beea662cf0d9121" } ] }, { "name": "libdbusmenuqt", "buildsystem": "cmake-ninja", "config-opts": ["-DENABLE_TESTING=OFF", "-DWITH_DOC=OFF"], "sources": [ { "type": "bzr", "url": "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk/", "revision": "0.9.3+16.04.20160218-0ubuntu1" } ] }, { "name": "extra-cmake-modules", "cleanup-platform": ["*"], "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/extra-cmake-modules.git", "branch": "v5.55.0" } ] }, { "name": "kwidgetsaddons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwidgetsaddons.git", "branch": "v5.55.0" } ] }, { "name": "ki18n", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/ki18n.git", "branch": "v5.55.0" } ] }, { "name": "kconfig", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kconfig.git", "branch": "v5.55.0" } ] }, { "name": "attica", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/attica.git", "branch": "v5.55.0" } ] }, { "name": "kguiaddons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kguiaddons.git", "branch": "v5.55.0" } ] }, { "name": "kcoreaddons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcoreaddons.git", "branch": "v5.55.0" } ] }, { "name": "kauth", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kauth.git", "branch": "v5.55.0" } ] }, { "name": "karchive", "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=TRUE"], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/karchive.git", "branch": "v5.55.0" } ] }, { "name": "kcodecs", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcodecs.git", "branch": "v5.55.0" } ] }, { "name": "kconfigwidgets", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kconfigwidgets.git", "branch": "v5.55.0" } ] }, { "name": "kitemviews", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kitemviews.git", "branch": "v5.55.0" } ] }, { "name": "kiconthemes", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kiconthemes.git", "branch": "v5.55.0" } ] }, { "name": "kwindowsystem", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwindowsystem.git", "branch": "v5.55.0" } ] }, { "name": "kcrash", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcrash.git", "branch": "v5.55.0" } ] }, { "name": "kdbusaddons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdbusaddons.git", "branch": "v5.55.0" } ] }, { "name": "kservice", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ { "type": "git", "url": "git://anongit.kde.org/kservice.git", "branch": "v5.55.0" } ] }, { "name": "kglobalaccel", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kglobalaccel.git", "branch": "v5.55.0" } ] }, { "name": "sonnet", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/sonnet.git", "branch": "v5.55.0" } ] }, { "name": "kcompletion", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcompletion.git", "branch": "v5.55.0" } ] }, { "name": "ktextwidgets", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/ktextwidgets.git", "branch": "v5.55.0" } ] }, { "name": "kxmlgui", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kxmlgui.git", "branch": "v5.55.0" } ] }, { "name": "perl-uri-escape", "cleanup-platform": ["*"], "sources": [{ "type": "archive", "url": "https://cpan.metacpan.org/authors/id/E/ET/ETHER/URI-1.74.tar.gz", "sha256": "a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d" }, { "type": "script", "commands": [ "perl Makefile.PL INSTALLDIRS=vendor"], "dest-filename": "configure" } ] }, { "name": "kdoctools", "config-opts": [ "-DENABLE_TESTING=OFF", "-DDocBookXSL_DIR=/usr/share/xml/docbook/xml/xsl-stylesheets/", "-DDTD_PATH_LIST=/usr/share/xml/docbook/xml-dtd/4.5/" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdoctools.git", "branch": "v5.55.0" } ] }, { "name": "kpackage", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kpackage.git", "branch": "v5.55.0" } ] }, { "name": "kbookmarks", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kbookmarks.git", "branch": "v5.55.0" } ] }, { "name": "phonon", "config-opts": ["-DENABLE_TESTING=OFF", "-DPHONON_BUILD_PHONON4QT5=ON"], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/phonon.git", "branch": "v4.10.1" } ] }, { "name": "knotifications", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/knotifications.git", "branch": "v5.55.0" } ] }, { "name": "kwallet", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwallet.git", "branch": "v5.55.0" } ] }, { "name": "kjobwidgets", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjobwidgets.git", "branch": "v5.55.0" } ] }, { "name": "solid", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/solid.git", "branch": "v5.55.0" }, { "type": "patch", "path": "patch/solid-no-udev.patch" } ] }, { "name": "kio", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kio.git", "branch": "v5.55.0" } ] }, { "name": "kparts", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kparts.git", "branch": "v5.55.0" } ] }, { "name": "kplotting", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kplotting.git", "branch": "v5.55.0" } ] }, { "name": "kdesignerplugin", "buildsystem": "cmake-ninja", "builddir": true, "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdesignerplugin.git", "branch": "v5.55.0" } ] }, { "name": "kinit", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kinit.git", "branch": "v5.55.0" } ] }, { "name": "kded", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kded.git", "branch": "v5.55.0" } ] }, { "name": "kunitconversion", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kunitconversion.git", "branch": "v5.55.0" } ] }, { "name": "kdeclarative", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdeclarative.git", "branch": "v5.55.0" } ] }, { "name": "kcmutils", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcmutils.git", "branch": "v5.55.0" } ] }, { "name": "knotifyconfig", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ { "type": "git", "url": "git://anongit.kde.org/knotifyconfig.git", "branch": "v5.55.0" } ] }, { "name": "knewstuff", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/knewstuff.git", "branch": "v5.55.0" } ] }, { "name": "kidletime", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kidletime.git", "branch": "v5.55.0" } ] }, { "name": "threadweaver", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/threadweaver.git", "branch": "v5.55.0" } ] }, { "name": "kitemmodels", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kitemmodels.git", "branch": "v5.55.0" } ] }, { "name": "kxmlrpcclient", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kxmlrpcclient.git", "branch": "v5.55.0" } ] }, { "name": "kdnssd", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdnssd.git", "branch": "v5.55.0" } ] }, { "config-opts": [ "-DENABLE_TESTING=OFF" ], "name": "syntax-highlighting", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/syntax-highlighting.git", "branch": "v5.55.0" } ] }, { "config-opts": [ "-DENABLE_TESTING=OFF" ], "name": "ktexteditor", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/ktexteditor.git", "branch": "v5.55.0" } ] }, { "name": "frameworkintegration", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ { "type": "git", "url": "git://anongit.kde.org/frameworkintegration.git", "branch": "v5.55.0" } ] }, { "name": "kemoticons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kemoticons.git", "branch": "v5.55.0" } ] }, { "name": "kpty", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kpty.git", "branch": "v5.55.0" } ] }, { "name": "kwayland", "buildsystem": "cmake-ninja", "config-opts": ["-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwayland.git", "branch": "v5.55.0" } ] }, { "name": "kirigami", "config-opts": ["-DENABLE_TESTING=OFF", "-DPLASMA_ENABLED=OFF"], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ { "type": "git", "url": "git://anongit.kde.org/kirigami.git", "branch": "v5.55.0" } ] }, { "name": "qqc2-desktop-style", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ { "type": "git", "url": "git://anongit.kde.org/qqc2-desktop-style.git", "branch": "v5.55.0" } ] }, { "name": "kactivities", "config-opts": [ "-DENABLE_TESTING=OFF", "-DKACTIVITIES_LIBRARY_ONLY=ON" ], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ { "type": "git", "url": "git://anongit.kde.org/kactivities.git", "branch": "v5.55.0" } ] }, { "name": "plasma-framework", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ { "type": "git", "url": "git://anongit.kde.org/plasma-framework.git", "branch": "v5.55.0" } ] }, { "name": "breeze-icons", "cleanup-platform": [ "*.rcc" ], "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/breeze-icons.git", "branch": "v5.55.0" } ] }, { "name": "breeze", "buildsystem": "cmake-ninja", "config-opts": ["-DENABLE_TESTING=OFF", "-DWITH_DECORATIONS=OFF", "-DWITH_WALLPAPERS=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/breeze.git", "branch": "Plasma/5.14" } ] }, { "name": "plasma-integration", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF", "-DBUILD_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/plasma-integration.git", "branch": "Plasma/5.14" } ] }, { "name": "kwayland-integration", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwayland-integration.git", "branch": "Plasma/5.14" } ] }, { "name": "phonon-gstreamer", "buildsystem": "cmake-ninja", "config-opts": ["-DENABLE_TESTING=OFF", "-DPHONON_BUILD_PHONON4QT5=ON"], "sources": [ { "type": "git", "url": "git://anongit.kde.org/phonon-gstreamer.git", "branch": "4.9" } ] }, { "name": "fcitx-platforminputcontext", "buildsystem": "cmake-ninja", "config-opts": ["-DENABLE_LIBRARY=OFF" ], "sources": [ { "type": "git", "url": "https://github.com/fcitx/fcitx-qt5", "branch": "1.2.3" } ] }, { "name": "os-release", "post-install": [ "mkdir -p /usr/share/runtime/lib/plugins/" ], "sources": [ { "type": "file", "path": "os-release" }, { "type": "file", "path": "issue" }, { "type": "file", "path": "issue.net" }, { "type": "file", "path": "org.kde.Sdk.appdata.xml" }, { "type": "file", "path": "org.kde.Platform.appdata.xml" }, { "type": "file", "path": "os-release-configure", "dest-filename": "configure" } ] } ] } diff --git a/patch/qtwebengine-buildarm.patch b/patch/qtwebengine-buildarm.patch deleted file mode 100644 index c34dc46..0000000 --- a/patch/qtwebengine-buildarm.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff --git a/src/3rdparty/gn/base/numerics/safe_conversions_arm_impl.h b/src/3rdparty/gn/base/numerics/safe_conversions_arm_impl.h -new file mode 100644 -index 0000000000..da5813f65e ---- /dev/null -+++ b/src/3rdparty/gn/base/numerics/safe_conversions_arm_impl.h -@@ -0,0 +1,51 @@ -+// Copyright 2017 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ -+#define BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ -+ -+#include -+#include -+#include -+ -+#include "base/numerics/safe_conversions_impl.h" -+ -+namespace base { -+namespace internal { -+ -+// Fast saturation to a destination type. -+template -+struct SaturateFastAsmOp { -+ static const bool is_supported = -+ std::is_signed::value && std::is_integral::value && -+ std::is_integral::value && -+ IntegerBitsPlusSign::value <= IntegerBitsPlusSign::value && -+ IntegerBitsPlusSign::value <= IntegerBitsPlusSign::value && -+ !IsTypeInRangeForNumericType::value; -+ -+ __attribute__((always_inline)) static Dst Do(Src value) { -+ int32_t src = value; -+ typename std::conditional::value, int32_t, -+ uint32_t>::type result; -+ if (std::is_signed::value) { -+ asm("ssat %[dst], %[shift], %[src]" -+ : [dst] "=r"(result) -+ : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign::value <= 32 -+ ? IntegerBitsPlusSign::value -+ : 32)); -+ } else { -+ asm("usat %[dst], %[shift], %[src]" -+ : [dst] "=r"(result) -+ : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign::value < 32 -+ ? IntegerBitsPlusSign::value -+ : 31)); -+ } -+ return static_cast(result); -+ } -+}; -+ -+} // namespace internal -+} // namespace base -+ -+#endif // BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_ -diff --git a/src/3rdparty/gn/base/numerics/safe_math_arm_impl.h b/src/3rdparty/gn/base/numerics/safe_math_arm_impl.h -new file mode 100644 -index 0000000000..a7cda1bb23 ---- /dev/null -+++ b/src/3rdparty/gn/base/numerics/safe_math_arm_impl.h -@@ -0,0 +1,122 @@ -+// Copyright 2017 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ -+#define BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ -+ -+#include -+#include -+#include -+ -+#include "base/numerics/safe_conversions.h" -+ -+namespace base { -+namespace internal { -+ -+template -+struct CheckedMulFastAsmOp { -+ static const bool is_supported = -+ FastIntegerArithmeticPromotion::is_contained; -+ -+ // The following is much more efficient than the Clang and GCC builtins for -+ // performing overflow-checked multiplication when a twice wider type is -+ // available. The below compiles down to 2-3 instructions, depending on the -+ // width of the types in use. -+ // As an example, an int32_t multiply compiles to: -+ // smull r0, r1, r0, r1 -+ // cmp r1, r1, asr #31 -+ // And an int16_t multiply compiles to: -+ // smulbb r1, r1, r0 -+ // asr r2, r1, #16 -+ // cmp r2, r1, asr #15 -+ template -+ __attribute__((always_inline)) static bool Do(T x, U y, V* result) { -+ using Promotion = typename FastIntegerArithmeticPromotion::type; -+ Promotion presult; -+ -+ presult = static_cast(x) * static_cast(y); -+ *result = static_cast(presult); -+ return IsValueInRangeForNumericType(presult); -+ } -+}; -+ -+template -+struct ClampedAddFastAsmOp { -+ static const bool is_supported = -+ BigEnoughPromotion::is_contained && -+ IsTypeInRangeForNumericType< -+ int32_t, -+ typename BigEnoughPromotion::type>::value; -+ -+ template -+ __attribute__((always_inline)) static V Do(T x, U y) { -+ // This will get promoted to an int, so let the compiler do whatever is -+ // clever and rely on the saturated cast to bounds check. -+ if (IsIntegerArithmeticSafe::value) -+ return saturated_cast(x + y); -+ -+ int32_t result; -+ int32_t x_i32 = x; -+ int32_t y_i32 = y; -+ -+ asm("qadd %[result], %[first], %[second]" -+ : [result] "=r"(result) -+ : [first] "r"(x_i32), [second] "r"(y_i32)); -+ return saturated_cast(result); -+ } -+}; -+ -+template -+struct ClampedSubFastAsmOp { -+ static const bool is_supported = -+ BigEnoughPromotion::is_contained && -+ IsTypeInRangeForNumericType< -+ int32_t, -+ typename BigEnoughPromotion::type>::value; -+ -+ template -+ __attribute__((always_inline)) static V Do(T x, U y) { -+ // This will get promoted to an int, so let the compiler do whatever is -+ // clever and rely on the saturated cast to bounds check. -+ if (IsIntegerArithmeticSafe::value) -+ return saturated_cast(x - y); -+ -+ int32_t result; -+ int32_t x_i32 = x; -+ int32_t y_i32 = y; -+ -+ asm("qsub %[result], %[first], %[second]" -+ : [result] "=r"(result) -+ : [first] "r"(x_i32), [second] "r"(y_i32)); -+ return saturated_cast(result); -+ } -+}; -+ -+template -+struct ClampedMulFastAsmOp { -+ static const bool is_supported = CheckedMulFastAsmOp::is_supported; -+ -+ template -+ __attribute__((always_inline)) static V Do(T x, U y) { -+ // Use the CheckedMulFastAsmOp for full-width 32-bit values, because -+ // it's fewer instructions than promoting and then saturating. -+ if (!IsIntegerArithmeticSafe::value && -+ !IsIntegerArithmeticSafe::value) { -+ V result; -+ if (CheckedMulFastAsmOp::Do(x, y, &result)) -+ return result; -+ return CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y)); -+ } -+ -+ assert((FastIntegerArithmeticPromotion::is_contained)); -+ using Promotion = typename FastIntegerArithmeticPromotion::type; -+ return saturated_cast(static_cast(x) * -+ static_cast(y)); -+ } -+}; -+ -+} // namespace internal -+} // namespace base -+ -+#endif // BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_ diff --git a/patch/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch b/patch/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch deleted file mode 100644 index 4027c2e..0000000 --- a/patch/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/3rdparty/chromium/mojo/public/c/system/macros.h b/src/3rdparty/chromium/mojo/public/c/system/macros.h -index 6de4a913de..0c9a489986 100644 ---- a/src/3rdparty/chromium/mojo/public/c/system/macros.h -+++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h -@@ -27,7 +27,13 @@ - (sizeof(void*) == 4 ? 32 : 0) - - // Like the C++11 |alignof| operator. --#if __cplusplus >= 201103L -+#if defined(__GNUC__) && __GNUC__ >= 8 && __i386__ -+// GCC 8 has changed the alignof operator to return the minimal alignment -+// required by the target ABI, instead of the preferred alignment. -+// This means that on 32-bit x86, it will return 4 instead of 8. -+// Use __alignof__ instead to avoid this. -+#define MOJO_ALIGNOF(type) __alignof__(type) -+#elif __cplusplus >= 201103L - #define MOJO_ALIGNOF(type) alignof(type) - #elif defined(__GNUC__) - #define MOJO_ALIGNOF(type) __alignof__(type) diff --git a/patch/qtwebengine-no-udev.patch b/patch/qtwebengine-no-udev.patch index e9932ca..1e17001 100644 --- a/patch/qtwebengine-no-udev.patch +++ b/patch/qtwebengine-no-udev.patch @@ -1,14 +1,13 @@ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index eb8bb7bb..a98b5fc8 100644 +index 85b948db..a08b03f7 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri -@@ -24,6 +24,9 @@ qtConfig(webengine-embedded-build) { - !use_gold_linker: gn_args += use_gold=false - } - -+# Disable UDev -+gn_args += use_udev=false -+ - qtConfig(webengine-system-x11): hasX11Dependencies() { - gn_args += ozone_platform_x11=true - } +@@ -6,7 +6,7 @@ gn_args += \ + use_gio=false \ + use_gnome_keyring=false \ + linux_use_bundled_binutils=false \ +- use_udev=true \ ++ use_udev=false \ + use_bundled_fontconfig=false \ + use_sysroot=false \ + enable_session_service=false \