diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-04-22 21:20:18 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-04-23 06:59:44 +0200 |
commit | 33bcf3987f7635a5515f6b21d939a90bc9f4e900 (patch) | |
tree | 9bd37ae0ab81065f5c1d15e3c76d13096faeedc0 /source | |
parent | aba57b8fb048fb6eac847e18978b0b8fd5729721 (diff) | |
download | current-33bcf3987f7635a5515f6b21d939a90bc9f4e900.tar.gz current-33bcf3987f7635a5515f6b21d939a90bc9f4e900.tar.xz |
Fri Apr 22 21:20:18 UTC 202220220422212018
a/kernel-firmware-20220421_e655307-noarch-1.txz: Upgraded.
kde/akonadi-22.04.0-x86_64-1.txz: Upgraded.
kde/akonadi-calendar-22.04.0-x86_64-1.txz: Upgraded.
kde/akonadi-calendar-tools-22.04.0-x86_64-1.txz: Upgraded.
kde/akonadi-contacts-22.04.0-x86_64-1.txz: Upgraded.
kde/akonadi-import-wizard-22.04.0-x86_64-1.txz: Upgraded.
kde/akonadi-mime-22.04.0-x86_64-1.txz: Upgraded.
kde/akonadi-notes-22.04.0-x86_64-1.txz: Upgraded.
kde/akonadi-search-22.04.0-x86_64-1.txz: Upgraded.
kde/akonadiconsole-22.04.0-x86_64-1.txz: Upgraded.
kde/akregator-22.04.0-x86_64-1.txz: Upgraded.
kde/analitza-22.04.0-x86_64-1.txz: Upgraded.
kde/ark-22.04.0-x86_64-1.txz: Upgraded.
kde/artikulate-22.04.0-x86_64-1.txz: Upgraded.
kde/audiocd-kio-22.04.0-x86_64-1.txz: Upgraded.
kde/baloo-widgets-22.04.0-x86_64-1.txz: Upgraded.
kde/blinken-22.04.0-x86_64-1.txz: Upgraded.
kde/bomber-22.04.0-x86_64-1.txz: Upgraded.
kde/bovo-22.04.0-x86_64-1.txz: Upgraded.
kde/calendarsupport-22.04.0-x86_64-1.txz: Upgraded.
kde/cantor-22.04.0-x86_64-1.txz: Upgraded.
kde/cervisia-22.04.0-x86_64-1.txz: Upgraded.
kde/dolphin-22.04.0-x86_64-1.txz: Upgraded.
kde/dolphin-plugins-22.04.0-x86_64-1.txz: Upgraded.
kde/dragon-22.04.0-x86_64-1.txz: Upgraded.
kde/elisa-22.04.0-x86_64-1.txz: Upgraded.
kde/eventviews-22.04.0-x86_64-1.txz: Upgraded.
kde/falkon-22.04.0-x86_64-1.txz: Upgraded.
kde/ffmpegthumbs-22.04.0-x86_64-1.txz: Upgraded.
kde/filelight-22.04.0-x86_64-1.txz: Upgraded.
kde/granatier-22.04.0-x86_64-1.txz: Upgraded.
kde/grantlee-editor-22.04.0-x86_64-1.txz: Upgraded.
kde/grantleetheme-22.04.0-x86_64-1.txz: Upgraded.
kde/gwenview-22.04.0-x86_64-1.txz: Upgraded.
kde/incidenceeditor-22.04.0-x86_64-1.txz: Upgraded.
kde/itinerary-22.04.0-x86_64-1.txz: Upgraded.
kde/juk-22.04.0-x86_64-1.txz: Upgraded.
kde/k3b-22.04.0-x86_64-1.txz: Upgraded.
kde/kaddressbook-22.04.0-x86_64-1.txz: Upgraded.
kde/kalarm-22.04.0-x86_64-1.txz: Upgraded.
kde/kalarmcal-21.12.3-x86_64-1.txz: Removed.
kde/kalendar-22.04.0-x86_64-1.txz: Added.
kde/kalgebra-22.04.0-x86_64-1.txz: Upgraded.
kde/kalzium-22.04.0-x86_64-1.txz: Upgraded.
kde/kamera-22.04.0-x86_64-1.txz: Upgraded.
kde/kamoso-22.04.0-x86_64-1.txz: Upgraded.
kde/kanagram-22.04.0-x86_64-1.txz: Upgraded.
kde/kapman-22.04.0-x86_64-1.txz: Upgraded.
kde/kapptemplate-22.04.0-x86_64-1.txz: Upgraded.
kde/kate-22.04.0-x86_64-1.txz: Upgraded.
kde/katomic-22.04.0-x86_64-1.txz: Upgraded.
kde/kbackup-22.04.0-x86_64-1.txz: Upgraded.
kde/kblackbox-22.04.0-x86_64-1.txz: Upgraded.
kde/kblocks-22.04.0-x86_64-1.txz: Upgraded.
kde/kbounce-22.04.0-x86_64-1.txz: Upgraded.
kde/kbreakout-22.04.0-x86_64-1.txz: Upgraded.
kde/kbruch-22.04.0-x86_64-1.txz: Upgraded.
kde/kcachegrind-22.04.0-x86_64-1.txz: Upgraded.
kde/kcalc-22.04.0-x86_64-1.txz: Upgraded.
kde/kcalutils-22.04.0-x86_64-1.txz: Upgraded.
kde/kcharselect-22.04.0-x86_64-1.txz: Upgraded.
kde/kcolorchooser-22.04.0-x86_64-1.txz: Upgraded.
kde/kcron-22.04.0-x86_64-1.txz: Upgraded.
kde/kde-dev-scripts-22.04.0-x86_64-1.txz: Upgraded.
kde/kde-dev-utils-22.04.0-x86_64-1.txz: Upgraded.
kde/kdebugsettings-22.04.0-x86_64-1.txz: Upgraded.
kde/kdeconnect-kde-22.04.0-x86_64-1.txz: Upgraded.
kde/kdeedu-data-22.04.0-x86_64-1.txz: Upgraded.
kde/kdegraphics-mobipocket-22.04.0-x86_64-1.txz: Upgraded.
kde/kdegraphics-thumbnailers-22.04.0-x86_64-1.txz: Upgraded.
kde/kdenetwork-filesharing-22.04.0-x86_64-1.txz: Upgraded.
kde/kdenlive-22.04.0-x86_64-1.txz: Upgraded.
kde/kdepim-addons-22.04.0-x86_64-1.txz: Upgraded.
kde/kdepim-runtime-22.04.0-x86_64-1.txz: Upgraded.
kde/kdesdk-kioslaves-22.04.0-x86_64-1.txz: Upgraded.
kde/kdesdk-thumbnailers-22.04.0-x86_64-1.txz: Upgraded.
kde/kdev-php-22.04.0-x86_64-1.txz: Upgraded.
kde/kdev-python-22.04.0-x86_64-1.txz: Upgraded.
kde/kdevelop-22.04.0-x86_64-1.txz: Upgraded.
kde/kdf-22.04.0-x86_64-1.txz: Upgraded.
kde/kdialog-22.04.0-x86_64-1.txz: Upgraded.
kde/kdiamond-22.04.0-x86_64-1.txz: Upgraded.
kde/keditbookmarks-22.04.0-x86_64-1.txz: Upgraded.
kde/kfind-22.04.0-x86_64-1.txz: Upgraded.
kde/kfloppy-22.04.0-x86_64-1.txz: Upgraded.
kde/kfourinline-22.04.0-x86_64-1.txz: Upgraded.
kde/kgeography-22.04.0-x86_64-1.txz: Upgraded.
kde/kget-22.04.0-x86_64-1.txz: Upgraded.
kde/kgoldrunner-22.04.0-x86_64-1.txz: Upgraded.
kde/kgpg-22.04.0-x86_64-1.txz: Upgraded.
kde/khangman-22.04.0-x86_64-1.txz: Upgraded.
kde/khelpcenter-22.04.0-x86_64-1.txz: Upgraded.
kde/kidentitymanagement-22.04.0-x86_64-1.txz: Upgraded.
kde/kig-22.04.0-x86_64-1.txz: Upgraded.
kde/kigo-22.04.0-x86_64-1.txz: Upgraded.
kde/killbots-22.04.0-x86_64-1.txz: Upgraded.
kde/kimagemapeditor-22.04.0-x86_64-1.txz: Upgraded.
kde/kimap-22.04.0-x86_64-1.txz: Upgraded.
kde/kio-extras-22.04.0-x86_64-1.txz: Upgraded.
kde/kio-gdrive-22.04.0-x86_64-1.txz: Upgraded.
kde/kipi-plugins-22.04.0-x86_64-1.txz: Upgraded.
kde/kirigami-gallery-22.04.0-x86_64-1.txz: Upgraded.
kde/kiriki-22.04.0-x86_64-1.txz: Upgraded.
kde/kiten-22.04.0-x86_64-1.txz: Upgraded.
kde/kitinerary-22.04.0-x86_64-1.txz: Upgraded.
kde/kjumpingcube-22.04.0-x86_64-1.txz: Upgraded.
kde/kldap-22.04.0-x86_64-1.txz: Upgraded.
kde/kleopatra-22.04.0-x86_64-1.txz: Upgraded.
kde/klickety-22.04.0-x86_64-1.txz: Upgraded.
kde/klines-22.04.0-x86_64-1.txz: Upgraded.
kde/kmag-22.04.0-x86_64-1.txz: Upgraded.
kde/kmahjongg-22.04.0-x86_64-1.txz: Upgraded.
kde/kmail-22.04.0-x86_64-1.txz: Upgraded.
kde/kmail-account-wizard-22.04.0-x86_64-1.txz: Upgraded.
kde/kmailtransport-22.04.0-x86_64-1.txz: Upgraded.
kde/kmbox-22.04.0-x86_64-1.txz: Upgraded.
kde/kmime-22.04.0-x86_64-1.txz: Upgraded.
kde/kmines-22.04.0-x86_64-1.txz: Upgraded.
kde/kmix-22.04.0-x86_64-1.txz: Upgraded.
kde/kmousetool-22.04.0-x86_64-1.txz: Upgraded.
kde/kmouth-22.04.0-x86_64-1.txz: Upgraded.
kde/kmplot-22.04.0-x86_64-1.txz: Upgraded.
kde/knavalbattle-22.04.0-x86_64-1.txz: Upgraded.
kde/knetwalk-22.04.0-x86_64-1.txz: Upgraded.
kde/knights-22.04.0-x86_64-1.txz: Upgraded.
kde/knotes-22.04.0-x86_64-1.txz: Upgraded.
kde/kolf-22.04.0-x86_64-1.txz: Upgraded.
kde/kollision-22.04.0-x86_64-1.txz: Upgraded.
kde/kolourpaint-22.04.0-x86_64-1.txz: Upgraded.
kde/kompare-22.04.0-x86_64-1.txz: Upgraded.
kde/konqueror-22.04.0-x86_64-1.txz: Upgraded.
kde/konquest-22.04.0-x86_64-1.txz: Upgraded.
kde/konsole-22.04.0-x86_64-1.txz: Upgraded.
kde/kontact-22.04.0-x86_64-1.txz: Upgraded.
kde/kontactinterface-22.04.0-x86_64-1.txz: Upgraded.
kde/kontrast-22.04.0-x86_64-1.txz: Upgraded.
kde/konversation-22.04.0-x86_64-1.txz: Upgraded.
kde/kopeninghours-22.04.0-x86_64-1.txz: Upgraded.
kde/kopete-22.04.0-x86_64-1.txz: Upgraded.
kde/korganizer-22.04.0-x86_64-1.txz: Upgraded.
kde/kosmindoormap-22.04.0-x86_64-1.txz: Upgraded.
kde/kpat-22.04.0-x86_64-1.txz: Upgraded.
kde/kpimtextedit-22.04.0-x86_64-1.txz: Upgraded.
kde/kpkpass-22.04.0-x86_64-1.txz: Upgraded.
kde/kpmcore-22.04.0-x86_64-1.txz: Upgraded.
kde/kpublictransport-22.04.0-x86_64-1.txz: Upgraded.
kde/kqtquickcharts-22.04.0-x86_64-1.txz: Upgraded.
kde/krdc-22.04.0-x86_64-1.txz: Upgraded.
kde/kreversi-22.04.0-x86_64-1.txz: Upgraded.
kde/krfb-22.04.0-x86_64-1.txz: Upgraded.
kde/kross-interpreters-22.04.0-x86_64-1.txz: Upgraded.
kde/kruler-22.04.0-x86_64-1.txz: Upgraded.
kde/kshisen-22.04.0-x86_64-1.txz: Upgraded.
kde/ksirk-22.04.0-x86_64-1.txz: Upgraded.
kde/ksmtp-22.04.0-x86_64-1.txz: Upgraded.
kde/ksnakeduel-22.04.0-x86_64-1.txz: Upgraded.
kde/kspaceduel-22.04.0-x86_64-1.txz: Upgraded.
kde/ksquares-22.04.0-x86_64-1.txz: Upgraded.
kde/ksudoku-22.04.0-x86_64-1.txz: Upgraded.
kde/ksystemlog-22.04.0-x86_64-1.txz: Upgraded.
kde/kteatime-22.04.0-x86_64-1.txz: Upgraded.
kde/ktimer-22.04.0-x86_64-1.txz: Upgraded.
kde/ktnef-22.04.0-x86_64-1.txz: Upgraded.
kde/ktorrent-22.04.0-x86_64-1.txz: Upgraded.
kde/ktouch-22.04.0-x86_64-1.txz: Upgraded.
kde/kturtle-22.04.0-x86_64-1.txz: Upgraded.
kde/kubrick-22.04.0-x86_64-1.txz: Upgraded.
kde/kwalletmanager-22.04.0-x86_64-1.txz: Upgraded.
kde/kwave-22.04.0-x86_64-1.txz: Upgraded.
kde/kwordquiz-22.04.0-x86_64-1.txz: Upgraded.
kde/libgravatar-22.04.0-x86_64-1.txz: Upgraded.
kde/libkcddb-22.04.0-x86_64-1.txz: Upgraded.
kde/libkcompactdisc-22.04.0-x86_64-1.txz: Upgraded.
kde/libkdcraw-22.04.0-x86_64-1.txz: Upgraded.
kde/libkdegames-22.04.0-x86_64-1.txz: Upgraded.
kde/libkdepim-22.04.0-x86_64-1.txz: Upgraded.
kde/libkeduvocdocument-22.04.0-x86_64-1.txz: Upgraded.
kde/libkexiv2-22.04.0-x86_64-1.txz: Upgraded.
kde/libkgapi-22.04.0-x86_64-1.txz: Upgraded.
kde/libkipi-22.04.0-x86_64-1.txz: Upgraded.
kde/libkleo-22.04.0-x86_64-1.txz: Upgraded.
kde/libkmahjongg-22.04.0-x86_64-1.txz: Upgraded.
kde/libkomparediff2-22.04.0-x86_64-1.txz: Upgraded.
kde/libksane-22.04.0-x86_64-1.txz: Upgraded.
kde/libksieve-22.04.0-x86_64-1.txz: Upgraded.
kde/libktorrent-22.04.0-x86_64-1.txz: Upgraded.
kde/lokalize-22.04.0-x86_64-1.txz: Upgraded.
kde/lskat-22.04.0-x86_64-1.txz: Upgraded.
kde/mailcommon-22.04.0-x86_64-1.txz: Upgraded.
kde/mailimporter-22.04.0-x86_64-1.txz: Upgraded.
kde/marble-22.04.0-x86_64-1.txz: Upgraded.
kde/markdownpart-22.04.0-x86_64-1.txz: Upgraded.
kde/mbox-importer-22.04.0-x86_64-1.txz: Upgraded.
kde/messagelib-22.04.0-x86_64-1.txz: Upgraded.
kde/minuet-22.04.0-x86_64-1.txz: Upgraded.
kde/okular-22.04.0-x86_64-1.txz: Upgraded.
kde/palapeli-22.04.0-x86_64-1.txz: Upgraded.
kde/parley-22.04.0-x86_64-1.txz: Upgraded.
kde/partitionmanager-22.04.0-x86_64-1.txz: Upgraded.
kde/picmi-22.04.0-x86_64-1.txz: Upgraded.
kde/pim-data-exporter-22.04.0-x86_64-1.txz: Upgraded.
kde/pim-sieve-editor-22.04.0-x86_64-1.txz: Upgraded.
kde/pimcommon-22.04.0-x86_64-1.txz: Upgraded.
kde/poxml-22.04.0-x86_64-1.txz: Upgraded.
kde/print-manager-22.04.0-x86_64-1.txz: Upgraded.
kde/rocs-22.04.0-x86_64-1.txz: Upgraded.
kde/skanlite-22.04.0-x86_64-1.txz: Upgraded.
kde/skanpage-22.04.0-x86_64-1.txz: Added.
kde/spectacle-22.04.0-x86_64-1.txz: Upgraded.
kde/step-22.04.0-x86_64-1.txz: Upgraded.
kde/svgpart-22.04.0-x86_64-1.txz: Upgraded.
kde/sweeper-22.04.0-x86_64-1.txz: Upgraded.
kde/umbrello-22.04.0-x86_64-1.txz: Upgraded.
kde/yakuake-22.04.0-x86_64-1.txz: Upgraded.
kde/zanshin-22.04.0-x86_64-1.txz: Upgraded.
kde/zeroconf-ioslave-22.04.0-x86_64-1.txz: Upgraded.
x/xauth-1.1.2-x86_64-1.txz: Upgraded.
xfce/xfce4-panel-4.16.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
31 files changed, 422 insertions, 398 deletions
diff --git a/source/kde/kde/build/akonadi-contacts b/source/kde/kde/build/akonadi-contacts index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/akonadi-contacts +++ b/source/kde/kde/build/akonadi-contacts @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/akonadi-import-wizard b/source/kde/kde/build/akonadi-import-wizard index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/akonadi-import-wizard +++ b/source/kde/kde/build/akonadi-import-wizard @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/akonadiconsole b/source/kde/kde/build/akonadiconsole index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/akonadiconsole +++ b/source/kde/kde/build/akonadiconsole @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/akregator b/source/kde/kde/build/akregator index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/akregator +++ b/source/kde/kde/build/akregator @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/grantlee-editor b/source/kde/kde/build/grantlee-editor index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/grantlee-editor +++ b/source/kde/kde/build/grantlee-editor @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kalendar b/source/kde/kde/build/kalendar new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/source/kde/kde/build/kalendar @@ -0,0 +1 @@ +1 diff --git a/source/kde/kde/build/kdepim-addons b/source/kde/kde/build/kdepim-addons index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kdepim-addons +++ b/source/kde/kde/build/kdepim-addons @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kget b/source/kde/kde/build/kget index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kget +++ b/source/kde/kde/build/kget @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kig b/source/kde/kde/build/kig index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kig +++ b/source/kde/kde/build/kig @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kldap b/source/kde/kde/build/kldap index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kldap +++ b/source/kde/kde/build/kldap @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kleopatra b/source/kde/kde/build/kleopatra index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kleopatra +++ b/source/kde/kde/build/kleopatra @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kmail b/source/kde/kde/build/kmail index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kmail +++ b/source/kde/kde/build/kmail @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kmail-account-wizard b/source/kde/kde/build/kmail-account-wizard index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kmail-account-wizard +++ b/source/kde/kde/build/kmail-account-wizard @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kopeninghours b/source/kde/kde/build/kopeninghours index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kopeninghours +++ b/source/kde/kde/build/kopeninghours @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/libkleo b/source/kde/kde/build/libkleo index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/libkleo +++ b/source/kde/kde/build/libkleo @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/mailcommon b/source/kde/kde/build/mailcommon index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/mailcommon +++ b/source/kde/kde/build/mailcommon @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/mbox-importer b/source/kde/kde/build/mbox-importer index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/mbox-importer +++ b/source/kde/kde/build/mbox-importer @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/messagelib b/source/kde/kde/build/messagelib index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/messagelib +++ b/source/kde/kde/build/messagelib @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/pim-data-exporter b/source/kde/kde/build/pim-data-exporter index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/pim-data-exporter +++ b/source/kde/kde/build/pim-data-exporter @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/skanpage b/source/kde/kde/build/skanpage new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/source/kde/kde/build/skanpage @@ -0,0 +1 @@ +1 diff --git a/source/kde/kde/kde.SlackBuild b/source/kde/kde/kde.SlackBuild index 86b2bcd36..9cc3d21c3 100755 --- a/source/kde/kde/kde.SlackBuild +++ b/source/kde/kde/kde.SlackBuild @@ -568,5 +568,3 @@ do done exit 0 - - diff --git a/source/kde/kde/modules/all-packaged-applications b/source/kde/kde/modules/all-packaged-applications index e0ac8fdbc..9721f6b6b 100644 --- a/source/kde/kde/modules/all-packaged-applications +++ b/source/kde/kde/modules/all-packaged-applications @@ -17,15 +17,14 @@ akonadi-mime akonadi-contacts akonadi-notes akonadi-search -kalarmcal kmailtransport akonadi-calendar libkdepim pimcommon +calendarsupport libgravatar libksieve mailimporter -calendarsupport eventviews incidenceeditor messagelib @@ -34,6 +33,7 @@ kleopatra kpkpass kopeninghours kitinerary +kaddressbook kdepim-addons kdepim-runtime akonadi-calendar-tools @@ -41,7 +41,6 @@ akonadiconsole akonadi-import-wizard akregator grantlee-editor -kaddressbook kalarm kmail kmail-account-wizard @@ -211,3 +210,6 @@ kdevelop kdev-php kdev-python zanshin +falkon +kalendar +skanpage diff --git a/source/kde/kde/modules/applications b/source/kde/kde/modules/applications index 5fa4c7f07..26b38adcf 100644 --- a/source/kde/kde/modules/applications +++ b/source/kde/kde/modules/applications @@ -213,3 +213,8 @@ kdev-python # New in 21.12.0: zanshin + +# New in 22.04.0: +falkon +kalendar +skanpage diff --git a/source/kde/kde/modules/applications-extra b/source/kde/kde/modules/applications-extra index c12dbbb2e..aaaab9f1b 100644 --- a/source/kde/kde/modules/applications-extra +++ b/source/kde/kde/modules/applications-extra @@ -3,7 +3,6 @@ calligra calligraplan digikam krita -falkon kdiagram kjots kstars diff --git a/source/kde/kde/modules/kdepim b/source/kde/kde/modules/kdepim index b36ce2582..7d6f8fbaa 100644 --- a/source/kde/kde/modules/kdepim +++ b/source/kde/kde/modules/kdepim @@ -18,7 +18,6 @@ akonadi-mime akonadi-contacts akonadi-notes akonadi-search -kalarmcal kmailtransport akonadi-calendar libkleo diff --git a/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch b/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch index 423e17074..3930959b3 100644 --- a/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch +++ b/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch @@ -1,23 +1,16 @@ -# Let the user decide whether she wants to run Dolphin as root: - -diff -uar dolphin-18.08.0.orig/src/main.cpp dolphin-18.08.0/src/main.cpp ---- dolphin-18.08.0.orig/src/main.cpp 2018-08-06 22:41:40.000000000 +0200 -+++ dolphin-18.08.0/src/main.cpp 2018-08-11 00:32:48.073913157 +0200 -@@ -43,14 +43,12 @@ - extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) - { - #ifndef Q_OS_WIN -- // Prohibit using sudo or kdesu (but allow using the root user directly) -+ // Warn using sudo or kdesu (but allow using the root user directly) - if (getuid() == 0) { - if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { -- std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl; +--- ./src/main.cpp.orig 2022-04-22 02:04:31.917318278 -0500 ++++ ./src/main.cpp 2022-04-22 02:05:16.203319268 -0500 +@@ -48,13 +48,11 @@ + "Instead use Dolphin normally and you will be prompted for elevated privileges when " + "performing file operations that require them." + << std::endl; - return EXIT_FAILURE; -+ std::cout << "Executing Dolphin with sudo is UNSAFE due to unfixable security vulnerabilities." << std::endl; } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) { -- std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl; + std::cout << "Running Dolphin with kdesu can cause bugs and expose you to security vulnerabilities. " + "Instead use Dolphin normally and you will be prompted for elevated privileges when " + "performing file operations that require them." + << std::endl; - return EXIT_FAILURE; -+ std::cout << "Executing Dolphin with kdesu is UNSAFE due to unfixable security vulnerabilities." << std::endl; } } #endif diff --git a/source/kde/kde/patch/kate/kate_runasroot.patch b/source/kde/kde/patch/kate/kate_runasroot.patch index 3cc919faf..7d2bc3c85 100644 --- a/source/kde/kde/patch/kate/kate_runasroot.patch +++ b/source/kde/kde/patch/kate/kate_runasroot.patch @@ -1,42 +1,30 @@ ---- ./kwrite/main.cpp.orig 2021-08-12 21:30:09.752256555 -0500 -+++ ./kwrite/main.cpp 2021-08-12 21:32:05.046259134 -0500 -@@ -41,17 +41,15 @@ - // Prohibit using sudo or kdesu (but allow using the root user directly) - if (getuid() == 0) { - if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { -- std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities. " -+ std::cout << "Executing KWrite with sudo is UNSAFE due to unfixable security vulnerabilities. " - "It is also not necessary; simply use KWrite normally, and you will be prompted for " - "elevated privileges when saving documents if needed." +--- ./kwrite/main.cpp.orig 2022-04-22 01:59:34.794311631 -0500 ++++ ./kwrite/main.cpp 2022-04-22 02:01:06.318313678 -0500 +@@ -46,13 +46,11 @@ + "Instead use KWrite normally and you will be prompted for elevated privileges when " + "saving documents if needed." << std::endl; - return EXIT_FAILURE; } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) { -- std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities. " -+ std::cout << "Executing KWrite with kdesu is UNSAFE due to unfixable security vulnerabilities. " - "It is also not necessary; simply use KWrite normally, and you will be prompted for " - "elevated privileges when saving documents if needed." + std::cout << "Running KWrite with kdesu can cause bugs and expose you to security vulnerabilities. " + "Instead use KWrite normally and you will be prompted for elevated privileges when " + "saving documents if needed." << std::endl; - return EXIT_FAILURE; } } #endif ---- ./kate/main.cpp.orig 2021-08-04 21:13:14.000000000 -0500 -+++ ./kate/main.cpp 2021-08-12 21:30:09.753256555 -0500 -@@ -49,17 +49,15 @@ - // Prohibit using sudo or kdesu (but allow using the root user directly) - if (getuid() == 0) { - if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { -- std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities. " -+ std::cout << "Executing Kate with sudo is UNSAFE due to unfixable security vulnerabilities. " - "It is also not necessary; simply use Kate normally, and you will be prompted for " - "elevated privileges when saving documents if needed." +--- ./kate/main.cpp.orig 2022-04-22 01:59:34.794311631 -0500 ++++ ./kate/main.cpp 2022-04-22 02:01:46.125314569 -0500 +@@ -54,13 +54,11 @@ + "Instead use Kate normally and you will be prompted for elevated privileges when " + "saving documents if needed." << std::endl; - return EXIT_FAILURE; } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) { -- std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities. " -+ std::cout << "Executing Kate with kdesu is UNSAFE due to unfixable security vulnerabilities. " - "It is also not necessary; simply use Kate normally, and you will be prompted for " - "elevated privileges when saving documents if needed." + std::cout << "Running Kate with kdesu can cause bugs and expose you to security vulnerabilities. " + "Instead use Kate normally and you will be prompted for elevated privileges when " + "saving documents if needed." << std::endl; - return EXIT_FAILURE; } diff --git a/source/kde/kde/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch b/source/kde/kde/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch index b23a20e12..b29f8289f 100644 --- a/source/kde/kde/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch +++ b/source/kde/kde/patch/ktorrent/ktorrent.geoip.revert.6c1ae6b2530c5f7c72611a95aea92275520a5aee.patch @@ -1,5 +1,85 @@ ---- ./plugins/infowidget/GeoIP.h.orig 2021-08-15 00:18:01.329498947 -0500 -+++ ./plugins/infowidget/GeoIP.h 2021-08-15 00:18:01.329498947 -0500 +--- ./plugins/infowidget/peerviewmodel.h.orig 2022-04-13 21:50:05.000000000 -0500 ++++ ./plugins/infowidget/peerviewmodel.h 2022-04-22 13:03:03.206722648 -0500 +@@ -61,12 +61,7 @@ + QString country; + QIcon flag; + +- Item(bt::PeerInterface *peer +-#if BUILD_WITH_GEOIP +- , +- GeoIPManager *geo_ip +-#endif +- ); ++ Item(bt::PeerInterface *peer, GeoIPManager *geo_ip); + + bool changed() const; + QVariant data(int col) const; +@@ -76,9 +71,7 @@ + + private: + QVector<Item *> items; +-#if BUILD_WITH_GEOIP +- GeoIPManager *geo_ip = nullptr; +-#endif ++ GeoIPManager *geo_ip; + }; + + } +--- ./plugins/infowidget/geoipmanager.h.orig 2022-04-13 21:50:05.000000000 -0500 ++++ ./plugins/infowidget/geoipmanager.h 2022-04-22 13:03:03.206722648 -0500 +@@ -7,7 +7,21 @@ + #define KT_GEOIPMANAGER_H + + #include <QObject> ++#include <QThread> ++#include <QUrl> ++ ++#ifdef USE_SYSTEM_GEOIP + #include <GeoIP.h> ++#else ++#include "GeoIP.h" ++#endif ++ ++class KJob; ++ ++namespace bt ++{ ++class DecompressThread; ++} + + namespace kt + { +@@ -42,8 +56,28 @@ + */ + QString countryCode(int country_id); + ++ /// Get the database URL ++ static QUrl geoIPUrl() ++ { ++ return geoip_url; ++ } ++ ++ /// Set the database URL ++ static void setGeoIPUrl(const QUrl &url); ++ ++ /// Download the database ++ void downloadDataBase(); ++ ++private Q_SLOTS: ++ void databaseDownloadFinished(KJob *job); ++ void decompressFinished(); ++ + private: + GeoIP *geo_ip; ++ QString geoip_data_file; ++ QString download_destination; ++ bt::DecompressThread *decompress_thread; ++ static QUrl geoip_url; + }; + + } +--- ./plugins/infowidget/GeoIP.h.orig 2022-04-22 13:03:03.205722648 -0500 ++++ ./plugins/infowidget/GeoIP.h 2022-04-22 13:03:03.205722648 -0500 @@ -0,0 +1,148 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */ +/* GeoIP.h @@ -149,125 +229,153 @@ +#endif + +#endif /* GEOIP_H */ ---- ./plugins/infowidget/geoipmanager.cpp.orig 2021-08-04 21:50:44.000000000 -0500 -+++ ./plugins/infowidget/geoipmanager.cpp 2021-08-15 00:18:01.329498947 -0500 -@@ -20,16 +20,47 @@ +--- ./plugins/infowidget/peerviewmodel.cpp.orig 2022-04-13 21:50:05.000000000 -0500 ++++ ./plugins/infowidget/peerviewmodel.cpp 2022-04-22 13:03:03.206722648 -0500 +@@ -13,13 +13,10 @@ + #include <KLocalizedString> + + #include "flagdb.h" ++#include "geoipmanager.h" + #include <interfaces/torrentinterface.h> + #include <util/functions.h> + +-#if BUILD_WITH_GEOIP +-#include "geoipmanager.h" +-#endif +- + using namespace bt; namespace kt +@@ -28,12 +25,7 @@ + static bool icons_loaded = false; + static FlagDB flagDB(22, 18); + +-PeerViewModel::Item::Item(bt::PeerInterface *peer +-#if BUILD_WITH_GEOIP +- , +- GeoIPManager *geo_ip +-#endif +- ) ++PeerViewModel::Item::Item(bt::PeerInterface *peer, GeoIPManager *geo_ip) + : peer(peer) { -+QUrl GeoIPManager::geoip_url = QUrl(QStringLiteral("http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz")); -+ - GeoIPManager::GeoIPManager(QObject *parent) - : QObject(parent) -+ , geo_ip(nullptr) -+ , decompress_thread(nullptr) - { -+#ifdef USE_SYSTEM_GEOIP - geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); -+#else -+ geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("geoip.dat")); -+ if (geoip_data_file.isEmpty()) -+ geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("GeoIP.dat")); -+ -+ if (geoip_data_file.isEmpty()) { -+ downloadDataBase(); -+ } else { -+ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0); -+ if (geo_ip) { -+ QFileInfo fi(geoip_data_file); -+ QDateTime now = QDateTime::currentDateTime(); -+ if (fi.lastModified().daysTo(now) >= 30) { -+ // if the last time the geoip file was modified, was more then -+ // 30 days ago, redownload it -+ downloadDataBase(); -+ } + stats = peer->getStats(); +@@ -47,13 +39,13 @@ + flagDB.addFlagSource(path + QStringLiteral("/%1/flag.png")); + } + +-#if BUILD_WITH_GEOIP +- int country_id = geo_ip->findCountry(stats.ip_address); +- if (country_id > 0) { +- country = geo_ip->countryName(country_id); +- flag = flagDB.getFlag(geo_ip->countryCode(country_id)); ++ if (geo_ip) { ++ int country_id = geo_ip->findCountry(stats.ip_address); ++ if (country_id > 0) { ++ country = geo_ip->countryName(country_id); ++ flag = flagDB.getFlag(geo_ip->countryCode(country_id)); + } -+ } -+#endif + } +-#endif } - GeoIPManager::~GeoIPManager() + bool PeerViewModel::Item::changed() const +@@ -191,10 +183,9 @@ + + PeerViewModel::PeerViewModel(QObject *parent) + : QAbstractTableModel(parent) ++ , geo_ip(nullptr) { - if (geo_ip) - GeoIP_delete(geo_ip); -+ -+ if (decompress_thread) { -+ decompress_thread->cancel(); -+ decompress_thread->wait(); -+ delete decompress_thread; -+ } +-#if BUILD_WITH_GEOIP + geo_ip = new GeoIPManager(this); +-#endif } - int GeoIPManager::findCountry(const QString &addr) -@@ -56,4 +87,66 @@ - return QString(); + PeerViewModel::~PeerViewModel() +@@ -204,12 +195,7 @@ + + void PeerViewModel::peerAdded(bt::PeerInterface *peer) + { +- items.append(new Item(peer +-#if BUILD_WITH_GEOIP +- , +- geo_ip +-#endif +- )); ++ items.append(new Item(peer, geo_ip)); + insertRow(items.count() - 1); } -+void GeoIPManager::downloadDataBase() -+{ -+#ifndef USE_SYSTEM_GEOIP -+ Out(SYS_INW | LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url << endl; -+ download_destination = kt::DataDir(CreateIfNotExists) + geoip_url.fileName(); -+ KIO::CopyJob *job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo); -+ connect(job, &KIO::CopyJob::result, this, &GeoIPManager::databaseDownloadFinished); -+#endif -+} -+ -+void GeoIPManager::databaseDownloadFinished(KJob *job) -+{ -+ if (job->error()) { -+ Out(SYS_INW | LOG_IMPORTANT) << "Failed to download GeoIP database: " << job->errorString() << endl; -+ return; -+ } -+ -+ if (download_destination.endsWith(QLatin1String(".dat")) || download_destination.endsWith(QLatin1String(".DAT"))) { -+ Out(SYS_INW | LOG_NOTICE) << "GeoIP database downloaded, opening ... " << endl; -+ geoip_data_file = download_destination; -+ if (geo_ip) { -+ GeoIP_delete(geo_ip); -+ geo_ip = nullptr; -+ } -+ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0); -+ if (!geo_ip) -+ Out(SYS_INW | LOG_NOTICE) << "Failed to open GeoIP database " << endl; -+ } else { -+ Out(SYS_INW | LOG_NOTICE) << "GeoIP database downloaded, decompressing ... " << endl; -+ // decompress the file -+ decompress_thread = new bt::DecompressThread(download_destination, kt::DataDir() + QLatin1String("geoip.dat")); -+ connect(decompress_thread, &bt::DecompressThread::finished, this, &GeoIPManager::decompressFinished, Qt::QueuedConnection); -+ decompress_thread->start(QThread::IdlePriority); -+ } -+} -+ -+void GeoIPManager::decompressFinished() -+{ -+ Out(SYS_INW | LOG_NOTICE) << "GeoIP database decompressed, opening ... " << endl; -+ if (!decompress_thread->error()) { -+ geoip_data_file = kt::DataDir() + QLatin1String("geoip.dat"); -+ if (geo_ip) { -+ GeoIP_delete(geo_ip); -+ geo_ip = nullptr; -+ } -+ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0); -+ if (!geo_ip) -+ Out(SYS_INW | LOG_NOTICE) << "Failed to open GeoIP database " << endl; -+ } -+ -+ decompress_thread->wait(); -+ delete decompress_thread; -+ decompress_thread = nullptr; -+} -+ -+void GeoIPManager::setGeoIPUrl(const QUrl &url) -+{ -+ geoip_url = url; -+} +--- ./plugins/infowidget/CMakeLists.txt.orig 2022-04-13 21:50:05.000000000 -0500 ++++ ./plugins/infowidget/CMakeLists.txt 2022-04-22 13:06:19.029711817 -0500 +@@ -1,23 +1,31 @@ +-# Add an option to compile & link against system GeoIP ++# Add an option to compile & link against system GeoIP (off by default) + option(BUILD_WITH_GEOIP + "Link InfoWidget plugin against system GeoIP library and use system-wide default GeoIP Country database" +- ON) ++ OFF) + +-if (BUILD_WITH_GEOIP) ++if (WITH_SYSTEM_GEOIP) + find_path(GEOIP_INCLUDE_DIR NAMES GeoIP.h PATHS / ${INCLUDE_INSTALL_DIR}/) +- find_library(GEOIP_LIBRARY NAMES GeoIP PATHS ${LIB_INSTALL_DIR}) ++ find_library(GEOIP_LIBRARY NAMES GeoIP PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) + + if (NOT GEOIP_INCLUDE_DIR OR NOT GEOIP_LIBRARY) +- set(BUILD_WITH_GEOIP OFF CACHE BOOL ++ set(WITH_SYSTEM_GEOIP OFF CACHE BOOL + "GeoIP development files could not be found on this system. Forcing this option to OFF" + FORCE) +- message(WARNING "GeoIP library development files could not be found on your system.") +- else() +- message(STATUS " Linking InfoWidget against system GeoIP library") +- include_directories(${GEOIP_INCLUDE_DIR}) +- set(geoip_link ${GEOIP_LIBRARY}) +- endif() +-endif(BUILD_WITH_GEOIP) ++ message(SEND_ERROR ++ "GeoIP library development files could not be found on your system. Embedding a local copy of GeoIP instead") ++ endif(NOT GEOIP_INCLUDE_DIR OR NOT GEOIP_LIBRARY) ++endif(WITH_SYSTEM_GEOIP) + -+/////////////////////////////////// ++if (WITH_SYSTEM_GEOIP) ++ message(STATUS " Linking InfoWidget against system GeoIP library") ++ add_definitions( -DUSE_SYSTEM_GEOIP ) ++ include_directories(GEOIP_INCLUDE_DIR) ++ set(geoip_link ${GEOIP_LIBRARY}) ++else(WITH_SYSTEM_GEOIP) ++ message(STATUS " Compiling GeoIP support directly into InfoWidget plugin") ++ set(geoip_src GeoIP.c) ++endif(WITH_SYSTEM_GEOIP) + - } ---- ./plugins/infowidget/GeoIP.c.orig 2021-08-15 00:18:01.329498947 -0500 -+++ ./plugins/infowidget/GeoIP.c 2021-08-15 00:18:01.329498947 -0500 + + ktorrent_add_plugin(ktorrent_infowidget) + +@@ -36,19 +44,14 @@ + trackerview.cpp + trackermodel.cpp + addtrackersdialog.cpp ++ ${geoip_src} ++ geoipmanager.cpp + flagdb.cpp + iwfiletreemodel.cpp + iwfilelistmodel.cpp + webseedstab.cpp + webseedsmodel.cpp) + +-if (BUILD_WITH_GEOIP) +- target_sources(ktorrent_infowidget PRIVATE geoipmanager.cpp) +- add_definitions(-DBUILD_WITH_GEOIP=1) +-else() +- add_definitions(-DBUILD_WITH_GEOIP=0) +-endif() +- + ki18n_wrap_ui(ktorrent_infowidget iwprefpage.ui statustab.ui chunkdownloadview.ui trackerview.ui webseedstab.ui) + kconfig_add_kcfg_files(ktorrent_infowidget infowidgetpluginsettings.kcfgc) + +--- ./plugins/infowidget/GeoIP.c.orig 2022-04-22 13:03:03.206722648 -0500 ++++ ./plugins/infowidget/GeoIP.c 2022-04-22 13:03:03.206722648 -0500 @@ -0,0 +1,968 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */ +/* GeoIP.c @@ -1237,238 +1345,130 @@ +{ + return gi->databaseType; +} ---- ./plugins/infowidget/CMakeLists.txt.orig 2021-08-04 21:50:44.000000000 -0500 -+++ ./plugins/infowidget/CMakeLists.txt 2021-08-15 00:20:25.218503074 -0500 -@@ -1,23 +1,30 @@ --# Add an option to compile & link against system GeoIP --option(BUILD_WITH_GEOIP -+# Add an option to compile & link against system GeoIP (off by default) -+option(WITH_SYSTEM_GEOIP - "Link InfoWidget plugin against system GeoIP library and use system-wide default GeoIP Country database" -- ON) -+ OFF) - --if (BUILD_WITH_GEOIP) -+if (WITH_SYSTEM_GEOIP) - find_path(GEOIP_INCLUDE_DIR NAMES GeoIP.h PATHS / ${INCLUDE_INSTALL_DIR}/) -- find_library(GEOIP_LIBRARY NAMES GeoIP PATHS ${LIB_INSTALL_DIR}) -+ find_library(GEOIP_LIBRARY NAMES GeoIP PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) - - if (NOT GEOIP_INCLUDE_DIR OR NOT GEOIP_LIBRARY) -- set(BUILD_WITH_GEOIP OFF CACHE BOOL -+ set(WITH_SYSTEM_GEOIP OFF CACHE BOOL - "GeoIP development files could not be found on this system. Forcing this option to OFF" - FORCE) -- message(WARNING "GeoIP library development files could not be found on your system.") -- else() -- message(STATUS " Linking InfoWidget against system GeoIP library") -- include_directories(GEOIP_INCLUDE_DIR) -- set(geoip_link ${GEOIP_LIBRARY}) -- endif() --endif(BUILD_WITH_GEOIP) -+ message(SEND_ERROR -+ "GeoIP library development files could not be found on your system. Embedding a local copy of GeoIP instead") -+ endif(NOT GEOIP_INCLUDE_DIR OR NOT GEOIP_LIBRARY) -+endif(WITH_SYSTEM_GEOIP) -+ -+if (WITH_SYSTEM_GEOIP) -+ message(STATUS " Linking InfoWidget against system GeoIP library") -+ add_definitions( -DUSE_SYSTEM_GEOIP ) -+ include_directories(GEOIP_INCLUDE_DIR) -+ set(geoip_link ${GEOIP_LIBRARY}) -+else(WITH_SYSTEM_GEOIP) -+ message(STATUS " Compiling GeoIP support directly into InfoWidget plugin") -+ set(geoip_src GeoIP.c) -+endif(WITH_SYSTEM_GEOIP) - - add_library(ktorrent_infowidget MODULE) - -@@ -36,19 +43,14 @@ - trackerview.cpp - trackermodel.cpp - addtrackersdialog.cpp -+ ${geoip_src} -+ geoipmanager.cpp - flagdb.cpp - iwfiletreemodel.cpp - iwfilelistmodel.cpp - webseedstab.cpp - webseedsmodel.cpp) - --if (BUILD_WITH_GEOIP) -- target_sources(ktorrent_infowidget PRIVATE geoipmanager.cpp) -- add_definitions(-DBUILD_WITH_GEOIP=1) --else() -- add_definitions(-DBUILD_WITH_GEOIP=0) --endif() -- - ki18n_wrap_ui(ktorrent_infowidget iwprefpage.ui statustab.ui chunkdownloadview.ui trackerview.ui webseedstab.ui) - kconfig_add_kcfg_files(ktorrent_infowidget infowidgetpluginsettings.kcfgc) +--- ./plugins/infowidget/infowidgetplugin.cpp.orig 2022-04-13 21:50:05.000000000 -0500 ++++ ./plugins/infowidget/infowidgetplugin.cpp 2022-04-22 13:03:03.206722648 -0500 +@@ -18,6 +18,7 @@ ---- ./plugins/infowidget/geoipmanager.h.orig 2021-08-04 21:50:44.000000000 -0500 -+++ ./plugins/infowidget/geoipmanager.h 2021-08-15 00:18:01.330498947 -0500 -@@ -7,7 +7,21 @@ - #define KT_GEOIPMANAGER_H + #include "chunkdownloadview.h" + #include "fileview.h" ++#include "geoipmanager.h" + #include "infowidgetpluginsettings.h" + #include "iwprefpage.h" + #include "monitor.h" +--- ./plugins/infowidget/geoipmanager.cpp.orig 2022-04-13 21:50:05.000000000 -0500 ++++ ./plugins/infowidget/geoipmanager.cpp 2022-04-22 13:03:03.206722648 -0500 +@@ -20,16 +20,47 @@ - #include <QObject> -+#include <QThread> -+#include <QUrl> + namespace kt + { ++QUrl GeoIPManager::geoip_url = QUrl(QStringLiteral("http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz")); + + GeoIPManager::GeoIPManager(QObject *parent) + : QObject(parent) ++ , geo_ip(nullptr) ++ , decompress_thread(nullptr) + { +#ifdef USE_SYSTEM_GEOIP - #include <GeoIP.h> + geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); +#else -+#include "GeoIP.h" ++ geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("geoip.dat")); ++ if (geoip_data_file.isEmpty()) ++ geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("GeoIP.dat")); ++ ++ if (geoip_data_file.isEmpty()) { ++ downloadDataBase(); ++ } else { ++ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0); ++ if (geo_ip) { ++ QFileInfo fi(geoip_data_file); ++ QDateTime now = QDateTime::currentDateTime(); ++ if (fi.lastModified().daysTo(now) >= 30) { ++ // if the last time the geoip file was modified, was more then ++ // 30 days ago, redownload it ++ downloadDataBase(); ++ } ++ } ++ } +#endif + } + + GeoIPManager::~GeoIPManager() + { + if (geo_ip) + GeoIP_delete(geo_ip); + -+class KJob; ++ if (decompress_thread) { ++ decompress_thread->cancel(); ++ decompress_thread->wait(); ++ delete decompress_thread; ++ } + } + + int GeoIPManager::findCountry(const QString &addr) +@@ -56,4 +87,66 @@ + return QString(); + } + ++void GeoIPManager::downloadDataBase() ++{ ++#ifndef USE_SYSTEM_GEOIP ++ Out(SYS_INW | LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url << endl; ++ download_destination = kt::DataDir(CreateIfNotExists) + geoip_url.fileName(); ++ KIO::CopyJob *job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo); ++ connect(job, &KIO::CopyJob::result, this, &GeoIPManager::databaseDownloadFinished); ++#endif ++} + -+namespace bt ++void GeoIPManager::databaseDownloadFinished(KJob *job) +{ -+class DecompressThread; ++ if (job->error()) { ++ Out(SYS_INW | LOG_IMPORTANT) << "Failed to download GeoIP database: " << job->errorString() << endl; ++ return; ++ } ++ ++ if (download_destination.endsWith(QLatin1String(".dat")) || download_destination.endsWith(QLatin1String(".DAT"))) { ++ Out(SYS_INW | LOG_NOTICE) << "GeoIP database downloaded, opening ... " << endl; ++ geoip_data_file = download_destination; ++ if (geo_ip) { ++ GeoIP_delete(geo_ip); ++ geo_ip = nullptr; ++ } ++ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0); ++ if (!geo_ip) ++ Out(SYS_INW | LOG_NOTICE) << "Failed to open GeoIP database " << endl; ++ } else { ++ Out(SYS_INW | LOG_NOTICE) << "GeoIP database downloaded, decompressing ... " << endl; ++ // decompress the file ++ decompress_thread = new bt::DecompressThread(download_destination, kt::DataDir() + QLatin1String("geoip.dat")); ++ connect(decompress_thread, &bt::DecompressThread::finished, this, &GeoIPManager::decompressFinished, Qt::QueuedConnection); ++ decompress_thread->start(QThread::IdlePriority); ++ } +} - - namespace kt - { -@@ -42,8 +56,28 @@ - */ - QString countryCode(int country_id); - -+ /// Get the database URL -+ static QUrl geoIPUrl() -+ { -+ return geoip_url; ++ ++void GeoIPManager::decompressFinished() ++{ ++ Out(SYS_INW | LOG_NOTICE) << "GeoIP database decompressed, opening ... " << endl; ++ if (!decompress_thread->error()) { ++ geoip_data_file = kt::DataDir() + QLatin1String("geoip.dat"); ++ if (geo_ip) { ++ GeoIP_delete(geo_ip); ++ geo_ip = nullptr; ++ } ++ geo_ip = GeoIP_open(QFile::encodeName(geoip_data_file).data(), 0); ++ if (!geo_ip) ++ Out(SYS_INW | LOG_NOTICE) << "Failed to open GeoIP database " << endl; + } + -+ /// Set the database URL -+ static void setGeoIPUrl(const QUrl &url); ++ decompress_thread->wait(); ++ delete decompress_thread; ++ decompress_thread = nullptr; ++} + -+ /// Download the database -+ void downloadDataBase(); ++void GeoIPManager::setGeoIPUrl(const QUrl &url) ++{ ++ geoip_url = url; ++} + -+private Q_SLOTS: -+ void databaseDownloadFinished(KJob *job); -+ void decompressFinished(); ++/////////////////////////////////// + - private: - GeoIP *geo_ip; -+ QString geoip_data_file; -+ QString download_destination; -+ bt::DecompressThread *decompress_thread; -+ static QUrl geoip_url; - }; - - } ---- ./plugins/infowidget/peerviewmodel.cpp.orig 2021-08-04 21:50:44.000000000 -0500 -+++ ./plugins/infowidget/peerviewmodel.cpp 2021-08-15 00:18:01.330498947 -0500 -@@ -13,13 +13,10 @@ - #include <KLocalizedString> - - #include "flagdb.h" -+#include "geoipmanager.h" - #include <interfaces/torrentinterface.h> - #include <util/functions.h> - --#if BUILD_WITH_GEOIP --#include "geoipmanager.h" --#endif -- - using namespace bt; - - namespace kt -@@ -28,12 +25,7 @@ - static bool icons_loaded = false; - static FlagDB flagDB(22, 18); - --PeerViewModel::Item::Item(bt::PeerInterface *peer --#if BUILD_WITH_GEOIP -- , -- GeoIPManager *geo_ip --#endif -- ) -+PeerViewModel::Item::Item(bt::PeerInterface *peer, GeoIPManager *geo_ip) - : peer(peer) - { - stats = peer->getStats(); -@@ -47,13 +39,13 @@ - flagDB.addFlagSource(path + QStringLiteral("/%1/flag.png")); - } - --#if BUILD_WITH_GEOIP -- int country_id = geo_ip->findCountry(stats.ip_address); -- if (country_id > 0) { -- country = geo_ip->countryName(country_id); -- flag = flagDB.getFlag(geo_ip->countryCode(country_id)); -+ if (geo_ip) { -+ int country_id = geo_ip->findCountry(stats.ip_address); -+ if (country_id > 0) { -+ country = geo_ip->countryName(country_id); -+ flag = flagDB.getFlag(geo_ip->countryCode(country_id)); -+ } - } --#endif - } - - bool PeerViewModel::Item::changed() const -@@ -191,10 +183,9 @@ - - PeerViewModel::PeerViewModel(QObject *parent) - : QAbstractTableModel(parent) -+ , geo_ip(nullptr) - { --#if BUILD_WITH_GEOIP - geo_ip = new GeoIPManager(this); --#endif - } - - PeerViewModel::~PeerViewModel() -@@ -204,12 +195,7 @@ - - void PeerViewModel::peerAdded(bt::PeerInterface *peer) - { -- items.append(new Item(peer --#if BUILD_WITH_GEOIP -- , -- geo_ip --#endif -- )); -+ items.append(new Item(peer, geo_ip)); - insertRow(items.count() - 1); - } - ---- ./plugins/infowidget/infowidgetplugin.cpp.orig 2021-08-04 21:50:44.000000000 -0500 -+++ ./plugins/infowidget/infowidgetplugin.cpp 2021-08-15 00:18:01.330498947 -0500 -@@ -18,6 +18,7 @@ - - #include "chunkdownloadview.h" - #include "fileview.h" -+#include "geoipmanager.h" - #include "infowidgetpluginsettings.h" - #include "iwprefpage.h" - #include "monitor.h" ---- ./plugins/infowidget/peerviewmodel.h.orig 2021-08-04 21:50:44.000000000 -0500 -+++ ./plugins/infowidget/peerviewmodel.h 2021-08-15 00:18:01.331498947 -0500 -@@ -61,12 +61,7 @@ - QString country; - QIcon flag; - -- Item(bt::PeerInterface *peer --#if BUILD_WITH_GEOIP -- , -- GeoIPManager *geo_ip --#endif -- ); -+ Item(bt::PeerInterface *peer, GeoIPManager *geo_ip); - - bool changed() const; - QVariant data(int col) const; -@@ -76,9 +71,7 @@ - - private: - QVector<Item *> items; --#if BUILD_WITH_GEOIP -- GeoIPManager *geo_ip = nullptr; --#endif -+ GeoIPManager *geo_ip; - }; - } diff --git a/source/kde/kde/slack-desc/kalendar b/source/kde/kde/slack-desc/kalendar new file mode 100644 index 000000000..410d824f1 --- /dev/null +++ b/source/kde/kde/slack-desc/kalendar @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +kalendar: kalendar (calendar and task management application) +kalendar: +kalendar: Kalendar is a Kirigami-based calendar and task management application +kalendar: that uses Akonadi. It lets you add, edit and delete events and tasks +kalendar: from local and remote accounts of your choice, while keeping changes +kalendar: synchronised across your Plasma desktop or phone. +kalendar: +kalendar: +kalendar: +kalendar: +kalendar: diff --git a/source/kde/kde/slack-desc/skanpage b/source/kde/kde/slack-desc/skanpage new file mode 100644 index 000000000..2a4f8ce7e --- /dev/null +++ b/source/kde/kde/slack-desc/skanpage @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +skanpage: skanpage (scanning program) +skanpage: +skanpage: Skanpage is a multi-page scanning application built using the libksane +skanpage: library and a QML interface. It supports saving to image and PDF +skanpage: files. +skanpage: +skanpage: Homepage: https://invent.kde.org/utilities/skanpage/ +skanpage: +skanpage: +skanpage: +skanpage: diff --git a/source/xfce/xfce4-panel/xfce4-panel.url b/source/xfce/xfce4-panel/xfce4-panel.url index c0fa9d8a8..74f7b6f5c 100644 --- a/source/xfce/xfce4-panel/xfce4-panel.url +++ b/source/xfce/xfce4-panel/xfce4-panel.url @@ -1 +1 @@ -https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.3.tar.bz2 +https://archive.xfce.org/src/xfce/xfce4-panel/4.16/ |