Hello community, here is the log from the commit of package clementine for openSUSE:Factory checked in at 2014-03-30 09:10:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clementine (Old) and /work/SRC/openSUSE:Factory/.clementine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clementine" Changes: -------- --- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2014-03-28 16:20:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clementine.new/clementine.changes 2014-03-30 12:10:12.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Mar 28 20:14:32 UTC 2014 - hrvoje.senjan@gmail.com + +- Added clementine-1.2.2-dont-use-hacks-but-proper-sintax-for-non-wrapping-in-namespace.patch, + fixes build with newer/stricter CMake +- As per patch, re-enable DBus +- Drop udisks BuildRequires, not needed + +------------------------------------------------------------------- New: ---- clementine-1.2.2-dont-use-hacks-but-proper-sintax-for-non-wrapping-in-namespace.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clementine.spec ++++++ --- /var/tmp/diff_new_pack.RL8JZ9/_old 2014-03-30 12:10:14.000000000 +0200 +++ /var/tmp/diff_new_pack.RL8JZ9/_new 2014-03-30 12:10:14.000000000 +0200 @@ -26,6 +26,7 @@ Source: https://github.com/clementine-player/Clementine/archive/%{version}.tar.gz Patch0: clementine-1.2.2-add-missing-header.patch Patch1: clementine-1.2.2-add-missing-include.patch +Patch2: clementine-1.2.2-dont-use-hacks-but-proper-sintax-for-non-wrapping-in-namespace.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: fdupes @@ -60,7 +61,6 @@ BuildRequires: pkgconfig(qca2) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(taglib) >= 1.8 -BuildRequires: pkgconfig(udisks) Requires: libtag1 >= 1.8 # plasma_runner dropped in clementine 1.1.0 Provides: %{name}-kde = %{version} @@ -91,6 +91,7 @@ %setup -q -n Clementine-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 ### NOTE built against system version of libraries rm -rvf 3rdparty/chromaprint @@ -111,7 +112,7 @@ -DENABLE_GOOGLE_DRIVE=ON \ %endif -DENABLE_MOODBAR=ON \ - -DENABLE_DBUS=OFF + -DENABLE_DBUS=ON make %{?_smp_mflags} %install ++++++ clementine-1.2.2-dont-use-hacks-but-proper-sintax-for-non-wrapping-in-namespace.patch ++++++ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ed57302..8da4368 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -887,11 +887,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 @@ -959,9 +954,11 @@ if(HAVE_DBUS) # DeviceKit DBUS interfaces if(HAVE_DEVICEKIT) + set_source_files_properties(dbus/org.freedesktop.UDisks.xml PROPERTIES NO_NAMESPACE dbus/udisks) qt4_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks.xml 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.Device.xml dbus/udisksdevice) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org