webkitgtk: remove.
This commit is contained in:
maxice8
Enno Boland
parent
4f91a6112c
commit
977f88d9e0
|
|
@ -544,11 +544,8 @@ libsoup-2.4.so.1 libsoup-2.34.0_1
|
|||
libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1
|
||||
libunique-3.0.so.0 libunique-2.91.4_1
|
||||
libwebkitgtk-1.0.so.0 webkitgtk2-2.4.8_2
|
||||
libwebkitgtk-3.0.so.0 webkitgtk-2.0.0_1
|
||||
libwebkit2gtk-3.0.so.25 webkitgtk-2.0.0_1
|
||||
libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1
|
||||
libjavascriptcoregtk-1.0.so.0 webkitgtk2-2.4.8_2
|
||||
libjavascriptcoregtk-3.0.so.0 webkitgtk-2.0.0_1
|
||||
libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1
|
||||
libgimp-2.0.so.0 libgimp-2.10.0_1
|
||||
libgimpwidgets-2.0.so.0 libgimp-2.10.0_1
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
webkitgtk
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- Source/WTF/wtf/DisallowCType.h.orig 2014-04-07 06:37:46.851957952 +0000
|
||||
+++ Source/WTF/wtf/DisallowCType.h 2014-04-07 06:39:30.653205023 +0000
|
||||
@@ -41,7 +41,7 @@
|
||||
// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
|
||||
// isacii().
|
||||
#include <wtf/Platform.h>
|
||||
-#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION)
|
||||
+#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) && defined(__GLIBC__)
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
Disambiguate abs() for gcc6 build.
|
||||
|
||||
--- Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-04-10 08:48:37.000000000 +0200
|
||||
+++ Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-09-12 23:01:44.285579470 +0200
|
||||
@@ -85,8 +85,8 @@
|
||||
guint32 eventTime = getEventTime(event);
|
||||
|
||||
if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
|
||||
- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
|
||||
- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
|
||||
+ || ((abs((int)(buttonEvent->x - m_previousClickPoint.x())) < doubleClickDistance)
|
||||
+ && (abs((int)(buttonEvent->y - m_previousClickPoint.y())) < doubleClickDistance)
|
||||
&& (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
|
||||
&& (buttonEvent->button == m_previousClickButton)))
|
||||
m_currentClickCount++;
|
||||
--- Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-04-10 08:48:37.000000000 +0200
|
||||
+++ Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-09-12 23:05:01.712760609 +0200
|
||||
@@ -659,7 +659,7 @@
|
||||
if (!std::isfinite(time))
|
||||
return String::fromUTF8(_("indefinite time"));
|
||||
|
||||
- int seconds = static_cast<int>(abs(time));
|
||||
+ int seconds = abs(static_cast<int>(time));
|
||||
int days = seconds / (60 * 60 * 24);
|
||||
int hours = seconds / (60 * 60);
|
||||
int minutes = (seconds / 60) % 60;
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
--- Source/WTF/wtf/Assertions.cpp
|
||||
+++ Source/WTF/wtf/Assertions.cpp
|
||||
@@ -64,7 +64,7 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
|
||||
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
|
||||
#include <cxxabi.h>
|
||||
#include <dlfcn.h>
|
||||
#include <execinfo.h>
|
||||
@@ -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
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
--- Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100
|
||||
+++ Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <stdbool.h>
|
||||
#endif
|
||||
#include <stddef.h> /* for size_t */
|
||||
+#include <uchar.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -46,7 +47,7 @@
|
||||
character. As with all scalar types, endianness depends on the underlying
|
||||
architecture.
|
||||
*/
|
||||
- typedef unsigned short JSChar;
|
||||
+ typedef char16_t JSChar;
|
||||
#else
|
||||
typedef wchar_t JSChar;
|
||||
#endif
|
||||
--- Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100
|
||||
+++ Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
#include <WebKit/WKBase.h>
|
||||
#include <stddef.h>
|
||||
+#include <uchar.h>
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdbool.h>
|
||||
@@ -39,7 +40,7 @@
|
||||
|
||||
#if !defined(WIN32) && !defined(_WIN32) \
|
||||
&& !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
|
||||
- typedef unsigned short WKChar;
|
||||
+ typedef char16_t WKChar;
|
||||
#else
|
||||
typedef wchar_t WKChar;
|
||||
#endif
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
# Template file for 'webkitgtk'
|
||||
pkgname=webkitgtk
|
||||
version=2.4.11
|
||||
revision=7
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-gtk-doc --disable-schemas-compile
|
||||
--enable-accelerated-compositing $(vopt_enable gir introspection)
|
||||
$(vopt_enable wayland wayland-target) $(vopt_enable x11 x11-target)"
|
||||
short_desc="GTK+3 port of the WebKit browser engine"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://webkitgtk.org/"
|
||||
license="LGPL-2.1, 2-clause-BSD"
|
||||
distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
|
||||
checksum=588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
|
||||
|
||||
# ETOOHUGE
|
||||
nodebug=1
|
||||
|
||||
hostmakedepends="automake libtool perl python pkg-config intltool gperf flex
|
||||
ruby glib-devel geoclue2 gtk-doc $(vopt_if gir gobject-introspection)"
|
||||
makedepends="
|
||||
libatomic-devel at-spi2-core-devel libjpeg-turbo-devel libpng-devel sqlite-devel
|
||||
harfbuzz-devel gst-plugins-base1-devel libsoup-devel libxslt-devel
|
||||
icu-devel enchant-devel dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel
|
||||
libgudev-devel libsecret-devel MesaLib-devel geoclue2-devel
|
||||
$(vopt_if wayland 'libxkbcommon-devel wayland-devel libwayland-egl')
|
||||
$(vopt_if x11 libXt-devel)"
|
||||
|
||||
# Package build options
|
||||
build_options="gir wayland x11"
|
||||
# Disable gir for cross builds.
|
||||
build_options_default="x11"
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
build_options_default+=" gir"
|
||||
fi
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
armv5*|aarch64*|mips*)
|
||||
CFLAGS+=" -DENABLE_YARR_JIT=0"
|
||||
CXXFLAGS+=" -DENABLE_YARR_JIT=0"
|
||||
configure_args+=" --disable-jit"
|
||||
;;
|
||||
esac
|
||||
|
||||
CFLAGS+=" -Wno-expansion-to-defined"
|
||||
CXXFLAGS+=" -Wno-expansion-to-defined"
|
||||
|
||||
# Explicit order since webkitgtk2-devel depends on webkitgtk2
|
||||
subpackages="webkitgtk-devel webkitgtk2 webkitgtk2-devel"
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
|
||||
local v
|
||||
for v in 3.0 2.0; do
|
||||
mkdir -p /tmp/$v
|
||||
cp -a $wrksrc/* /tmp/$v
|
||||
done
|
||||
rm -r $wrksrc/*
|
||||
for v in 3.0 2.0; do
|
||||
mv /tmp/$v $wrksrc/$v
|
||||
done
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
local v
|
||||
for v in 3.0 2.0; do
|
||||
cd $wrksrc/$v
|
||||
|
||||
if [ $v = 2.0 ]; then
|
||||
configure_args+=" --disable-webkit2"
|
||||
fi
|
||||
./configure $configure_args --with-gtk=${v}
|
||||
done
|
||||
}
|
||||
|
||||
do_build() {
|
||||
local v
|
||||
for v in 3.0 2.0; do
|
||||
cd $wrksrc/$v
|
||||
make $makejobs
|
||||
done
|
||||
}
|
||||
|
||||
do_install() {
|
||||
cd $wrksrc/3.0
|
||||
make DESTDIR=$DESTDIR install
|
||||
}
|
||||
|
||||
webkitgtk-devel_package() {
|
||||
depends="gtk+3-devel libsoup-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
if [ "$build_option_gir" ]; then
|
||||
vmove usr/share/gir-1.0
|
||||
fi
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/share/gtk-doc
|
||||
}
|
||||
}
|
||||
|
||||
webkitgtk2_package() {
|
||||
short_desc="${short_desc/3/2}"
|
||||
pkg_install() {
|
||||
cd $wrksrc/2.0
|
||||
make DESTDIR=$PKGDESTDIR install
|
||||
}
|
||||
}
|
||||
|
||||
webkitgtk2-devel_package() {
|
||||
depends="gtk+-devel libsoup-devel webkitgtk2>=${version}_${revision}"
|
||||
short_desc="${short_desc/3/2} - development files"
|
||||
pkg_install() {
|
||||
local parent=$PKGDESTDIR/../webkitgtk2-${version}
|
||||
|
||||
install -d $PKGDESTDIR/usr/{lib,share}
|
||||
mv $parent/usr/include $PKGDESTDIR/usr
|
||||
mv $parent/usr/lib/pkgconfig $PKGDESTDIR/usr/lib
|
||||
if [ "$build_option_gir" ]; then
|
||||
mv $parent/usr/share/gir-1.0 $PKGDESTDIR/usr/share
|
||||
fi
|
||||
mv $parent/usr/lib/*.so $PKGDESTDIR/usr/lib
|
||||
mv $parent/usr/share/gtk-doc $PKGDESTDIR/usr/share
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
ignore="*.[13579].* [!2].* 2.[!4].* 2.??.*"
|
||||
Loading…
Reference in New Issue