]> git.pld-linux.org Git - packages/clementine.git/commitdiff
update udisks-headers.patch from fedora
authorElan Ruusamäe <glen@delfi.ee>
Wed, 20 Jan 2016 22:08:03 +0000 (00:08 +0200)
committerElan Ruusamäe <glen@delfi.ee>
Wed, 20 Jan 2016 22:08:03 +0000 (00:08 +0200)
clementine-udisks-headers.patch
clementine.spec

index 199661fec27b41512e9ffa5764ccbabf6d7fe9f8..95ccd35bfeca769064c1a3886c8024188707e1b7 100644 (file)
@@ -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
index fd2872be07b5fc3e0f099d43b1439008726bd4b4..c3d5e8e39a4ecc873cced1e9fef60a3734609d76 100644 (file)
@@ -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
This page took 0.098828 seconds and 4 git commands to generate.