[ostree] gnomeos: Building WebKit

From: Colin Walters <walters src gnome org>
To: commits-list gnome org
Cc:
Subject: [ostree] gnomeos: Building WebKit
Date: Wed, 18 Jan 2012 22:39:33 +0000 (UTC)
commit 47e94305a1a1a5ebf94826768791bc3dae40294c
Author: Colin Walters <walters verbum org>
Date:   Wed Jan 18 17:38:45 2012 -0500

    gnomeos: Building WebKit

 gnomeos/3.4/WebKit-autogen.patch            |   25 ++++++++++
 gnomeos/3.4/gst-plugins-base-warnings.patch |   12 +----
 gnomeos/3.4/gst-plugins-good-warnings.patch |   65 +++++++++++++++++++++++++++
 gnomeos/3.4/manifest.json                   |   24 ++++++----
 4 files changed, 106 insertions(+), 20 deletions(-)
---
diff --git a/gnomeos/3.4/WebKit-autogen.patch b/gnomeos/3.4/WebKit-autogen.patch
new file mode 100644
index 0000000..e5be0b2
--- /dev/null
+++ b/gnomeos/3.4/WebKit-autogen.patch
@@ -0,0 +1,25 @@
+From 6dae71d03594b8bcd95195c6c167b4b3ff6780fa Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 18 Jan 2012 16:32:48 -0500
+Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
+
+See http://people.gnome.org/~walters/docs/build-api.txt
+---
+ autogen.sh |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index bb7779d..029d737 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -20,4 +20,6 @@ autoreconf --verbose --install -I Source/autotools $ACLOCAL_FLAGS|| exit $?
+ 
+ cd $ORIGDIR || exit 1
+ 
+-$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
++if test -z "$NOCONFIGURE"; then
++    exec $srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@"
++fi
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/gst-plugins-base-warnings.patch b/gnomeos/3.4/gst-plugins-base-warnings.patch
index 884f89f..78a2aa4 100644
--- a/gnomeos/3.4/gst-plugins-base-warnings.patch
+++ b/gnomeos/3.4/gst-plugins-base-warnings.patch
@@ -1,4 +1,4 @@
-From 1e8d86a199857d762b2bb13be8431112a8eed16d Mon Sep 17 00:00:00 2001
+From f2849da4e3f832d6f5a99bc0f1c0952af3fd2f53 Mon Sep 17 00:00:00 2001
 From: Colin Walters <walters verbum org>
 Date: Tue, 17 Jan 2012 16:50:46 -0500
 Subject: [PATCH] build: Add --disable-fatal-warnings
@@ -8,17 +8,9 @@ warnings into fatal errors.  For example, GNOME's jhbuild helps people
 get newer versions of software than came from their distribution, but
 they may not necessarily want to hack on it.
 ---
- common       |    2 +-
  configure.ac |   10 +++++++---
- 2 files changed, 8 insertions(+), 4 deletions(-)
+ 1 files changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/common b/common
-index 63d592e..e4a9407 160000
---- a/common
-+++ b/common
-@@ -1 +1 @@
--Subproject commit 63d592ed74618734d69438c770d6462efeb5ab9d
-+Subproject commit e4a9407a51803016bab9918b03e2034981886bdb
 diff --git a/configure.ac b/configure.ac
 index 13647a4..0e3b20e 100644
 --- a/configure.ac
diff --git a/gnomeos/3.4/gst-plugins-good-warnings.patch b/gnomeos/3.4/gst-plugins-good-warnings.patch
new file mode 100644
index 0000000..e02ac51
--- /dev/null
+++ b/gnomeos/3.4/gst-plugins-good-warnings.patch
@@ -0,0 +1,65 @@
+From e9212c6cb3e7efd5165ce10264f25a61ca371b0e Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 18 Jan 2012 16:18:41 -0500
+Subject: [PATCH] build: Add --disable-fatal-warnings
+
+It's reasonable to build from git, but not want to turn all compiler
+warnings into fatal errors.  For example, GNOME's jhbuild helps people
+get newer versions of software than came from their distribution, but
+they may not necessarily want to hack on it.
+---
+ configure.ac |   12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 681bc37..6b0a677 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,10 @@ AS_VERSION
+ 
+ dnl check if this is a release version
+ AS_NANO(GST_GIT="no", GST_GIT="yes")
++AC_ARG_ENABLE(fatal-warnings,
++  AS_HELP_STRING([--enable-fatal-warnings],
++		 [Turn compiler warnings into fatal errors]),
++  [GST_FATAL_WARNINGS=$enableval], [GST_FATAL_WARNINGS=$GST_GIT])
+ 
+ dnl can autoconf find the source ?
+ AC_CONFIG_SRCDIR([gst/law/alaw.c])
+@@ -298,7 +302,7 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
+ dnl define an ERROR_CFLAGS Makefile variable
+ dnl -Wundef: too many broken headers
+ if test "x$HAVE_OSX_VIDEO" != "xyes"; then
+-  AG_GST_SET_ERROR_CFLAGS($GST_GIT, [
++  AG_GST_SET_ERROR_CFLAGS($GST_FATAL_WARNINGS, [
+         -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls
+         -Wwrite-strings -Wold-style-definition -Waggregate-return
+         -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar
+@@ -307,7 +311,7 @@ else
+   dnl work-around for us passing GST_CFLAGS to the ObjC-compiler, which
+   dnl doesn't understand all warning flags that the C compiler knows about
+   dnl (e.g. -Waddress) or causes problems with some flags (-Waggregate-return)
+-  AG_GST_SET_ERROR_CFLAGS($GST_GIT, [
++  AG_GST_SET_ERROR_CFLAGS($GST_FATAL_WARNINGS, [
+         -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls
+         -Wwrite-strings -Wold-style-definition
+         -Winit-self -Wmissing-include-dirs -Wno-multichar
+@@ -315,13 +319,13 @@ else
+ fi
+ 
+ dnl define an ERROR_CXXFLAGS Makefile variable
+-AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [
++AG_GST_SET_ERROR_CXXFLAGS($GST_FATAL_WARNINGS, [
+         -Wmissing-declarations -Wredundant-decls
+         -Wwrite-strings
+         -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar ])
+ 
+ dnl define correct level for debugging messages
+-AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
++AG_GST_SET_LEVEL_DEFAULT($GST_FATAL_WARNINGS)
+ 
+ dnl used in examples
+ AG_GST_DEFAULT_ELEMENTS
+-- 
+1.7.6.5
+
diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index b3dfd16..424d356 100644
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -531,24 +531,28 @@
 		 "config-args": ["--disable-tls-check"]},
 
 		{"src": "fd-gstreamer:gstreamer",
-		 "config-args": ["--disable-tests"],
-		 "branch": "RELEASE-0.11.1"},
+		 "config-opts": ["--disable-tests",
+		                 "--disable-fatal-warnings"],
+		 "patches": ["gstreamer-warning-errors.patch"]},
 
 		{"src": "fd-gstreamer:gst-plugins-base",
-		 "config-args": ["--with-gtk=3.0",
+		 "config-opts": ["--with-gtk=3.0",
 		                 "--disable-tests",
-				 "--disable-gnome_vfs"],
-		 "branch": "RELEASE-0.11.1",
-		 "patches": ["gst-plugins-base-no-builddir.patch"]},
+				 "--disable-gnome_vfs",
+				 "--disable-fatal-warnings"],
+		 "patches": ["gst-plugins-base-no-builddir.patch",
+		             "gst-plugins-base-warnings.patch"]},
 
 		{"src": "fd-gstreamer:gst-plugins-good",
-		 "config-args": ["--with-gtk=3.0",
+		 "config-opts": ["--with-gtk=3.0",
 		                 "--disable-tests",
-				 "--disable-examples"],
-		 "branch": "RELEASE-0.10.30"},
+				 "--disable-examples",
+				 "--disable-fatal-warnings"],
+		 "patches": ["gst-plugins-good-warnings.patch"]},
 
 		{"src": "git:git://git.webkit.org/WebKit.git",
-		 "branch": "4e276ff268f3f3e97abb97f8e5a8cf6d8d97d2db"},
+		 "branch": "4e276ff268f3f3e97abb97f8e5a8cf6d8d97d2db",
+		 "patches": ["WebKit-autogen.patch"]},
 
 		{"src": "gnome:gnome-online-accounts"},
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]