diff options
| -rw-r--r-- | package/ImageMagick/Makefile | 4 | ||||
| -rw-r--r-- | package/grep/Makefile | 3 | ||||
| -rw-r--r-- | package/gtk+/Makefile | 7 | ||||
| -rw-r--r-- | package/gtk+/patches/patch-Makefile_in | 14 | ||||
| -rw-r--r-- | package/gtk+/patches/patch-gtk_Makefile_in | 265 | ||||
| -rw-r--r-- | package/gtk+/patches/patch-gtk_gtktypefuncs_c | 78 | ||||
| -rw-r--r-- | package/gtk+/patches/patch-ltmain_sh | 14 | ||||
| -rw-r--r-- | package/xf86-video-intel/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 2 | ||||
| -rw-r--r-- | target/linux/patches/2.6.37/foxg20.patch | 80 | ||||
| -rw-r--r-- | target/packages/pkg-available/laptop | 31 |
11 files changed, 95 insertions, 405 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 9f16e819e..e99c2c515 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -11,19 +11,19 @@ PKG_MD5SUM:= a07a97cfb28b588cbcf83ffa9ec92e3f PKG_DESCR:= image processing and converting utility PKG_SECTION:= multimedia PKG_BUILDDEP:= jpeg libtiff fontconfig libiconv -PKG_DEPENDS:= libjpeg libtiff PKG_URL:= http://www.imagemagick.org/ PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK PKGSD_LIBIMAGEMAGICK:= imagemagick library PKGSC_LIBIMAGEMAGICK:= libs +PKGSS_LIBIMAGEMAGICK:= libjpeg libtiff PKGSD_CONVERT:= image processing and converting utility PKGSC_CONVERT:= multimedia PKGSS_CONVERT:= libimagemagick PKGSD_DISPLAY:= image display application PKGSC_DISPLAY:= multimedia -PKGSS_DISPLAY:= libimagemagick +PKGSS_DISPLAY:= libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng PKGSB_DISPLAY:= libX11 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz diff --git a/package/grep/Makefile b/package/grep/Makefile index d9fc4d56c..b59a2f69f 100644 --- a/package/grep/Makefile +++ b/package/grep/Makefile @@ -5,10 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= grep PKG_VERSION:= 2.5.4 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 92258031d98d4f12dfc6a6d24057e672 PKG_DESCR:= global search for a regular expression and print out matched lines PKG_SECTION:= utils +PKG_DEPENDS:= libpcre PKG_BUILDDEP:= pcre PKG_URL:= http://www.gnu.org/software/grep/ PKG_SITES:= ftp://ftp.gnu.org/gnu/grep/ diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index dd216bf0b..5e0a8ead8 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -4,16 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ -PKG_VERSION:= 2.22.1 +PKG_VERSION:= 2.18.6 +PKG_EXTRAVER:= 2.18 PKG_RELEASE:= 2 -PKG_MD5SUM:= dd1830395a6b9265a1e1989af7a3c5bf +PKG_MD5SUM:= f98617af9f6be3065f64248f78dae2b7 PKG_DESCR:= GTK+ library PKG_SECTION:= libs PKG_DEPENDS:= glib PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender PKG_BUILDDEP+= gdk-pixbuf libXcomposite PKG_URL:= http://www.gtk.org/ -PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.22/ +PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/ PKG_SUBPKGS:= LIBGTK diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in index a3c0845f8..5f732adc4 100644 --- a/package/gtk+/patches/patch-Makefile_in +++ b/package/gtk+/patches/patch-Makefile_in @@ -1,13 +1,13 @@ ---- gtk+-2.22.1.orig/Makefile.in 2010-11-15 17:49:52.000000000 +0100 -+++ gtk+-2.22.1/Makefile.in 2011-01-07 22:23:19.000000000 +0100 -@@ -455,8 +455,8 @@ XVFB_START = \ +--- gtk+-2.18.6.orig/Makefile.in 2010-01-11 22:11:32.000000000 +0100 ++++ gtk+-2.18.6/Makefile.in 2011-01-19 15:27:36.616158611 +0100 +@@ -467,8 +467,8 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY --SRC_SUBDIRS = gdk gtk modules demos tests perf --SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build -+SRC_SUBDIRS = gdk gtk modules -+SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros build +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib +-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules ++SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros # require automake 1.4 AUTOMAKE_OPTIONS = 1.7 diff --git a/package/gtk+/patches/patch-gtk_Makefile_in b/package/gtk+/patches/patch-gtk_Makefile_in deleted file mode 100644 index d2c098b84..000000000 --- a/package/gtk+/patches/patch-gtk_Makefile_in +++ /dev/null @@ -1,265 +0,0 @@ ---- gtk+-2.22.1.orig/gtk/Makefile.in 2010-11-15 17:49:47.000000000 +0100 -+++ gtk+-2.22.1/gtk/Makefile.in 2011-01-04 13:33:50.000000000 +0100 -@@ -1595,7 +1595,172 @@ GENERATED_ICONS = \ - stock-icons/24/folder-remote.png \ - stock-icons/24/user-home.png \ - stock-icons/24/user-desktop.png \ -- stock-icons/24/text-x-generic.png -+ stock-icons/24/text-x-generic.png \ -+ stock-icons/16/gtk-quit.png \ -+ stock-icons/16/gtk-info.png \ -+ stock-icons/16/gtk-file.png \ -+ stock-icons/16/gtk-open.png \ -+ stock-icons/16/gtk-print-preview.png \ -+ stock-icons/16/gtk-print.png \ -+ stock-icons/16/gtk-properties.png \ -+ stock-icons/16/gtk-revert-to-saved-ltr.png \ -+ stock-icons/16/gtk-revert-to-saved-rtl.png \ -+ stock-icons/16/gtk-save-as.png \ -+ stock-icons/16/gtk-new.png \ -+ stock-icons/16/gtk-harddisk.png \ -+ stock-icons/16/gtk-clear.png \ -+ stock-icons/16/gtk-copy.png \ -+ stock-icons/16/gtk-cut.png \ -+ stock-icons/16/gtk-delete.png \ -+ stock-icons/16/gtk-find-and-replace.png \ -+ stock-icons/16/gtk-find.png \ -+ stock-icons/16/gtk-paste.png \ -+ stock-icons/16/gtk-redo-ltr.png \ -+ stock-icons/16/gtk-redo-rtl.png \ -+ stock-icons/16/gtk-select-all.png \ -+ stock-icons/16/gtk-undo-ltr.png \ -+ stock-icons/16/gtk-undo-rtl.png \ -+ stock-icons/16/gtk-directory.png \ -+ stock-icons/16/gtk-unindent-ltr.png \ -+ stock-icons/16/gtk-unindent-rtl.png \ -+ stock-icons/16/gtk-indent-ltr.png \ -+ stock-icons/16/gtk-indent-rtl.png \ -+ stock-icons/16/gtk-justify-center.png \ -+ stock-icons/16/gtk-justify-fill.png \ -+ stock-icons/16/gtk-justify-left.png \ -+ stock-icons/16/gtk-justify-right.png \ -+ stock-icons/16/gtk-bold.png \ -+ stock-icons/16/gtk-italic.png \ -+ stock-icons/16/gtk-strikethrough.png \ -+ stock-icons/16/gtk-underline.png \ -+ stock-icons/16/gtk-goto-bottom.png \ -+ stock-icons/16/gtk-go-down.png \ -+ stock-icons/16/gtk-goto-first-ltr.png \ -+ stock-icons/16/gtk-home.png \ -+ stock-icons/16/gtk-jump-to-ltr.png \ -+ stock-icons/16/gtk-jump-to-rtl.png \ -+ stock-icons/16/gtk-goto-last-ltr.png \ -+ stock-icons/16/gtk-go-forward-ltr.png \ -+ stock-icons/16/gtk-go-back-ltr.png \ -+ stock-icons/16/gtk-goto-top.png \ -+ stock-icons/16/gtk-go-up.png \ -+ stock-icons/16/gtk-about.png \ -+ stock-icons/16/gtk-help.png \ -+ stock-icons/16/gtk-missing-image.png \ -+ stock-icons/16/gtk-add.png \ -+ stock-icons/16/gtk-remove.png \ -+ stock-icons/16/gtk-floppy.png \ -+ stock-icons/16/gtk-cdrom.png \ -+ stock-icons/16/gtk-media-pause.png \ -+ stock-icons/16/gtk-media-play-ltr.png \ -+ stock-icons/16/gtk-media-play-rtl.png \ -+ stock-icons/16/gtk-media-stop.png \ -+ stock-icons/16/gtk-media-record.png \ -+ stock-icons/16/gtk-media-rewind-ltr.png \ -+ stock-icons/16/gtk-media-forward-ltr.png \ -+ stock-icons/16/gtk-media-previous-ltr.png \ -+ stock-icons/16/gtk-media-next-ltr.png \ -+ stock-icons/16/gtk-network.png \ -+ stock-icons/16/gtk-print-error.png \ -+ stock-icons/16/gtk-print-report.png \ -+ stock-icons/16/gtk-print-paused.png \ -+ stock-icons/16/gtk-print-warning.png \ -+ stock-icons/16/gtk-stop.png \ -+ stock-icons/16/gtk-execute.png \ -+ stock-icons/16/gtk-spell-check.png \ -+ stock-icons/16/gtk-fullscreen.png \ -+ stock-icons/16/gtk-refresh.png \ -+ stock-icons/16/gtk-leave-fullscreen.png \ -+ stock-icons/16/gtk-sort-ascending.png \ -+ stock-icons/16/gtk-sort-descending.png \ -+ stock-icons/16/gtk-close.png \ -+ stock-icons/16/gtk-zoom-fit.png \ -+ stock-icons/16/gtk-zoom-in.png \ -+ stock-icons/16/gtk-zoom-100.png \ -+ stock-icons/16/gtk-zoom-out.png \ -+ stock-icons/24/gtk-quit.png \ -+ stock-icons/24/gtk-info.png \ -+ stock-icons/24/gtk-file.png \ -+ stock-icons/24/gtk-open.png \ -+ stock-icons/24/gtk-print-preview.png \ -+ stock-icons/24/gtk-print.png \ -+ stock-icons/24/gtk-properties.png \ -+ stock-icons/24/gtk-revert-to-saved-ltr.png \ -+ stock-icons/24/gtk-revert-to-saved-rtl.png \ -+ stock-icons/24/gtk-save-as.png \ -+ stock-icons/24/gtk-new.png \ -+ stock-icons/24/gtk-harddisk.png \ -+ stock-icons/24/gtk-clear.png \ -+ stock-icons/24/gtk-copy.png \ -+ stock-icons/24/gtk-cut.png \ -+ stock-icons/24/gtk-delete.png \ -+ stock-icons/24/gtk-find-and-replace.png \ -+ stock-icons/24/gtk-find.png \ -+ stock-icons/24/gtk-paste.png \ -+ stock-icons/24/gtk-redo-ltr.png \ -+ stock-icons/24/gtk-redo-rtl.png \ -+ stock-icons/24/gtk-select-all.png \ -+ stock-icons/24/gtk-undo-ltr.png \ -+ stock-icons/24/gtk-undo-rtl.png \ -+ stock-icons/24/gtk-directory.png \ -+ stock-icons/24/gtk-unindent-ltr.png \ -+ stock-icons/24/gtk-unindent-rtl.png \ -+ stock-icons/24/gtk-indent-ltr.png \ -+ stock-icons/24/gtk-indent-rtl.png \ -+ stock-icons/24/gtk-justify-center.png \ -+ stock-icons/24/gtk-justify-fill.png \ -+ stock-icons/24/gtk-justify-left.png \ -+ stock-icons/24/gtk-justify-right.png \ -+ stock-icons/24/gtk-bold.png \ -+ stock-icons/24/gtk-italic.png \ -+ stock-icons/24/gtk-strikethrough.png \ -+ stock-icons/24/gtk-underline.png \ -+ stock-icons/24/gtk-goto-bottom.png \ -+ stock-icons/24/gtk-go-down.png \ -+ stock-icons/24/gtk-goto-first-ltr.png \ -+ stock-icons/24/gtk-home.png \ -+ stock-icons/24/gtk-jump-to-ltr.png \ -+ stock-icons/24/gtk-jump-to-rtl.png \ -+ stock-icons/24/gtk-goto-last-ltr.png \ -+ stock-icons/24/gtk-go-forward-ltr.png \ -+ stock-icons/24/gtk-go-back-ltr.png \ -+ stock-icons/24/gtk-goto-top.png \ -+ stock-icons/24/gtk-go-up.png \ -+ stock-icons/24/gtk-about.png \ -+ stock-icons/24/gtk-help.png \ -+ stock-icons/24/gtk-missing-image.png \ -+ stock-icons/24/gtk-add.png \ -+ stock-icons/24/gtk-remove.png \ -+ stock-icons/24/gtk-floppy.png \ -+ stock-icons/24/gtk-cdrom.png \ -+ stock-icons/24/gtk-media-pause.png \ -+ stock-icons/24/gtk-media-play-ltr.png \ -+ stock-icons/24/gtk-media-play-rtl.png \ -+ stock-icons/24/gtk-media-stop.png \ -+ stock-icons/24/gtk-media-record.png \ -+ stock-icons/24/gtk-media-rewind-ltr.png \ -+ stock-icons/24/gtk-media-forward-ltr.png \ -+ stock-icons/24/gtk-media-previous-ltr.png \ -+ stock-icons/24/gtk-media-next-ltr.png \ -+ stock-icons/24/gtk-network.png \ -+ stock-icons/24/gtk-print-error.png \ -+ stock-icons/24/gtk-print-report.png \ -+ stock-icons/24/gtk-print-paused.png \ -+ stock-icons/24/gtk-print-warning.png \ -+ stock-icons/24/gtk-stop.png \ -+ stock-icons/24/gtk-execute.png \ -+ stock-icons/24/gtk-spell-check.png \ -+ stock-icons/24/gtk-fullscreen.png \ -+ stock-icons/24/gtk-refresh.png \ -+ stock-icons/24/gtk-leave-fullscreen.png \ -+ stock-icons/24/gtk-sort-ascending.png \ -+ stock-icons/24/gtk-sort-descending.png \ -+ stock-icons/24/gtk-close.png \ -+ stock-icons/24/gtk-zoom-fit.png \ -+ stock-icons/24/gtk-zoom-in.png \ -+ stock-icons/24/gtk-zoom-100.png \ -+ stock-icons/24/gtk-zoom-out.png -+ - - @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ - @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -@@ -2866,6 +3031,88 @@ stamp-icons: $(STOCK_ICONS) - && $(LN_S) folder.png user-desktop.png \ - && $(RM) text-x-generic.png \ - && $(LN_S) document-x-generic.png text-x-generic.png \ -+ && $(LN_S) application-exit.png gtk-quit.png \ -+ && $(LN_S) dialog-info.png gtk-info.png \ -+ && $(LN_S) document-new.png gtk-file.png \ -+ && $(LN_S) document-open.png gtk-open.png \ -+ && $(LN_S) document-print-preview.png gtk-print-preview.png \ -+ && $(LN_S) document-print.png gtk-print.png \ -+ && $(LN_S) document-properties.png gtk-properties.png \ -+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ -+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ -+ && $(LN_S) document-save-as.png gtk-save-as.png \ -+ && $(LN_S) document-x-generic.png gtk-new.png \ -+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ -+ && $(LN_S) edit-clear.png gtk-clear.png \ -+ && $(LN_S) edit-copy.png gtk-copy.png \ -+ && $(LN_S) edit-cut.png gtk-cut.png \ -+ && $(LN_S) edit-delete.png gtk-delete.png \ -+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ -+ && $(LN_S) edit-find.png gtk-find.png \ -+ && $(LN_S) edit-paste.png gtk-paste.png \ -+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ -+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ -+ && $(LN_S) edit-select-all.png gtk-select-all.png \ -+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ -+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ -+ && $(LN_S) folder.png gtk-directory.png \ -+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ -+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ -+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ -+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ -+ && $(LN_S) format-justify-center.png gtk-justify-center.png \ -+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ -+ && $(LN_S) format-justify-left.png gtk-justify-left.png \ -+ && $(LN_S) format-justify-right.png gtk-justify-right.png \ -+ && $(LN_S) format-text-bold.png gtk-bold.png \ -+ && $(LN_S) format-text-italic.png gtk-italic.png \ -+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ -+ && $(LN_S) format-text-underline.png gtk-underline.png \ -+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ -+ && $(LN_S) go-down.png gtk-go-down.png \ -+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ -+ && $(LN_S) go-home.png gtk-home.png \ -+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ -+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ -+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ -+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ -+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ -+ && $(LN_S) go-top.png gtk-goto-top.png \ -+ && $(LN_S) go-up.png gtk-go-up.png \ -+ && $(LN_S) help-about.png gtk-about.png \ -+ && $(LN_S) help-contents.png gtk-help.png \ -+ && $(LN_S) image-missing.png gtk-missing-image.png \ -+ && $(LN_S) list-add.png gtk-add.png \ -+ && $(LN_S) list-remove.png gtk-remove.png \ -+ && $(LN_S) media-floppy.png gtk-floppy.png \ -+ && $(LN_S) media-optical.png gtk-cdrom.png \ -+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ -+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ -+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ -+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ -+ && $(LN_S) media-record.png gtk-media-record.png \ -+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ -+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ -+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ -+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ -+ && $(LN_S) network-idle.png gtk-network.png \ -+ && $(LN_S) printer-error.png gtk-print-error.png \ -+ && $(LN_S) printer-info.png gtk-print-report.png \ -+ && $(LN_S) printer-paused.png gtk-print-paused.png \ -+ && $(LN_S) printer-warning.png gtk-print-warning.png \ -+ && $(LN_S) process-stop.png gtk-stop.png \ -+ && $(LN_S) system-run.png gtk-execute.png \ -+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ -+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ -+ && $(LN_S) view-refresh.png gtk-refresh.png \ -+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ -+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ -+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ -+ && $(LN_S) window-close.png gtk-close.png \ -+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ -+ && $(LN_S) zoom-in.png gtk-zoom-in.png \ -+ && $(LN_S) zoom-original.png gtk-zoom-100.png \ -+ && $(LN_S) zoom-out.png gtk-zoom-out.png \ - ) done \ - && touch stamp-icons - diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c deleted file mode 100644 index 8328bf01c..000000000 --- a/package/gtk+/patches/patch-gtk_gtktypefuncs_c +++ /dev/null @@ -1,78 +0,0 @@ ---- gtk+-2.22.1.orig/gtk/gtktypefuncs.c 2010-11-15 18:05:27.000000000 +0100 -+++ gtk+-2.22.1/gtk/gtktypefuncs.c 2011-01-04 00:15:34.000000000 +0100 -@@ -53,8 +53,8 @@ - *tp++ = gdk_pixbuf_simple_anim_get_type(); - *tp++ = gdk_pixbuf_simple_anim_iter_get_type(); - *tp++ = gdk_pixmap_get_type(); --*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_prop_mode_get_type(); -+*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_rectangle_get_type(); - *tp++ = gdk_rgb_dither_get_type(); - *tp++ = gdk_screen_get_type(); -@@ -190,14 +190,14 @@ - *tp++ = gtk_icon_view_drop_position_get_type(); - *tp++ = gtk_icon_view_get_type(); - *tp++ = gtk_identifier_get_type(); --*tp++ = gtk_image_get_type(); --*tp++ = gtk_image_menu_item_get_type(); --*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_im_context_get_type(); - *tp++ = gtk_im_context_simple_get_type(); - *tp++ = gtk_im_multicontext_get_type(); - *tp++ = gtk_im_preedit_style_get_type(); - *tp++ = gtk_im_status_style_get_type(); -+*tp++ = gtk_image_get_type(); -+*tp++ = gtk_image_menu_item_get_type(); -+*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_info_bar_get_type(); - *tp++ = gtk_invisible_get_type(); - *tp++ = gtk_item_get_type(); -@@ -282,10 +282,10 @@ - *tp++ = gtk_ruler_get_type(); - *tp++ = gtk_scale_button_get_type(); - *tp++ = gtk_scale_get_type(); --*tp++ = gtk_scrollbar_get_type(); --*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_scroll_step_get_type(); - *tp++ = gtk_scroll_type_get_type(); -+*tp++ = gtk_scrollbar_get_type(); -+*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_selection_data_get_type(); - *tp++ = gtk_selection_mode_get_type(); - *tp++ = gtk_sensitivity_type_get_type(); -@@ -302,11 +302,11 @@ - *tp++ = gtk_sort_type_get_type(); - *tp++ = gtk_spin_button_get_type(); - *tp++ = gtk_spin_button_update_policy_get_type(); --*tp++ = gtk_spinner_get_type(); - *tp++ = gtk_spin_type_get_type(); -+*tp++ = gtk_spinner_get_type(); - *tp++ = gtk_state_type_get_type(); --*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_status_icon_get_type(); -+*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_style_get_type(); - *tp++ = gtk_submenu_direction_get_type(); - *tp++ = gtk_submenu_placement_get_type(); -@@ -330,16 +330,16 @@ - *tp++ = gtk_toggle_action_get_type(); - *tp++ = gtk_toggle_button_get_type(); - *tp++ = gtk_toggle_tool_button_get_type(); --*tp++ = gtk_toolbar_child_type_get_type(); --*tp++ = gtk_toolbar_get_type(); --*tp++ = gtk_toolbar_space_style_get_type(); --*tp++ = gtk_toolbar_style_get_type(); - *tp++ = gtk_tool_button_get_type(); - *tp++ = gtk_tool_item_get_type(); - *tp++ = gtk_tool_item_group_get_type(); - *tp++ = gtk_tool_palette_drag_targets_get_type(); - *tp++ = gtk_tool_palette_get_type(); - *tp++ = gtk_tool_shell_get_type(); -+*tp++ = gtk_toolbar_child_type_get_type(); -+*tp++ = gtk_toolbar_get_type(); -+*tp++ = gtk_toolbar_space_style_get_type(); -+*tp++ = gtk_toolbar_style_get_type(); - *tp++ = gtk_tooltip_get_type(); - *tp++ = gtk_tree_drag_dest_get_type(); - *tp++ = gtk_tree_drag_source_get_type(); diff --git a/package/gtk+/patches/patch-ltmain_sh b/package/gtk+/patches/patch-ltmain_sh index 2d17e2538..77ed2f207 100644 --- a/package/gtk+/patches/patch-ltmain_sh +++ b/package/gtk+/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- gtk+-2.22.1.orig/ltmain.sh 2010-08-13 04:09:38.000000000 +0200 -+++ gtk+-2.22.1/ltmain.sh 2011-01-14 23:50:15.000000000 +0100 -@@ -5091,7 +5091,7 @@ func_mode_link () - # @file GCC response files - # -tp=* Portland pgcc target processor selection +--- gtk+-2.18.6.orig/ltmain.sh 2009-12-02 12:35:38.000000000 +0100 ++++ gtk+-2.18.6/ltmain.sh 2011-01-19 15:27:06.368658496 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index 9eaaceb3e..5bcc3ccf1 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= xorg-server libdrm PKG_BUILDDEP:= xorg-server libdrm PKG_SITES:= http://xorg.freedesktop.org/archive/individual/driver/ +PKG_CFLINE:= y if (ADK_PKG_LAPTOP && ADK_TARGET_SYSTEM_IBM_X40) + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_INTEL,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index ef12cbe0c..d6e4bfcd1 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -267,6 +267,7 @@ config ADK_KERNEL_MAC80211_DEBUGFS config ADK_KPACKAGE_KMOD_MAC80211 tristate + select ADK_KERNEL_RFKILL select ADK_KERNEL_WIRELESS select ADK_KERNEL_WLAN_80211 select ADK_KERNEL_MOD_CFG80211 @@ -319,7 +320,6 @@ config ADK_KPACKAGE_KMOD_B43 tristate select ADK_KPACKAGE_KMOD_FW_LOADER depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54G default n help Driver for Broadcom B43xx wireless chips. diff --git a/target/linux/patches/2.6.37/foxg20.patch b/target/linux/patches/2.6.37/foxg20.patch index 9a7d7afa0..d00c4c111 100644 --- a/target/linux/patches/2.6.37/foxg20.patch +++ b/target/linux/patches/2.6.37/foxg20.patch @@ -1,18 +1,18 @@ -diff -Nur linux-2.6.36.orig/arch/arm/Kconfig linux-2.6.36/arch/arm/Kconfig ---- linux-2.6.36.orig/arch/arm/Kconfig 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/arm/Kconfig 2010-12-25 17:49:20.000000000 +0100 -@@ -21,6 +21,8 @@ - select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) +diff -Nur linux-2.6.37.orig/arch/arm/Kconfig linux-2.6.37/arch/arm/Kconfig +--- linux-2.6.37.orig/arch/arm/Kconfig 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37/arch/arm/Kconfig 2011-01-19 22:07:18.000000000 +0100 +@@ -16,6 +16,8 @@ + select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) select HAVE_GENERIC_DMA_COHERENT select HAVE_KERNEL_GZIP + select HAVE_KERNEL_BZIP2 + select HAVE_KERNEL_LZMA select HAVE_KERNEL_LZO select HAVE_KERNEL_LZMA - select HAVE_PERF_EVENTS -diff -Nur linux-2.6.36.orig/arch/arm/include/asm/setup.h linux-2.6.36/arch/arm/include/asm/setup.h ---- linux-2.6.36.orig/arch/arm/include/asm/setup.h 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/arm/include/asm/setup.h 2010-12-25 17:49:20.000000000 +0100 + select HAVE_IRQ_WORK +diff -Nur linux-2.6.37.orig/arch/arm/include/asm/setup.h linux-2.6.37/arch/arm/include/asm/setup.h +--- linux-2.6.37.orig/arch/arm/include/asm/setup.h 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37/arch/arm/include/asm/setup.h 2011-01-19 22:07:18.000000000 +0100 @@ -18,6 +18,8 @@ #define COMMAND_LINE_SIZE 1024 @@ -22,10 +22,10 @@ diff -Nur linux-2.6.36.orig/arch/arm/include/asm/setup.h linux-2.6.36/arch/arm/i /* The list ends with an ATAG_NONE node. */ #define ATAG_NONE 0x00000000 -diff -Nur linux-2.6.36.orig/arch/arm/kernel/setup.c linux-2.6.36/arch/arm/kernel/setup.c ---- linux-2.6.36.orig/arch/arm/kernel/setup.c 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/arm/kernel/setup.c 2010-12-25 17:49:20.000000000 +0100 -@@ -899,8 +899,12 @@ +diff -Nur linux-2.6.37.orig/arch/arm/kernel/setup.c linux-2.6.37/arch/arm/kernel/setup.c +--- linux-2.6.37.orig/arch/arm/kernel/setup.c 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37/arch/arm/kernel/setup.c 2011-01-19 22:07:18.000000000 +0100 +@@ -935,8 +935,12 @@ static int c_show(struct seq_file *m, void *v) { @@ -38,12 +38,12 @@ diff -Nur linux-2.6.36.orig/arch/arm/kernel/setup.c linux-2.6.36/arch/arm/kernel seq_printf(m, "Processor\t: %s rev %d (%s)\n", cpu_name, read_cpuid_id() & 15, elf_platform); -diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Kconfig linux-2.6.36/arch/arm/mach-at91/Kconfig ---- linux-2.6.36.orig/arch/arm/mach-at91/Kconfig 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/arm/mach-at91/Kconfig 2010-12-25 17:49:20.000000000 +0100 -@@ -364,6 +364,15 @@ - evaluation board. - <http://www.taskit.de/en/> +diff -Nur linux-2.6.37.orig/arch/arm/mach-at91/Kconfig linux-2.6.37/arch/arm/mach-at91/Kconfig +--- linux-2.6.37.orig/arch/arm/mach-at91/Kconfig 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37/arch/arm/mach-at91/Kconfig 2011-01-19 22:08:47.000000000 +0100 +@@ -347,6 +347,15 @@ + Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit + that embeds only one SD/MMC slot. +config MACH_FOXG20 + bool "Acme Systems FOX G20" @@ -54,15 +54,15 @@ diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Kconfig linux-2.6.36/arch/arm/mac + Select this if you are using Acme Systems + FOX Board G20 <http://netus.acmesystems.it> + - endif - - if (ARCH_AT91SAM9260 || ARCH_AT91SAM9G20) -diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Makefile linux-2.6.36/arch/arm/mach-at91/Makefile ---- linux-2.6.36.orig/arch/arm/mach-at91/Makefile 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/arm/mach-at91/Makefile 2010-12-25 17:49:20.000000000 +0100 -@@ -72,6 +72,9 @@ + config MACH_AT91SAM9G20EK_2MMC + depends on MACH_AT91SAM9G20EK + bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots" +diff -Nur linux-2.6.37.orig/arch/arm/mach-at91/Makefile linux-2.6.37/arch/arm/mach-at91/Makefile +--- linux-2.6.37.orig/arch/arm/mach-at91/Makefile 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37/arch/arm/mach-at91/Makefile 2011-01-19 22:07:18.000000000 +0100 +@@ -73,6 +73,9 @@ # AT91SAM9G45 board-specific support - obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o + obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o +# FOXG20 board-specific support +obj-$(CONFIG_MACH_FOXG20) += board-foxg20.o @@ -70,9 +70,9 @@ diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Makefile linux-2.6.36/arch/arm/ma # AT91CAP9 board-specific support obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o -diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.36/arch/arm/mach-at91/at91sam9260_devices.c ---- linux-2.6.36.orig/arch/arm/mach-at91/at91sam9260_devices.c 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/arch/arm/mach-at91/at91sam9260_devices.c 2010-12-25 17:49:20.000000000 +0100 +diff -Nur linux-2.6.37.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.37/arch/arm/mach-at91/at91sam9260_devices.c +--- linux-2.6.37.orig/arch/arm/mach-at91/at91sam9260_devices.c 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37/arch/arm/mach-at91/at91sam9260_devices.c 2011-01-19 22:07:18.000000000 +0100 @@ -454,7 +454,15 @@ .sda_is_open_drain = 1, .scl_pin = AT91_PIN_PA24, @@ -89,10 +89,10 @@ diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.3 }; static struct platform_device at91sam9260_twi_device = { -diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.36/arch/arm/mach-at91/board-foxg20.c ---- linux-2.6.36.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36/arch/arm/mach-at91/board-foxg20.c 2010-12-25 17:49:20.000000000 +0100 -@@ -0,0 +1,376 @@ +diff -Nur linux-2.6.37.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.37/arch/arm/mach-at91/board-foxg20.c +--- linux-2.6.37.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.37/arch/arm/mach-at91/board-foxg20.c 2011-01-19 22:30:43.000000000 +0100 +@@ -0,0 +1,374 @@ +/* + * Copyright (C) 2005 SAN People + * Copyright (C) 2008 Atmel @@ -461,18 +461,16 @@ diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.36/arch/ + +MACHINE_START(AT91SAM9G20EK, "Acme Systems FOXG20") + /* Maintainer: Lee McLoughlin */ -+ .phys_io = AT91_BASE_SYS, -+ .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, + .boot_params = AT91_SDRAM_BASE + 0x100, + .timer = &at91sam926x_timer, + .map_io = foxg20_map_io, + .init_irq = foxg20_init_irq, + .init_machine = foxg20_board_init, +MACHINE_END -diff -Nur linux-2.6.36.orig/drivers/mmc/host/Kconfig linux-2.6.36/drivers/mmc/host/Kconfig ---- linux-2.6.36.orig/drivers/mmc/host/Kconfig 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/drivers/mmc/host/Kconfig 2010-12-25 19:15:17.000000000 +0100 -@@ -208,12 +208,12 @@ +diff -Nur linux-2.6.37.orig/drivers/mmc/host/Kconfig linux-2.6.37/drivers/mmc/host/Kconfig +--- linux-2.6.37.orig/drivers/mmc/host/Kconfig 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37/drivers/mmc/host/Kconfig 2011-01-19 22:07:18.000000000 +0100 +@@ -230,12 +230,12 @@ If unsure, say N. @@ -491,7 +489,7 @@ diff -Nur linux-2.6.36.orig/drivers/mmc/host/Kconfig linux-2.6.36/drivers/mmc/ho config MMC_AT91 tristate "AT91 SD/MMC Card Interface support" -@@ -223,17 +223,17 @@ +@@ -245,17 +245,17 @@ If unsure, say N. diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/laptop new file mode 100644 index 000000000..52312c9ab --- /dev/null +++ b/target/packages/pkg-available/laptop @@ -0,0 +1,31 @@ +config ADK_PKG_LAPTOP + bool "Choose packages for a laptop system with X" + default n + select ADK_KPACKAGE_KMOD_PCMCIA + select ADK_KPACKAGE_KMOD_PCCARD + select ADK_KPACKAGE_KMOD_SERIAL_8250_CS + select ADK_PACKAGE_SCREEN + select ADK_PACKAGE_SUDO + select ADK_PACKAGE_KEYCHAIN + select ADK_PACKAGE_CRYPTSETUP + select ADK_PACKAGE_OPENSC + select ADK_PACKAGE_PCSC_LITE + select ADK_PACKAGE_CCID + select ADK_PACKAGE_OPENSSL_PKCS11 + select ADK_PACKAGE_OPENSSH_CLIENT + select ADK_PACKAGE_OPENSSH_CLIENT_UTILS + select ADK_PACKAGE_OPENSSH_SERVER + select ADK_PACKAGE_MKSH + select ADK_PACKAGE_MKSH_FULL + select ADK_PACKAGE_RXVT_UNICODE + select ADK_PACKAGE_XORG_SERVER + select ADK_PACKAGE_XORG_SERVER_WITH_DRI + select ADK_PACKAGE_XF86_INPUT_KEYBOARD + select ADK_PACKAGE_XF86_INPUT_MOUSE + select ADK_PACKAGE_SETXKBMAP + select ADK_PACKAGE_XBINDKEYS + select ADK_PACKAGE_DISPLAY + select ADK_PACKAGE_XINIT + select ADK_PACKAGE_EVILWM + select ADK_PACKAGE_FIREFOX + select ADK_PACKAGE_MPLAYER |