diff --git a/maemo/hildon-desktop/0001-hd-task-navigator-Remove-old-i386-ifdef.patch b/maemo/hildon-desktop/0001-hd-task-navigator-Remove-old-i386-ifdef.patch deleted file mode 100644 index 158479da0..000000000 --- a/maemo/hildon-desktop/0001-hd-task-navigator-Remove-old-i386-ifdef.patch +++ /dev/null @@ -1,65 +0,0 @@ -From d3d39d70824a16dfc28e0dbf5810b5af3e3b1044 Mon Sep 17 00:00:00 2001 -From: Grant Miller -Date: Fri, 4 Jan 2019 11:27:35 -0600 -Subject: [PATCH] hd-task-navigator: Remove old i386 ifdef - -This ifdef causes a compiler error when compiling for 32 bit x86. -According to Wizzup and freemangordon on IRC, this code can simply be -removed. - -There are still more instances of `#ifdef __386__` but they don't seem -to cause compiler errors, so I left them alone. - -``` -$ git grep -n __i386__ -src/hildon-desktop.h:35:#if defined (__i386__) || defined (DEBUG) -src/mb/hd-comp-mgr.c:2022:#ifdef __i386__ -src/tidy/tidy-cached-group.c:79:#ifdef __i386__ -src/tidy/tidy-desaturation-group.c:183:#ifdef __i386__ -src/tidy/tidy-desaturation-group.c:308:#ifdef __i386__ -``` ---- - src/home/hd-task-navigator.c | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/src/home/hd-task-navigator.c b/src/home/hd-task-navigator.c -index d558b32a..5268fe49 100644 ---- a/src/home/hd-task-navigator.c -+++ b/src/home/hd-task-navigator.c -@@ -1309,25 +1309,6 @@ check_and_move (ClutterActor * actor, gfloat xpos_new, gfloat ypos_new) - free_effect (closure->timeline, closure); - } - --/* On the gadget (or maybe in general if we're accelerated) we can't -- * resize continously because it blocks all effects and doesn't come -- * about anyway. It's so even if we don't clip_on_resize(). */ --#ifdef __i386__ --DEFINE_RMS_EFFECT(resize, gfloat, -- clutter_actor_get_size, clutter_actor_set_size); --static void --check_and_resize (ClutterActor * actor, gint width_new, gint height_new) --{ -- EffectClosure *closure; -- guint width_now, height_now; -- -- clutter_actor_get_size (actor, &width_now, &height_now); -- if (width_now != width_new || height_now != height_new) -- resize (actor, width_new, height_new); -- else if ((closure = has_effect (actor, resize_effect_frame)) != NULL) -- free_effect (closure->timeline, closure); --} --#else /* __armel__ */ - static void resize_effect_complete (ClutterTimeline * timeline, - EffectClosure * closure) - { -@@ -1391,7 +1372,6 @@ check_and_resize (ClutterActor * actor, gfloat width_new, gfloat height_new) - else if ((closure = has_effect (actor, resize_effect_complete)) != NULL) - free_effect (closure->timeline, closure); - } --#endif /* __armel__ */ - - DEFINE_RMS_EFFECT(scale, gdouble, - clutter_actor_get_scale, clutter_actor_set_scale); --- -2.19.1 - diff --git a/maemo/hildon-desktop/APKBUILD b/maemo/hildon-desktop/APKBUILD index 50c85834b..420f744d3 100644 --- a/maemo/hildon-desktop/APKBUILD +++ b/maemo/hildon-desktop/APKBUILD @@ -1,6 +1,6 @@ pkgname=hildon-desktop -pkgver=2.2.157.10 -pkgrel=1 +pkgver=2.2.157.11 +pkgrel=0 pkgdesc="Hildon desktop for Fremantle" arch="all" url="https://github.com/maemo-leste/hildon-desktop" @@ -16,7 +16,6 @@ makedepends=" profiled-dev" source=" $pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/hildon-desktop/archive/$pkgver.tar.gz - 0001-hd-task-navigator-Remove-old-i386-ifdef.patch " builddir="$srcdir/hildon-desktop-$pkgver" @@ -38,5 +37,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir/" install } -sha512sums="307bee2290031bfde4fce22b1c451bcc7e32bb784aa53f4d32f99fcd64cf3d3d796598908befe5878db4b40f66479faf2465981bf4e2ae71efcda1d94efeffdf hildon-desktop-2.2.157.10.tar.gz -672dbde79f9d56a38320c4daf6a646a77d145192cc5439e2d3789f115cf60e213dbcb137306561140557eff3c031296194d4814902dd235e5778f115fbe6bdb9 0001-hd-task-navigator-Remove-old-i386-ifdef.patch" +sha512sums="4084f535b366283d2d7d1a2ca546a925c50506a97270c0bfbb9358f859a4e175d9fbd530ffa9e3251afe372c58352d91d4d707c9190b19b114f655f35ea16f58 hildon-desktop-2.2.157.11.tar.gz"