[neon/backports-jammy/packagekit-qt/Neon/unstable] /: New upstream version 1.0.2
Matthias Klumpp
null at kde.org
Wed Mar 15 04:29:33 GMT 2023
Git commit 26d351e7edff67a968bb13f1bdaf0c249718accb by Matthias Klumpp.
Committed on 20/02/2020 at 22:56.
Pushed by carlosdem into branch 'Neon/unstable'.
New upstream version 1.0.2
D +0 -4 .gitignore
M +5 -4 CMakeLists.txt
M +31 -0 NEWS
D +0 -49 RELEASE
D +0 -69 release.sh
M +12 -5 src/daemon.h
M +2 -2 src/packagekitqt5.pc.in
M +4 -1 src/transaction.cpp
M +4 -4 src/transaction.h
M +4 -1 src/transactionprivate.cpp
https://invent.kde.org/neon/backports-jammy/packagekit-qt/commit/26d351e7edff67a968bb13f1bdaf0c249718accb
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b92d68d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build/
-*~
-*.o
-*.moc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f94a1fa..08787de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.2)
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.0.1)
+project(packagekit-qt VERSION 1.0.2)
# Used to set installation paths
set(CMAKE_AUTOMOC ON)
@@ -56,14 +56,15 @@ set (LOCALSTATEDIR "/var")
set (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/packagekitqt5/")
add_definitions("-DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"")
+set (CMAKE_CXX_STANDARD 11)
configure_file(config.h.in ${CMAKE_BINARY_DIR}/config.h)
#
# Custom C flags
#
-option (DISABLE_MAINTAINER_CFLAGS "Disable maintainer CFlags" ON)
-if (NOT DISABLE_MAINTAINER_CFLAGS)
+option (MAINTAINER "Enable maintainer CFlags" OFF)
+if (MAINTAINER)
set (MAINTAINER_CFLAGS "-Werror -Wall -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self")
add_definitions(${MAINTAINER_CFLAGS})
endif ()
diff --git a/NEWS b/NEWS
index ad18902..21a43da 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+Version 1.0.2
+~~~~~~~~~~~~~
+Released: 2020-02-20
+
+Bugfixes:
+ * Fix documentation (Aleix Pol)
+ * Fix pkg-config include path (Matthias Klumpp)
+ * Fix some documentation typos (Pekka Vuorela)
+ * Make sure the build is done as c++11 (Pekka Vuorela)
+ * Map DBusError::AccessDenied to Transaction::ErrorNotAuthorized (Raine Makelainen)
+
+Version 1.0.1
+~~~~~~~~~~~~~
+Released: 2018-01-16
+
+Bugfixes:
+ * Fix typo
+ * Fix class export
+
+Version 1.0.0
+~~~~~~~~~~~~~
+Released: 2018-01-12
+
+Features:
+ * Full Offline interface support
+
+Bugfixes:
+ * Added missing enums
+ * Faster package-id parser
+ * Removed deprecated methods
+
Version 0.9.6
~~~~~~~~~~~~~
Released: 2016-09-20
diff --git a/RELEASE b/RELEASE
deleted file mode 100644
index bda64c5..0000000
--- a/RELEASE
+++ /dev/null
@@ -1,49 +0,0 @@
-PackageKit-Qt Release Notes
-
-1. Write NEWS entries for PackageKit-Qt in the same format as usual.
-
-git shortlog QPACKAGEKIT_0_9_6.. | grep -i -v trivial | grep -v Merge > NEWS.new
-
---------------------------------------------------------------------------------
-Version 0.9.7
-~~~~~~~~~~~~~
-Released: 2014-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 0.9.7"
-git tag -s -f -m "Release 0.9.7" QPACKAGEKIT_0_9_7
-<gpg password>
-git push --tags
-git push
-
-4. run './release.sh --version=0.9.7 --git-tag=QPACKAGEKIT_0_9_7 --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 at lists.freedesktop.org
-
-=================================================
-PackageKit-Qt 0.9.7 released!
-
-Tarballs available here: http://www.packagekit.org/releases/
-
-=================================================
diff --git a/release.sh b/release.sh
deleted file mode 100755
index f67ab1b..0000000
--- a/release.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/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
-mkdir -p ./t-build-release
-make -C ./build 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 --git a/src/daemon.h b/src/daemon.h
index 607d32c..449cf17 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -184,7 +184,7 @@ public:
* Allows a client to find out if it would be allowed to authorize an action.
* The action ID, e.g. org.freedesktop.packagekit.system-network-proxy-configure
* specified in \p actionId
- * Returm might be either yes, no or interactive \sa Authorize.
+ * Return might be either yes, no or interactive \sa Authorize.
*/
static QDBusPendingReply<Authorize> canAuthorize(const QString &actionId);
@@ -384,8 +384,11 @@ public:
* Gets more details about the given \p files
*
* \sa Transaction::details
- * \note This method emits \sa package()
- * with details set
+ * \note this method emits:
+ * \li details()
+ * \li status()
+ * \li progress()
+ * \li error()
*
* \warning check \sa errorCode() signal to know if it the call has any error
*/
@@ -395,8 +398,12 @@ public:
* Gets more details about the given \p file
*
* \sa Transaction::details
- * \note This method emits \sa package()
- * with details set
+ *
+ * \note this method emits:
+ * \li details()
+ * \li status()
+ * \li progress()
+ * \li error()
*
* \warning check \sa errorCode() signal to know if it the call has any error
*/
diff --git a/src/packagekitqt5.pc.in b/src/packagekitqt5.pc.in
index 7d896e4..0bf324c 100644
--- a/src/packagekitqt5.pc.in
+++ b/src/packagekitqt5.pc.in
@@ -4,8 +4,8 @@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: @LIBNAME@
-Description: PackageKit is a system daemon for installing stuff.
+Description: PackageKit is a package management abstraction layer.
Version: @PROJECT_VERSION@
Requires: Qt5Core, Qt5DBus
Libs: -L${libdir} -lpackagekitqt5
-Cflags: -I${includedir}/packagekitqt5/PackageKit
+Cflags: -I${includedir}/packagekitqt5
diff --git a/src/transaction.cpp b/src/transaction.cpp
index 4b717a0..a17b93e 100644
--- a/src/transaction.cpp
+++ b/src/transaction.cpp
@@ -46,7 +46,10 @@ Transaction::Transaction()
{
QDBusPendingReply<QDBusObjectPath> reply = *call;
if (reply.isError()) {
- errorCode(Transaction::ErrorInternalError, reply.error().message());
+ QDBusError error = reply.error();
+ Transaction::Error transactionError = error.type() == QDBusError::AccessDenied ? Transaction::ErrorNotAuthorized
+ : Transaction::ErrorInternalError;
+ errorCode(transactionError, error.message());
d->finished(Transaction::ExitFailed, 0);
d->destroy();
} else {
diff --git a/src/transaction.h b/src/transaction.h
index 71c9fcc..6f9e312 100644
--- a/src/transaction.h
+++ b/src/transaction.h
@@ -508,9 +508,9 @@ public:
bool allowCancel() const;
/**
- * Indicates weither the transaction caller is active or not
+ * Indicates whether the transaction caller is active or not
*
- * The caller can be inactive if it has quitted before the transaction finished.
+ * The caller can be inactive if it has quit before the transaction finished.
*
* \return true if the caller is active, false else
*/
@@ -583,7 +583,7 @@ public:
QDateTime timespec() const;
/**
- * Returns weither the transaction succeded or not
+ * Returns whether the transaction succeded or not
* \return true if the transaction succeeded, false else
* \note This function only returns a real value for old transactions returned by getOldTransactions
*/
@@ -597,7 +597,7 @@ public:
uint duration() const;
/**
- * Returns some data set by the backend to pass additionnal information
+ * Returns some data set by the backend to pass additional information
* \return a string set by the backend
* \note This function only returns a real value for old transactions returned by getOldTransactions
*/
diff --git a/src/transactionprivate.cpp b/src/transactionprivate.cpp
index 8a40f4c..38a4db6 100644
--- a/src/transactionprivate.cpp
+++ b/src/transactionprivate.cpp
@@ -193,7 +193,10 @@ void TransactionPrivate::runQueuedTransaction()
q, [this, q] (QDBusPendingCallWatcher *call) {
QDBusPendingReply<> reply = *call;
if (reply.isError()) {
- q->errorCode(Transaction::ErrorInternalError, reply.error().message());
+ QDBusError error = reply.error();
+ Transaction::Error transactionError = error.type() == QDBusError::AccessDenied ? Transaction::ErrorNotAuthorized
+ : Transaction::ErrorInternalError;
+ q->errorCode(transactionError, error.message());
finished(Transaction::ExitFailed, 0);
destroy();
}
More information about the Neon-commits
mailing list