mirror of
https://git.busybox.net/buildroot.git
synced 2024-12-18 09:43:33 +08:00
fix build and ensure we install needed runtime components
This commit is contained in:
Eric Andersen
parent
a461faf1ee
commit
9524e48516
26
package/libgtk2/000_gtk+-2.0.6-exportsymbols.patch
Normal file
26
package/libgtk2/000_gtk+-2.0.6-exportsymbols.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff -ruN gtk+-2.0.6.orig/configure gtk+-2.0.6/configure
|
||||
--- gtk+-2.0.6.orig/configure 2002-08-31 03:49:07.000000000 +0900
|
||||
+++ gtk+-2.0.6/configure 2002-08-31 03:52:45.000000000 +0900
|
||||
@@ -7904,7 +7904,8 @@
|
||||
if test "$os_win32" != yes; then
|
||||
# libtool option to control which symbols are exported
|
||||
# right now, symbols starting with _ are not exported
|
||||
- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[^_].*"'
|
||||
+ # Disabled until -export-symbols-regex works (RH patch)
|
||||
+ LIBTOOL_EXPORT_OPTIONS=
|
||||
else
|
||||
# We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
|
||||
LIBTOOL_EXPORT_OPTIONS=
|
||||
diff -ruN gtk+-2.0.6.orig/configure.in gtk+-2.0.6/configure.in
|
||||
--- gtk+-2.0.6.orig/configure.in 2002-08-31 03:49:07.000000000 +0900
|
||||
+++ gtk+-2.0.6/configure.in 2002-08-31 03:51:22.000000000 +0900
|
||||
@@ -273,7 +273,8 @@
|
||||
if test "$os_win32" != yes; then
|
||||
# libtool option to control which symbols are exported
|
||||
# right now, symbols starting with _ are not exported
|
||||
- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
|
||||
+ # Disabled until -export-symbols-regex works (RH patch)
|
||||
+ LIBTOOL_EXPORT_OPTIONS=
|
||||
else
|
||||
# We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
|
||||
LIBTOOL_EXPORT_OPTIONS=
|
||||
33
package/libgtk2/000_gtk+-2.2.0-buildfix-immodule.patch
Normal file
33
package/libgtk2/000_gtk+-2.2.0-buildfix-immodule.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff -ruN gtk+-2.2.0.orig/modules/input/Makefile.am gtk+-2.2.0/modules/input/Makefile.am
|
||||
--- gtk+-2.2.0.orig/modules/input/Makefile.am 2003-01-06 23:40:37.000000000 +0900
|
||||
+++ gtk+-2.2.0/modules/input/Makefile.am 2003-01-06 23:46:35.000000000 +0900
|
||||
@@ -118,7 +118,12 @@
|
||||
im-viqr.la
|
||||
|
||||
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
|
||||
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
|
||||
+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
|
||||
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ; \
|
||||
+ else \
|
||||
+ touch $@ ; \
|
||||
+ fi
|
||||
+
|
||||
|
||||
CLEANFILES = gtk.immodules
|
||||
|
||||
diff -ruN gtk+-2.2.0.orig/modules/input/Makefile.in gtk+-2.2.0/modules/input/Makefile.in
|
||||
--- gtk+-2.2.0.orig/modules/input/Makefile.in 2003-01-06 23:39:08.000000000 +0900
|
||||
+++ gtk+-2.2.0/modules/input/Makefile.in 2003-01-06 23:46:44.000000000 +0900
|
||||
@@ -785,7 +785,11 @@
|
||||
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
|
||||
|
||||
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
|
||||
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
|
||||
+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
|
||||
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ; \
|
||||
+ else \
|
||||
+ touch $@ ; \
|
||||
+ fi
|
||||
|
||||
@CROSS_COMPILING_FALSE@all-local: gtk.immodules
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
18
package/libgtk2/002_xpmico.patch
Normal file
18
package/libgtk2/002_xpmico.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff -Nur gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c gtk+-2.4.9/gdk-pixbuf/io-ico.c
|
||||
--- gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c 2004-08-25 18:52:18.000000000 +0200
|
||||
+++ gtk+-2.4.9/gdk-pixbuf/io-ico.c 2004-09-15 00:40:17.000000000 +0200
|
||||
@@ -210,6 +210,14 @@
|
||||
|
||||
State->HeaderSize = 6 + IconCount*16;
|
||||
|
||||
+ if (State->HeaderSize < 0) {
|
||||
+ g_set_error (error,
|
||||
+ GDK_PIXBUF_ERROR,
|
||||
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
|
||||
+ _("Invalid header in icon"));
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
if (State->HeaderSize>State->BytesInHeaderBuf) {
|
||||
guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
|
||||
if (!tmp) {
|
||||
33
package/libgtk2/007_password_char.patch
Normal file
33
package/libgtk2/007_password_char.patch
Normal file
@ -0,0 +1,33 @@
|
||||
--- gtk+-2.8.10/gtk/gtkentry.c.set-invisible-char-to-bullet 2006-01-19 15:12:18.000000000 -0500
|
||||
+++ gtk+-2.8.10/gtk/gtkentry.c 2006-01-19 15:36:51.000000000 -0500
|
||||
@@ -542,7 +542,7 @@
|
||||
g_param_spec_unichar ("invisible-char",
|
||||
P_("Invisible character"),
|
||||
P_("The character to use when masking entry contents (in \"password mode\")"),
|
||||
- '*',
|
||||
+ (gunichar) 0x25cf,
|
||||
GTK_PARAM_READWRITE));
|
||||
|
||||
g_object_class_install_property (gobject_class,
|
||||
@@ -1000,7 +1000,7 @@
|
||||
|
||||
entry->editable = TRUE;
|
||||
entry->visible = TRUE;
|
||||
- entry->invisible_char = '*';
|
||||
+ entry->invisible_char = (gunichar) 0x25cf;
|
||||
entry->dnd_position = -1;
|
||||
entry->width_chars = -1;
|
||||
entry->is_cell_renderer = FALSE;
|
||||
@@ -4019,9 +4019,9 @@
|
||||
* gtk_entry_set_visibility() has been called to set text visibility
|
||||
* to %FALSE. i.e. this is the character used in "password mode" to
|
||||
* show the user how many characters have been typed. The default
|
||||
- * invisible char is an asterisk ('*'). If you set the invisible char
|
||||
- * to 0, then the user will get no feedback at all; there will be
|
||||
- * no text on the screen as they type.
|
||||
+ * invisible char is a small bullet (Unicode character 2022). If you
|
||||
+ * set the invisible char to 0, then the user will get no feedback at
|
||||
+ * all; there will be no text on the screen as they type.
|
||||
*
|
||||
**/
|
||||
void
|
||||
123
package/libgtk2/0815_ia32-hack.patch
Normal file
123
package/libgtk2/0815_ia32-hack.patch
Normal file
@ -0,0 +1,123 @@
|
||||
--- gtk+-2.8.13/gdk-pixbuf/gdk-pixbuf-io.c~ 2005-10-03 17:11:49.000000000 +0200
|
||||
+++ gtk+-2.8.13/gdk-pixbuf/gdk-pixbuf-io.c 2006-03-01 20:33:36.524552192 +0100
|
||||
@@ -32,6 +32,7 @@
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
+#include <sys/utsname.h>
|
||||
|
||||
#include "gdk-pixbuf-private.h"
|
||||
#include "gdk-pixbuf-io.h"
|
||||
@@ -276,8 +277,21 @@
|
||||
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
|
||||
|
||||
if (!result)
|
||||
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
|
||||
+#if defined(__linux__) && defined (__i386__)
|
||||
+ {
|
||||
+ struct utsname uts;
|
||||
|
||||
+ uname(&uts);
|
||||
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL);
|
||||
+ if (strcmp("x86_64", uts.machine) || access(result, R_OK))
|
||||
+ {
|
||||
+ g_free(result);
|
||||
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
|
||||
+ }
|
||||
+ }
|
||||
+#else
|
||||
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
|
||||
+#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
--- gtk+-2.8.13/gtk/gtkprivate.h~ 2005-03-22 03:14:55.000000000 +0100
|
||||
+++ gtk+-2.8.13/gtk/gtkprivate.h 2006-03-01 19:51:42.510740384 +0100
|
||||
@@ -96,6 +96,13 @@
|
||||
|
||||
#endif /* G_OS_WIN32 */
|
||||
|
||||
+#if defined(__linux__) && defined (__i386__)
|
||||
+const gchar *_gtk_get_libdir ();
|
||||
+
|
||||
+#undef GTK_LIBDIR
|
||||
+#define GTK_LIBDIR _gtk_get_libdir ()
|
||||
+#endif
|
||||
+
|
||||
gboolean _gtk_fnmatch (const char *pattern,
|
||||
const char *string,
|
||||
gboolean no_leading_period);
|
||||
--- gtk+-2.8.13/gtk/gtkmain.c~ 2005-12-06 17:14:30.000000000 +0100
|
||||
+++ gtk+-2.8.13/gtk/gtkmain.c 2006-03-01 20:36:05.175953744 +0100
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <sys/types.h> /* For uid_t, gid_t */
|
||||
+#include <sys/utsname.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#define STRICT
|
||||
@@ -336,6 +337,28 @@
|
||||
|
||||
#endif /* G_OS_WIN32 */
|
||||
|
||||
+#if defined(__linux__) && defined (__i386__)
|
||||
+const gchar *
|
||||
+_gtk_get_libdir (void)
|
||||
+{
|
||||
+ static char *gtk_libdir = NULL;
|
||||
+ if (gtk_libdir == NULL)
|
||||
+ {
|
||||
+#if defined(__linux__) && defined (__i386__)
|
||||
+ struct utsname uts;
|
||||
+
|
||||
+ uname(&uts);
|
||||
+ if (!strcmp("x86_64", uts.machine)
|
||||
+ && !access("/usr/lib32/gtk-2.0", R_OK|X_OK))
|
||||
+ gtk_libdir = "/usr/lib32";
|
||||
+ else
|
||||
+#endif
|
||||
+ gtk_libdir = "/usr/lib";
|
||||
+ }
|
||||
+ return gtk_libdir;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
static gboolean do_setlocale = TRUE;
|
||||
|
||||
/**
|
||||
--- gtk+-2.8.13/gtk/gtkrc.c~ 2005-11-23 15:24:51.000000000 +0100
|
||||
+++ gtk+-2.8.13/gtk/gtkrc.c 2006-03-01 20:33:25.952159440 +0100
|
||||
@@ -38,6 +38,10 @@
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
+#include <sys/utsname.h>
|
||||
|
||||
|
||||
#include <glib.h>
|
||||
@@ -364,7 +368,21 @@
|
||||
if (im_module_file)
|
||||
result = g_strdup (im_module_file);
|
||||
else
|
||||
+#if defined(__linux__) && defined (__i386__)
|
||||
+ {
|
||||
+ struct utsname uts;
|
||||
+
|
||||
+ uname(&uts);
|
||||
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL);
|
||||
+ if (strcmp("x86_64", uts.machine) || access(result, R_OK))
|
||||
+ {
|
||||
+ g_free(result);
|
||||
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
|
||||
+ }
|
||||
+ }
|
||||
+#else
|
||||
result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
|
||||
+#endif
|
||||
}
|
||||
|
||||
return result;
|
||||
107
package/libgtk2/gdk-pixbuf.loaders
Normal file
107
package/libgtk2/gdk-pixbuf.loaders
Normal file
@ -0,0 +1,107 @@
|
||||
# GdkPixbuf Image Loader Modules file
|
||||
# Automatically generated file, do not edit
|
||||
# Created by gdk-pixbuf-query-loaders from gtk+-2.10.7
|
||||
#
|
||||
# LoaderDir = /lib/gtk-2.0/2.10.0/loaders
|
||||
#
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so"
|
||||
"png" 5 "gtk20" "The PNG image format"
|
||||
"image/png" ""
|
||||
"png" ""
|
||||
"\211PNG\r\n\032\n" "" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
|
||||
"jpeg" 5 "gtk20" "The JPEG image format"
|
||||
"image/jpeg" ""
|
||||
"jpeg" "jpe" "jpg" ""
|
||||
"\377\330" "" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so"
|
||||
"gif" 4 "gtk20" "The GIF image format"
|
||||
"image/gif" ""
|
||||
"gif" ""
|
||||
"GIF8" "" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so"
|
||||
"ico" 5 "gtk20" "The ICO image format"
|
||||
"image/x-icon" ""
|
||||
"ico" "cur" ""
|
||||
" \001 " "zz znz" 100
|
||||
" \002 " "zz znz" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.so"
|
||||
"ani" 4 "gtk20" "The ANI image format"
|
||||
"application/x-navi-animation" ""
|
||||
"ani" ""
|
||||
"RIFF ACON" " xxxx " 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so"
|
||||
"ras" 4 "gtk20" "The Sun raster image format"
|
||||
"image/x-cmu-raster" "image/x-sun-raster" ""
|
||||
"ras" ""
|
||||
"Y\246j\225" "" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
|
||||
"xpm" 4 "gtk20" "The XPM image format"
|
||||
"image/x-xpixmap" ""
|
||||
"xpm" ""
|
||||
"/* XPM */" "" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
|
||||
"tiff" 1 "gtk20" "The TIFF image format"
|
||||
"image/tiff" ""
|
||||
"tiff" "tif" ""
|
||||
"MM *" " z " 100
|
||||
"II* " " z" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
|
||||
"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family"
|
||||
"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
|
||||
"pnm" "pbm" "pgm" "ppm" ""
|
||||
"P1" "" 100
|
||||
"P2" "" 100
|
||||
"P3" "" 100
|
||||
"P4" "" 100
|
||||
"P5" "" 100
|
||||
"P6" "" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
|
||||
"bmp" 5 "gtk20" "The BMP image format"
|
||||
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
|
||||
"bmp" ""
|
||||
"BM" "" 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.so"
|
||||
"wbmp" 4 "gtk20" "The WBMP image format"
|
||||
"image/vnd.wap.wbmp" ""
|
||||
"wbmp" ""
|
||||
" " "z" 1
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
|
||||
"xbm" 4 "gtk20" "The XBM image format"
|
||||
"image/x-xbitmap" ""
|
||||
"xbm" ""
|
||||
"#define " "" 100
|
||||
"/*" "" 50
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.so"
|
||||
"tga" 4 "gtk20" "The Targa image format"
|
||||
"image/x-tga" ""
|
||||
"tga" "targa" ""
|
||||
" \001\001" "x " 100
|
||||
" \001\t" "x " 100
|
||||
" \002" "xz " 99
|
||||
" \003" "xz " 100
|
||||
" \n" "xz " 100
|
||||
" \013" "xz " 100
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
|
||||
"pcx" 4 "gtk20" "The PCX image format"
|
||||
"image/x-pcx" ""
|
||||
"pcx" ""
|
||||
"\n \001" "" 100
|
||||
"\n\002\001" "" 100
|
||||
"\n\003\001" "" 100
|
||||
"\n\004\001" "" 100
|
||||
"\n\005\001" "" 100
|
||||
|
||||
35
package/libgtk2/gtk.immodules
Normal file
35
package/libgtk2/gtk.immodules
Normal file
@ -0,0 +1,35 @@
|
||||
# GTK+ Input Method Modules file
|
||||
# Automatically generated file, do not edit
|
||||
# Created by gtk-query-immodules-2.0 from gtk+-2.10.7
|
||||
#
|
||||
#
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-xim.so"
|
||||
"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh"
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-am-et.so"
|
||||
"am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am"
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so"
|
||||
"cedilla" "Cedilla" "gtk20" "/usr/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa"
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so"
|
||||
"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" ""
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so"
|
||||
"inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu"
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-ipa.so"
|
||||
"ipa" "IPA" "gtk20" "/usr/share/locale" ""
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-thai.so"
|
||||
"thai" "Thai-Lao" "gtk+" "/usr/share/locale" "lo:th"
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so"
|
||||
"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti"
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so"
|
||||
"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti"
|
||||
|
||||
"/lib/gtk-2.0/2.10.0/immodules/im-viqr.so"
|
||||
"viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi"
|
||||
|
||||
@ -10,22 +10,7 @@ LIBGTK2_CAT:=$(BZCAT)
|
||||
LIBGTK2_DIR:=$(BUILD_DIR)/gtk+-$(LIBGTK2_VERSION)
|
||||
LIBGTK2_BINARY:=libgtk-x11-2.0.a
|
||||
|
||||
|
||||
$(DL_DIR)/$(LIBGTK2_SOURCE):
|
||||
$(WGET) -P $(DL_DIR) $(LIBGTK2_SITE)/$(LIBGTK2_SOURCE)
|
||||
|
||||
libgtk2-source: $(DL_DIR)/$(LIBGTK2_SOURCE)
|
||||
|
||||
$(LIBGTK2_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE)
|
||||
$(LIBGTK2_CAT) $(DL_DIR)/$(LIBGTK2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
||||
toolchain/patch-kernel.sh $(LIBGTK2_DIR) package/libgtk2/ \*.patch*
|
||||
$(CONFIG_UPDATE) $(LIBGTK2_DIR)
|
||||
touch $(LIBGTK2_DIR)/.unpacked
|
||||
|
||||
$(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
|
||||
(cd $(LIBGTK2_DIR); rm -rf config.cache; \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
GLIB_CONFIG=$(STAGING_DIR)/bin/glib-config \
|
||||
LIBGTK2_BUILD_ENV=$(TARGET_CONFIGURE_OPTS) \
|
||||
ac_cv_func_mmap_fixed_mapped=yes \
|
||||
ac_cv_func_posix_getpwuid_r=yes \
|
||||
glib_cv_stack_grows=no \
|
||||
@ -84,7 +69,28 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
|
||||
ac_use_included_regex=no \
|
||||
gl_cv_c_restrict=no \
|
||||
ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
|
||||
ac_cv_path_CUPS_CONFIG=no \
|
||||
ac_cv_path_CUPS_CONFIG=no
|
||||
|
||||
|
||||
$(DL_DIR)/$(LIBGTK2_SOURCE):
|
||||
$(WGET) -P $(DL_DIR) $(LIBGTK2_SITE)/$(LIBGTK2_SOURCE)
|
||||
|
||||
libgtk2-source: $(DL_DIR)/$(LIBGTK2_SOURCE)
|
||||
|
||||
$(LIBGTK2_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE)
|
||||
$(LIBGTK2_CAT) $(DL_DIR)/$(LIBGTK2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
||||
toolchain/patch-kernel.sh $(LIBGTK2_DIR) package/libgtk2/ \*.patch*
|
||||
$(CONFIG_UPDATE) $(LIBGTK2_DIR)
|
||||
touch $(LIBGTK2_DIR)/.unpacked
|
||||
|
||||
$(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
|
||||
# The following is an truely evil hack!
|
||||
# I dont yet understand why configure is not doing this right
|
||||
# TODO: also remove 'odd-include-problem.patch' when this is fixed
|
||||
$(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/include/pango-1.0 -I$(STAGING_DIR)/include/cairo\',g" $(LIBGTK2_DIR)/configure
|
||||
$(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L/home/andersen/SVN/buildroot/build_i686/staging_dir/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure
|
||||
(cd $(LIBGTK2_DIR); rm -rf config.cache; \
|
||||
$(LIBGTK2_BUILD_ENV) \
|
||||
./configure \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
@ -104,37 +110,20 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
--with-x \
|
||||
--x-includes=$(STAGING_DIR)/usr/X11R6/include \
|
||||
--x-libraries=$(STAGING_DIR)/usr/X11R6/lib \
|
||||
--x-includes=$(STAGING_DIR)/include \
|
||||
--x-libraries=$(STAGING_DIR)/lib \
|
||||
--disable-glibtest \
|
||||
--enable-explicit-deps=no \
|
||||
--disable-debug \
|
||||
--disable-glibtest \
|
||||
--disable-xim \
|
||||
--with-gdktarget=x11 \
|
||||
);
|
||||
touch $(LIBGTK2_DIR)/.configured
|
||||
|
||||
$(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/.configured
|
||||
$(MAKE) CC=$(TARGET_CC) -C $(LIBGTK2_DIR)
|
||||
$(LIBGTK2_BUILD_ENV) $(MAKE) CC=$(TARGET_CC) -C $(LIBGTK2_DIR)
|
||||
touch -c $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY)
|
||||
|
||||
$(STAGING_DIR)/lib/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY)
|
||||
$(MAKE) prefix=$(STAGING_DIR) \
|
||||
exec_prefix=$(STAGING_DIR) \
|
||||
bindir=$(STAGING_DIR)/bin \
|
||||
sbindir=$(STAGING_DIR)/sbin \
|
||||
libexecdir=$(STAGING_DIR)/bin \
|
||||
datadir=$(STAGING_DIR)/share \
|
||||
sysconfdir=$(STAGING_DIR)/etc \
|
||||
sharedstatedir=$(STAGING_DIR)/com \
|
||||
localstatedir=$(STAGING_DIR)/var \
|
||||
libdir=$(STAGING_DIR)/lib \
|
||||
includedir=$(STAGING_DIR)/include \
|
||||
oldincludedir=$(STAGING_DIR)/include \
|
||||
infodir=$(STAGING_DIR)/info \
|
||||
mandir=$(STAGING_DIR)/man \
|
||||
-C $(LIBGTK2_DIR) install;
|
||||
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGTK2_DIR) install;
|
||||
touch -c $(STAGING_DIR)/lib/$(LIBGTK2_BINARY)
|
||||
|
||||
$(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY)
|
||||
@ -144,6 +133,21 @@ $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY)
|
||||
cp -a $(STAGING_DIR)/lib/libgdk*-2.0.so.0* $(TARGET_DIR)/lib/
|
||||
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0*
|
||||
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgdk*-2.0.so.0*
|
||||
mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines
|
||||
cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \
|
||||
$(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/
|
||||
mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends
|
||||
cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/printbackends/*.so \
|
||||
$(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends/
|
||||
mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules
|
||||
cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/immodules/*.so \
|
||||
$(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules/
|
||||
mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders
|
||||
cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/loaders/*.so \
|
||||
$(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders/
|
||||
mkdir -p $(TARGET_DIR)/etc/gtk-2.0
|
||||
cp package/libgtk2/gdk-pixbuf.loaders $(TARGET_DIR)/etc/gtk-2.0
|
||||
cp package/libgtk2/gtk.immodules $(TARGET_DIR)/etc/gtk-2.0
|
||||
touch -c $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
|
||||
|
||||
libgtk2: uclibc png jpeg tiff xorg libglib2 \
|
||||
|
||||
84
package/libgtk2/odd-include-problem.patch
Normal file
84
package/libgtk2/odd-include-problem.patch
Normal file
@ -0,0 +1,84 @@
|
||||
--- gtk+-2.10.7/gdk/Makefile.am.orig 2007-01-05 11:42:47.000000000 -0700
|
||||
+++ gtk+-2.10.7/gdk/Makefile.am 2007-01-14 02:47:46.000000000 -0700
|
||||
@@ -26,7 +26,8 @@
|
||||
-I$(top_builddir)/gdk \
|
||||
-I$(top_srcdir)/gdk-pixbuf \
|
||||
-DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||
- $(GTK_DEBUG_FLAGS) \
|
||||
+ $(GTK_DEBUG_FLAGS) \
|
||||
+ $(GTK_DEP_CFLAGS) \
|
||||
$(GDK_DEP_CFLAGS)
|
||||
|
||||
gtarget=$(gdktarget)
|
||||
--- gtk+-2.10.7/gdk/Makefile.in.orig 2007-01-05 11:44:15.000000000 -0700
|
||||
+++ gtk+-2.10.7/gdk/Makefile.in 2007-01-14 02:48:02.000000000 -0700
|
||||
@@ -323,7 +323,8 @@
|
||||
-I$(top_builddir)/gdk \
|
||||
-I$(top_srcdir)/gdk-pixbuf \
|
||||
-DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||
- $(GTK_DEBUG_FLAGS) \
|
||||
+ $(GTK_DEBUG_FLAGS) \
|
||||
+ $(GTK_DEP_CFLAGS) \
|
||||
$(GDK_DEP_CFLAGS)
|
||||
|
||||
|
||||
--- gtk+-2.10.6/gdk/x11/Makefile.am.orig 2007-01-14 01:56:44.000000000 -0700
|
||||
+++ gtk+-2.10.6/gdk/x11/Makefile.am 2007-01-14 01:57:09.000000000 -0700
|
||||
@@ -9,7 +9,8 @@
|
||||
-I$(top_srcdir)/gdk \
|
||||
-I$(top_builddir)/gdk \
|
||||
-DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||
- $(GTK_DEBUG_FLAGS) \
|
||||
+ $(GTK_DEBUG_FLAGS) \
|
||||
+ $(GTK_DEP_CFLAGS) \
|
||||
$(GDK_DEP_CFLAGS)
|
||||
|
||||
LDADDS = $(GDK_DEP_LIBS)
|
||||
--- gtk+-2.10.7/gdk/x11/Makefile.in.orig 2007-01-14 02:40:58.000000000 -0700
|
||||
+++ gtk+-2.10.7/gdk/x11/Makefile.in 2007-01-14 02:41:30.000000000 -0700
|
||||
@@ -305,7 +305,8 @@
|
||||
-I$(top_srcdir)/gdk \
|
||||
-I$(top_builddir)/gdk \
|
||||
-DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||
- $(GTK_DEBUG_FLAGS) \
|
||||
+ $(GTK_DEBUG_FLAGS) \
|
||||
+ $(GTK_DEP_CFLAGS) \
|
||||
$(GDK_DEP_CFLAGS)
|
||||
|
||||
|
||||
--- gtk+-2.10.7/gtk/Makefile.am.orig 2007-01-14 15:19:59.000000000 -0700
|
||||
+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-14 15:21:58.000000000 -0700
|
||||
@@ -36,6 +36,7 @@
|
||||
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
|
||||
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
|
||||
$(GTK_DEBUG_FLAGS) \
|
||||
+ $(GDK_DEP_CFLAGS) \
|
||||
$(GTK_DEP_CFLAGS) \
|
||||
$(gtk_clipboard_dnd_c_sources_CFLAGS)
|
||||
|
||||
@@ -106,6 +107,7 @@
|
||||
libadd = \
|
||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||
+ $(GDK_DEP_LIBS) \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
if OS_UNIX
|
||||
--- gtk+-2.10.7/gtk/Makefile.in.orig 2007-01-14 15:20:06.000000000 -0700
|
||||
+++ gtk+-2.10.7/gtk/Makefile.in 2007-01-14 15:21:46.000000000 -0700
|
||||
@@ -344,6 +344,7 @@
|
||||
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
|
||||
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
|
||||
$(GTK_DEBUG_FLAGS) \
|
||||
+ $(GDK_DEP_CFLAGS) \
|
||||
$(GTK_DEP_CFLAGS) \
|
||||
$(gtk_clipboard_dnd_c_sources_CFLAGS)
|
||||
|
||||
@@ -370,6 +371,7 @@
|
||||
libadd = \
|
||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||
+ $(GDK_DEP_LIBS) \
|
||||
$(GTK_DEP_LIBS)\
|
||||
$(am__append_3)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,24 @@
|
||||
--- gtk+-2.10.7/gtk/Makefile.am.orig 2007-01-05 11:32:46.000000000 -0700
|
||||
+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-11 01:03:52.000000000 -0700
|
||||
--- gtk/gtk/Makefile.in.orig 2007-01-14 02:29:46.000000000 -0700
|
||||
+++ gtk/gtk/Makefile.in 2007-01-14 02:30:19.000000000 -0700
|
||||
@@ -2954,11 +2954,11 @@
|
||||
done \
|
||||
&& touch stamp-icons
|
||||
|
||||
-gtkbuiltincache.h: @REBUILD@ stamp-icons
|
||||
- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
||||
- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
|
||||
- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
||||
- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
|
||||
+#gtkbuiltincache.h: @REBUILD@ stamp-icons
|
||||
+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
||||
+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \
|
||||
+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
||||
+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
|
||||
|
||||
install-data-local:
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
--- gtk/gtk/Makefile.am.orig 2007-01-14 02:29:39.000000000 -0700
|
||||
+++ gtk/gtk/Makefile.am 2007-01-14 02:30:06.000000000 -0700
|
||||
@@ -1123,11 +1123,11 @@
|
||||
./gtk-update-icon-cache
|
||||
endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user