Request 279 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 279 (accepted)

update to 3.0.2

Created by etamPL over 10 years ago
In state accepted

Submit cairo-dock-plugins

Submit package home:etamP...hes:Extra / cairo-dock-plugins to package Extra / cairo-dock-plugins

cairo-dock-plugins.changes Changed

cairo-dock-plugins.spec Changed

@@ -14,36 +14,62 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name:           cairo-dock-plugins
-Version:        3.0.1
+Version:        3.0.2
 Release:        0.pm.1
-Summary:        Cairo-dock is a small simple but effective docklet like Mac
 License:        GPL-3.0+
-URL:            http://www.glx-dock.org/
+Summary:        Cairo-dock is a small simple but effective docklet like Mac
+Url:            http://www.glx-dock.org/
 Group:          System/GUI/GNOME
 Source0:        https://launchpad.net/cairo-dock-plug-ins/3.0/%{version}/+download/cairo-dock-plugins-%{version}.tar.gz
 Source99:       cairo-dock-plugins-rpmlintrc
-BuildRoot:      %{_tmppath}/%{packagename}-%{version}-%{release}-root
-Requires:       cairo-dock = %{version}
-BuildRequires:  cairo-dock-devel = %{version}
+# PATCH-FIX-UPSTREAM cairo-dock-plugins-3.0.2-no-return-in-nonvoid-function.patch adam@mizerski lp#1050526 -- fix no-return-in-nonvoid-function
+Patch0:         cairo-dock-plugins-3.0.2-no-return-in-nonvoid-function.patch
+BuildRequires:  cmake
 BuildRequires:  fdupes
-BuildRequires:  alsa-devel glib-sharp2 gnome-vfs2-devel gvfs-devel
-BuildRequires:  libdbusmenu-qt-devel libetpan-devel libexif-devel libical-devel
-BuildRequires:  libsensors4-devel libwebkitgtk-devel libxklavier-devel
-BuildRequires:  mono-devel ndesk-dbus-glib-devel python-devel ruby-devel
-BuildRequires:  vala-devel vte-devel
-Recommends:     %{name}-lang = %{version}
+BuildRequires:  gcc-c++
+BuildRequires:  mono-core
+BuildRequires:  ruby
+BuildRequires:  vala-devel
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(cairo-dock) = %{version}
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(fftw3)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gldi)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glib-sharp-2.0)
+BuildRequires:  pkgconfig(libexif)
+#BuildRequires:  pkgconfig(libgnome-menu-3.0) not yet
+BuildRequires:  pkgconfig(libical)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(libxklavier)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(ndesk-dbus-1.0)
+BuildRequires:  pkgconfig(ndesk-dbus-glib-1.0)
+BuildRequires:  pkgconfig(upower-glib)
+%if 0%{?suse_version} >= 1210
+BuildRequires:  pkgconfig(vte-2.90)
+BuildRequires:  pkgconfig(webkitgtk-3.0)
+%else
+BuildRequires:  pkgconfig(vte)
+BuildRequires:  pkgconfig(webkit-1.0)
+%endif
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xxf86vm)
+%if 0%{?suse_version} >= 1210
+BuildRequires:  pkgconfig(zeitgeist-1.0)
+%endif
+Requires:       cairo-dock = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%py_requires
 
 %description
 That package provides plugins for cairo-dock
 
-%package lang
-Summary:        That package provides plugins for cairo-dock
-Group:          System/GUI/GNOME
-Requires:       cairo-dock-lang = %{version}
-
-%description lang
-That package provides translation for all the plugins
-
 %package gnome-integration
 Summary:        That package provides plugins for cairo-dock
 Group:          System/GUI/GNOME
@@ -61,67 +87,60 @@
 That package provides DE specific integration plugins
 
 %package kde-integration
-Summary:        That package provides plugins for %{packagename}
+Summary:        That package provides plugins for cairo-dock
 Group:          System/GUI/KDE
 Requires:       %{name} = %{version}
 
 %description kde-integration
 That package provides DE specific integration plugins
 
+%lang_package
+
 %prep
 %setup -q
-%__sed -i -e "s|lib/ruby/|%{_lib}/ruby/|g" CMakeLists.txt
-%__sed -i -e "s|--prefix=|--root=%{buildroot} --prefix=|g" Dbus/interfaces/python/PythonInstall.cmake.in
+%patch0 -p1
+sed -i -e "s|lib/ruby/|%{_lib}/ruby/|g" CMakeLists.txt
+sed -i -e "s|--prefix=|--root=%{buildroot} --prefix=|g" Dbus/interfaces/python/PythonInstall.cmake.in
 
 %build
-%__mkdir build
+mkdir build
 pushd build
     cmake \
-    -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-    -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-    -DCMAKE_SKIP_RPATH=TRUE \
-    -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
-    %if %{_lib} == lib64
-    -DFORCE_LIB64=yes \
-    -DLIB_SUFFIX=64 \
-    %endif
-    ..
-%__make %{?_smp_flags}
+        -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+        -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+        -DCMAKE_C_FLAGS="%{optflags}" \
+        -DCMAKE_SKIP_RPATH=TRUE \
+        -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
+        -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+        ..
+    make %{?_smp_flags}
 popd
 
 %install
 pushd build
-    %makeinstall
+    %make_install
 popd
-
 %find_lang %{name}
-
 %fdupes -s %{buildroot}
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files
 %defattr(-,root,root)
 %dir %{_libdir}/cairo-dock
 %{_libdir}/cairo-dock/libcd-*.so
 %{_libdir}/libCDApplet.so
 %{_libdir}/pkgconfig/CDApplet.pc
-%dir %{_datadir}/cairo-dock/plug-ins
-%{_datadir}/cairo-dock/plug-ins/*
-%dir %{_datadir}/cairo-dock/gauges
-%{_datadir}/cairo-dock/gauges/*
+%{_datadir}/cairo-dock/plug-ins/
+%{_datadir}/cairo-dock/gauges/
 %dir %{_datadir}/vala-*
 %dir %{_datadir}/vala-*/vapi
 %{_datadir}/vala-*/vapi/CDApplet.*
 %dir %{_prefix}/lib/cli
 %dir %{_prefix}/lib/cli/cairo-dock-plug-ins
 %{_prefix}/lib/cli/cairo-dock-plug-ins/CDApplet.dll
-%{_libdir}/ruby/1.8/CDApplet.rb
+%{_libdir}/ruby/*/CDApplet.rb
 %{python_sitelib}/CDApplet.py*
 %{python_sitelib}/CDApplet*egg-info*
 %{python_sitelib}/CairoDock.py*

cairo-dock-plugins-3.0.2-no-return-in-nonvoid-function.patch Added

@@ -0,0 +1,53 @@
+diff -rupN cairo-dock-plugins-3.0.2/alsaMixer/src/applet-init.c cairo-dock-plugins-3.0.2_mod/alsaMixer/src/applet-init.c
+--- cairo-dock-plugins-3.0.2/alsaMixer/src/applet-init.c	2012-06-15 21:32:58.000000000 +0200
++++ cairo-dock-plugins-3.0.2_mod/alsaMixer/src/applet-init.c	2012-09-13 16:22:35.178259521 +0200
+@@ -52,6 +52,7 @@ static gboolean _cd_mixer_on_enter (GtkW
+ 	{
+ 		gtk_widget_show (myData.pScale);
+ 	}
++	return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
+ }
+ gboolean _cd_mixer_on_leave (GtkWidget* pWidget,
+ 	GdkEventCrossing* pEvent,
+@@ -62,6 +63,7 @@ gboolean _cd_mixer_on_leave (GtkWidget*
+ 		if (! myDesklet->container.bInside)
+ 			gtk_widget_hide (myData.pScale);
+ 	}
++	return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
+ }
+ 
+ CD_APPLET_INIT_BEGIN
+diff -rupN cairo-dock-plugins-3.0.2/Dbus/src/interface-main-methods.c cairo-dock-plugins-3.0.2_mod/Dbus/src/interface-main-methods.c
+--- cairo-dock-plugins-3.0.2/Dbus/src/interface-main-methods.c	2012-06-15 21:32:58.000000000 +0200
++++ cairo-dock-plugins-3.0.2_mod/Dbus/src/interface-main-methods.c	2012-09-13 16:21:03.949721153 +0200
+@@ -1103,6 +1103,7 @@ gboolean cd_dbus_main_reload_icon (dbusM
+ static gboolean _on_icon_deleted (GList *ic, Icon *pIcon)
+ {
+ 	ic->data = NULL;
++	return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
+ }
+ gboolean cd_dbus_main_remove_icon (dbusMainObject *pDbusCallback, gchar *cIconQuery, GError **error)
+ {
+diff -rupN cairo-dock-plugins-3.0.2/dock-rendering/src/rendering-parabole.c cairo-dock-plugins-3.0.2_mod/dock-rendering/src/rendering-parabole.c
+--- cairo-dock-plugins-3.0.2/dock-rendering/src/rendering-parabole.c	2012-06-15 21:32:58.000000000 +0200
++++ cairo-dock-plugins-3.0.2_mod/dock-rendering/src/rendering-parabole.c	2012-09-13 16:24:07.577804792 +0200
+@@ -491,7 +491,7 @@ static double cd_rendering_project_curso
+ 	while (y_sup - y_inf > 1);
+ 	return (y_inf + y_sup) / 2;
+ }
+-static double cd_rendering_project_cursor_on_curve (double x0, double y0, double lambda, double alpha, double *fXOnCurve, double *fYOnCurve)
++static void cd_rendering_project_cursor_on_curve (double x0, double y0, double lambda, double alpha, double *fXOnCurve, double *fYOnCurve)
+ {
+ 	double xM, yM;
+ 	if (my_fParaboleRatio > 1)
+diff -rupN cairo-dock-plugins-3.0.2/dustbin/src/applet-notifications.c cairo-dock-plugins-3.0.2_mod/dustbin/src/applet-notifications.c
+--- cairo-dock-plugins-3.0.2/dustbin/src/applet-notifications.c	2012-06-15 21:32:58.000000000 +0200
++++ cairo-dock-plugins-3.0.2_mod/dustbin/src/applet-notifications.c	2012-09-13 16:26:01.116474822 +0200
+@@ -96,6 +96,7 @@ static gboolean _display_result (CDShare
+ 	}
+ 	cairo_dock_discard_task (myData.pInfoTask);
+ 	myData.pInfoTask = NULL;
++	return TRUE;
+ }
+ static void _cd_dustbin_show_info (GtkMenuItem *menu_item, CairoDockModuleInstance *myApplet)
+ {

cairo-dock-plugins-3.0.1.tar.gz -> cairo-dock-plugins-3.0.2.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 279 0

Request History

etamPL created request over 10 years ago

update to 3.0.2

mrdocs accepted request over 11 years ago

Thanks. Looks good to me!