summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/dbus/Makefile1
-rw-r--r--package/firefox/Makefile5
-rw-r--r--package/jpeg/patches/patch-ltmain_sh4
-rw-r--r--package/xterm/Makefile4
-rw-r--r--target/linux/config/Config.in.systems3
5 files changed, 13 insertions, 4 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 642b0a245..a86beb442 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -33,6 +33,7 @@ CONFIGURE_ARGS+= --disable-tests \
--without-x \
--enable-checks \
--with-xml=expat \
+ --with-session-socket-dir=/var/tmp \
--disable-dnotify \
--disable-kqueue \
--disable-xml-docs \
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 143047b05..c774ac51c 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -9,10 +9,10 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 3468a2c463b4fc2788ba621e4b511c30
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
-PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify libpng
+PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify libpng libtiff
PKG_DEPENDS+= nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf
-PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 MesaLib
+PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 MesaLib libtiff
PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme
PKG_URL:= http://www.mozilla.org/
PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
@@ -65,6 +65,7 @@ CONFIGURE_ARGS+= --enable-application=browser \
--with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \
--with-glib-prefix=${STAGING_TARGET_DIR}/usr \
--enable-libxul \
+ --enable-dbus \
--disable-tests \
--disable-libconic \
--disable-static \
diff --git a/package/jpeg/patches/patch-ltmain_sh b/package/jpeg/patches/patch-ltmain_sh
index c52339725..dbc41c774 100644
--- a/package/jpeg/patches/patch-ltmain_sh
+++ b/package/jpeg/patches/patch-ltmain_sh
@@ -1,5 +1,9 @@
--- jpeg-8c.orig/ltmain.sh 2010-11-17 22:41:29.000000000 +0100
+<<<<<<< HEAD
++++ jpeg-8c/ltmain.sh 2011-04-07 11:28:48.000000000 +0200
+=======
+++ jpeg-8c/ltmain.sh 2011-04-01 17:20:27.503069018 +0200
+>>>>>>> 62cd6b2635b1e0d233c8537a008bc823c4cd4b2c
@@ -5840,7 +5840,7 @@ func_mode_link ()
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index 6c336d952..a7f267a81 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 3945ab70cfa2a9e95804157ee1b0f8e8
PKG_DESCR:= Terminal Emulator for X Windows
PKG_SECTION:= x11/apps
-PKG_DEPENDS:= libxaw libxt
-PKG_BUILDDEP:= libXt libXmu libXaw
+PKG_DEPENDS:= libxaw libxt libncurses
+PKG_BUILDDEP:= ncurses libXt libXmu libXaw
PKG_URL:= http://invisible-island.net/xterm/xterm.html
PKG_SITES:= ftp://invisible-island.net/xterm/
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
index 5ded9d0cf..3d933c5ed 100644
--- a/target/linux/config/Config.in.systems
+++ b/target/linux/config/Config.in.systems
@@ -1,4 +1,7 @@
# mips systems
+config ADK_KERNEL_ATHEROS_AR231X
+ boolean
+
config ADK_KERNEL_MIPS_MALTA
boolean