diff --git a/common/shlibs b/common/shlibs index 076d4cff4bf..e6a906e49b1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -473,14 +473,13 @@ libgconf-2.so.4 GConf-2.32.0_1 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 -libwebkit-1.0.so webkit-gtk-1.3.12_1 -libwebkitgtk-1.0.so.0 webkit-gtk-1.3.12_1 +libwebkitgtk-1.0.so.0 webkitgtk2-2.4.8_2 libwebkitgtk-3.0.so.0 webkitgtk-2.0.0_1 -libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1 -libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1 -libjavascriptcoregtk-1.0.so.0 webkit-gtk-1.3.12_1 -libjavascriptcoregtk-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.8.10_3 libgimpwidgets-2.0.so.0 libgimp-2.8.10_3 libgimpui-2.0.so.0 libgimp-2.8.10_3 diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index 7b5d5fa8641..bc8566e528a 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,7 +1,7 @@ # Template build file for 'gimp'. pkgname=gimp version=2.8.14 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure configure_args="--without-aa --without-gvfs --enable-gimp-console @@ -9,7 +9,7 @@ configure_args="--without-aa --without-gvfs --enable-gimp-console hostmakedepends="pkg-config intltool" makedepends="libpng-devel>=1.6 gtk+-devel lcms2-devel alsa-lib-devel dbus-glib-devel libXmu-devel libXcursor-devel - libexif-devel libsoup-devel webkit-gtk-devel libwmf-devel librsvg-devel + libexif-devel libsoup-devel webkitgtk2-devel libwmf-devel librsvg-devel libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel iso-codes" short_desc="The GNU image manipulation program" diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index d69f5324f99..bc863db1722 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,14 +1,14 @@ # Template file for 'gnucash' pkgname=gnucash version=2.6.5 -revision=2 +revision=3 conf_files=" /etc/gnucash/config /etc/gnucash/environment" hostmakedepends="pkg-config intltool guile" makedepends=" gmp-devel gtk+-devel libxml2-devel libxslt-devel libgnomecanvas-devel - goffice0.8-devel libgsf-devel GConf-devel webkit-gtk-devel gc-devel guile-devel + goffice0.8-devel libgsf-devel GConf-devel webkitgtk2-devel gc-devel guile-devel aqbanking-devel aqbanking libofx-devel gwenhywfar-devel gwenhywfar-gtk python-devel" depends="guile dconf" build_style="gnu-configure" diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template index da41f867891..763a1aa6444 100644 --- a/srcpkgs/luakit/template +++ b/srcpkgs/luakit/template @@ -3,9 +3,9 @@ pkgname=luakit _distver=2012.09.13 _patchver=r1 version=${_distver}.${_patchver} -revision=2 +revision=3 hostmakedepends="pkg-config help2man git" -makedepends="webkit-gtk-devel lua-devel luafilesystem libunique1-devel sqlite-devel LuaJIT-devel" +makedepends="webkitgtk2-devel lua-devel luafilesystem libunique1-devel sqlite-devel LuaJIT-devel" depends="desktop-file-utils luafilesystem" conf_files=" /etc/xdg/luakit/webview.lua diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template index e847d36a409..d140c23551c 100644 --- a/srcpkgs/surf/template +++ b/srcpkgs/surf/template @@ -1,11 +1,11 @@ # Template file for 'surf' pkgname=surf version=0.6 -revision=3 +revision=4 build_style=gnu-makefile make_install_args="PREFIX=/usr" hostmakedepends="pkg-config" -makedepends="webkit-gtk-devel" +makedepends="webkitgtk2-devel" short_desc="Simple web browser based on WebKit/GTK+" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/vimb/template b/srcpkgs/vimb/template index b589bcbd01b..9057a204591 100644 --- a/srcpkgs/vimb/template +++ b/srcpkgs/vimb/template @@ -5,7 +5,7 @@ revision=3 build_style=gnu-makefile make_build_args="$(vopt_if gtk3 GTK=3)" hostmakedepends="pkg-config" -makedepends="$(vopt_if gtk3 webkitgtk-devel webkit-gtk-devel)" +makedepends="$(vopt_if gtk3 webkitgtk-devel webkitgtk2-devel)" short_desc="Fast and lightweight web browser based on WebKit/GTK+" maintainer="Eivind Uggedal " license="GPL-3" diff --git a/srcpkgs/webkit-gtk/template b/srcpkgs/webkit-gtk/template deleted file mode 100644 index 15657da8f9b..00000000000 --- a/srcpkgs/webkit-gtk/template +++ /dev/null @@ -1,36 +0,0 @@ -# Template file for 'webkit-gtk' -pkgname=webkit-gtk -version=1.10.2 -revision=7 -wrksrc="webkitgtk-${version}" -build_style=gnu-configure -configure_args="--enable-jit --with-font-backend=freetype --with-gtk=2.0 - --enable-introspection --disable-webkit2 --with-unicode-backend=icu - --disable-schemas-compile --disable-silent-rules --disable-gtk-doc-html" -hostmakedepends="perl pkg-config intltool which gperf flex ruby gtk-doc" -makedepends="libjpeg-turbo-devel libpng-devel>=1.6 libXcomposite-devel - sqlite-devel gtk+-devel gobject-introspection dbus-glib-devel - libXt-devel gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel>=54 - enchant-devel geoclue-devel" -short_desc="GTK+ port of the WebKit browser engine" -maintainer="Juan RP " -homepage="http://webkitgtk.org/" -license="LGPL-2.1, Simplified BSD (2 clause)" -distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c - -post_install() { - # Remove conflicting files with webkitgtk-devel. - rm -rf ${DESTDIR}/usr/share/gtk-doc -} - -webkit-gtk-devel_package() { - depends="libglib-devel gtk+-devel libsoup-devel webkit-gtk-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/share/gir-1.0 - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template index 79e934592a5..32c6c5054c3 100644 --- a/srcpkgs/webkitgtk/template +++ b/srcpkgs/webkitgtk/template @@ -1,9 +1,9 @@ # Template file for 'webkitgtk' pkgname=webkitgtk version=2.4.8 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-gtk-doc --with-gtk=3.0 --disable-schemas-compile +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" @@ -34,8 +34,43 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" fi +# 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 + 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() { @@ -51,3 +86,30 @@ webkitgtk-devel_package() { vmove usr/share/gtk-doc } } + +webkitgtk2_package() { + short_desc="${short_desc/3/2}" + replaces="webkit-gtk>=0" + 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" + replaces="webkit-gtk-devel>=0" + 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 + } +} diff --git a/srcpkgs/webkitgtk2 b/srcpkgs/webkitgtk2 new file mode 120000 index 00000000000..f1f77c4975f --- /dev/null +++ b/srcpkgs/webkitgtk2 @@ -0,0 +1 @@ +webkitgtk \ No newline at end of file diff --git a/srcpkgs/webkitgtk2-devel b/srcpkgs/webkitgtk2-devel new file mode 120000 index 00000000000..f1f77c4975f --- /dev/null +++ b/srcpkgs/webkitgtk2-devel @@ -0,0 +1 @@ +webkitgtk \ No newline at end of file diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template index 65bd637be77..316c731beb4 100644 --- a/srcpkgs/wxPython/template +++ b/srcpkgs/wxPython/template @@ -1,12 +1,12 @@ # Template file for 'wxPython' pkgname=wxPython version=3.0.2.0 -revision=1 +revision=2 wrksrc="${pkgname}-src-${version}" hostmakedepends="pkg-config" makedepends=" zlib-devel libpng-devel libjpeg-turbo-devel tiff-devel expat-devel gtk+-devel - libSM-devel MesaLib-devel glu-devel webkit-gtk-devel gst-plugins-base-devel + libSM-devel MesaLib-devel glu-devel webkitgtk2-devel gst-plugins-base-devel libnotify-devel python-devel wxWidgets-devel" depends="python" pycompile_module="wx-3.0-gtk2 wxversion.py"