X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 83778DC00E2 for ; Wed, 4 Nov 2015 18:21:22 +0000 (UTC) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 05C25DC0125 for ; Wed, 4 Nov 2015 18:21:21 +0000 (UTC) Received: by wmll128 with SMTP id l128so121554260wml.0 for ; Wed, 04 Nov 2015 10:21:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=4FMaPAAtz4NiDufiJI/9DCYkNW0jbGGNzfrzivZ71B0=; b=L1arLL9PG/Agvb9BERBVbPev6qD0gXgWmvwUVcli0XQZCSCr3Ed23Ur2ok3iedpZTX qEV4FHyQAnIWbS6GSAXJKfhBLpYLP8qTX3jNDCmeU+/LuLOpN+jtd4NGC7+6AEYUWg9F HWAmUmDdmnplxzC4hWDR3wQHx2mP5Jqbyn7yQ57P9+FgPAfrHXPLqirQaEr4QdHhxyD+ UWqCkD6kZrDG4eVhIQat+xRKlV6GrW0vdH9xlULWhIb3cz371R+i/qad8I0YHpLGb03u NA+rdqwppGoNo/G7eZV47RAcapbaRAhNE6LurNH9p2xTBbPZNmvGtgZSf3fCXXJJnuiW YUvQ== X-Received: by 10.28.19.198 with SMTP id 189mr5184641wmt.103.1446661280260; Wed, 04 Nov 2015 10:21:20 -0800 (PST) Received: from eucalyptus (kaj-0668.koleje.cuni.cz. [78.128.162.162]) by smtp.gmail.com with ESMTPSA id n17sm4273331wmg.17.2015.11.04.10.21.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Nov 2015 10:21:19 -0800 (PST) Date: Wed, 4 Nov 2015 19:21:18 +0100 From: Jiri Horner To: Natanael Copa Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] testing/webkit2gtk: new aport Message-ID: <20151104182118.GA30891@eucalyptus> Mail-Followup-To: Natanael Copa , alpine-aports@lists.alpinelinux.org References: <1446510767-4912-2-git-send-email-laeqten@gmail.com> <20151103092949.049b0bc2@ncopa-desktop.alpinelinux.org> <20151103102122.GB4816@eucalyptus> <20151104135521.37d082a5@ncopa-desktop.alpinelinux.org> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="2fHTh5uZTiUOsy+g" Content-Disposition: inline In-Reply-To: <20151104135521.37d082a5@ncopa-desktop.alpinelinux.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Virus-Scanned: ClamAV using ClamSMTP --2fHTh5uZTiUOsy+g Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline > >This all sounds great to me. lets do it. > >There appear to be a build error (32bit atleast): > >[ 13%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/platform/linux/MemoryPressureHandlerLinux.cpp.o >/home/ncopa/aports/testing/webkit2gtk/src/webkitgtk-2.10.3/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp: In member function 'void WebCore::MemoryPressureHandler::platformReleaseMemory(WebCore::Critical)': >/home/ncopa/aports/testing/webkit2gtk/src/webkitgtk-2.10.3/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp:205:18: error: 'malloc_trim' was not declared in this scope > malloc_trim(0); > ^ >Source/WebCore/CMakeFiles/WebCore.dir/build.make:60331: recipe for target 'Source/WebCore/CMakeFiles/WebCore.dir/platform/linux/MemoryPressureHandlerLinux.cpp.o' failed >make[2]: *** [Source/WebCore/CMakeFiles/WebCore.dir/platform/linux/MemoryPressureHandlerLinux.cpp.o] Error 1 >CMakeFiles/Makefile2:642: recipe for target 'Source/WebCore/CMakeFiles/WebCore.dir/all' failed >make[1]: *** [Source/WebCore/CMakeFiles/WebCore.dir/all] Error 2 >Makefile:149: recipe for target 'all' failed >make: *** [all] Error 2 > > I'm sorry, mea culpa. I have forgotten to add one of the patches to APKBUILD. This patch deals with problem (glibc malloc.h extension). New patch attached. Jiri --2fHTh5uZTiUOsy+g Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="0001-community-webkit2gtk-new-aport.patch" >From 89ccc65dfc7ed9ba35a8ff6fe85a8a6d3faeaa1e Mon Sep 17 00:00:00 2001 From: Jiri Horner Date: Fri, 30 Oct 2015 23:28:12 +0000 Subject: [PATCH] community/webkit2gtk: new aport http://webkitgtk.org/ portable web rendering engine WebKit for GTK+ --- community/webkit2gtk/APKBUILD | 99 +++++++++++++++++++++++++ community/webkit2gtk/disallow-ctype.patch | 11 +++ community/webkit2gtk/disallow-malloc_trim.patch | 12 +++ community/webkit2gtk/fix-execinfo.patch | 20 +++++ community/webkit2gtk/fix-isnan.patch | 19 +++++ 5 files changed, 161 insertions(+) create mode 100644 community/webkit2gtk/APKBUILD create mode 100644 community/webkit2gtk/disallow-ctype.patch create mode 100644 community/webkit2gtk/disallow-malloc_trim.patch create mode 100644 community/webkit2gtk/fix-execinfo.patch create mode 100644 community/webkit2gtk/fix-isnan.patch diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD new file mode 100644 index 0000000..2740f78 --- /dev/null +++ b/community/webkit2gtk/APKBUILD @@ -0,0 +1,99 @@ +# Contributor: Jiri Horner +# Maintainer: Jiri Horner +pkgname=webkit2gtk +pkgver=2.10.3 +pkgrel=0 +pkgdesc="portable web rendering engine WebKit for GTK+" +url="http://webkitgtk.org/" +arch="all" +license="LGPL2+ BSD" +depends="" +depends_dev="gtk+3.0-dev libsoup-dev" +makedepends="$depends_dev + cmake + bison + enchant-dev + flex + gnutls-dev + gobject-introspection-dev + gperf + gtk-doc + icu-dev + gstreamer1-dev + gst-plugins-base1-dev + hyphen-dev + libjpeg-turbo-dev + libpng-dev + libsecret-dev + libwebp-dev + libxml2-dev + libxslt-dev + libxt-dev + libnotify-dev + mesa-dev + pango-dev + ruby + sqlite-dev + " +install= +replaces="webkit" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz + fix-execinfo.patch + disallow-ctype.patch + fix-isnan.patch + disallow-malloc_trim.patch + " + +_srcdir="${srcdir}/webkitgtk-${pkgver}" +_builddir="${srcdir}/build" +prepare() { + cd "$_srcdir" + for i in $source; do + case "$i" in + *.patch) + msg "Applying $i" + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac + done + rm -r Source/ThirdParty/gtest/ || return 1 + rm -r Source/ThirdParty/qunit/ || return 1 +} + +build() { + mkdir "$_builddir" + cd "$_builddir" + cmake -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib \ + -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ + -DENABLE_GTKDOC=ON \ + -DENABLE_GEOLOCATION=OFF \ + -DENABLE_PLUGIN_PROCESS_GTK2=OFF \ + "$_srcdir" || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="278d6c64f4673a506daf27556c124523 webkitgtk-2.10.3.tar.xz +c114751c30cdcaede5a7ed5568b2b0d4 fix-execinfo.patch +375d22de42a0d1053985a6df942f1db3 disallow-ctype.patch +3fa45dbc0ea278e6426b6f86e0f8fc6d fix-isnan.patch +b98f38a61f4155eb808101b99690bcb0 disallow-malloc_trim.patch" +sha256sums="2b3ee0b2ea9bac82064d818085e09236d5fca97a5780d4c731b2f0400fb64052 webkitgtk-2.10.3.tar.xz +b2bc9e03fd5d968d6df4531a7d102496139120e666e6fed397a19ae4026751c6 fix-execinfo.patch +f4fd0f6d2c70c95169ab5c84d39607d1c4b2f674c36119f8fc1c60c751564e12 disallow-ctype.patch +08a688126e3e9a0640786b4b928740bceec0e7f94720d71ecbec971dd1dd77ce fix-isnan.patch +3045c8022bee29cda9cb31e96e441473805701b672df8984a931082389f70259 disallow-malloc_trim.patch" +sha512sums="12546184cb0b60f00382da010f5c5717e01aca2a56e1a351be1b5fae0a1584e534b82ddf2361bac2f213fddeabcf29772cc20f1cf4a5ac834e7876beb13b2f24 webkitgtk-2.10.3.tar.xz +602630468ee80b9f9bb53ee7808f4b2f2c86d1d4db14ac9c244b3e2e79a245510a289eb321cb7dbefd3b7a2dde13cf444b8ecf7cd46f23eaa5c0f04670914e42 fix-execinfo.patch +59f4e977fae16145a5116c97e3700625f1ed27963ad65daa957f1355dc93269435c1225fc5302b45e5df731c14aa7e639db4e163003eb265b867a9df9f97ab6f disallow-ctype.patch +cf48a1faf1e4daebf37c17e6b646d797b4179cee37b37369c34f879e4bafd190c974c18bad80beb7bc4560ce4d9a1f39aab8f5e5df3c130c2c8eaabb9fd124be fix-isnan.patch +a42aafb24233451a6b01770641aaf8c2cd4ee26f9e4301c5723ad70b83f3615533595405a27a35ac26e844082021cc3d516a92c385d2e0cef32366fa64eef16b disallow-malloc_trim.patch" diff --git a/community/webkit2gtk/disallow-ctype.patch b/community/webkit2gtk/disallow-ctype.patch new file mode 100644 index 0000000..d14932e --- /dev/null +++ b/community/webkit2gtk/disallow-ctype.patch @@ -0,0 +1,11 @@ +--- webkitgtk-2.10.3/Source/WTF/wtf/DisallowCType.h.orig ++++ webkitgtk-2.10.3/Source/WTF/wtf/DisallowCType.h +@@ -40,7 +40,7 @@ + // are used from wx headers. On GTK+ for Mac many GTK+ files include + // or , which in turn include which uses + // isacii(). +-#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) ++#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) && defined(__GLIBC__) + + #include + diff --git a/community/webkit2gtk/disallow-malloc_trim.patch b/community/webkit2gtk/disallow-malloc_trim.patch new file mode 100644 index 0000000..34d4905 --- /dev/null +++ b/community/webkit2gtk/disallow-malloc_trim.patch @@ -0,0 +1,12 @@ +--- webkitgtk-2.10.3/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp.orig ++++ webkitgtk-2.10.3/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp +@@ -202,7 +202,9 @@ + void MemoryPressureHandler::platformReleaseMemory(Critical) + { + ReliefLogger log("Run malloc_trim"); ++#if defined(__GLIBC__) + malloc_trim(0); ++#endif + } + + void MemoryPressureHandler::ReliefLogger::platformLog() diff --git a/community/webkit2gtk/fix-execinfo.patch b/community/webkit2gtk/fix-execinfo.patch new file mode 100644 index 0000000..eb82531 --- /dev/null +++ b/community/webkit2gtk/fix-execinfo.patch @@ -0,0 +1,20 @@ +--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp ++++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp +@@ -64,7 +64,7 @@ + #include + #endif + +-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) + #include + #include + #include +@@ -242,7 +242,7 @@ + + void WTFGetBacktrace(void** stack, int* size) + { +-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/community/webkit2gtk/fix-isnan.patch b/community/webkit2gtk/fix-isnan.patch new file mode 100644 index 0000000..6644460 --- /dev/null +++ b/community/webkit2gtk/fix-isnan.patch @@ -0,0 +1,19 @@ +--- webkitgtk-2.10.3/Source/JavaScriptCore/runtime/Options.cpp.orig ++++ webkitgtk-2.10.3/Source/JavaScriptCore/runtime/Options.cpp +@@ -29,7 +29,6 @@ + #include "HeapStatistics.h" + #include + #include +-#include + #include + #include + #include +@@ -610,7 +609,7 @@ + case Options::Type::unsignedType: + return m_entry.unsignedVal == other.m_entry.unsignedVal; + case Options::Type::doubleType: +- return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal)); ++ return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal)); + case Options::Type::int32Type: + return m_entry.int32Val == other.m_entry.int32Val; + case Options::Type::optionRangeType: -- 2.4.1 --2fHTh5uZTiUOsy+g-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---