Update packages
This commit is contained in:
moparisthebest
+54
-72
@@ -1,96 +1,78 @@
|
||||
# $Id: PKGBUILD 294869 2017-04-27 03:06:45Z foutrelis $
|
||||
# Maintainer: Fredy García <frealgagu at gmail.com>
|
||||
# Contributor: Chih-Hsuan Yen <yan12125@archlinux.org>
|
||||
# Contributor: foutrelis
|
||||
# Contributor: Andreas Radke <andyrtr@archlinux.org>
|
||||
|
||||
pkgbase=webkitgtk
|
||||
pkgname=(webkitgtk webkitgtk2)
|
||||
pkgname=webkitgtk
|
||||
pkgver=2.4.11
|
||||
pkgrel=12
|
||||
pkgdesc="Legacy Web content engine"
|
||||
arch=(i686 x86_64 armv7h)
|
||||
url="https://webkitgtk.org/"
|
||||
license=(custom)
|
||||
depends=(libxt libxslt sqlite libsoup 'enchant>=2.2' libgl geoclue2 gst-plugins-base-libs
|
||||
libsecret libwebp harfbuzz-icu 'icu>=61')
|
||||
makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
|
||||
optdepends=('gst-plugins-base: free media decoding'
|
||||
'gst-plugins-good: media decoding'
|
||||
'gst-libav: nonfree media decoding')
|
||||
options=(!emptydirs)
|
||||
install=webkitgtk.install
|
||||
source=(https://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
|
||||
webkitgtk-2.4.9-abs.patch
|
||||
icu59.patch
|
||||
enchant-2.x.patch
|
||||
pkgconfig-enchant-2.patch)
|
||||
sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
|
||||
'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70'
|
||||
'a1118b3c9317806438c1e2f46f17e15556aae34665f739ca72b94b10b16ae422'
|
||||
'8db282f3b7f0e21ff51121c2579466c3194475a20d35c4fbd0e53f35b5639919'
|
||||
'df8284004f25d189184aab1009df696c915212e0e439a555dbd0dbec06111e2e')
|
||||
pkgrel=16
|
||||
epoch=3
|
||||
pkgdesc="Legacy Web content engine for GTK+ 3"
|
||||
arch=("armv7h" "i686" "x86_64")
|
||||
url="https://${pkgname}.org/"
|
||||
license=("custom")
|
||||
depends=("enchant>=2.2" "geoclue2" "gst-plugins-base-libs" "gtk3" "harfbuzz-icu" "libgl" "libsecret" "libwebp" "libxslt" "libxt")
|
||||
optdepends=("gst-libav: nonfree media decoding"
|
||||
"gst-plugins-base: free media decoding"
|
||||
"gst-plugins-good: media decoding"
|
||||
"gtk2: Netscape plugin support")
|
||||
makedepends=("gobject-introspection" "gperf" "gtk2" "gtk3" "mesa" "python2" "ruby")
|
||||
provides=("${pkgname}3=${pkgver}" "libwebkit3=${pkgver}")
|
||||
conflicts=("${pkgname}3" "libwebkit3")
|
||||
replaces=("${pkgname}3" "libwebkit3")
|
||||
options=("!emptydirs")
|
||||
install="${pkgname}.install"
|
||||
source=("https://${pkgname}.org/releases/${pkgname}-${pkgver}.tar.xz"
|
||||
"${pkgname}-2.4.9-abs.patch"
|
||||
"enchant-2.x.patch"
|
||||
"icu59.patch"
|
||||
"pkgconfig-enchant-2.patch")
|
||||
sha256sums=("588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7"
|
||||
"e40f1e08665e1646ebc490141678f26c9c4a2792207fdf7c05978547eae9f61c"
|
||||
"7e37e059f071aaef93e387675de1a0c6a3dcf61ef67a3221a078caca69e22079"
|
||||
"4e94e35b036f8a87a64e02d747d4103c0553dfe637fda372785c2b95211445ca"
|
||||
"a1e2f24b28273746b2fbaecef42495f6314c76b16a446c22dc123e6a3afb58c8")
|
||||
|
||||
prepare() {
|
||||
mkdir build-gtk{,2} path
|
||||
ln -s /usr/bin/python2 path/python
|
||||
mkdir -p "${srcdir}/build-gtk" "${srcdir}/path"
|
||||
ln -rTsf "/usr/bin/python2" "${srcdir}/path/python"
|
||||
|
||||
cd $pkgbase-$pkgver
|
||||
patch -Np1 -i ../webkitgtk-2.4.9-abs.patch
|
||||
patch -Np1 -i ../icu59.patch
|
||||
patch -Np1 -i ../enchant-2.x.patch
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -Np1 -i "${srcdir}/${pkgname}-2.4.9-abs.patch"
|
||||
patch -Np1 -i "${srcdir}/enchant-2.x.patch"
|
||||
patch -Np1 -i "${srcdir}/icu59.patch"
|
||||
# https://www.archlinux.org/todo/enchant-221-rebuild/
|
||||
patch -Np1 -i ../pkgconfig-enchant-2.patch
|
||||
patch -Np1 -i "${srcdir}/pkgconfig-enchant-2.patch"
|
||||
|
||||
# Needed as autotools-related files are patched
|
||||
autoreconf -ifv
|
||||
}
|
||||
|
||||
_build() (
|
||||
_ver="$1"; shift
|
||||
cd build-${_ver}
|
||||
build() (
|
||||
cd "${srcdir}/build-gtk"
|
||||
|
||||
PATH="$srcdir/path:$PATH"
|
||||
PATH="${srcdir}/path:${PATH}"
|
||||
|
||||
CXXFLAGS+=" -fno-delete-null-pointer-checks"
|
||||
CFLAGS+=" -fno-delete-null-pointer-checks"
|
||||
|
||||
CFLAGS+=" -Wno-expansion-to-defined"
|
||||
CXXFLAGS+=" -Wno-expansion-to-defined"
|
||||
CFLAGS+=" -Wno-expansion-to-defined -Wno-class-memaccess"
|
||||
CXXFLAGS+=" -Wno-expansion-to-defined -Wno-class-memaccess"
|
||||
|
||||
../$pkgbase-$pkgver/configure --prefix=/usr \
|
||||
--libexecdir=/usr/lib/webkit${_ver} \
|
||||
"${srcdir}/${pkgname}-${pkgver}/configure" \
|
||||
--prefix=/usr \
|
||||
--libexecdir=/usr/lib/${pkgname} \
|
||||
--enable-introspection \
|
||||
--disable-webkit2 \
|
||||
--disable-gtk-doc \
|
||||
"$@"
|
||||
--disable-gtk-doc
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=655517
|
||||
sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
sed -i "s/ -shared / -Wl,-O1,--as-needed\0/g" "${srcdir}/build-gtk/libtool"
|
||||
|
||||
make all stamp-po
|
||||
)
|
||||
|
||||
build() {
|
||||
_build gtk
|
||||
_build gtk2 --with-gtk=2.0
|
||||
}
|
||||
|
||||
package_webkitgtk() {
|
||||
pkgdesc+=" for GTK+ 3"
|
||||
depends+=(gtk3)
|
||||
optdepends+=('gtk2: Netscape plugin support')
|
||||
provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
|
||||
conflicts=(webkitgtk3 libwebkit3)
|
||||
replaces=(webkitgtk3 libwebkit3)
|
||||
|
||||
make -C build-gtk -j1 DESTDIR="$pkgdir" install
|
||||
install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
|
||||
"$pkgdir/usr/share/licenses/webkitgtk/LICENSE"
|
||||
}
|
||||
|
||||
package_webkitgtk2() {
|
||||
pkgdesc+=" for GTK+ 2"
|
||||
depends+=(gtk2)
|
||||
provides=("libwebkit=${pkgver}")
|
||||
conflicts=(libwebkit)
|
||||
replaces=(libwebkit)
|
||||
|
||||
make -C build-gtk2 -j1 DESTDIR="$pkgdir" install
|
||||
install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
|
||||
"$pkgdir/usr/share/licenses/webkitgtk2/LICENSE"
|
||||
package() {
|
||||
make -C "${srcdir}/build-gtk" DESTDIR="${pkgdir}" install
|
||||
install -Dm644 "${srcdir}/${pkgname}-${pkgver}/Source/WebKit/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
--- webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp.orig 2017-12-06 14:59:40.768262788 -0500
|
||||
+++ webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2017-12-06 15:03:10.000000000 -0500
|
||||
@@ -128,7 +128,7 @@
|
||||
diff --git a/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp b/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp
|
||||
index d2d2c6f..905ca5b 100644
|
||||
--- a/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp
|
||||
+++ b/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp
|
||||
@@ -128,7 +128,7 @@ Vector<String> TextCheckerEnchant::getGuessesForWord(const String& word)
|
||||
for (i = 0; i < numberOfSuggestions; i++)
|
||||
guesses.append(String::fromUTF8(suggestions[i]));
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
--- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100
|
||||
+++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200
|
||||
diff --git a/Source/JavaScriptCore/API/JSStringRef.h b/Source/JavaScriptCore/API/JSStringRef.h
|
||||
index aded736..30a6b73 100644
|
||||
--- a/Source/JavaScriptCore/API/JSStringRef.h
|
||||
+++ b/Source/JavaScriptCore/API/JSStringRef.h
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <stdbool.h>
|
||||
#endif
|
||||
@@ -8,14 +10,19 @@
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -46,4 +47,4 @@
|
||||
@@ -43,7 +44,7 @@ extern "C" {
|
||||
@typedef JSChar
|
||||
@abstract A Unicode character.
|
||||
*/
|
||||
- typedef unsigned short JSChar;
|
||||
+ typedef char16_t JSChar;
|
||||
#else
|
||||
typedef wchar_t JSChar;
|
||||
#endif
|
||||
--- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100
|
||||
+++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200
|
||||
diff --git a/Source/WebKit2/Shared/API/c/WKString.h b/Source/WebKit2/Shared/API/c/WKString.h
|
||||
index dd5b877..2df4a3b 100644
|
||||
--- a/Source/WebKit2/Shared/API/c/WKString.h
|
||||
+++ b/Source/WebKit2/Shared/API/c/WKString.h
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
#include <WebKit2/WKBase.h>
|
||||
@@ -24,7 +31,7 @@
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdbool.h>
|
||||
@@ -39,7 +40,7 @@
|
||||
@@ -39,7 +40,7 @@ extern "C" {
|
||||
|
||||
#if !defined(WIN32) && !defined(_WIN32) \
|
||||
&& !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
--- webkitgtk-2.4.11/Source/autotools/FindDependencies.m4.orig 2018-01-19 23:47:23.866875328 +0800
|
||||
+++ webkitgtk-2.4.11/Source/autotools/FindDependencies.m4 2018-01-19 23:47:34.543576202 +0800
|
||||
@@ -154,7 +154,7 @@
|
||||
diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4
|
||||
index 60ee32d..cf1019f 100644
|
||||
--- a/Source/autotools/FindDependencies.m4
|
||||
+++ b/Source/autotools/FindDependencies.m4
|
||||
@@ -154,7 +154,7 @@ AC_SUBST(PANGO_CFLAGS)
|
||||
AC_SUBST(PANGO_LIBS)
|
||||
|
||||
if test "$enable_spellcheck" = "yes"; then
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
|
||||
--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600
|
||||
+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700
|
||||
@@ -85,8 +85,8 @@
|
||||
diff --git a/Source/WebCore/platform/gtk/GtkClickCounter.cpp b/Source/WebCore/platform/gtk/GtkClickCounter.cpp
|
||||
index baa8917..7db658c 100644
|
||||
--- a/Source/WebCore/platform/gtk/GtkClickCounter.cpp
|
||||
+++ b/Source/WebCore/platform/gtk/GtkClickCounter.cpp
|
||||
@@ -85,8 +85,8 @@ int GtkClickCounter::clickCountForGdkButtonEvent(GtkWidget* widget, GdkEventButt
|
||||
guint32 eventTime = getEventTime(event);
|
||||
|
||||
if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
|
||||
@@ -12,10 +13,11 @@ diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp w
|
||||
&& (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
|
||||
&& (buttonEvent->button == m_previousClickButton)))
|
||||
m_currentClickCount++;
|
||||
diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
|
||||
--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600
|
||||
+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700
|
||||
@@ -659,7 +659,7 @@
|
||||
diff --git a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp b/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
|
||||
index 30d7d13..2563be6 100644
|
||||
--- a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
|
||||
+++ b/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
|
||||
@@ -659,7 +659,7 @@ String localizedMediaTimeDescription(float time)
|
||||
if (!std::isfinite(time))
|
||||
return String::fromUTF8(_("indefinite time"));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user