From c19ff1fd47adef6a1171673b4789c7e6d6f3798c Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Thu, 15 Mar 2018 20:58:48 -0500 Subject: Removing nonprism/webkitgtk --- nonprism/webkitgtk/PKGBUILD | 93 ---------------------------- nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch | 26 -------- nonprism/webkitgtk/webkitgtk.install | 14 ----- 3 files changed, 133 deletions(-) delete mode 100644 nonprism/webkitgtk/PKGBUILD delete mode 100644 nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch delete mode 100644 nonprism/webkitgtk/webkitgtk.install diff --git a/nonprism/webkitgtk/PKGBUILD b/nonprism/webkitgtk/PKGBUILD deleted file mode 100644 index 250f5ca78..000000000 --- a/nonprism/webkitgtk/PKGBUILD +++ /dev/null @@ -1,93 +0,0 @@ -# $Id: PKGBUILD 286949 2017-01-18 21:06:40Z heftig $ -# Maintainer (Arch): Andreas Radke -# Maintainer: André Silva - -pkgbase=webkitgtk -pkgname=(webkitgtk webkitgtk2) -pkgver=2.4.11 -pkgrel=4.nonprism2 -pkgdesc="Legacy Web content engine" -arch=(i686 x86_64) -url="https://webkitgtk.org/" -license=(custom) -depends=(libxt libxslt sqlite libsoup enchant libgl gst-plugins-base-libs - libsecret libwebp harfbuzz-icu 'icu=59.1') -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=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz - webkitgtk-2.4.9-abs.patch) -sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7' - 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70') - -prepare() { - mkdir build-gtk{,2} path - ln -s /usr/bin/python2 path/python - - cd $pkgbase-$pkgver - patch -Np1 -i ${srcdir}/webkitgtk-2.4.9-abs.patch - - # fix icu-59.1 build issues - sed -i 's/unsigned short/char16_t/' \ - Source/JavaScriptCore/API/JSStringRef.h \ - Source/WebKit2/Shared/API/c/WKString.h - - sed -i '/stdbool.h/ a#include ' \ - Source/JavaScriptCore/API/JSBase.h -} - -_build() ( - _ver="$1"; shift - cd build-${_ver} - - PATH="$srcdir/path:$PATH" - - CXXFLAGS+=" -fno-delete-null-pointer-checks" - CFLAGS+=" -fno-delete-null-pointer-checks" - - ../$pkgbase-$pkgver/configure --prefix=/usr \ - --libexecdir=/usr/lib/webkit${_ver} \ - --enable-introspection \ - --disable-webkit2 \ - --disable-gtk-doc \ - --disable-geolocation \ - "$@" - - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make all stamp-po -) - -build() { - _build gtk - _build gtk2 --with-gtk=2.0 -} - -package_webkitgtk() { - pkgdesc+=" for GTK+ 3, without geoclue2 support" - 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, without geoclue2 support" - 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" -} diff --git a/nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch b/nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch deleted file mode 100644 index 9a1c5f990..000000000 --- a/nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 @@ - 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) -+ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) -+ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) - && (eventTime - m_previousClickTime < static_cast(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 @@ - if (!std::isfinite(time)) - return String::fromUTF8(_("indefinite time")); - -- int seconds = static_cast(abs(time)); -+ int seconds = static_cast(fabs(time)); - int days = seconds / (60 * 60 * 24); - int hours = seconds / (60 * 60); - int minutes = (seconds / 60) % 60; diff --git a/nonprism/webkitgtk/webkitgtk.install b/nonprism/webkitgtk/webkitgtk.install deleted file mode 100644 index 245d07b19..000000000 --- a/nonprism/webkitgtk/webkitgtk.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - post_upgrade $1 0 -} - -post_upgrade() { - if (( $(vercmp $2 2.4.11-4) < 0)); then - cat < WARNING: WebKitGTK+ 2.4 is known to have many security vulnerabilities that - will NOT be fixed. Avoid browsing with it. - -END - fi -} -- cgit v1.2.3