From c6084810db86e4080c94f4390a88bf53509f4e3a Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Feb 09 2015 13:26:48 +0000 Subject: - Update translations --- diff --git a/lxqt-qtplugin-missing-upstream.patch b/lxqt-qtplugin-missing-upstream.patch deleted file mode 100644 index a8e2ac2..0000000 --- a/lxqt-qtplugin-missing-upstream.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index be8b01a..6bb3e57 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON) - find_package(Qt5Widgets REQUIRED QUIET) - find_package(Qt5LinguistTools REQUIRED QUIET) - --find_package(lxqt-qt5 REQUIRED QUIET) -+find_package(lxqt REQUIRED QUIET) - - include(${LXQT_USE_FILE}) - -diff --git a/src/lxqtplatformtheme.cpp b/src/lxqtplatformtheme.cpp -index fb2b858..a7b5edc 100644 ---- a/src/lxqtplatformtheme.cpp -+++ b/src/lxqtplatformtheme.cpp -@@ -67,7 +67,7 @@ void LXQtPlatformTheme::initWatch() - { - settingsWatcher_ = new QFileSystemWatcher(); - settingsWatcher_->addPath(settingsFile_); -- connect(settingsWatcher_, SIGNAL(fileChanged(QString)), SLOT(onSettingsChanged())); -+ connect(settingsWatcher_, &QFileSystemWatcher::fileChanged, this, &LXQtPlatformTheme::onSettingsChanged); - } - - void LXQtPlatformTheme::loadSettings() { -@@ -126,7 +126,21 @@ void LXQtPlatformTheme::loadSettings() { - - // this is called whenever the config file is changed. - void LXQtPlatformTheme::onSettingsChanged() { -- // qDebug() << "onSettingsChanged"; -+ // D*mn! yet another Qt 5.4 regression!!! -+ // See the bug report: https://github.com/lxde/lxqt/issues/441 -+ // Since Qt 5.4, QSettings uses QSaveFile to save the config files. -+ // https://github.com/qtproject/qtbase/commit/8d15068911d7c0ba05732e2796aaa7a90e34a6a1#diff-e691c0405f02f3478f4f50a27bdaecde -+ // QSaveFile will save the content to a new temp file, and replace the old file later. -+ // Hence the existing config file is not changed. Instead, it's deleted and then replaced. -+ // This new behaviour unfortunately breaks QFileSystemWatcher. -+ // After file deletion, we can no longer receive any new change notifications. -+ // The most ridiculous thing is, QFileSystemWatcher does not provide a -+ // way for us to know if a file is deleted. WT*? -+ // Luckily, I found a workaround: If the file path no longer exists -+ // in the watcher's files(), this file is deleted. -+ bool file_deleted = !settingsWatcher_->files().contains(settingsFile_); -+ if(file_deleted) // if our config file is already deleted, reinstall a new watcher -+ settingsWatcher_->addPath(settingsFile_); - - // NOTE: in Qt4, Qt monitors the change of _QT_SETTINGS_TIMESTAMP root property and - // reload Trolltech.conf when the value is changed. Then, it automatically -@@ -145,8 +159,9 @@ void LXQtPlatformTheme::onSettingsChanged() { - if(style_ != oldStyle) // the widget style is changed - qApp->setStyle(style_); // ask Qt5 to apply the new style - -- if(iconTheme_ != oldIconTheme) // the icon theme is changed -+ if(iconTheme_ != oldIconTheme) { // the icon theme is changed - QIconLoader::instance()->updateSystemTheme(); // this is a private internal API of Qt5. -+ } - - // if font is changed - if(oldFont != fontStr_ || oldFixedFont != fixedFontStr_){ diff --git a/lxqt-qtplugin.spec b/lxqt-qtplugin.spec index f510523..4ddd1ea 100644 --- a/lxqt-qtplugin.spec +++ b/lxqt-qtplugin.spec @@ -1,12 +1,10 @@ Name: lxqt-qtplugin Summary: Qt plugin framework for LXQt Desktop Suite Version: 0.9.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://lxqt.org/ Source0: http://downloads.lxqt.org/lxqt/0.9.0/lxqt-qtplugin-0.9.0.tar.xz -#( From upstream ) -Patch0: lxqt-qtplugin-missing-upstream.patch BuildRequires: cmake >= 2.8.9 BuildRequires: pkgconfig(Qt5Help) @@ -19,7 +17,6 @@ BuildRequires: kf5-kwindowsystem-devel >= 5.5 %prep %setup -%patch0 -p1 %build mkdir -p %{_target_platform} @@ -29,7 +26,6 @@ popd make %{?_smp_mflags} -C %{_target_platform} - %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} @@ -38,6 +34,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_libdir}/qt5/plugins/platformthemes//libqtlxqt.so %changelog +* Mon Feb 09 2015 Helio Chissini de Castro - 0.9.0-3 +- Upstream tarball updated with latest fixes + * Sun Feb 08 2015 Helio Chissini de Castro - 0.9.0-2 - Added missing updates in the main upstream tarball