December 2019 - netsurf-commits - listmaster.pepperfish.net

packaging/debian: branch master updated. release/3.6-3-12-g492b28c

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/packaging/debian.git/shortlog/492b28c439ce... ...commit http://git.netsurf-browser.org/packaging/debian.git/commit/492b28c439ce46... ...tree http://git.netsurf-browser.org/packaging/debian.git/tree/492b28c439ce4694... The branch, master has been updated via 492b28c439ce4694aff20dd0a14936af62b9c9d7 (commit) from c1828cce0bfac32491a2721b33900ba01687f20a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/packaging/debian.git/commit/?id=492b28c439... commit 492b28c439ce4694aff20dd0a14936af62b9c9d7 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> build both gtk3 and gtk2 versions diff --git a/changelog b/changelog index df12957..d111342 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,10 @@ -netsurf (3.9-1) UNRELEASED; urgency=medium +netsurf (3.9-2) UNRELEASED; urgency=medium + + * Build both gtk2 and gtk3 versions + + -- Vincent Sanders <vince(a)debian.org> 02 Dec 2019 22:11:04 +0000 + +netsurf (3.9-1) unstable; urgency=medium * New upstream release (Closes: #869600) * Make png generation reproducible. diff --git a/control b/control index 074da22..243e401 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Vincent Sanders <vince(a)debian.org> Uploaders: Daniel Silverstone <dsilvers(a)digital-scurf.org> -Build-Depends: debhelper (>= 9~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf, xxd +Build-Depends: debhelper (>= 9~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, libgtk-3-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf, xxd Standards-Version: 4.1.4 Homepage: https://www.netsurf-browser.org Vcs-Browser: https://source.netsurf-browser.org/packaging/debian.git/ @@ -32,7 +32,19 @@ Description: small web browser with CSS support for GTK comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint without compromising performance. . - This version uses the GTK+ toolkit. + This version uses the GTK+ 3 toolkit. + +Package: netsurf-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, netsurf-common (=${source:Version}) +Provides: www-browser +Recommends: mime-support +Description: small web browser with CSS support for GTK + NetSurf is a multi-platform lightweight web browser. It aims to provide + comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint + without compromising performance. + . + This version uses the GTK+ 2 toolkit. Package: netsurf-fb Architecture: any diff --git a/netsurf-gtk.1 b/netsurf-gtk.1 deleted file mode 100644 index 13a0fa5..0000000 --- a/netsurf-gtk.1 +++ /dev/null @@ -1,362 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH NETSURF 1 "April 19, 2011" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -netsurf \- A small fast web browser -.SH SYNOPSIS -.B netsurf -.RI [ options ] -.RI [ url ] -.SH DESCRIPTION -This manual page documents briefly the -.B netsurf -browser. -.PP -.\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBnetsurf\fP is a small fast web browser. This man page only describes how to run the browser. -.SH OPTIONS -This programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -.PP -The command line parameters override any options loaded from the users Choices file. -.PP -A summary of options is included below. -.TP -.B \-v -Enable verbose logging. -.TP -.B \-\-http_proxy -Bboolean indicating if the http proxy is being used. -.TP -.B \-\-http_proxy_host -The http proxy host. -.TP -.B \-\-http_proxy_port -The http proxy port. -.TP -.B \-\-http_proxy_auth -The authentication scheme for the http proxy. -.TP -.B \-\-http_proxy_auth_user -The authentication schemes user. -.TP -.B \-\-http_proxy_auth_pass -The authentication schemes password. -.TP -.B \-\-font_size -The default font size to use. -.TP -.B \-\-font_min_size -The minimum font size to use. -.TP -.B \-\-font_sans -Family name of the sans serrif font. -.TP -.B \-\-font_serif -Family name of the serrif font. -.TP -.B \-\-font_mono -Family name of the monospace font. -.TP -.B \-\-font_cursive -Family name of the cursive font. -.TP -.B \-\-font_fantasy -Family name of the fantasy font. -.TP -.B \-\-accept_language -Languages to accept. -.TP -.B \-\-accept_charset -Character set to accept -.TP -.B \-\-memory_cache_size -Maximum memory cache size. -.TP -.B \-\-disc_cache_age -Maximum disc cache size. -.TP -.B \-\-block_advertisements -Boolean to enable ad blocking. -.TP -.B \-\-minimum_gif_delay -Minimum time between gif frames -.TP -.B \-\-send_referer -Boolean controlling wether referer data should be sent -.TP -.B \-\-animate_images -Boolean controlling wether images should be animated. -.TP -.B \-\-expire_url -expire url -.TP -.B \-\-font_default -Default font. -.TP -.B \-\-ca_bundle -ca bundle -.TP -.B \-\-ca_path -ca path -.TP -.B \-\-cookie_file -cookie file -.TP -.B \-\-cookie_jar -cookie jar -.TP -.B \-\-homepage_url -homepage url -.TP -.B \-\-search_url_bar -search url bar -.TP -.B \-\-search_provider -search provider -.TP -.B \-\-url_suggestion -url suggestion -.TP -.B \-\-window_x -The X co-ordinate of the initial window. -.TP -.B \-\-window_y -The Y co-ordinate of the initial window. -.TP -.B \-\-window_width -The width of the initial window. -.TP -.B \-\-window_height -The height of the initial window. -.TP -.B \-\-window_screen_width -window screen width -.TP -.B \-\-window_screen_height -window screen height -.TP -.B \-\-toolbar_status_size -toolbar status size -.TP -.B \-\-scale -Initial scale factor. -.TP -.B \-\-incremental_reflow -Boolean controlling wether incremental reflow is performed. -.TP -.B \-\-min_reflow_period -Minimum time between incremental reflows -.TP -.B \-\-core_select_menu -core select menu -.TP -.B \-\-max_fetchers -max fetchers -.TP -.B \-\-max_fetchers_per_host -max fetchers per host -.TP -.B \-\-max_cached_fetch_handles -max cached fetch handles -.TP -.B \-\-suppress_curl_debug -suppress curl debug -.TP -.B \-\-target_blank -target blank -.TP -.B \-\-button_2_tab -button 2 tab -.TP -.B \-\-margin_top -margin top -.TP -.B \-\-margin_bottom -margin bottom -.TP -.B \-\-margin_left -margin left -.TP -.B \-\-margin_right -margin right -.TP -.B \-\-export_scale -export scale -.TP -.B \-\-suppress_images -suppress images -.TP -.B \-\-remove_backgrounds -remove backgrounds -.TP -.B \-\-enable_loosening -enable loosening -.TP -.B \-\-enable_PDF_compression -enable PDF compression -.TP -.B \-\-enable_PDF_password -enable_PDF_password -.TP -.B \-\-gui_colour_bg_1 -gui colour bg_1 -.TP -.B \-\-gui_colour_fg_1 -gui colour fg_1 -.TP -.B \-\-gui_colour_fg_2 -gui colour fg_2 -.TP -.B \-\-sys_colour_ActiveBorder -Override CSS sys_colour_ActiveBorder colour. -.TP -.B \-\-sys_colour_ActiveCaption -Override CSS sys_colour_ActiveCaption colour. -.TP -.B \-\-sys_colour_AppWorkspace -Override CSS sys_colour_AppWorkspace colour. -.TP -.B \-\-sys_colour_Background -Override CSS sys_colour_Background colour. -.TP -.B \-\-sys_colour_ButtonFace -Override CSS sys_colour_ButtonFace colour. -.TP -.B \-\-sys_colour_ButtonHighlight -Override CSS sys_colour_ButtonHighlight colour. -.TP -.B \-\-sys_colour_ButtonShadow -Override CSS sys_colour_ButtonShadow colour. -.TP -.B \-\-sys_colour_ButtonText -Override CSS sys_colour_ButtonText colour. -.TP -.B \-\-sys_colour_CaptionText -Override CSS sys_colour_CaptionText colour. -.TP -.B \-\-sys_colour_GrayText -Override CSS sys_colour_GrayText colour. -.TP -.B \-\-sys_colour_Highlight -Override CSS sys_colour_Highlight colour. -.TP -.B \-\-sys_colour_HighlightText -Override CSS sys_colour_HighlightText colour. -.TP -.B \-\-sys_colour_InactiveBorder -Override CSS sys_colour_InactiveBorder colour. -.TP -.B \-\-sys_colour_InactiveCaption -Override CSS sys_colour_InactiveCaption colour. -.TP -.B \-\-sys_colour_InactiveCaptionText -Override CSS sys_colour_InactiveCaptionText colour. -.TP -.B \-\-sys_colour_InfoBackground -Override CSS sys_colour_InfoBackground colour. -.TP -.B \-\-sys_colour_InfoText -Override CSS sys_colour_InfoText colour. -.TP -.B \-\-sys_colour_Menu -Override CSS sys_colour_Menu colour. -.TP -.B \-\-sys_colour_MenuText -Override CSS sys_colour_MenuText colour. -.TP -.B \-\-sys_colour_Scrollbar -Override CSS sys_colour_Scrollbar colour. -.TP -.B \-\-sys_colour_ThreeDDarkShadow -Override CSS sys_colour_ThreeDDarkShadow colour. -.TP -.B \-\-sys_colour_ThreeDFace -Override CSS sys_colour_ThreeDFace colour. -.TP -.B \-\-sys_colour_ThreeDHighlight -Override CSS sys_colour_ThreeDHighlight colour. -.TP -.B \-\-sys_colour_ThreeDLightShadow -Override CSS sys_colour_ThreeDLightShadow colour. -.TP -.B \-\-sys_colour_ThreeDShadow -Override CSS sys_colour_ThreeDShadow colour. -.TP -.B \-\-sys_colour_Window -Override CSS sys_colour_Window colour. -.TP -.B \-\-sys_colour_WindowFrame -Override CSS sys_colour_WindowFrame colour. -.TP -.B \-\-sys_colour_WindowText -Override CSS sys_colour_WindowText colour. -.TP -.B \-\-render_resample -render resample -.TP -.B \-\-downloads_clear -downloads clear -.TP -.B \-\-request_overwrite -request overwrite -.TP -.B \-\-downloads_directory -downloads directory -.TP -.B \-\-url_file -url file -.TP -.B \-\-show_single_tab -Force tabs to always be show. -.TP -.B \-\-button_type -button type -.TP -.B \-\-disable_popups -disable popups -.TP -.B \-\-disable_plugins -disable plugins -.TP -.B \-\-history_age -history age -.TP -.B \-\-hover_urls -hover urls -.TP -.B \-\-focus_new -focus new -.TP -.B \-\-new_blank -new blank -.TP -.B \-\-hotlist_path -hotlist path -.TP -.B \-\-source_tab -source tab -.TP -.B \-\-current_theme -current theme -.SH AUTHOR -netsurf was written by <upstream author>. -.PP -This manual page was written by Vincent Sanders <vince(a)debian.org>, -for the Debian project (and may be used by others). diff --git a/netsurf-gtk.desktop b/netsurf-gtk.desktop index 4c21d55..99b7ceb 100644 --- a/netsurf-gtk.desktop +++ b/netsurf-gtk.desktop @@ -57,11 +57,11 @@ GenericName[pl]=Przeglądarka WWW GenericName[pt]=Navegador Web GenericName[pt_BR]=Navegador Web GenericName[sk]=Internetový prehliadač -Exec=netsurf-gtk %u +Exec=netsurf-gtk3 %u Terminal=false X-MultipleArgs=false Type=Application -Icon=netsurf.png +Icon=netsurf3.png Categories=Network; MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png StartupWMClass=NetSurf-bin diff --git a/netsurf-gtk.install b/netsurf-gtk.install index 39984a6..4a23411 100644 --- a/netsurf-gtk.install +++ b/netsurf-gtk.install @@ -1 +1 @@ -usr/bin/netsurf-gtk +usr/bin/netsurf-gtk3 diff --git a/netsurf-gtk.manpages b/netsurf-gtk.manpages index a49aae5..6d833ec 100644 --- a/netsurf-gtk.manpages +++ b/netsurf-gtk.manpages @@ -1 +1 @@ -debian/netsurf-gtk.1 +debian/netsurf-gtk3.1 diff --git a/netsurf-gtk.postinst b/netsurf-gtk.postinst index 8686b98..22d8df5 100644 --- a/netsurf-gtk.postinst +++ b/netsurf-gtk.postinst @@ -2,7 +2,7 @@ set -e if [ "$1" = "configure" ]; then - update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk.1.gz + update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk3 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk3.1.gz fi #DEBHELPER# diff --git a/netsurf-gtk.prerm b/netsurf-gtk.prerm index 6294db0..1a4eedc 100644 --- a/netsurf-gtk.prerm +++ b/netsurf-gtk.prerm @@ -2,7 +2,7 @@ set -e if [ "$1" != "upgrade" ]; then - update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk + update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk3 fi #DEBHELPER# diff --git a/netsurf-gtk2.1 b/netsurf-gtk2.1 new file mode 100644 index 0000000..13a0fa5 --- /dev/null +++ b/netsurf-gtk2.1 @@ -0,0 +1,362 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH NETSURF 1 "April 19, 2011" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +netsurf \- A small fast web browser +.SH SYNOPSIS +.B netsurf +.RI [ options ] +.RI [ url ] +.SH DESCRIPTION +This manual page documents briefly the +.B netsurf +browser. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBnetsurf\fP is a small fast web browser. This man page only describes how to run the browser. +.SH OPTIONS +This programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +.PP +The command line parameters override any options loaded from the users Choices file. +.PP +A summary of options is included below. +.TP +.B \-v +Enable verbose logging. +.TP +.B \-\-http_proxy +Bboolean indicating if the http proxy is being used. +.TP +.B \-\-http_proxy_host +The http proxy host. +.TP +.B \-\-http_proxy_port +The http proxy port. +.TP +.B \-\-http_proxy_auth +The authentication scheme for the http proxy. +.TP +.B \-\-http_proxy_auth_user +The authentication schemes user. +.TP +.B \-\-http_proxy_auth_pass +The authentication schemes password. +.TP +.B \-\-font_size +The default font size to use. +.TP +.B \-\-font_min_size +The minimum font size to use. +.TP +.B \-\-font_sans +Family name of the sans serrif font. +.TP +.B \-\-font_serif +Family name of the serrif font. +.TP +.B \-\-font_mono +Family name of the monospace font. +.TP +.B \-\-font_cursive +Family name of the cursive font. +.TP +.B \-\-font_fantasy +Family name of the fantasy font. +.TP +.B \-\-accept_language +Languages to accept. +.TP +.B \-\-accept_charset +Character set to accept +.TP +.B \-\-memory_cache_size +Maximum memory cache size. +.TP +.B \-\-disc_cache_age +Maximum disc cache size. +.TP +.B \-\-block_advertisements +Boolean to enable ad blocking. +.TP +.B \-\-minimum_gif_delay +Minimum time between gif frames +.TP +.B \-\-send_referer +Boolean controlling wether referer data should be sent +.TP +.B \-\-animate_images +Boolean controlling wether images should be animated. +.TP +.B \-\-expire_url +expire url +.TP +.B \-\-font_default +Default font. +.TP +.B \-\-ca_bundle +ca bundle +.TP +.B \-\-ca_path +ca path +.TP +.B \-\-cookie_file +cookie file +.TP +.B \-\-cookie_jar +cookie jar +.TP +.B \-\-homepage_url +homepage url +.TP +.B \-\-search_url_bar +search url bar +.TP +.B \-\-search_provider +search provider +.TP +.B \-\-url_suggestion +url suggestion +.TP +.B \-\-window_x +The X co-ordinate of the initial window. +.TP +.B \-\-window_y +The Y co-ordinate of the initial window. +.TP +.B \-\-window_width +The width of the initial window. +.TP +.B \-\-window_height +The height of the initial window. +.TP +.B \-\-window_screen_width +window screen width +.TP +.B \-\-window_screen_height +window screen height +.TP +.B \-\-toolbar_status_size +toolbar status size +.TP +.B \-\-scale +Initial scale factor. +.TP +.B \-\-incremental_reflow +Boolean controlling wether incremental reflow is performed. +.TP +.B \-\-min_reflow_period +Minimum time between incremental reflows +.TP +.B \-\-core_select_menu +core select menu +.TP +.B \-\-max_fetchers +max fetchers +.TP +.B \-\-max_fetchers_per_host +max fetchers per host +.TP +.B \-\-max_cached_fetch_handles +max cached fetch handles +.TP +.B \-\-suppress_curl_debug +suppress curl debug +.TP +.B \-\-target_blank +target blank +.TP +.B \-\-button_2_tab +button 2 tab +.TP +.B \-\-margin_top +margin top +.TP +.B \-\-margin_bottom +margin bottom +.TP +.B \-\-margin_left +margin left +.TP +.B \-\-margin_right +margin right +.TP +.B \-\-export_scale +export scale +.TP +.B \-\-suppress_images +suppress images +.TP +.B \-\-remove_backgrounds +remove backgrounds +.TP +.B \-\-enable_loosening +enable loosening +.TP +.B \-\-enable_PDF_compression +enable PDF compression +.TP +.B \-\-enable_PDF_password +enable_PDF_password +.TP +.B \-\-gui_colour_bg_1 +gui colour bg_1 +.TP +.B \-\-gui_colour_fg_1 +gui colour fg_1 +.TP +.B \-\-gui_colour_fg_2 +gui colour fg_2 +.TP +.B \-\-sys_colour_ActiveBorder +Override CSS sys_colour_ActiveBorder colour. +.TP +.B \-\-sys_colour_ActiveCaption +Override CSS sys_colour_ActiveCaption colour. +.TP +.B \-\-sys_colour_AppWorkspace +Override CSS sys_colour_AppWorkspace colour. +.TP +.B \-\-sys_colour_Background +Override CSS sys_colour_Background colour. +.TP +.B \-\-sys_colour_ButtonFace +Override CSS sys_colour_ButtonFace colour. +.TP +.B \-\-sys_colour_ButtonHighlight +Override CSS sys_colour_ButtonHighlight colour. +.TP +.B \-\-sys_colour_ButtonShadow +Override CSS sys_colour_ButtonShadow colour. +.TP +.B \-\-sys_colour_ButtonText +Override CSS sys_colour_ButtonText colour. +.TP +.B \-\-sys_colour_CaptionText +Override CSS sys_colour_CaptionText colour. +.TP +.B \-\-sys_colour_GrayText +Override CSS sys_colour_GrayText colour. +.TP +.B \-\-sys_colour_Highlight +Override CSS sys_colour_Highlight colour. +.TP +.B \-\-sys_colour_HighlightText +Override CSS sys_colour_HighlightText colour. +.TP +.B \-\-sys_colour_InactiveBorder +Override CSS sys_colour_InactiveBorder colour. +.TP +.B \-\-sys_colour_InactiveCaption +Override CSS sys_colour_InactiveCaption colour. +.TP +.B \-\-sys_colour_InactiveCaptionText +Override CSS sys_colour_InactiveCaptionText colour. +.TP +.B \-\-sys_colour_InfoBackground +Override CSS sys_colour_InfoBackground colour. +.TP +.B \-\-sys_colour_InfoText +Override CSS sys_colour_InfoText colour. +.TP +.B \-\-sys_colour_Menu +Override CSS sys_colour_Menu colour. +.TP +.B \-\-sys_colour_MenuText +Override CSS sys_colour_MenuText colour. +.TP +.B \-\-sys_colour_Scrollbar +Override CSS sys_colour_Scrollbar colour. +.TP +.B \-\-sys_colour_ThreeDDarkShadow +Override CSS sys_colour_ThreeDDarkShadow colour. +.TP +.B \-\-sys_colour_ThreeDFace +Override CSS sys_colour_ThreeDFace colour. +.TP +.B \-\-sys_colour_ThreeDHighlight +Override CSS sys_colour_ThreeDHighlight colour. +.TP +.B \-\-sys_colour_ThreeDLightShadow +Override CSS sys_colour_ThreeDLightShadow colour. +.TP +.B \-\-sys_colour_ThreeDShadow +Override CSS sys_colour_ThreeDShadow colour. +.TP +.B \-\-sys_colour_Window +Override CSS sys_colour_Window colour. +.TP +.B \-\-sys_colour_WindowFrame +Override CSS sys_colour_WindowFrame colour. +.TP +.B \-\-sys_colour_WindowText +Override CSS sys_colour_WindowText colour. +.TP +.B \-\-render_resample +render resample +.TP +.B \-\-downloads_clear +downloads clear +.TP +.B \-\-request_overwrite +request overwrite +.TP +.B \-\-downloads_directory +downloads directory +.TP +.B \-\-url_file +url file +.TP +.B \-\-show_single_tab +Force tabs to always be show. +.TP +.B \-\-button_type +button type +.TP +.B \-\-disable_popups +disable popups +.TP +.B \-\-disable_plugins +disable plugins +.TP +.B \-\-history_age +history age +.TP +.B \-\-hover_urls +hover urls +.TP +.B \-\-focus_new +focus new +.TP +.B \-\-new_blank +new blank +.TP +.B \-\-hotlist_path +hotlist path +.TP +.B \-\-source_tab +source tab +.TP +.B \-\-current_theme +current theme +.SH AUTHOR +netsurf was written by <upstream author>. +.PP +This manual page was written by Vincent Sanders <vince(a)debian.org>, +for the Debian project (and may be used by others). diff --git a/netsurf-gtk2.desktop b/netsurf-gtk2.desktop new file mode 100644 index 0000000..2b4e15d --- /dev/null +++ b/netsurf-gtk2.desktop @@ -0,0 +1,68 @@ +[Desktop Entry] +Name=NetSurf Web Browser +Name[ca]=Navegador web NetSurf +Name[cs]=NetSurf Webový prohlížeč +Name[es]=Navegador web NetSurf +Name[fa]=مرورگر اینترنتی NetSurf +Name[fi]=NetSurf-selain +Name[fr]=Navigateur Web NetSurf +Name[hu]=NetSurf webböngésző +Name[it]=NetSurf Browser Web +Name[ja]=NetSurf ウェブ・ブラウザ +Name[ko]=NetSurf 웹 브라우저 +Name[nb]=NetSurf Nettleser +Name[nl]=NetSurf webbrowser +Name[nn]=NetSurf Nettlesar +Name[no]=NetSurf Nettleser +Name[pl]=Przeglądarka WWW NetSurf +Name[pt]=NetSurf Navegador Web +Name[pt_BR]=Navegador Web NetSurf +Name[sk]=Internetový prehliadač NetSurf +Comment=Browse the World Wide Web +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +Comment[es]=Navegue por la web +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[sk]=Prehliadanie internetu +GenericName=Web Browser +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[sk]=Internetový prehliadač +Exec=netsurf-gtk2 %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=netsurf2.png +Categories=Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png +StartupWMClass=NetSurf-bin +StartupNotify=true diff --git a/netsurf-gtk2.install b/netsurf-gtk2.install new file mode 100644 index 0000000..70e97da --- /dev/null +++ b/netsurf-gtk2.install @@ -0,0 +1 @@ +usr/bin/netsurf-gtk2 diff --git a/netsurf-gtk2.manpages b/netsurf-gtk2.manpages new file mode 100644 index 0000000..d8a67f3 --- /dev/null +++ b/netsurf-gtk2.manpages @@ -0,0 +1 @@ +debian/netsurf-gtk2.1 diff --git a/netsurf-gtk2.menu b/netsurf-gtk2.menu new file mode 100644 index 0000000..35b70d5 --- /dev/null +++ b/netsurf-gtk2.menu @@ -0,0 +1,3 @@ +?package(netsurf-gtk):needs="X11" section="Applications/Network/Web Browsing"\ + title="Netsurf Web Browser" command="/usr/bin/netsurf-gtk" hints="Web Browsers" \ + icon="/usr/share/pixmaps/netsurf.xpm" diff --git a/netsurf-gtk2.postinst b/netsurf-gtk2.postinst new file mode 100644 index 0000000..71d21f7 --- /dev/null +++ b/netsurf-gtk2.postinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" = "configure" ]; then + update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk2 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk2.1.gz +fi + +#DEBHELPER# diff --git a/netsurf-gtk2.prerm b/netsurf-gtk2.prerm new file mode 100644 index 0000000..ed25ffa --- /dev/null +++ b/netsurf-gtk2.prerm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk2 +fi + +#DEBHELPER# diff --git a/netsurf-gtk3.1 b/netsurf-gtk3.1 new file mode 100644 index 0000000..13a0fa5 --- /dev/null +++ b/netsurf-gtk3.1 @@ -0,0 +1,362 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH NETSURF 1 "April 19, 2011" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +netsurf \- A small fast web browser +.SH SYNOPSIS +.B netsurf +.RI [ options ] +.RI [ url ] +.SH DESCRIPTION +This manual page documents briefly the +.B netsurf +browser. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBnetsurf\fP is a small fast web browser. This man page only describes how to run the browser. +.SH OPTIONS +This programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +.PP +The command line parameters override any options loaded from the users Choices file. +.PP +A summary of options is included below. +.TP +.B \-v +Enable verbose logging. +.TP +.B \-\-http_proxy +Bboolean indicating if the http proxy is being used. +.TP +.B \-\-http_proxy_host +The http proxy host. +.TP +.B \-\-http_proxy_port +The http proxy port. +.TP +.B \-\-http_proxy_auth +The authentication scheme for the http proxy. +.TP +.B \-\-http_proxy_auth_user +The authentication schemes user. +.TP +.B \-\-http_proxy_auth_pass +The authentication schemes password. +.TP +.B \-\-font_size +The default font size to use. +.TP +.B \-\-font_min_size +The minimum font size to use. +.TP +.B \-\-font_sans +Family name of the sans serrif font. +.TP +.B \-\-font_serif +Family name of the serrif font. +.TP +.B \-\-font_mono +Family name of the monospace font. +.TP +.B \-\-font_cursive +Family name of the cursive font. +.TP +.B \-\-font_fantasy +Family name of the fantasy font. +.TP +.B \-\-accept_language +Languages to accept. +.TP +.B \-\-accept_charset +Character set to accept +.TP +.B \-\-memory_cache_size +Maximum memory cache size. +.TP +.B \-\-disc_cache_age +Maximum disc cache size. +.TP +.B \-\-block_advertisements +Boolean to enable ad blocking. +.TP +.B \-\-minimum_gif_delay +Minimum time between gif frames +.TP +.B \-\-send_referer +Boolean controlling wether referer data should be sent +.TP +.B \-\-animate_images +Boolean controlling wether images should be animated. +.TP +.B \-\-expire_url +expire url +.TP +.B \-\-font_default +Default font. +.TP +.B \-\-ca_bundle +ca bundle +.TP +.B \-\-ca_path +ca path +.TP +.B \-\-cookie_file +cookie file +.TP +.B \-\-cookie_jar +cookie jar +.TP +.B \-\-homepage_url +homepage url +.TP +.B \-\-search_url_bar +search url bar +.TP +.B \-\-search_provider +search provider +.TP +.B \-\-url_suggestion +url suggestion +.TP +.B \-\-window_x +The X co-ordinate of the initial window. +.TP +.B \-\-window_y +The Y co-ordinate of the initial window. +.TP +.B \-\-window_width +The width of the initial window. +.TP +.B \-\-window_height +The height of the initial window. +.TP +.B \-\-window_screen_width +window screen width +.TP +.B \-\-window_screen_height +window screen height +.TP +.B \-\-toolbar_status_size +toolbar status size +.TP +.B \-\-scale +Initial scale factor. +.TP +.B \-\-incremental_reflow +Boolean controlling wether incremental reflow is performed. +.TP +.B \-\-min_reflow_period +Minimum time between incremental reflows +.TP +.B \-\-core_select_menu +core select menu +.TP +.B \-\-max_fetchers +max fetchers +.TP +.B \-\-max_fetchers_per_host +max fetchers per host +.TP +.B \-\-max_cached_fetch_handles +max cached fetch handles +.TP +.B \-\-suppress_curl_debug +suppress curl debug +.TP +.B \-\-target_blank +target blank +.TP +.B \-\-button_2_tab +button 2 tab +.TP +.B \-\-margin_top +margin top +.TP +.B \-\-margin_bottom +margin bottom +.TP +.B \-\-margin_left +margin left +.TP +.B \-\-margin_right +margin right +.TP +.B \-\-export_scale +export scale +.TP +.B \-\-suppress_images +suppress images +.TP +.B \-\-remove_backgrounds +remove backgrounds +.TP +.B \-\-enable_loosening +enable loosening +.TP +.B \-\-enable_PDF_compression +enable PDF compression +.TP +.B \-\-enable_PDF_password +enable_PDF_password +.TP +.B \-\-gui_colour_bg_1 +gui colour bg_1 +.TP +.B \-\-gui_colour_fg_1 +gui colour fg_1 +.TP +.B \-\-gui_colour_fg_2 +gui colour fg_2 +.TP +.B \-\-sys_colour_ActiveBorder +Override CSS sys_colour_ActiveBorder colour. +.TP +.B \-\-sys_colour_ActiveCaption +Override CSS sys_colour_ActiveCaption colour. +.TP +.B \-\-sys_colour_AppWorkspace +Override CSS sys_colour_AppWorkspace colour. +.TP +.B \-\-sys_colour_Background +Override CSS sys_colour_Background colour. +.TP +.B \-\-sys_colour_ButtonFace +Override CSS sys_colour_ButtonFace colour. +.TP +.B \-\-sys_colour_ButtonHighlight +Override CSS sys_colour_ButtonHighlight colour. +.TP +.B \-\-sys_colour_ButtonShadow +Override CSS sys_colour_ButtonShadow colour. +.TP +.B \-\-sys_colour_ButtonText +Override CSS sys_colour_ButtonText colour. +.TP +.B \-\-sys_colour_CaptionText +Override CSS sys_colour_CaptionText colour. +.TP +.B \-\-sys_colour_GrayText +Override CSS sys_colour_GrayText colour. +.TP +.B \-\-sys_colour_Highlight +Override CSS sys_colour_Highlight colour. +.TP +.B \-\-sys_colour_HighlightText +Override CSS sys_colour_HighlightText colour. +.TP +.B \-\-sys_colour_InactiveBorder +Override CSS sys_colour_InactiveBorder colour. +.TP +.B \-\-sys_colour_InactiveCaption +Override CSS sys_colour_InactiveCaption colour. +.TP +.B \-\-sys_colour_InactiveCaptionText +Override CSS sys_colour_InactiveCaptionText colour. +.TP +.B \-\-sys_colour_InfoBackground +Override CSS sys_colour_InfoBackground colour. +.TP +.B \-\-sys_colour_InfoText +Override CSS sys_colour_InfoText colour. +.TP +.B \-\-sys_colour_Menu +Override CSS sys_colour_Menu colour. +.TP +.B \-\-sys_colour_MenuText +Override CSS sys_colour_MenuText colour. +.TP +.B \-\-sys_colour_Scrollbar +Override CSS sys_colour_Scrollbar colour. +.TP +.B \-\-sys_colour_ThreeDDarkShadow +Override CSS sys_colour_ThreeDDarkShadow colour. +.TP +.B \-\-sys_colour_ThreeDFace +Override CSS sys_colour_ThreeDFace colour. +.TP +.B \-\-sys_colour_ThreeDHighlight +Override CSS sys_colour_ThreeDHighlight colour. +.TP +.B \-\-sys_colour_ThreeDLightShadow +Override CSS sys_colour_ThreeDLightShadow colour. +.TP +.B \-\-sys_colour_ThreeDShadow +Override CSS sys_colour_ThreeDShadow colour. +.TP +.B \-\-sys_colour_Window +Override CSS sys_colour_Window colour. +.TP +.B \-\-sys_colour_WindowFrame +Override CSS sys_colour_WindowFrame colour. +.TP +.B \-\-sys_colour_WindowText +Override CSS sys_colour_WindowText colour. +.TP +.B \-\-render_resample +render resample +.TP +.B \-\-downloads_clear +downloads clear +.TP +.B \-\-request_overwrite +request overwrite +.TP +.B \-\-downloads_directory +downloads directory +.TP +.B \-\-url_file +url file +.TP +.B \-\-show_single_tab +Force tabs to always be show. +.TP +.B \-\-button_type +button type +.TP +.B \-\-disable_popups +disable popups +.TP +.B \-\-disable_plugins +disable plugins +.TP +.B \-\-history_age +history age +.TP +.B \-\-hover_urls +hover urls +.TP +.B \-\-focus_new +focus new +.TP +.B \-\-new_blank +new blank +.TP +.B \-\-hotlist_path +hotlist path +.TP +.B \-\-source_tab +source tab +.TP +.B \-\-current_theme +current theme +.SH AUTHOR +netsurf was written by <upstream author>. +.PP +This manual page was written by Vincent Sanders <vince(a)debian.org>, +for the Debian project (and may be used by others). diff --git a/rules b/rules index 49c27e9..ec16557 100755 --- a/rules +++ b/rules @@ -12,21 +12,29 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed dh $@ override_dh_auto_build: - dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk + dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk2 + dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk3 dh_auto_build -- V=1 PREFIX=/usr TARGET=framebuffer override_dh_auto_install: - dh_auto_install -- PREFIX=/usr TARGET=gtk + dh_auto_install -- PREFIX=/usr TARGET=gtk3 mkdir -p debian/netsurf-gtk/usr/share/pixmaps mkdir -p debian/netsurf-gtk/usr/share/applications - convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf.xpm - convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk/usr/share/pixmaps/netsurf.png + convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf3.xpm + convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk/usr/share/pixmaps/netsurf3.png install -m 644 debian/netsurf-gtk.desktop debian/netsurf-gtk/usr/share/applications + dh_auto_install -- PREFIX=/usr TARGET=gtk2 + mkdir -p debian/netsurf-gtk2/usr/share/pixmaps + mkdir -p debian/netsurf-gtk2/usr/share/applications + convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk2/usr/share/pixmaps/netsurf2.xpm + convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk2/usr/share/pixmaps/netsurf2.png + install -m 644 debian/netsurf-gtk2.desktop debian/netsurf-gtk2/usr/share/applications dh_auto_install -- PREFIX=/usr TARGET=framebuffer rm debian/tmp/usr/share/netsurf/ca-bundle.txt ln -s /etc/ssl/certs/ca-certificates.crt debian/tmp/usr/share/netsurf/ca-bundle.txt override_dh_auto_clean: - dh_auto_clean -- PREFIX=/usr TARGET=gtk + dh_auto_clean -- PREFIX=/usr TARGET=gtk2 + dh_auto_clean -- PREFIX=/usr TARGET=gtk3 dh_auto_clean -- PREFIX=/usr TARGET=framebuffer ----------------------------------------------------------------------- Summary of changes: changelog | 8 +++++++- control | 16 ++++++++++++++-- netsurf-gtk.desktop | 4 ++-- netsurf-gtk.install | 2 +- netsurf-gtk.manpages | 2 +- netsurf-gtk.postinst | 2 +- netsurf-gtk.prerm | 2 +- netsurf-gtk.1 => netsurf-gtk2.1 | 0 netsurf-gtk.desktop => netsurf-gtk2.desktop | 4 ++-- netsurf-gtk2.install | 1 + netsurf-gtk2.manpages | 1 + netsurf-gtk.menu => netsurf-gtk2.menu | 0 netsurf-fb.postinst => netsurf-gtk2.postinst | 2 +- netsurf-fb.prerm => netsurf-gtk2.prerm | 2 +- netsurf-gtk.1 => netsurf-gtk3.1 | 0 rules | 18 +++++++++++++----- 16 files changed, 46 insertions(+), 18 deletions(-) copy netsurf-gtk.1 => netsurf-gtk2.1 (100%) copy netsurf-gtk.desktop => netsurf-gtk2.desktop (98%) create mode 100644 netsurf-gtk2.install create mode 100644 netsurf-gtk2.manpages copy netsurf-gtk.menu => netsurf-gtk2.menu (100%) copy netsurf-fb.postinst => netsurf-gtk2.postinst (51%) copy netsurf-fb.prerm => netsurf-gtk2.prerm (94%) rename netsurf-gtk.1 => netsurf-gtk3.1 (100%) diff --git a/changelog b/changelog index df12957..d111342 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,10 @@ -netsurf (3.9-1) UNRELEASED; urgency=medium +netsurf (3.9-2) UNRELEASED; urgency=medium + + * Build both gtk2 and gtk3 versions + + -- Vincent Sanders <vince(a)debian.org> 02 Dec 2019 22:11:04 +0000 + +netsurf (3.9-1) unstable; urgency=medium * New upstream release (Closes: #869600) * Make png generation reproducible. diff --git a/control b/control index 074da22..243e401 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Vincent Sanders <vince(a)debian.org> Uploaders: Daniel Silverstone <dsilvers(a)digital-scurf.org> -Build-Depends: debhelper (>= 9~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf, xxd +Build-Depends: debhelper (>= 9~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, libgtk-3-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf, xxd Standards-Version: 4.1.4 Homepage: https://www.netsurf-browser.org Vcs-Browser: https://source.netsurf-browser.org/packaging/debian.git/ @@ -32,7 +32,19 @@ Description: small web browser with CSS support for GTK comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint without compromising performance. . - This version uses the GTK+ toolkit. + This version uses the GTK+ 3 toolkit. + +Package: netsurf-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, netsurf-common (=${source:Version}) +Provides: www-browser +Recommends: mime-support +Description: small web browser with CSS support for GTK + NetSurf is a multi-platform lightweight web browser. It aims to provide + comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint + without compromising performance. + . + This version uses the GTK+ 2 toolkit. Package: netsurf-fb Architecture: any diff --git a/netsurf-gtk.desktop b/netsurf-gtk.desktop index 4c21d55..99b7ceb 100644 --- a/netsurf-gtk.desktop +++ b/netsurf-gtk.desktop @@ -57,11 +57,11 @@ GenericName[pl]=Przeglądarka WWW GenericName[pt]=Navegador Web GenericName[pt_BR]=Navegador Web GenericName[sk]=Internetový prehliadač -Exec=netsurf-gtk %u +Exec=netsurf-gtk3 %u Terminal=false X-MultipleArgs=false Type=Application -Icon=netsurf.png +Icon=netsurf3.png Categories=Network; MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png StartupWMClass=NetSurf-bin diff --git a/netsurf-gtk.install b/netsurf-gtk.install index 39984a6..4a23411 100644 --- a/netsurf-gtk.install +++ b/netsurf-gtk.install @@ -1 +1 @@ -usr/bin/netsurf-gtk +usr/bin/netsurf-gtk3 diff --git a/netsurf-gtk.manpages b/netsurf-gtk.manpages index a49aae5..6d833ec 100644 --- a/netsurf-gtk.manpages +++ b/netsurf-gtk.manpages @@ -1 +1 @@ -debian/netsurf-gtk.1 +debian/netsurf-gtk3.1 diff --git a/netsurf-gtk.postinst b/netsurf-gtk.postinst index 8686b98..22d8df5 100644 --- a/netsurf-gtk.postinst +++ b/netsurf-gtk.postinst @@ -2,7 +2,7 @@ set -e if [ "$1" = "configure" ]; then - update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk.1.gz + update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk3 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk3.1.gz fi #DEBHELPER# diff --git a/netsurf-gtk.prerm b/netsurf-gtk.prerm index 6294db0..1a4eedc 100644 --- a/netsurf-gtk.prerm +++ b/netsurf-gtk.prerm @@ -2,7 +2,7 @@ set -e if [ "$1" != "upgrade" ]; then - update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk + update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk3 fi #DEBHELPER# diff --git a/netsurf-gtk.1 b/netsurf-gtk2.1 similarity index 100% copy from netsurf-gtk.1 copy to netsurf-gtk2.1 diff --git a/netsurf-gtk.desktop b/netsurf-gtk2.desktop similarity index 98% copy from netsurf-gtk.desktop copy to netsurf-gtk2.desktop index 4c21d55..2b4e15d 100644 --- a/netsurf-gtk.desktop +++ b/netsurf-gtk2.desktop @@ -57,11 +57,11 @@ GenericName[pl]=Przeglądarka WWW GenericName[pt]=Navegador Web GenericName[pt_BR]=Navegador Web GenericName[sk]=Internetový prehliadač -Exec=netsurf-gtk %u +Exec=netsurf-gtk2 %u Terminal=false X-MultipleArgs=false Type=Application -Icon=netsurf.png +Icon=netsurf2.png Categories=Network; MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png StartupWMClass=NetSurf-bin diff --git a/netsurf-gtk2.install b/netsurf-gtk2.install new file mode 100644 index 0000000..70e97da --- /dev/null +++ b/netsurf-gtk2.install @@ -0,0 +1 @@ +usr/bin/netsurf-gtk2 diff --git a/netsurf-gtk2.manpages b/netsurf-gtk2.manpages new file mode 100644 index 0000000..d8a67f3 --- /dev/null +++ b/netsurf-gtk2.manpages @@ -0,0 +1 @@ +debian/netsurf-gtk2.1 diff --git a/netsurf-gtk.menu b/netsurf-gtk2.menu similarity index 100% copy from netsurf-gtk.menu copy to netsurf-gtk2.menu diff --git a/netsurf-fb.postinst b/netsurf-gtk2.postinst similarity index 51% copy from netsurf-fb.postinst copy to netsurf-gtk2.postinst index e317616..71d21f7 100644 --- a/netsurf-fb.postinst +++ b/netsurf-gtk2.postinst @@ -2,7 +2,7 @@ set -e if [ "$1" = "configure" ]; then - update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-fb 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-fb.1.gz + update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk2 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk2.1.gz fi #DEBHELPER# diff --git a/netsurf-fb.prerm b/netsurf-gtk2.prerm similarity index 94% copy from netsurf-fb.prerm copy to netsurf-gtk2.prerm index 8c38472..ed25ffa 100644 --- a/netsurf-fb.prerm +++ b/netsurf-gtk2.prerm @@ -2,7 +2,7 @@ set -e if [ "$1" != "upgrade" ]; then - update-alternatives --remove netsurf-browser /usr/bin/netsurf-fb + update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk2 fi #DEBHELPER# diff --git a/netsurf-gtk.1 b/netsurf-gtk3.1 similarity index 100% rename from netsurf-gtk.1 rename to netsurf-gtk3.1 diff --git a/rules b/rules index 49c27e9..ec16557 100755 --- a/rules +++ b/rules @@ -12,21 +12,29 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed dh $@ override_dh_auto_build: - dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk + dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk2 + dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk3 dh_auto_build -- V=1 PREFIX=/usr TARGET=framebuffer override_dh_auto_install: - dh_auto_install -- PREFIX=/usr TARGET=gtk + dh_auto_install -- PREFIX=/usr TARGET=gtk3 mkdir -p debian/netsurf-gtk/usr/share/pixmaps mkdir -p debian/netsurf-gtk/usr/share/applications - convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf.xpm - convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk/usr/share/pixmaps/netsurf.png + convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf3.xpm + convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk/usr/share/pixmaps/netsurf3.png install -m 644 debian/netsurf-gtk.desktop debian/netsurf-gtk/usr/share/applications + dh_auto_install -- PREFIX=/usr TARGET=gtk2 + mkdir -p debian/netsurf-gtk2/usr/share/pixmaps + mkdir -p debian/netsurf-gtk2/usr/share/applications + convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk2/usr/share/pixmaps/netsurf2.xpm + convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk2/usr/share/pixmaps/netsurf2.png + install -m 644 debian/netsurf-gtk2.desktop debian/netsurf-gtk2/usr/share/applications dh_auto_install -- PREFIX=/usr TARGET=framebuffer rm debian/tmp/usr/share/netsurf/ca-bundle.txt ln -s /etc/ssl/certs/ca-certificates.crt debian/tmp/usr/share/netsurf/ca-bundle.txt override_dh_auto_clean: - dh_auto_clean -- PREFIX=/usr TARGET=gtk + dh_auto_clean -- PREFIX=/usr TARGET=gtk2 + dh_auto_clean -- PREFIX=/usr TARGET=gtk3 dh_auto_clean -- PREFIX=/usr TARGET=framebuffer -- Debian Packaging for NetSurf

3 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.9-378-g2cebe26

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/2cebe260582e646252052... ...commit http://git.netsurf-browser.org/netsurf.git/commit/2cebe260582e64625205220... ...tree http://git.netsurf-browser.org/netsurf.git/tree/2cebe260582e646252052209d... The branch, master has been updated via 2cebe260582e646252052209d61fb78513566046 (commit) from 3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2cebe260582e6462520... commit 2cebe260582e646252052209d61fb78513566046 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> enforce setting subtarget so gtk2 gets named the correct thing in installs diff --git a/Makefile b/Makefile index 166bf81..f8b5e9c 100644 --- a/Makefile +++ b/Makefile @@ -303,13 +303,8 @@ else else ifeq ($(TARGET),gtk2) override TARGET := gtk - ifeq ($(origin NETSURF_GTK_MAJOR),undefined) - override NETSURF_GTK_MAJOR := 2 - else - ifneq ($(NETSURF_GTK_MAJOR),2) - SUBTARGET = $(NETSURF_GTK_MAJOR) - endif - endif + override NETSURF_GTK_MAJOR := 2 + SUBTARGET = $(NETSURF_GTK_MAJOR) endif endif endif ----------------------------------------------------------------------- Summary of changes: Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 166bf81..f8b5e9c 100644 --- a/Makefile +++ b/Makefile @@ -303,13 +303,8 @@ else else ifeq ($(TARGET),gtk2) override TARGET := gtk - ifeq ($(origin NETSURF_GTK_MAJOR),undefined) - override NETSURF_GTK_MAJOR := 2 - else - ifneq ($(NETSURF_GTK_MAJOR),2) - SUBTARGET = $(NETSURF_GTK_MAJOR) - endif - endif + override NETSURF_GTK_MAJOR := 2 + SUBTARGET = $(NETSURF_GTK_MAJOR) endif endif endif -- NetSurf Browser

3 years, 1 month

1
0
0 / 0

netsurf-all: branch master updated. release/3.9-1-g773298a

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-all.git/shortlog/773298ad44156d8ff... ...commit http://git.netsurf-browser.org/netsurf-all.git/commit/773298ad44156d8ffa2... ...tree http://git.netsurf-browser.org/netsurf-all.git/tree/773298ad44156d8ffa298... The branch, master has been updated via 773298ad44156d8ffa298897a33bafc6d7517e88 (commit) from 78b690d42636517d92f1dd158a19f025aff62152 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-all.git/commit/?id=773298ad44156d8... commit 773298ad44156d8ffa298897a33bafc6d7517e88 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> default target is now gtk2 diff --git a/Makefile b/Makefile index 78d645e..3559a29 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ # NetSurf Source makefile for libraries and browser # # The TARGET variable changes what toolkit is built for valid values are: -# gtk (default if unset) +# gtk2 (default if unset) +# gtk3 # riscos # framebuffer # amiga @@ -38,7 +39,7 @@ NSLIB_RO_TARG := librufl libpencil # Build Environment -export TARGET ?= gtk +export TARGET ?= gtk2 TMP_PREFIX := $(CURDIR)/inst-$(TARGET) export PKG_CONFIG_PATH := $(TMP_PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH) export PATH := $(PATH):$(TMP_PREFIX)/bin/ ----------------------------------------------------------------------- Summary of changes: Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 78d645e..3559a29 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ # NetSurf Source makefile for libraries and browser # # The TARGET variable changes what toolkit is built for valid values are: -# gtk (default if unset) +# gtk2 (default if unset) +# gtk3 # riscos # framebuffer # amiga @@ -38,7 +39,7 @@ NSLIB_RO_TARG := librufl libpencil # Build Environment -export TARGET ?= gtk +export TARGET ?= gtk2 TMP_PREFIX := $(CURDIR)/inst-$(TARGET) export PKG_CONFIG_PATH := $(TMP_PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH) export PATH := $(PATH):$(TMP_PREFIX)/bin/ -- NetSurf 'all' tree. Typically used for releases

3 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.9-377-g3a8317f

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/3a8317fddb979f95ff7ae... ...commit http://git.netsurf-browser.org/netsurf.git/commit/3a8317fddb979f95ff7ae3a... ...tree http://git.netsurf-browser.org/netsurf.git/tree/3a8317fddb979f95ff7ae3a6c... The branch, master has been updated via 3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1 (commit) via 6f105c41c202c570a37cc0cca2ab15172b2dbbaf (commit) via 24dd16ddff6a284a98c1abb30dacbf23d8895f4f (commit) from f1e6690b25eacac268686b5ebf02a5f31ca918af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3a8317fddb979f95ff7... commit 3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> fetch_curl_report_certs_upstream: Use new SSL_CERT_ERR_CERT_MISSING Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org> diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index cb09ece..0be33ae 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -482,7 +482,11 @@ fetch_curl_report_certs_upstream(struct curl_fetch_info *f) memset(ssl_certs, 0, sizeof(ssl_certs)); for (depth = 0; depth <= f->cert_depth; depth++) { - assert(certs[depth].cert != NULL); + if (certs[depth].cert == NULL) { + /* This certificate is missing, skip it */ + ssl_certs[depth].err = SSL_CERT_ERR_CERT_MISSING; + continue; + } /* get certificate version */ ssl_certs[depth].version = X509_get_version(certs[depth].cert); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6f105c41c202c570a37... commit 6f105c41c202c570a37cc0cca2ab15172b2dbbaf Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Add certificate-missing error code Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org> diff --git a/include/netsurf/ssl_certs.h b/include/netsurf/ssl_certs.h index dcd644e..0444678 100644 --- a/include/netsurf/ssl_certs.h +++ b/include/netsurf/ssl_certs.h @@ -42,6 +42,7 @@ typedef enum { SSL_CERT_ERR_CHAIN_SELF_SIGNED, /**< This certificate chain is self signed */ SSL_CERT_ERR_REVOKED, /**< This certificate has been revoked */ SSL_CERT_ERR_HOSTNAME_MISMATCH, /**< This certificate host did not match the server */ + SSL_CERT_ERR_CERT_MISSING, /**< This certificate was missing from the chain, its data is useless */ } ssl_cert_err; /** Always the max known ssl certificate error type */ diff --git a/resources/FatMessages b/resources/FatMessages index f1cb870..c5cfd3e 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -1085,6 +1085,7 @@ en.all.SSLCertErrSelfSigned:The certificate is self signed. en.all.SSLCertErrChainSelfSigned:The certificate chain is self signed. en.all.SSLCertErrRevoked:The certificate has been revoked by the issuer. en.all.SSLCertErrHostnameMismatch:The certificate is for a different host than the server +en.all.SSLCertErrCertMissing:The certificate was missing from the chain. # Timeout error interface diff --git a/utils/messages.c b/utils/messages.c index 5525e18..418276e 100644 --- a/utils/messages.c +++ b/utils/messages.c @@ -445,6 +445,10 @@ const char *messages_get_sslcode(ssl_cert_err code) /* Common name is invalid */ return messages_get_ctx("SSLCertErrHostnameMismatch", messages_hash); + case SSL_CERT_ERR_CERT_MISSING: + /* Common name is invalid */ + return messages_get_ctx("SSLCertErrCertMissing", messages_hash); + } /* The switch has no default, so the compiler should tell us when we commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=24dd16ddff6a284a98c... commit 24dd16ddff6a284a98c1abb30dacbf23d8895f4f Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> fetch_curl_verify_callback: Do depth update after check Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org> diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index a1d7ee1..cb09ece 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -662,11 +662,6 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx) depth = X509_STORE_CTX_get_error_depth(x509_ctx); fetch = X509_STORE_CTX_get_app_data(x509_ctx); - /* record the max depth */ - if (depth > fetch->cert_depth) { - fetch->cert_depth = depth; - } - /* certificate chain is excessively deep so fail verification */ if (depth >= MAX_SSL_CERTS) { X509_STORE_CTX_set_error(x509_ctx, @@ -674,6 +669,11 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx) return 0; } + /* record the max depth */ + if (depth > fetch->cert_depth) { + fetch->cert_depth = depth; + } + /* save the certificate by incrementing the reference count and * keeping a pointer. */ ----------------------------------------------------------------------- Summary of changes: content/fetchers/curl.c | 16 ++++++++++------ include/netsurf/ssl_certs.h | 1 + resources/FatMessages | 1 + utils/messages.c | 4 ++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index a1d7ee1..0be33ae 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -482,7 +482,11 @@ fetch_curl_report_certs_upstream(struct curl_fetch_info *f) memset(ssl_certs, 0, sizeof(ssl_certs)); for (depth = 0; depth <= f->cert_depth; depth++) { - assert(certs[depth].cert != NULL); + if (certs[depth].cert == NULL) { + /* This certificate is missing, skip it */ + ssl_certs[depth].err = SSL_CERT_ERR_CERT_MISSING; + continue; + } /* get certificate version */ ssl_certs[depth].version = X509_get_version(certs[depth].cert); @@ -662,11 +666,6 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx) depth = X509_STORE_CTX_get_error_depth(x509_ctx); fetch = X509_STORE_CTX_get_app_data(x509_ctx); - /* record the max depth */ - if (depth > fetch->cert_depth) { - fetch->cert_depth = depth; - } - /* certificate chain is excessively deep so fail verification */ if (depth >= MAX_SSL_CERTS) { X509_STORE_CTX_set_error(x509_ctx, @@ -674,6 +673,11 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx) return 0; } + /* record the max depth */ + if (depth > fetch->cert_depth) { + fetch->cert_depth = depth; + } + /* save the certificate by incrementing the reference count and * keeping a pointer. */ diff --git a/include/netsurf/ssl_certs.h b/include/netsurf/ssl_certs.h index dcd644e..0444678 100644 --- a/include/netsurf/ssl_certs.h +++ b/include/netsurf/ssl_certs.h @@ -42,6 +42,7 @@ typedef enum { SSL_CERT_ERR_CHAIN_SELF_SIGNED, /**< This certificate chain is self signed */ SSL_CERT_ERR_REVOKED, /**< This certificate has been revoked */ SSL_CERT_ERR_HOSTNAME_MISMATCH, /**< This certificate host did not match the server */ + SSL_CERT_ERR_CERT_MISSING, /**< This certificate was missing from the chain, its data is useless */ } ssl_cert_err; /** Always the max known ssl certificate error type */ diff --git a/resources/FatMessages b/resources/FatMessages index f1cb870..c5cfd3e 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -1085,6 +1085,7 @@ en.all.SSLCertErrSelfSigned:The certificate is self signed. en.all.SSLCertErrChainSelfSigned:The certificate chain is self signed. en.all.SSLCertErrRevoked:The certificate has been revoked by the issuer. en.all.SSLCertErrHostnameMismatch:The certificate is for a different host than the server +en.all.SSLCertErrCertMissing:The certificate was missing from the chain. # Timeout error interface diff --git a/utils/messages.c b/utils/messages.c index 5525e18..418276e 100644 --- a/utils/messages.c +++ b/utils/messages.c @@ -445,6 +445,10 @@ const char *messages_get_sslcode(ssl_cert_err code) /* Common name is invalid */ return messages_get_ctx("SSLCertErrHostnameMismatch", messages_hash); + case SSL_CERT_ERR_CERT_MISSING: + /* Common name is invalid */ + return messages_get_ctx("SSLCertErrCertMissing", messages_hash); + } /* The switch has no default, so the compiler should tell us when we -- NetSurf Browser

3 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.9-374-gf1e6690

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/f1e6690b25eacac268686... ...commit http://git.netsurf-browser.org/netsurf.git/commit/f1e6690b25eacac268686b5... ...tree http://git.netsurf-browser.org/netsurf.git/tree/f1e6690b25eacac268686b5eb... The branch, master has been updated via f1e6690b25eacac268686b5ebf02a5f31ca918af (commit) from 77b74137e7ebf195a8d4139bb89c02982a4f4642 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f1e6690b25eacac2686... commit f1e6690b25eacac268686b5ebf02a5f31ca918af Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> fix coverity build target for gtk target change diff --git a/utils/coverity-build.sh b/utils/coverity-build.sh index b51562f..24dafd1 100755 --- a/utils/coverity-build.sh +++ b/utils/coverity-build.sh @@ -36,8 +36,8 @@ COVERITY_PROJECT="NetSurf+Browser" -# build gtk, framebuffer and monkey frontend by default -TARGETS="gtk framebuffer monkey" +# build gtk2, framebuffer and monkey frontend by default +TARGETS="gtk2 framebuffer monkey" # setup build environment export PREFIX=${PREFIX:-${JENKINS_HOME}/artifacts-${HOST}} ----------------------------------------------------------------------- Summary of changes: utils/coverity-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/coverity-build.sh b/utils/coverity-build.sh index b51562f..24dafd1 100755 --- a/utils/coverity-build.sh +++ b/utils/coverity-build.sh @@ -36,8 +36,8 @@ COVERITY_PROJECT="NetSurf+Browser" -# build gtk, framebuffer and monkey frontend by default -TARGETS="gtk framebuffer monkey" +# build gtk2, framebuffer and monkey frontend by default +TARGETS="gtk2 framebuffer monkey" # setup build environment export PREFIX=${PREFIX:-${JENKINS_HOME}/artifacts-${HOST}} -- NetSurf Browser

3 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.9-373-g77b7413

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/77b74137e7ebf195a8d41... ...commit http://git.netsurf-browser.org/netsurf.git/commit/77b74137e7ebf195a8d4139... ...tree http://git.netsurf-browser.org/netsurf.git/tree/77b74137e7ebf195a8d4139bb... The branch, master has been updated via 77b74137e7ebf195a8d4139bb89c02982a4f4642 (commit) from eb88c92749255e89350a988716ae14ebea9896a0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=77b74137e7ebf195a8d... commit 77b74137e7ebf195a8d4139bb89c02982a4f4642 Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> CI: Update jenkins for gtk2 rename. diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index dc6698b..0ef9897 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -191,7 +191,7 @@ case ${TARGET} in ;; - "gtk") + "gtk2") case ${HOST} in "x86_64-linux-gnu") ;; @@ -219,7 +219,7 @@ case ${TARGET} in IDENTIFIER="${HOST}-${IDENTIFIER}" OLD_IDENTIFIER="${HOST}-${OLD_IDENTIFIER}" - PKG_SRC=nsgtk + PKG_SRC=nsgtk2 PKG_SFX= ;; ----------------------------------------------------------------------- Summary of changes: utils/jenkins-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index dc6698b..0ef9897 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -191,7 +191,7 @@ case ${TARGET} in ;; - "gtk") + "gtk2") case ${HOST} in "x86_64-linux-gnu") ;; @@ -219,7 +219,7 @@ case ${TARGET} in IDENTIFIER="${HOST}-${IDENTIFIER}" OLD_IDENTIFIER="${HOST}-${OLD_IDENTIFIER}" - PKG_SRC=nsgtk + PKG_SRC=nsgtk2 PKG_SFX= ;; -- NetSurf Browser

3 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.9-372-geb88c92

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/eb88c92749255e89350a9... ...commit http://git.netsurf-browser.org/netsurf.git/commit/eb88c92749255e89350a988... ...tree http://git.netsurf-browser.org/netsurf.git/tree/eb88c92749255e89350a98871... The branch, master has been updated via eb88c92749255e89350a988716ae14ebea9896a0 (commit) via 1d73269a49bfbbcf0e42dd88a11c0861e3e967e6 (commit) via 2c953cdf97171ab84e2756f59073839ea20ca74c (commit) from b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=eb88c92749255e89350... commit eb88c92749255e89350a988716ae14ebea9896a0 Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> html: css fetcher: Fix passing LWC borrow to fetcher_add, which consumes. Fixes abort on exit when corestring finalisation tried to unref what should have been the final ref: $ ./nsgtk3 corrupted double-linked list Aborted (core dumped) diff --git a/content/handlers/html/html_css_fetcher.c b/content/handlers/html/html_css_fetcher.c index 71fd78f..ae20879 100644 --- a/content/handlers/html/html_css_fetcher.c +++ b/content/handlers/html/html_css_fetcher.c @@ -296,7 +296,8 @@ nserror html_css_fetcher_register(void) .finalise = html_css_fetcher_finalise }; - return fetcher_add(corestring_lwc_x_ns_css, &html_css_fetcher_ops); + return fetcher_add(lwc_string_ref(corestring_lwc_x_ns_css), + &html_css_fetcher_ops); } /* exported interface documented in html_internal.h */ commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1d73269a49bfbbcf0e4... commit 1d73269a49bfbbcf0e42dd88a11c0861e3e967e6 Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> Buildsystem: Change default nsgtk build from gtk2 to gtk3. diff --git a/Makefile b/Makefile index 899dfee..166bf81 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ endif # Default target is GTK backend ifeq ($(TARGET),) - TARGET := gtk2 + TARGET := gtk3 endif # valid values for the TARGET commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2c953cdf97171ab84e2... commit 2c953cdf97171ab84e2756f59073839ea20ca74c Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> Buildsystem: GTK: Change gtk target to gtk2, which builds nsgtk2. diff --git a/Makefile b/Makefile index ebde9dc..899dfee 100644 --- a/Makefile +++ b/Makefile @@ -105,11 +105,11 @@ endif # Default target is GTK backend ifeq ($(TARGET),) - TARGET := gtk + TARGET := gtk2 endif # valid values for the TARGET -VLDTARGET := riscos gtk gtk3 beos amiga amigaos3 framebuffer windows atari monkey +VLDTARGET := riscos gtk2 gtk3 beos amiga amigaos3 framebuffer windows atari monkey # Check for valid TARGET ifeq ($(filter $(VLDTARGET),$(TARGET)),) @@ -301,7 +301,8 @@ else override NETSURF_GTK_MAJOR := 3 SUBTARGET = $(NETSURF_GTK_MAJOR) else - ifeq ($(TARGET),gtk) + ifeq ($(TARGET),gtk2) + override TARGET := gtk ifeq ($(origin NETSURF_GTK_MAJOR),undefined) override NETSURF_GTK_MAJOR := 2 else diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile index ae2e856..ec9889e 100644 --- a/frontends/gtk/Makefile +++ b/frontends/gtk/Makefile @@ -59,13 +59,7 @@ LDFLAGS += -lm NSGTK_RESOURCES_DIR := $(FRONTEND_RESOURCES_DIR) # The gtk binary target. -ifeq ($(NETSURF_GTK_MAJOR),2) - # gtk2 builds have no major suffix - EXETARGET := nsgtk -else - # gtk3 and later builds use the major version suffix - EXETARGET := nsgtk$(NETSURF_GTK_MAJOR) -endif +EXETARGET := nsgtk$(NETSURF_GTK_MAJOR) # The filter and target for split messages MESSAGES_FILTER=gtk ----------------------------------------------------------------------- Summary of changes: Makefile | 7 ++++--- content/handlers/html/html_css_fetcher.c | 3 ++- frontends/gtk/Makefile | 8 +------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index ebde9dc..166bf81 100644 --- a/Makefile +++ b/Makefile @@ -105,11 +105,11 @@ endif # Default target is GTK backend ifeq ($(TARGET),) - TARGET := gtk + TARGET := gtk3 endif # valid values for the TARGET -VLDTARGET := riscos gtk gtk3 beos amiga amigaos3 framebuffer windows atari monkey +VLDTARGET := riscos gtk2 gtk3 beos amiga amigaos3 framebuffer windows atari monkey # Check for valid TARGET ifeq ($(filter $(VLDTARGET),$(TARGET)),) @@ -301,7 +301,8 @@ else override NETSURF_GTK_MAJOR := 3 SUBTARGET = $(NETSURF_GTK_MAJOR) else - ifeq ($(TARGET),gtk) + ifeq ($(TARGET),gtk2) + override TARGET := gtk ifeq ($(origin NETSURF_GTK_MAJOR),undefined) override NETSURF_GTK_MAJOR := 2 else diff --git a/content/handlers/html/html_css_fetcher.c b/content/handlers/html/html_css_fetcher.c index 71fd78f..ae20879 100644 --- a/content/handlers/html/html_css_fetcher.c +++ b/content/handlers/html/html_css_fetcher.c @@ -296,7 +296,8 @@ nserror html_css_fetcher_register(void) .finalise = html_css_fetcher_finalise }; - return fetcher_add(corestring_lwc_x_ns_css, &html_css_fetcher_ops); + return fetcher_add(lwc_string_ref(corestring_lwc_x_ns_css), + &html_css_fetcher_ops); } /* exported interface documented in html_internal.h */ diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile index ae2e856..ec9889e 100644 --- a/frontends/gtk/Makefile +++ b/frontends/gtk/Makefile @@ -59,13 +59,7 @@ LDFLAGS += -lm NSGTK_RESOURCES_DIR := $(FRONTEND_RESOURCES_DIR) # The gtk binary target. -ifeq ($(NETSURF_GTK_MAJOR),2) - # gtk2 builds have no major suffix - EXETARGET := nsgtk -else - # gtk3 and later builds use the major version suffix - EXETARGET := nsgtk$(NETSURF_GTK_MAJOR) -endif +EXETARGET := nsgtk$(NETSURF_GTK_MAJOR) # The filter and target for split messages MESSAGES_FILTER=gtk -- NetSurf Browser

3 years, 1 month

1
0
0 / 0

netsurf-wiki: branch master updated. 949aaef3e6fbf81ee50502f9c7c78af44be012d0

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/949aaef3e6fbf81e... ...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/949aaef3e6fbf81ee5... ...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/949aaef3e6fbf81ee505... The branch, master has been updated via 949aaef3e6fbf81ee50502f9c7c78af44be012d0 (commit) from 772bb03198f96ae821dc134eea72b05c2f248bfa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=949aaef3e6fbf8... commit 949aaef3e6fbf81ee50502f9c7c78af44be012d0 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Final notes from weekend diff --git a/developer-weekend/dec-2019.mdwn b/developer-weekend/dec-2019.mdwn index 0d9f7db..d255425 100644 --- a/developer-weekend/dec-2019.mdwn +++ b/developer-weekend/dec-2019.mdwn @@ -1,6 +1,6 @@ [[!meta title="Developer Weekend (December 2019)"]] [[!meta author="NetSurf Developers"]] -[[!meta date="2019-12-01 20:00:00"]] +[[!meta date="2019-12-01 22:30:00"]] [[!toc]] @@ -44,8 +44,8 @@ Topics * Goals for the weekend * Complete the multi-site parallel test stuff that Vince has started **DONE** * Migrate SSL certification ownership to the llcache and at least block out - the padlock work - * Resolve new Debian packaging and upload + the padlock work **DONE** + * Resolve new Debian packaging and upload **Deferred to after 3.10** * Bug triage * Do general triage **DONE** @@ -60,10 +60,10 @@ Topics * Look over the generic error internal query page work **DONE** Daniel checked it * Check over the mouse input handler rework **DONE** As a group -* Consider the pathway to 3.10/4.0 +* Consider the pathway to 3.10/4.0 **DONE** * Consider what the best return-on-effort might be to improve general layout - support. We're increasingly falling behind. + support. We're increasingly falling behind. **DONE** Discussions =========== @@ -93,6 +93,27 @@ Bug Triage * [[!bug 2703]] - Daniel added a note, but we're leaving it unassigned * [[!bug 2710]] - This appears to be a RISC OS font problem, Michael responded +General Layout Improvement Approach +=================================== + +* libcss needs support for `calc` +* libcss needs css variable support +* NetSurf could try and use the flexbox properties and grid layout +* Continue to try and get jQuery working + +Pathway to 3.10 +=============== + +* Completion of MVP for page info core window (Assigned to Vince, Michael to + help) +* Completion of integration of that into GTK and RISC OS frontends, with others + being given at least two weeks to integrate before they cease blocking. + (Assigned to Vince) +* At least some attention given to GTK focus issues (Assigned to Vince, Daniel + to assist) +* See if we can exfiltrate better SSL session error information such as a lack + of cipher list overlap. [[!bug 2719]] (Assigned to Daniel) +* Verify webp on riscos, disable if too buggy (Assigned to Michael) Activity ======== @@ -102,6 +123,7 @@ Mostly individual activity here Michael ------- +* Proposed a FOSDEM talk * [[!bug 2689]] - Fixed us not to render scrollbars when the CSS tells us not to. * Added some extra glyphs to the Framebuffer front end to render the the @@ -109,6 +131,12 @@ Michael * [[!bug 2688]] - Looked into the cause of this bug, and found it was due to the unimplemented opacity property. It's tricky to implement right now. It applies to all descendant elements, so compositing is required. +* [[!bug 2705]] - Looked into this, unfortunately we seem to be given different + content to Firefox - save firefox's content and NS can render it. ARGH. +* Helped Daniel track down a breakage in libcss when faced with + an incomplete ruleset inside a media query block. +* Added support for `KeyboardEvent` properly in libdom and semi-properly + in NetSurf Daniel ------ @@ -121,6 +149,12 @@ Daniel * Did a bunch of `rr` and fixed some leaks in `box_construct.c` * Did a bunch of `rr` and tracked down a breakage in libcss when faced with an incomplete ruleset inside a media query block. (Michael helped) +* Did a bunch of `rr` and tracked down an incorrect throbberstoppage. +* Wrote support for page info status indicators in browser window and + content, threaded through html content too. +* Wrote a monkey test set to validate the page info status +* Various jenkins frobbling + Vince ----- @@ -128,6 +162,13 @@ Vince * [[!bug 2720]] - Implemented feature request of closing tabs with middle click * Finished extended internet test badgering including full reorganisation of the monkey-tests tree. +* Fixed [[!bug 2709]] - UTF8 caption on Windows (WIN32) +* Implemented icons for page info status work that Daniel did, and made it all + work in the GTK frontend (GTK2 *and* GTK3) +* Temporarily plumbed the old SSL cert info into being activated from that + button. It's not brilliant but it does work. +* Began to look at fixing win32 font-width stuff for wide-chars +* Various jenkins frobbling Plan for page info ================== @@ -166,10 +207,27 @@ Statement of work If at all possible, we'd like to see some of the following addressed before the next developer weekend… +* General + * Implement any appropriate auto fill auth handlers + * Continue styling the generated query pages. + * Review TODOs. +* Framebuffer + * Language support for resources (Vince) + * Listing of compiled-in surfaces (Vince) +* Internationalisation + * Translations of all messages for the SSL/privacy internal query page. + * Translations of all messages for the authentication internal query page. +* Text layout + - Continue implementing. (Michael) +* Release 3.10 + * Which means do the work first needed to complete it + * And then do Debian package releases, including removing framebuffer + from Debian. +* Events + * Michael to do more UI event support in NetSurf Next time ========= -* ??? -* ??? -* Consider extending either side, depending on holidays. +* February 21st to 24th (Fri through Monday) as a full 4 day event +* Manchester, unless something changes. ----------------------------------------------------------------------- Summary of changes: developer-weekend/dec-2019.mdwn | 74 ++++++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 8 deletions(-) diff --git a/developer-weekend/dec-2019.mdwn b/developer-weekend/dec-2019.mdwn index 0d9f7db..d255425 100644 --- a/developer-weekend/dec-2019.mdwn +++ b/developer-weekend/dec-2019.mdwn @@ -1,6 +1,6 @@ [[!meta title="Developer Weekend (December 2019)"]] [[!meta author="NetSurf Developers"]] -[[!meta date="2019-12-01 20:00:00"]] +[[!meta date="2019-12-01 22:30:00"]] [[!toc]] @@ -44,8 +44,8 @@ Topics * Goals for the weekend * Complete the multi-site parallel test stuff that Vince has started **DONE** * Migrate SSL certification ownership to the llcache and at least block out - the padlock work - * Resolve new Debian packaging and upload + the padlock work **DONE** + * Resolve new Debian packaging and upload **Deferred to after 3.10** * Bug triage * Do general triage **DONE** @@ -60,10 +60,10 @@ Topics * Look over the generic error internal query page work **DONE** Daniel checked it * Check over the mouse input handler rework **DONE** As a group -* Consider the pathway to 3.10/4.0 +* Consider the pathway to 3.10/4.0 **DONE** * Consider what the best return-on-effort might be to improve general layout - support. We're increasingly falling behind. + support. We're increasingly falling behind. **DONE** Discussions =========== @@ -93,6 +93,27 @@ Bug Triage * [[!bug 2703]] - Daniel added a note, but we're leaving it unassigned * [[!bug 2710]] - This appears to be a RISC OS font problem, Michael responded +General Layout Improvement Approach +=================================== + +* libcss needs support for `calc` +* libcss needs css variable support +* NetSurf could try and use the flexbox properties and grid layout +* Continue to try and get jQuery working + +Pathway to 3.10 +=============== + +* Completion of MVP for page info core window (Assigned to Vince, Michael to + help) +* Completion of integration of that into GTK and RISC OS frontends, with others + being given at least two weeks to integrate before they cease blocking. + (Assigned to Vince) +* At least some attention given to GTK focus issues (Assigned to Vince, Daniel + to assist) +* See if we can exfiltrate better SSL session error information such as a lack + of cipher list overlap. [[!bug 2719]] (Assigned to Daniel) +* Verify webp on riscos, disable if too buggy (Assigned to Michael) Activity ======== @@ -102,6 +123,7 @@ Mostly individual activity here Michael ------- +* Proposed a FOSDEM talk * [[!bug 2689]] - Fixed us not to render scrollbars when the CSS tells us not to. * Added some extra glyphs to the Framebuffer front end to render the the @@ -109,6 +131,12 @@ Michael * [[!bug 2688]] - Looked into the cause of this bug, and found it was due to the unimplemented opacity property. It's tricky to implement right now. It applies to all descendant elements, so compositing is required. +* [[!bug 2705]] - Looked into this, unfortunately we seem to be given different + content to Firefox - save firefox's content and NS can render it. ARGH. +* Helped Daniel track down a breakage in libcss when faced with + an incomplete ruleset inside a media query block. +* Added support for `KeyboardEvent` properly in libdom and semi-properly + in NetSurf Daniel ------ @@ -121,6 +149,12 @@ Daniel * Did a bunch of `rr` and fixed some leaks in `box_construct.c` * Did a bunch of `rr` and tracked down a breakage in libcss when faced with an incomplete ruleset inside a media query block. (Michael helped) +* Did a bunch of `rr` and tracked down an incorrect throbberstoppage. +* Wrote support for page info status indicators in browser window and + content, threaded through html content too. +* Wrote a monkey test set to validate the page info status +* Various jenkins frobbling + Vince ----- @@ -128,6 +162,13 @@ Vince * [[!bug 2720]] - Implemented feature request of closing tabs with middle click * Finished extended internet test badgering including full reorganisation of the monkey-tests tree. +* Fixed [[!bug 2709]] - UTF8 caption on Windows (WIN32) +* Implemented icons for page info status work that Daniel did, and made it all + work in the GTK frontend (GTK2 *and* GTK3) +* Temporarily plumbed the old SSL cert info into being activated from that + button. It's not brilliant but it does work. +* Began to look at fixing win32 font-width stuff for wide-chars +* Various jenkins frobbling Plan for page info ================== @@ -166,10 +207,27 @@ Statement of work If at all possible, we'd like to see some of the following addressed before the next developer weekend… +* General + * Implement any appropriate auto fill auth handlers + * Continue styling the generated query pages. + * Review TODOs. +* Framebuffer + * Language support for resources (Vince) + * Listing of compiled-in surfaces (Vince) +* Internationalisation + * Translations of all messages for the SSL/privacy internal query page. + * Translations of all messages for the authentication internal query page. +* Text layout + - Continue implementing. (Michael) +* Release 3.10 + * Which means do the work first needed to complete it + * And then do Debian package releases, including removing framebuffer + from Debian. +* Events + * Michael to do more UI event support in NetSurf Next time ========= -* ??? -* ??? -* Consider extending either side, depending on holidays. +* February 21st to 24th (Fri through Monday) as a full 4 day event +* Manchester, unless something changes. -- NetSurf Developer Wiki Backing Store

3 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.9-369-gb9cb2ca

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/b9cb2cab0bf34f34dfcfb... ...commit http://git.netsurf-browser.org/netsurf.git/commit/b9cb2cab0bf34f34dfcfb3b... ...tree http://git.netsurf-browser.org/netsurf.git/tree/b9cb2cab0bf34f34dfcfb3b59... The branch, master has been updated via b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c (commit) from 614a563d2f16703b96e18e6c65cdb2765efdbaac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b9cb2cab0bf34f34dfc... commit b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> browser_window: Don't use the fetch parameters for page info In order to cope with redirects properly, use the content's URL not the fetch parameters. Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org> diff --git a/desktop/browser_window.c b/desktop/browser_window.c index ac3dc1e..dea507f 100644 --- a/desktop/browser_window.c +++ b/desktop/browser_window.c @@ -4652,13 +4652,13 @@ browser_window_page_info_state browser_window_get_page_info_state( assert(bw != NULL); - /* Do we have any parameters? If not -- UNKNOWN */ - if (bw->current_parameters.url == NULL || - bw->current_content == NULL) { + /* Do we have any content? If not -- UNKNOWN */ + if (bw->current_content == NULL) { return PAGE_STATE_UNKNOWN; } - scheme = nsurl_get_component(bw->current_parameters.url, NSURL_SCHEME); + scheme = nsurl_get_component( + hlcache_handle_get_url(bw->current_content), NSURL_SCHEME); /* Is this an internal scheme? */ if ((lwc_string_isequal(scheme, corestring_lwc_about, ----------------------------------------------------------------------- Summary of changes: desktop/browser_window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/browser_window.c b/desktop/browser_window.c index ac3dc1e..dea507f 100644 --- a/desktop/browser_window.c +++ b/desktop/browser_window.c @@ -4652,13 +4652,13 @@ browser_window_page_info_state browser_window_get_page_info_state( assert(bw != NULL); - /* Do we have any parameters? If not -- UNKNOWN */ - if (bw->current_parameters.url == NULL || - bw->current_content == NULL) { + /* Do we have any content? If not -- UNKNOWN */ + if (bw->current_content == NULL) { return PAGE_STATE_UNKNOWN; } - scheme = nsurl_get_component(bw->current_parameters.url, NSURL_SCHEME); + scheme = nsurl_get_component( + hlcache_handle_get_url(bw->current_content), NSURL_SCHEME); /* Is this an internal scheme? */ if ((lwc_string_isequal(scheme, corestring_lwc_about, -- NetSurf Browser

3 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.9-368-g614a563

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/614a563d2f16703b96e18... ...commit http://git.netsurf-browser.org/netsurf.git/commit/614a563d2f16703b96e18e6... ...tree http://git.netsurf-browser.org/netsurf.git/tree/614a563d2f16703b96e18e6c6... The branch, master has been updated via 614a563d2f16703b96e18e6c65cdb2765efdbaac (commit) from fac20e8d38b6c05312a349cb05511719201e3f10 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=614a563d2f16703b96e... commit 614a563d2f16703b96e18e6c65cdb2765efdbaac Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> set debug text to correct level diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c index c65c360..3cfcd5c 100644 --- a/frontends/gtk/gui.c +++ b/frontends/gtk/gui.c @@ -289,7 +289,7 @@ add_builtin_icon(const char *prefix, const char *name, int x, int y) snprintf(resname, resnamelen, "icons%s/%s.png", prefix, name); res = nsgdk_pixbuf_new_from_resname(resname, &pixbuf); - NSLOG(netsurf, WARNING, "%d %s", res, resname); + NSLOG(netsurf, DEEPDEBUG, "%d %s", res, resname); free(resname); if (res != NSERROR_OK) { pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, x, y); ----------------------------------------------------------------------- Summary of changes: frontends/gtk/gui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c index c65c360..3cfcd5c 100644 --- a/frontends/gtk/gui.c +++ b/frontends/gtk/gui.c @@ -289,7 +289,7 @@ add_builtin_icon(const char *prefix, const char *name, int x, int y) snprintf(resname, resnamelen, "icons%s/%s.png", prefix, name); res = nsgdk_pixbuf_new_from_resname(resname, &pixbuf); - NSLOG(netsurf, WARNING, "%d %s", res, resname); + NSLOG(netsurf, DEEPDEBUG, "%d %s", res, resname); free(resname); if (res != NSERROR_OK) { pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, x, y); -- NetSurf Browser

3 years, 1 month

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits December 2019