pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/47354: pkgsrc/www/webkit-gtk : invalid conversion from 'signed char*' to 'int8_t* {aka char*}'
The following reply was made to PR pkg/47354; it has been noted by GNATS.
From: Richard PALO <richard.palo%baou.fr@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/47354: pkgsrc/www/webkit-gtk : invalid conversion from 'signed
char*' to 'int8_t* {aka char*}'
Date: Thu, 03 Jan 2013 09:22:53 +0100
I can now confirm that this single patch got over the namespace problem
with (std::)isnan.
I am now able to successfully build and install webkit-gtk and
webkit-gtk3 both with and without the option webkit-jit.
In summary:
patch to Makefile.common:
upgrades to webkit-gtk 1.10.2
and adds CXXFLAGS+= -fpermissive to get over the following error
when building Source/JavaScriptCore/jsc.cpp
"conversion from 'signed char*' to 'int8_t* {aka char*}'"
new patch patch-GNUmakefile.in replacing old patch patch-al in order to
get over the following warning during patching:
> => Applying pkgsrc patches for webkit-gtk-1.10.2
> No such line 80443 in input file, ignoring
> ===> Creating toolchain wrappers for webkit-gtk-1.10.2
new patch patch-Source_WTF_wtf_MathExtras.h
to fix check for sunstudio on solaris instead of all solaris
===================================
Update pkgsrc/www/webkit-gtk to 1.10.2 redo patch to
GNUmakefile.in to avoid warnings add CXXFLAGS+= -fpermissive to prevent
"conversion from 'signed char*' to 'int8_t* {aka char*}'" correct
sunstudio
bugfix to !(OS(SOLARIS) && defined(__SUNPRO_CC)) in MathExtras.h
diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common
index 1d3a66b..8513195 100644
--- a/www/webkit-gtk/Makefile.common
+++ b/www/webkit-gtk/Makefile.common
@@ -2,7 +2,7 @@
# used by www/webkit-gtk/Makefile
# used by www/webkit-gtk3/Makefile
-DISTNAME= webkitgtk-1.10.1
+DISTNAME= webkitgtk-1.10.2
CATEGORIES= www
MASTER_SITES= http://www.webkitgtk.org/releases/
EXTRACT_SUFX= .tar.xz
@@ -29,6 +29,8 @@ CONFIGURE_ARGS+= --with-target=x11 \
CONFIGURE_ARGS+= --disable-geolocation
CONFIGURE_ENV+= ZLIB_CFLAGS=-I${BUILDLINK_PREFIX.zlib}/include
ZLIB_LIBS=-lz
+CXXFLAGS+= -fpermissive
+
.include "options.mk"
REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index ee038b8..674cc3b 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.58 2012/11/22 18:20:48 marino Exp $
+$NetBSD$
-SHA1 (webkitgtk-1.10.1.tar.xz) = 3a2df2eb42ffdd7f3b39873d5461c347a6330493
-RMD160 (webkitgtk-1.10.1.tar.xz) = ea246d29a1def4993d592d8464b527b2c9ed1bdc
-Size (webkitgtk-1.10.1.tar.xz) = 8548452 bytes
+SHA1 (webkitgtk-1.10.2.tar.xz) = 733ca23157eb8dd072d57becf325799c00bde630
+RMD160 (webkitgtk-1.10.2.tar.xz) = 91e6b8bcd4bb8234271dd6c6ebdba63dd1c0840e
+Size (webkitgtk-1.10.2.tar.xz) = 8633640 bytes
+SHA1 (patch-GNUmakefile.in) = e2041fda38ad0a4d8d5e4c31f184a812f5332b6b
SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) =
c5e1efdac5f6e2a4c035b6a3ce808d0e7a076703
SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) =
f166335d829aba9051c1aaf1b950ec655deef372
SHA1
(patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) =
462e62d9078ef90df8cdeccbb64b0d2ccde5f11e
+SHA1 (patch-Source_WTF_wtf_MathExtras.h) =
e89115f5c256865ba2a83936c3c17f73926bca5f
SHA1 (patch-Source_WebCore_editing_Editor.h) =
43562577dd6432a86fd8ee0a1e7bb0db31f07d2d
SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) =
0f33b188b242166584d5725060c5c430a819be61
SHA1 (patch-ai) = 8df303ffde5c4398e56601c524e9ab4aff52096c
SHA1 (patch-aj) = 930d1b5d73028b2f2e5abb33c15f72befadc64ce
SHA1 (patch-ak) = 64ad843164f1c12968e933080e0966a9019abfdf
-SHA1 (patch-al) = dd7201d0a5dcc0f173a156f3bb42e1417bef6b06
SHA1 (patch-am) = 9516994b630b43c7c234f61debf8d762cf7aee97
SHA1 (patch-configure) = 448caea068344fe987e566f73b3f567dad7b93ed
diff --git a/www/webkit-gtk/patches/patch-GNUmakefile.in
b/www/webkit-gtk/patches/patch-GNUmakefile.in
new file mode 100644
index 0000000..372ac03
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-GNUmakefile.in
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- GNUmakefile.in.orig 2012-12-09 18:20:20.000000000 +0000
++++ GNUmakefile.in
+@@ -21156,7 +21156,6 @@ Programs_minidom_CPPFLAGS = \
+ $(javascriptcore_cppflags)
+
+ Programs_minidom_CFLAGS = \
+- -ansi \
+ -fno-strict-aliasing \
+ $(global_cflags) \
+ $(GLOBALDEPS_CFLAGS)
+@@ -79732,6 +79731,8 @@ doc-maintainer-clean-local: clean
+ -@rmdir Documentation
+
+ install-data-local:
++
++xinstall-data-local:
+ @installfiles=`echo ./Documentation/webkitgtk/html/*`; \
+ if test "$$installfiles" = './Documentation/webkitgtk/html/*'; \
+ then echo 1>&2 'No documentation to install' ; \
+@@ -79772,7 +79773,7 @@ install-data-local:
+ @ENABLE_WEBKIT2_TRUE@
$${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
+ @ENABLE_WEBKIT2_TRUE@ fi; \
+ @ENABLE_WEBKIT2_TRUE@ fi
+- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase
--virtual-root=$${DESTDIR}
++# @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase
--virtual-root=$${DESTDIR}
+
+ uninstall-local:
+ @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
new file mode 100644
index 0000000..7ab4e16
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WTF/wtf/MathExtras.h.orig 2012-11-23 20:12:16.000000000 +0000
++++ Source/WTF/wtf/MathExtras.h
+@@ -288,7 +288,7 @@ inline bool isWithinIntRange(float x)
+ return x > static_cast<float>(std::numeric_limits<int>::min()) &&
x < static_cast<float>(std::numeric_limits<int>::max());
+ }
+
+-#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(SOLARIS)
++#if !COMPILER(MSVC) && !COMPILER(RVCT) && !(OS(SOLARIS) &&
defined(__SUNPRO_CC))
+ using std::isfinite;
+ #if !COMPILER_QUIRK(GCC11_GLOBAL_ISINF_ISNAN)
+ using std::isinf;
diff --git a/www/webkit-gtk/patches/patch-al
b/www/webkit-gtk/patches/patch-al
deleted file mode 100644
index b2facf7..0000000
--- a/www/webkit-gtk/patches/patch-al
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-al,v 1.3 2012/11/07 15:29:13 joerg Exp $
-
---- GNUmakefile.in.orig 2012-04-24 05:17:27.000000000 +0000
-+++ GNUmakefile.in
-@@ -21828,7 +21828,6 @@ Programs_minidom_CPPFLAGS = \
- $(javascriptcore_cppflags)
-
- Programs_minidom_CFLAGS = \
-- -ansi \
- -fno-strict-aliasing \
- $(global_cflags) \
- $(GLOBALDEPS_CFLAGS)
-@@ -80247,6 +80246,8 @@ doc-maintainer-clean-local: clean
- -@rmdir Documentation
-
- install-data-local:
-+
-+xinstall-data-local:
- @installfiles=`echo ./Documentation/webkitgtk/html/*`; \
- if test "$$installfiles" = './Documentation/webkitgtk/html/*'; \
- then echo 1>&2 'No documentation to install' ; \
-@@ -80287,7 +80288,7 @@ install-data-local:
- @ENABLE_WEBKIT2_TRUE@
$${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
- @ENABLE_WEBKIT2_TRUE@ fi; \
- @ENABLE_WEBKIT2_TRUE@ fi
-- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase
--virtual-root=$${DESTDIR}
-+# @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase
--virtual-root=$${DESTDIR}
-
- uninstall-local:
- @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
--
1.8.0.1
Home |
Main Index |
Thread Index |
Old Index