[Lunar-commits] <moonbase-gnome3> webkitgtk+-3: rename it webkitgtk3. version bumped to 1.10.2.
Florin Braescu
florin at lunar-linux.org
Sun Mar 3 17:46:37 CET 2013
commit 4cdf9071f01f585686b4d94f61f86cb858fe2775
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun, 03 Mar 2013 08:46:37 -0800
URL: https://github.com/lunar-linux/moonbase-gnome3/commit/4cdf9071f01f585686b4d94f61f86cb858fe2775
webkitgtk+-3: rename it webkitgtk3. version bumped to 1.10.2.
---
apps/shotwell/DEPENDS | +1/-1
core/zenity/DEPENDS | +1/-1
libs/webkitgtk+-3/BUILD | +0/-39
libs/webkitgtk+-3/DEPENDS | +0/-22
libs/webkitgtk3/BUILD | +34/-0
libs/webkitgtk+-3/CONFIGURE -> libs/webkitgtk3/CONFIGURE
libs/webkitgtk3/DEPENDS | +33/-0
libs/webkitgtk3/DETAILS | +7/-10
8 files changed, 76 insertions(+), 73 deletions(-)
--- a/apps/shotwell/DEPENDS
+++ b/apps/shotwell/DEPENDS
@@ -7,6 +7,6 @@ depends libunique
depends librsvg
depends json-glib
depends gtk+-3
-depends webkitgtk+-3
+depends webkitgtk3
depends LibRaw
depends rest
--- a/core/zenity/DEPENDS
+++ b/core/zenity/DEPENDS
@@ -4,5 +4,5 @@ depends gtk+-3
depends itstool
optional_depends "libnotify4" "--enable-notify" "--disable-notify" "for libnotify support"
-#optional_depends "webkitgtk3" "--enable-webkitgtk" "--disable-webkitgtk" "for webkit support"
+optional_depends "webkitgtk3" "--enable-webkitgtk" "--disable-webkitgtk" "for webkit support"
--- a/libs/webkitgtk+-3/BUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-(
- patch_it $SOURCE2 1 &&
-
- OPTS+=" --with-target=x11 \
- --with-unicode-backend=icu \
- --with-font-backend=freetype \
- --enable-xslt \
- --enable-optimizations \
- --disable-glibtest \
- --with-gtk=3.0 \
- --enable-video \
- --disable-web-audio \
- --disable-gtk-doc-html" &&
-
- #make build work even if gtk-doc is not installed
- if ! module_installed gtk-doc ; then
- sed -i '/gtkdoc --rebase/s:^:# :' GNUmakefile.in
- fi &&
-
- #stolen from blfs, avoid race condition in build with multiple makes
- default_config &&
- error_count=0 &&
- until default_make
- do
- if (( $((error_count++)) > 4 )) ; then
- echo Too Many Errors &&
- break
- fi
- done &&
- unset error_count &&
- make install &&
- install 'Programs/GtkLauncher' '/usr/bin/Gtk3Launcher' &&
-
- # symlink plugin folder to a location webkit looks for it
- if [ ! -e "/usr/lib/browser-plugins" ]; then
- ln -sf /usr/lib/lunar/plugins /usr/lib/browser-plugins
- fi
-
-) > $C_FIFO 2>&1
--- a/libs/webkitgtk+-3/DEPENDS
+++ /dev/null
@@ -1,22 +0,0 @@
-depends gtk+-3
-depends icu4c
-depends gperf
-depends libxslt
-depends sqlite
-depends %JPEG
-depends libpng
-depends freetype2
-depends libsoup
-depends enchant
-depends gst-plugins-base
-
-# workaround for make_names.pl
-depends Switch
-
-# compile fails without this for 1.8.2 so --enable is in BUILD for now
-#optional_depends "gst-plugins-good" "--enable-video" "--disable-video" "for HTML5 video support"
-depends "gst-plugins-good"
-
-optional_depends "geoclue" "--enable-geolocation" "--disable-geolocation" "for geolocation support"
-optional_depends "gobject-introspection" "--enable-introspection" "--disable-introspection" "say Y for Epiphany, and possibly others"
-optional_depends "librsvg" "--enable-svg --enable-svg-fonts" "--disable-svg" "for svg graphics support"
--- /dev/null
+++ b/libs/webkitgtk3/BUILD
@@ -0,0 +1,34 @@
+OPTS+=" --with-target=x11 \
+ --with-unicode-backend=icu \
+ --with-font-backend=freetype \
+ --enable-xslt \
+ --enable-optimizations \
+ --disable-glibtest \
+ --with-gtk=3.0 \
+ --enable-video \
+ --disable-web-audio \
+ --disable-gtk-doc-html" &&
+
+#make build work even if gtk-doc is not installed
+if ! module_installed gtk-doc ; then
+ sed -i '/gtkdoc --rebase/s:^:# :' GNUmakefile.in
+fi &&
+
+#stolen from blfs, avoid race condition in build with multiple makes
+default_config &&
+error_count=0 &&
+until default_make
+do
+ if (( $((error_count++)) > 4 )) ; then
+ echo Too Many Errors &&
+ break
+ fi
+done &&
+unset error_count &&
+make install &&
+install 'Programs/GtkLauncher' '/usr/bin/Gtk3Launcher' &&
+
+# symlink plugin folder to a location webkit looks for it
+if [ ! -e "/usr/lib/browser-plugins" ]; then
+ ln -sf /usr/lib/lunar/plugins /usr/lib/browser-plugins
+fi
--- /dev/null
+++ b/libs/webkitgtk3/DEPENDS
@@ -0,0 +1,33 @@
+depends gtk+-3
+depends icu4c
+depends gperf
+depends libxslt
+depends sqlite
+depends %JPEG
+depends libpng
+depends freetype2
+depends libsoup
+depends enchant
+depends gst-plugins-base
+
+# workaround for make_names.pl
+depends Switch
+
+# compile fails without this for 1.8.2 so --enable is in BUILD for now
+#optional_depends "gst-plugins-good" "--enable-video" "--disable-video" "for HTML5 video support"
+depends "gst-plugins-good"
+
+optional_depends "geoclue" \
+ "--enable-geolocation" \
+ "--disable-geolocation" \
+ "for geolocation support"
+
+optional_depends "gobject-introspection" \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "say Y for Epiphany, and possibly others"
+
+optional_depends "librsvg" \
+ "--enable-svg --enable-svg-fonts" \
+ "--disable-svg" \
+ "for svg graphics support"
@@ -1,17 +1,14 @@
# WHEN BUMPING THIS MODULE PLEASE CHECK IF ANY OF THE COMMENTED
# BUILD OPTIONS IN CONFIGURE/DEPENDS WORK AGAIN!
- MODULE=webkitgtk\+-3
- VERSION=1.8.3
- SOURCE=webkit-$VERSION.tar.xz
- SOURCE2=webkit-bison-2.6.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkit-$VERSION
- SOURCE_URL=http://www.webkitgtk.org/releases/
- SOURCE2_URL=$PATCH_URL/
- SOURCE_VFY=sha1:ccf567fdfd7fbc63a3340777278e41b17522b80d
- SOURCE2_VFY=sha1:18c5611095a3d105d8ee02357dd6fb729c1eb86a
+ MODULE=webkitgtk3
+ VERSION=1.10.2
+ SOURCE=webkitgtk-$VERSION.tar.xz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
+ SOURCE_URL=http://www.webkitgtk.org/releases
+ SOURCE_VFY=sha1:733ca23157eb8dd072d57becf325799c00bde630
WEB_SITE=http://www.webkit.org
ENTERED=20070919
- UPDATED=20130102
+ UPDATED=20130303
SHORT="gtk+ web rendering engine"
cat << EOF
More information about the Lunar-commits
mailing list