xmw 14/11/15 15:01:58
Added: netsurf-3.2-CFLAGS.patch
netsurf-3.2-glibc2.20.patch
netsurf-3.2-conditionally-include-image-headers.patch
Log:
Version bump, frist try.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
62EEF090)
Revision Changes Path
1.1 www-client/netsurf/files/netsurf-3.2-CFLAGS.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/netsurf/files/netsurf-3.2-CFLAGS.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/netsurf/files/netsurf-3.2-CFLAGS.patch?rev=1.1&content-type=text/plain
Index: netsurf-3.2-CFLAGS.patch
===================================================================
--- netsurf-3.2/Makefile.defaults
+++ netsurf-3.2/Makefile.defaults
@@ -91,9 +91,6 @@
# Valid options: YES, NO
NETSURF_FS_BACKING_STORE := NO
-# Initial CFLAGS. Optimisation level etc. tend to be target specific.
-CFLAGS :=
-
# Default installation/execution prefix
PREFIX ?= /usr/local
--- netsurf-3.2/framebuffer/Makefile.defaults
+++ netsurf-3.2/framebuffer/Makefile.defaults
@@ -2,9 +2,6 @@
# Framebuffer-target-specific options
# ----------------------------------------------------------------------------
-# Optimisation levels
-CFLAGS += -O2
-
# Framebuffer default surface provider.
# Valid values are: x, sdl, linux, vnc, able,
NETSURF_FB_FRONTEND := sdl
--- netsurf-3.2/framebuffer/Makefile.target
+++ netsurf-3.2/framebuffer/Makefile.target
@@ -42,7 +42,7 @@
$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
-CFLAGS += -std=c99 -g -Dsmall $(WARNFLAGS) \
+CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) \
-D_BSD_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
--- netsurf-3.2/gtk/Makefile.defaults
+++ netsurf-3.2/gtk/Makefile.defaults
@@ -38,6 +38,3 @@
# Set default GTK version to build for (2 or 3)
NETSURF_GTK_MAJOR := 2
-
-# Optimisation levels
-CFLAGS += -O2
--- netsurf-3.2/gtk/Makefile.target
+++ netsurf-3.2/gtk/Makefile.target
@@ -51,7 +51,7 @@
-D_POSIX_C_SOURCE=200809L \
-D_NETBSD_SOURCE \
-DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \
- $(WARNFLAGS) -g
+ $(WARNFLAGS)
# non optional pkg-configed libs
$(eval $(call pkg_config_find_and_add,libcss,CSS))
--- netsurf-3.2/test/Makefile
+++ netsurf-3.2/test/Makefile
@@ -1,8 +1,8 @@
-CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
+CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
$(shell pkg-config --cflags libcurl)
LDFLAGS := $(shell pkg-config --libs libcurl) -lz
-llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet
libdom) -O2
+llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet
libdom)
llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet
libdom)
llcache_SRCS := content/fetch.c content/fetchers/curl.c \
@@ -19,7 +19,7 @@
utils/filename.c utils/nsurl.c utils/corestrings.c \
test/urldbtest.c
-urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
+urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c
utils/utf8proc.c test/nsurl.c
1.1 www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch?rev=1.1&content-type=text/plain
Index: netsurf-3.2-glibc2.20.patch
===================================================================
--- netsurf-3.2/framebuffer/Makefile.target
+++ netsurf-3.2/framebuffer/Makefile.target
@@ -43,7 +43,7 @@
$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) \
- -D_BSD_SOURCE \
+ -D_DEFAULT_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
$(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
--- netsurf-3.2/gtk/Makefile.target
+++ netsurf-3.2/gtk/Makefile.target
@@ -46,7 +46,7 @@
GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
$(GTKDEPFLAGS) \
- -D_BSD_SOURCE \
+ -D_DEFAULT_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200809L \
-D_NETBSD_SOURCE \
--- netsurf-3.2/test/Makefile
+++ netsurf-3.2/test/Makefile
@@ -1,4 +1,4 @@
-CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
+CFLAGS := -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \
$(shell pkg-config --cflags libcurl)
LDFLAGS := $(shell pkg-config --libs libcurl) -lz
1.1
www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch?rev=1.1&content-type=text/plain
Index: netsurf-3.2-conditionally-include-image-headers.patch
===================================================================
--- netsurf-3.2/image/image.c
+++ netsurf-3.2/image/image.c
@@ -28,15 +28,42 @@
#include "content/content.h"
#include "image/bitmap.h"
+#ifdef WITH_BMP
#include "image/bmp.h"
-#include "image/gif.h"
#include "image/ico.h"
+#endif
+
+#ifdef WITH_GIF
+#include "image/gif.h"
+#endif
+
+#ifdef WITH_JPEG
#include "image/jpeg.h"
-#include "image/nssprite.h"
+#endif
+
+#ifdef WITH_MNG
+#include "image/mng.h"
+#endif
+
+#ifdef WITH_PNG
#include "image/png.h"
-#include "image/rsvg.h"
+#endif
+
+#ifdef WITH_NSSPRITE
+#include "image/nssprite.h"
+#endif
+
+#ifdef WITH_NS_SVG
#include "image/svg.h"
+#endif
+
+#ifdef WITH_RSVG
+#include "image/rsvg.h"
+#endif
+
+#ifdef WITH_WEBP
#include "image/webp.h"
+#endif
#include "image/image.h"
@@ -73,7 +100,18 @@
return error;
#endif
+#ifdef WITH_MNG
+ error = nsmng_init();
+ if (error != NSERROR_OK)
+ return error;
+
+ error = nsjpng_init();
+ if (error != NSERROR_OK)
+ return error;
+#endif
+
#ifdef WITH_PNG
+ /* Prefer libpng over libmng for pngs by registering later */
error = nspng_init();
if (error != NSERROR_OK)
return error;
