* [PATCH 0/3] Web fixes
@ 2012-07-13 15:15 Ross Burton
2012-07-13 15:15 ` [PATCH 1/3] web-webkit: remove unused dependencies (taken from the gecko-based recipe) Ross Burton
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Ross Burton @ 2012-07-13 15:15 UTC (permalink / raw)
To: openembedded-core
Some small fixes for Web.
The following changes since commit eb0cb7e8234f5d2e5623406e9660be91cf52f65e:
perf: add perl, python to DEPENDS (2012-07-12 12:52:09 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/web
for you to fetch changes up to d48782c50edd6fc4018b8144050922bd439abea1:
web-webkit: don't link using g++, it's not needed anymore (2012-07-13 16:12:55 +0100)
----------------------------------------------------------------
Ross Burton (3):
web-webkit: remove unused dependencies (taken from the gecko-based recipe)
web-webkit: push make whitespace fix upstream
web-webkit: don't link using g++, it's not needed anymore
.../web/web-webkit/link-with-g++.patch | 35 --------------------
meta/recipes-sato/web/web-webkit/make-382.patch | 17 ----------
meta/recipes-sato/web/web-webkit_git.bb | 16 +++------
3 files changed, 5 insertions(+), 63 deletions(-)
delete mode 100644 meta/recipes-sato/web/web-webkit/link-with-g++.patch
delete mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch
Ross Burton (3):
web-webkit: remove unused dependencies (taken from the gecko-based
recipe)
web-webkit: push make whitespace fix upstream
web-webkit: don't link using g++, it's not needed anymore
.../web/web-webkit/link-with-g++.patch | 35 --------------------
meta/recipes-sato/web/web-webkit/make-382.patch | 17 ----------
meta/recipes-sato/web/web-webkit_git.bb | 16 +++------
3 files changed, 5 insertions(+), 63 deletions(-)
delete mode 100644 meta/recipes-sato/web/web-webkit/link-with-g++.patch
delete mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch
--
1.7.10
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] web-webkit: remove unused dependencies (taken from the gecko-based recipe)
2012-07-13 15:15 [PATCH 0/3] Web fixes Ross Burton
@ 2012-07-13 15:15 ` Ross Burton
2012-07-13 15:15 ` [PATCH 2/3] web-webkit: push make whitespace fix upstream Ross Burton
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2012-07-13 15:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-sato/web/web-webkit_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
index 2af12bc..57cd545 100644
--- a/meta/recipes-sato/web/web-webkit_git.bb
+++ b/meta/recipes-sato/web/web-webkit_git.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
SECTION = "x11"
-DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl"
+DEPENDS = "glib-2.0 gtk+ webkit-gtk libowl"
# To access https web pages
RRECOMMENDS_${PN} += "glib-networking"
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
EXTRA_OECONF = "--enable-libowl"
-inherit autotools pkgconfig gconf
+inherit autotools pkgconfig
do_configure_prepend() {
touch ${S}/src/dummy.cpp
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] web-webkit: push make whitespace fix upstream
2012-07-13 15:15 [PATCH 0/3] Web fixes Ross Burton
2012-07-13 15:15 ` [PATCH 1/3] web-webkit: remove unused dependencies (taken from the gecko-based recipe) Ross Burton
@ 2012-07-13 15:15 ` Ross Burton
2012-07-13 15:15 ` [PATCH 3/3] web-webkit: don't link using g++, it's not needed anymore Ross Burton
2012-07-17 17:16 ` [PATCH 0/3] Web fixes Saul Wold
3 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2012-07-13 15:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-sato/web/web-webkit/make-382.patch | 17 -----------------
meta/recipes-sato/web/web-webkit_git.bb | 7 +++----
2 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch
diff --git a/meta/recipes-sato/web/web-webkit/make-382.patch b/meta/recipes-sato/web/web-webkit/make-382.patch
deleted file mode 100644
index 3689435..0000000
--- a/meta/recipes-sato/web/web-webkit/make-382.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make 3.82 does not allow 8 spaces instead of a tab
-
-JL - 15/12/10
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: webkit/Makefile.am
-===================================================================
---- webkit.orig/Makefile.am
-+++ webkit/Makefile.am
-@@ -5,5 +5,5 @@ SUBDIRS = src data
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
-
- snapshot:
-- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
index 57cd545..dae7faf 100644
--- a/meta/recipes-sato/web/web-webkit_git.bb
+++ b/meta/recipes-sato/web/web-webkit_git.bb
@@ -11,13 +11,12 @@ DEPENDS = "glib-2.0 gtk+ webkit-gtk libowl"
# To access https web pages
RRECOMMENDS_${PN} += "glib-networking"
-SRCREV = "0f7019acd9db5383c732d0524c7c3a5eaec9be2b"
+SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503"
PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
- file://link-with-g++.patch \
- file://make-382.patch"
+ file://link-with-g++.patch"
S = "${WORKDIR}/git"
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] web-webkit: don't link using g++, it's not needed anymore
2012-07-13 15:15 [PATCH 0/3] Web fixes Ross Burton
2012-07-13 15:15 ` [PATCH 1/3] web-webkit: remove unused dependencies (taken from the gecko-based recipe) Ross Burton
2012-07-13 15:15 ` [PATCH 2/3] web-webkit: push make whitespace fix upstream Ross Burton
@ 2012-07-13 15:15 ` Ross Burton
2012-07-17 17:16 ` [PATCH 0/3] Web fixes Saul Wold
3 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2012-07-13 15:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../web/web-webkit/link-with-g++.patch | 35 --------------------
meta/recipes-sato/web/web-webkit_git.bb | 9 ++---
2 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-sato/web/web-webkit/link-with-g++.patch
diff --git a/meta/recipes-sato/web/web-webkit/link-with-g++.patch b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
deleted file mode 100644
index e0c6784..0000000
--- a/meta/recipes-sato/web/web-webkit/link-with-g++.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-The main webkit library links against stdc++ so we need to use g++ for
-linking. The easiest way to achieve this is to add a dummy cpp file.
-This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset.
-
-RP - 14/4/08
-
-Upstream-Status: Inappropriate [configuration]
-
---- webkit.orig/src/Makefile.am
-+++ webkit/src/Makefile.am
-@@ -1,11 +1,11 @@
- AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\"
- AM_CFLAGS = -Wall -export-dynamic $(WEB_CFLAGS)
-
- bin_PROGRAMS = web2
-
--web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h
-+web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h dummy.cpp
- web2_LDADD = $(WEB_LIBS)
-
- MAINTAINERCLEANFILES = config.h.in Makefile.in
-
- uidir = $(pkgdatadir)
-Index: webkit/configure.ac
-===================================================================
---- webkit.orig/configure.ac 2008-04-14 22:15:25.000000000 +0100
-+++ webkit/configure.ac 2008-04-14 22:16:31.000000000 +0100
-@@ -7,6 +7,7 @@
-
- AC_ISC_POSIX
- AC_PROG_CC
-+AC_PROG_CXX
- AC_STDC_HEADERS
- AC_PROG_LIBTOOL
-
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
index dae7faf..0c79324 100644
--- a/meta/recipes-sato/web/web-webkit_git.bb
+++ b/meta/recipes-sato/web/web-webkit_git.bb
@@ -13,10 +13,9 @@ RRECOMMENDS_${PN} += "glib-networking"
SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503"
PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
- file://link-with-g++.patch"
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
@@ -24,8 +23,4 @@ EXTRA_OECONF = "--enable-libowl"
inherit autotools pkgconfig
-do_configure_prepend() {
- touch ${S}/src/dummy.cpp
-}
-
FILES_${PN} += "${datadir}/web2"
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] Web fixes
2012-07-13 15:15 [PATCH 0/3] Web fixes Ross Burton
` (2 preceding siblings ...)
2012-07-13 15:15 ` [PATCH 3/3] web-webkit: don't link using g++, it's not needed anymore Ross Burton
@ 2012-07-17 17:16 ` Saul Wold
3 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-07-17 17:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 07/13/2012 08:15 AM, Ross Burton wrote:
> Some small fixes for Web.
>
> The following changes since commit eb0cb7e8234f5d2e5623406e9660be91cf52f65e:
>
> perf: add perl, python to DEPENDS (2012-07-12 12:52:09 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib ross/web
>
> for you to fetch changes up to d48782c50edd6fc4018b8144050922bd439abea1:
>
> web-webkit: don't link using g++, it's not needed anymore (2012-07-13 16:12:55 +0100)
>
> ----------------------------------------------------------------
> Ross Burton (3):
> web-webkit: remove unused dependencies (taken from the gecko-based recipe)
> web-webkit: push make whitespace fix upstream
> web-webkit: don't link using g++, it's not needed anymore
>
> .../web/web-webkit/link-with-g++.patch | 35 --------------------
> meta/recipes-sato/web/web-webkit/make-382.patch | 17 ----------
> meta/recipes-sato/web/web-webkit_git.bb | 16 +++------
> 3 files changed, 5 insertions(+), 63 deletions(-)
> delete mode 100644 meta/recipes-sato/web/web-webkit/link-with-g++.patch
> delete mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch
>
> Ross Burton (3):
> web-webkit: remove unused dependencies (taken from the gecko-based
> recipe)
> web-webkit: push make whitespace fix upstream
> web-webkit: don't link using g++, it's not needed anymore
>
> .../web/web-webkit/link-with-g++.patch | 35 --------------------
> meta/recipes-sato/web/web-webkit/make-382.patch | 17 ----------
> meta/recipes-sato/web/web-webkit_git.bb | 16 +++------
> 3 files changed, 5 insertions(+), 63 deletions(-)
> delete mode 100644 meta/recipes-sato/web/web-webkit/link-with-g++.patch
> delete mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] web-webkit: don't link using g++, it's not needed anymore
2012-07-17 16:22 [PATCH 0/3] Fixes for Web Ross Burton
@ 2012-07-17 16:22 ` Ross Burton
0 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2012-07-17 16:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../web/web-webkit/link-with-g++.patch | 35 --------------------
meta/recipes-sato/web/web-webkit_git.bb | 9 ++---
2 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-sato/web/web-webkit/link-with-g++.patch
diff --git a/meta/recipes-sato/web/web-webkit/link-with-g++.patch b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
deleted file mode 100644
index e0c6784..0000000
--- a/meta/recipes-sato/web/web-webkit/link-with-g++.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-The main webkit library links against stdc++ so we need to use g++ for
-linking. The easiest way to achieve this is to add a dummy cpp file.
-This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset.
-
-RP - 14/4/08
-
-Upstream-Status: Inappropriate [configuration]
-
---- webkit.orig/src/Makefile.am
-+++ webkit/src/Makefile.am
-@@ -1,11 +1,11 @@
- AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\"
- AM_CFLAGS = -Wall -export-dynamic $(WEB_CFLAGS)
-
- bin_PROGRAMS = web2
-
--web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h
-+web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h dummy.cpp
- web2_LDADD = $(WEB_LIBS)
-
- MAINTAINERCLEANFILES = config.h.in Makefile.in
-
- uidir = $(pkgdatadir)
-Index: webkit/configure.ac
-===================================================================
---- webkit.orig/configure.ac 2008-04-14 22:15:25.000000000 +0100
-+++ webkit/configure.ac 2008-04-14 22:16:31.000000000 +0100
-@@ -7,6 +7,7 @@
-
- AC_ISC_POSIX
- AC_PROG_CC
-+AC_PROG_CXX
- AC_STDC_HEADERS
- AC_PROG_LIBTOOL
-
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
index dae7faf..0c79324 100644
--- a/meta/recipes-sato/web/web-webkit_git.bb
+++ b/meta/recipes-sato/web/web-webkit_git.bb
@@ -13,10 +13,9 @@ RRECOMMENDS_${PN} += "glib-networking"
SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503"
PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
- file://link-with-g++.patch"
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
@@ -24,8 +23,4 @@ EXTRA_OECONF = "--enable-libowl"
inherit autotools pkgconfig
-do_configure_prepend() {
- touch ${S}/src/dummy.cpp
-}
-
FILES_${PN} += "${datadir}/web2"
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-07-17 17:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-13 15:15 [PATCH 0/3] Web fixes Ross Burton
2012-07-13 15:15 ` [PATCH 1/3] web-webkit: remove unused dependencies (taken from the gecko-based recipe) Ross Burton
2012-07-13 15:15 ` [PATCH 2/3] web-webkit: push make whitespace fix upstream Ross Burton
2012-07-13 15:15 ` [PATCH 3/3] web-webkit: don't link using g++, it's not needed anymore Ross Burton
2012-07-17 17:16 ` [PATCH 0/3] Web fixes Saul Wold
2012-07-17 16:22 [PATCH 0/3] Fixes for Web Ross Burton
2012-07-17 16:22 ` [PATCH 3/3] web-webkit: don't link using g++, it's not needed anymore Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.