Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5xdg for openSUSE:Factory
checked in at 2022-11-06 12:42:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5xdg (Old)
and /work/SRC/openSUSE:Factory/.libqt5xdg.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5xdg"
Sun Nov 6 12:42:51 2022 rev:18 rq:1033820 version:3.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5xdg/libqt5xdg.changes 2022-05-09
18:45:28.244303694 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5xdg.new.2275/libqt5xdg.changes
2022-11-06 12:43:21.561796356 +0100
@@ -1,0 +2,7 @@
+Sat Nov 5 17:05:32 UTC 2022 - Shawn Dunn <sfal...@cloverleaf-linux.org>
+
+- Update to 3.10.0:
+ * Invalidate GTK icon cache as soon as icons are installed.
+ * Follow `freedesktop.org` in adding dirs under `DefaultDirectoryDirs`.
+
+-------------------------------------------------------------------
Old:
----
libqtxdg-3.9.1.tar.xz
libqtxdg-3.9.1.tar.xz.asc
New:
----
libqtxdg-3.10.0.tar.xz
libqtxdg-3.10.0.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5xdg.spec ++++++
--- /var/tmp/diff_new_pack.unB2PU/_old 2022-11-06 12:43:22.045799246 +0100
+++ /var/tmp/diff_new_pack.unB2PU/_new 2022-11-06 12:43:22.049799270 +0100
@@ -18,7 +18,7 @@
%define _name libqtxdg
Name: libqt5xdg
-Version: 3.9.1
+Version: 3.10.0
Release: 0
Summary: Qt implementation of xdg specs for lxqt
License: GPL-3.0-only
@@ -84,7 +84,7 @@
%build
%cmake
-%make_build
+%cmake_build
%install
%cmake_install
@@ -99,8 +99,8 @@
%license COPYING
%doc AUTHORS
%{_libdir}/libQt5Xdg.so.*
-%{_sysconfdir}/xdg/lxqt-qtxdg.conf
-%{_sysconfdir}/xdg/qtxdg.conf
+%config %{_sysconfdir}/xdg/lxqt-qtxdg.conf
+%config %{_sysconfdir}/xdg/qtxdg.conf
%files devel
%{_datadir}/cmake/qt5xdg
++++++ libqtxdg-3.9.1.tar.xz -> libqtxdg-3.10.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libqtxdg-3.9.1/CHANGELOG
new/libqtxdg-3.10.0/CHANGELOG
--- old/libqtxdg-3.9.1/CHANGELOG 2022-05-08 08:40:26.000000000 +0200
+++ new/libqtxdg-3.10.0/CHANGELOG 2022-11-05 08:56:11.000000000 +0100
@@ -1,3 +1,8 @@
+libqtxdg-3.10.0 / 2022-11-05
+============================
+ * Invalidate GTK icon cache as soon as icons are installed.
+ * Follow `freedesktop.org` in adding dirs under `DefaultDirectoryDirs`.
+
libqtxdg-3.9.1 / 2022-05-08
===========================
* Separated `qtxdg-mat` and made installation of config files optional (to
prepare for Qt6).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libqtxdg-3.9.1/CMakeLists.txt
new/libqtxdg-3.10.0/CMakeLists.txt
--- old/libqtxdg-3.9.1/CMakeLists.txt 2022-05-08 08:40:26.000000000 +0200
+++ new/libqtxdg-3.10.0/CMakeLists.txt 2022-11-05 08:56:11.000000000 +0100
@@ -14,11 +14,11 @@
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(QTXDG_MAJOR_VERSION 3)
-set(QTXDG_MINOR_VERSION 9)
-set(QTXDG_PATCH_VERSION 1)
+set(QTXDG_MINOR_VERSION 10)
+set(QTXDG_PATCH_VERSION 0)
set(QTXDG_VERSION_STRING
${QTXDG_MAJOR_VERSION}.${QTXDG_MINOR_VERSION}.${QTXDG_PATCH_VERSION})
-set(LXQTBT_MINIMUM_VERSION "0.11.0")
+set(LXQTBT_MINIMUM_VERSION "0.12.0")
set(QT_MINIMUM_VERSION "5.15.0")
set(GLIB_MINIMUM_VERSION "2.41.0") # Mime Apps new implementation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libqtxdg-3.9.1/src/qtxdg/xdgmenureader.cpp
new/libqtxdg-3.10.0/src/qtxdg/xdgmenureader.cpp
--- old/libqtxdg-3.9.1/src/qtxdg/xdgmenureader.cpp 2022-05-08
08:40:26.000000000 +0200
+++ new/libqtxdg-3.10.0/src/qtxdg/xdgmenureader.cpp 2022-11-05
08:56:11.000000000 +0100
@@ -349,6 +349,9 @@
<DirectoryDir> elements containing the default desktop dir locations
($XDG_DATA_DIRS/desktop-directories/).
+ The default locations that are earlier in the search path go later in the
<Menu>
+ so that they have priority.
+
menu-cache additional prepends $XDG_DATA_HOME/applications.
************************************************/
void XdgMenuReader::processDefaultDirectoryDirsTag(QDomElement& element)
@@ -357,8 +360,9 @@
QStringList dirs = XdgDirs::dataDirs();
dirs.prepend(XdgDirs::dataHome(false));
- for (const QString &dir : qAsConst(dirs))
- addDirTag(element, QLatin1String("DirectoryDir"), dir +
QLatin1String("/desktop-directories/"));
+ int n = dirs.size();
+ for (int i = 0; i < n; ++i)
+ addDirTag(element, QLatin1String("DirectoryDir"), dirs.at(n - i - 1) +
QLatin1String("/desktop-directories/"));
}
/************************************************
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libqtxdg-3.9.1/src/xdgiconloader/xdgiconloader.cpp
new/libqtxdg-3.10.0/src/xdgiconloader/xdgiconloader.cpp
--- old/libqtxdg-3.9.1/src/xdgiconloader/xdgiconloader.cpp 2022-05-08
08:40:26.000000000 +0200
+++ new/libqtxdg-3.10.0/src/xdgiconloader/xdgiconloader.cpp 2022-11-05
08:56:11.000000000 +0100
@@ -149,14 +149,12 @@
// Note: The cache file can be (IS) removed and newly created during the
// cache update. But we hold open file descriptor for the "old" removed
// file. So we need to watch the changes and reopen/remap the file.
- QObject::connect(gtkCachesWatcher(), &QFileSystemWatcher::fileChanged,
&m_file, [this](const QString & path)
+ gtkCachesWatcher->addPath(dirName);
+ QObject::connect(gtkCachesWatcher(),
&QFileSystemWatcher::directoryChanged, &m_file, [this]
{
- if (m_file.fileName() == path)
- {
- m_isValid = false;
- // invalidate icons to reload them ...
- QIconLoader::instance()->invalidateKey();
- }
+ m_isValid = false;
+ // invalidate icons to reload them ...
+ QIconLoader::instance()->invalidateKey();
});
reValid(false);
}
@@ -175,11 +173,6 @@
if (!m_cacheFileInfo.exists() || m_cacheFileInfo.lastModified() <
QFileInfo{dir.absolutePath()}.lastModified())
return m_isValid;
- // Note: If the file is removed, it is also silently removed from watched
- // paths in QFileSystemWatcher.
- if
(!gtkCachesWatcher->files().contains(m_cacheFileInfo.absoluteFilePath()))
- gtkCachesWatcher->addPath(m_cacheFileInfo.absoluteFilePath());
-
if (!m_file.open(QFile::ReadOnly))
return m_isValid;
m_size = m_file.size();
