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
Submit package home:etamP...hes:Extra / cairo-dock-plugins to package Extra / cairo-dock-plugins
cairo-dock-plugins.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Wed Sep 12 22:35:06 UTC 2012 - adam@mizerski.pl
4
+
5
+- update to 3.0.2: bugfixes
6
+- spec file cleanup
7
+- added patch:
8
+ * cairo-dock-plugins-3.0.2-no-return-in-nonvoid-function.patch
9
+
10
+-------------------------------------------------------------------
11
Thu May 24 20:23:20 UTC 2012 - pascal.bleser@opensuse.org
12
13
- update to 3.0.1: bugfixes
14
cairo-dock-plugins.spec
Changed
171
1
2
# Please submit bugfixes or comments via http://bugs.opensuse.org/
3
4
Name: cairo-dock-plugins
5
-Version: 3.0.1
6
+Version: 3.0.2
7
Release: 0.pm.1
8
-Summary: Cairo-dock is a small simple but effective docklet like Mac
9
License: GPL-3.0+
10
-URL: http://www.glx-dock.org/
11
+Summary: Cairo-dock is a small simple but effective docklet like Mac
12
+Url: http://www.glx-dock.org/
13
Group: System/GUI/GNOME
14
Source0: https://launchpad.net/cairo-dock-plug-ins/3.0/%{version}/+download/cairo-dock-plugins-%{version}.tar.gz
15
Source99: cairo-dock-plugins-rpmlintrc
16
-BuildRoot: %{_tmppath}/%{packagename}-%{version}-%{release}-root
17
-Requires: cairo-dock = %{version}
18
-BuildRequires: cairo-dock-devel = %{version}
19
+# 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
20
+Patch0: cairo-dock-plugins-3.0.2-no-return-in-nonvoid-function.patch
21
+BuildRequires: cmake
22
BuildRequires: fdupes
23
-BuildRequires: alsa-devel glib-sharp2 gnome-vfs2-devel gvfs-devel
24
-BuildRequires: libdbusmenu-qt-devel libetpan-devel libexif-devel libical-devel
25
-BuildRequires: libsensors4-devel libwebkitgtk-devel libxklavier-devel
26
-BuildRequires: mono-devel ndesk-dbus-glib-devel python-devel ruby-devel
27
-BuildRequires: vala-devel vte-devel
28
-Recommends: %{name}-lang = %{version}
29
+BuildRequires: gcc-c++
30
+BuildRequires: mono-core
31
+BuildRequires: ruby
32
+BuildRequires: vala-devel
33
+BuildRequires: pkgconfig(alsa)
34
+BuildRequires: pkgconfig(cairo)
35
+BuildRequires: pkgconfig(cairo-dock) = %{version}
36
+BuildRequires: pkgconfig(dbus-1)
37
+BuildRequires: pkgconfig(dbus-glib-1)
38
+BuildRequires: pkgconfig(fftw3)
39
+BuildRequires: pkgconfig(gio-2.0)
40
+BuildRequires: pkgconfig(gldi)
41
+BuildRequires: pkgconfig(glib-2.0)
42
+BuildRequires: pkgconfig(glib-sharp-2.0)
43
+BuildRequires: pkgconfig(libexif)
44
+#BuildRequires: pkgconfig(libgnome-menu-3.0) not yet
45
+BuildRequires: pkgconfig(libical)
46
+BuildRequires: pkgconfig(libpulse)
47
+BuildRequires: pkgconfig(librsvg-2.0)
48
+BuildRequires: pkgconfig(libxklavier)
49
+BuildRequires: pkgconfig(libxml-2.0)
50
+BuildRequires: pkgconfig(ndesk-dbus-1.0)
51
+BuildRequires: pkgconfig(ndesk-dbus-glib-1.0)
52
+BuildRequires: pkgconfig(upower-glib)
53
+%if 0%{?suse_version} >= 1210
54
+BuildRequires: pkgconfig(vte-2.90)
55
+BuildRequires: pkgconfig(webkitgtk-3.0)
56
+%else
57
+BuildRequires: pkgconfig(vte)
58
+BuildRequires: pkgconfig(webkit-1.0)
59
+%endif
60
+BuildRequires: pkgconfig(x11)
61
+BuildRequires: pkgconfig(xrandr)
62
+BuildRequires: pkgconfig(xxf86vm)
63
+%if 0%{?suse_version} >= 1210
64
+BuildRequires: pkgconfig(zeitgeist-1.0)
65
+%endif
66
+Requires: cairo-dock = %{version}
67
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
68
+%py_requires
69
70
%description
71
That package provides plugins for cairo-dock
72
73
-%package lang
74
-Summary: That package provides plugins for cairo-dock
75
-Group: System/GUI/GNOME
76
-Requires: cairo-dock-lang = %{version}
77
-
78
-%description lang
79
-That package provides translation for all the plugins
80
-
81
%package gnome-integration
82
Summary: That package provides plugins for cairo-dock
83
Group: System/GUI/GNOME
84
85
That package provides DE specific integration plugins
86
87
%package kde-integration
88
-Summary: That package provides plugins for %{packagename}
89
+Summary: That package provides plugins for cairo-dock
90
Group: System/GUI/KDE
91
Requires: %{name} = %{version}
92
93
%description kde-integration
94
That package provides DE specific integration plugins
95
96
+%lang_package
97
+
98
%prep
99
%setup -q
100
-%__sed -i -e "s|lib/ruby/|%{_lib}/ruby/|g" CMakeLists.txt
101
-%__sed -i -e "s|--prefix=|--root=%{buildroot} --prefix=|g" Dbus/interfaces/python/PythonInstall.cmake.in
102
+%patch0 -p1
103
+sed -i -e "s|lib/ruby/|%{_lib}/ruby/|g" CMakeLists.txt
104
+sed -i -e "s|--prefix=|--root=%{buildroot} --prefix=|g" Dbus/interfaces/python/PythonInstall.cmake.in
105
106
%build
107
-%__mkdir build
108
+mkdir build
109
pushd build
110
cmake \
111
- -DCMAKE_VERBOSE_MAKEFILE=TRUE \
112
- -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
113
- -DCMAKE_SKIP_RPATH=TRUE \
114
- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
115
- %if %{_lib} == lib64
116
- -DFORCE_LIB64=yes \
117
- -DLIB_SUFFIX=64 \
118
- %endif
119
- ..
120
-%__make %{?_smp_flags}
121
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
122
+ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
123
+ -DCMAKE_C_FLAGS="%{optflags}" \
124
+ -DCMAKE_SKIP_RPATH=TRUE \
125
+ -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
126
+ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
127
+ ..
128
+ make %{?_smp_flags}
129
popd
130
131
%install
132
pushd build
133
- %makeinstall
134
+ %make_install
135
popd
136
-
137
%find_lang %{name}
138
-
139
%fdupes -s %{buildroot}
140
141
%post -p /sbin/ldconfig
142
-
143
%postun -p /sbin/ldconfig
144
145
-%clean
146
-%{?buildroot:%__rm -rf "%{buildroot}"}
147
-
148
%files
149
%defattr(-,root,root)
150
%dir %{_libdir}/cairo-dock
151
%{_libdir}/cairo-dock/libcd-*.so
152
%{_libdir}/libCDApplet.so
153
%{_libdir}/pkgconfig/CDApplet.pc
154
-%dir %{_datadir}/cairo-dock/plug-ins
155
-%{_datadir}/cairo-dock/plug-ins/*
156
-%dir %{_datadir}/cairo-dock/gauges
157
-%{_datadir}/cairo-dock/gauges/*
158
+%{_datadir}/cairo-dock/plug-ins/
159
+%{_datadir}/cairo-dock/gauges/
160
%dir %{_datadir}/vala-*
161
%dir %{_datadir}/vala-*/vapi
162
%{_datadir}/vala-*/vapi/CDApplet.*
163
%dir %{_prefix}/lib/cli
164
%dir %{_prefix}/lib/cli/cairo-dock-plug-ins
165
%{_prefix}/lib/cli/cairo-dock-plug-ins/CDApplet.dll
166
-%{_libdir}/ruby/1.8/CDApplet.rb
167
+%{_libdir}/ruby/*/CDApplet.rb
168
%{python_sitelib}/CDApplet.py*
169
%{python_sitelib}/CDApplet*egg-info*
170
%{python_sitelib}/CairoDock.py*
171
cairo-dock-plugins-3.0.2-no-return-in-nonvoid-function.patch
Added
55
1
2
+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
3
+--- cairo-dock-plugins-3.0.2/alsaMixer/src/applet-init.c 2012-06-15 21:32:58.000000000 +0200
4
++++ cairo-dock-plugins-3.0.2_mod/alsaMixer/src/applet-init.c 2012-09-13 16:22:35.178259521 +0200
5
+@@ -52,6 +52,7 @@ static gboolean _cd_mixer_on_enter (GtkW
6
+ {
7
+ gtk_widget_show (myData.pScale);
8
+ }
9
++ return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
10
+ }
11
+ gboolean _cd_mixer_on_leave (GtkWidget* pWidget,
12
+ GdkEventCrossing* pEvent,
13
+@@ -62,6 +63,7 @@ gboolean _cd_mixer_on_leave (GtkWidget*
14
+ if (! myDesklet->container.bInside)
15
+ gtk_widget_hide (myData.pScale);
16
+ }
17
++ return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
18
+ }
19
+
20
+ CD_APPLET_INIT_BEGIN
21
+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
22
+--- cairo-dock-plugins-3.0.2/Dbus/src/interface-main-methods.c 2012-06-15 21:32:58.000000000 +0200
23
++++ cairo-dock-plugins-3.0.2_mod/Dbus/src/interface-main-methods.c 2012-09-13 16:21:03.949721153 +0200
24
+@@ -1103,6 +1103,7 @@ gboolean cd_dbus_main_reload_icon (dbusM
25
+ static gboolean _on_icon_deleted (GList *ic, Icon *pIcon)
26
+ {
27
+ ic->data = NULL;
28
++ return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
29
+ }
30
+ gboolean cd_dbus_main_remove_icon (dbusMainObject *pDbusCallback, gchar *cIconQuery, GError **error)
31
+ {
32
+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
33
+--- cairo-dock-plugins-3.0.2/dock-rendering/src/rendering-parabole.c 2012-06-15 21:32:58.000000000 +0200
34
++++ cairo-dock-plugins-3.0.2_mod/dock-rendering/src/rendering-parabole.c 2012-09-13 16:24:07.577804792 +0200
35
+@@ -491,7 +491,7 @@ static double cd_rendering_project_curso
36
+ while (y_sup - y_inf > 1);
37
+ return (y_inf + y_sup) / 2;
38
+ }
39
+-static double cd_rendering_project_cursor_on_curve (double x0, double y0, double lambda, double alpha, double *fXOnCurve, double *fYOnCurve)
40
++static void cd_rendering_project_cursor_on_curve (double x0, double y0, double lambda, double alpha, double *fXOnCurve, double *fYOnCurve)
41
+ {
42
+ double xM, yM;
43
+ if (my_fParaboleRatio > 1)
44
+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
45
+--- cairo-dock-plugins-3.0.2/dustbin/src/applet-notifications.c 2012-06-15 21:32:58.000000000 +0200
46
++++ cairo-dock-plugins-3.0.2_mod/dustbin/src/applet-notifications.c 2012-09-13 16:26:01.116474822 +0200
47
+@@ -96,6 +96,7 @@ static gboolean _display_result (CDShare
48
+ }
49
+ cairo_dock_discard_task (myData.pInfoTask);
50
+ myData.pInfoTask = NULL;
51
++ return TRUE;
52
+ }
53
+ static void _cd_dustbin_show_info (GtkMenuItem *menu_item, CairoDockModuleInstance *myApplet)
54
+ {
55
cairo-dock-plugins-3.0.1.tar.gz -> cairo-dock-plugins-3.0.2.tar.gz
Changed
Refresh
Refresh
Login required, please
login
or
signup
in order to comment
Request History
etamPL created request over 11 years ago
update to 3.0.2
mrdocs accepted request over 12 years ago
Thanks. Looks good to me!