jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

webkit-gtk: update to 1.4.2, unify gtk2 version in subpkgs.

Browse source
This commit is contained in:
Juan RP 2011-07-07 17:20:02 +02:00
parent b39eb62faa
commit 182355ecfb
10 changed files with 111 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/webkit-gtk Symbolic link
View file

@ -0,0 +1 @@
webkit-gtk3

2
srcpkgs/webkit-gtk-devel
View file

@ -1 +1 @@
webkit-gtk
webkit-gtk3

2
srcpkgs/webkit-gtk/depends
View file

@ -1,2 +0,0 @@
abi_depends=">=1.1.6"
api_depends="${abi_depends}"

22
srcpkgs/webkit-gtk/patches/introspection.patch
View file

@ -1,22 +0,0 @@
--- WebKit/gtk/JSCore-1.0.gir.o 2010-09-29 14:54:07.000000000 +0200
+++ WebKit/gtk/JSCore-1.0.gir 2010-09-29 15:57:06.000000000 +0200
@@ -1,12 +1,14 @@
<?xml version="1.0"?>
-<repository version="1.0"
+<repository version="1.2"
xmlns="http://www.gtk.org/introspection/core/1.0"
xmlns:c="http://www.gtk.org/introspection/c/1.0">
<namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
- <alias name="GlobalContextRef"
- target="none"
- c:type="JSGlobalContextRef"/>
- <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
+ <alias name="GlobalContextRef" target="none">
+ <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
+ </alias>
+ <alias name="ObjectRef" target="none">
+ <type name="JSObjectRef" c:type="JSObjectRef"/>
+ </alias>
<function name="EvaluateScript" c:identifier="JSEvaluateScript">
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>

80
srcpkgs/webkit-gtk/template
View file

@ -1,80 +0,0 @@
# Template file for 'webkit-gtk'
pkgname=webkit-gtk
version=1.2.7
revision=2
wrksrc=webkit-${version}
distfiles="http://www.webkitgtk.org/webkit-${version}.tar.gz"
build_style=gnu_configure
configure_args="--with-target=x11 --enable-3D-transforms
--enable-channel-messaging --with-font-backend=freetype
--enable-jit --enable-introspection --enable-video
--with-unicode-backend=icu"
short_desc="GTK2 port of the WebKit browser engine"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=228a80b3f0132db1342708e8ef7738996f05e30393e0187acf4cab987283718b
long_desc="
WebKit is an open source web browser engine. WebKit is also the name of
the Mac OS X system framework version of the engine that's used by
Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML
and JavaScript code began as a branch of the KHTML and KJS libraries
from KDE.
This is the GTK2+ port of the engine."
subpackages="$pkgname-devel"
Add_dependency run libgcc
Add_dependency run glibc
Add_dependency run libstdc++
Add_dependency run enchant
Add_dependency run gdk-pixbuf
Add_dependency run gtk+
Add_dependency run gst-plugins-base
Add_dependency run gstreamer
Add_dependency run glib
Add_dependency run atk
Add_dependency run pango
Add_dependency run cairo
Add_dependency run jpeg
Add_dependency run libsoup
Add_dependency run libxslt
Add_dependency run zlib
Add_dependency run libxml2
Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run libpng
Add_dependency run sqlite
Add_dependency run icu-libs
Add_dependency run libXt
Add_dependency run libX11
Add_dependency run libSM
Add_dependency run libICE
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gperf
Add_dependency build flex
Add_dependency build enchant-devel
Add_dependency build gtk+-devel
Add_dependency build gst-plugins-base-devel
Add_dependency build gstreamer-devel
Add_dependency build glib-devel
Add_dependency build atk-devel
Add_dependency build pango-devel
Add_dependency build cairo-devel
Add_dependency build jpeg-devel
Add_dependency build libsoup-devel
Add_dependency build libxslt-devel
Add_dependency build zlib-devel
Add_dependency build libxml2-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
Add_dependency build libpng-devel
Add_dependency build sqlite-devel
Add_dependency build icu-devel
Add_dependency build libXt-devel
Add_dependency build libX11-devel
Add_dependency build libSM-devel
Add_dependency build libICE-devel
Add_dependency build libstdc++-devel
Add_dependency build gobject-introspection

45
srcpkgs/webkit-gtk3/patches/replace-switch-with-given-when.patch
View file

@ -1,45 +0,0 @@
diff -upr webkit-1.4.0.orig/Source/WebCore/make-hash-tools.pl webkit-1.4.0/Source/WebCore/make-hash-tools.pl
--- webkit-1.4.0.orig/Source/WebCore/make-hash-tools.pl 2011-04-25 22:27:15.000000000 +0300
+++ webkit-1.4.0/Source/WebCore/make-hash-tools.pl 2011-06-02 00:41:26.000000000 +0300
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
use strict;
-use Switch;
+use feature 'switch';
use File::Basename;
my $outdir = $ARGV[0];
@@ -28,9 +28,9 @@ shift;
my $option = basename($ARGV[0],".gperf");
-switch ($option) {
+given ($option) {
-case "DocTypeStrings" {
+when ("DocTypeStrings") {
my $docTypeStringsGenerated = "$outdir/DocTypeStrings.cpp";
my $docTypeStringsGperf = $ARGV[0];
@@ -38,9 +38,9 @@ case "DocTypeStrings" {
system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
-} # case "DocTypeStrings"
+} # when ("DocTypeStrings")
-case "ColorData" {
+when ("ColorData") {
my $colorDataGenerated = "$outdir/ColorData.cpp";
my $colorDataGperf = $ARGV[0];
@@ -48,6 +48,6 @@ case "ColorData" {
system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
-} # case "ColorData"
+} # when ("ColorData")
-} # switch ($option)
+} # given ($option)

46
srcpkgs/webkit-gtk3/template
View file

@ -1,18 +1,15 @@
# Template file for 'webkit-gtk3'
pkgname=webkit-gtk3
version=1.4.1
version=1.4.2
patch_args="-Np1"
wrksrc=webkit-${version}
homepage="http://webkitgtk.org/"
license="LGPL-2.1, Simplified BSD (2 clause)"
distfiles="${homepage}/webkit-${version}.tar.gz"
build_style=gnu_configure
configure_args="--enable-video --with-gtk=3.0 --enable-jit
--enable-3d-transforms --with-font-backend=freetype --enable-introspection
--with-unicode-backend=icu --disable-schemas-compile"
build_style=custom-install
short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=d0db4f6c8e4dd73ebb7fd34c8ca21b0b3b245ac7162d884e789a2104ca631c64
checksum=dee6336b5366e952f67a18a66dca2edce95a8e70f591dbc7fc30cf30b5fdb9ba
long_desc="
WebKit is an open source web browser engine. WebKit is also the name of
the Mac OS X system framework version of the engine that's used by
@ -23,7 +20,7 @@ long_desc="
This is the GTK3+ port of the engine."
triggers="gsettings-schemas"
subpackages="$pkgname-devel"
subpackages="webkit-gtk webkit-gtk-devel $pkgname-devel"
Add_dependency run libgcc
Add_dependency run glibc
@ -49,6 +46,7 @@ Add_dependency run gstreamer
Add_dependency run gst-plugins-base
Add_dependency run enchant
Add_dependency run libsoup
Add_dependency run libXrender
Add_dependency build pkg-config
Add_dependency build intltool
@ -58,16 +56,12 @@ Add_dependency build gperf
Add_dependency build flex
Add_dependency build gobject-introspection
Add_dependency build enchant-devel
Add_dependency build gtk+-devel
Add_dependency build gtk+3-devel
Add_dependency build gst-plugins-base-devel
Add_dependency build gstreamer-devel
Add_dependency build atk-devel
Add_dependency build pango-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build cairo-devel
Add_dependency build gst-plugins-base-devel
Add_dependency build jpeg-devel
Add_dependency build libsoup-devel
Add_dependency build glib-devel
Add_dependency build libxslt-devel
Add_dependency build zlib-devel
Add_dependency build libxml2-devel
@ -78,3 +72,29 @@ Add_dependency build sqlite-devel
Add_dependency build icu-devel
Add_dependency build libXt-devel
Add_dependency build libX11-devel
Add_dependency build libXrender-devel
do_build()
{
local args="--enable-video --enable-jit --enable-3d-transforms \
--with-font-backend=freetype --enable-introspection \
--with-unicode-backend=icu --disable-schemas-compile \
${CONFIGURE_SHARED_ARGS}"
for ver in 2 3; do
[ ! -d build-gtk${ver} ] && mkdir build-gtk${ver}
msg_normal "Building GTK+${ver} version...\n"
cd ${wrksrc}/build-gtk${ver}
../configure ${args} --with-gtk=${ver}.0
make ${makejobs}
done
}
do_install()
{
for ver in 2 3; do
msg_normal "Installing GTK+${ver} version...\n"
cd ${wrksrc}/build-gtk${ver}
make DESTDIR=${DESTDIR} install
done
}

33
srcpkgs/webkit-gtk/webkit-gtk-devel.template → srcpkgs/webkit-gtk3/webkit-gtk-devel.template
View file

@ -1,23 +1,20 @@
# Template file for 'webkit-gtk-devel'.
#
short_desc="${sourcepkg} development files"
short_desc="GTK+ port of the WebKit browser engine - development files"
long_desc="${long_desc}
WebKit is an open source web browser engine. WebKit is also the name of
the Mac OS X system framework version of the engine that's used by
Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML
and JavaScript code began as a branch of the KHTML and KJS libraries
from KDE.
This package contains files for development, headers, static libs, etc."
Add_dependency run pkg-config
Add_dependency run intltool
Add_dependency run gperf
Add_dependency run flex
Add_dependency run gobject-introspection
Add_dependency run enchant-devel
Add_dependency run gdk-pixbuf-devel
Add_dependency run gtk+-devel
Add_dependency run gst-plugins-base-devel
Add_dependency run gstreamer-devel
Add_dependency run glib-devel
Add_dependency run atk-devel
Add_dependency run pango-devel
Add_dependency run cairo-devel
Add_dependency run gst-plugins-base-devel
Add_dependency run jpeg-devel
Add_dependency run libsoup-devel
Add_dependency run libxslt-devel
@ -30,15 +27,15 @@ Add_dependency run sqlite-devel
Add_dependency run icu-devel
Add_dependency run libXt-devel
Add_dependency run libX11-devel
Add_dependency run libSM-devel
Add_dependency run libICE-devel
Add_dependency run libstdc++-devel
Add_dependency run libXrender-devel
Add_dependency run webkit-gtk
do_install()
{
install -d ${DESTDIR}/usr/{lib,share}
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
vmkdir usr/lib/pkgconfig
vmkdir usr/share/gir-1.0
vmove usr/include/webkit-1.0 usr/include
vmove "usr/lib/pkgconfig/*-1.0.pc" usr/lib/pkgconfig
vmove "usr/share/gir-1.0/*-1.0.gir" usr/share/gir-1.0
}

56
srcpkgs/webkit-gtk3/webkit-gtk.template Normal file
View file

@ -0,0 +1,56 @@
# Template file for 'webkit-gtk'.
#
short_desc="GTK+ port of the WebKit browser engine"
long_desc="
WebKit is an open source web browser engine. WebKit is also the name of
the Mac OS X system framework version of the engine that's used by
Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML
and JavaScript code began as a branch of the KHTML and KJS libraries
from KDE.
This is the GTK+ port of the engine."
Add_dependency run libgcc
Add_dependency run glibc
Add_dependency run libstdc++
Add_dependency run glib
Add_dependency run atk
Add_dependency run pango
Add_dependency run cairo
Add_dependency run jpeg
Add_dependency run libxslt
Add_dependency run zlib
Add_dependency run libxml2
Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run libpng
Add_dependency run sqlite
Add_dependency run icu-libs
Add_dependency run libX11
Add_dependency run libXt
Add_dependency run gdk-pixbuf
Add_dependency run gtk+
Add_dependency run gstreamer
Add_dependency run gst-plugins-base
Add_dependency run enchant
Add_dependency run libsoup
Add_dependency run libXrender
triggers="gsettings-schemas"
do_install()
{
vmkdir usr/lib/girepository-1.0
vmove usr/bin/jsc-1 usr/bin
vmove "usr/lib/libwebkitgtk-1.0.so*" usr/lib
vmove "usr/lib/girepository-1.0/*-1.0.typelib" usr/lib/girepository-1.0
for f in $(echo ${SRCPKGDESTDIR}/usr/share/locale/*); do
vmove usr/share/locale/$(basename $f)/LC_MESSAGES/webkit-2.0.mo \
usr/share/locale/$(basename $f)/LC_MESSAGES
done
vmove usr/share/webkit-1.0 usr/share
vmove usr/share/webkitgtk-1.0 usr/share
vmove usr/share/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml \
usr/share/glib-2.0/schemas
}

17
srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
View file

@ -5,15 +5,9 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
revision=1
Add_dependency run pkg-config
Add_dependency run intltool
Add_dependency run gperf
Add_dependency run flex
Add_dependency run enchant-devel
Add_dependency run gdk-pixbuf-devel
Add_dependency run gtk+-devel
Add_dependency run gtk+3-devel
Add_dependency run gst-plugins-base-devel
Add_dependency run gstreamer-devel
Add_dependency run glib-devel
@ -34,13 +28,12 @@ Add_dependency run libXt-devel
Add_dependency run libX11-devel
Add_dependency run libSM-devel
Add_dependency run libICE-devel
Add_dependency run libstdc++-devel
Add_dependency run libXrender-devel
Add_dependency run webkit-gtk3
do_install()
{
install -d ${DESTDIR}/usr/{lib,share}
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
vmove usr/include usr
vmove usr/lib/pkgconfig usr/lib
vmove "usr/share/gir*" usr/share
}