Re: KF6 overlapping files
El miércoles, 6 de septiembre de 2023 0:13:32 (CEST) Christophe Marin escribió: > On mardi 11 juillet 2023 10:13:16 CEST Jonathan Riddell wrote: > > I thought I'd give an update on current overlapping files since our > > automated setup isn't running just now.. > > As of 15/10, there are still the following conflicts which are not tracked in https://community.kde.org/Plasma/Plasma_6#Coinstallability: kservice: /etc/xdg/menus/applications.menu exists in filesystem (owned by kservice5) kio: /etc/xdg/accept-languages.codes exists in filesystem (owned by kio5) kio: /etc/xdg/kshorturifilterrc exists in filesystem (owned by kio5) kio: /usr/share/kconf_update/filepicker.upd exists in filesystem (owned by kio5) ktexteditor: /usr/share/dbus-1/system-services/org.kde.ktexteditor.katetextbuffer.service exists in filesystem (owned by ktexteditor5) ktexteditor: /usr/share/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf exists in filesystem (owned by ktexteditor5) ktexteditor: /usr/share/katepart5/script/README.md exists in filesystem (owned by ktexteditor5) ktexteditor: /usr/share/polkit-1/actions/org.kde.ktexteditor.katetextbuffer.policy exists in filesystem (owned by ktexteditor5) purpose: /usr/share/icons/hicolor/128x128/apps/phabricator-purpose.png exists in filesystem (owned by purpose5) purpose: /usr/share/icons/hicolor/128x128/apps/reviewboard-purpose.png exists in filesystem (owned by purpose5) purpose: /usr/share/icons/hicolor/16x16/apps/phabricator-purpose.png exists in filesystem (owned by purpose5) purpose: /usr/share/icons/hicolor/16x16/apps/reviewboard-purpose.png exists in filesystem (owned by purpose5) Additionally, syntax-highlighting syntax files conflict if QRC_SYNTAX=OFF
Re: KF6 overlapping files
On mardi 11 juillet 2023 10:13:16 CEST Jonathan Riddell wrote: > I thought I'd give an update on current overlapping files since our > automated setup isn't running just now.. > Update with current issues found while packaging: - kio: /etc/xdg/accept-languages.codes /etc/xdg/kshorturifilterrc /usr/share/dbus-1/services/org.kde.kiod5.service /usr/share/dbus-1/services/org.kde.kioexecd.service /usr/share/dbus-1/services/org.kde.kpasswdserver.service /usr/share/dbus-1/services/org.kde.kssld5.service /usr/share/kconf_update/filepicker.upd /usr/share/knotifications6/proxyscout.notifyrc - plasma-framework: /usr/share/plasma/desktoptheme syntax-highlighting: /usr/bin/kate-syntax-highlighter - baloo (slightly less problematic, I don't think anyone would want two file indexers running) /etc/xdg/autostart/baloo_file.desktop /usr/lib/systemd/user/kde-baloo.service - kglobalaccel: /usr/share/dbus-1/interfaces/kf5_org.kde.KGlobalAccel.xml /usr/share/dbus-1/interfaces/kf5_org.kde.kglobalaccel.Component.xml - kwallet: /usr/bin/kwallet-query /usr/share/dbus-1/services/org.kde.kwalletd5.service /usr/share/man/man1/kwallet-query.1.gz kguiaddons: /usr/bin/kde-geo-uri-handler /usr/share/applications/google-maps-geo-handler.desktop /usr/share/applications/openstreetmap-geo-handler.desktop /usr/share/applications/qwant-maps-geo-handler.desktop /usr/share/applications/wheelmap-geo-handler.desktop ADDENDUM: Other important issues found while packaging: - Plasma repos still use the same soname as plasma 5 for libraries and the same minor version in CMakeLists.txt files. Both are huge issues for package dependencies. - This also applies to CMake config name. e.g: qqc2-breeze-style still installs its CMake files into KF5QQC2BreezeStyle. - plasma-workspace uses QQC1 (plasmacalendarplugins/holidays) and an obsolete import (components/calendar/qml/CalendarToolbar.qml imports org.kde.plasma.components 2.0) Christophe
Re: KF6 overlapping files
Jonathan Riddell ha scritto: > Here's a current list > > [...] > '/usr/share/locale/ar/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/az/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/bg/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/bs/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ca/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ca@valencia/LC_MESSAGES/baloowidgets5.mo' → > kf6-baloowidgets > '/usr/share/locale/cs/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/da/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/de/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/el/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/en_GB/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/es/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/et/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/eu/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/fi/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/fr/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ga/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/gl/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/he/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/hu/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ia/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/id/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/it/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ja/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ka/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/kk/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ko/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/lt/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ml/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/mr/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/nb/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/nds/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/nl/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/nn/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/pa/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/pl/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/pt/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/pt_BR/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ro/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ru/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/sk/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/sl/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/sr/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/sr@ijekavian/LC_MESSAGES/baloowidgets5.mo' → > kf6-baloowidgets > '/usr/share/locale/sr@ijekavianlatin/LC_MESSAGES/baloowidgets5.mo' → > kf6-baloowidgets > '/usr/share/locale/sr@latin/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/sv/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ta/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/tr/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/ug/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/uk/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/zh_CN/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/share/locale/zh_TW/LC_MESSAGES/baloowidgets5.mo' → kf6-baloowidgets > '/usr/bin/baloo_filemetadata_temp_extractor' → libkf5baloowidgets-bin > '/usr/share/locale/ar/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/az/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/bg/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/bs/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/ca/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/ca@valencia/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/cs/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/da/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/de/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/el/LC_MESSAGES/baloowidgets5.mo' → > libkf5baloowidgets5:amd64 > '/usr/share/locale/en_GB/LC_MESSAGES/baloowidgets5.mo' → >
Re: KF6 overlapping files
Here's a current list '/usr/share/dbus-1/system.d/org.kde.kf5auth.conf' → libkf5auth-data '/etc/xdg/ui/ui_standards.rc' → libkf5xmlgui-data '/etc/xdg/accept-languages.codes' → kio '/etc/xdg/kshorturifilterrc' → kio '/usr/bin/kcookiejar5' → kio '/usr/share/dbus-1/services/org.kde.kcookiejar5.service' → kio '/usr/share/dbus-1/services/org.kde.kiod5.service' → kio '/usr/share/dbus-1/services/org.kde.kioexecd.service' → kio '/usr/share/dbus-1/services/org.kde.kpasswdserver.service' → kio '/usr/share/dbus-1/services/org.kde.kssld5.service' → kio '/usr/share/kconf_update/filepicker.upd' → kio '/etc/xdg/autostart/baloo_file.desktop' → baloo-kf5 '/usr/lib/systemd/user/kde-baloo.service' → baloo-kf5 '/usr/share/plasma/desktoptheme/breeze-dark/colors' → plasma-framework '/usr/share/plasma/desktoptheme/breeze-dark/metadata.json' → plasma-framework '/usr/share/plasma/desktoptheme/breeze-dark/plasmarc' → plasma-framework '/usr/share/plasma/desktoptheme/breeze-light/colors' → plasma-framework '/usr/share/plasma/desktoptheme/breeze-light/metadata.json' → plasma-framework '/usr/share/plasma/desktoptheme/breeze-light/plasmarc' → plasma-framework '/usr/share/plasma/desktoptheme/default/dialogs/background.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/akonadi.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/akregator.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/amarok.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/applications.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/apport.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/audio.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/battery.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/bookmarks.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/cantata.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/computer.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/configure.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/device.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/disk.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/distribute.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/document.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/drive.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/edit.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/fcitx.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/go.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/ime.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/input.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kalarm.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kdeconnect.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/keyboard.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kget.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kgpg.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kleopatra.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/klipper.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kmail.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/konv_message.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/konversation.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kopete.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/korgac.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kpackagekit.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kruler.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kteatime.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/ktorrent.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/kup.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/list.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/mail.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/media.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/mobile.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/network.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/notification.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/osd.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/phone.svgz' → plasma-framework '/usr/share/plasma/desktoptheme/default/icons/plasmavault.svgz' → plasma-framework
Re: KF6 overlapping files
On Dienstag, 11. Juli 2023 10:13:16 CEST Jonathan Riddell wrote: > I thought I'd give an update on current overlapping files since our > automated setup isn't running just now.. Thank you, that is indeed very useful! > kf6-knotifications-dev (0.0+p22.04+tunstable+git20230708.0123-0) over > (0.0+p22.04+tunstable+git20230703.0121-0) ... > '/usr/share/dbus-1/interfaces/kf5_org.kde.StatusNotifierItem.xml' > libkf5notifications-dev > '/usr/share/dbus-1/interfaces/kf5_org.kde.StatusNotifierWatcher.xml' > libkf5notifications-dev Should be fixed with: https://invent.kde.org/frameworks/knotifications/-/merge_requests/108 https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/3062 > kf6-kguiaddons (0.0+p22.04+tunstable+git20230711.0102-0) over > (0.0+p22.04+tunstable+git20230701.0112-0) ... > '/usr/bin/kde-geo-uri-handler' libkf5guiaddons-bin > '/usr/share/applications/google-maps-geo-handler.desktop' > libkf5guiaddons-data > '/usr/share/applications/openstreetmap-geo-handler.desktop' > libkf5guiaddons-data > '/usr/share/applications/qwant-maps-geo-handler.desktop' > libkf5guiaddons-data > '/usr/share/applications/wheelmap-geo-handler.desktop' libkf5guiaddons-data This already was addressed with https://invent.kde.org/frameworks/ kguiaddons/-/merge_requests/96 but probably still needs adjustment in packaging then. signature.asc Description: This is a digitally signed message part.
Re: KF6 overlapping files
On mardi 11 juillet 2023 10:13:16 CEST Jonathan Riddell wrote: > kf6-kauth (0.0+p22.04+tunstable+git20230705.0759-0) over > (0.0+p22.04+tunstable+git20230630.0252-0) ... > '/usr/share/dbus-1/system.d/org.kde.kf5auth.conf' libkf5auth-data + /usr/libexec/kauth/kauth-policy-gen and generally (also affects plasma), all programs installed into KDE_INSTALL_LIBEXECDIR Also, KF6NewStuffCoreConfig.cmake hardcodes KDE_INSTALL_KNSRCDIR to 'share/knsrcfiles'. That will cause file conflicts. Christophe
KF6 overlapping files
I thought I'd give an update on current overlapping files since our automated setup isn't running just now.. kf6-kxmlgui (0.0+p22.04+tunstable+git20230708.0126-0) over (0.0+p22.04+tunstable+git20230701.0107-0) ... '/etc/xdg/ui/ui_standards.rc' libkf5xmlgui-data kf6-kio (0.0+p22.04+tunstable+git20230711.0449-0) over (0.0+p22.04+tunstable+git20230703.0257-0) ... '/etc/xdg/accept-languages.codes' kio '/etc/xdg/kshorturifilterrc' kio '/usr/bin/kcookiejar5' kio '/usr/share/dbus-1/services/org.kde.kcookiejar5.service' kio '/usr/share/dbus-1/services/org.kde.kiod5.service' kio '/usr/share/dbus-1/services/org.kde.kioexecd.service' kio '/usr/share/dbus-1/services/org.kde.kpasswdserver.service' kio '/usr/share/dbus-1/services/org.kde.kssld5.service' kio '/usr/share/kconf_update/filepicker.upd' kio kf6-baloo (0.0+p22.04+tunstable+git20230711.0216-0) over (0.0+p22.04+tunstable+git20230701.0101-0) ... '/etc/xdg/autostart/baloo_file.desktop' baloo-kf5 '/usr/lib/systemd/user/kde-baloo.service' baloo-kf5 kf6-kglobalaccel-dev (0.0+p22.04+tunstable+git20230705.0803-0) over (0.0+p22.04+tunstable+git20230701.0128-0) ... '/usr/share/dbus-1/interfaces/kf5_org.kde.KGlobalAccel.xml' libkf5globalaccel-dev '/usr/share/dbus-1/interfaces/kf5_org.kde.kglobalaccel.Component.xml' libkf5globalaccel-dev kf6-kwallet (0.0+p22.04+tunstable+git20230708.0144-0) over (0.0+p22.04+tunstable+git20230703.0249-0) ... '/usr/bin/kwallet-query' libkf5wallet-bin '/usr/bin/kwalletd5' libkf5wallet-bin '/usr/share/applications/org.kde.kwalletd5.desktop' libkf5wallet-bin '/usr/share/dbus-1/services/org.kde.kwalletd5.service' libkf5wallet-bin '/usr/share/man/man1/kwallet-query.1.gz' libkf5wallet-bin kf6-knotifications-dev (0.0+p22.04+tunstable+git20230708.0123-0) over (0.0+p22.04+tunstable+git20230703.0121-0) ... '/usr/share/dbus-1/interfaces/kf5_org.kde.StatusNotifierItem.xml' libkf5notifications-dev '/usr/share/dbus-1/interfaces/kf5_org.kde.StatusNotifierWatcher.xml' libkf5notifications-dev kf6-kguiaddons (0.0+p22.04+tunstable+git20230711.0102-0) over (0.0+p22.04+tunstable+git20230701.0112-0) ... '/usr/bin/kde-geo-uri-handler' libkf5guiaddons-bin '/usr/share/applications/google-maps-geo-handler.desktop' libkf5guiaddons-data '/usr/share/applications/openstreetmap-geo-handler.desktop' libkf5guiaddons-data '/usr/share/applications/qwant-maps-geo-handler.desktop' libkf5guiaddons-data '/usr/share/applications/wheelmap-geo-handler.desktop' libkf5guiaddons-data kf6-kauth (0.0+p22.04+tunstable+git20230705.0759-0) over (0.0+p22.04+tunstable+git20230630.0252-0) ... '/usr/share/dbus-1/system.d/org.kde.kf5auth.conf' libkf5auth-data
