rebuilt by autoport with build requirements: libplist-devel>=1.11-1mamba [release 1.2.3-2mamba;Fri Sep 05 2014]

This commit is contained in:
Silvan Calarco 2024-01-05 21:25:21 +01:00
parent d6a7295886
commit bf90a4a633
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.chocobo@gmail.com>
Date: Wed, 16 Jul 2014 15:57:25 +0200
Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
---
src/CMakeLists.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 650fa74..775b0a5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
if(HAVE_DBUS)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
- # Hack to get it to generate interfaces without namespaces - required
- # because otherwise org::freedesktop::UDisks and
- # org::freedesktop::UDisks::Device conflict.
- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
-
# MPRIS DBUS interfaces
qt4_add_dbus_adaptor(SOURCES
dbus/org.freedesktop.MediaPlayer.player.xml
@@ -964,6 +959,10 @@ if(HAVE_DBUS)
# DeviceKit DBUS interfaces
if(HAVE_DEVICEKIT)
+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml
+ PROPERTIES NO_NAMESPACE dbus/udisks)
+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
+ PROPERTIES NO_NAMESPACE dbus/udisksdevice)
qt4_add_dbus_interface(SOURCES
dbus/org.freedesktop.UDisks.xml
dbus/udisks)

View File

@ -1,6 +1,6 @@
Name: clementine Name: clementine
Version: 1.2.3 Version: 1.2.3
Release: 1mamba Release: 2mamba
Summary: A modern music player and library organiser Summary: A modern music player and library organiser
Group: Graphical Desktop/Applications/Multimedia Group: Graphical Desktop/Applications/Multimedia
Vendor: openmamba Vendor: openmamba
@ -13,6 +13,7 @@ Patch0: %{name}-0.6-optional-dbus-devicekit.patch
Patch1: %{name}-0.7.1-glibc-2.31.patch Patch1: %{name}-0.7.1-glibc-2.31.patch
Patch2: %{name}-1.0.1-libimobiledevice-1.1.2.patch Patch2: %{name}-1.0.1-libimobiledevice-1.1.2.patch
Patch3: clementine-1.2.2-glibc-2.19.patch Patch3: clementine-1.2.2-glibc-2.19.patch
Patch4: clementine-1.2.3-udisks-1.0.5.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -47,6 +48,7 @@ BuildRequires: libxml2-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: protobuf-devel BuildRequires: protobuf-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libplist-devel >= 1.11-1mamba
BuildRequires: cmake BuildRequires: cmake
BuildRequires: liblastfm-devel >= 0.3.3 BuildRequires: liblastfm-devel >= 0.3.3
BuildRequires: libboost-devel BuildRequires: libboost-devel
@ -67,6 +69,7 @@ Clementine is a modern music player and library organiser. Clementine is a port
#%patch1 -p1 #%patch1 -p1
#%patch2 -p1 #%patch2 -p1
#%patch3 -p1 #%patch3 -p1
%patch4 -p1
%build %build
%cmake -d build %cmake -d build
@ -108,6 +111,9 @@ fi
%doc COPYING %doc COPYING
%changelog %changelog
* Fri Sep 05 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.3-2mamba
- rebuilt by autoport with build requirements: libplist-devel>=1.11-1mamba
* Sun Apr 27 2014 Automatic Build System <autodist@mambasoft.it> 1.2.3-1mamba * Sun Apr 27 2014 Automatic Build System <autodist@mambasoft.it> 1.2.3-1mamba
- automatic version update by autodist - automatic version update by autodist