SHA256
1
0
forked from pool/liblxqt

Accepting request 535966 from X11:LXQt

- Update to 0.12.0:
  * Bump minimum qtxdg version to 3.1.0
  * Don't export github templates
  * Bump version and needed versions to the final values
  * lxqtpower: Allow disabling of lxqt-session provider
  * Drops Qt5Core_VERSION_STRING
  * HtmlDelegate: Fix sizeHint() computation
  * Add some comments about the meaning of versions
  * Move LXQt version back to liblxqt
  * Fixes (#118)
  * lxqtapplication: Avoid wrong signal handling
  * Removes unneeded semicolon in namespace definition
  * Fix format conversions [-Wformat-pedantic] warnings
  * Suppress compiler warnings about unused function parameters
  * Removes extra semicolons in Qt's Q macros
  * Translator: Prefer XDG_DATA_DIRS over compiled in path
  * Help the compiler optimizing loops
  * Use const variables where possible
  * Update AUTHORS
- Remove liblxqt-0.11.1-allow-disabl-lxqt-session.patch:
  contained in upstream
- boo#1044483:
  * Add liblxqt-0.11.1-allow-disabl-lxqt-session.patch
    to allow disabling of lxqt-session
- Update to 0.11.1:
  * Bump needed build tools version (#113)
  * build: Enable/disable WITH_XDG_DIRS_FALLBACK based on Qt version (#111)
  * Updates lxqt-build-tools required version
  * Adds a CMake minimum version requirement to the -config.cmake
  * Refactors superbuild support
  * Adds PROJECT_NAME to the build with Qt version message
  * Pack target_compile_definitions() and target_include_directories()
  * Adds PROJECT_NAME to the build with Qt version message
  * Pack target_compile_definitions() and target_include_directories()
  * Use the LXQtConfigVars module
  * Make liblxqt depend on lxqt-build-tools
  * Use the lxqt-build-tools LXQtCreatePortableHeaders
  * Use the new LXQt Build Tools package
  * Sets a minimum Qt5Xdg required version
  * Adds minimum Qt version requirement (5.4.2)
  * Remove cpack (#107)
- Update descriptions. Drop seemingly unneeded Provides: liblxqt.
  Own all directories.
- Update to 0.11.0:
  * Bump version ot 0.11.0 (#105)
  * Settings: Make use of reverse_iterator conditional
  * Application: Add <cerrno> include
  * Settings: Add "homemade" XDG_CONFIG_DIRS support
  * Settings: unify duplicated code
  * Add README.md
  * translations: Change default translations repository
  * Update DBus Notify method annotation name
  * Fix lupdate warning missing Q_OBJECT macro
  * Replaces deprecated QStyleOptionViewItemV4
  * Don't lock the screen when it's already locked.
  * lxqtscreensaver: Makes it a opaque pointer class
  * GridLayout: Store current animation flag
  * lxqtgridlayout: Move private class definition
  * HtmlDelegate: Take layoutDirection into account
  * GridLayout: Take layoutDirection into account
  * application: Correct signal handling & clean-up (#72)
  * lxqtpower: Removes unused stuff
  * SingleApplication: Only create an DBus adaptor when needed
  * NotificationPrivate: Fixes programming typo
  * Don't set icon theme name
  * configdialog: Update icons in ThemeChanged event
  * lxqtpower: Add suspend and hibernate to ConsoleKit2 provider
  * LXQtTranslateTs.cmake: Enable PULL_TRANSLATIONS by default
  * LXQtTranslateTs.cmake: Use/update template in remote repo
  * .gitignore: Cleanup
  * build: Use external translations
  * ts-files removal (#90)
  * GridLayout: Fix memory leak
  * translations: Fix external translations logic
  * translations: Add external translations support
  * configdialog: Fix icon bar sizing
  * configdialog: fix size of PageSelectWidget (#83)
  * Use const references with the foreach iterator
  * SettingsCache: Improve performance
  * Print warning messages when using the fallback Icon Theme
  * Use LXQT_DATA_DIR for fallback icon theme search path
  * Sets Oxygen as the only fallback icon theme
  * Adds CMAKE_INSTALL_PREFIX to the LXQt Theme search paths
  * LXQtCompilerSettings: Add QT_USE_QSTRINGBUILDER to the compile definitions
  * SingleApplication: Use QCoreApplication::exit() instead of ::exit()
  * bump year
  * TranslateDesktopTs: Adds UPDATE_OPTIONS options
  * TranslateDesktop: Remove lupdate absolute option
  * TranslateDesktop: Use -a switch in grep commands
  * LXQtTheme: Remove (outdated) "singleclick" qss assembly
  * settings: Upgrade emitting of "changed" signals
  * SingleApplication: Call also QWidget::show on activate
  * Updated Russian translation Removed ru_RU file
  * Use QString() instead of ""
  * Use CMAKE_INSTALL_FULL_DATAROOTDIR
  * Add LXQT_GRAPHICS_DIR directory definition
  * lxqt-config: Correct escaping while setting variables
  * CMake: Removes artifact
  * Adds FindXdgUserDirs CMake find_package module
  * Italian translation update
- Remove patch 0001-fix-build-with-qt-5.5.patch
  Contained in upstream version
- Upstream release 0.10.0
- Factory moved fom libqt5.4 to 5.5
  0001-fix-build-with-qt-5.5.patch: include QObject header explicitly
- Use correct name "lxqt" instead of "lxde-qt"
- Changed to %cmake and %cmake_install macros in %build and
  %install 
- New upstream version 0.9.0  
- Added -lang subpackage
- Dropped -qt5 package naming, as none of the internal library
  names use -qt5 in 0.9.0.  Added Obsoletes and Conflicts, in the
  odd chance that liblxqt-0.7.0 and liblxqt >=0.8.0 are installed
  on the same system.  Which should never happen.  lxqt-0.9.0 is not
  likely to be pushed to 13.2, and liblxqt can no longer be built
  against Qt4.
- Added conditionals to build for Fedora 
- new upstream version 0.8.0 
- spec file clean up 
- Cleaned up BuildRequires: 
- Removed fedora spec, split into seperate subproject
  Del: liblxqt-Fedora_20.spec 
- Removed BuildRequires: pkgconfig entries in favour of BuildRequires: libqt4-devel at request of X11:lxde:lxqt maintainers 
- Ran spec-cleaner on specfile 
- Added specfile for Fedora_20
  Add: liblxqt-Fedora_20.spec 
- Added tarball for new stable release
  Add: liblxqt-0.7.0.tar.xz
  Del: _service 
- Shortened Summary: to make rpmlint happy
  Removed explicit Requires: per rpmlint 
- Removed direct calls to cmake, in favour of %cmake and %cmake_install macros 
- Specfile finalized 
- Inital Source Upload
  Add:  _service
  Add:  liblxqt.spec
  Add:  liblxqt.changes

OBS-URL: https://build.opensuse.org/request/show/535966
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/liblxqt?expand=0&rev=9
This commit is contained in:
2017-10-24 20:22:43 +00:00
committed by Git OBS Bridge
7 changed files with 51 additions and 153 deletions

View File

@@ -1,126 +0,0 @@
From f3f824c85811596bc8886b86f31b5f37c2480736 Mon Sep 17 00:00:00 2001
From: Palo Kisa <palo.kisa@gmail.com>
Date: Wed, 28 Jun 2017 09:25:43 +0200
Subject: [PATCH] lxqtpower: Allow disabling of lxqt-session provider
To allow usage of LXQt::Power object inside of lxqt-session (handling
the called method of LXQtSessionProvider) we need to avoid recurently
calling lxqt-session itself.
---
lxqtpower/lxqtpower.cpp | 10 ++++++++--
lxqtpower/lxqtpower.h | 12 ++++++++++--
lxqtpower/lxqtpowerproviders.cpp | 36 +++++++++++++++++++++++++-----------
3 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/lxqtpower/lxqtpower.cpp b/lxqtpower/lxqtpower.cpp
index 742793b..07cd19e 100644
--- a/lxqtpower/lxqtpower.cpp
+++ b/lxqtpower/lxqtpower.cpp
@@ -33,15 +33,21 @@
using namespace LXQt;
-Power::Power(QObject *parent) :
+Power::Power(bool useLxqtSessionProvider, QObject * parent /*= nullptr*/) :
QObject(parent)
{
mProviders.append(new CustomProvider(this));
+ if (useLxqtSessionProvider)
+ mProviders.append(new LXQtProvider(this));
mProviders.append(new SystemdProvider(this));
mProviders.append(new UPowerProvider(this));
mProviders.append(new ConsoleKitProvider(this));
mProviders.append(new LxSessionProvider(this));
- mProviders.append(new LXQtProvider(this));
+}
+
+Power::Power(QObject * parent /*= nullptr*/)
+ : Power(true, parent)
+{
}
diff --git a/lxqtpower/lxqtpower.h b/lxqtpower/lxqtpower.h
index f738b46..98b021e 100644
--- a/lxqtpower/lxqtpower.h
+++ b/lxqtpower/lxqtpower.h
@@ -56,8 +56,16 @@ class LXQT_API Power : public QObject
PowerSuspend /// Suspend the computer
};
- /// Constructs a Power with parent.
- explicit Power(QObject *parent = 0);
+ /*!
+ * Constructs the Power object.
+ * \param useLxqtSessionProvider indicates if the DBus methods
+ * provided by lxqt-session should be considered. This is useful to
+ * avoid recursion if the lxqt-session wants to provide some of the
+ * methods by itself with internal use of this object.
+ */
+ explicit Power(bool useLxqtSessionProvider, QObject *parent = nullptr);
+ /// Constructs a Power with using the lxqt-session provider.
+ explicit Power(QObject *parent = nullptr);
/// Destroys the object.
virtual ~Power();
diff --git a/lxqtpower/lxqtpowerproviders.cpp b/lxqtpower/lxqtpowerproviders.cpp
index 1304e05..3907cc7 100644
--- a/lxqtpower/lxqtpowerproviders.cpp
+++ b/lxqtpower/lxqtpowerproviders.cpp
@@ -500,31 +500,45 @@ LXQtProvider::~LXQtProvider()
bool LXQtProvider::canAction(Power::Action action) const
{
+ QString command;
switch (action)
{
case Power::PowerLogout:
- // there can be case when razo-session does not run
- return dbusCall(LXQT_SERVICE, LXQT_PATH, LXQT_SERVICE,
- QDBusConnection::sessionBus(), "canLogout",
- PowerProvider::DontCheckDBUS);
+ command = "canLogout";
+ break;
+ case Power::PowerReboot:
+ command = "canReboot";
+ break;
+ case Power::PowerShutdown:
+ command = "canPowerOff";
+ break;
default:
return false;
}
+
+ // there can be case when lxqtsession-session does not run
+ return dbusCall(LXQT_SERVICE, LXQT_PATH, LXQT_SERVICE,
+ QDBusConnection::sessionBus(), command,
+ PowerProvider::DontCheckDBUS);
}
bool LXQtProvider::doAction(Power::Action action)
{
QString command;
-
switch (action)
{
- case Power::PowerLogout:
- command = "logout";
- break;
-
- default:
- return false;
+ case Power::PowerLogout:
+ command = "logout";
+ break;
+ case Power::PowerReboot:
+ command = "reboot";
+ break;
+ case Power::PowerShutdown:
+ command = "powerOff";
+ break;
+ default:
+ return false;
}
return dbusCall(LXQT_SERVICE,

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:487dc42ceb611f53024c531d5550bd0d4fe8cbfe3dbf3711faba5db6ee6d415d
size 50356

View File

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEfHM7pfWFqtZp5NI6QsnI069epeMFAlhpeWEACgkQQsnI069e
peMNHBAAieIcbt4feaHDCQue7bFkJu+W6BmbzISgJgzg4/5vseN7GVZal/yt87Mm
8t5S2SzLo8bzqCcOH0r/kHgRZHd/u7rJuuU3Fv9G2oN/7yIz9WzrKc15JlVu1gTs
JvQ4oW8h1gB0yYsBfWNp6LnIiUPDCIfDdEdLVA3/r9vrjib37vQj+RApOoGlDvsG
gkehsQf5VtkDKKQ99lXYIFKBJpzMxnqwvtvfO9QShrzwvsB+eYWo104bkdMRri51
IP6vaF6V0vh8uxjEuEjczGRjbZdJJN/x2r4F+BZMXAiHVBgi8aFo4UdXBjs2mznp
NSTa4fcgkOJEKOIXvqAV3mSGIUUtdHha3aGSWDd1HCx9v5q7ty4fQv2HG5OMi/Ce
A1sNAgTFYsHdH0LzBZVvz5h2LQ/peaUZs/BrWcuE7BW7v1xqLTNV8X5vhfLiJ+7H
QhBQyBduPaiQCd0ozN/5sESuVWAz8CLoEx+vjT0uZeMjdj8UMpulcKvpTmV9hMyP
b9iam0ZJ1Pup4ETz4bxx5yttzagz1eamUNBkKzuYFoPlZgY05BNnSAKWj1d8BCnR
1nNMjAcqqrw4RAuqf65zLZRwd7OL7KxJAA1d9X/dkNNQu0dATdmKLW1F+/sPkeku
27auQcJadI3GPmSd1oNK7ucKhPK2UNUCJZYUxzPEFgqK+TZnotI=
=hn+7
-----END PGP SIGNATURE-----

3
liblxqt-0.12.0.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44bba48b073ded5b0ab3de2ea3575a704bb22d23ce5cc5743f76579c1f084f33
size 51192

16
liblxqt-0.12.0.tar.xz.asc Normal file
View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEfHM7pfWFqtZp5NI6QsnI069epeMFAlnrl6kACgkQQsnI069e
peOf8g/+O9bI1RYe6PZo4emiDlIjleJ17IvVZ529axrDXLQPCik9Q+fOiLuxzbMU
8Nc+DlYAsH3av/L8vFZJDrBssbhMto4vnuugYh16YlEx0ormr0HAP/xhksMtcsFG
4sAwjvztlVyIXskeZm9jmc/qkWPUICK3CH/VuBwQEREZUqeIfVQvpjJtKcYcD+SO
EJA7B+as6rod6YPQ4JXzp+k1f956mohMkbOTAc7x+hdIm50ZBC8w034u8UyepuFZ
h2HIRnSSEUKmMO4vJalZCt3l9ndCI8IGfnw/aUULeS7igLPFboeBXYCd1kKBWyF1
kt1EWJTv6NbkBU8k33K2GqRn1YSc92MlsBGkKwqN7veJjkkZaz8qcOi8r1eLrsGV
pfjxWADK5dHpmOBx92b/m957IU/UumYt+V0NPrhtmg3eQx6ozgr3oFBpIJ4eVRly
XUqGe/fSowh/8xxpdRLazqIoifU/Y47zcEwKoh/1xeRZgbDokwmbjnWJAkqXZZXz
Ohy+cO3x5ZGVOciawJsYwUDKvCDd5L1DbJDpNnmSs3kL5y6yr33RPwRrBh9pgX52
fHxIeT6wn92WyPlswtyUYDseAkOWyXP5of4mF/chrjayD9SWNca+AWm78yElvejD
lH/awfCeuWlKu/bkgnWvR78IKmtT/5BvUof/QHSBp81zBh/a5Ow=
=LHzZ
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon Oct 23 10:02:44 UTC 2017 - mvetter@suse.com
- Update to 0.12.0:
* Bump minimum qtxdg version to 3.1.0
* Don't export github templates
* Bump version and needed versions to the final values
* lxqtpower: Allow disabling of lxqt-session provider
* Drops Qt5Core_VERSION_STRING
* HtmlDelegate: Fix sizeHint() computation
* Add some comments about the meaning of versions
* Move LXQt version back to liblxqt
* Fixes (#118)
* lxqtapplication: Avoid wrong signal handling
* Removes unneeded semicolon in namespace definition
* Fix format conversions [-Wformat-pedantic] warnings
* Suppress compiler warnings about unused function parameters
* Removes extra semicolons in Qt's Q macros
* Translator: Prefer XDG_DATA_DIRS over compiled in path
* Help the compiler optimizing loops
* Use const variables where possible
* Update AUTHORS
- Remove liblxqt-0.11.1-allow-disabl-lxqt-session.patch:
contained in upstream
-------------------------------------------------------------------
Wed Sep 13 11:47:59 UTC 2017 - mvetter@suse.com

View File

@@ -17,26 +17,25 @@
Name: liblxqt
Version: 0.11.1
Version: 0.12.0
Release: 0
Summary: Core utility library for LXQt
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Url: http://www.lxqt.org
Source: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz
Source1: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz.asc
Source: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Source1: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring
Patch0: liblxqt-0.11.1-allow-disabl-lxqt-session.patch
BuildRequires: cmake >= 3.0.2
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: lxqt-build-tools-devel
BuildRequires: lxqt-build-tools-devel >= 0.4.0
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5UiTools)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xdg) >= 1.3.0
BuildRequires: pkgconfig(Qt5Xdg) >= 3.1.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xscrnsaver)
Obsoletes: liblxqt-qt5 < %{version}
@@ -50,6 +49,7 @@ functionality needed by nearly all of its components.
%package -n liblxqt0
Summary: LXQt core library
Group: System/Libraries
Provides: liblxqt
Recommends: %{name}-lang
%description -n liblxqt0
@@ -72,7 +72,6 @@ applications that want to make use of liblxqt.
%prep
%setup -q -n liblxqt-%{version}
%patch0 -p1
%build
%cmake -DPULL_TRANSLATIONS=No
@@ -94,7 +93,7 @@ make %{?_smp_mflags}
%files devel
%defattr (-,root,root)
%{_includedir}/lxqt/
%{_datadir}/cmake/
%{_datadir}/cmake/lxqt/
%{_libdir}/pkgconfig/lxqt.pc
%{_libdir}/%{name}.so