maemo/libhildon: fix hildon-desktop armv7 build (!130)
Add patch to remove inline from some functions to make hildon-desktop compile on armv7.
This commit is contained in:
PureTryOut
Oliver Smith
parent
aaae271609
commit
2c08e209fe
2 changed files with 156 additions and 3 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
pkgname=libhildon
|
pkgname=libhildon
|
||||||
pkgver=2.2.25
|
pkgver=2.2.25
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc="Hildon libraries"
|
pkgdesc="Hildon libraries"
|
||||||
arch="all"
|
arch="all"
|
||||||
url="https://github.com/maemo-leste/hildon"
|
url="https://github.com/maemo-leste/hildon"
|
||||||
|
|
@ -10,7 +10,8 @@ depends_dev="gtk+2.0-maemo-dev libcanberra-dev gconf-dev"
|
||||||
makedepends="autoconf automake libtool gtk-doc $depends_dev"
|
makedepends="autoconf automake libtool gtk-doc $depends_dev"
|
||||||
subpackages="$pkgname-dev"
|
subpackages="$pkgname-dev"
|
||||||
source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/hildon/archive/$pkgver.tar.gz
|
source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/hildon/archive/$pkgver.tar.gz
|
||||||
hildon-non-glibc.patch"
|
hildon-non-glibc.patch
|
||||||
|
fix-inline-function-problems.patch"
|
||||||
|
|
||||||
builddir="$srcdir/hildon-$pkgver"
|
builddir="$srcdir/hildon-$pkgver"
|
||||||
|
|
||||||
|
|
@ -27,4 +28,5 @@ package() {
|
||||||
rm -rf "$pkgdir/usr/share/locale"
|
rm -rf "$pkgdir/usr/share/locale"
|
||||||
}
|
}
|
||||||
sha512sums="e0b73d19c0406d19a2c6ad10a19e062310213dae2ecbbdf5831c063926d4b3e5998827b43599000185a9705629680afe4dcd40720029e14decd0813633f2acf1 libhildon-2.2.25.tar.gz
|
sha512sums="e0b73d19c0406d19a2c6ad10a19e062310213dae2ecbbdf5831c063926d4b3e5998827b43599000185a9705629680afe4dcd40720029e14decd0813633f2acf1 libhildon-2.2.25.tar.gz
|
||||||
5cc6578d513794276ed46292de9ecb72400477ffafa560ebbef2028c214e1a7c8e371f5179941cbfcb1865d2fc2db71e4f50f81e95a5173f247ec4412e312d12 hildon-non-glibc.patch"
|
5cc6578d513794276ed46292de9ecb72400477ffafa560ebbef2028c214e1a7c8e371f5179941cbfcb1865d2fc2db71e4f50f81e95a5173f247ec4412e312d12 hildon-non-glibc.patch
|
||||||
|
7f46f856fd50ddd4cefce1d17af2714948923c26be95283319d4651adb4e19d0c760abe127d704b111b60f226a325fd7462d0623ff1b0e1e0bd4e0d03a90485a fix-inline-function-problems.patch"
|
||||||
|
|
|
||||||
151
maemo/libhildon/fix-inline-function-problems.patch
Normal file
151
maemo/libhildon/fix-inline-function-problems.patch
Normal file
|
|
@ -0,0 +1,151 @@
|
||||||
|
diff --git a/hildon/hildon-color-chooser.c b/hildon/hildon-color-chooser.c
|
||||||
|
index 1dd0293..ad7188d 100644
|
||||||
|
--- a/hildon/hildon-color-chooser.c
|
||||||
|
+++ b/hildon/hildon-color-chooser.c
|
||||||
|
@@ -109,19 +109,19 @@ init_borders (GtkWidget *w,
|
||||||
|
GtkBorder *inner,
|
||||||
|
GtkBorder *outer);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_clip_to_alloc (void *s,
|
||||||
|
GtkAllocation *a);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_sub_times (GTimeVal *result,
|
||||||
|
GTimeVal *greater,
|
||||||
|
GTimeVal *lesser);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_limited_expose (HildonColorChooser *self);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_hue_bar (GtkWidget *widget,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
@@ -130,7 +130,7 @@ inline_draw_hue_bar (GtkWidget *widget,
|
||||||
|
int sy,
|
||||||
|
int sh);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_hue_bar_dimmed (GtkWidget *widget,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
@@ -139,28 +139,28 @@ inline_draw_hue_bar_dimmed (GtkWidget *widget,
|
||||||
|
int sy,
|
||||||
|
int sh);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_sv_plane (HildonColorChooser *self,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
int w,
|
||||||
|
int h);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_sv_plane_dimmed (HildonColorChooser *self,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
int w,
|
||||||
|
int h);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_crosshair (unsigned char *buf,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
int w,
|
||||||
|
int h);
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_h2rgb (unsigned short hue,
|
||||||
|
unsigned long *rgb);
|
||||||
|
|
||||||
|
@@ -462,7 +462,7 @@ hildon_color_chooser_unmap (GtkWidget *widget)
|
||||||
|
GTK_WIDGET_CLASS (parent_class)->unmap (widget);
|
||||||
|
}
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_clip_to_alloc (void *s,
|
||||||
|
GtkAllocation *a)
|
||||||
|
{
|
||||||
|
@@ -574,7 +574,7 @@ hildon_color_chooser_expose (GtkWidget *widget,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_sub_times (GTimeVal *result,
|
||||||
|
GTimeVal *greater,
|
||||||
|
GTimeVal *lesser)
|
||||||
|
@@ -588,7 +588,7 @@ inline_sub_times (GTimeVal *result,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_limited_expose (HildonColorChooser *sel)
|
||||||
|
{
|
||||||
|
GTimeVal curr_time, result;
|
||||||
|
@@ -849,7 +849,7 @@ hildon_color_chooser_set_color (HildonColorChooser *chooser,
|
||||||
|
g_signal_emit (chooser, color_chooser_signals[COLOR_CHANGED], 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_h2rgb (unsigned short hue,
|
||||||
|
unsigned long *rgb)
|
||||||
|
{
|
||||||
|
@@ -963,7 +963,7 @@ intern_h2rgb8 (unsigned short hue,
|
||||||
|
|
||||||
|
/* optimization: do not ask hue for each round but have bilinear vectors */
|
||||||
|
/* rethink: benefits from handling data 8 bit? (no shift round) */
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_hue_bar (GtkWidget *widget,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
@@ -1024,7 +1024,7 @@ inline_draw_hue_bar (GtkWidget *widget,
|
||||||
|
g_free(buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_hue_bar_dimmed (GtkWidget *widget,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
@@ -1075,7 +1075,7 @@ inline_draw_hue_bar_dimmed (GtkWidget *widget,
|
||||||
|
gdk_draw_pixbuf (widget->parent->window, widget->style->fg_gc [0], priv->dimmed_bar, 0, 0, x, y, w, h, GDK_RGB_DITHER_NONE, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_crosshair (unsigned char *buf,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
@@ -1106,7 +1106,7 @@ inline_draw_crosshair (unsigned char *buf,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_sv_plane (HildonColorChooser *sel,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
@@ -1179,7 +1179,7 @@ inline_draw_sv_plane (HildonColorChooser *sel,
|
||||||
|
g_free(buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
-inline void
|
||||||
|
+void
|
||||||
|
inline_draw_sv_plane_dimmed (HildonColorChooser *sel,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
Loading…
Reference in a new issue