diff --git a/org.kde.Sdk.json b/org.kde.Sdk.json index 55e162e..ff9eaa3 100644 --- a/org.kde.Sdk.json +++ b/org.kde.Sdk.json @@ -1,940 +1,932 @@ { "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_PATH=/app/lib/gstreamer-1.0:/app/lib/@SDK_ARCH@-linux-gnu/extensions/gstreamer-1.0:/usr/lib/@SDK_ARCH@-linux-gnu/extensions/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", "--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", "*.cmake" ], "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", "-force-debug-info" ] }, "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.2/submodules/qtbase-everywhere-src-5.12.2.tar.xz", - "sha256": "562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz", + "sha256": "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701" }, { "type": "patch", "path": "patch/qtbase-avoid-hardcoding-kernel-version.patch" }, - { - "type": "patch", - "path": "patch/qtbase-buildabsoluteglesv2.patch" - }, - { - "type": "patch", - "path": "patch/qtbase-filechooser-properly-convert-filename.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.2/submodules/qtdeclarative-everywhere-src-5.12.2.tar.xz", - "sha256": "470568745602e7fa21cdca42b1641162e4257cfeb7a2dcf8af24538c9516cc5b" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz", + "sha256": "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7" } ] }, { "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.2/submodules/qttools-everywhere-src-5.12.2.tar.xz", - "sha256": "4aa3a089794ab1c629b666fffb5da4371351a9e85ea691d5d988c2ff63586005" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz", + "sha256": "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8" } ] }, { "name": "qt5-qtscript", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtscript-everywhere-src-5.12.2.tar.xz", - "sha256": "f8717d51072b4d4455755ae081e45f23f3d0ce25602f96231dd7703bd818a2e6" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz", + "sha256": "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e" } ] }, { "name": "qt5-webchannel", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtwebchannel-everywhere-src-5.12.2.tar.xz", - "sha256": "8eb9cff9492937daa1bf5d001e39afec68c310ce5596807345e2a555dcc80b8e" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz", + "sha256": "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a" } ] }, { "name": "qt5-qtlocation", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtlocation-everywhere-src-5.12.2.tar.xz", - "sha256": "a31f27f457ac57e7203ae808b95ba0053d182e22425de03840af761e343d8bef" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz", + "sha256": "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6" } ] }, { "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.2/submodules/qtwebengine-everywhere-src-5.12.2.tar.xz", - "sha256": "082b1d6e60c1be61881bc8533acc67d9688620d6b3a538417f62b27b34ead493" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz", + "sha256": "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317" }, { "type": "patch", "path": "patch/qtwebengine-no-udev.patch" } ] }, { "name": "qt5-qtsvg", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtsvg-everywhere-src-5.12.2.tar.xz", - "sha256": "ed9f2118a6d33f53e5d9ed18dcd36f252a4fbaf68382a1c4a663ba75b25ae7bd" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz", + "sha256": "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2" } ] }, { "name": "qt5-qtx11extras", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtx11extras-everywhere-src-5.12.2.tar.xz", - "sha256": "711f39ddc6237787a5522278be235fe3af547a4674bb265e6dff5c2892fe6084" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz", + "sha256": "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613" } ] }, { "name": "qt5-qtmultimedia", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtmultimedia-everywhere-src-5.12.2.tar.xz", - "sha256": "5d3c90c546e64abf523432a3df5e7a3f1b5ad72e7d0b5ea6260729fbefeb30f5" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz", + "sha256": "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301" } ] }, { "name": "qt5-qtsensors", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtsensors-everywhere-src-5.12.2.tar.xz", - "sha256": "758a131ad86c4b8b8364e48d659a680ed12d03c091c5ab2958d06b7b0aa2e50c" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz", + "sha256": "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc" } ] }, { "name": "qt5-qtquickcontrols", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtquickcontrols-everywhere-src-5.12.2.tar.xz", - "sha256": "9b5c87605d08849927dd09bf9b03a939511461372b7e20004abe1116cf9fc73e" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz", + "sha256": "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46" } ] }, { "name": "qt5-qtquickcontrols2", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtquickcontrols2-everywhere-src-5.12.2.tar.xz", - "sha256": "1fbd703612a2c0257861e07a2b709f6fbad00cb6df70a1c2c1fafa9de522e549" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz", + "sha256": "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a" } ] }, { "name": "qt5-qtgraphicaleffects", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtgraphicaleffects-everywhere-src-5.12.2.tar.xz", - "sha256": "429398b6c661897b3c7cd62fb3657a2de60ad9152578edeeca0abde6e7ae5a86" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz", + "sha256": "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73" } ] }, { "name": "qt5-qtxmlpatterns", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtxmlpatterns-everywhere-src-5.12.2.tar.xz", - "sha256": "2e535ec17b542f2a0b87a9db93284666015cc07b6188894ace7e75104c6d860d" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz", + "sha256": "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61" } ] }, { "name": "qt5-qtimageformats", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtimageformats-everywhere-src-5.12.2.tar.xz", - "sha256": "1ea757728f205deb6b3f5873f5c7c3129cded5993077500a9fb249559bee7a9c" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz", + "sha256": "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2" } ] }, { "name": "qt5-connectivity", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtconnectivity-everywhere-src-5.12.2.tar.xz", - "sha256": "15eb21a1c102408e43c7204a82ad144e97ebe05dc4a15edb0900cd49762a226e" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz", + "sha256": "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661" } ] }, { "name": "qt5-wayland", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtwayland-everywhere-src-5.12.2.tar.xz", - "sha256": "b7840692420d106871433eb1b678277f09927d48ec6eb31a1851ee9c60d9df84" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz", + "sha256": "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff" } ] }, { "name": "qt5-virtualkeyboard", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtvirtualkeyboard-everywhere-src-5.12.2.tar.xz", - "sha256": "7111de5c78f8a0d29394409727647b90ae5906fd5105c843af98c3ae3804248d" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz", + "sha256": "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22" } ] }, { "name": "qt5-qtserialport", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtserialport-everywhere-src-5.12.2.tar.xz", - "sha256": "72163cedda4c6fa787db8666bec6b5057272dc87bf8de6addba3440dd472bd7f" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz", + "sha256": "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51" } ] }, { "name": "qt5-qtwebsockets", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtwebsockets-everywhere-src-5.12.2.tar.xz", - "sha256": "ab9ce815b1466abe52910c9b50c0f61df8af74f9521574bb534f7f562d0e8c04" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz", + "sha256": "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577" } ] }, { "name": "qt5-qtcharts", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtcharts-everywhere-src-5.12.2.tar.xz", - "sha256": "11d88d3e0ec86730219f7c2efa17f696ec8766415c488b208bfcb8f3c3a68a31" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz", + "sha256": "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9" } ] }, { "name": "qt5-qt3d", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qt3d-everywhere-src-5.12.2.tar.xz", - "sha256": "d4036e7ac146ba78784dde0dd99e8182372b7c38e832e33b61fed4187de0ad06" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz", + "sha256": "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d" } ] }, { "name": "qt5-qtspeech", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtspeech-everywhere-src-5.12.2.tar.xz", - "sha256": "5ad4b5931d6a677d8c4569a2a9147b992653962b339bd2f233400ffb43955911" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz", + "sha256": "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5" } ] }, { "name": "qt5-qtnetworkauth", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtnetworkauth-everywhere-src-5.12.2.tar.xz", - "sha256": "5876c1d8e37238eca8d5fbc945dfeb90bac013597bcac5c5beff23c12a8a4383" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz", + "sha256": "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332" } ] }, { "name": "qt5-qtgamepad", "buildsystem": "qmake", "cleanup-platform": [ "/bin", "/mkspecs" ], "sources": [ { "type": "archive", - "url": "http://download.qt.io/archive/qt/5.12/5.12.2/submodules/qtgamepad-everywhere-src-5.12.2.tar.xz", - "sha256": "d289d8c983f4e88018c9ccb22bbde196c9f97efd20ecd48ae92994885f2334a7" + "url": "http://download.qt.io/archive/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz", + "sha256": "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642" } ] }, { "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.57.0" } ] }, { "name": "kwidgetsaddons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwidgetsaddons.git", "branch": "v5.57.0" } ] }, { "name": "ki18n", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/ki18n.git", "branch": "v5.57.0" } ] }, { "name": "kconfig", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kconfig.git", "branch": "v5.57.0" } ] }, { "name": "attica", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/attica.git", "branch": "v5.57.0" } ] }, { "name": "kguiaddons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kguiaddons.git", "branch": "v5.57.0" } ] }, { "name": "kcoreaddons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcoreaddons.git", "branch": "v5.57.0" } ] }, { "name": "kauth", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kauth.git", "branch": "v5.57.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.57.0" } ] }, { "name": "kcodecs", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcodecs.git", "branch": "v5.57.0" } ] }, { "name": "kconfigwidgets", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kconfigwidgets.git", "branch": "v5.57.0" } ] }, { "name": "kitemviews", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kitemviews.git", "branch": "v5.57.0" } ] }, { "name": "kiconthemes", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kiconthemes.git", "branch": "v5.57.0" } ] }, { "name": "kwindowsystem", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwindowsystem.git", "branch": "v5.57.0" } ] }, { "name": "kcrash", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcrash.git", "branch": "v5.57.0" } ] }, { "name": "kdbusaddons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdbusaddons.git", "branch": "v5.57.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.57.0" } ] }, { "name": "kglobalaccel", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kglobalaccel.git", "branch": "v5.57.0" } ] }, { "name": "sonnet", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/sonnet.git", "branch": "v5.57.0" } ] }, { "name": "kcompletion", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcompletion.git", "branch": "v5.57.0" } ] }, { "name": "ktextwidgets", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/ktextwidgets.git", "branch": "v5.57.0" } ] }, { "name": "kxmlgui", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kxmlgui.git", "branch": "v5.57.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.57.0" } ] }, { "name": "kpackage", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kpackage.git", "branch": "v5.57.0" } ] }, { "name": "kbookmarks", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kbookmarks.git", "branch": "v5.57.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.2" } ] }, { "name": "knotifications", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/knotifications.git", "branch": "v5.57.0" } ] }, { "name": "kwallet", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwallet.git", "branch": "v5.57.0" } ] }, { "name": "kjobwidgets", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjobwidgets.git", "branch": "v5.57.0" } ] }, { "name": "solid", "config-opts": [ "-DENABLE_TESTING=OFF", "-DUDEV_DISABLED=ON" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/solid.git", "branch": "v5.57.0" } ] }, { "name": "kio", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kio.git", "branch": "v5.57.0" } ] }, { "name": "kparts", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kparts.git", "branch": "v5.57.0" } ] }, { "name": "kplotting", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kplotting.git", "branch": "v5.57.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.57.0" } ] }, { "name": "kinit", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kinit.git", "branch": "v5.57.0" } ] }, { "name": "kded", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kded.git", "branch": "v5.57.0" } ] }, { "name": "kunitconversion", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kunitconversion.git", "branch": "v5.57.0" } ] }, { "name": "kdeclarative", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdeclarative.git", "branch": "v5.57.0" } ] }, { "name": "kcmutils", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcmutils.git", "branch": "v5.57.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.57.0" } ] }, { "name": "knewstuff", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/knewstuff.git", "branch": "v5.57.0" } ] }, { "name": "kidletime", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kidletime.git", "branch": "v5.57.0" } ] }, { "name": "threadweaver", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/threadweaver.git", "branch": "v5.57.0" } ] }, { "name": "kitemmodels", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kitemmodels.git", "branch": "v5.57.0" } ] }, { "name": "kxmlrpcclient", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kxmlrpcclient.git", "branch": "v5.57.0" } ] }, { "name": "kdnssd", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdnssd.git", "branch": "v5.57.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.57.0" } ] }, { "config-opts": [ "-DENABLE_TESTING=OFF" ], "name": "ktexteditor", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/ktexteditor.git", "branch": "v5.57.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.57.0" } ] }, { "name": "kemoticons", "config-opts": [ "-DENABLE_TESTING=OFF" ], "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kemoticons.git", "branch": "v5.57.0" } ] }, { "name": "kpty", "buildsystem": "cmake-ninja", "config-opts": [ "-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kpty.git", "branch": "v5.57.0" } ] }, { "name": "kwayland", "buildsystem": "cmake-ninja", "config-opts": ["-DENABLE_TESTING=OFF" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwayland.git", "branch": "v5.57.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.57.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.57.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.57.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.57.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.57.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.15" } ] }, { "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.15" } ] }, { "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.15" } ] }, { "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": "v4.9.0" } ] }, { "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/qtbase-buildabsoluteglesv2.patch b/patch/qtbase-buildabsoluteglesv2.patch deleted file mode 100644 index 858e03a..0000000 --- a/patch/qtbase-buildabsoluteglesv2.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..84dbbfebd4 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -91,16 +91,29 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) - endforeach() - !!ENDIF - foreach(_lib ${Libs}) -- string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) -+ if (IS_ABSOLUTE ${_lib}) -+ get_filename_component(_libFile ${_lib} NAME_WE) -+ if (_libFile MATCHES \"^${CMAKE_SHARED_LIBRARY_PREFIX}(.*)\") -+ set(_libFile ${CMAKE_MATCH_1}) -+ endif() -+ else() -+ set(_libFile ${_lib}) -+ endif() -+ -+ string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_libFile}) - if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) -- find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib} -+ if (IS_ABSOLUTE ${_lib}) -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib}) -+ else() -+ find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib} - !!IF !isEmpty(CROSS_COMPILE) -- PATHS \"${LibDir}\" -+ PATHS \"${LibDir}\" - !!IF !mac -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH - !!ENDIF - !!ENDIF -- ) -+ ) -+ endif() - !!IF mac - set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}") - if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") diff --git a/patch/qtbase-filechooser-properly-convert-filename.patch b/patch/qtbase-filechooser-properly-convert-filename.patch deleted file mode 100644 index 4002fb7..0000000 --- a/patch/qtbase-filechooser-properly-convert-filename.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1d3a162bfe38f8a3cd576ca17ea7e0f71a55e074 Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Mon, 18 Feb 2019 13:15:31 +0100 -Subject: Properly convert filename to bytearray when sending over portal - -We should be using QFile::encodeName() to properly convert filenames -from string to bytearray. This takes user's locale into account. - -Change-Id: I090f73f21feb73af166e88baa0e7f4a595cdb25b -Reviewed-by: Thiago Macieira - -diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp -index 5e94d1558e..dcf52921aa 100644 ---- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp -+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp -@@ -48,6 +48,7 @@ - #include - #include - -+#include - #include - #include - #include -@@ -181,10 +182,10 @@ void QXdgDesktopPortalFileDialog::openPortal() - - if (d->saveFile) { - if (!d->directory.isEmpty()) -- options.insert(QLatin1String("current_folder"), d->directory.toLatin1().append('\0')); -+ options.insert(QLatin1String("current_folder"), QFile::encodeName(d->directory).append('\0')); - - if (!d->selectedFiles.isEmpty()) -- options.insert(QLatin1String("current_file"), d->selectedFiles.first().toLatin1().append('\0')); -+ options.insert(QLatin1String("current_file"), QFile::encodeName(d->selectedFiles.first()).append('\0')); - } - - // Insert filters