diff -pruN 1.1.2-1/.github/workflows/build-test.yml 1.1.3-0ubuntu1/.github/workflows/build-test.yml --- 1.1.2-1/.github/workflows/build-test.yml 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.3-0ubuntu1/.github/workflows/build-test.yml 2025-07-28 19:53:42.000000000 +0000 @@ -0,0 +1,25 @@ +name: Build Test + +on: [push, pull_request] + +jobs: + build-test: + runs-on: ubuntu-latest + + strategy: + matrix: + distro: + - fedora + - debian + fail-fast: false + + steps: + - name: Get this version + uses: actions/checkout@v4 + + - name: Create Build Environment + run: podman build -t packagekitqt-${{ matrix.distro }} -f tests/ci/Dockerfile-${{ matrix.distro }} . + + - name: Build & Test + run: podman run -t -v `pwd`:/build packagekitqt-${{ matrix.distro }} + ./tests/ci/build-and-test.sh diff -pruN 1.1.2-1/.github/workflows/main.yml 1.1.3-0ubuntu1/.github/workflows/main.yml --- 1.1.2-1/.github/workflows/main.yml 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/.github/workflows/main.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -name: Build and Test - -on: [push, pull_request] - -jobs: - build-test: - runs-on: ubuntu-latest - - strategy: - matrix: - distro: - - fedora - - debian - fail-fast: false - - steps: - - uses: actions/checkout@v2 - - run: docker build -t packagekitqt-${{ matrix.distro }} -f tests/ci/Dockerfile-${{ matrix.distro }} . - - run: docker run -t -v `pwd`:/build packagekitqt-${{ matrix.distro }} ./tests/ci/build-and-test.sh - if: ${{ matrix.distro == 'fedora' }} - - run: docker run -t -v `pwd`:/build packagekitqt-${{ matrix.distro }} ./tests/ci/build-and-test.sh - if: ${{ matrix.distro == 'debian' }} diff -pruN 1.1.2-1/.gitignore 1.1.3-0ubuntu1/.gitignore --- 1.1.2-1/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.3-0ubuntu1/.gitignore 2025-07-28 19:53:42.000000000 +0000 @@ -0,0 +1,4 @@ +build/ +*~ +*.o +*.moc diff -pruN 1.1.2-1/CMakeLists.txt 1.1.3-0ubuntu1/CMakeLists.txt --- 1.1.2-1/CMakeLists.txt 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/CMakeLists.txt 2025-07-28 19:53:42.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0048 NEW) if (POLICY CMP0043) @@ -8,7 +8,7 @@ if (POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() -project(packagekit-qt VERSION 1.1.2) +project(packagekit-qt VERSION 1.1.3) # Used to set installation paths set(CMAKE_AUTOMOC ON) @@ -19,12 +19,12 @@ include(GNUInstallDirs) set(QPACKAGEKIT_API_LEVEL "1") -option(BUILD_WITH_QT6 "Use Qt6 instead of Qt5" OFF) +option(BUILD_WITH_QT5 "Use Qt5 instead of Qt6" OFF) -if(BUILD_WITH_QT6) - set(QT_VERSION_MAJOR 6) -else() +if(BUILD_WITH_QT5) set(QT_VERSION_MAJOR 5) +else() + set(QT_VERSION_MAJOR 6) endif() find_package(Qt${QT_VERSION_MAJOR} 5.10 REQUIRED COMPONENTS Core DBus) diff -pruN 1.1.2-1/NEWS 1.1.3-0ubuntu1/NEWS --- 1.1.2-1/NEWS 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/NEWS 2025-07-28 19:53:42.000000000 +0000 @@ -1,3 +1,17 @@ +Version 1.1.3 +~~~~~~~~~~~~~ +Released: 2025-07-28 + +Features: + * Add new GetResult* methods of the Offline interface (Gleb Popov) + +Bugfixes: + * Bump cmake version (Matthias Klumpp) + +Miscellaneous: + * Build with Qt6 by default, instead of Qt5 (Matthias Klumpp) + * ci: Modernize & update distro versions (Matthias Klumpp) + Version 1.1.2 ~~~~~~~~~~~~~ Released: 2024-06-16 diff -pruN 1.1.2-1/README.md 1.1.3-0ubuntu1/README.md --- 1.1.2-1/README.md 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/README.md 2025-07-28 19:53:42.000000000 +0000 @@ -1,6 +1,8 @@ # PackageKit-Qt Qt bindings for PackageKit +[![Build Test](https://github.com/PackageKit/PackageKit-Qt/actions/workflows/build-test.yml/badge.svg)](https://github.com/PackageKit/PackageKit-Qt/actions/workflows/build-test.yml) + ## PackageKit PackageKit is a DBUS abstraction layer that allows the session user to manage packages in a secure way using a cross-distro, cross-architecture API. diff -pruN 1.1.2-1/RELEASE 1.1.3-0ubuntu1/RELEASE --- 1.1.2-1/RELEASE 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.3-0ubuntu1/RELEASE 2025-07-28 19:53:42.000000000 +0000 @@ -0,0 +1,48 @@ +PackageKit-Qt Release Notes + +1. Write NEWS entries for PackageKit-Qt in the same format as usual. + +git shortlog v1.1.2.. | grep -i -v trivial | grep -v Merge > NEWS.new + +-------------------------------------------------------------------------------- +Version 1.1.3 +~~~~~~~~~~~~~ +Released: 2024-xx-xx + +Notes: + +Features: + +Bugfixes: +-------------------------------------------------------------------------------- + +2. Update library version if new ABI or API in CMakeLists.txt + +3. Commit changes in PackageKit-Qt git: + +git commit -a -m "Release version 1.1.3" +git tag -s -f -m "Release 1.1.3" v1.1.3 + +git push --tags && git push + +4. run './release.sh --version=1.1.3 --git-tag=v1.1.3 --sign' + +5. Upload tarball to: + +scp *.tar.* annarchy.freedesktop.org:/srv/www.freedesktop.org/www/software/PackageKit/releases/ + +6. Do post release version bump in CMakeLists.txt, RELEASE + +7. Commit trivial changes: + +git commit -a -m "trivial: post release version bump" +git push + +8. Send an email to packagekit@lists.freedesktop.org + +================================================= +PackageKit-Qt 1.1.3 released! + +Tarballs available here: https://www.freedesktop.org/software/PackageKit/releases/ + +================================================= diff -pruN 1.1.2-1/debian/changelog 1.1.3-0ubuntu1/debian/changelog --- 1.1.2-1/debian/changelog 2024-06-16 15:48:26.000000000 +0000 +++ 1.1.3-0ubuntu1/debian/changelog 2025-10-17 11:44:07.000000000 +0000 @@ -1,3 +1,10 @@ +packagekit-qt (1.1.3-0ubuntu1) resolute; urgency=medium + + * New upstream release (1.1.3) + * Force Qt5 build ON now that Qt6 is the default. + + -- Rik Mills Fri, 17 Oct 2025 12:44:07 +0100 + packagekit-qt (1.1.2-1) unstable; urgency=medium * New upstream version: 1.1.2 diff -pruN 1.1.2-1/debian/control 1.1.3-0ubuntu1/debian/control --- 1.1.2-1/debian/control 2024-05-25 19:46:13.000000000 +0000 +++ 1.1.3-0ubuntu1/debian/control 2025-10-17 11:44:07.000000000 +0000 @@ -1,7 +1,8 @@ Source: packagekit-qt Section: libs Priority: optional -Maintainer: Matthias Klumpp +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Matthias Klumpp Uploaders: Aurélien COUDERC Build-Depends: cmake (>= 3.2), debhelper-compat (= 13), diff -pruN 1.1.2-1/debian/rules 1.1.3-0ubuntu1/debian/rules --- 1.1.2-1/debian/rules 2024-05-25 19:35:40.000000000 +0000 +++ 1.1.3-0ubuntu1/debian/rules 2025-09-25 15:43:49.000000000 +0000 @@ -8,7 +8,7 @@ QPK_CONFIGURE_ARGS = dh $@ --with kf5,pkgkde_symbolshelper override_dh_auto_configure: - dh_auto_configure --buildsystem=kf5 -- $(QPK_CONFIGURE_ARGS) + dh_auto_configure --buildsystem=kf5 -- $(QPK_CONFIGURE_ARGS) -DBUILD_WITH_QT5=ON dh_auto_configure --buildsystem=kf6 --builddirectory=build-qt6 -- $(QPK_CONFIGURE_ARGS) -DBUILD_WITH_QT6=ON override_dh_auto_build: diff -pruN 1.1.2-1/release.sh 1.1.3-0ubuntu1/release.sh --- 1.1.2-1/release.sh 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.3-0ubuntu1/release.sh 2025-07-28 19:53:42.000000000 +0000 @@ -0,0 +1,71 @@ +#!/bin/bash +# +# Create QPK release tarball from version control system +# +# (c) 2011 Matthias Klumpp +# GPLv2+ +set -e +OPTION_SPEC="version:,git-tag:,sign" +PARSED_OPTIONS=$(getopt -n "$0" -a -o h --l "$OPTION_SPEC" -- "$@") + +eval set -- "$PARSED_OPTIONS" + +if [ $? != 0 ] ; then usage ; exit 1 ; fi + +while true ; do + case "$1" in + --version ) case "$2" in + "") echo "version parameter needs an argument!"; exit 3 ;; + *) export QPK_VERSION=$2 ; shift 2 ;; + esac ;; + --git-tag ) case "$2" in + "") echo "git-tag parameter needs an argument!"; exit 3 ;; + *) export GIT_TAG=$2 ; shift 2 ;; + esac ;; + --sign ) SIGN_RELEASE=1; shift; ;; + --) shift ; break ;; + * ) echo "ERROR: unknown flag $1"; exit 2;; + esac +done + +if [ "$QPK_VERSION" = "" ]; then + echo "No PackageKit-Qt version set!" + exit 1 +fi +if [ "$GIT_TAG" = "" ]; then + echo "No Git tag set!" + exit 1 +fi + +rm -rf ./release-tar-tmp + +# check if we can build PackageKit-Qt +rm -rf ./t-build-release +mkdir -p ./t-build-release +cmake -B ./t-build-release -DMAINTAINER=ON +make -C ./t-build-release clean all +rm -rf ./t-build-release + +mkdir -p ./release-tar-tmp +git archive --prefix="PackageKit-Qt-$QPK_VERSION/" "$GIT_TAG^{tree}" | tar -x -C ./release-tar-tmp + +R_ROOT="./release-tar-tmp/PackageKit-Qt-$QPK_VERSION" + +# cleanup files which should not go to the release tarball +find ./release-tar-tmp -name .gitignore -type f -delete +rm $R_ROOT/release.sh +rm $R_ROOT/RELEASE + +# create release tarball +cd ./release-tar-tmp +tar cvJf "PackageKit-Qt-$QPK_VERSION.tar.xz" "./PackageKit-Qt-$QPK_VERSION/" +mv "PackageKit-Qt-$QPK_VERSION.tar.xz" ../ +cd .. + +# cleanup +rm -r ./release-tar-tmp + +# sign release, if flag is set +if [ "$SIGN_RELEASE" = "1" ]; then + gpg --armor --sign --detach-sig "PackageKit-Qt-$QPK_VERSION.tar.xz" +fi diff -pruN 1.1.2-1/src/offline.cpp 1.1.3-0ubuntu1/src/offline.cpp --- 1.1.2-1/src/offline.cpp 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/src/offline.cpp 2025-07-28 19:53:42.000000000 +0000 @@ -131,6 +131,18 @@ QDBusPendingReply<> Offline::triggerUpgr return QDBusConnection::systemBus().asyncCall(msg, 24 * 60 * 1000 * 1000); } +QDBusPendingReply Offline::getResults() +{ + // Manually invoke dbus because the qdbusxml2cpp does not allow + // setting the ALLOW_INTERACTIVE_AUTHORIZATION flag + auto msg = QDBusMessage::createMethodCall(PK_NAME, + PK_PATH, + PK_OFFLINE_INTERFACE, + QStringLiteral("GetResults")); + msg.setInteractiveAuthorizationAllowed(true); + return QDBusConnection::systemBus().asyncCall(msg, 24 * 60 * 1000 * 1000); +} + QDBusPendingReply<> Offline::cancel() { // Manually invoke dbus because the qdbusxml2cpp does not allow diff -pruN 1.1.2-1/src/offline.h 1.1.3-0ubuntu1/src/offline.h --- 1.1.2-1/src/offline.h 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/src/offline.h 2025-07-28 19:53:42.000000000 +0000 @@ -24,6 +24,8 @@ #include #include +#include + #include namespace PackageKit { @@ -100,6 +102,11 @@ public: QDBusPendingReply<> triggerUpgrade(Action action); /** + * Returns the information about the last offline action performed. + */ + QDBusPendingReply getResults(); + + /** * Cancels the offline update so the next boot procceeds as normal. */ QDBusPendingReply<> cancel(); diff -pruN 1.1.2-1/tests/ci/Dockerfile-debian 1.1.3-0ubuntu1/tests/ci/Dockerfile-debian --- 1.1.2-1/tests/ci/Dockerfile-debian 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/tests/ci/Dockerfile-debian 2025-07-28 19:53:42.000000000 +0000 @@ -1,17 +1,18 @@ -FROM debian:bullseye - -# allow fetching source packages -RUN echo "deb-src http://deb.debian.org/debian/ bullseye main" >> /etc/apt/sources.list +FROM debian:trixie # prepare RUN apt-get update -qq -# install build essentials -RUN apt-get install -yq build-essential +# install essentials +RUN apt-get install -yq eatmydata build-essential -# install PackageKit-Qt dependencies -RUN apt-get build-dep -yq packagekit-qt -RUN apt-get install -yq cmake ninja-build +# install build dependencies +RUN eatmydata apt-get install -yq --no-install-recommends \ + cmake \ + ninja-build \ + packagekit \ + pkgconf \ + qt6-base-dev # finish RUN mkdir /build diff -pruN 1.1.2-1/tests/ci/Dockerfile-fedora 1.1.3-0ubuntu1/tests/ci/Dockerfile-fedora --- 1.1.2-1/tests/ci/Dockerfile-fedora 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/tests/ci/Dockerfile-fedora 2025-07-28 19:53:42.000000000 +0000 @@ -1,4 +1,4 @@ -FROM fedora:31 +FROM fedora:42 RUN dnf -y update RUN dnf -y install dnf-plugins-core libdnf-devel redhat-rpm-config cmake gcc-c++ ninja-build diff -pruN 1.1.2-1/tests/ci/build-and-test.sh 1.1.3-0ubuntu1/tests/ci/build-and-test.sh --- 1.1.2-1/tests/ci/build-and-test.sh 2024-06-16 15:35:14.000000000 +0000 +++ 1.1.3-0ubuntu1/tests/ci/build-and-test.sh 2025-07-28 19:53:42.000000000 +0000 @@ -4,11 +4,20 @@ set -e if [ -d "build" ]; then rm build -rf fi -cmake -S . -B build -GNinja -DMAINTAINER:BOOL=ON $@ +set -x + +cmake -S . -B build -GNinja \ + -DMAINTAINER:BOOL=ON \ + $@ # Build, Test & Install cmake --build build + ## No tests yet #cd build && ctest && cd - -DESTDIR=/tmp/install_root/ cmake --install build +DUMMY_DESTDIR=/tmp/install-root/ +rm -rf $DUMMY_DESTDIR + +# Test installation +DESTDIR=$DUMMY_DESTDIR cmake --install build