commit 19c141f7891a8a5f7cd6c0163fddf92715d93601
Author: Witold Filipczyk <[email protected]>
Date: Mon Mar 16 13:25:02 2015 +0100
- updated to 3.3
- added jsapi_h.patch
jsapi_h.patch | 11 +++++++++++
netsurf.spec | 32 ++++++++++++++++++--------------
no-Werror.patch | 14 +++++++-------
optflags.patch | 12 +++++++-----
4 files changed, 43 insertions(+), 26 deletions(-)
---
diff --git a/netsurf.spec b/netsurf.spec
index 4a42066..ec8ed3b 100644
--- a/netsurf.spec
+++ b/netsurf.spec
@@ -8,40 +8,43 @@
Summary: Light WWW browser with CSS support
Summary(pl.UTF-8): Lekka przeglądarka WWW z obsługą CSS
Name: netsurf
-Version: 3.2
-Release: 2
+Version: 3.3
+Release: 1
License: GPL v2 with OpenSSL exception (code), MIT (artwork)
Group: Applications/Networking
Source0:
http://download.netsurf-browser.org/netsurf/releases/source/%{name}-%{version}-src.tar.gz
-# Source0-md5: 8b49a31345e2902fd962fcc11a1eedc2
+# Source0-md5: 81a2838d8816ea435c4471f515a397d4
Source1: %{name}.desktop
Patch0: nsfb-ldflags.patch
Patch1: %{name}-link.patch
Patch2: no-Werror.patch
Patch3: optflags.patch
+Patch4: jsapi_h.patch
URL: http://netsurf-browser.org/
BuildRequires: curl-devel
BuildRequires: freetype-devel >= 2
%{?with_gstreamer:BuildRequires: gstreamer0.10-devel >= 0.10}
BuildRequires: gtk+2-devel >= 2.0
%{?with_js:BuildRequires: js185-devel}
-BuildRequires: libCSS-devel >= 0.4.0
-BuildRequires: libdom-devel >= 0.1.1
+BuildRequires: libCSS-devel >= 0.5.0
+BuildRequires: libdom-devel >= 0.1.2
%{?with_pdf:BuildRequires: libharu-devel}
-BuildRequires: libhubbub-devel >= 0.3.0
+BuildRequires: libhubbub-devel >= 0.3.1
BuildRequires: libjpeg-devel
-BuildRequires: libnsbmp-devel >= 0.1.1
-BuildRequires: libnsfb-devel >= 0.1.2
-BuildRequires: libnsgif-devel >= 0.1.1
-BuildRequires: libparserutils-devel >= 0.2.0
+BuildRequires: libnsbmp-devel >= 0.1.2
+BuildRequires: libnsfb-devel >= 0.1.3
+BuildRequires: libnsgif-devel >= 0.1.2
+BuildRequires: libnsutils-devel >= 0.0.1
+BuildRequires: libparserutils-devel >= 0.2.1
BuildRequires: libpng-devel
BuildRequires: librsvg-devel
-BuildRequires: libsvgtiny-devel >= 0.1.2
-BuildRequires: libwapcaplet-devel >= 0.2.1
+BuildRequires: libsvgtiny-devel >= 0.1.3
+BuildRequires: libutf8proc-devel >= 1.1.6
+BuildRequires: libwapcaplet-devel >= 0.2.2
%{?with_webp:BuildRequires: libwebp-devel}
BuildRequires: openssl-devel
-BuildRequires: netsurf-buildsystem >= 1.2
-BuildRequires: nsgenbind >= 0.1.1
+BuildRequires: netsurf-buildsystem >= 1.3
+BuildRequires: nsgenbind >= 0.1.2
BuildRequires: perl-HTML-Parser
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
@@ -131,6 +134,7 @@ Ten pakiet zawiera wersję SDL.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
cat << EOF > Makefile.config
NETSURF_FB_FONTLIB := freetype
diff --git a/jsapi_h.patch b/jsapi_h.patch
new file mode 100644
index 0000000..600bcf5
--- /dev/null
+++ b/jsapi_h.patch
@@ -0,0 +1,11 @@
+--- netsurf-3.3/javascript/jsapi.h.orig 2015-03-16 13:11:26.470556751
+0100
++++ netsurf-3.3/javascript/jsapi.h 2015-03-16 13:11:50.455694550 +0100
+@@ -25,7 +25,7 @@
+
+ /* include the correct header */
+ #ifdef WITH_MOZJS
+-#include "js/jsapi.h"
++#include <jsapi.h>
+ #else
+ #include "mozjs/jsapi.h"
+ #endif
diff --git a/no-Werror.patch b/no-Werror.patch
index 51fbeef..1233ec5 100644
--- a/no-Werror.patch
+++ b/no-Werror.patch
@@ -1,11 +1,11 @@
---- netsurf-3.1/monkey/Makefile.target~ 2014-04-25 13:14:16.000000000
+0200
-+++ netsurf-3.1/monkey/Makefile.target 2014-11-25 19:35:10.859023670 +0100
-@@ -33,8 +33,6 @@
+--- netsurf-3.3/monkey/Makefile.target.orig 2015-03-16 12:51:28.222386599
+0100
++++ netsurf-3.3/monkey/Makefile.target 2015-03-16 12:52:53.091926808 +0100
+@@ -33,8 +33,6 @@ $(eval $(call pkg_config_find_and_add_en
# no pkg-config for this library
$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp -lvpx,WebP (libwebp)))
--WARNFLAGS += -Werror
+-CWARNFLAGS += -Werror
-
- MONKEYCFLAGS := -std=c99 -Dmonkey -Dnsmonkey \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
+ CFLAGS += -std=c99 -Dmonkey -Dnsmonkey -g \
+ -D_BSD_SOURCE \
+ -D_XOPEN_SOURCE=600 \
diff --git a/optflags.patch b/optflags.patch
index 450d3a9..83536de 100644
--- a/optflags.patch
+++ b/optflags.patch
@@ -1,15 +1,17 @@
---- netsurf-3.1/Makefile.orig 2014-04-25 13:14:16.000000000 +0200
-+++ netsurf-3.1/Makefile 2014-11-25 20:46:18.669202155 +0100
-@@ -437,10 +437,10 @@
- $(eval $(call feature_enabled,LIBICONV_PLUG,-DLIBICONV_PLUG,,glibc internal
iconv))
+--- netsurf-3.3/Makefile.orig 2015-03-16 12:53:40.421670394 +0100
++++ netsurf-3.3/Makefile 2015-03-16 12:55:55.214273473 +0100
+@@ -500,11 +500,11 @@
+ $(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
- # common libraries without pkg-config support
+ # Common libraries without pkg-config support
-LDFLAGS += -lz
+LDFLAGS += -lz $(OPTLDFLAGS)
# add top level and build directory to include search path
-CFLAGS += -I. -I$(OBJROOT)
+-CXXFLAGS += -I. -I$(OBJROOT)
+CFLAGS += -I. -I$(OBJROOT) $(OPTFLAGS)
++CXXFLAGS += -I. -I$(OBJROOT) $(OPTFLAGS)
# export the user agent format
CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/netsurf.git/commitdiff/19c141f7891a8a5f7cd6c0163fddf92715d93601
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
