summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/firefox/patches/patch-ipc_chromium_src_base_file_util_cc12
-rw-r--r--package/firefox/patches/patch-ipc_chromium_src_base_file_util_linux_cc10
-rw-r--r--package/firefox/patches/patch-ipc_chromium_src_base_time_posix_cc11
-rw-r--r--package/gdb/patches/patch-gdb_common_signals_c11
-rw-r--r--package/glib/Makefile10
-rw-r--r--package/glib/patches/patch-gio_Makefile_in47
-rw-r--r--package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py9
-rw-r--r--target/linux/config/Config.in.mips12
9 files changed, 54 insertions, 70 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index d214c1938..7605c9071 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 6d1f43e402cec84459a3d7f950bd5192
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
-PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libxcursor
+PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libxcursor libffi
PKG_DEPENDS+= nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libintl
PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_cc b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_cc
new file mode 100644
index 000000000..882ed195a
--- /dev/null
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_cc
@@ -0,0 +1,12 @@
+--- mozilla-release.orig/ipc/chromium/src/base/file_util.cc 2011-07-08 03:15:22.000000000 +0200
++++ mozilla-release/ipc/chromium/src/base/file_util.cc 2012-10-03 13:44:11.000000000 +0200
+@@ -8,9 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
+ #include <unistd.h>
+-#endif
+
+ #include <fstream>
+
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_linux_cc b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_linux_cc
new file mode 100644
index 000000000..eb3e50b3b
--- /dev/null
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_linux_cc
@@ -0,0 +1,10 @@
+--- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc 2011-07-08 03:15:22.000000000 +0200
++++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc 2012-10-03 13:50:20.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#include <unistd.h>
+
+ #include <string>
+ #include <vector>
diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_time_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_time_posix_cc
new file mode 100644
index 000000000..7d0bc5934
--- /dev/null
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_time_posix_cc
@@ -0,0 +1,11 @@
+--- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc 2011-07-08 03:15:22.000000000 +0200
++++ mozilla-release/ipc/chromium/src/base/time_posix.cc 2012-10-03 13:54:12.000000000 +0200
+@@ -164,7 +164,7 @@ TimeTicks TimeTicks::Now() {
+ // With numer and denom = 1 (the expected case), the 64-bit absolute time
+ // reported in nanoseconds is enough to last nearly 585 years.
+
+-#elif defined(OS_POSIX) && \
++#elif defined(__linux__) || defined(OS_POSIX) && \
+ defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
+
+ struct timespec ts;
diff --git a/package/gdb/patches/patch-gdb_common_signals_c b/package/gdb/patches/patch-gdb_common_signals_c
new file mode 100644
index 000000000..666e37430
--- /dev/null
+++ b/package/gdb/patches/patch-gdb_common_signals_c
@@ -0,0 +1,11 @@
+--- gdb-7.5.orig/gdb/common/signals.c 2012-05-24 18:51:37.000000000 +0200
++++ gdb-7.5/gdb/common/signals.c 2012-10-01 14:44:23.000000000 +0200
+@@ -346,6 +346,8 @@ gdb_signal_from_host (int hostsig)
+ else if (64 <= hostsig && hostsig <= 127)
+ return (enum gdb_signal)
+ (hostsig - 64 + (int) GDB_SIGNAL_REALTIME_64);
++ else if (hostsig == 128)
++ return GDB_SIGNAL_UNKNOWN;
+ else
+ error (_("GDB bug: target.c (gdb_signal_from_host): "
+ "unrecognized real-time signal"));
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 81874a534..3f1def14f 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,10 +4,10 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= glib
-PKG_VERSION:= 2.33.14
-PKG_EXTRAVER:= 2.33
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 294304bc64a3e22b9278f49c04530aaa
+PKG_VERSION:= 2.28.1
+PKG_EXTRAVER:= 2.28
+PKG_RELEASE:= 4
+PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e
PKG_DESCR:= low-level core library that forms the basis of GTK+
PKG_SECTION:= libs
PKG_DEPENDS:= libintl libiconv libpthread
@@ -16,7 +16,7 @@ PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
PKG_NOPARALLEL:= 1
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
PKG_SUBPKGS:= GLIB GLIB_DEV
PKGSC_GLIB_DEV:= devel
diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in
deleted file mode 100644
index 9132e4b29..000000000
--- a/package/glib/patches/patch-gio_Makefile_in
+++ /dev/null
@@ -1,47 +0,0 @@
---- glib-2.33.14.orig/gio/Makefile.in 2012-09-17 23:50:14.000000000 +0200
-+++ glib-2.33.14/gio/Makefile.in 2012-09-23 11:49:44.000000000 +0200
-@@ -430,7 +430,7 @@ am_glib_compile_resources_OBJECTS = gvdb
- glib-compile-resources.$(OBJEXT)
- glib_compile_resources_OBJECTS = $(am_glib_compile_resources_OBJECTS)
- glib_compile_resources_DEPENDENCIES = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+ $(top_builddir)/glib/libglib-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/gmodule/libgmodule-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la libgio-2.0.la
- am_glib_compile_schemas_OBJECTS = gvdb-builder.$(OBJEXT) \
- glib-compile-schemas.$(OBJEXT)
-@@ -1277,6 +1277,8 @@ BUILT_EXTRA_DIST = \
- CLEANFILES = gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-headers.txt gconstructor_as_data.h
- glib_compile_resources_LDADD = \
- $(top_builddir)/glib/libglib-2.0.la \
-+ $(top_builddir)/gthread/libgthread-2.0.la \
-+ $(top_builddir)/gmodule/libgmodule-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- libgio-2.0.la
-
-@@ -1304,6 +1306,8 @@ glib_compile_schemas_SOURCES = \
-
- gsettings_LDADD = \
- $(top_builddir)/glib/libglib-2.0.la \
-+ $(top_builddir)/gthread/libgthread-2.0.la \
-+ $(top_builddir)/gmodule/libgmodule-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- libgio-2.0.la
-
-@@ -1313,6 +1317,8 @@ dist_schema_DATA = gschema.dtd
- gdbus_SOURCES = gdbus-tool.c
- gdbus_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
-+ $(top_builddir)/gthread/libgthread-2.0.la \
-+ $(top_builddir)/gmodule/libgmodule-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la
-
- completiondir = $(datadir)/bash-completion/completions
-@@ -1325,6 +1331,8 @@ gresource_SOURCES = gresource-tool.c
- gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
- gresource_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
-+ $(top_builddir)/gthread/libgthread-2.0.la \
-+ $(top_builddir)/gmodule/libgmodule-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- $(LIBELF_LIBS)
-
diff --git a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
deleted file mode 100644
index d9642d91e..000000000
--- a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
+++ /dev/null
@@ -1,9 +0,0 @@
---- glib-2.33.14.orig/gio/gdbus-2.0/codegen/config.py 2012-09-17 23:50:37.000000000 +0200
-+++ glib-2.33.14/gio/gdbus-2.0/codegen/config.py 2012-09-23 11:08:10.000000000 +0200
-@@ -23,5 +23,5 @@
-
- DATADIR = "${prefix}/share"
- DATADIR = DATADIR.replace(
-- "${prefix}", "/usr/local")
-+ "${prefix}", "/usr")
- VERSION = "2.33.14"
diff --git a/target/linux/config/Config.in.mips b/target/linux/config/Config.in.mips
index 2d9a2e661..6f082c574 100644
--- a/target/linux/config/Config.in.mips
+++ b/target/linux/config/Config.in.mips
@@ -1,17 +1,13 @@
menu "MIPS devices support"
depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-config ADK_KERNEL_MIPS_PLATFORM_DEVICES
+config ADK_KERNEL_LEMOTE_YEELOONG2F_PDEV
+ prompt ".................................. Lemote Yeelong platform drivers (f.e. battery support)"
boolean
-
-config ADK_KERNEL_LEMOTE_YEELOONG2F
- prompt ".................................. RTC support for PC CMOS"
- boolean
- select ADK_KERNEL_MIPS_PLATFORM_DEVICES
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default n
depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG
help
- Embedded controller suppport.
-
+ Lemote Yeelong platform drivers.
+
endmenu
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 07:39:01 +0000