[packages/QtSingleApplication] - rel 8, fix patch fuzz disable qt4

baggins baggins at pld-linux.org
Sat Mar 28 23:31:22 CET 2026


commit 1d9b58f303531995b549fa431aae071cb533f3d9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 29 00:30:45 2026 +0100

    - rel 8, fix patch fuzz disable qt4

 QtSingleApplication.spec | 30 +++++++++++++++---------------
 clementine.patch         |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/QtSingleApplication.spec b/QtSingleApplication.spec
index d3b673c..54406d0 100644
--- a/QtSingleApplication.spec
+++ b/QtSingleApplication.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	qt4		# build Qt4
+%bcond_with	qt4		# build Qt4
 %bcond_without	qt5		# build Qt5
 
 # last commit to qtsingleapplication subdir in
@@ -10,7 +10,7 @@ Summary:	Qt 4 library to start applications only once per user
 Summary(pl.UTF-8):	Biblioteka Qt 4 do uruchamiania pojedynczej instancji aplikacji na użytkownika
 Name:		QtSingleApplication
 Version:	2.6.1
-Release:	7
+Release:	8
 License:	GPL v3 or LGPL v2 with exceptions
 Group:		Libraries
 Source0:	https://github.com/qtproject/qt-solutions/archive/%{commit}/%{name}-%{commit}.tar.gz
@@ -120,8 +120,8 @@ QtSingleCoreApplication, który nie ma zależności od QtGui.
 Summary:	Development files for Qt5SingleApplication library
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki Qt5SingleApplication
 Group:		Development/Libraries
-Requires:	Qt5SingleApplication = %{version}-%{release}
 Requires:	Qt5Core-devel >= 5
+Requires:	Qt5SingleApplication = %{version}-%{release}
 
 %description -n Qt5SingleApplication-devel
 This package contains header files for developing applications that
@@ -222,16 +222,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.TXT
-%attr(755,root,root) %{_libdir}/libQtSolutions_SingleApplication-2.6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQtSolutions_SingleApplication-2.6.so.1
-%attr(755,root,root) %{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so.1
+%{_libdir}/libQtSolutions_SingleApplication-2.6.so.*.*.*
+%ghost %{_libdir}/libQtSolutions_SingleApplication-2.6.so.1
+%{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so.*.*.*
+%ghost %{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc examples
-%attr(755,root,root) %{_libdir}/libQtSolutions_SingleApplication-2.6.so
-%attr(755,root,root) %{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so
+%{_libdir}/libQtSolutions_SingleApplication-2.6.so
+%{_libdir}/libQtSolutions_SingleCoreApplication-2.6.so
 %{_includedir}/qt4/QtSolutions/QtSingleApplication
 %{_includedir}/qt4/QtSolutions/QtSingleCoreApplication
 %{_includedir}/qt4/QtSolutions/qtsingleapplication.h
@@ -244,16 +244,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -n Qt5SingleApplication
 %defattr(644,root,root,755)
 %doc README.TXT
-%attr(755,root,root) %{_libdir}/libQt5Solutions_SingleApplication-2.6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQt5Solutions_SingleApplication-2.6.so.1
-%attr(755,root,root) %{_libdir}/libQt5Solutions_SingleCoreApplication-2.6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQt5Solutions_SingleCoreApplication-2.6.so.1
+%{_libdir}/libQt5Solutions_SingleApplication-2.6.so.*.*.*
+%ghost %{_libdir}/libQt5Solutions_SingleApplication-2.6.so.1
+%{_libdir}/libQt5Solutions_SingleCoreApplication-2.6.so.*.*.*
+%ghost %{_libdir}/libQt5Solutions_SingleCoreApplication-2.6.so.1
 
 %files -n Qt5SingleApplication-devel
 %defattr(644,root,root,755)
 %doc doc examples
-%attr(755,root,root) %{_libdir}/libQt5Solutions_SingleApplication-2.6.so
-%attr(755,root,root) %{_libdir}/libQt5Solutions_SingleCoreApplication-2.6.so
+%{_libdir}/libQt5Solutions_SingleApplication-2.6.so
+%{_libdir}/libQt5Solutions_SingleCoreApplication-2.6.so
 %{_includedir}/qt5/QtSolutions/QtSingleApplication
 %{_includedir}/qt5/QtSolutions/QtSingleCoreApplication
 %{_includedir}/qt5/QtSolutions/qtsingleapplication.h
diff --git a/clementine.patch b/clementine.patch
index 1201b54..34c759d 100644
--- a/clementine.patch
+++ b/clementine.patch
@@ -8,8 +8,8 @@ Controlling playback with the commandline as well (--pause, --play, etc.)
 --- QtSingleApplication-2.6.1/src/qtlocalpeer.cpp~	2015-02-23 00:06:20.000000000 +0200
 +++ QtSingleApplication-2.6.1/src/qtlocalpeer.cpp	2015-02-23 00:08:51.179884397 +0200
 @@ -42,6 +42,7 @@
- #include "qtlocalpeer.h"
  #include <QCoreApplication>
+ #include <QDataStream>
  #include <QTime>
 +#include <QtDebug>
  
@@ -36,8 +36,8 @@ Controlling playback with the commandline as well (--pause, --play, etc.)
 -    ds.writeBytes(uMsg.constData(), uMsg.size());
 +    ds.writeBytes(message.constData(), message.size());
      bool res = socket.waitForBytesWritten(timeout);
-     res &= socket.waitForReadyRead(timeout);   // wait for ack
-     res &= (socket.read(qstrlen(ack)) == ack);
+     if (res) {
+         res &= socket.waitForReadyRead(timeout);   // wait for ack
 @@ -189,10 +190,10 @@
          delete socket;
          return;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/QtSingleApplication.git/commitdiff/1d9b58f303531995b549fa431aae071cb533f3d9



More information about the pld-cvs-commit mailing list