Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test Failure Fix in kwayland #5

Open
wants to merge 102 commits into
base: patch/upstream-kde
Choose a base branch
from

Conversation

MarekPasnikowski
Copy link

I messed my GitHub operations and now I am forced to split the Pull Request into two.

This fix hides two lines of testing code which interfered with the build process.

brendan-t and others added 30 commits August 19, 2022 02:08
* gnu/packages/kde-frameworks.scm (plasma-wayland-protocols): New variable.
*  gnu/packages/lxqt.scm: Remove libdbusmenu-qt.
*  gnu/packages/qt.scm: Re-add libdbusmenu-qt.
* gnu/packages/kde-pim.scm
* gnu/packages/kde-frameworks.scm
(kdav): Move to (gnu packages kde-frameworks). It's considered a
framework component now.
*  gnu/packages/kde-frameworks.scm

(extra-cmake-modules, attica, bluez-qt, breeze-icons, kapidox, karchive,
kcalendarcore, kcodecs, kconfig, kcoreaddons, kdbusaddons, kdnssd,
kguiaddons, kholidays, ki18n, kidletime, kirigami, kitemmodels,
kitemviews, kplotting, ksyntaxhighlighting, kwayland, kwidgetsaddons,
kwindowsystem, modemmanager-qt, networkmanager-qt, oxygen-icons, prison,
qqc2-desktop-style, solid, sonnet, threadweaver, kactivities, kauth,
kcompletion, kcontacts, kcrash, kdoctools, kfilemetadata, kimageformats,
kjobwidgets, knotifications, kpackage, kpty, kunitconversion, syndication,
baloo, kactivities-stats, kbookmarks, kcmutils, kconfigwidgets,
kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kemoticons,
kglobalaccel, kiconthemes, kinit, kio, knewstuff, knotifyconfig, kparts,
kpeople, krunner, kservice, ktexteditor, ktextwidgets, kwallet, kxmlgui,
kxmlrpcclient, plasma-framework, purpose, kde-frameworkintegration,
kdelibs4support, khtml, kjs, kjsembed, kmediaplayer, kross, kdav):
Update to 5.92.0.

(extra-cmake-modules)[arguments]:
Disable failing test.
Don't run check phase after install.

(bluez): [arguments]: Enable tests.

(breeze-icons): [native-inputs]: Remove uneeded dependency libxml2, Add python-lxml, python.

(kapidox): Use python-build-system.  [native-inputs]: Remove extraneous
input.

kcalendarcore: [arguments]: Enable as many tests as possible.

(kconfig): [native-inputs]: Remove no longer needed inputs.
[arguments]: Disable failing test.

(kcoreaddons): [arguments]: Remove old hack, disable broken tests.

(ki18n): [arguments]: Disable failing tests.

(kguiaddons): [inputs]: Add new dependencies qtwayland, wayland.

(kwidgetsaddons): [arguments]: Disable another failing test.

(kwayland): [inputs]: Add plasma-wayland-protocols.
[arguments]: Enable working tests.

(knotifications): [native-inputs]: add libcanberra, libdbusmenu-qt,
qtdeclarative-5.
[arguments]: Respect tests?

(sonnet): [inputs]: Add qtdeclarative-5.

(kxmlgui): [inputs]: Add kguiaddons.

(kxmlrpcclient): [source]: Update url.

(plasma-framework): [arguments]: Enable all tests that work.
[native-inputs]: Add kdoctools.

(kpackage): [arguments]: Use substitution instead of patch.

(kio): [inputs]: Add new dependencies.
[native-inputs]: Add kdoctools.
[arguments]: Enable all tests that work.

(kdeclarative): [inputs]: Remove extraenous inputs.
[propagated-inputs]: Propagate qtdeclarative, since it always seems to
be needed.
[native-inputs]: Add dbus to skip failing test.
[arguments]: Replace check due to failing test.

(solid): [arguments]: Respect tests?.

(kdbusaddons): [arguments]: Respect tests?.
Fix patch by replacing it with a substitution instead.

(kholidays): [arguments]: Enable working test.

(ksyntaxhighlighting): [arguments]: Don't patch file that doesn't exist any more.

(kwindowsystem): [arguments]: Respect tests?.

(modemmanager-qt): [arguments]: Respect tests?.

(kauth): [arguments]: Respect tests?.

(kfilemetadata): [arguments]: A different test fails now.

(kunitconversion): [arguments]: Disable tests.

(baloo): [arguments]: Enable tests. Respect tests?.

(kconfigwidgets): Move qttools to native-inputs.

(kded): [inputs]: Remove unneeded kinit input.
[native-inputs]: Add kdoctools.

(kdesignerplugin): [inputs]: Remove extraneous inputs.
[native-inputs]: Add kdoctools.

(kglobalaccel): [inputs]: Remove extraneous inputs.

(kinit): [native-inputs]: Add kdoctools.

(knewstuff): [inputs]: Add kpackage.

(krunner): [arguments]: Disable failing tests.

(kservice): [arguments]: Enable all tests that work.
[native-inputs]: Add kdoctools.

(ktexteditor): [arguments]: Enable all tests that work.

(kwallet): [native-inputs]: Add kdoctools.

(purpose): [arguments]: Remove unneeded hack.

(kdelibs4support): Move qttools to native-inputs.
[native-inputs]: Add kdoctools.

(kcontacts): [inputs]: Add iso-codes since the tests look for some .json
files from it.
[arguments]: Disable failing tests.

(networkmanager-qt): [arguments]: Respect tests?.

* gnu/local.mk: Delete references to deleted patches:
kdbusaddons-kinit-file-name.patch
kinit-kdeinit-libpath.patch
kpackage-allow-external-paths.patch
kpackage-fix-KF5PackageMacros.cmake.patch
plasma-framework-fix-KF5PlasmaMacros.cmake.patch

* gnu/packages/patches/kdbusaddons-kinit-file-name.patch: Delete file.
* gnu/packages/patches/kinit-kdeinit-libpath.patch: Delete file.
* gnu/packages/patches/kpackage-allow-external-paths.patch: Delete file.
* gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch: Delete
file.
* gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch:
Delete file.

* gnu/packages/patches/kinit-kdeinit-extra_libs.patch: Fix patch.
* gnu/packages/kde-frameworks.scm (kcalendarcore, kconfig, kcoreaddons,
ksyntaxhighlighting, kwayland, kwindowsystem, modemmanager-qt, kcontacts,
kdoctools, kfilemetadata, imageformats, knotifications, kpackage, kpty,
baloo, kbookmarks, kcmutils, kconfigwidgets, kemoticons, kiconthemes,
kinit, kio, knewstuff, kparts, kservice, ktexteditor, kxmlgui,plasma-framework,
kde-frameworkintegration, kdelibs4support): Remove trailing booleans.
* gnu/packages/kde-frameworks.scm (kde-frameworkintegration): Remove input
labels.
* gnu/packages/kde-frameworks.scm (plasma-framework): Remove input
labels.
* gnu/packages/kde-frameworks.scm (kio): Remove input labels.
[inputs]: Remove kdoctools.
* gnu/packages/kde-frameworks.scm (kfilemetadata): Remove input labels.
* gnu/packages/kde-frameworks.scm (solid): Remove input labels.
* gnu/packages/kde-frameworks.scm (kwindowsystem): Remove input labels.
* gnu/packages/kde-frameworks.scm (ki18n): Remove input labels.
* gnu/packages/kde-frameworks.scm (phonon): Update home page.
* gnu/packages/kde-frameworks.scm (phonon-backend-gstreamer): Update home page.
* gnu/packages/kde-frameworks.scm (kgraphviewer): Fix home page.
* gnu/packages/kde-plasma.scm (layer-shell-qt): New variable.
* gnu/packages/kde-plasma.scm (breeze, kdecoration, kscreenlocker,
ksshaskpass, layer-shell-qt, libkscreen, libksysguard): Update to 5.24.4.

(kdecoration)[inputs]: Add new dependency.

(libkscreen)[inputs]: Add new Wayland inputs.

(kscreenlocker)[inputs]: Add layer-shell-qt.

(libksysguard)[origin]: Fix url so refresh script works.
[native-inputs]: Add qttools.
[inputs]: Add libnl libcap libpcap, qtwebengine, qtwebchannel,
lm-sensors:lib.
[arguments]: Remove unneened hacks. Respect tests?.
Remove uneeded (gnu packages kde-internet) import.
* gnu/packages/kde-internet.scm: Move libgravatar ...
* gnu/packages/kde-pim.scm ...here
* gnu/packages/kde-pim.scm (libgravatar): Remove input labels.
* gnu/packages/kde.scm (grantleetheme): Update to 21.12.3.
* gnu/local.mk: Remove patch.
* gnu/packages/patches/grantlee-merge-theme-dirs.patch: Remove file.
* gnu/packages/kde-pim.scm (KDE PIM): Update to 21.12.3.

(akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime,
akonadi-notes, akonadi-search, kaddressbook, kalarmcal,
kcalendarsupport, kcalutils, kdepim-runtime, keventviews, kgpg,
kidentitymanagement, kimap, kincidenceeditor, kldap, kleopatra, kmail,
kmailcommon, kmailimporter, kmailtransport, kmbox, kmessagelib, kmime,
knotes, kontactinterface, korganizer, kpeoplevcard, kpimcommon,
kpimtextedit, ksmtp, ktnef, libgravatar, libkdepim, libkgapi, libkleo,
libksieve): Update to 21.12.3.
(kblog): Update to 20.04.3.

* gnu/packages/patches/akonadi-not-relocatable.patch
* gnu/packages/patches/akonadi-paths.patch
* gnu/packages/patches/akonadi-timestamps.patch
Fix patches to apply to latest code.

(akonadi-calendar): [inputs]: Add new dependencies.

(akonadi-contacts): [inputs]: Add new dependencies.

(akonadi-search): [arguments]: Disable failing tests.

(kcalendarsupport): [inputs]: Add new dependency, remove obsolete kdepim-apps-lib.

(libksieve): [arguments]: Enable test that works now.
* gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch: Fix patch.

(kaddressbook): [inputs]: Remove obsolete kdepim-apps-libs.
Move kdocstools to native-inputs.

(kmessagelib): [inputs]: Remove obsolete kdepim-appslibs, add kguiaddons.
[arguments]: Fix findind header file.

(kmailimporter): [inputs]: Add new dependencies.

(kmailtransport): [inputs]: Add qtkeychain.

(knotes): [inputs]: Move kdocstools to native-inputs.

(kincidenceeditor): [inputs]: Add new dependencies. Remove obsolete kdepim-apps-libs
[arguments]: Disable failing test.

(kldap): [inputs]: Add qtkeychain.

(kgpg)[arguments]: Disable failing tests.

(libkleo): [propagated-inputs]: Propagate gpgme, qgpgme.
[arguments]: Disable failing tests.

(kdepim-runtime): [inputs]: Add new dependencies grantlee, grantleetheme, kcmutils, kldap,
libkdepim, qtkeychain
[arguments]: Enable all the tests that pass.
We need to use the old hack instead of search-input-directory to
workaround a mysterious include error.

(kdepim-apps-lib): Remove obsolete package.

(kmail): [origin]: Remove patch. Don't think it is needed anymore.
[inputs]: Add new dependencies, delete obsolete kdepim-apps-libs and
duplicate kmime.
[arguments]: Disable failing tests.
* gnu/packages/patches/kmail-Fix-missing-link-libraries.patch: Delete file.
* gnu/local.mk: Remove reference to patch.

(kmailcommon): [inputs]: Add new dependencies.
* gnu/packages/kde-pim.scm (akonadi, kaddressbook, kcalutils, kgpg, kimap,
kldap, kleopatra, kmail, kmailtransport, kmbox, kmime, knotes,
 kontactinterface, korganizer, kpimtextedit, ktnef): [home-page]: Update the
link.

(kontactinterface): [description]: Remove leading white space.

(kaddressbook): [inputs]: Add kdoctools.

(knotes): [inputs]: Add kdoctools.
* gnu/packages/kde-pim.scm (akonadi, akonadi-mime, akonadi-search,
kincidenceeditor, kdepim-runtime, kidentitymanagement, kleopatra, kmail,
kmime, korganizer, kpeoplevcard, ksmtp, libkleo,
libksieve)[arguments]: Remove trailing booleans.
* gnu/packages/kde.scm (baloo-widgets, kcachegrind,
kdeconnect, kdegraphics-mobipocket, kdenlive, kdevelop, kdevelop-pg-qt,
kdf, kdiagram, kpmcore, kqtquickcharts, krita, kseexpr, kuserfeedback,
labplot, libkdegames, libkexiv2, libkomparediff2, marble-qt,
massif-visualizer, okular, poxml, qca, snorenotify, zeroconf-ioslave):
Update to 21.12.3.

(baloo-widgets)[arguments]: Disable tests.

(kdiagram): Update to 2.8.0.

(qca): Update to 2.3.4.

(kpmcore)[arguments]: Don't try install polkit files to polkits store path.

(kdevelop)[inputs]: Add ksyntaxhighlighting. Use new inputs format.

(kdeconnect)[native-inputs]: Use new style.
[inputs]: Add new dependencies.

(krita)[inputs]: Use latest libraw.
* gnu/packages/kde.scm (kdenlive)[native-inputs]: Add kdoctools.
(marble-qt): Move kdoctools from inputs to native-inputs.
* gnu/packages/kde.scm (massif-visualizer, libkdegames, okular, poxml,
  zeroconf-ioslave): Update home-page link.
* gnu/packages/kde.scm (akregator, kdevelop)[arguments]: Remove trailing booleans.
* gnu/packages/kde-pim.scm (labplot): Remove input labels.
* gnu/packages/photo.scm (libraw-0.18): Delete unused old version.
* gnu/packages/kde-internet.scm (kget, konversation, kopete, krdc,
ktorrent, libktorrent): Update to 21.12.3.

(kget)[inputs]: Move kdoctools to native-inputs.
[arguments]: Disable broken tests.

(kopete)[inputs]: Add ksyntaxhighlighting, mediastreamer2.

(krdc)[arguments]: Add new dependencies.

(ktorrent)[origin]: Update URI.
[inputs]: Remove obsolete kdewebkit.
phodina and others added 18 commits August 19, 2022 02:08
* gnu/packages/freedesktop.scm (modem-manager) Update to 1.18.6. Disable tests
  due failing tests.
* gnu/packages/kde-plasma.scm (plasma-mobile): New variable.
* gnu/pacakges/kde-plasma.scm (plasma-mobile-settings): New variable.
* gnu/pacakges/kde-frameworks.scm (maliit-framework): New variable.
* gnu/pacakges/kde-frameworks.scm (maliit-keyboard): New variable.
* gnu/packages/kde-plasma.scm (plasma-mobile-sounds): New variable.
* gnu/packages/kde-frameworks.scm (kwin-effects-yet-another-magic-lamp): New
  variable.
* gnu/packages/kde-plasma.scm (plasma-phonebook): New variable.
* gnu/packages/kde-utils.scm (pikasso): New variable.
* gnu/packages/kde-plasma.scm (eink-lookandfeel): New variable.
* gnu/packages/kde-pim.scm (kpkpass): New variable.
* gnu/packages/kde-pim.scm (kitinerary): New variable.
* gnu/packages/kde-plasma.scm (kwin-lowlatency): New variable.
* gnu/packages/kde-plasma.scm (plasmatube): New variable.
* gnu/packages/kde-plasma.scm (latte-dock): New variable.
* gnu/system/examples/desktop.tmpl (operating-system): [services]: Add
plasma-desktop-service-type to provide all Desktop environments.
* Comment Out Faulty Test

* Comment Out Test Invocation in `kio`

* Revert "Comment Out Test Invocation in `kio`"
@MarekPasnikowski
Copy link
Author

I just discovered that GitHub automatically adds commits to Pull Requests.

The second commit is my naive attempt at making the test phase of kio build succeed. It does work.

Now I am stuck compiling QtWebEngine, so I am unable to get any more progress done for next 16-18 hours.

@phodina phodina force-pushed the patch/upstream-kde branch 5 times, most recently from 1315670 to c606c80 Compare August 28, 2022 22:15
@phodina phodina force-pushed the patch/upstream-kde branch 4 times, most recently from 958d20d to a8d3073 Compare September 12, 2022 04:13
@phodina
Copy link
Owner

phodina commented Sep 14, 2022

Hi @obikawa.

Thanks for the patches and sorry for late reply. I'll have a look. I keep rebasing this branch a lot but I should be able to find the correct diff.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants