From 466fe0b18ffd82aa9cb04e39fef3080af0a9cf29 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 25 Sep 2016 14:12:36 +0200 Subject: [PATCH] Cherry-picking upstream release 0.11.0. * Bumped compat to 10 * Bumped minimum version debhelper (>= 10) * Bumped minimum version libqtxdg-dev (>= 2.0.0) * Bumped minimum version libqt5xdgiconloader-dev (>= 2.0) * Bumped build dependency liblxqt-dev (>= 0.11.0) * Added build dependency libqt5svg5-dev * Removed --parallel from rules, standard in compat 10 --- .gitignore | 2 + CHANGELOG | 180 ++++++++++++++++++ README.md | 32 +++- .../lxqt-config-notificationd_ca.desktop | 4 + debian/changelog | 13 ++ debian/control | 9 +- debian/gbp.conf | 2 +- debian/rules | 3 +- 8 files changed, 233 insertions(+), 12 deletions(-) create mode 100644 .gitignore create mode 100644 CHANGELOG create mode 100644 config/translations/lxqt-config-notificationd_ca.desktop diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..290b958 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +build +*/translations/lxqt-notificationd diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..d396fda --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,180 @@ + +lxqt-notificationd-0.11.0 / 2016-09-24 +====================================== + + * Update and extend README.md + * Add Catalan translation + * build: Use external translations + * ts-files removal (#50) + * Clean up qDebugs/comments in notification.cpp + * config: Use our specific icon for demo + * Fix used licenses in AUTHORS, lxqt-notificationd is pure LGPL Bump year in AUTHORS + * Italian translation update + * Updated Russian translation Removed ru_RU files + * notification: Default icon + * notification: Fill background + * update lxqt-config-notificationd_hu.ts + * Update lxqt-config-notificationd_it.ts + +0.10.0 / 2015-10-31 +=================== + + * Update translations + * Remove docs/notification-spec-latest.html in favour of an upstream link + * Fix license file + * Switch all connect() calls to the new-style syntax + * Handle clicks on text labels properly (workaround for QTBUG-49025) + * Don't force rich text formatting on app, summary and body labels. + * Fix and improve action buttons. + * lxqt-config-notificationd: Fix Advanced Settings Ui Layout + * OnlyShowIn=LXQt; + * Update Greek (el) translation Remove country variant from language code + * Rename LxQt to LXQt everywhere + * Handles CMake policy CMP0063 + * Use the LXQtCompilerSettings CMake module + * Adds Runtime install COMPONENT + * Coding style changes + * Use GNUInstallDirs + * Use CMAKE_AUTOUIC, drop qt5_wrap_ui() + * Removes unneeded include_directories() entries + * Updated german translation. + * Updated template for new translations. + * Updates the build system to use the Targets infrastructure + * fix building + * Remove trailing whitespaces + * Replace LXDE-Qt with LXQt in documentation/comment + * lxqt_translate_ts: Fixes wrong argument position + * config-nototification_hu.ts modified + *_hu.ts added + * Hungarian translatons + * Update lxqt-config-notificationd_it.desktop + * Create lxqt-config-notificationd_it.ts + * Create lxqt-config-notificationd_hr.ts + * Fix image format for images with 3 channels + * Easier selection of notifications stop + * Fix notifications disappearing on mouse leave + * lxqt-config-notificationd_fr_FR.desktop: french translation update + * notification: set fixed width of text labels for correct sizeHint after setText + * config: more options to configure notification placement (added center ver/hor) + * Fix Russian duplicated entries on .desktop files + * Update lxqt-config-notificationd_it_IT.desktop + * notification: multilined plain text formatting + * Remove KF5/ prefix as done in lxde/liblxqt#36 + * settings: possibility to configure more than 99s shown time + * Unified german translation + * Updated german translation + * Added german translation. + +0.9.0 / 2015-01-06 +================== + + * Portuguese language update + * Fix typos in tests + * - Unify naming for a unique lxqt. No more suffixes + * Add icon to config window + * Use the new LxQt::SingleApplication + * CMakeLists.txt maintenance. + * fix a translation mistake for zh_CN + * Uses the new translations cmake modules + * Update Russian translation + * Display a clearer test notification right after changing the settings + * Notifications must not cover the panel. Fixes lxde/lxde-qt#315. + * Port to KWindowSystem + * Update deprecated dbus annotation + * Use lxqt.org as vendor + * Drop Qt4 support in code + * Clean up CMakeLists.txt and drop Qt 4 support + +0.8.0 / 2014-10-13 +================== + + * Adapt to the translation infrastructure + * Fix xde/lxde-qt #67 - Notifications are shown in the wrong location. + * Make the notification stay on top, fix bug lxde/lxde-qt #6 - Notifications show up under calendar plugin. + * Cleanup for Qt5 ready includes + * Use cmake 2.8.9 by default and use 2.8.11 for qt5. * Simplify qt5 support. + * Initial Qt5 support. + * Use new LXQt header files. + * Swap Spacing and Width + +0.7.0 / 2014-05-07 +================== + + * Update COPYING + +0.6.99 / 2014-04-30 +=================== + + * remove old templates from translations remove icon translations from desktop file translations + * Style fixes to the advanced config + * Update AUTHORS + * Add CPack rules for creating tarball + * Rename main window to Desktop Notifications + * Better wording in desktop files + * fixed: worng (and debug) qlabel color qss; moving bottom-left notification out of screen in some conditions + * Removed CMAKE_SOURCE_DIR usage from CMakeLists.txt files + * Add a dirty hack to workaround repainting issues and fix razor-qt bug 536. See https://github.com/Razor-qt/razor-qt/issues/536 for details. + * Use the correct updated org.freedesktop.Notifications.xml file from razor-resources. + * Fix renaming bugs, replacing lxqt-qt with lxde-qt + * Finish the crazy razor=>lxqt renaming tasks. + * rename razor to lxqt in strings + * Add missing files. + * Rename binaries and replace razor with lxqt. * Use the latest liblxqt and libqtxdg. + * Add COPYING and AUTHORS + * X-RAZOR changed to Razor in desktop files + * fixed #611 Notifications HTML rendering and buttons versus combo-box + * Set foreground colors for dark themes + * Fix CMakeLists.txt for 'Unknown CMake command "razor_translate_ts"' + * Translations updated + * first part of fixes based on Coverity Scan (code static analysis) + * Generate translation files + * Fix components missing translations + * Delete bad en_GB translations + * Update translations + * Translations updated + * Replace

tag with newlines since it's not valid notification markup + * notifications: fix button/combobox displaying for actions (stringlist should be checked divided by 2) + * Translations + * Deleted old translation methods. + * notifications: do not grow height in time (after days of use we were getting higher notification widgets) + * fixed #383 Identical notifications get increasingly large + * New translation infrastructure + * notification, dbus: no need for ReloadSettings anymore because it works out of the box now + * Fix variable (Issue #387) + * Fix for Issue #290 Fails to build on BSD + * fixed #324 Add a notification queue + * Fix for fix for commit 1c31b24 "compiles with qt 4.6.x as well" + * Fix for commit 1c31b24f3b43de5d6fb82f26e41d1a183d0c61e0 "compiles with qt 4.6.x as well" + * compiles with qt 4.6.x as well + * ad #329 - default actions and docs + * part of #329: on-click on notification launces default action or it tries to find appropariate window to raise; xfitman method renamed + one new + * don't display summary if its content equals appLabel + * issue #325: do not display default app icon if there is no icon found for notification + * fixed #327 Focused notifications should not time out + * suggestion for #325 - notifications are much smaller now. And it can be set to use smaller fornt in theme as well + * Add warning if a different notifications daemon is running + * Fix for #308 + * notifications: devel docs + * notifications: settings are synced with config tool (dbus); layouting fixes + * razorqt-notificationd: Fix the placement restore configuration Ui + * Add Hints support + * Add license headers + * notification icon fix + * proper actions handling + * notification widget expands as required + * notif: final fix for signals and slots + * notif. config: do not limit notification to 99px by default + * notiications test app + * port icon code for qt4.6.x + * Fix issue 308 Calling setMinimumSize and setMaximumSize when widget is not shown will do nothing + * slot name fix + * fixed action handling + * Let CMake generate the adaptor + * Add use parts of razor-runner theme for notifications + * Fix .desktop file generation + * notifications: vrious fixes; more options (hardcoded values removed); layouting + * fixes; begin of movabe notifications + * config app for notifications + * xdg notification actions implemented + * notifications: razorapplication used (theming); qtxdg used; spec icon loading implemented + * new notification solution (initial import) diff --git a/README.md b/README.md index ddcd8a6..677cda4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,33 @@ # lxqt-notificationd -The LXQt Notification daemon +## Overview -## Spec +`lxqt-notificationd` is LXQt's implementation of a daemon according to the [Desktop Notifications Specification](https://developer.gnome.org/notification-spec/). -lxqt-notificationd follows the Desktop Notifications Specification version 1.2. +This specification defines a way to display notifications in pop-up windows on desktops. Notifications like this are e. g. frequently used by chat or mail clients to inform about incoming messages, by media players to indicate the beginning of another track but also by the desktop environment itself to indicate volume changes or similar. -It can be found here: +lxqt-notificationd is comprising binaries `lxqt-notificationd` and `lxqt-config-notificationd`. +`lxqt-notificationd` is running in a daemon-like manner as so-called [LXQt Module](https://github.com/lxde/lxqt-session#lxqt-modules) and doing the actual work. GUI "Desktop Notifications", binary `lxqt-config-notificationd`, is used to customize the notifications. -* https://people.gnome.org/~mccann/docs/notification-spec/notification-spec-latest.html +lxqt-notificationd is implementing version 1.2 of the said specification. + +## Installation + +### Compiling source code + +Runtime dependencies are KWindowSystem, [liblxqt](https://github.com/lxde/liblxqt) and [lxqt-common](https://github.com/lxde/lxqt-common). +Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. + +Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems. + +To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual. + +### Binary packages + +Official binary packages are provided by all major Linux distributions like Arch Linux, Debian (as of Debian stretch only), Fedora and openSUSE. Just use your package manager to search for string `lxqt-notificationd`. + +## Configuration, Usage + +As `lxqt-notificationd` is run as LXQt Module it can be adjusted from section "Basic Settings" in configuration dialogue [LXQt Session Settings](https://github.com/lxde/lxqt-session#lxqt-session-settings) of [lxqt-session](https://github.com/lxde/lxqt-session). + +Configuration dialogue "Desktop Notifications" (binary `lxqt-config-notificationd`) which is used to customize notifications can be opened from the panel's main menu - Preferences - LXQt Settings - Desktop Notifications and is provided by the [Configuration Center](https://github.com/lxde/lxqt-config#configuration-center) of [lxqt-config](https://github.com/lxde/lxqt-config) as well. diff --git a/config/translations/lxqt-config-notificationd_ca.desktop b/config/translations/lxqt-config-notificationd_ca.desktop new file mode 100644 index 0000000..d79fcbd --- /dev/null +++ b/config/translations/lxqt-config-notificationd_ca.desktop @@ -0,0 +1,4 @@ +# Translations +Name[ca]=Notificacions de l'escriptori +GenericName[ca]=Ajusts de les notificacions de LXQt +Comment[ca]=Configureu les notificacions de l'escriptori diff --git a/debian/changelog b/debian/changelog index 07f2673..5c00c8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +lxqt-notificationd (0.11.0-1) experimental; urgency=medium + + * Cherry-picking upstream release 0.11.0. + * Bumped compat to 10 + * Bumped minimum version debhelper (>= 10) + * Bumped minimum version libqtxdg-dev (>= 2.0.0) + * Bumped minimum version libqt5xdgiconloader-dev (>= 2.0) + * Bumped build dependency liblxqt-dev (>= 0.11.0) + * Added build dependency libqt5svg5-dev + * Removed --parallel from rules, standard in compat 10 + + -- Alf Gaida Sun, 25 Sep 2016 14:13:20 +0200 + lxqt-notificationd (0.10.96~11-g0a0a1d5-1) experimental; urgency=medium * Cherry-picking upstream version 0.10.96~11-g0a0a1d5. diff --git a/debian/control b/debian/control index 19d6577..990f9d9 100644 --- a/debian/control +++ b/debian/control @@ -8,17 +8,18 @@ Priority: optional Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.10.96~), + liblxqt0-dev (>= 0.11.0), + libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.1~), - libqt5xdgiconloader-dev (>= 1.3.1~), + libqt5xdg-dev (>= 2.0.0), + libqt5xdgiconloader-dev (>= 2.0.0), libx11-dev, pkg-config, qtbase5-private-dev, qttools5-dev, qttools5-dev-tools Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/lxqt-notificationd.git/?h=debian/experimental +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-notificationd.git/?h=debian/experimental Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-notificationd.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-notificationd diff --git a/debian/gbp.conf b/debian/gbp.conf index 7a9f00a..ffe50a8 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/sid +debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True diff --git a/debian/rules b/debian/rules index 5858ca7..9dbedc2 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh ${@} --buildsystem cmake\ - --parallel + dh ${@} --buildsystem cmake override_dh_auto_configure: dh_auto_configure -- \