cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to netsurf 2.6, based on a diff from Anthony J Bentley (thanks!)

Browse Source 
Remove -Wredundant-decls while here..
This commit is contained in:
landry 2010-09-30 19:45:04 +00:00
parent a343726624
commit c47b025ccd
4 changed files with 66 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/netsurf/browser/Makefile
View File

@ -1,12 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2010/09/30 07:26:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2010/09/30 19:45:04 landry Exp $
COMMENT = lightweight web browser
NETSURF_PROJECT = netsurf
NETSURF_VERSION = 2.5
PKGNAME = ${DISTNAME:S/-src//}
REVISION = 1
NETSURF_VERSION = 2.6
CATEGORIES= www

10
www/netsurf/browser/distinfo
View File

@ -1,5 +1,5 @@
MD5 (netsurf-2.5-src.tar.gz) = eTj0xZ7PYkGzZEK3Cs2SAw==
RMD160 (netsurf-2.5-src.tar.gz) = YnZS3t1QAe5p/HgDnPJ47C2kzpc=
SHA1 (netsurf-2.5-src.tar.gz) = 6aZREl3LdBOU2XLpd5DRM+Gyzo0=
SHA256 (netsurf-2.5-src.tar.gz) = CwNi4jWvLw2NW4yd2kt5Pbbt8znE+PVG+o1FbRwxSU8=
SIZE (netsurf-2.5-src.tar.gz) = 1684294
MD5 (netsurf-2.6-src.tar.gz) = hlN4nS7ebbv+eYgq/HU4/A==
RMD160 (netsurf-2.6-src.tar.gz) = jewGz1cL5x8UExMt7y3VON0s6eI=
SHA1 (netsurf-2.6-src.tar.gz) = f+8Z5TcuK+LrX4psalTgdpQG8zQ=
SHA256 (netsurf-2.6-src.tar.gz) = NmrRXhh5d2tUiC/W8/pOQhoElkTAKeTBT8Fjt2xvwZA=
SIZE (netsurf-2.6-src.tar.gz) = 1766352

84
www/netsurf/browser/patches/patch-Makefile
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile,v 1.2 2010/09/30 07:26:05 ajacoutot Exp $
$OpenBSD: patch-Makefile,v 1.3 2010/09/30 19:45:04 landry Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
gtk/gtk_tabs.c:41: error: expected declaration specifiers or '...' before 'GtkNotebookPage'
--- Makefile.orig Mon Apr 19 22:56:28 2010
+++ Makefile Thu Sep 30 07:49:36 2010
@@ -102,8 +102,8 @@ ifneq ($(TARGET),riscos)
--- Makefile.orig Tue Sep 21 21:35:54 2010
+++ Makefile Thu Sep 30 21:37:56 2010
@@ -110,8 +110,8 @@ ifneq ($(TARGET),riscos)
endif
endif
@ -16,16 +16,16 @@ gtk/gtk_tabs.c:41: error: expected declaration specifiers or '...' before 'GtkNo
PERL=perl
MKDIR=mkdir
TOUCH=touch
@@ -424,7 +424,7 @@ endif
# ----------------------------------------------------------------------------
ifeq ($(TARGET),gtk)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub openssl)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcss)
# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
@@ -444,7 +444,6 @@ ifeq ($(TARGET),gtk)
@@ -198,7 +198,7 @@ OBJROOT = build-$(HOST)-$(TARGET)$(SUBTARGET)
# Set up the WARNFLAGS here so that they can be overridden in the Makefile.config
WARNFLAGS = -W -Wall -Wundef -Wpointer-arith \
-Wcast-align -Wwrite-strings -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
+ -Wmissing-prototypes -Wmissing-declarations \
-Wnested-externs
ifneq ($(GCCVER),2)
WARNFLAGS += -Wno-unused-parameter
@@ -452,7 +452,6 @@ ifeq ($(TARGET),gtk)
$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
@ -33,59 +33,3 @@ gtk/gtk_tabs.c:41: error: expected declaration specifiers or '...' before 'GtkNo
-D_BSD_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
@@ -452,7 +451,7 @@ ifeq ($(TARGET),gtk)
-DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \
$(WARNFLAGS) -I. -g \
$(shell $(PKG_CONFIG) --cflags libglade-2.0 gtk+-2.0) \
- $(shell $(PKG_CONFIG) --cflags libhubbub libcurl openssl) \
+ $(shell $(PKG_CONFIG) --cflags libhubbub libcurl) \
$(shell xml2-config --cflags)
GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 lcms)
@@ -799,26 +798,26 @@ clean: $(CLEANS)
install-gtk: nsgtk
mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
- @cp -v nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
- @cp -vRL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/blankpage $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
- @cp -vRL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/docs $(DESTDIR)/$(NETSURF_GTK_RESOURCES)
- @cp -vRL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)SearchEngines
+ @cp nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
+ @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/blankpage $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
+ @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/docs $(DESTDIR)/$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)SearchEngines
gzip -9v < gtk/res/downloads.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)downloads.glade
gzip -9v < gtk/res/history.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)history.glade
gzip -9v < gtk/res/login.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)login.glade

51
www/netsurf/browser/pkg/PLIST
View File

@ -1,38 +1,77 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/09/30 19:45:04 landry Exp $
@bin bin/netsurf
share/netsurf/
share/netsurf/Aliases
share/netsurf/C/
share/netsurf/C/Messages
share/netsurf/SearchEngines
share/netsurf/adblock.css
share/netsurf/arrow_down_8x32.png
share/netsurf/blankpage
share/netsurf/ca-bundle.txt
share/netsurf/de/
share/netsurf/de/Messages
share/netsurf/default.css
share/netsurf/default.ico
share/netsurf/docs/
share/netsurf/docs/about/
share/netsurf/docs/about/index_en,faf
share/netsurf/docs/about/libcurl,b60
share/netsurf/docs/about/libmng,b60
share/netsurf/docs/about/libxml2,b60
share/netsurf/docs/about/openssl,695
share/netsurf/downloads.glade
share/netsurf/en/
share/netsurf/en/Messages
share/netsurf/favicon.png
share/netsurf/fr/
share/netsurf/fr/Messages
share/netsurf/gtkdefault.css
share/netsurf/history.glade
share/netsurf/it/
share/netsurf/it/Messages
share/netsurf/languages
share/netsurf/license
share/netsurf/login.glade
share/netsurf/messages
share/netsurf/netsurf-16x16.xpm
share/netsurf/netsurf.glade
share/netsurf/netsurf.xpm
share/netsurf/nl/
share/netsurf/nl/Messages
share/netsurf/options.glade
share/netsurf/password.glade
share/netsurf/quirks.css
share/netsurf/source.glade
share/netsurf/ssl.glade
share/netsurf/themelist
share/netsurf/themes/
share/netsurf/themes/Alpha.png
share/netsurf/themes/gtk+/
share/netsurf/themes/gtk+/back.png
share/netsurf/themes/gtk+/closetab.png
share/netsurf/themes/gtk+/closewindow.png
share/netsurf/themes/gtk+/copy.png
share/netsurf/themes/gtk+/cut.png
share/netsurf/themes/gtk+/delete.png
share/netsurf/themes/gtk+/forward.png
share/netsurf/themes/gtk+/fullscreen.png
share/netsurf/themes/gtk+/helpabout.png
share/netsurf/themes/gtk+/helpcontents.png
share/netsurf/themes/gtk+/history.png
share/netsurf/themes/gtk+/home.png
share/netsurf/themes/gtk+/info
share/netsurf/themes/gtk+/newtab.png
share/netsurf/themes/gtk+/newwindow.png
share/netsurf/themes/gtk+/openfile.png
share/netsurf/themes/gtk+/paste.png
share/netsurf/themes/gtk+/preferences.png
share/netsurf/themes/gtk+/print.png
share/netsurf/themes/gtk+/printpreview.png
share/netsurf/themes/gtk+/quit.png
share/netsurf/themes/gtk+/reload.png
share/netsurf/themes/gtk+/savepage.png
share/netsurf/themes/gtk+/selectall.png
share/netsurf/themes/gtk+/stop.png
share/netsurf/themes/gtk+/viewsource.png
share/netsurf/themes/gtk+/zoomminus.png
share/netsurf/themes/gtk+/zoomnormal.png
share/netsurf/themes/gtk+/zoomplus.png
share/netsurf/throbber/
share/netsurf/throbber/throbber0.png
share/netsurf/throbber/throbber1.png