Docky

Merge lp:~docky-core/docky/drop-rsvg2 into lp:docky

  1. drop-rsvg2
  2. Merge into trunk
Proposed by Rico Tzschichholz
Status: Merged
Merged at revision: 1843
Proposed branch: lp:~docky-core/docky/drop-rsvg2
Merge into: lp:docky
Diff against target: 293 lines (+31/-33)
18 files modified
Docky.CairoHelper/Docky.CairoHelper.csproj (+0/-3)
Docky.CairoHelper/Makefile.am (+1/-2)
Docky.Items/Docky.Items.csproj (+0/-3)
Docky.Items/Makefile.am (+1/-2)
Docky.Services/Docky.Services.csproj (+0/-4)
Docky.Services/Docky.Services.dll.config (+2/-1)
Docky.Services/Docky.Services/Extensions/GdkPixbufExtension.cs (+5/-0)
Docky.Services/Docky.Services/NativeInterop.cs (+17/-0)
Docky.Services/Makefile.am (+2/-3)
Docky/Docky.csproj (+0/-4)
Docky/Makefile.am (+0/-1)
StandardPlugins/Clock/Clock.csproj (+0/-3)
StandardPlugins/Clock/Makefile.am (+0/-1)
StandardPlugins/Clock/src/ClockDockItem.cs (+1/-1)
StandardPlugins/Desktop/Makefile.am (+0/-1)
StandardPlugins/NetworkMonitor/Makefile.am (+0/-1)
StandardPlugins/WorkspaceSwitcher/Makefile.am (+0/-1)
configure.ac (+2/-2)
To merge this branch: bzr merge lp:~docky-core/docky/drop-rsvg2
Reviewer Review Type Date Requested Status
Rico Tzschichholz Approve
Robert Dyer Pending
Review via email: mp+163602@code.launchpad.net
To post a comment you must log in.
lp:~docky-core/docky/drop-rsvg2 updated
1844. By Rico Tzschichholz

services: update dllmap

Revision history for this message
Rico Tzschichholz (ricotz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Docky.CairoHelper/Docky.CairoHelper.csproj'
2--- Docky.CairoHelper/Docky.CairoHelper.csproj 2011-12-22 15:47:35 +0000
3+++ Docky.CairoHelper/Docky.CairoHelper.csproj 2013-05-13 19:51:24 +0000
4@@ -43,9 +43,6 @@
5 <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
6 <Package>gtk-sharp-2.0</Package>
7 </Reference>
8- <Reference Include="rsvg2-sharp, Version=2.18.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
9- <Package>rsvg2-sharp-2.0</Package>
10- </Reference>
11 <Reference Include="System.Core">
12 <RequiredTargetFramework>3.5</RequiredTargetFramework>
13 </Reference>
14
15=== modified file 'Docky.CairoHelper/Makefile.am'
16--- Docky.CairoHelper/Makefile.am 2010-12-29 08:12:28 +0000
17+++ Docky.CairoHelper/Makefile.am 2013-05-13 19:51:24 +0000
18@@ -17,7 +17,6 @@
19 System.Core \
20 $(GLIB_SHARP_20_LIBS) \
21 $(GTK_SHARP_20_LIBS) \
22- $(MONO_CAIRO_LIBS) \
23- $(LIBRSVG_SHARP_LIBS)
24+ $(MONO_CAIRO_LIBS)
25
26 MCS_FLAGS += -unsafe
27
28=== modified file 'Docky.Items/Docky.Items.csproj'
29--- Docky.Items/Docky.Items.csproj 2011-12-22 15:47:35 +0000
30+++ Docky.Items/Docky.Items.csproj 2013-05-13 19:51:24 +0000
31@@ -45,9 +45,6 @@
32 <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
33 <Package>gtk-sharp-2.0</Package>
34 </Reference>
35- <Reference Include="rsvg2-sharp, Version=2.18.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
36- <Package>rsvg2-sharp-2.0</Package>
37- </Reference>
38 <Reference Include="System.Core">
39 <RequiredTargetFramework>3.5</RequiredTargetFramework>
40 </Reference>
41
42=== modified file 'Docky.Items/Makefile.am'
43--- Docky.Items/Makefile.am 2011-01-02 12:42:36 +0000
44+++ Docky.Items/Makefile.am 2013-05-13 19:51:24 +0000
45@@ -60,8 +60,7 @@
46 $(GTK_SHARP_20_LIBS) \
47 $(GLIB_SHARP_20_LIBS) \
48 $(GIO_SHARP_LIBS) \
49- $(LIBRSVG_SHARP_LIBS) \
50 $(WNCK_SHARP_10_LIBS) \
51 $(NOTIFY_SHARP_LIBS)
52-
53+
54 MCS_FLAGS += -unsafe
55
56=== modified file 'Docky.Services/Docky.Services.csproj'
57--- Docky.Services/Docky.Services.csproj 2011-12-22 15:47:35 +0000
58+++ Docky.Services/Docky.Services.csproj 2013-05-13 19:51:24 +0000
59@@ -48,10 +48,6 @@
60 <SpecificVersion>False</SpecificVersion>
61 <Package>gtk-sharp-2.0</Package>
62 </Reference>
63- <Reference Include="rsvg2-sharp, Version=2.18.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
64- <SpecificVersion>False</SpecificVersion>
65- <Package>rsvg2-sharp-2.0</Package>
66- </Reference>
67 <Reference Include="System.Core">
68 <RequiredTargetFramework>3.5</RequiredTargetFramework>
69 </Reference>
70
71=== modified file 'Docky.Services/Docky.Services.dll.config'
72--- Docky.Services/Docky.Services.dll.config 2011-06-11 06:14:27 +0000
73+++ Docky.Services/Docky.Services.dll.config 2013-05-13 19:51:24 +0000
74@@ -1,7 +1,8 @@
75 <configuration>
76 <dllmap dll="libgobject-2.0" target="libgobject-2.0.so.0"/>
77 <dllmap dll="libgtk-x11-2.0" target="libgtk-x11-2.0.so.0"/>
78- <dllmap dll="libgdk-x11-2.0" target="libgdk-x11-2.0.so.0"/>
79+ <dllmap dll="libgdk-x11-2.0" target="libgdk-x11-2.0.so.0"/>
80+ <dllmap dll="libgdk_pixbuf-2.0" target="libgdk_pixbuf-2.0.so.0"/>
81 <dllmap dll="libgio-2.0" target="libgio-2.0.so.0"/>
82 <dllmap dll="libX11" target="libX11.so.6"/>
83 </configuration>
84
85=== modified file 'Docky.Services/Docky.Services/Extensions/GdkPixbufExtension.cs'
86--- Docky.Services/Docky.Services/Extensions/GdkPixbufExtension.cs 2010-11-11 23:33:22 +0000
87+++ Docky.Services/Docky.Services/Extensions/GdkPixbufExtension.cs 2013-05-13 19:51:24 +0000
88@@ -129,5 +129,10 @@
89
90 return tmp;
91 }
92+
93+ public static Pixbuf FromFileAtSize (string filename, int width, int height)
94+ {
95+ return NativeInterop.GdkPixbufNewFromFileAtSize (filename, width, height);
96+ }
97 }
98 }
99
100=== modified file 'Docky.Services/Docky.Services/NativeInterop.cs'
101--- Docky.Services/Docky.Services/NativeInterop.cs 2011-06-11 06:14:27 +0000
102+++ Docky.Services/Docky.Services/NativeInterop.cs 2013-05-13 19:51:24 +0000
103@@ -54,6 +54,9 @@
104 [DllImport("libgtk-x11-2.0", CallingConvention = CallingConvention.Cdecl)]
105 private static extern IntPtr gtk_icon_theme_lookup_by_gicon (IntPtr icon_theme, IntPtr icon, int size, int flags);
106
107+ [DllImport("libgdk_pixbuf-2.0")]
108+ private static extern IntPtr gdk_pixbuf_new_from_file_at_size (string filename, int width, int height, out IntPtr error);
109+
110 #region Workaround for GLib.FileInfo leaks...
111
112 // some attributes must be looked up as bytestrings, not strings
113@@ -108,6 +111,7 @@
114 const string GIO_NOT_FOUND = "Could not find gio-2.0, please report immediately.";
115 const string GOBJECT_NOT_FOUND = "Could not find gobject-2.0, please report immediately.";
116 const string GTK_NOT_FOUND = "Could not find gtk-2.0, please report immediately.";
117+ const string GDK_PIXBUF_NOT_FOUND = "Could not find gdk_pixbuf-2.0, please report immediately.";
118
119 public static string StrUri (File file)
120 {
121@@ -292,6 +296,19 @@
122 "Failed to query icon {0}");
123 }
124
125+ public static Gdk.Pixbuf GdkPixbufNewFromFileAtSize (string filename, int width, int height)
126+ {
127+ return NativeHelper<Gdk.Pixbuf> (() =>
128+ {
129+ IntPtr error = IntPtr.Zero;
130+ IntPtr pixbuf = gdk_pixbuf_new_from_file_at_size (filename, width, height, out error);
131+ if (error != IntPtr.Zero)
132+ throw new GLib.GException (error);
133+ return new Gdk.Pixbuf (pixbuf);
134+ }, GDK_PIXBUF_NOT_FOUND,
135+ "Failed to load pixbuf from file {0}");
136+ }
137+
138 public static void GObjectUnref (IntPtr objectHandle)
139 {
140 NativeHelper (() =>
141
142=== modified file 'Docky.Services/Makefile.am'
143--- Docky.Services/Makefile.am 2010-10-09 12:54:14 +0000
144+++ Docky.Services/Makefile.am 2013-05-13 19:51:24 +0000
145@@ -52,7 +52,7 @@
146
147 PROJECT_REFERENCES= \
148 Docky.CairoHelper
149-
150+
151 REFERENCES = \
152 System \
153 System.Core \
154@@ -66,8 +66,7 @@
155 $(GTK_SHARP_20_LIBS) \
156 $(GNOME_KEYRING_SHARP_LIBS) \
157 $(NOTIFY_SHARP_LIBS) \
158- $(WNCK_SHARP_10_LIBS) \
159- $(LIBRSVG_SHARP_LIBS)
160+ $(WNCK_SHARP_10_LIBS)
161
162 EXTRA_DIST += Docky.Services.dll.config
163
164
165=== modified file 'Docky/Docky.csproj'
166--- Docky/Docky.csproj 2013-05-12 20:15:37 +0000
167+++ Docky/Docky.csproj 2013-05-13 19:51:24 +0000
168@@ -94,10 +94,6 @@
169 <Package>glib-sharp-2.0</Package>
170 </Reference>
171 <Reference Include="System" />
172- <Reference Include="rsvg2-sharp, Version=2.18.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
173- <SpecificVersion>False</SpecificVersion>
174- <Package>rsvg2-sharp-2.0</Package>
175- </Reference>
176 <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
177 <SpecificVersion>False</SpecificVersion>
178 <Package>gtk-sharp-2.0</Package>
179
180=== modified file 'Docky/Makefile.am'
181--- Docky/Makefile.am 2013-05-12 20:15:37 +0000
182+++ Docky/Makefile.am 2013-05-13 19:51:24 +0000
183@@ -71,7 +71,6 @@
184 $(GTK_SHARP_20_LIBS) \
185 $(GKEYFILE_SHARP_LIBS) \
186 $(WNCK_SHARP_10_LIBS) \
187- $(LIBRSVG_SHARP_LIBS) \
188 $(NOTIFY_SHARP_LIBS) \
189 $(DBUS_SHARP_10_LIBS) \
190 $(DBUS_SHARP_GLIB_10_LIBS) \
191
192=== modified file 'StandardPlugins/Clock/Clock.csproj'
193--- StandardPlugins/Clock/Clock.csproj 2011-12-22 15:47:35 +0000
194+++ StandardPlugins/Clock/Clock.csproj 2013-05-13 19:51:24 +0000
195@@ -41,9 +41,6 @@
196 <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
197 <Package>gtk-sharp-2.0</Package>
198 </Reference>
199- <Reference Include="rsvg2-sharp, Version=2.18.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
200- <Package>rsvg2-sharp-2.0</Package>
201- </Reference>
202 <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
203 <Package>gtk-sharp-2.0</Package>
204 </Reference>
205
206=== modified file 'StandardPlugins/Clock/Makefile.am'
207--- StandardPlugins/Clock/Makefile.am 2010-02-22 23:14:53 +0000
208+++ StandardPlugins/Clock/Makefile.am 2013-05-13 19:51:24 +0000
209@@ -26,5 +26,4 @@
210 Mono.Posix \
211 $(GIO_SHARP_LIBS) \
212 $(MONO_CAIRO_LIBS) \
213- $(LIBRSVG_SHARP_LIBS) \
214 $(GTK_SHARP_20_LIBS)
215
216=== modified file 'StandardPlugins/Clock/src/ClockDockItem.cs'
217--- StandardPlugins/Clock/src/ClockDockItem.cs 2011-03-13 16:47:29 +0000
218+++ StandardPlugins/Clock/src/ClockDockItem.cs 2013-05-13 19:51:24 +0000
219@@ -174,7 +174,7 @@
220 if (!File.Exists (file))
221 return;
222
223- using (Gdk.Pixbuf pbuf = Rsvg.Tool.PixbufFromFileAtSize (file, size, size)) {
224+ using (Gdk.Pixbuf pbuf = GdkPixbufExtension.FromFileAtSize (file, size, size)) {
225 Gdk.CairoHelper.SetSourcePixbuf (cr, pbuf, 0, 0);
226 cr.Paint ();
227 }
228
229=== modified file 'StandardPlugins/Desktop/Makefile.am'
230--- StandardPlugins/Desktop/Makefile.am 2010-12-29 08:44:38 +0000
231+++ StandardPlugins/Desktop/Makefile.am 2013-05-13 19:51:24 +0000
232@@ -33,5 +33,4 @@
233 $(GTK_SHARP_20_LIBS) \
234 $(GLIB_SHARP_20_LIBS) \
235 $(GIO_SHARP_LIBS) \
236- $(LIBRSVG_SHARP_LIBS) \
237 $(WNCK_SHARP_10_LIBS)
238
239=== modified file 'StandardPlugins/NetworkMonitor/Makefile.am'
240--- StandardPlugins/NetworkMonitor/Makefile.am 2011-02-24 11:16:13 +0000
241+++ StandardPlugins/NetworkMonitor/Makefile.am 2013-05-13 19:51:24 +0000
242@@ -24,5 +24,4 @@
243 Mono.Posix \
244 $(GIO_SHARP_LIBS) \
245 $(MONO_CAIRO_LIBS) \
246- $(LIBRSVG_SHARP_LIBS) \
247 $(GTK_SHARP_20_LIBS)
248
249=== modified file 'StandardPlugins/WorkspaceSwitcher/Makefile.am'
250--- StandardPlugins/WorkspaceSwitcher/Makefile.am 2010-08-06 08:06:53 +0000
251+++ StandardPlugins/WorkspaceSwitcher/Makefile.am 2013-05-13 19:51:24 +0000
252@@ -25,5 +25,4 @@
253 $(GTK_SHARP_20_LIBS) \
254 $(GLIB_SHARP_20_LIBS) \
255 $(GIO_SHARP_LIBS) \
256- $(LIBRSVG_SHARP_LIBS) \
257 $(WNCK_SHARP_10_LIBS)
258
259=== modified file 'configure.ac'
260--- configure.ac 2013-05-12 20:15:37 +0000
261+++ configure.ac 2013-05-13 19:51:24 +0000
262@@ -64,6 +64,7 @@
263 GTK_REQUIRED_VERSION=2.14.3
264 GLIB_REQUIRED_VERSION=2.22
265 GIO_SHARP_REQUIRED_VERSION=2.22.2
266+GDK_PIXBUF_REQUIRED_VERSION=2.14.3
267 DBUS_SHARP_REQUIRED_VERSION=0.7
268 DBUS_SHARP_GLIB_REQUIRED_VERSION=0.5
269
270@@ -85,7 +86,6 @@
271 PKG_CHECK_MODULES([GKEYFILE_SHARP], [gkeyfile-sharp])
272 PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
273 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
274-PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0])
275 PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
276 PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui])
277 PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup])
278@@ -99,6 +99,7 @@
279 PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED_VERSION)
280 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
281 PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GLIB_REQUIRED_VERSION)
282+PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION)
283
284 AC_SUBST([GCONF_SHARP_20_LIBS])
285 AC_SUBST([GLIB_SHARP_20_LIBS])
286@@ -106,7 +107,6 @@
287 AC_SUBST([GKEYFILE_SHARP_LIBS])
288 AC_SUBST([GNOME_KEYRING_SHARP_LIBS])
289 AC_SUBST([GTK_SHARP_20_LIBS])
290-AC_SUBST([LIBRSVG_SHARP_LIBS])
291 AC_SUBST([MONO_ADDINS_LIBS])
292 AC_SUBST([MONO_ADDINS_GUI_LIBS])
293 AC_SUBST([MONO_ADDINS_SETUP_LIBS])

Subscribers

People subscribed via source and target branches

to status/vote changes: