[packages/clementine/dev-1.3: 6/7] update udisks-headers.patch from fedora

[glen]

commit 04b41b7e971b7d247cde0ee433eca3aa09550565
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 21 00:08:03 2016 +0200

    update udisks-headers.patch from fedora

 clementine-udisks-headers.patch | 14 +++-----------
 clementine.spec                 |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/clementine.spec b/clementine.spec
index fd2872b..c3d5e8e 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -110,7 +110,7 @@ a Qt4 előnyeit.
 %setup -q -n %{name}-%{version}%{subver}
 %patch1 -p1
 #%patch4 -p1
-#%patch6 -p1
+%patch6 -p1
 
 # cleanup vendor. keep only needed libraries.
 mv 3rdparty 3rdparty.dist
diff --git a/clementine-udisks-headers.patch b/clementine-udisks-headers.patch
index 199661f..95ccd35 100644
--- a/clementine-udisks-headers.patch
+++ b/clementine-udisks-headers.patch
@@ -1,16 +1,8 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1104542..65d765c 100644
+index afe58b9..a8c6773 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -887,7 +887,6 @@ if(HAVE_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
-@@ -954,6 +953,8 @@ if(HAVE_DBUS)
+@@ -953,6 +953,8 @@ if(HAVE_DBUS)
    list(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.h)
    list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.cpp)
  
@@ -18,4 +10,4 @@ index 1104542..65d765c 100644
 +
    # DeviceKit DBUS interfaces
    if(HAVE_DEVICEKIT)
-     qt4_add_dbus_interface(SOURCES
+     set_source_files_properties(dbus/org.freedesktop.UDisks.xml
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clementine.git/commitdiff/257df20428a4828045ba04fea380cf14870577b0