Mercurial > octave
view build-aux/gnulib-bootstrap-git-fetch.diff @ 30964:04601f6c47f4
fix broken icon path after new icon structure in GUI
* community-news.cc: use window icon configured in the preferences
* documentation-dock-widget.cc (documentation_dock_widget)
* files-dock-widget.cc (files_dock_widget)
* history-dock-widget.cc (history_dock_widget)
* terminal-dock-widget.cc (terminal_dock_widget)
* variable-editor.cc (variable_editor)
* workspace-view.cc (workspace_view)
do not set window icon here as it is set in the main window
* gui-preferences-dw.h: organize dw_icon_set_names in a hash
* file-editor.cc (notice_settings): fix path to tab close icon on mac
* find-dialog.cc (find_dialog): do not set window icon here, it is
already set by the editor
* main-window.cc (notice_settings): set dok widget icons using the
new hash structure of available icon sets
(construct): use global const settings instead of literal string
for main window icon
* octave-qobject.cc (release_notes_widget): pass base qobject
to the release note constructor
* release-notes.cc (release_notes): get qbase object as argument,
get desired window icon from settings
* release-notes.h: constructor with base object as argument
* variable-editor.cc (toplevel_change): use icon path from const
preferences instead of literal strings
* welcome-wizard.cc (make_octave_logo): use icon path from const
preferences instead of literal strings
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Sat, 23 Apr 2022 18:10:45 +0200 |
parents | a3df57fa5c5d |
children | e98fb9b4be86 |
line wrap: on
line source
Update bootstrap script from upstream gnulib to automatically fetch from repository if needed See also: https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00150.html diff --git a/bootstrap b/bootstrap index 8f76d6962..2d0a06376 100755 --- a/bootstrap +++ b/bootstrap @@ -670,6 +670,11 @@ if $use_gnulib; then || cleanup_gnulib trap - 1 2 13 15 + + elif test -n "$GNULIB_REVISION" \ + && ! git --git-dir="$gnulib_path"/.git cat-file \ + commit "$GNULIB_REVISION"; then + git --git-dir="$gnulib_path"/.git fetch fi GNULIB_SRCDIR=$gnulib_path ;; @@ -704,6 +709,10 @@ if $use_gnulib; then if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \ && ! git_modules_config submodule.gnulib.url >/dev/null; then + if ! git --git-dir="$GNULIB_SRCDIR"/.git cat-file \ + commit "$GNULIB_REVISION"; then + git --git-dir="$GNULIB_SRCDIR"/.git fetch + fi (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib fi