commit 9d35d08ce196ae9c5d7e0ba62fa01cdd598580b4 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Tue Nov 11 00:25:48 2014 +0100
- do not generate namespace headers for udisks clementine-udisks-headers.patch | 21 +++++++++++++++++++++ clementine.spec | 2 ++ 2 files changed, 23 insertions(+) --- diff --git a/clementine.spec b/clementine.spec index 86272e2..070faae 100644 --- a/clementine.spec +++ b/clementine.spec @@ -28,6 +28,7 @@ Patch1: unbundle-po.patch Patch3: %{name}-dt_categories.patch Patch4: %{name}-mygpo.patch Patch5: %{name}-desktop.patch +Patch6: %{name}-udisks-headers.patch URL: http://www.clementine-player.org/ BuildRequires: QtCore-devel >= %{qtver} BuildRequires: QtDBus-devel >= %{qtver} @@ -110,6 +111,7 @@ a Qt4 előnyeit. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # Remove all 3rdparty libraries except: # - universalchardet - not available as a separate library. diff --git a/clementine-udisks-headers.patch b/clementine-udisks-headers.patch new file mode 100644 index 0000000..199661f --- /dev/null +++ b/clementine-udisks-headers.patch @@ -0,0 +1,21 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1104542..65d765c 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) + list(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.h) + list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.cpp) + ++ set_source_files_properties( dbus/org.freedesktop.UDisks.xml dbus/org.freedesktop.UDisks.Device.xml PROPERTIES NO_NAMESPACE TRUE) ++ + # DeviceKit DBUS interfaces + if(HAVE_DEVICEKIT) + qt4_add_dbus_interface(SOURCES ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/clementine.git/commitdiff/9d35d08ce196ae9c5d7e0ba62fa01cdd598580b4 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit