Merge lp:~noskcaj/ubuntu/trusty/gtk2-engines/merge into lp:ubuntu/trusty/gtk2-engines
- Trusty (14.04)
- merge
- Merge into trusty
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp:~noskcaj/ubuntu/trusty/gtk2-engines/merge |
Merge into: | lp:ubuntu/trusty/gtk2-engines |
Diff against target: |
1246 lines (+79/-922) 29 files modified
.pc/01_libm.patch/engines/clearlooks/Makefile.am (+0/-50) .pc/01_libm.patch/engines/crux/Makefile.am (+0/-25) .pc/01_libm.patch/engines/glide/Makefile.am (+0/-40) .pc/01_libm.patch/engines/hc/Makefile.am (+0/-44) .pc/01_libm.patch/engines/industrial/Makefile.am (+0/-45) .pc/01_libm.patch/engines/lua/Makefile.am (+0/-117) .pc/01_libm.patch/engines/mist/Makefile.am (+0/-22) .pc/01_libm.patch/engines/redmond/Makefile.am (+0/-43) .pc/01_libm.patch/engines/thinice/Makefile.am (+0/-24) .pc/01_libm.patch/test/Makefile.am (+0/-153) .pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c (+0/-341) .pc/applied-patches (+0/-2) debian/changelog (+18/-0) debian/control (+0/-1) debian/control.in (+0/-1) debian/patches/03_automake1.14.patch (+49/-0) debian/patches/series (+1/-0) debian/rules (+0/-3) engines/clearlooks/Makefile.am (+1/-1) engines/clearlooks/src/animation.c (+1/-1) engines/crux/Makefile.am (+1/-1) engines/glide/Makefile.am (+1/-1) engines/hc/Makefile.am (+1/-1) engines/industrial/Makefile.am (+1/-1) engines/lua/Makefile.am (+1/-1) engines/mist/Makefile.am (+1/-1) engines/redmond/Makefile.am (+1/-1) engines/thinice/Makefile.am (+1/-1) test/Makefile.am (+1/-1) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/gtk2-engines/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+199053@code.launchpad.net |
Commit message
Description of the change
Merge from debian, they fixed the automake FTBFS better than we did.
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote : | # |
Thanks. Uploaded.
review:
Approve
Unmerged revisions
- 74. By Jackson Doak
-
* Merge from debian, remaining changes:
- debian/control: Build depend on gnome-common, so we can get a .pot file
to use for launchpad translations
- debian/rules: build translations template
- Update watch file to only track GNOME 2.20 as gtk-engines was then
ported to gtk3 and finally abandoned.
* Drop our automake fix, debian now supports the new version
* Fix FTBS due to automake bug (Closes: #713353) - 73. By Jackson Doak
-
Merging shared upstream rev into target branch.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed directory '.pc/01_libm.patch' |
2 | === removed directory '.pc/01_libm.patch/engines' |
3 | === removed directory '.pc/01_libm.patch/engines/clearlooks' |
4 | === removed file '.pc/01_libm.patch/engines/clearlooks/Makefile.am' |
5 | --- .pc/01_libm.patch/engines/clearlooks/Makefile.am 2011-11-13 18:42:27 +0000 |
6 | +++ .pc/01_libm.patch/engines/clearlooks/Makefile.am 1970-01-01 00:00:00 +0000 |
7 | @@ -1,50 +0,0 @@ |
8 | -# Clearlooks - a cairo based GTKengine |
9 | -# Copyright (C) 2005-2006 Andrew Johnson <acjgenius@earthlink.net> |
10 | -# Copyright (C) 2006-2007 Benjamin Berg <benjamin@sipsolutions.net> |
11 | -# |
12 | -# This library is free software; you can redistribute it and/or |
13 | -# modify it under the terms of the GNU Lesser General Public |
14 | -# License as published by the Free Software Foundation; either |
15 | -# version 2.1 of the License, or (at your option) any later version. |
16 | -# |
17 | -# This library is distributed in the hope that it will be useful, |
18 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
19 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
20 | -# Lesser General Public License for more details. |
21 | -# |
22 | -# You should have received a copy of the GNU Lesser General Public |
23 | -# License along with this library; if not, write to the Free Software |
24 | -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
25 | -# |
26 | -# Project contact: <gnome-themes-list@gnome.org> |
27 | -# |
28 | - |
29 | -INCLUDES = -I$(top_srcdir)/engines/support \ |
30 | - $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) |
31 | - |
32 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
33 | -engine_LTLIBRARIES = libclearlooks.la |
34 | - |
35 | -libclearlooks_la_SOURCES = \ |
36 | - ./src/clearlooks_rc_style.c \ |
37 | - ./src/clearlooks_rc_style.h \ |
38 | - ./src/clearlooks_style.c \ |
39 | - ./src/clearlooks_style.h \ |
40 | - ./src/clearlooks_theme_main.c \ |
41 | - ./src/support.c \ |
42 | - ./src/animation.c \ |
43 | - ./src/animation.h \ |
44 | - ./src/support.h \ |
45 | - ./src/clearlooks_draw.c \ |
46 | - ./src/clearlooks_draw_glossy.c \ |
47 | - ./src/clearlooks_draw_inverted.c \ |
48 | - ./src/clearlooks_draw_gummy.c \ |
49 | - ./src/clearlooks_draw.h \ |
50 | - ./src/clearlooks_types.h |
51 | - |
52 | -libclearlooks_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
53 | -libclearlooks_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
54 | - |
55 | - |
56 | --include $(top_srcdir)/git.mk |
57 | - |
58 | |
59 | === removed directory '.pc/01_libm.patch/engines/crux' |
60 | === removed file '.pc/01_libm.patch/engines/crux/Makefile.am' |
61 | --- .pc/01_libm.patch/engines/crux/Makefile.am 2011-11-13 18:42:27 +0000 |
62 | +++ .pc/01_libm.patch/engines/crux/Makefile.am 1970-01-01 00:00:00 +0000 |
63 | @@ -1,25 +0,0 @@ |
64 | -INCLUDES = -I$(top_srcdir)/engines/support \ |
65 | - $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) |
66 | - |
67 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
68 | - |
69 | -engine_LTLIBRARIES = libcrux-engine.la |
70 | - |
71 | -EXTRA_DIST = \ |
72 | - ./AUTHORS |
73 | - |
74 | -libcrux_engine_la_SOURCES = \ |
75 | - ./src/crux.h \ |
76 | - ./src/crux-draw.c \ |
77 | - ./src/crux-draw.h \ |
78 | - ./src/crux-main.c \ |
79 | - ./src/crux-style.c \ |
80 | - ./src/crux-style.h \ |
81 | - ./src/crux-rc-style.c \ |
82 | - ./src/crux-rc-style.h |
83 | - |
84 | -libcrux_engine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
85 | -libcrux_engine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
86 | - |
87 | --include $(top_srcdir)/git.mk |
88 | - |
89 | |
90 | === removed directory '.pc/01_libm.patch/engines/glide' |
91 | === removed file '.pc/01_libm.patch/engines/glide/Makefile.am' |
92 | --- .pc/01_libm.patch/engines/glide/Makefile.am 2011-11-13 18:42:27 +0000 |
93 | +++ .pc/01_libm.patch/engines/glide/Makefile.am 1970-01-01 00:00:00 +0000 |
94 | @@ -1,40 +0,0 @@ |
95 | -# Glide - a cairo based GTK+ engine |
96 | -# Copyright (C) 2006 Andrew Johnson <acjgenius@earthlink.net> |
97 | -# |
98 | -# This library is free software; you can redistribute it and/or |
99 | -# modify it under the terms of the GNU Lesser General Public |
100 | -# License as published by the Free Software Foundation; either |
101 | -# version 2.1 of the License, or (at your option) any later version. |
102 | -# |
103 | -# This library is distributed in the hope that it will be useful, |
104 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
105 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
106 | -# Lesser General Public License for more details. |
107 | -# |
108 | -# You should have received a copy of the GNU Lesser General Public |
109 | -# License along with this library; if not, write to the Free Software |
110 | -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
111 | -# |
112 | -# Project contact: <gnome-themes-list@gnome.org> |
113 | -# |
114 | - |
115 | -INCLUDES = -I$(top_srcdir)/engines/support \ |
116 | - $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) |
117 | - |
118 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
119 | - |
120 | -engine_LTLIBRARIES = libglide.la |
121 | - |
122 | -libglide_la_SOURCES = \ |
123 | - ./src/glide_gtk2_support.c \ |
124 | - ./src/glide_gtk2_support.h \ |
125 | - ./src/glide_gtk2_drawing.c \ |
126 | - ./src/glide_gtk2_drawing.h \ |
127 | - ./src/glide_gtk2_engine.c \ |
128 | - ./src/glide_gtk2_engine.h |
129 | - |
130 | -libglide_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
131 | -libglide_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
132 | - |
133 | --include $(top_srcdir)/git.mk |
134 | - |
135 | |
136 | === removed directory '.pc/01_libm.patch/engines/hc' |
137 | === removed file '.pc/01_libm.patch/engines/hc/Makefile.am' |
138 | --- .pc/01_libm.patch/engines/hc/Makefile.am 2011-11-13 18:42:27 +0000 |
139 | +++ .pc/01_libm.patch/engines/hc/Makefile.am 1970-01-01 00:00:00 +0000 |
140 | @@ -1,44 +0,0 @@ |
141 | -# High Contrast - a cairo based GTK+ engine |
142 | -# Copyright (C) 2003 Sun Microsystems Inc. |
143 | -# Copyright (C) 2005-2006 Andrew Johnson <acjgenius@earthlink.net> |
144 | -# |
145 | -# This library is free software; you can redistribute it and/or |
146 | -# modify it under the terms of the GNU Lesser General Public |
147 | -# License as published by the Free Software Foundation; either |
148 | -# version 2.1 of the License, or (at your option) any later version. |
149 | -# |
150 | -# This library is distributed in the hope that it will be useful, |
151 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
152 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
153 | -# Lesser General Public License for more details. |
154 | -# |
155 | -# You should have received a copy of the GNU Lesser General Public |
156 | -# License along with this library; if not, write to the Free Software |
157 | -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
158 | -# |
159 | -# Project contact: <gnome-themes-list@gnome.org> |
160 | -# |
161 | - |
162 | -INCLUDES = -I$(top_srcdir)/engines/support \ |
163 | - $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) |
164 | - |
165 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
166 | - |
167 | -engine_LTLIBRARIES = libhcengine.la |
168 | - |
169 | -EXTRA_DIST = \ |
170 | - ./AUTHORS |
171 | - |
172 | -libhcengine_la_SOURCES = \ |
173 | - ./src/hc_gtk2_engine.c \ |
174 | - ./src/hc_gtk2_engine.h \ |
175 | - ./src/hc_gtk2_support.c \ |
176 | - ./src/hc_gtk2_support.h \ |
177 | - ./src/hc_gtk2_drawing.h \ |
178 | - ./src/hc-style.c |
179 | - |
180 | -libhcengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
181 | -libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
182 | - |
183 | --include $(top_srcdir)/git.mk |
184 | - |
185 | |
186 | === removed directory '.pc/01_libm.patch/engines/industrial' |
187 | === removed file '.pc/01_libm.patch/engines/industrial/Makefile.am' |
188 | --- .pc/01_libm.patch/engines/industrial/Makefile.am 2011-11-13 18:42:27 +0000 |
189 | +++ .pc/01_libm.patch/engines/industrial/Makefile.am 1970-01-01 00:00:00 +0000 |
190 | @@ -1,45 +0,0 @@ |
191 | -# Clearlooks - a cairo based GTKengine |
192 | -# Copyright (C) 2001 Red Hat, Inc. |
193 | -# Copyright (C) 2002 Ximian, Inc. |
194 | -# Copyright (C) 2006 Benjamin Berg <benjamin@sipsolutions.net> |
195 | -# |
196 | -# This library is free software; you can redistribute it and/or |
197 | -# modify it under the terms of the GNU Lesser General Public |
198 | -# License as published by the Free Software Foundation; either |
199 | -# version 2.1 of the License, or (at your option) any later version. |
200 | -# |
201 | -# This library is distributed in the hope that it will be useful, |
202 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
203 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
204 | -# Lesser General Public License for more details. |
205 | -# |
206 | -# You should have received a copy of the GNU Lesser General Public |
207 | -# License along with this library; if not, write to the Free Software |
208 | -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
209 | -# |
210 | -# Project contact: <gnome-themes-list@gnome.org> |
211 | -# |
212 | - |
213 | -INCLUDES = -I$(top_srcdir)/engines/support \ |
214 | - $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) |
215 | - |
216 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
217 | - |
218 | -engine_LTLIBRARIES = libindustrial.la |
219 | - |
220 | -libindustrial_la_SOURCES = \ |
221 | - ./src/industrial_rc_style.c \ |
222 | - ./src/industrial_rc_style.h \ |
223 | - ./src/industrial_style.c \ |
224 | - ./src/industrial_style.h \ |
225 | - ./src/industrial_theme_main.c |
226 | - |
227 | -EXTRA_DIST = \ |
228 | - ./src/parse_rc_style.h \ |
229 | - ./AUTHORS |
230 | - |
231 | -libindustrial_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
232 | -libindustrial_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
233 | - |
234 | --include $(top_srcdir)/git.mk |
235 | - |
236 | |
237 | === removed directory '.pc/01_libm.patch/engines/lua' |
238 | === removed file '.pc/01_libm.patch/engines/lua/Makefile.am' |
239 | --- .pc/01_libm.patch/engines/lua/Makefile.am 2011-11-13 18:42:27 +0000 |
240 | +++ .pc/01_libm.patch/engines/lua/Makefile.am 1970-01-01 00:00:00 +0000 |
241 | @@ -1,117 +0,0 @@ |
242 | -# LUA - a LUA scriptable GTK+ engine |
243 | -# Copyright (C) 2006 Daniel Borgmann <daniel.borgmann@gmail.com> |
244 | -# |
245 | -# This library is free software; you can redistribute it and/or |
246 | -# modify it under the terms of the GNU Lesser General Public |
247 | -# License as published by the Free Software Foundation; either |
248 | -# version 2.1 of the License, or (at your option) any later version. |
249 | -# |
250 | -# This library is distributed in the hope that it will be useful, |
251 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
252 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
253 | -# Lesser General Public License for more details. |
254 | -# |
255 | -# You should have received a copy of the GNU Lesser General Public |
256 | -# License along with this library; if not, write to the Free Software |
257 | -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
258 | -# |
259 | -# Project contact: <gnome-themes-list@gnome.org> |
260 | -# |
261 | - |
262 | - |
263 | -NULL = |
264 | - |
265 | -LIBLUA_FILES = \ |
266 | - ./src/liblua/lapi.h \ |
267 | - ./src/liblua/lauxlib.h \ |
268 | - ./src/liblua/lcode.h \ |
269 | - ./src/liblua/ldebug.h \ |
270 | - ./src/liblua/ldo.h \ |
271 | - ./src/liblua/lfunc.h \ |
272 | - ./src/liblua/lgc.h \ |
273 | - ./src/liblua/llex.h \ |
274 | - ./src/liblua/llimits.h \ |
275 | - ./src/liblua/lmem.h \ |
276 | - ./src/liblua/lobject.h \ |
277 | - ./src/liblua/lopcodes.h \ |
278 | - ./src/liblua/lparser.h \ |
279 | - ./src/liblua/lstate.h \ |
280 | - ./src/liblua/lstring.h \ |
281 | - ./src/liblua/ltable.h \ |
282 | - ./src/liblua/ltm.h \ |
283 | - ./src/liblua/lua.h \ |
284 | - ./src/liblua/luaconf.h \ |
285 | - ./src/liblua/lualib.h \ |
286 | - ./src/liblua/lundump.h \ |
287 | - ./src/liblua/lvm.h \ |
288 | - ./src/liblua/lzio.h \ |
289 | - ./src/liblua/lapi.c \ |
290 | - ./src/liblua/lcode.c \ |
291 | - ./src/liblua/ldebug.c \ |
292 | - ./src/liblua/ldo.c \ |
293 | - ./src/liblua/ldump.c \ |
294 | - ./src/liblua/lfunc.c \ |
295 | - ./src/liblua/lgc.c \ |
296 | - ./src/liblua/liolib.c \ |
297 | - ./src/liblua/llex.c \ |
298 | - ./src/liblua/lmem.c \ |
299 | - ./src/liblua/lobject.c \ |
300 | - ./src/liblua/lopcodes.c \ |
301 | - ./src/liblua/loslib.c \ |
302 | - ./src/liblua/lparser.c \ |
303 | - ./src/liblua/lstate.c \ |
304 | - ./src/liblua/lstring.c \ |
305 | - ./src/liblua/lstrlib.c \ |
306 | - ./src/liblua/ltable.c \ |
307 | - ./src/liblua/ltablib.c \ |
308 | - ./src/liblua/ltm.c \ |
309 | - ./src/liblua/lundump.c \ |
310 | - ./src/liblua/lvm.c \ |
311 | - ./src/liblua/lzio.c \ |
312 | - ./src/liblua/lauxlib.c \ |
313 | - ./src/liblua/lbaselib.c \ |
314 | - ./src/liblua/ldblib.c \ |
315 | - ./src/liblua/lmathlib.c \ |
316 | - ./src/liblua/loadlib.c \ |
317 | - ./src/liblua/linit.c |
318 | - |
319 | -if SYSTEM_LUA |
320 | -LIBLUA_SOURCES = |
321 | -LIBLUA_CFLAGS = $(LUA_CFLAGS) |
322 | -EXTRA_DIST = $(LIBLUA_FILES) |
323 | -else |
324 | -LIBLUA_CFLAGS = -I$(top_srcdir)/engines/lua/src/liblua |
325 | -LIBLUA_SOURCES = $(LIBLUA_FILES) |
326 | -EXTRA_DIST = |
327 | -endif |
328 | - |
329 | -INCLUDES = \ |
330 | - -I$(top_srcdir)/engines/support \ |
331 | - $(LIBLUA_CFLAGS) $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \ |
332 | - $(NULL) |
333 | - |
334 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
335 | -engine_LTLIBRARIES = libluaengine.la |
336 | - |
337 | -libluaengine_la_SOURCES = \ |
338 | - ./src/draw_lib.c \ |
339 | - ./src/draw_lib.h \ |
340 | - ./src/draw_utils.c \ |
341 | - ./src/draw_utils.h \ |
342 | - ./src/lua_rc_style.c \ |
343 | - ./src/lua_rc_style.h \ |
344 | - ./src/lua_style.c \ |
345 | - ./src/lua_style.h \ |
346 | - ./src/lua_utils.c \ |
347 | - ./src/lua_utils.h \ |
348 | - ./src/main.c \ |
349 | - ./src/misc_utils.c \ |
350 | - ./src/misc_utils.h \ |
351 | - $(LIBLUA_SOURCES) \ |
352 | - $(NULL) |
353 | - |
354 | -libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
355 | -libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS) |
356 | - |
357 | --include $(top_srcdir)/git.mk |
358 | - |
359 | |
360 | === removed directory '.pc/01_libm.patch/engines/mist' |
361 | === removed file '.pc/01_libm.patch/engines/mist/Makefile.am' |
362 | --- .pc/01_libm.patch/engines/mist/Makefile.am 2011-11-13 18:42:27 +0000 |
363 | +++ .pc/01_libm.patch/engines/mist/Makefile.am 1970-01-01 00:00:00 +0000 |
364 | @@ -1,22 +0,0 @@ |
365 | -INCLUDES = -I$(top_srcdir)/engines/support \ |
366 | - $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) |
367 | - |
368 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
369 | - |
370 | -engine_LTLIBRARIES = libmist.la |
371 | - |
372 | -EXTRA_DIST = \ |
373 | - ./AUTHORS |
374 | - |
375 | -libmist_la_SOURCES = \ |
376 | - ./src/mist-rc-style.c \ |
377 | - ./src/mist-rc-style.h \ |
378 | - ./src/mist-style.c \ |
379 | - ./src/mist-style.h \ |
380 | - ./src/mist.c |
381 | - |
382 | -libmist_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
383 | -libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
384 | - |
385 | --include $(top_srcdir)/git.mk |
386 | - |
387 | |
388 | === removed directory '.pc/01_libm.patch/engines/redmond' |
389 | === removed file '.pc/01_libm.patch/engines/redmond/Makefile.am' |
390 | --- .pc/01_libm.patch/engines/redmond/Makefile.am 2011-11-13 18:42:27 +0000 |
391 | +++ .pc/01_libm.patch/engines/redmond/Makefile.am 1970-01-01 00:00:00 +0000 |
392 | @@ -1,43 +0,0 @@ |
393 | -# Redmond95 - a cairo based GTK+ engine |
394 | -# Copyright (C) 2001 Red Hat, Inc. |
395 | -# Copyright (C) 2006 Andrew Johnson <acjgenius@earthlink.net> |
396 | -# |
397 | -# This library is free software; you can redistribute it and/or |
398 | -# modify it under the terms of the GNU Lesser General Public |
399 | -# License as published by the Free Software Foundation; either |
400 | -# version 2.1 of the License, or (at your option) any later version. |
401 | -# |
402 | -# This library is distributed in the hope that it will be useful, |
403 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
404 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
405 | -# Lesser General Public License for more details. |
406 | -# |
407 | -# You should have received a copy of the GNU Lesser General Public |
408 | -# License along with this library; if not, write to the Free Software |
409 | -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
410 | -# |
411 | -# Project contact: <gnome-themes-list@gnome.org> |
412 | -# |
413 | - |
414 | - |
415 | -INCLUDES = -I$(top_srcdir)/engines/support \ |
416 | - $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) |
417 | - |
418 | - |
419 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
420 | - |
421 | -engine_LTLIBRARIES = libredmond95.la |
422 | - |
423 | -libredmond95_la_SOURCES = \ |
424 | - ./src/redmond_gtk2_misc.c \ |
425 | - ./src/redmond_gtk2_misc.h \ |
426 | - ./src/redmond_gtk2_drawing.c \ |
427 | - ./src/redmond_gtk2_drawing.h \ |
428 | - ./src/redmond_gtk2_engine.c \ |
429 | - ./src/redmond_gtk2_engine.h |
430 | - |
431 | -libredmond95_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
432 | -libredmond95_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
433 | - |
434 | --include $(top_srcdir)/git.mk |
435 | - |
436 | |
437 | === removed directory '.pc/01_libm.patch/engines/thinice' |
438 | === removed file '.pc/01_libm.patch/engines/thinice/Makefile.am' |
439 | --- .pc/01_libm.patch/engines/thinice/Makefile.am 2011-11-13 18:42:27 +0000 |
440 | +++ .pc/01_libm.patch/engines/thinice/Makefile.am 1970-01-01 00:00:00 +0000 |
441 | @@ -1,24 +0,0 @@ |
442 | -INCLUDES = -I$(top_srcdir)/engines/support \ |
443 | - $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) |
444 | - |
445 | -enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
446 | - |
447 | -engine_LTLIBRARIES = libthinice.la |
448 | - |
449 | -EXTRA_DIST = \ |
450 | - ./AUTHORS |
451 | - |
452 | -libthinice_la_SOURCES = \ |
453 | - ./src/thinice_rc_style.c \ |
454 | - ./src/thinice_rc_style.h \ |
455 | - ./src/thinice_style.h \ |
456 | - ./src/thinice_misc.h \ |
457 | - ./src/thinice_misc.c \ |
458 | - ./src/thinice_theme_draw.c \ |
459 | - ./src/thinice_main.c |
460 | - |
461 | -libthinice_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
462 | -libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
463 | - |
464 | --include $(top_srcdir)/git.mk |
465 | - |
466 | |
467 | === removed directory '.pc/01_libm.patch/test' |
468 | === removed file '.pc/01_libm.patch/test/Makefile.am' |
469 | --- .pc/01_libm.patch/test/Makefile.am 2011-11-13 18:42:27 +0000 |
470 | +++ .pc/01_libm.patch/test/Makefile.am 1970-01-01 00:00:00 +0000 |
471 | @@ -1,153 +0,0 @@ |
472 | -# gtk-engines - a collection of drawing engines for GTK+ |
473 | -# Copyright (C) 2007 Benjamin Berg <benjamin@sipsolutions.net> |
474 | -# |
475 | -# This library is free software; you can redistribute it and/or |
476 | -# modify it under the terms of the GNU Lesser General Public |
477 | -# License as published by the Free Software Foundation; either |
478 | -# version 2.1 of the License, or (at your option) any later version. |
479 | -# |
480 | -# This library is distributed in the hope that it will be useful, |
481 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
482 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
483 | -# Lesser General Public License for more details. |
484 | -# |
485 | -# You should have received a copy of the GNU Lesser General Public |
486 | -# License along with this library; if not, write to the Free Software |
487 | -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
488 | -# |
489 | -# Project contact: <gnome-themes-list@gnome.org> |
490 | -# |
491 | - |
492 | - |
493 | -# Initilize TESTS and XFAIL_TESTS |
494 | -TESTS = |
495 | -XFAIL_TESTS = |
496 | - |
497 | -GTKRCS = \ |
498 | - gtkrcs/buildin \ |
499 | - gtkrcs/clearlooks \ |
500 | - gtkrcs/clearlooks-glossy \ |
501 | - gtkrcs/clearlooks-inverted \ |
502 | - gtkrcs/clearlooks-gummy \ |
503 | - gtkrcs/crux \ |
504 | - gtkrcs/glide \ |
505 | - gtkrcs/hc \ |
506 | - gtkrcs/industrial \ |
507 | - gtkrcs/mist \ |
508 | - gtkrcs/redmond \ |
509 | - gtkrcs/thinice |
510 | - |
511 | -EXTRA_DIST = exported torture runinx valgrind-suppressions $(GTKRCS) |
512 | - |
513 | - |
514 | -EXTRA_PROGRAMS = torturetest |
515 | -torturetest_CFLAGS = $(GTK_CFLAGS) |
516 | -torturetest_LDFLAGS = $(GTK_LIBS) |
517 | - |
518 | - |
519 | - |
520 | -# Setup enviroment variables for GTK+ |
521 | -# ie. add $(top_builddir)/tests to the module searchpath, so that GTK+ finds |
522 | -# the engines in tests/engines |
523 | -# Also set the debug-blocks debugging of g_slice, will be overridden during the valgrind test. |
524 | -# Unset GTK_MODULES to not load a11y stuff or similar. |
525 | -TESTS_ENVIRONMENT=GTK_PATH="." G_SLICE=debug-blocks GTK_MODULES="" |
526 | - |
527 | -VALGRIND_COMMAND=valgrind --leak-resolution=high --leak-check=full --suppressions=$(srcdir)/valgrind-suppressions --num-callers=20 --log-file=valgrind-logs/THEME |
528 | -# set some flags to make glib more valgrind friendly |
529 | -VALGRIND_ENV=G_SLICE=always-malloc G_DEBUG=gc-friendly,resident-modules |
530 | - |
531 | -################################################################# |
532 | -################################################################# |
533 | - |
534 | -############################################################# |
535 | -# Exported Symbols Test - Tests all engines unconditionally |
536 | -############################################################# |
537 | -# Prefix with exported_ |
538 | -EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) |
539 | - |
540 | -TESTS += $(EXPORTED_SYMBOLS_TESTS) |
541 | - |
542 | - |
543 | -############################################################# |
544 | -# Torture Test |
545 | -############################################################# |
546 | -SUPPORTED_TORTURE_TEST_ENGINES = \ |
547 | - clearlooks \ |
548 | - crux \ |
549 | - glide \ |
550 | - hc \ |
551 | - industrial \ |
552 | - mist \ |
553 | - redmond \ |
554 | - thinice |
555 | - |
556 | -# Filter engines that are not build from the set of engines |
557 | -TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES)) |
558 | -# Prefix with torture_ |
559 | -TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) |
560 | - |
561 | -# Add TORTURE_TEST_ENGINES to list of tests |
562 | -TESTS += $(TORTURE_TEST_TESTS) |
563 | - |
564 | -# Possible other tests: |
565 | -# - An extensive theme switch tests that loads/unloads the engine |
566 | -# multiple times. A requirement here is that multiple rc styles need |
567 | -# to be merged. |
568 | -# - RC style merging? Don't think there is a way to do that. |
569 | -# - Maybe a visual test that looks for visible changes? That way one can |
570 | -# check that a modification does not break anything. (eg. when doing |
571 | -# code cleanups) |
572 | -# - I would love to have some coverage statistics for the torture test |
573 | -# anyone knows how to do that? |
574 | - |
575 | -################################################################# |
576 | -################################################################# |
577 | - |
578 | -engines: |
579 | - -rm -rf engines |
580 | - mkdir engines |
581 | - cd engines; \ |
582 | - for engine in $(BUILD_ENGINES); do \ |
583 | - # Fail if the engine does not exist. \ |
584 | - # Maybe we should force a build or something? \ |
585 | - if [ ! -f ../$(top_builddir)/engines/$$engine/.libs/*.so ]; then \ |
586 | - exit 1; \ |
587 | - fi; \ |
588 | - ln -s ../$(top_builddir)/engines/$$engine/.libs/*.so lib$$engine.so ; \ |
589 | - done; |
590 | - |
591 | -CLEANFILES = \ |
592 | - torture_buildin-failed \ |
593 | - $(EXTRA_PROGRAMS) |
594 | - |
595 | -clean-local: |
596 | - -$(RM) torture_* |
597 | - -$(RM) exported_* |
598 | - -$(RM) -r engines |
599 | - -$(RM) -r valgrind-logs |
600 | - -$(RM) -r symbols |
601 | - |
602 | -valgrind-logs: |
603 | - -$(RM) -r valgrind-logs |
604 | - mkdir valgrind-logs |
605 | - |
606 | -symbols: |
607 | - mkdir symbols |
608 | - |
609 | -torture_%: torture torturetest engines |
610 | - cp $(srcdir)/torture $@ |
611 | - |
612 | -exported_%: exported engines symbols |
613 | - cp $(srcdir)/exported $@ |
614 | - |
615 | -check-valgrind: valgrind-logs |
616 | - $(MAKE) $(AM_MAKEFLAGS) check TESTS_ENVIRONMENT="$(TESTS_ENVIRONMENT) $(VALGRIND_ENV) EXEC_WRAPPER=\"$(VALGRIND_COMMAND)\"" |
617 | - |
618 | -test: |
619 | - @$(MAKE) $(AM_MAKEFLAGS) check |
620 | - |
621 | -.PHONY: engines valgrind-logs |
622 | - |
623 | --include $(top_srcdir)/git.mk |
624 | - |
625 | |
626 | === removed directory '.pc/02_glib-single-include.patch' |
627 | === removed directory '.pc/02_glib-single-include.patch/engines' |
628 | === removed directory '.pc/02_glib-single-include.patch/engines/clearlooks' |
629 | === removed directory '.pc/02_glib-single-include.patch/engines/clearlooks/src' |
630 | === removed file '.pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c' |
631 | --- .pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c 2012-03-25 23:51:08 +0000 |
632 | +++ .pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c 1970-01-01 00:00:00 +0000 |
633 | @@ -1,341 +0,0 @@ |
634 | -/* Clearlooks - a cairo based GTK+ engine |
635 | - * Copyright (C) 2006 Kulyk Nazar <schamane@myeburg.net> |
636 | - * Copyright (C) 2006-2007 Benjamin Berg <benjamin@sipsolutions.net> |
637 | - * |
638 | - * This library is free software; you can redistribute it and/or |
639 | - * modify it under the terms of the GNU Lesser General Public |
640 | - * License as published by the Free Software Foundation; either |
641 | - * version 2.1 of the License, or (at your option) any later version. |
642 | - * |
643 | - * This library is distributed in the hope that it will be useful, |
644 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
645 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
646 | - * Lesser General Public License for more details. |
647 | - * |
648 | - * You should have received a copy of the GNU Lesser General Public |
649 | - * License along with this library; if not, write to the Free Software |
650 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
651 | - * |
652 | - * Project contact: <gnome-themes-list@gnome.org> |
653 | - * |
654 | - * |
655 | - * This code is responsible for the clearlooks animation support. The code |
656 | - * works by forcing a redraw on the animated widget. |
657 | - * |
658 | - */ |
659 | - |
660 | - |
661 | -#include "animation.h" |
662 | - |
663 | -#ifdef HAVE_WORKING_ANIMATION |
664 | -#include <glib/gtimer.h> |
665 | - |
666 | -struct _AnimationInfo { |
667 | - GTimer *timer; |
668 | - |
669 | - gdouble start_modifier; |
670 | - gdouble stop_time; |
671 | - GtkWidget *widget; |
672 | -}; |
673 | -typedef struct _AnimationInfo AnimationInfo; |
674 | - |
675 | -struct _SignalInfo { |
676 | - GtkWidget *widget; |
677 | - gulong handler_id; |
678 | -}; |
679 | -typedef struct _SignalInfo SignalInfo; |
680 | - |
681 | -static GSList *connected_widgets = NULL; |
682 | -static GHashTable *animated_widgets = NULL; |
683 | -static int animation_timer_id = 0; |
684 | - |
685 | - |
686 | -static gboolean animation_timeout_handler (gpointer data); |
687 | - |
688 | -/* This forces a redraw on a widget */ |
689 | -static void |
690 | -force_widget_redraw (GtkWidget *widget) |
691 | -{ |
692 | - if (GE_IS_PROGRESS_BAR (widget)) |
693 | - gtk_widget_queue_resize (widget); |
694 | - else |
695 | - gtk_widget_queue_draw (widget); |
696 | -} |
697 | - |
698 | -/* ensures that the timer is running */ |
699 | -static void |
700 | -start_timer () |
701 | -{ |
702 | - if (animation_timer_id == 0) |
703 | - animation_timer_id = g_timeout_add (ANIMATION_DELAY, animation_timeout_handler, NULL); |
704 | -} |
705 | - |
706 | -/* ensures that the timer is stopped */ |
707 | -static void |
708 | -stop_timer () |
709 | -{ |
710 | - if (animation_timer_id != 0) |
711 | - { |
712 | - g_source_remove(animation_timer_id); |
713 | - animation_timer_id = 0; |
714 | - } |
715 | -} |
716 | - |
717 | - |
718 | -/* destroys an AnimationInfo structure including the GTimer */ |
719 | -static void |
720 | -animation_info_destroy (AnimationInfo *animation_info) |
721 | -{ |
722 | - g_timer_destroy (animation_info->timer); |
723 | - g_free (animation_info); |
724 | -} |
725 | - |
726 | - |
727 | -/* This function does not unref the weak reference, because the object |
728 | - * is beeing destroyed currently. */ |
729 | -static void |
730 | -on_animated_widget_destruction (gpointer data, GObject *object) |
731 | -{ |
732 | - /* steal the animation info from the hash table (destroying it would |
733 | - * result in the weak reference to be unrefed, which does not work |
734 | - * as the widget is already destroyed. */ |
735 | - g_hash_table_steal (animated_widgets, object); |
736 | - animation_info_destroy ((AnimationInfo*) data); |
737 | -} |
738 | - |
739 | -/* This function also needs to unref the weak reference. */ |
740 | -static void |
741 | -destroy_animation_info_and_weak_unref (gpointer data) |
742 | -{ |
743 | - AnimationInfo *animation_info = data; |
744 | - |
745 | - /* force a last redraw. This is so that if the animation is removed, |
746 | - * the widget is left in a sane state. */ |
747 | - force_widget_redraw (animation_info->widget); |
748 | - |
749 | - g_object_weak_unref (G_OBJECT (animation_info->widget), on_animated_widget_destruction, data); |
750 | - animation_info_destroy (animation_info); |
751 | -} |
752 | - |
753 | -/* Find and return a pointer to the data linked to this widget, if it exists */ |
754 | -static AnimationInfo* |
755 | -lookup_animation_info (const GtkWidget *widget) |
756 | -{ |
757 | - if (animated_widgets) |
758 | - return g_hash_table_lookup (animated_widgets, widget); |
759 | - |
760 | - return NULL; |
761 | -} |
762 | - |
763 | -/* Create all the relevant information for the animation, and insert it into the hash table. */ |
764 | -static void |
765 | -add_animation (const GtkWidget *widget, gdouble stop_time) |
766 | -{ |
767 | - AnimationInfo *value; |
768 | - |
769 | - /* object already in the list, do not add it twice */ |
770 | - if (lookup_animation_info (widget)) |
771 | - return; |
772 | - |
773 | - if (animated_widgets == NULL) |
774 | - animated_widgets = g_hash_table_new_full (g_direct_hash, g_direct_equal, |
775 | - NULL, destroy_animation_info_and_weak_unref); |
776 | - |
777 | - value = g_new(AnimationInfo, 1); |
778 | - |
779 | - value->widget = (GtkWidget*) widget; |
780 | - |
781 | - value->timer = g_timer_new (); |
782 | - value->stop_time= stop_time; |
783 | - value->start_modifier = 0.0; |
784 | - |
785 | - g_object_weak_ref (G_OBJECT (widget), on_animated_widget_destruction, value); |
786 | - g_hash_table_insert (animated_widgets, (GtkWidget*) widget, value); |
787 | - |
788 | - start_timer (); |
789 | -} |
790 | - |
791 | -/* update the animation information for each widget. This will also queue a redraw |
792 | - * and stop the animation if it is done. */ |
793 | -static gboolean |
794 | -update_animation_info (gpointer key, gpointer value, gpointer user_data) |
795 | -{ |
796 | - AnimationInfo *animation_info = value; |
797 | - GtkWidget *widget = key; |
798 | - |
799 | - g_assert ((widget != NULL) && (animation_info != NULL)); |
800 | - |
801 | - /* remove the widget from the hash table if it is not drawable */ |
802 | - if (!GTK_WIDGET_DRAWABLE (widget)) |
803 | - { |
804 | - return TRUE; |
805 | - } |
806 | - |
807 | - if (GE_IS_PROGRESS_BAR (widget)) |
808 | - { |
809 | - gfloat fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (widget)); |
810 | - |
811 | - /* stop animation for filled/not filled progress bars */ |
812 | - if (fraction <= 0.0 || fraction >= 1.0) |
813 | - return TRUE; |
814 | - } |
815 | - |
816 | - force_widget_redraw (widget); |
817 | - |
818 | - /* stop at stop_time */ |
819 | - if (animation_info->stop_time != 0 && |
820 | - g_timer_elapsed (animation_info->timer, NULL) > animation_info->stop_time) |
821 | - return TRUE; |
822 | - |
823 | - return FALSE; |
824 | -} |
825 | - |
826 | -/* This gets called by the glib main loop every once in a while. */ |
827 | -static gboolean |
828 | -animation_timeout_handler (gpointer data) |
829 | -{ |
830 | - /*g_print("** TICK **\n");*/ |
831 | - |
832 | - /* enter threads as update_animation_info will use gtk/gdk. */ |
833 | - gdk_threads_enter (); |
834 | - g_hash_table_foreach_remove (animated_widgets, update_animation_info, NULL); |
835 | - /* leave threads again */ |
836 | - gdk_threads_leave (); |
837 | - |
838 | - if(g_hash_table_size(animated_widgets)==0) |
839 | - { |
840 | - stop_timer (); |
841 | - return FALSE; |
842 | - } |
843 | - |
844 | - return TRUE; |
845 | -} |
846 | - |
847 | -static void |
848 | -on_checkbox_toggle (GtkWidget *widget, gpointer data) |
849 | -{ |
850 | - AnimationInfo *animation_info = lookup_animation_info (widget); |
851 | - |
852 | - if (animation_info != NULL) |
853 | - { |
854 | - gfloat elapsed = g_timer_elapsed (animation_info->timer, NULL); |
855 | - |
856 | - animation_info->start_modifier = elapsed - animation_info->start_modifier; |
857 | - } |
858 | - else |
859 | - { |
860 | - add_animation (widget, CHECK_ANIMATION_TIME); |
861 | - } |
862 | -} |
863 | - |
864 | -static void |
865 | -on_connected_widget_destruction (gpointer data, GObject *widget) |
866 | -{ |
867 | - connected_widgets = g_slist_remove (connected_widgets, data); |
868 | - g_free (data); |
869 | -} |
870 | - |
871 | -static void |
872 | -disconnect_all_signals () |
873 | -{ |
874 | - GSList * item = connected_widgets; |
875 | - while (item != NULL) |
876 | - { |
877 | - SignalInfo *signal_info = (SignalInfo*) item->data; |
878 | - |
879 | - g_signal_handler_disconnect (signal_info->widget, signal_info->handler_id); |
880 | - g_object_weak_unref (G_OBJECT (signal_info->widget), on_connected_widget_destruction, signal_info); |
881 | - g_free (signal_info); |
882 | - |
883 | - item = g_slist_next (item); |
884 | - } |
885 | - |
886 | - g_slist_free (connected_widgets); |
887 | - connected_widgets = NULL; |
888 | -} |
889 | - |
890 | -/* helper function for clearlooks_animation_connect_checkbox */ |
891 | -static gint |
892 | -find_signal_info (gconstpointer signal_info, gconstpointer widget) |
893 | -{ |
894 | - if (((SignalInfo*)signal_info)->widget == widget) |
895 | - return 0; |
896 | - else |
897 | - return 1; |
898 | -} |
899 | - |
900 | - |
901 | -/* external interface */ |
902 | - |
903 | -/* adds a progress bar */ |
904 | -void |
905 | -clearlooks_animation_progressbar_add (GtkWidget *progressbar) |
906 | -{ |
907 | - gdouble fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progressbar)); |
908 | - |
909 | - if (fraction < 1.0 && fraction > 0.0) |
910 | - add_animation ((GtkWidget*) progressbar, 0.0); |
911 | -} |
912 | - |
913 | -/* hooks up the signals for check and radio buttons */ |
914 | -void |
915 | -clearlooks_animation_connect_checkbox (GtkWidget *widget) |
916 | -{ |
917 | - if (GE_IS_CHECK_BUTTON (widget)) |
918 | - { |
919 | - if (!g_slist_find_custom (connected_widgets, widget, find_signal_info)) |
920 | - { |
921 | - SignalInfo * signal_info = g_new (SignalInfo, 1); |
922 | - |
923 | - signal_info->widget = widget; |
924 | - signal_info->handler_id = g_signal_connect ((GObject*)widget, "toggled", G_CALLBACK (on_checkbox_toggle), NULL); |
925 | - |
926 | - connected_widgets = g_slist_append (connected_widgets, signal_info); |
927 | - g_object_weak_ref (G_OBJECT (widget), on_connected_widget_destruction, signal_info); |
928 | - } |
929 | - } |
930 | -} |
931 | - |
932 | -/* returns TRUE if the widget is animated, and FALSE otherwise */ |
933 | -gboolean |
934 | -clearlooks_animation_is_animated (GtkWidget *widget) |
935 | -{ |
936 | - return lookup_animation_info (widget) != NULL ? TRUE : FALSE; |
937 | -} |
938 | - |
939 | -/* returns the elapsed time for the animation */ |
940 | -gdouble |
941 | -clearlooks_animation_elapsed (gpointer data) |
942 | -{ |
943 | - AnimationInfo *animation_info = lookup_animation_info (data); |
944 | - |
945 | - if (animation_info) |
946 | - return g_timer_elapsed (animation_info->timer, NULL) |
947 | - - animation_info->start_modifier; |
948 | - else |
949 | - return 0.0; |
950 | -} |
951 | - |
952 | -/* cleans up all resources of the animation system */ |
953 | -void |
954 | -clearlooks_animation_cleanup () |
955 | -{ |
956 | - disconnect_all_signals (); |
957 | - |
958 | - if (animated_widgets != NULL) |
959 | - { |
960 | - g_hash_table_destroy (animated_widgets); |
961 | - animated_widgets = NULL; |
962 | - } |
963 | - |
964 | - stop_timer (); |
965 | -} |
966 | -#else /* !HAVE_WORKING_ANIMATION */ |
967 | -/* Warn here so the message is only displayed once. */ |
968 | -#warning Disabling animation support as it currently needs deprecated symbols and GTK_DISABLE_DEPRECATED is enabled. |
969 | - |
970 | -static void clearlooks_animation_dummy_function_so_wall_shuts_up_when_animations_is_disabled() |
971 | -{ |
972 | - clearlooks_animation_dummy_function_so_wall_shuts_up_when_animations_is_disabled(); |
973 | -} |
974 | -#endif /* HAVE_WORKING_ANIMATION */ |
975 | |
976 | === removed file '.pc/applied-patches' |
977 | --- .pc/applied-patches 2012-09-25 17:02:08 +0000 |
978 | +++ .pc/applied-patches 1970-01-01 00:00:00 +0000 |
979 | @@ -1,2 +0,0 @@ |
980 | -01_libm.patch |
981 | -02_glib-single-include.patch |
982 | |
983 | === modified file 'debian/changelog' |
984 | --- debian/changelog 2013-10-10 15:51:58 +0000 |
985 | +++ debian/changelog 2013-12-15 20:38:39 +0000 |
986 | @@ -1,3 +1,21 @@ |
987 | +gtk2-engines (1:2.20.2-3ubuntu1) UNRELEASED; urgency=medium |
988 | + |
989 | + * Merge from debian, remaining changes: |
990 | + - debian/control: Build depend on gnome-common, so we can get a .pot file |
991 | + to use for launchpad translations |
992 | + - debian/rules: build translations template |
993 | + - Update watch file to only track GNOME 2.20 as gtk-engines was then |
994 | + ported to gtk3 and finally abandoned. |
995 | + * Drop our automake fix, debian now supports the new version |
996 | + |
997 | + -- Jackson Doak <noskcaj@ubuntu.com> Mon, 16 Dec 2013 07:09:33 +1100 |
998 | + |
999 | +gtk2-engines (1:2.20.2-3) unstable; urgency=low |
1000 | + |
1001 | + * Fix FTBS due to automake bug (Closes: #713353) |
1002 | + |
1003 | + -- Balint Reczey <balint@balintreczey.hu> Fri, 15 Nov 2013 09:35:40 +0100 |
1004 | + |
1005 | gtk2-engines (1:2.20.2-2ubuntu2) saucy; urgency=low |
1006 | |
1007 | * Force to use automake1.11, thus fixing FTBFS. |
1008 | |
1009 | === modified file 'debian/control' |
1010 | --- debian/control 2013-10-10 15:51:58 +0000 |
1011 | +++ debian/control 2013-12-15 20:38:39 +0000 |
1012 | @@ -11,7 +11,6 @@ |
1013 | Standards-Version: 3.8.4 |
1014 | Build-Depends: debhelper (>= 5), |
1015 | dh-autoreconf, |
1016 | - automake1.11, |
1017 | gnome-common, |
1018 | libgtk2.0-dev (>= 2.19.7-2), |
1019 | gnome-pkg-tools (>= 0.10), |
1020 | |
1021 | === modified file 'debian/control.in' |
1022 | --- debian/control.in 2013-10-10 15:51:58 +0000 |
1023 | +++ debian/control.in 2013-12-15 20:38:39 +0000 |
1024 | @@ -7,7 +7,6 @@ |
1025 | Standards-Version: 3.8.4 |
1026 | Build-Depends: debhelper (>= 5), |
1027 | dh-autoreconf, |
1028 | - automake1.11, |
1029 | gnome-common, |
1030 | libgtk2.0-dev (>= 2.19.7-2), |
1031 | gnome-pkg-tools (>= 0.10), |
1032 | |
1033 | === added file 'debian/patches/03_automake1.14.patch' |
1034 | --- debian/patches/03_automake1.14.patch 1970-01-01 00:00:00 +0000 |
1035 | +++ debian/patches/03_automake1.14.patch 2013-12-15 20:38:39 +0000 |
1036 | @@ -0,0 +1,49 @@ |
1037 | +Description: Work around FTBFS due to automake 1.14 bug |
1038 | + Automake generates invalid Makefiles when patsubst is used in |
1039 | + Makefile.am. To work around this problem configure injects the |
1040 | + patsubsts to the Makefile now. |
1041 | + . |
1042 | +Author: Balint Reczey <balint@balintreczey.hu> |
1043 | +Bug-Debian: http://bugs.debian.org/713353 |
1044 | +--- gtk2-engines-2.20.2.orig/configure.ac |
1045 | ++++ gtk2-engines-2.20.2/configure.ac |
1046 | +@@ -142,6 +142,8 @@ fi |
1047 | + AC_SUBST(BUILD_ENGINES) |
1048 | + AC_SUBST(BUILD_THEMES) |
1049 | + AC_SUBST(BUILD_SCHEMAS) |
1050 | ++AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))']) |
1051 | ++ |
1052 | + |
1053 | + if test $animation = "yes"; then |
1054 | + AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support]) |
1055 | +--- gtk2-engines-2.20.2.orig/test/Makefile.am |
1056 | ++++ gtk2-engines-2.20.2/test/Makefile.am |
1057 | +@@ -64,9 +64,10 @@ VALGRIND_ENV=G_SLICE=always-malloc G_DEB |
1058 | + # Exported Symbols Test - Tests all engines unconditionally |
1059 | + ############################################################# |
1060 | + # Prefix with exported_ |
1061 | +-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) |
1062 | ++# disabled to work around automake bug #14561 |
1063 | ++# EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) |
1064 | + |
1065 | +-TESTS += $(EXPORTED_SYMBOLS_TESTS) |
1066 | ++#TESTS += $(EXPORTED_SYMBOLS_TESTS) |
1067 | + |
1068 | + |
1069 | + ############################################################# |
1070 | +@@ -85,10 +86,13 @@ SUPPORTED_TORTURE_TEST_ENGINES = \ |
1071 | + # Filter engines that are not build from the set of engines |
1072 | + TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES)) |
1073 | + # Prefix with torture_ |
1074 | +-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) |
1075 | ++# disabled to work around automake bug #14561 |
1076 | ++# TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) |
1077 | + |
1078 | + # Add TORTURE_TEST_ENGINES to list of tests |
1079 | +-TESTS += $(TORTURE_TEST_TESTS) |
1080 | ++# disabled to work around automake bug #14561 |
1081 | ++#TESTS += $(TORTURE_TEST_TESTS) |
1082 | ++TESTS += @auto_find_tests@ |
1083 | + |
1084 | + # Possible other tests: |
1085 | + # - An extensive theme switch tests that loads/unloads the engine |
1086 | |
1087 | === modified file 'debian/patches/series' |
1088 | --- debian/patches/series 2012-09-25 17:02:08 +0000 |
1089 | +++ debian/patches/series 2013-12-15 20:38:39 +0000 |
1090 | @@ -1,2 +1,3 @@ |
1091 | 01_libm.patch |
1092 | 02_glib-single-include.patch |
1093 | +03_automake1.14.patch |
1094 | |
1095 | === modified file 'debian/rules' |
1096 | --- debian/rules 2013-10-10 15:51:58 +0000 |
1097 | +++ debian/rules 2013-12-15 20:38:39 +0000 |
1098 | @@ -1,8 +1,5 @@ |
1099 | #!/usr/bin/make -f |
1100 | |
1101 | -export AUTOMAKE=automake-1.11 |
1102 | -export ACLOCAL=aclocal-1.11 |
1103 | - |
1104 | buildbasedir := $(CURDIR)/debian/build |
1105 | DEB_BUILDDIR := $(buildbasedir)/x11 |
1106 | DEB_BUILDDIR_gtk2-engines-udeb := $(buildbasedir)/x11-udeb |
1107 | |
1108 | === modified file 'engines/clearlooks/Makefile.am' |
1109 | --- engines/clearlooks/Makefile.am 2011-12-05 20:26:07 +0000 |
1110 | +++ engines/clearlooks/Makefile.am 2013-12-15 20:38:39 +0000 |
1111 | @@ -43,7 +43,7 @@ |
1112 | ./src/clearlooks_types.h |
1113 | |
1114 | libclearlooks_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1115 | -libclearlooks_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm |
1116 | +libclearlooks_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
1117 | |
1118 | |
1119 | -include $(top_srcdir)/git.mk |
1120 | |
1121 | === modified file 'engines/clearlooks/src/animation.c' |
1122 | --- engines/clearlooks/src/animation.c 2012-09-25 17:02:08 +0000 |
1123 | +++ engines/clearlooks/src/animation.c 2013-12-15 20:38:39 +0000 |
1124 | @@ -28,7 +28,7 @@ |
1125 | #include "animation.h" |
1126 | |
1127 | #ifdef HAVE_WORKING_ANIMATION |
1128 | -#include <glib.h> |
1129 | +#include <glib/gtimer.h> |
1130 | |
1131 | struct _AnimationInfo { |
1132 | GTimer *timer; |
1133 | |
1134 | === modified file 'engines/crux/Makefile.am' |
1135 | --- engines/crux/Makefile.am 2011-12-05 20:26:07 +0000 |
1136 | +++ engines/crux/Makefile.am 2013-12-15 20:38:39 +0000 |
1137 | @@ -19,7 +19,7 @@ |
1138 | ./src/crux-rc-style.h |
1139 | |
1140 | libcrux_engine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1141 | -libcrux_engine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm |
1142 | +libcrux_engine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
1143 | |
1144 | -include $(top_srcdir)/git.mk |
1145 | |
1146 | |
1147 | === modified file 'engines/glide/Makefile.am' |
1148 | --- engines/glide/Makefile.am 2011-12-05 20:26:07 +0000 |
1149 | +++ engines/glide/Makefile.am 2013-12-15 20:38:39 +0000 |
1150 | @@ -34,7 +34,7 @@ |
1151 | ./src/glide_gtk2_engine.h |
1152 | |
1153 | libglide_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1154 | -libglide_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm |
1155 | +libglide_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
1156 | |
1157 | -include $(top_srcdir)/git.mk |
1158 | |
1159 | |
1160 | === modified file 'engines/hc/Makefile.am' |
1161 | --- engines/hc/Makefile.am 2011-12-05 20:26:07 +0000 |
1162 | +++ engines/hc/Makefile.am 2013-12-15 20:38:39 +0000 |
1163 | @@ -38,7 +38,7 @@ |
1164 | ./src/hc-style.c |
1165 | |
1166 | libhcengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1167 | -libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm |
1168 | +libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
1169 | |
1170 | -include $(top_srcdir)/git.mk |
1171 | |
1172 | |
1173 | === modified file 'engines/industrial/Makefile.am' |
1174 | --- engines/industrial/Makefile.am 2011-12-05 20:26:07 +0000 |
1175 | +++ engines/industrial/Makefile.am 2013-12-15 20:38:39 +0000 |
1176 | @@ -39,7 +39,7 @@ |
1177 | ./AUTHORS |
1178 | |
1179 | libindustrial_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1180 | -libindustrial_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm |
1181 | +libindustrial_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
1182 | |
1183 | -include $(top_srcdir)/git.mk |
1184 | |
1185 | |
1186 | === modified file 'engines/lua/Makefile.am' |
1187 | --- engines/lua/Makefile.am 2011-12-05 20:26:07 +0000 |
1188 | +++ engines/lua/Makefile.am 2013-12-15 20:38:39 +0000 |
1189 | @@ -111,7 +111,7 @@ |
1190 | $(NULL) |
1191 | |
1192 | libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1193 | -libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS) -lm |
1194 | +libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS) |
1195 | |
1196 | -include $(top_srcdir)/git.mk |
1197 | |
1198 | |
1199 | === modified file 'engines/mist/Makefile.am' |
1200 | --- engines/mist/Makefile.am 2011-12-05 20:26:07 +0000 |
1201 | +++ engines/mist/Makefile.am 2013-12-15 20:38:39 +0000 |
1202 | @@ -16,7 +16,7 @@ |
1203 | ./src/mist.c |
1204 | |
1205 | libmist_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1206 | -libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm |
1207 | +libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
1208 | |
1209 | -include $(top_srcdir)/git.mk |
1210 | |
1211 | |
1212 | === modified file 'engines/redmond/Makefile.am' |
1213 | --- engines/redmond/Makefile.am 2011-12-05 20:26:07 +0000 |
1214 | +++ engines/redmond/Makefile.am 2013-12-15 20:38:39 +0000 |
1215 | @@ -37,7 +37,7 @@ |
1216 | ./src/redmond_gtk2_engine.h |
1217 | |
1218 | libredmond95_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1219 | -libredmond95_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm |
1220 | +libredmond95_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
1221 | |
1222 | -include $(top_srcdir)/git.mk |
1223 | |
1224 | |
1225 | === modified file 'engines/thinice/Makefile.am' |
1226 | --- engines/thinice/Makefile.am 2011-12-05 20:26:07 +0000 |
1227 | +++ engines/thinice/Makefile.am 2013-12-15 20:38:39 +0000 |
1228 | @@ -18,7 +18,7 @@ |
1229 | ./src/thinice_main.c |
1230 | |
1231 | libthinice_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
1232 | -libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) -lm |
1233 | +libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
1234 | |
1235 | -include $(top_srcdir)/git.mk |
1236 | |
1237 | |
1238 | === modified file 'test/Makefile.am' |
1239 | --- test/Makefile.am 2011-12-05 20:26:07 +0000 |
1240 | +++ test/Makefile.am 2013-12-15 20:38:39 +0000 |
1241 | @@ -42,7 +42,7 @@ |
1242 | |
1243 | EXTRA_PROGRAMS = torturetest |
1244 | torturetest_CFLAGS = $(GTK_CFLAGS) |
1245 | -torturetest_LDFLAGS = $(GTK_LIBS) -lm |
1246 | +torturetest_LDFLAGS = $(GTK_LIBS) |
1247 | |
1248 | |
1249 |
The last lines of the bzr commit was from debcommit.