diff options
Diffstat (limited to 'package')
13 files changed, 76 insertions, 76 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/package/xorg-server/files/xorg.conf.lemote-yeelong b/package/xorg-server/files/xorg.conf.lemote-yeelong index 6fe95b179..4c8c5d71b 100644 --- a/package/xorg-server/files/xorg.conf.lemote-yeelong +++ b/package/xorg-server/files/xorg.conf.lemote-yeelong @@ -31,7 +31,6 @@ Section "Device" Option "pci_burst" "true" Option "HWCursor" "false" Option "SWCursor" "true" - Option "UseBIOS" "false" Option "PanelSize" "1024x600" EndSection diff --git a/package/xorg-server/patches/patch-fb_fb_h b/package/xorg-server/patches/patch-fb_fb_h index 82a814c7d..39d271d5a 100644 --- a/package/xorg-server/patches/patch-fb_fb_h +++ b/package/xorg-server/patches/patch-fb_fb_h @@ -1,8 +1,8 @@ Fix for xf86-video-siliconmotion in 16bpp with XAA, see: http://groups.google.com/group/loongson-dev/browse_thread/thread/570549e3d7894fef/5f04b3d9370adfd2 ---- xorg-server-1.7.6.orig/fb/fb.h 2010-03-12 05:38:21.000000000 +0100 -+++ xorg-server-1.7.6/fb/fb.h 2010-06-03 15:34:35.903809488 +0200 -@@ -75,7 +75,7 @@ +--- xorg-server-1.9.3.orig/fb/fb.h 2010-12-13 20:42:27.000000000 +0100 ++++ xorg-server-1.9.3/fb/fb.h 2012-10-01 13:23:55.000000000 +0200 +@@ -71,7 +71,7 @@ #define FBPREFIX(x) fb##x #define WRITE(ptr, val) (*(ptr) = (val)) #define READ(ptr) (*(ptr)) diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h index 44b9b9b1a..ebf414b0d 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h +++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h @@ -1,8 +1,8 @@ Caller side code changes regarding memory mapped IO. This patch applies for mips architectures and is used by xf86-video-siliconmotion. ---- xorg-server-1.7.6.orig/hw/xfree86/common/compiler.h 2010-03-12 05:38:22.000000000 +0100 -+++ xorg-server-1.7.6/hw/xfree86/common/compiler.h 2010-06-05 09:43:12.531809482 +0200 -@@ -713,42 +713,43 @@ xf86WriteMmio32LeNB(__volatile__ void *b +--- xorg-server-1.9.3.orig/hw/xfree86/common/compiler.h 2010-09-30 09:27:11.000000000 +0200 ++++ xorg-server-1.9.3/hw/xfree86/common/compiler.h 2012-10-01 13:23:55.000000000 +0200 +@@ -714,42 +714,43 @@ xf86WriteMmio32LeNB(__volatile__ void *b # define PORT_SIZE short # endif diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c new file mode 100644 index 000000000..c75c99f14 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c @@ -0,0 +1,13 @@ +--- xorg-server-1.9.3.orig/hw/xfree86/os-support/linux/lnx_init.c 2010-09-28 19:17:31.000000000 +0200 ++++ xorg-server-1.9.3/hw/xfree86/os-support/linux/lnx_init.c 2012-10-01 16:32:57.000000000 +0200 +@@ -95,8 +95,8 @@ xf86OpenConsole(void) + struct vt_mode VT; + struct vt_stat vts; + MessageType from = X_PROBED; +- char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL }; +- char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL }; ++ char *tty0[] = { "/dev/tty0", NULL }; ++ char *vcs[] = { "/dev/tty%d", NULL }; + + if (serverGeneration == 1) { + diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c index ccbe060a4..c6cd39636 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c @@ -1,8 +1,8 @@ Enable the ioBase mapping code for mips, too. This is needed by xf86-video-siliconmotion. ---- xorg-server-1.7.6.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-03-12 05:38:22.000000000 +0100 -+++ xorg-server-1.7.6/hw/xfree86/os-support/linux/lnx_video.c 2010-06-05 21:46:29.659792653 +0200 -@@ -485,7 +485,7 @@ unmapVidMem(int ScreenNum, pointer Base, +--- xorg-server-1.9.3.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-11-23 20:07:26.000000000 +0100 ++++ xorg-server-1.9.3/hw/xfree86/os-support/linux/lnx_video.c 2012-10-01 13:23:55.000000000 +0200 +@@ -480,7 +480,7 @@ unmapVidMem(int ScreenNum, pointer Base, /* I/O Permissions section */ /***************************************************************************/ @@ -11,7 +11,7 @@ volatile unsigned char *ioBase = NULL; #ifndef __NR_pciconfig_iobase -@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL; +@@ -492,7 +492,7 @@ volatile unsigned char *ioBase = NULL; Bool xf86EnableIO(void) { @@ -20,7 +20,7 @@ int fd; unsigned int ioBase_phys; #endif -@@ -505,8 +505,12 @@ xf86EnableIO(void) +@@ -500,8 +500,12 @@ xf86EnableIO(void) if (ExtendedEnabled) return TRUE; @@ -34,7 +34,7 @@ fd = open("/dev/mem", O_RDWR); if (ioBase == NULL) { -@@ -522,9 +526,10 @@ xf86EnableIO(void) +@@ -517,9 +521,10 @@ xf86EnableIO(void) return FALSE; } #endif @@ -46,7 +46,7 @@ if (ioperm(0, 1024, 1) || iopl(3)) { if (errno == ENODEV) ErrorF("xf86EnableIOPorts: no I/O ports found\n"); -@@ -548,10 +553,10 @@ xf86DisableIO(void) +@@ -545,10 +550,10 @@ xf86DisableIO(void) { if (!ExtendedEnabled) return; |