* [PATCH 01/22] Change tarball compression to xz for gnome recipes
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 02/22] Enable icu feature in harfbuzz recipe Alexander Kanavin
` (21 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
Upstream, xz has been the only format for some time now, so let's
make it the default and adjust recipes that package old stuff.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/classes/gnomebase.bbclass | 2 +-
meta/recipes-core/glib-networking/glib-networking_2.44.0.bb | 2 --
meta/recipes-gnome/gnome/gnome-common_3.14.0.bb | 2 --
meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb | 2 --
meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | 1 +
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 1 +
meta/recipes-gnome/json-glib/json-glib_1.0.4.bb | 2 --
meta/recipes-gnome/libglade/libglade_2.6.4.bb | 1 +
meta/recipes-gnome/librsvg/librsvg_2.40.9.bb | 2 --
meta/recipes-graphics/pango/pango_1.36.8.bb | 2 --
meta/recipes-support/atk/atk_2.16.0.bb | 2 --
meta/recipes-support/libcroco/libcroco_0.6.8.bb | 2 --
meta/recipes-support/vte/vte_0.28.2.bb | 4 ++--
13 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass
index 6ca13cb..e5c6776 100644
--- a/meta/classes/gnomebase.bbclass
+++ b/meta/classes/gnomebase.bbclass
@@ -1,7 +1,7 @@
def gnome_verdir(v):
return oe.utils.trim_version(v, 2)
-GNOME_COMPRESS_TYPE ?= "bz2"
+GNOME_COMPRESS_TYPE ?= "xz"
SECTION ?= "x11/gnome"
GNOMEBN ?= "${BPN}"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive"
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
index 848bf53..4f91b76 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
SECTION = "libs"
DEPENDS = "glib-2.0 intltool-native"
-GNOME_COMPRESS_TYPE = "xz"
-
SRC_URI[archive.md5sum] = "6989b20cf3b26dd5ae272e04a9acb0b3"
SRC_URI[archive.sha256sum] = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"
diff --git a/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb b/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb
index 1f9fe8b..80b7033 100644
--- a/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb
@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SECTION = "x11/gnome"
inherit gnomebase allarch
-GNOME_COMPRESS_TYPE = "xz"
-
SRC_URI[archive.md5sum] = "ba58c61d0d81b7c3ff8452c620513a9d"
SRC_URI[archive.sha256sum] = "4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c"
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
index 321eb7f..78cc005 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb
@@ -2,8 +2,6 @@ require gnome-doc-utils.inc
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-GNOME_COMPRESS_TYPE = "xz"
-
SRC_URI += "file://xsltproc_nonet.patch \
file://use-usr-bin-env-for-python-in-xml2po.patch \
file://sysrooted-pkg-config.patch \
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
index 65b79f0..a31eb55 100644
--- a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
@@ -13,6 +13,7 @@ SRC_URI += "file://pkgconfig.patch"
SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c"
SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7"
+GNOME_COMPRESS_TYPE="bz2"
DEPENDS += "shared-mime-info intltool-native"
RDEPENDS_${PN} = "shared-mime-info"
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 036aa27..c30454c 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -32,6 +32,7 @@ CFLAGS_prepend = "-DHAVE_ANIMATION "
RDEPENDS_${PN}-dev = ""
inherit gnomebase
+GNOME_COMPRESS_TYPE="bz2"
python populate_packages_prepend() {
engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines")
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
index 4d2b613..c57c973 100644
--- a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "glib-2.0"
-GNOME_COMPRESS_TYPE = "xz"
-
SRC_URI[archive.md5sum] = "3131b0417ecde3da1ae72acceaa375cf"
SRC_URI[archive.sha256sum] = "80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd"
diff --git a/meta/recipes-gnome/libglade/libglade_2.6.4.bb b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
index 681b856..15267ca 100644
--- a/meta/recipes-gnome/libglade/libglade_2.6.4.bb
+++ b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
@@ -12,6 +12,7 @@ PR = "r5"
DEPENDS = "zlib gdk-pixbuf gtk+"
inherit autotools pkgconfig gnomebase gtk-doc
+GNOME_COMPRESS_TYPE="bz2"
SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch"
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
index 9a14f29..9b2c74c 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
@@ -12,8 +12,6 @@ BBCLASSEXTEND = "native"
inherit autotools pkgconfig gnomebase gtk-doc pixbufcache
-GNOME_COMPRESS_TYPE = "xz"
-
SRC_URI += "file://gtk-option.patch"
SRC_URI[archive.md5sum] = "31df15e3beaa8fbbf538ca3c52b400d2"
diff --git a/meta/recipes-graphics/pango/pango_1.36.8.bb b/meta/recipes-graphics/pango/pango_1.36.8.bb
index 4605c76..f4e4250 100644
--- a/meta/recipes-graphics/pango/pango_1.36.8.bb
+++ b/meta/recipes-graphics/pango/pango_1.36.8.bb
@@ -2,8 +2,6 @@ require pango.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-GNOME_COMPRESS_TYPE="xz"
-
SRC_URI += "file://run-ptest \
file://multilib-fix-clean.patch \
"
diff --git a/meta/recipes-support/atk/atk_2.16.0.bb b/meta/recipes-support/atk/atk_2.16.0.bb
index e29469b..0f8f9b5 100644
--- a/meta/recipes-support/atk/atk_2.16.0.bb
+++ b/meta/recipes-support/atk/atk_2.16.0.bb
@@ -12,8 +12,6 @@ DEPENDS = "glib-2.0"
inherit gnomebase gtk-doc
-GNOME_COMPRESS_TYPE = "xz"
-
SRC_URI[archive.md5sum] = "c7c5002bd6e58b4723a165f1bf312116"
SRC_URI[archive.sha256sum] = "095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562"
diff --git a/meta/recipes-support/libcroco/libcroco_0.6.8.bb b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
index 88696a4..2b1b910 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.8.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
@@ -17,7 +17,5 @@ BINCONFIG = "${bindir}/croco-0.6-config"
inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled
-GNOME_COMPRESS_TYPE = "xz"
-
SRC_URI[archive.md5sum] = "767e73c4174f75b99695d4530fd9bb80"
SRC_URI[archive.sha256sum] = "ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570"
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/meta/recipes-support/vte/vte_0.28.2.bb
index 9dab390..68bc16d 100644
--- a/meta/recipes-support/vte/vte_0.28.2.bb
+++ b/meta/recipes-support/vte/vte_0.28.2.bb
@@ -8,5 +8,5 @@ SRC_URI += "file://obsolete_automake_macros.patch"
CFLAGS += "-D_GNU_SOURCE"
-SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
-SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"
+SRC_URI[archive.md5sum] = "497f26e457308649e6ece32b3bb142ff"
+SRC_URI[archive.sha256sum] = "86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 02/22] Enable icu feature in harfbuzz recipe
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
2015-06-17 13:19 ` [PATCH 01/22] Change tarball compression to xz for gnome recipes Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 03/22] Add arch conversion routine to cmake.bbclass Alexander Kanavin
` (20 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
This is required to build latest webkitgtk
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb
index 2517ede..b3608c9 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb
@@ -22,7 +22,7 @@ BBCLASSEXTEND = "native"
EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "icu"
PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu"
PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 03/22] Add arch conversion routine to cmake.bbclass
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
2015-06-17 13:19 ` [PATCH 01/22] Change tarball compression to xz for gnome recipes Alexander Kanavin
2015-06-17 13:19 ` [PATCH 02/22] Enable icu feature in harfbuzz recipe Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 04/22] Update jpeg recipe to version 9a Alexander Kanavin
` (19 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
cmake expects target architecture strings in the format of uname(2),
which do not always match TARGET_ARCH (e.g. powerpc vs ppc).
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/classes/cmake.bbclass | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 1ebb936..40115a0 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -27,12 +27,22 @@ OECMAKE_RPATH ?= ""
OECMAKE_PERLNATIVE_DIR ??= ""
OECMAKE_EXTRA_ROOT_PATH ?= ""
+# CMake expects target architectures in the format of uname(2),
+# which do not always match TARGET_ARCH, so all the necessary
+# conversions should happen here.
+def map_target_arch_to_uname_arch(target_arch):
+ if target_arch == "powerpc":
+ return "ppc"
+ if target_arch == "powerpc64":
+ return "ppc64"
+ return target_arch
+
cmake_do_generate_toolchain_file() {
cat > ${WORKDIR}/toolchain.cmake <<EOF
# CMake system name must be something like "Linux".
# This is important for cross-compiling.
set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` )
-set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} )
+set( CMAKE_SYSTEM_PROCESSOR ${@map_target_arch_to_uname_arch(d.getVar('TARGET_ARCH', True))} )
set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )
set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )
set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} )
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 04/22] Update jpeg recipe to version 9a
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (2 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 03/22] Add arch conversion routine to cmake.bbclass Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 05/22] Update libnotify to version 0.7.6 Alexander Kanavin
` (18 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
Previous webkit version was blocking this; latest webkit works fine.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../jpeg/jpeg-8d/debian-libjpeg7_7-1.diff | 1070 --------------------
.../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 -
meta/recipes-core/jpeg/{jpeg_8d.bb => jpeg_9a.bb} | 28 +-
3 files changed, 4 insertions(+), 1138 deletions(-)
delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff
delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
rename meta/recipes-core/jpeg/{jpeg_8d.bb => jpeg_9a.bb} (55%)
diff --git a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff
deleted file mode 100644
index 3b8fa69..0000000
--- a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff
+++ /dev/null
@@ -1,1070 +0,0 @@
-This is a well-known debian patch used by many Linux distribution, but not
-accepted by upstream yet.
-Upstream-Status: Pending
-
---- libjpeg7-7.orig/config.sub
-+++ libjpeg7-7/config.sub
-@@ -1,4 +1,10 @@
- #! /bin/sh
-+# autotools-dev hack (<ballombe@debian.org>, Wed, 14 Nov 2001 10:13:10 +0100)
-+if [ -x /usr/share/misc/config.sub ]; then
-+ /usr/share/misc/config.sub $*
-+ exit $?
-+fi
-+
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
---- libjpeg7-7.orig/config.guess
-+++ libjpeg7-7/config.guess
-@@ -1,4 +1,10 @@
- #! /bin/sh
-+# autotools-dev hack (<ballombe@debian.org>, Wed, 14 Nov 2001 10:13:10 +0100)
-+if [ -x /usr/share/misc/config.guess ]; then
-+ /usr/share/misc/config.guess $*
-+ exit $?
-+fi
-+
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
---- libjpeg7-7.orig/debian/libjpeg7-dev.files
-+++ libjpeg7-7/debian/libjpeg7-dev.files
-@@ -0,0 +1,4 @@
-+usr/include
-+usr/lib/libjpeg.a
-+usr/lib/libjpeg.la
-+usr/lib/libjpeg.so
---- libjpeg7-7.orig/debian/libjpeg-progs.README.Debian
-+++ libjpeg7-7/debian/libjpeg-progs.README.Debian
-@@ -0,0 +1,13 @@
-+libjpeg-progs for Debian
-+========================
-+
-+This package contains programs for manipulating JPEG files:
-+ cjpeg/djpeg: convert to/from the JPEG file format
-+ rdjpgcom/wrjpgcom: read/write comments in JPEG files
-+ jpegtran: lossless transformations of JPEG files
-+ jpegexiforient/exifautotran: manipulate EXIF orientation tag
-+
-+Thanks for using Debian!
-+
-+--
-+Bill Allombert <ballombe@debian.org> Sun, 05 Jul 2009 15:18:59 +0200
---- libjpeg7-7.orig/debian/shlibs.local
-+++ libjpeg7-7/debian/shlibs.local
-@@ -0,0 +1 @@
-+libjpeg 7 libjpeg7
---- libjpeg7-7.orig/debian/rules
-+++ libjpeg7-7/debian/rules
-@@ -0,0 +1,71 @@
-+#!/usr/bin/make -f
-+# Made with the aid of debmake, by Christoph Lameter,
-+# based on the sample debian/rules file for GNU hello by Ian Jackson.
-+
-+package=libjpeg
-+
-+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+export CFLAGS=-D_REENTRANT -g -Wall
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+CFLAGS += -O0
-+else
-+CFLAGS += -O2
-+endif
-+
-+#export DH_VERBOSE=1
-+
-+build: build-stamp
-+build-stamp:
-+ dh_testdir
-+ ./configure --prefix=/usr --mandir=/usr/share/man \
-+ --enable-static --enable-shared \
-+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-+ $(MAKE)
-+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-+ $(MAKE) check
-+endif
-+ $(MAKE) -C debian/extra
-+
-+ touch build-stamp
-+
-+clean:
-+ dh_testdir
-+ dh_testroot
-+ -rm -f build-stamp
-+ if [ -f Makefile ]; then $(MAKE) distclean; fi
-+ $(MAKE) clean -C debian/extra
-+ dh_clean
-+
-+binary-indep:
-+
-+binary-arch: build
-+ dh_testdir
-+ dh_testroot
-+ dh_clean -k
-+ dh_installdirs
-+ $(MAKE) install DESTDIR=`pwd`/debian/tmp
-+ $(MAKE) install -C debian/extra prefix=/usr DESTDIR=`pwd`/debian/tmp
-+ # fix jconfig.h
-+ rm debian/tmp/usr/include/jconfig.h
-+ sed -e "s/#\(undef\|define\) HAVE_\(LOCALE\|\(STD\(DEF\|LIB\)\)\)_H 1//g" \
-+ jconfig.h > debian/tmp/usr/include/jconfig.h
-+ # separate out lib package
-+ dh_movefiles
-+ # Finish it off with debhelper
-+ dh_installdocs README
-+ dh_installexamples
-+ dh_installchangelogs change.log
-+ dh_strip --dbg-package=libjpeg7-dbg
-+ dh_compress
-+ dh_fixperms
-+ dh_installdeb
-+ dh_shlibdeps -l`pwd`/debian/libjpeg7/usr/lib
-+ dh_gencontrol
-+ dh_md5sums
-+ dh_builddeb
-+
-+binary: binary-indep binary-arch
-+
-+.PHONY: clean binary-indep binary-arch binary build
---- libjpeg7-7.orig/debian/libjpeg7-dev.README.Debian
-+++ libjpeg7-7/debian/libjpeg7-dev.README.Debian
-@@ -0,0 +1,18 @@
-+IJG JPEG for Debian
-+===================
-+
-+The following patch has been applied to the headers files:
-+
-+--- jconfig.h: Remove unused symbol HAVE_STDDEF_H, HAVE_STDLIB_H and
-+HAVE_LOCALE_H since they are not used by the installed headers files and cause
-+problem with autoconf.
-+
-+This can theoretically cause problems if your software relies on theses symbols
-+being defined by this header. If it ever happens, please define them manually.
-+
-+Note: this is not Debian-specific, others distributions apply similar patches.
-+
-+Thanks for using Debian!
-+
-+---
-+Bill Allombert <ballombe@debian.org> Sun, 05 Jul 2009 15:17:56 +0200
---- libjpeg7-7.orig/debian/shlibs
-+++ libjpeg7-7/debian/shlibs
-@@ -0,0 +1 @@
-+libjpeg 7 libjpeg7
---- libjpeg7-7.orig/debian/control
-+++ libjpeg7-7/debian/control
-@@ -0,0 +1,52 @@
-+Source: libjpeg7
-+Maintainer: Bill Allombert <ballombe@debian.org>
-+Section: graphics
-+Priority: optional
-+Build-Depends: debhelper (>= 5), autotools-dev
-+Standards-Version: 3.8.2
-+
-+Package: libjpeg7
-+Architecture: any
-+Section: libs
-+Description: The Independent JPEG Group's JPEG runtime library
-+ The Independent JPEG Group's JPEG library is a library for handling
-+ JPEG files.
-+ .
-+ This package contains the shared library.
-+Depends: ${shlibs:Depends}
-+
-+Package: libjpeg7-dev
-+Architecture: any
-+Section: libdevel
-+Description: Development files for the IJG JPEG library
-+ The Independent JPEG Group's JPEG library is a library for handling
-+ JPEG files.
-+ .
-+ This package contains the static library, headers and documentation.
-+Depends: libjpeg7 (=${binary:Version}), libc-dev
-+Conflicts: libjpeg62-dev
-+Replaces: libjpeg62-dev
-+
-+Package: libjpeg7-dbg
-+Architecture: any
-+Section: debug
-+Priority: extra
-+Description: Development files for the IJG JPEG library
-+ The Independent JPEG Group's JPEG library is a library for handling
-+ JPEG files.
-+ .
-+ This package contains the debugging symbols for libjpeg.
-+Provides: libjpeg-dbg
-+Depends: libjpeg7 (=${binary:Version})
-+Conflicts: libjpeg62-dbg
-+Replaces: libjpeg62-dbg
-+
-+Package: libjpeg-progs
-+Architecture: any
-+Description: Programs for manipulating JPEG files
-+ This package contains programs for manipulating JPEG files:
-+ cjpeg/djpeg: convert to/from the JPEG file format
-+ rdjpgcom/wrjpgcom: read/write comments in JPEG files
-+ jpegtran: lossless transformations of JPEG files
-+ jpegexiforient/exifautotran: manipulate EXIF orientation tag
-+Depends: ${shlibs:Depends}
---- libjpeg7-7.orig/debian/libjpeg7.files
-+++ libjpeg7-7/debian/libjpeg7.files
-@@ -0,0 +1,2 @@
-+/usr/lib/libjpeg.so.7.0.0
-+/usr/lib/libjpeg.so.7
---- libjpeg7-7.orig/debian/postinst
-+++ libjpeg7-7/debian/postinst
-@@ -0,0 +1,8 @@
-+#!/bin/sh -e
-+
-+#DEBHELPER#
-+
-+if [ "$1" = "configure" ]; then
-+ ldconfig
-+fi
-+
---- libjpeg7-7.orig/debian/compat
-+++ libjpeg7-7/debian/compat
-@@ -0,0 +1 @@
-+5
---- libjpeg7-7.orig/debian/libjpeg7-dev.examples
-+++ libjpeg7-7/debian/libjpeg7-dev.examples
-@@ -0,0 +1 @@
-+example.c
---- libjpeg7-7.orig/debian/changelog
-+++ libjpeg7-7/debian/changelog
-@@ -0,0 +1,245 @@
-+libjpeg7 (7-1) unstable; urgency=low
-+
-+ * The "Yoan" release.
-+ * New upstream release. closes: #535350
-+ - This release includes configure.ac and Makefile.am. closes: #346126
-+ - All patches merged upstream.
-+ - Remove dpatch support.
-+ * debian/control:
-+ - Remove Build-Dependency on libtool and sharutils.
-+ - Move libjpeg7-dbg to debug section.
-+ - Bump standard version to 3.8.2.
-+ * Skip test-suite if nocheck is set. closes: #451222
-+
-+ -- Bill Allombert <ballombe@debian.org> Sun, 05 Jul 2009 15:29:27 +0200
-+
-+libjpeg6b (6b-14) unstable; urgency=low
-+
-+ * The "Lino" release.
-+ * exifautotran:
-+ - fix typo in manpage. closes: #376371, thanks Reuben Thomas.
-+ - preserve file mode. closes: #383379, thanks Vincent Arkesteijn.
-+ * debian/control, debian/rules, debian/compat:
-+ + switch to debhelper v5
-+ + add libjpeg-dbg debugging package.
-+ * debian/rules: remove - before "make clean" rules.
-+ * Add patch 204_jpegtran_man to improve readability of manpage.
-+ closes: #437453. Thanks Jorgen Grahn.
-+ * jpegexiforient.1: Apply patch from Jorgen Grahn to improve formatting.
-+ closes: #437446.
-+
-+ -- Bill Allombert <ballombe@debian.org> Thu, 16 Aug 2007 22:59:21 +0200
-+
-+libjpeg6b (6b-13) unstable; urgency=low
-+
-+ * The "If at first you don't succeed..." release.
-+ * Change --enable-maxmem to 1024, following Guido advice.
-+ This should fix the slowdowns with large files (for large < 1Gb):
-+ closes: #356556, #365025, Thanks Nicolas.
-+ If you hit performance problems, please set the JPEGMEM variable to
-+ about half your available RAM, see jpegtran(1).
-+ * Update libjpeg-progs README.Debian to reflect the new patch set and
-+ the JPEGMEM feature.
-+ * Bump standard version to 3.7.2.
-+
-+ -- Bill Allombert <ballombe@debian.org> Fri, 5 May 2006 19:14:25 +0200
-+
-+libjpeg6b (6b-12) unstable; urgency=low
-+
-+ * The "vote for me" release
-+ * Bump standard version to 3.6.2.
-+ * Run 'make test' instead of home-made test-suite.
-+ * Switch to debhelper v4.
-+ * libjpeg is now configured with --enable-maxmem=32. This limits the memory
-+ usage to 32Mb and it can be overrided by JPEGMEM. Without this flag
-+ JPEGMEM is ignored and there were no limits.
-+ closes: #346023. Thanks C. Scott Ananian.
-+
-+ -- Bill Allombert <ballombe@debian.org> Thu, 2 Mar 2006 18:52:44 +0100
-+
-+libjpeg6b (6b-11) unstable; urgency=high
-+
-+ * The "Silencio" release
-+ * exifautotran: Apply patch by Uwe Zeisberger to fix bad temporary file
-+ handling. closes: #340079
-+
-+ -- Bill Allombert <ballombe@debian.org> Sun, 20 Nov 2005 20:57:07 +0100
-+
-+libjpeg6b (6b-10) unstable; urgency=low
-+
-+ * The "timeout" release.
-+ * Rebuild with current toolchain.
-+ * Depends on libc-dev instead of libc6-dev. closes: #294696
-+ Thanks Joel Aelwyn for discussing thoroughly the matter.
-+ * Instead of copying /usr/bin/libtool, we replace it by a script that
-+ call libtool (using standard path search). Remarked by Jesus Climent.
-+ * debian/control: remove pre-hamm cruft.
-+ * Add jpegexiforient and jpegautotran by Guido Vollbeding
-+ <http://sylvana.net/jpegcrop/exif_orientation.html> as proposed by Philip
-+ Armstrong. closes: #257061.
-+ * Run the test-suite at build time instead of shipping it in the package:
-+ - /usr/share/doc/libjpeg-progs/tests: removed.
-+ - debian/control: Add Build-Depends on sharutils for uuencode.
-+ - debian/libjpeg-progs.dirs: removed.
-+ - debian/libjpeg-progs.test: removed.
-+
-+ -- Bill Allombert <ballombe@debian.org> Tue, 1 Mar 2005 19:43:26 +0100
-+
-+libjpeg6b (6b-9) unstable; urgency=low
-+
-+ * The "I'm all for aggressive goals" release.
-+ * Rebuild with new libtool. closes: #201943.
-+ * patch 100_crop: Updated from Guido Vollbeding <guido@jpegclub.org>
-+ to include patches 203_jpegtran_errmsg,204_perfect.
-+ * patch 200_crop_man: Include 205_perfect_man.
-+ * patches 203_jpegtran_errmsg, 204_perfect, 205_perfect_man: removed
-+ * Add patch 203_rdppm: fix cjpeg issue with 16-bit PPM files. closes: #208937
-+ * Bump standard version to 3.6.1.
-+ * Update debian/edit-patch.
-+
-+ -- Bill Allombert <ballombe@debian.org> Mon, 8 Sep 2003 16:22:08 +0200
-+
-+libjpeg6b (6b-8) unstable; urgency=low
-+
-+ * The "I *hate* when that happens" release.
-+ * Move libjpeg62-dev to libdevel section.
-+ * See debian/README.sources for detail about the (d)patch system.
-+ * debian/rules: avoid to run configure twice.
-+ * Add patches 204_perfect and 205_perfect_man. They implement the
-+ -perfect jpegtran option as proposed by Mark W. Eichin. closes: #189027
-+ * Bump standard version to 3.5.10.
-+ * Use /usr/bin/libtool instead of ldconfig-generated libtool, and remove
-+ various libtool related kludges, including patch 301_configure.
-+ closes: #195281. Thanks Robert Millan for the suggestion.
-+ * Remove patch 302_makefile. Fix debian/rules instead.
-+
-+ -- Bill Allombert <ballombe@debian.org> Sat, 31 May 2003 16:16:59 +0200
-+
-+libjpeg6b (6b-7) unstable; urgency=low
-+
-+ * Rebuild with new gcc/new glibc/new debhelper.
-+ * Add -g to build options according to new policy.
-+ * Add support for DEB_BUILD_OPTIONS noopt. nostrip is handled by dh_strip.
-+ * Bump standard version to 3.5.9.
-+ * Extend description a bit (If you have a better one please email me!).
-+ * Use dpatch to handle the patches.
-+
-+ -- Bill Allombert <ballombe@debian.org> Sun, 16 Mar 2003 12:19:36 +0100
-+
-+libjpeg6b (6b-6) unstable; urgency=low
-+
-+ * The "Try to break sarge before it even got a name" release
-+ * jpegtran: better error messages when opening files.
-+ closes: #147516 Thanks Mark W. Eichin.
-+ * Add debian/patch dir with my patches.
-+ * Add extern "C" if we are under C++.
-+ closes: #113167 Thanks, Fredrik Jagenheim.
-+ * Remove HAVE_STD{LIB,DEF}_H from jconfig.h since they are not used and
-+ conflict with autoconf. closes: #109516 Thanks <Benedikt.Roth@gmx.net>
-+ * Add README.Debian in /usr/share/libjpeg62-dev
-+
-+ -- Bill Allombert <ballombe@debian.org> Mon, 3 Jun 2002 19:34:08 +0200
-+
-+libjpeg6b (6b-5) unstable; urgency=low
-+
-+ * jpeg-->JPEG in libjpeg-progs description.
-+ * Add lib path to dh_shlibdeps to avoid warning.
-+ * Apply patch from <http://sylvana.net/jpegcrop/croppatch.tar.gz> by
-+ <guido@jpegclub.org> closes: #129412 Thanks, Colin Marquardt.
-+
-+ -- Bill Allombert <ballombe@debian.org> Mon, 20 May 2002 11:55:22 +0200
-+
-+libjpeg6b (6b-4) unstable; urgency=low
-+
-+ * Avoid bashism in debian/rules.
-+ * Update libtool to 1.3.5. (1.4 will break).
-+ closes: #52095 Thanks, <Marcus.Brinkmann@ruhr-uni-bochum.de>
-+ * Patch config.guess to use version in the autotools-dev package.
-+ * Correct Section: field of libjpeg62 and libjpeg62-dev.
-+
-+ -- Bill Allombert <ballombe@debian.org> Tue, 20 Nov 2001 10:23:47 +0100
-+
-+libjpeg6b (6b-3) unstable; urgency=low
-+
-+ * The "Where is ltconfig ?" release.
-+ * Remove jconfig.h in debian/rules clean and do some clean up.
-+ * Install libjpeg.la per Policy 11.2.
-+ * Remove duplicate wizard.doc file in libjpeg62-dev.
-+ * Use dpkg-architecture instead of config.guess.
-+ * Patch config.sub to use version in the autotools-dev package.
-+ closes: #85558, #120039
-+ * Patch rdjpgcom.c to use locales for isprint check on comment chars.
-+ closes: #116589 Thanks, Neal H Walfield <neal@cs.uml.edu>
-+ * Apply patch from <http://sylvana.net/jpegcrop/transupp.c> by
-+ <guido@jpegclub.org> closes: #114415 Thanks, <Jean-Marc.Notin@loria.fr>
-+
-+ -- Bill Allombert <ballombe@debian.org> Tue, 13 Nov 2001 21:41:49 +0000
-+
-+libjpeg6b (6b-2) unstable; urgency=low
-+
-+ * New Maintainer. Mark, If you want back the package, just ask!
-+ * Acknowledge previous NMU:
-+ Jordi: closes: #74087, #24330, #24291
-+ Colin: closes: #80752
-+ Joel: closes: #25324, #27033, #28341
-+ * Write source location as a valid URL in debian/copyright.
-+ closes: #118628 Thanks, Doug Porter <dsp@debian.org>.
-+ * Fix formating of description of libjpeg-progs.
-+ closes: #114378 Thanks, Colin Watson <cjwatson@flatline.org.uk>.
-+ * Install jpegint.h header needed by some apps. closes: #100171
-+ * Remove unused/empty debian/postrm.
-+ closes: #24849 Thanks, Adrian Bridgett <adrian.bridgett@zetnet.co.uk>.
-+ * Install wizard.doc file. closes: #64807 Thanks <amc@arwen.cs.berkeley.edu>.
-+ * Fix libjpeg-progs test.sh.
-+ * Fix lintian bugs: typo in copyright, emacs user info in changelog.
-+ * Fix false lintian bug: unsafe ldconfig in postinst, by reformatting.
-+ * Remove "-g" from CFLAGS per Policy 11.1, hoping m68k is fixed now.
-+ * Remove libtool and Makefile in debian/rules clean.
-+ * Fix the test system. As a side effect,
-+ closes: #109195 Thanks Daniel Schepler <schepler@math.berkeley.edu>
-+ * Standards-Version is now 3.5.6.
-+
-+ -- Bill Allombert <ballombe@debian.org> Fri, 9 Nov 2001 22:40:16 +0100
-+
-+libjpeg6b (6b-1.3) frozen unstable; urgency=low
-+
-+ * Non-Maintainer Upload.
-+ * Added Build-Depends.
-+ * Gil Bahat <coutal@netvision.net.il> did the rest of the changes.
-+ * Close bug regarding non-standard jpegs not being processed
-+ (closes: #74087).
-+ * The output gifs are uncompressed, so have no UNISYS patent issues.
-+ (closes: #24330, #24291).
-+ * Standards-Version is now 3.0.0.
-+
-+ -- Jordi Mallach <jordi@debian.org> Sat, 24 Feb 2001 22:17:38 +0100
-+
-+libjpeg6b (6b-1.2) frozen unstable; urgency=low (HIGH for m68k)
-+
-+ * Non-maintainer release.
-+ * Recompile for m68k since existing djpeg binary claims all jpegs I have
-+ are invalid (yet hamm djpeg has no problem with them).
-+ Specifically, added "-O2 -g -Wall" to CFLAGS -- possible gcc bug?
-+
-+ -- Chris Lawrence <lawrencc@debian.org> Tue, 10 Nov 1998 20:57:38 -0600
-+
-+libjpeg6b (6b-1.1) frozen unstable; urgency=high
-+
-+ * Non-maintainer release.
-+ * Use upstream library soname (62).
-+ * Removed libjpeg-gif package, as the source notes
-+ that the GIF reading has been removed, and the GIFs written
-+ do not infringe on the LZW patent.
-+
-+ -- Joel Klecker <espy@debian.org> Thu, 22 Oct 1998 05:49:48 -0700
-+
-+libjpeg6b (6b-1) unstable; urgency=low
-+
-+ * New binary packages for 6b
-+ * New upstream release
-+
-+ -- Mark Mickan <mmickan@debian.org> Tue, 7 Jul 1998 22:27:10 +0930
-+
-+Local variables:
-+mode: debian-changelog
-+End:
---- libjpeg7-7.orig/debian/libjpeg-progs.files
-+++ libjpeg7-7/debian/libjpeg-progs.files
-@@ -0,0 +1,2 @@
-+usr/bin
-+usr/share/man/man1
---- libjpeg7-7.orig/debian/libjpeg7-dev.docs
-+++ libjpeg7-7/debian/libjpeg7-dev.docs
-@@ -0,0 +1,3 @@
-+libjpeg.txt
-+structure.txt
-+coderules.txt
---- libjpeg7-7.orig/debian/libjpeg-progs.docs
-+++ libjpeg7-7/debian/libjpeg-progs.docs
-@@ -0,0 +1,2 @@
-+usage.txt
-+wizard.txt
---- libjpeg7-7.orig/debian/copyright
-+++ libjpeg7-7/debian/copyright
-@@ -0,0 +1,96 @@
-+This is Debian's prepackaged version of the `jpeg library' by the Independent
-+JPEG Group.
-+
-+This package was created by Mark Mickan <mmickan@debian.org> from sources
-+which can be found at ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz
-+
-+It is partly based on the libjpeg6a package originally put together by
-+Andy Guy <awpguy@acs.ucalgary.ca> and later maintained by Mark Mickan.
-+
-+Current Debian maintainer is Bill Allombert <ballombe@debian.org>.
-+
-+LEGAL ISSUES [ from README supplied with source - MM ]
-+============
-+
-+In plain English:
-+
-+1. We don't promise that this software works. (But if you find any bugs,
-+ please let us know!)
-+2. You can use this software for whatever you want. You don't have to pay us.
-+3. You may not pretend that you wrote this software. If you use it in a
-+ program, you must acknowledge somewhere in your documentation that
-+ you've used the IJG code.
-+
-+In legalese:
-+
-+The authors make NO WARRANTY or representation, either express or implied,
-+with respect to this software, its quality, accuracy, merchantability, or
-+fitness for a particular purpose. This software is provided "AS IS", and you,
-+its user, assume the entire risk as to its quality and accuracy.
-+
-+This software is copyright (C) 1991-2009, Thomas G. Lane, Guido Vollbeding.
-+All Rights Reserved except as specified below.
-+
-+Permission is hereby granted to use, copy, modify, and distribute this
-+software (or portions thereof) for any purpose, without fee, subject to these
-+conditions:
-+(1) If any part of the source code for this software is distributed, then this
-+README file must be included, with this copyright and no-warranty notice
-+unaltered; and any additions, deletions, or changes to the original files
-+must be clearly indicated in accompanying documentation.
-+(2) If only executable code is distributed, then the accompanying
-+documentation must state that "this software is based in part on the work of
-+the Independent JPEG Group".
-+(3) Permission for use of this software is granted only if the user accepts
-+full responsibility for any undesirable consequences; the authors accept
-+NO LIABILITY for damages of any kind.
-+
-+These conditions apply to any software derived from or based on the IJG code,
-+not just to the unmodified library. If you use our work, you ought to
-+acknowledge us.
-+
-+Permission is NOT granted for the use of any IJG author's name or company name
-+in advertising or publicity relating to this software or products derived from
-+it. This software may be referred to only as "the Independent JPEG Group's
-+software".
-+
-+We specifically permit and encourage the use of this software as the basis of
-+commercial products, provided that all warranty or liability claims are
-+assumed by the product vendor.
-+
-+
-+ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
-+sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
-+ansi2knr.c is NOT covered by the above copyright and conditions, but instead
-+by the usual distribution terms of the Free Software Foundation; principally,
-+that you must include source code if you redistribute it. (See the file
-+ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part
-+of any program generated from the IJG code, this does not limit you more than
-+the foregoing paragraphs do.
-+
-+The Unix configuration script "configure" was produced with GNU Autoconf.
-+It is copyright by the Free Software Foundation but is freely distributable.
-+The same holds for its supporting scripts (config.guess, config.sub,
-+ltconfig, ltmain.sh). Another support script, install-sh, is copyright
-+by M.I.T. but is also freely distributable.
-+
-+It appears that the arithmetic coding option of the JPEG spec is covered by
-+patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot
-+legally be used without obtaining one or more licenses. For this reason,
-+support for arithmetic coding has been removed from the free JPEG software.
-+(Since arithmetic coding provides only a marginal gain over the unpatented
-+Huffman mode, it is unlikely that very many implementations will support it.)
-+So far as we are aware, there are no patent restrictions on the remaining
-+code.
-+
-+The IJG distribution formerly included code to read and write GIF files.
-+To avoid entanglement with the Unisys LZW patent, GIF reading support has
-+been removed altogether, and the GIF writer has been simplified to produce
-+"uncompressed GIFs". This technique does not use the LZW algorithm; the
-+resulting GIF files are larger than usual, but are readable by all standard
-+GIF decoders.
-+
-+We are required to state that
-+ "The Graphics Interchange Format(c) is the Copyright property of
-+ CompuServe Incorporated. GIF(sm) is a Service Mark property of
-+ CompuServe Incorporated."
---- libjpeg7-7.orig/debian/extra/jpegexiforient.c
-+++ libjpeg7-7/debian/extra/jpegexiforient.c
-@@ -0,0 +1,299 @@
-+/*
-+ * jpegexiforient.c
-+ *
-+ * This is a utility program to get and set the Exif Orientation Tag.
-+ * It can be used together with jpegtran in scripts for automatic
-+ * orientation correction of digital camera pictures.
-+ *
-+ * The Exif orientation value gives the orientation of the camera
-+ * relative to the scene when the image was captured. The relation
-+ * of the '0th row' and '0th column' to visual position is shown as
-+ * below.
-+ *
-+ * Value | 0th Row | 0th Column
-+ * ------+-------------+-----------
-+ * 1 | top | left side
-+ * 2 | top | rigth side
-+ * 3 | bottom | rigth side
-+ * 4 | bottom | left side
-+ * 5 | left side | top
-+ * 6 | right side | top
-+ * 7 | right side | bottom
-+ * 8 | left side | bottom
-+ *
-+ * For convenience, here is what the letter F would look like if it were
-+ * tagged correctly and displayed by a program that ignores the orientation
-+ * tag:
-+ *
-+ * 1 2 3 4 5 6 7 8
-+ *
-+ * 888888 888888 88 88 8888888888 88 88 8888888888
-+ * 88 88 88 88 88 88 88 88 88 88 88 88
-+ * 8888 8888 8888 8888 88 8888888888 8888888888 88
-+ * 88 88 88 88
-+ * 88 88 888888 888888
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+static FILE * myfile; /* My JPEG file */
-+
-+static unsigned char exif_data[65536L];
-+
-+/* Return next input byte, or EOF if no more */
-+#define NEXTBYTE() getc(myfile)
-+
-+/* Error exit handler */
-+#define ERREXIT(msg) (exit(0))
-+
-+/* Read one byte, testing for EOF */
-+static int
-+read_1_byte (void)
-+{
-+ int c;
-+
-+ c = NEXTBYTE();
-+ if (c == EOF)
-+ ERREXIT("Premature EOF in JPEG file");
-+ return c;
-+}
-+
-+/* Read 2 bytes, convert to unsigned int */
-+/* All 2-byte quantities in JPEG markers are MSB first */
-+static unsigned int
-+read_2_bytes (void)
-+{
-+ int c1, c2;
-+
-+ c1 = NEXTBYTE();
-+ if (c1 == EOF)
-+ ERREXIT("Premature EOF in JPEG file");
-+ c2 = NEXTBYTE();
-+ if (c2 == EOF)
-+ ERREXIT("Premature EOF in JPEG file");
-+ return (((unsigned int) c1) << 8) + ((unsigned int) c2);
-+}
-+
-+static const char * progname; /* program name for error messages */
-+
-+static void
-+usage (FILE *out)
-+/* complain about bad command line */
-+{
-+ fprintf(out, "jpegexiforient reads or writes the Exif Orientation Tag ");
-+ fprintf(out, "in a JPEG Exif file.\n");
-+
-+ fprintf(out, "Usage: %s [switches] jpegfile\n", progname);
-+
-+ fprintf(out, "Switches:\n");
-+ fprintf(out, " --help display this help and exit\n");
-+ fprintf(out, " --version output version information and exit\n");
-+ fprintf(out, " -n Do not output the trailing newline\n");
-+ fprintf(out, " -1 .. -8 Set orientation value 1 .. 8\n");
-+}
-+
-+/*
-+ * The main program.
-+ */
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int n_flag, set_flag;
-+ unsigned int length, i;
-+ int is_motorola; /* Flag for byte order */
-+ unsigned int offset, number_of_tags, tagnum;
-+
-+ progname = argv[0];
-+ if (progname == NULL || progname[0] == 0)
-+ progname = "jpegexiforient"; /* in case C library doesn't provide it */
-+
-+ if (argc < 2) { usage(stderr); return 1; }
-+
-+ n_flag = 0; set_flag = 0;
-+
-+ i = 1;
-+ while (argv[i][0] == '-') {
-+ switch (argv[i][1]) {
-+ case '-':
-+ switch (argv[i][2]) {
-+ case 'h': usage(stdout); return 0;
-+ case 'v': fprintf(stdout,"jpegexiforient\n"); return 0;
-+ }
-+ case 'n':
-+ n_flag = 1;
-+ break;
-+ case '1':
-+ case '2':
-+ case '3':
-+ case '4':
-+ case '5':
-+ case '6':
-+ case '7':
-+ case '8':
-+ set_flag = argv[i][1] - '0';
-+ break;
-+ default:
-+ usage(stderr); return 1;
-+ }
-+ if (++i >= argc) { usage(stderr); return 1; }
-+ }
-+
-+ if (set_flag) {
-+ if ((myfile = fopen(argv[i], "rb+")) == NULL) {
-+ fprintf(stderr, "%s: can't open %s\n", progname, argv[i]);
-+ return 0;
-+ }
-+ } else {
-+ if ((myfile = fopen(argv[i], "rb")) == NULL) {
-+ fprintf(stderr, "%s: can't open %s\n", progname, argv[i]);
-+ return 0;
-+ }
-+ }
-+
-+ /* Read File head, check for JPEG SOI + Exif APP1 */
-+ for (i = 0; i < 4; i++)
-+ exif_data[i] = (unsigned char) read_1_byte();
-+ if (exif_data[0] != 0xFF ||
-+ exif_data[1] != 0xD8 ||
-+ exif_data[2] != 0xFF ||
-+ exif_data[3] != 0xE1)
-+ return 0;
-+
-+ /* Get the marker parameter length count */
-+ length = read_2_bytes();
-+ /* Length includes itself, so must be at least 2 */
-+ /* Following Exif data length must be at least 6 */
-+ if (length < 8)
-+ return 0;
-+ length -= 8;
-+ /* Read Exif head, check for "Exif" */
-+ for (i = 0; i < 6; i++)
-+ exif_data[i] = (unsigned char) read_1_byte();
-+ if (exif_data[0] != 0x45 ||
-+ exif_data[1] != 0x78 ||
-+ exif_data[2] != 0x69 ||
-+ exif_data[3] != 0x66 ||
-+ exif_data[4] != 0 ||
-+ exif_data[5] != 0)
-+ return 0;
-+ /* Read Exif body */
-+ for (i = 0; i < length; i++)
-+ exif_data[i] = (unsigned char) read_1_byte();
-+
-+ if (length < 12) return 0; /* Length of an IFD entry */
-+
-+ /* Discover byte order */
-+ if (exif_data[0] == 0x49 && exif_data[1] == 0x49)
-+ is_motorola = 0;
-+ else if (exif_data[0] == 0x4D && exif_data[1] == 0x4D)
-+ is_motorola = 1;
-+ else
-+ return 0;
-+
-+ /* Check Tag Mark */
-+ if (is_motorola) {
-+ if (exif_data[2] != 0) return 0;
-+ if (exif_data[3] != 0x2A) return 0;
-+ } else {
-+ if (exif_data[3] != 0) return 0;
-+ if (exif_data[2] != 0x2A) return 0;
-+ }
-+
-+ /* Get first IFD offset (offset to IFD0) */
-+ if (is_motorola) {
-+ if (exif_data[4] != 0) return 0;
-+ if (exif_data[5] != 0) return 0;
-+ offset = exif_data[6];
-+ offset <<= 8;
-+ offset += exif_data[7];
-+ } else {
-+ if (exif_data[7] != 0) return 0;
-+ if (exif_data[6] != 0) return 0;
-+ offset = exif_data[5];
-+ offset <<= 8;
-+ offset += exif_data[4];
-+ }
-+ if (offset > length - 2) return 0; /* check end of data segment */
-+
-+ /* Get the number of directory entries contained in this IFD */
-+ if (is_motorola) {
-+ number_of_tags = exif_data[offset];
-+ number_of_tags <<= 8;
-+ number_of_tags += exif_data[offset+1];
-+ } else {
-+ number_of_tags = exif_data[offset+1];
-+ number_of_tags <<= 8;
-+ number_of_tags += exif_data[offset];
-+ }
-+ if (number_of_tags == 0) return 0;
-+ offset += 2;
-+
-+ /* Search for Orientation Tag in IFD0 */
-+ for (;;) {
-+ if (offset > length - 12) return 0; /* check end of data segment */
-+ /* Get Tag number */
-+ if (is_motorola) {
-+ tagnum = exif_data[offset];
-+ tagnum <<= 8;
-+ tagnum += exif_data[offset+1];
-+ } else {
-+ tagnum = exif_data[offset+1];
-+ tagnum <<= 8;
-+ tagnum += exif_data[offset];
-+ }
-+ if (tagnum == 0x0112) break; /* found Orientation Tag */
-+ if (--number_of_tags == 0) return 0;
-+ offset += 12;
-+ }
-+
-+ if (set_flag) {
-+ /* Set the Orientation value */
-+ if (is_motorola) {
-+ exif_data[offset+2] = 0; /* Format = unsigned short (2 octets) */
-+ exif_data[offset+3] = 3;
-+ exif_data[offset+4] = 0; /* Number Of Components = 1 */
-+ exif_data[offset+5] = 0;
-+ exif_data[offset+6] = 0;
-+ exif_data[offset+7] = 1;
-+ exif_data[offset+8] = 0;
-+ exif_data[offset+9] = (unsigned char)set_flag;
-+ exif_data[offset+10] = 0;
-+ exif_data[offset+11] = 0;
-+ } else {
-+ exif_data[offset+2] = 3; /* Format = unsigned short (2 octets) */
-+ exif_data[offset+3] = 0;
-+ exif_data[offset+4] = 1; /* Number Of Components = 1 */
-+ exif_data[offset+5] = 0;
-+ exif_data[offset+6] = 0;
-+ exif_data[offset+7] = 0;
-+ exif_data[offset+8] = (unsigned char)set_flag;
-+ exif_data[offset+9] = 0;
-+ exif_data[offset+10] = 0;
-+ exif_data[offset+11] = 0;
-+ }
-+ fseek(myfile, (4 + 2 + 6 + 2) + offset, SEEK_SET);
-+ fwrite(exif_data + 2 + offset, 1, 10, myfile);
-+ } else {
-+ /* Get the Orientation value */
-+ if (is_motorola) {
-+ if (exif_data[offset+8] != 0) return 0;
-+ set_flag = exif_data[offset+9];
-+ } else {
-+ if (exif_data[offset+9] != 0) return 0;
-+ set_flag = exif_data[offset+8];
-+ }
-+ if (set_flag > 8) return 0;
-+ }
-+
-+ /* Write out Orientation value */
-+ if (n_flag)
-+ printf("%c", '0' + set_flag);
-+ else
-+ printf("%c\n", '0' + set_flag);
-+
-+ /* All done. */
-+ return 0;
-+}
---- libjpeg7-7.orig/debian/extra/exifautotran.1
-+++ libjpeg7-7/debian/extra/exifautotran.1
-@@ -0,0 +1,13 @@
-+.TH EXIFAUTOTRAN "1" "February 2005" "exifautotran" "User Commands"
-+.SH NAME
-+exifautotran \- Transforms Exif files so that Orientation becomes 1
-+.SH DESCRIPTION
-+exifautotran [list of files]
-+.PP
-+Take a list of files as input and transform them in place so that the
-+Orientation becomes 1.
-+.SH "AUTHOR"
-+ Guido Vollbeding <guido@jpegclub.org>
-+.SH "SEE ALSO"
-+.BR jpegtran(1)
-+.BR jpegexiforient(1)
---- libjpeg7-7.orig/debian/extra/jpegexiforient.1
-+++ libjpeg7-7/debian/extra/jpegexiforient.1
-@@ -0,0 +1,73 @@
-+.TH JPEGEXIFORIENT "1" "February 2005" "jpegexiforient" "User Commands"
-+.SH NAME
-+jpegexiforient \- reads or writes the Exif Orientation Tag
-+.SH SYNOPSIS
-+.B jpegexiforient
-+[\fIswitches\fR] \fIjpegfile\fR
-+.SH DESCRIPTION
-+.
-+This is a utility program to get and set the Exif Orientation Tag.
-+It can be used together with jpegtran in scripts for automatic
-+orientation correction of digital camera pictures.
-+.PP
-+The Exif orientation value gives the orientation of the camera
-+relative to the scene when the image was captured. The relation
-+of the '0th row' and '0th column' to visual position is shown as
-+below.
-+.IP
-+.nf
-+.ft CR
-+Value | 0th Row | 0th Column
-+------+-------------+-----------
-+ 1 | top | left side
-+ 2 | top | rigth side
-+ 3 | bottom | rigth side
-+ 4 | bottom | left side
-+ 5 | left side | top
-+ 6 | right side | top
-+ 7 | right side | bottom
-+ 8 | left side | bottom
-+.fi
-+.PP
-+For convenience, here is what the letter F would look like if it were
-+tagged correctly and displayed by a program that ignores the orientation
-+tag:
-+.IP
-+.nf
-+.ft CB
-+ 1 2 3 4
-+
-+888888 888888 88 88
-+88 88 88 88
-+8888 8888 8888 8888
-+88 88 88 88
-+88 88 888888 888888
-+
-+ 5 6 7 8
-+
-+8888888888 88 88 8888888888
-+88 88 88 88 88 88 88 88
-+88 8888888888 8888888888 88
-+.fi
-+.PP
-+jpegexiforient output the Exif Orientation Tag in a JPEG Exif file.
-+With the options -1 .. -8, it can also be used to set the tag.
-+.
-+.SS "OPTIONS"
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
-+.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.TP
-+\fB\-n\fR
-+Do not output the trailing newline
-+.TP
-+\fB\-1\fR .. \fB\-8\fR
-+Set orientation value 1 .. 8
-+.SH "AUTHOR"
-+ Guido Vollbeding <guido@jpegclub.org>
-+.SH "SEE ALSO"
-+.BR jpegtran(1)
-+.BR exifautotran(1)
---- libjpeg7-7.orig/debian/extra/exifautotran
-+++ libjpeg7-7/debian/extra/exifautotran
-@@ -0,0 +1,50 @@
-+#!/bin/sh
-+# exifautotran [list of files]
-+#
-+# Transforms Exif files so that Orientation becomes 1
-+#
-+
-+trap "if test -n \"\$tempfile\"; then rm -f \"\$tempfile\"; fi" INT QUIT TERM
-+
-+for i
-+do
-+ case $i in
-+ -v|--version) echo "exifautotran"; exit 0;;
-+ -h|--help)
-+ cat <<EOF
-+exifautotran [list of files]
-+
-+Transforms Exif files so that Orientation becomes 1
-+EOF
-+ exit 0;;
-+ esac
-+
-+ case `jpegexiforient -n "$i"` in
-+ 1) transform="";;
-+ 2) transform="-flip horizontal";;
-+ 3) transform="-rotate 180";;
-+ 4) transform="-flip vertical";;
-+ 5) transform="-transpose";;
-+ 6) transform="-rotate 90";;
-+ 7) transform="-transverse";;
-+ 8) transform="-rotate 270";;
-+ *) transform="";;
-+ esac
-+ if test -n "$transform"; then
-+ tempfile=`mktemp`;
-+ if test "$?" -ne "0"; then
-+ echo "Failed to create temporary file" >&2
-+ exit 1;
-+ fi
-+ echo Executing: jpegtran -copy all $transform $i >&2
-+ jpegtran -copy all $transform "$i" > $tempfile
-+ if test $? -ne 0; then
-+ echo Error while transforming $i - skipped. >&2
-+ rm "$tempfile"
-+ else
-+ cp "$tempfile" "$i"
-+ rm "$tempfile"
-+ jpegexiforient -1 "$i" > /dev/null
-+ fi
-+ fi
-+done
---- libjpeg7-7.orig/debian/extra/Makefile
-+++ libjpeg7-7/debian/extra/Makefile
-@@ -0,0 +1,22 @@
-+CFLAGS = -O2 -Wall -g
-+CC = cc
-+INSTALL = install -m755 -o root -g root
-+INSTALLDIR = install -m755 -o root -g root -d
-+DESTDIR =
-+prefix = /usr/local
-+bindir = $(prefix)/bin
-+mandir = $(prefix)/share/man/man1
-+
-+all: jpegexiforient
-+
-+jpegexiforient: jpegexiforient.c
-+ $(CC) $(CFLAGS) -o jpegexiforient jpegexiforient.c
-+clean:
-+ -rm -f jpegexiforient
-+install:
-+ $(INSTALLDIR) $(DESTDIR)$(bindir)
-+ $(INSTALLDIR) $(DESTDIR)$(mandir)
-+ $(INSTALL) jpegexiforient $(DESTDIR)$(bindir)
-+ $(INSTALL) jpegexiforient.1 $(DESTDIR)$(mandir)
-+ $(INSTALL) exifautotran $(DESTDIR)$(bindir)
-+ $(INSTALL) exifautotran.1 $(DESTDIR)$(mandir)
diff --git a/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch b/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
deleted file mode 100644
index 3a970ea..0000000
--- a/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream-Status: Pending
-
-The support for automatic de-ANSI-fication has been deprecated in
-automake 1.11.2, and will be removed altogether in automake 1.12
-
-This avoids this error:
-| configure.ac:24: automatic de-ANSI-fication support is deprecated
-| autoreconf: automake failed with exit status: 1
-| ERROR: autoreconf execution failed.
-NOTE: package jpeg-native-8c-r2: task do_configure: Failed
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2011/12/28
-
-
-Index: jpeg-8d/configure.ac
-===================================================================
---- jpeg-8d.orig/configure.ac
-+++ jpeg-8d/configure.ac
-@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
-
- # Initialize Automake
- # Don't require all the GNU mandated files
--AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete ansi2knr no-dist foreign])
-+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete no-dist foreign])
-
- # Make --enable-silent-rules the default.
- # To get verbose build output you may configure
-@@ -29,7 +29,14 @@ AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obs
- AM_SILENT_RULES([yes])
-
- # This is required when using the de-ANSI-fication feature.
--AM_C_PROTOTYPES
-+#AM_C_PROTOTYPES
-+# add following to avoid this error:
-+#| automake: warnings are treated as errors
-+#| /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libjpeg.la': linking libtool libraries using a non-POSIX
-+#| /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
-+#| Makefile.am:65: while processing Libtool library 'libjpeg.la'
-+#| autoreconf: automake failed with exit status: 1
-+AM_PROG_AR
-
- # Add configure option --enable-maintainer-mode which enables
- # dependency checking and generation useful to package maintainers.
diff --git a/meta/recipes-core/jpeg/jpeg_8d.bb b/meta/recipes-core/jpeg/jpeg_9a.bb
similarity index 55%
rename from meta/recipes-core/jpeg/jpeg_8d.bb
rename to meta/recipes-core/jpeg/jpeg_9a.bb
index da23302..dccbdcd 100644
--- a/meta/recipes-core/jpeg/jpeg_8d.bb
+++ b/meta/recipes-core/jpeg/jpeg_9a.bb
@@ -3,40 +3,20 @@ DESCRIPTION = "libjpeg contains a library for handling the JPEG (JFIF) image for
HOMEPAGE = "http://www.ijg.org/"
LICENSE ="BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://README;md5=4f46756b064c225fae088903300e5c98"
+LIC_FILES_CHKSUM = "file://README;md5=ea93a8a2fed10106b63bc21679edacb9"
SECTION = "libs"
-DEPENDS = "libtool-cross"
-DEPENDS_class-native = "libtool-native"
-
PR = "r1"
SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
- file://debian-libjpeg7_7-1.diff \
- file://fix_for_automake_1.12.1.patch"
+ "
-SRC_URI[md5sum] = "52654eb3b2e60c35731ea8fc87f1bd29"
-SRC_URI[sha256sum] = "00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3"
+SRC_URI[md5sum] = "3353992aecaee1805ef4109aadd433e7"
+SRC_URI[sha256sum] = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"
inherit autotools
-EXTRA_OECONF="--enable-static --enable-shared"
-EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"'
-
-CFLAGS_append = " -D_REENTRANT"
-
-do_configure_prepend () {
- rm -f ${S}/ltconfig
- rm -f ${S}/ltmain.sh
-}
-
-do_install() {
- install -d ${D}${bindir} ${D}${includedir} \
- ${D}${mandir}/man1 ${D}${libdir}
- oe_runmake 'DESTDIR=${D}' install
-}
-
PACKAGES =+ "jpeg-tools "
DESCRIPTION_jpeg-tools = "The jpeg-tools package includes the client programs for access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files."
FILES_jpeg-tools = "${bindir}/*"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (3 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 04/22] Update jpeg recipe to version 9a Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 14:59 ` Jussi Kukkonen
[not found] ` <CALbNGRS5T12OGFK-C9B4DSyWsz-nRe8zsm=8_xnv4xtqhBHUXg@mail.gmail.com>
2015-06-17 13:19 ` [PATCH 06/22] Add a recipe for giflib Alexander Kanavin
` (17 subsequent siblings)
22 siblings, 2 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
New webkit requires at least version 0.7
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../libnotify/{libnotify_0.6.0.bb => libnotify_0.7.6.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-gnome/libnotify/{libnotify_0.6.0.bb => libnotify_0.7.6.bb} (66%)
diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
similarity index 66%
rename from meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
rename to meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
index e6ee89b..e9363e8 100644
--- a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
+++ b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
@@ -5,15 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
PR = "r1"
-DEPENDS = "dbus gtk+ dbus-glib"
+DEPENDS = "dbus gtk+3 dbus-glib"
-inherit gnomebase distro_features_check
+inherit gnomebase distro_features_check gtk-doc
# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516"
-SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210"
+SRC_URI[archive.md5sum] = "a4997019d08f46f3bf57b78e6f795a59"
+SRC_URI[archive.sha256sum] = "0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837"
do_configure_prepend() {
sed -i /GTK3/d ${S}/configure.ac
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-17 13:19 ` [PATCH 05/22] Update libnotify to version 0.7.6 Alexander Kanavin
@ 2015-06-17 14:59 ` Jussi Kukkonen
2015-06-18 11:23 ` Alexander Kanavin
[not found] ` <CALbNGRS5T12OGFK-C9B4DSyWsz-nRe8zsm=8_xnv4xtqhBHUXg@mail.gmail.com>
1 sibling, 1 reply; 38+ messages in thread
From: Jussi Kukkonen @ 2015-06-17 14:59 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On 17 June 2015 at 16:19, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> New webkit requires at least version 0.7
0.6 is the last release that supports GTK+2 and changing this might
annoy people who are avoiding GTK+3 and are using some of the recipes
in meta-oe that depend on libnotify.
I believe the GTK dependency is only there for tests: Modifying the
build so it doesn't build tests and doesn't depend on GTK should not
be difficult.
- Jussi
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> .../libnotify/{libnotify_0.6.0.bb => libnotify_0.7.6.bb} | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
> rename meta/recipes-gnome/libnotify/{libnotify_0.6.0.bb => libnotify_0.7.6.bb} (66%)
>
> diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
> similarity index 66%
> rename from meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
> rename to meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
> index e6ee89b..e9363e8 100644
> --- a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
> +++ b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
> @@ -5,15 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
>
> PR = "r1"
>
> -DEPENDS = "dbus gtk+ dbus-glib"
> +DEPENDS = "dbus gtk+3 dbus-glib"
>
> -inherit gnomebase distro_features_check
> +inherit gnomebase distro_features_check gtk-doc
>
> # Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES
> REQUIRED_DISTRO_FEATURES = "x11"
>
> -SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516"
> -SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210"
> +SRC_URI[archive.md5sum] = "a4997019d08f46f3bf57b78e6f795a59"
> +SRC_URI[archive.sha256sum] = "0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837"
>
> do_configure_prepend() {
> sed -i /GTK3/d ${S}/configure.ac
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-17 14:59 ` Jussi Kukkonen
@ 2015-06-18 11:23 ` Alexander Kanavin
2015-06-18 12:35 ` Andreas Müller
0 siblings, 1 reply; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-18 11:23 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer
On 06/17/2015 05:59 PM, Jussi Kukkonen wrote:
> 0.6 is the last release that supports GTK+2 and changing this might
> annoy people who are avoiding GTK+3 and are using some of the recipes
> in meta-oe that depend on libnotify.
>
> I believe the GTK dependency is only there for tests: Modifying the
> build so it doesn't build tests and doesn't depend on GTK should not
> be difficult.
There is no way to switch off tests building in libnotify, so dropping
the gtk3 dependency means developing a custom source patch. I'd rather
do that only if there are specific complaints.
Alex
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-18 11:23 ` Alexander Kanavin
@ 2015-06-18 12:35 ` Andreas Müller
2015-06-18 13:02 ` Martin Jansa
2015-06-18 13:16 ` Alexander Kanavin
0 siblings, 2 replies; 38+ messages in thread
From: Andreas Müller @ 2015-06-18 12:35 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Thu, Jun 18, 2015 at 1:23 PM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 06/17/2015 05:59 PM, Jussi Kukkonen wrote:
>>
>> 0.6 is the last release that supports GTK+2 and changing this might
>> annoy people who are avoiding GTK+3 and are using some of the recipes
>> in meta-oe that depend on libnotify.
>>
>> I believe the GTK dependency is only there for tests: Modifying the
>> build so it doesn't build tests and doesn't depend on GTK should not
>> be difficult.
>
>
> There is no way to switch off tests building in libnotify, so dropping the
> gtk3 dependency means developing a custom source patch. I'd rather do that
> only if there are specific complaints.
>
I think gtk3 is not the problem here it is the API change libnotify
0.6 -> 0.7 which cannot (or only by ugly hacks) be installed parallel.
Do we know what happens to meta-gnome/meta-xfce?
Andreas
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-18 12:35 ` Andreas Müller
@ 2015-06-18 13:02 ` Martin Jansa
2015-06-18 13:16 ` Alexander Kanavin
1 sibling, 0 replies; 38+ messages in thread
From: Martin Jansa @ 2015-06-18 13:02 UTC (permalink / raw)
To: Andreas Müller; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
On Thu, Jun 18, 2015 at 02:35:20PM +0200, Andreas Müller wrote:
> On Thu, Jun 18, 2015 at 1:23 PM, Alexander Kanavin
> <alexander.kanavin@linux.intel.com> wrote:
> > On 06/17/2015 05:59 PM, Jussi Kukkonen wrote:
> >>
> >> 0.6 is the last release that supports GTK+2 and changing this might
> >> annoy people who are avoiding GTK+3 and are using some of the recipes
> >> in meta-oe that depend on libnotify.
> >>
> >> I believe the GTK dependency is only there for tests: Modifying the
> >> build so it doesn't build tests and doesn't depend on GTK should not
> >> be difficult.
> >
> >
> > There is no way to switch off tests building in libnotify, so dropping the
> > gtk3 dependency means developing a custom source patch. I'd rather do that
> > only if there are specific complaints.
> >
> I think gtk3 is not the problem here it is the API change libnotify
> 0.6 -> 0.7 which cannot (or only by ugly hacks) be installed parallel.
> Do we know what happens to meta-gnome/meta-xfce?
I think they will get broken like 2 years ago when we tried to do this:
http://permalink.gmane.org/gmane.comp.handhelds.openembedded/57913
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-18 12:35 ` Andreas Müller
2015-06-18 13:02 ` Martin Jansa
@ 2015-06-18 13:16 ` Alexander Kanavin
2015-06-18 14:42 ` Andreas Müller
1 sibling, 1 reply; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-18 13:16 UTC (permalink / raw)
To: Andreas Müller; +Cc: Patches and discussions about the oe-core layer
On 06/18/2015 03:35 PM, Andreas Müller wrote:
> I think gtk3 is not the problem here it is the API change libnotify
> 0.6 -> 0.7 which cannot (or only by ugly hacks) be installed parallel.
> Do we know what happens to meta-gnome/meta-xfce?
The packages in meta-gnome that fail because of new libnotify are all
five year old, unmaintained 2.32.something versions.
Let's just accept that meta-gnome needs to get a massive update to 3.x,
those who don't like gnome 3.x need to seek alternative desktops and
move on.
Regards,
Alex
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-18 13:16 ` Alexander Kanavin
@ 2015-06-18 14:42 ` Andreas Müller
2015-06-19 21:41 ` Andreas Müller
0 siblings, 1 reply; 38+ messages in thread
From: Andreas Müller @ 2015-06-18 14:42 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Thu, Jun 18, 2015 at 3:16 PM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 06/18/2015 03:35 PM, Andreas Müller wrote:
>
>> I think gtk3 is not the problem here it is the API change libnotify
>> 0.6 -> 0.7 which cannot (or only by ugly hacks) be installed parallel.
>> Do we know what happens to meta-gnome/meta-xfce?
>
>
> The packages in meta-gnome that fail because of new libnotify are all five
> year old, unmaintained 2.32.something versions.
>
> Let's just accept that meta-gnome needs to get a massive update to 3.x,
> those who don't like gnome 3.x need to seek alternative desktops and move
> on.
>
Cool: you send patches having no idea what efforts are caused and give
helping hints as 'let's move on'. From my experience guys like you
will not give any support in 'moving on' as the only scope is academic
'core-image-sato' building green for quemux86.
Over and out
Andreas
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-18 14:42 ` Andreas Müller
@ 2015-06-19 21:41 ` Andreas Müller
2015-06-22 12:34 ` Alexander Kanavin
0 siblings, 1 reply; 38+ messages in thread
From: Andreas Müller @ 2015-06-19 21:41 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Thu, Jun 18, 2015 at 4:42 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Thu, Jun 18, 2015 at 3:16 PM, Alexander Kanavin
> <alexander.kanavin@linux.intel.com> wrote:
>> On 06/18/2015 03:35 PM, Andreas Müller wrote:
>>
>>> I think gtk3 is not the problem here it is the API change libnotify
>>> 0.6 -> 0.7 which cannot (or only by ugly hacks) be installed parallel.
>>> Do we know what happens to meta-gnome/meta-xfce?
>>
>>
>> The packages in meta-gnome that fail because of new libnotify are all five
>> year old, unmaintained 2.32.something versions.
>>
>> Let's just accept that meta-gnome needs to get a massive update to 3.x,
>> those who don't like gnome 3.x need to seek alternative desktops and move
>> on.
>>
> Cool: you send patches having no idea what efforts are caused and give
> helping hints as 'let's move on'. From my experience guys like you
> will not give any support in 'moving on' as the only scope is academic
> 'core-image-sato' building green for quemux86.
>
> Over and out
>
Hi Alexander,
Emotional part: I am sorry for my last email's style and I hope this
does not cause lack of motivation on your side. This was definitely
not an email that should have gone out this way.
Technical part: Although your patches break things I think _now_ that
they point in the right direction. The old gnome stuff turns into a
maintenance burden with every new tool/library introduced. As Martin
pointed out: I have tried to update libnotify two years ago and
stopped due to huge fallout.
Now we expect same but the situation is different: We have stable
releases of better quality than two years ago. If still interested in
gnome 2 style user experience and not accepting gnome 3 one could work
with releases (or implement/use alternatives Mate/Xfce..).
One note regarding gnome 3: I played around with gnome 3 long time ago
but stopped messing around with gobject-introspection which looked
mandatory for some packages. I think if we want to migrate meta-gnome
to gnome 3 we should think of migrating meta-gir to meta-gnome.
Andreas
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 05/22] Update libnotify to version 0.7.6
2015-06-19 21:41 ` Andreas Müller
@ 2015-06-22 12:34 ` Alexander Kanavin
0 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-22 12:34 UTC (permalink / raw)
To: Andreas Müller; +Cc: Patches and discussions about the oe-core layer
On 06/20/2015 12:41 AM, Andreas Müller wrote:
> Emotional part: I am sorry for my last email's style and I hope this
> does not cause lack of motivation on your side. This was definitely
> not an email that should have gone out this way.
Thank you Andreas, I very much appreciate you saying this. Also my email
had the wrong tone, a bit too blunt and provocative perhaps.
> Technical part: Although your patches break things I think _now_ that
> they point in the right direction. The old gnome stuff turns into a
> maintenance burden with every new tool/library introduced. As Martin
> pointed out: I have tried to update libnotify two years ago and
> stopped due to huge fallout.
> Now we expect same but the situation is different: We have stable
> releases of better quality than two years ago. If still interested in
> gnome 2 style user experience and not accepting gnome 3 one could work
> with releases (or implement/use alternatives Mate/Xfce..).
I have looked at recent commit history for meta-gnome; my impression is
that it only gets ad-hoc patching so that things still compile, and
nobody is doing a systematic effort to keep things up to date and
working. So the layer is effectively unmaintained and slowly bit rots.
> One note regarding gnome 3: I played around with gnome 3 long time ago
> but stopped messing around with gobject-introspection which looked
> mandatory for some packages. I think if we want to migrate meta-gnome
> to gnome 3 we should think of migrating meta-gir to meta-gnome.
Yes; getting gobject-introspection to work and perhaps taking it into
oe-core is something that we'd really like to do, so I plan to look at
it when I have a bit of breathing space later this or next week.
Regards,
Alex
^ permalink raw reply [flat|nested] 38+ messages in thread
[parent not found: <CALbNGRS5T12OGFK-C9B4DSyWsz-nRe8zsm=8_xnv4xtqhBHUXg@mail.gmail.com>]
* [PATCH 05/22] Update libnotify to version 0.7.6
[not found] ` <CALbNGRS5T12OGFK-C9B4DSyWsz-nRe8zsm=8_xnv4xtqhBHUXg@mail.gmail.com>
@ 2015-06-17 15:01 ` Andreas Müller
0 siblings, 0 replies; 38+ messages in thread
From: Andreas Müller @ 2015-06-17 15:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, Jun 17, 2015 at 3:19 PM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> New webkit requires at least version 0.7
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> .../libnotify/{libnotify_0.6.0.bb => libnotify_0.7.6.bb} | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
> rename meta/recipes-gnome/libnotify/{libnotify_0.6.0.bb => libnotify_0.7.6.bb} (66%)
>
> diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
> similarity index 66%
> rename from meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
> rename to meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
> index e6ee89b..e9363e8 100644
> --- a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
> +++ b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb
> @@ -5,15 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
>
> PR = "r1"
^ Please remove
>
> -DEPENDS = "dbus gtk+ dbus-glib"
> +DEPENDS = "dbus gtk+3 dbus-glib"
>
> -inherit gnomebase distro_features_check
> +inherit gnomebase distro_features_check gtk-doc
>
> # Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES
> REQUIRED_DISTRO_FEATURES = "x11"
>
> -SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516"
> -SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210"
> +SRC_URI[archive.md5sum] = "a4997019d08f46f3bf57b78e6f795a59"
> +SRC_URI[archive.sha256sum] = "0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837"
>
> do_configure_prepend() {
> sed -i /GTK3/d ${S}/configure.ac
> --
> 2.1.4
>
Just a note - I tried similar 2 years ago in meta-oe but stopped. If I
remember correct there were other packages to be updated due to API
change and these required gobject introspection which was not
available and still is missing in layers affected. What I know
definitely is that xfce4-notify will fail with this. I don't want to
be misunderstood: This is just a 'be prepared'.
Andreas
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 06/22] Add a recipe for giflib
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (4 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 05/22] Update libnotify to version 0.7.6 Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 07/22] Add a recipe for libyaml Alexander Kanavin
` (16 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
This is a dependency of libwebp (which is a dependency of webkit)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-devtools/giflib/giflib_5.1.1.bb | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 meta/recipes-devtools/giflib/giflib_5.1.1.bb
diff --git a/meta/recipes-devtools/giflib/giflib_5.1.1.bb b/meta/recipes-devtools/giflib/giflib_5.1.1.bb
new file mode 100644
index 0000000..0553f57
--- /dev/null
+++ b/meta/recipes-devtools/giflib/giflib_5.1.1.bb
@@ -0,0 +1,20 @@
+SUMMARY = "shared library for GIF images"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2"
+
+inherit autotools
+
+PACKAGES += "${PN}-utils"
+FILES_${PN} = "${libdir}/libgif.so.*"
+FILES_${PN}-utils = "${bindir}"
+
+BBCLASSEXTEND = "native"
+
+RDEPENDS_${PN}-utils = "perl"
+
+SRC_URI[md5sum] = "1c39333192712788c6568c78a949f13e"
+SRC_URI[sha256sum] = "391014aceb21c8b489dc7b0d0b6a917c4e32cc014ce2426d47ca376d02fe2ffc"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 07/22] Add a recipe for libyaml
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (5 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 06/22] Add a recipe for giflib Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 08/22] Add a recipe for ruby Alexander Kanavin
` (15 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
libyaml is a dependency of ruby
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-support/libyaml/libyaml_0.1.6.bb | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 meta/recipes-support/libyaml/libyaml_0.1.6.bb
diff --git a/meta/recipes-support/libyaml/libyaml_0.1.6.bb b/meta/recipes-support/libyaml/libyaml_0.1.6.bb
new file mode 100644
index 0000000..8a624f7
--- /dev/null
+++ b/meta/recipes-support/libyaml/libyaml_0.1.6.bb
@@ -0,0 +1,20 @@
+SUMMARY = "LibYAML is a YAML 1.1 parser and emitter written in C."
+DESCRIPTION = "LibYAML is a C library for parsing and emitting data in YAML 1.1, \
+a human-readable data serialization format. "
+HOMEPAGE = "http://pyyaml.org/wiki/LibYAML"
+SECTION = "libs/devel"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17"
+
+SRC_URI = "http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz \
+ "
+
+SRC_URI[md5sum] = "5fe00cda18ca5daeb43762b80c38e06e"
+SRC_URI[sha256sum] = "7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749"
+
+S = "${WORKDIR}/yaml-${PV}"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 08/22] Add a recipe for ruby
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (6 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 07/22] Add a recipe for libyaml Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 09/22] Add a recipe for libsecret Alexander Kanavin
` (14 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
Ruby is required to build webkit.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-devtools/ruby/ruby.inc | 40 +++++++++++++++++++++++++++
meta/recipes-devtools/ruby/ruby/extmk.patch | 13 +++++++++
meta/recipes-devtools/ruby/ruby_2.2.2.bb | 42 +++++++++++++++++++++++++++++
3 files changed, 95 insertions(+)
create mode 100644 meta/recipes-devtools/ruby/ruby.inc
create mode 100644 meta/recipes-devtools/ruby/ruby/extmk.patch
create mode 100644 meta/recipes-devtools/ruby/ruby_2.2.2.bb
diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc
new file mode 100644
index 0000000..ba60191
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby.inc
@@ -0,0 +1,40 @@
+SUMMARY = "An interpreter of object-oriented scripting language"
+DESCRIPTION = "Ruby is an interpreted scripting language for quick \
+and easy object-oriented programming. It has many features to process \
+text files and to do system management tasks (as in Perl). \
+It is simple, straight-forward, and extensible. \
+"
+HOMEPAGE = "http://www.ruby-lang.org/"
+SECTION = "devel/ruby"
+LICENSE = "Ruby | BSD | GPLv2"
+LIC_FILES_CHKSUM = "\
+ file://COPYING;md5=837b32593517ae48b9c3b5c87a5d288c \
+ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\
+ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\
+ file://LEGAL;md5=c440adb575ba4e6e2344c2630b6a5584\
+"
+
+DEPENDS = "ruby-native zlib openssl tcl libyaml db gdbm readline"
+DEPENDS_class-native = "libyaml-native"
+
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
+ file://extmk.patch \
+"
+
+S = "${WORKDIR}/ruby-${PV}"
+
+inherit autotools
+
+
+# This snippet lets compiled extensions which rely on external libraries,
+# such as zlib, compile properly. If we don't do this, then when extmk.rb
+# runs, it uses the native libraries instead of the target libraries, and so
+# none of the linking operations succeed -- which makes extconf.rb think
+# that the libraries aren't available and hence that the extension can't be
+# built.
+
+do_configure_prepend() {
+ sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk
+ rm -rf ${S}/ruby/
+}
diff --git a/meta/recipes-devtools/ruby/ruby/extmk.patch b/meta/recipes-devtools/ruby/ruby/extmk.patch
new file mode 100644
index 0000000..8b68450
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby/extmk.patch
@@ -0,0 +1,13 @@
+diff -ru ruby-1.8.7-p248.orig/ext/extmk.rb ruby-1.8.7-p248/ext/extmk.rb
+--- ruby-1.8.7-p248.orig/ext/extmk.rb 2009-12-24 03:01:58.000000000 -0600
++++ ruby-1.8.7-p248/ext/extmk.rb 2010-02-12 15:55:27.370061558 -0600
+@@ -354,8 +354,8 @@
+ $ruby = '$(topdir)/miniruby' + EXEEXT
+ end
+ $ruby << " -I'$(topdir)'"
++$ruby << " -I'$(top_srcdir)/lib'"
+ unless CROSS_COMPILING
+- $ruby << " -I'$(top_srcdir)/lib'"
+ $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
+ $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
+ ENV["RUBYLIB"] = "-"
diff --git a/meta/recipes-devtools/ruby/ruby_2.2.2.bb b/meta/recipes-devtools/ruby/ruby_2.2.2.bb
new file mode 100644
index 0000000..78c943c
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby_2.2.2.bb
@@ -0,0 +1,42 @@
+require ruby.inc
+
+SRC_URI[md5sum] = "326e99ddc75381c7b50c85f7089f3260"
+SRC_URI[sha256sum] = "5ffc0f317e429e6b29d4a98ac521c3ce65481bfd22a8cf845fa02a7b113d9b44"
+
+# it's unknown to configure script, but then passed to extconf.rb
+# maybe it's not really needed as we're hardcoding the result with
+# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
+UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+
+PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
+PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp"
+PACKAGECONFIG[ipv6] = ",--enable-wide-getaddrinfo,"
+
+EXTRA_OECONF = "\
+ --disable-versioned-paths \
+ --disable-rpath \
+ --disable-dtrace \
+ --enable-shared \
+ --enable-load-relative \
+"
+
+EXTRA_OEMAKE = " \
+ LIBRUBYARG='-lruby-static' \
+"
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' install
+}
+
+FILES_${PN} += "${datadir}/rubygems \
+ ${datadir}/ri"
+
+FILES_${PN}-dbg += "${libdir}/ruby/*/.debug \
+ ${libdir}/ruby/*/*/.debug \
+ ${libdir}/ruby/*/*/*/.debug \
+ ${libdir}/ruby/*/*/*/*/.debug"
+
+BBCLASSEXTEND = "native"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 09/22] Add a recipe for libsecret
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (7 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 08/22] Add a recipe for ruby Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 15:05 ` Andreas Müller
2015-06-17 13:19 ` [PATCH 10/22] Add a recipe for libwebp Alexander Kanavin
` (13 subsequent siblings)
22 siblings, 1 reply; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
libsecret is a dependency of webkit
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
new file mode 100644
index 0000000..cebc83b
--- /dev/null
+++ b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
@@ -0,0 +1,12 @@
+SUMMARY = "libsecret is a library for storing and retrieving passwords and other secrets"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
+
+inherit gnomebase gtk-doc
+
+DEPENDS = "glib-2.0 libgcrypt"
+
+EXTRA_OECONF += "--disable-manpages"
+
+SRC_URI[archive.md5sum] = "23cdf8267d11a26f88f0dbec1e2022ad"
+SRC_URI[archive.sha256sum] = "12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH 09/22] Add a recipe for libsecret
2015-06-17 13:19 ` [PATCH 09/22] Add a recipe for libsecret Alexander Kanavin
@ 2015-06-17 15:05 ` Andreas Müller
2015-06-17 18:54 ` akuster808
2015-06-18 11:31 ` Alexander Kanavin
0 siblings, 2 replies; 38+ messages in thread
From: Andreas Müller @ 2015-06-17 15:05 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Wed, Jun 17, 2015 at 3:19 PM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> libsecret is a dependency of webkit
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
> create mode 100644 meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
>
> diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
> new file mode 100644
> index 0000000..cebc83b
> --- /dev/null
> +++ b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
> @@ -0,0 +1,12 @@
> +SUMMARY = "libsecret is a library for storing and retrieving passwords and other secrets"
> +LICENSE = "LGPLv2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
> +
> +inherit gnomebase gtk-doc
> +
> +DEPENDS = "glib-2.0 libgcrypt"
> +
> +EXTRA_OECONF += "--disable-manpages"
> +
> +SRC_URI[archive.md5sum] = "23cdf8267d11a26f88f0dbec1e2022ad"
> +SRC_URI[archive.sha256sum] = "12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443"
> --
> 2.1.4
>
> --
I think I have seen this recipe somewhere.. A note would have been nice
Andreas
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 09/22] Add a recipe for libsecret
2015-06-17 15:05 ` Andreas Müller
@ 2015-06-17 18:54 ` akuster808
2015-06-18 11:54 ` Alexander Kanavin
2015-06-18 11:31 ` Alexander Kanavin
1 sibling, 1 reply; 38+ messages in thread
From: akuster808 @ 2015-06-17 18:54 UTC (permalink / raw)
To: openembedded-core
On 06/17/2015 08:05 AM, Andreas Müller wrote:
> On Wed, Jun 17, 2015 at 3:19 PM, Alexander Kanavin
> <alexander.kanavin@linux.intel.com> wrote:
>> libsecret is a dependency of webkit
>>
>> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
>> ---
>> meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 12 ++++++++++++
>> 1 file changed, 12 insertions(+)
>> create mode 100644 meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
>>
>> diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
>> new file mode 100644
>> index 0000000..cebc83b
>> --- /dev/null
>> +++ b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
>> @@ -0,0 +1,12 @@
>> +SUMMARY = "libsecret is a library for storing and retrieving passwords and other secrets"
>> +LICENSE = "LGPLv2.1"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
>> +
>> +inherit gnomebase gtk-doc
>> +
>> +DEPENDS = "glib-2.0 libgcrypt"
>> +
>> +EXTRA_OECONF += "--disable-manpages"
>> +
>> +SRC_URI[archive.md5sum] = "23cdf8267d11a26f88f0dbec1e2022ad"
>> +SRC_URI[archive.sha256sum] = "12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443"
>> --
>> 2.1.4
>>
>> --
> I think I have seen this recipe somewhere.. A note would have been nice
it is in meta-openembedded/meta-gnome per layer index. So is this part
of move from one layer another task?
I take once accepted, the removal patches will be sent out?
- armin
>
> Andreas
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 09/22] Add a recipe for libsecret
2015-06-17 18:54 ` akuster808
@ 2015-06-18 11:54 ` Alexander Kanavin
0 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-18 11:54 UTC (permalink / raw)
To: openembedded-core
On 06/17/2015 09:54 PM, akuster808 wrote:
> it is in meta-openembedded/meta-gnome per layer index. So is this part
> of move from one layer another task?
Move and version update. Every single recipe I've taken from meta-oe was
out-of-date :(
> I take once accepted, the removal patches will be sent out?
Yes; those patches are in fact ready, but held off to avoid confusion.
Alex
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 09/22] Add a recipe for libsecret
2015-06-17 15:05 ` Andreas Müller
2015-06-17 18:54 ` akuster808
@ 2015-06-18 11:31 ` Alexander Kanavin
1 sibling, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-18 11:31 UTC (permalink / raw)
To: Andreas Müller; +Cc: Patches and discussions about the oe-core layer
On 06/17/2015 06:05 PM, Andreas Müller wrote:
> I think I have seen this recipe somewhere.. A note would have been nice
Yes, I'll add a note for recipes picked from meta-gnome.
Alex
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 10/22] Add a recipe for libwebp
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (8 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 09/22] Add a recipe for libsecret Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 11/22] Add a recipe for webkitgtk 2.8.3 Alexander Kanavin
` (12 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
libwebp is a dependency of webkit
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-multimedia/webp/libwebp_0.4.3.bb | 47 +++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 meta/recipes-multimedia/webp/libwebp_0.4.3.bb
diff --git a/meta/recipes-multimedia/webp/libwebp_0.4.3.bb b/meta/recipes-multimedia/webp/libwebp_0.4.3.bb
new file mode 100644
index 0000000..3ab2e5b
--- /dev/null
+++ b/meta/recipes-multimedia/webp/libwebp_0.4.3.bb
@@ -0,0 +1,47 @@
+SUMMARY = "WebP is an image format designed for the Web"
+DESCRIPTION = "WebP is a method of lossy and lossless compression that can be \
+ used on a large variety of photographic, translucent and \
+ graphical images found on the web. The degree of lossy \
+ compression is adjustable so a user can choose the trade-off \
+ between file size and image quality. WebP typically achieves \
+ an average of 30% more compression than JPEG and JPEG 2000, \
+ without loss of image quality."
+HOMEPAGE = "https://developers.google.com/speed/webp/"
+SECTION = "libs"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb"
+
+DEPENDS = "giflib"
+
+SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
+SRC_URI[md5sum] = "08813525eeeffe7e305b4cbfade8ae9b"
+SRC_URI[sha256sum] = "efbe0d58fda936f2ed99d0b837ed7087d064d6838931f282c4618d2a3f7390c4"
+
+EXTRA_OECONF = " \
+ --disable-experimental \
+ --disable-wic \
+ --enable-libwebpmux \
+ --enable-libwebpdemux \
+ --enable-threading \
+"
+
+inherit autotools lib_package
+
+PACKAGECONFIG ??= ""
+
+# libwebpdecoder is a subset of libwebp, don't build it unless requested
+PACKAGECONFIG[decoder] = "--enable-libwebpdecoder,--disable-libwebpdecoder"
+
+# Apply for examples programs: cwebp and dwebp
+PACKAGECONFIG[jpeg] = ",ac_cv_header_jpeglib_h=no,jpeg"
+PACKAGECONFIG[png] = ",ac_cv_header_png_h=no,libpng"
+PACKAGECONFIG[tiff] = ",ac_cv_header_tiffio_h=no,tiff"
+
+# Apply only for example program vwebp
+PACKAGECONFIG[gl] = ",,mesa-glut"
+
+PACKAGES =+ "${PN}-gif2webp"
+
+DESCRIPTION_${PN}-gif2webp = "Simple tool to convert animated GIFs to WebP"
+FILES_${PN}-gif2webp = "${bindir}/gif2webp"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 11/22] Add a recipe for webkitgtk 2.8.3
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (9 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 10/22] Add a recipe for libwebp Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 12/22] Add a recipe for p11-kit Alexander Kanavin
` (11 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
Recipe for webkit-gtk 1.8.3 is removed in a separate commit
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-sato/webkit/webkitgtk_2.8.3.bb | 58 +++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 meta/recipes-sato/webkit/webkitgtk_2.8.3.bb
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb
new file mode 100644
index 0000000..2386a7c
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk_2.8.3.bb
@@ -0,0 +1,58 @@
+SUMMARY = "WebKit web rendering engine for the GTK+ platform"
+HOMEPAGE = "http://www.webkitgtk.org/"
+BUGTRACKER = "http://bugs.webkit.org/"
+
+LICENSE = "BSD & LGPLv2+"
+LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \
+ file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \
+ file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \
+ file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \
+ file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \
+ "
+
+SRC_URI = "\
+ http://www.webkitgtk.org/releases/${PN}-${PV}.tar.xz \
+ "
+SRC_URI[md5sum] = "29b92a0aacc819d0e5e5df03895fb98e"
+SRC_URI[sha256sum] = "b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16"
+
+inherit cmake lib_package pkgconfig perlnative pythonnative
+
+DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
+ gtk+ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \
+ pango icu bison-native gnome-common gawk intltool-native libwebp \
+ atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \
+ ruby-native libsecret libnotify gstreamer1.0-plugins-bad \
+ "
+DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
+
+EXTRA_OECMAKE = " \
+ -DPORT=GTK \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DENABLE_INTROSPECTION=False \
+ -DENABLE_MINIBROWSER=True \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-DENABLE_WEBGL=True', '-DENABLE_WEBGL=False', d)} \
+ "
+
+# Javascript JIT is not supported on powerpc
+# FIXME: This might be needed on powerpc64 as well, but can't be easily tested in poky.
+EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=False "
+
+# ARM JIT code does not build on ARMv5/6 anymore, apparently they test only on v7 onwards
+EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=False "
+EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=False "
+
+# binutils 2.25 has a bug on aarch64:
+# https://sourceware.org/bugzilla/show_bug.cgi?id=18430
+EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=False "
+
+# JIT not supported on MIPS either
+EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=False "
+
+# Note: does not currently build on mips64 due to incorrect type size assumptions
+# Bug filed here: https://bugs.webkit.org/show_bug.cgi?id=146058
+
+FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
+FILES_${PN}-dbg += "${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so"
+FILES_${PN}-dbg += "${libdir}/webkitgtk/webkit2gtk-4.0/.debug/*"
+
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 12/22] Add a recipe for p11-kit
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (10 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 11/22] Add a recipe for webkitgtk 2.8.3 Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 13/22] Add a recipe for gcr Alexander Kanavin
` (10 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
p11-kit is a dependency of gcr (which is a dependency of epiphany)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-support/p11-kit/p11-kit_0.22.1.bb | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
new file mode 100644
index 0000000..7ad9626e
--- /dev/null
+++ b/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Provides a way to load and enumerate PKCS#11 modules"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50"
+
+inherit autotools gettext pkgconfig
+
+DEPENDS = "libtasn1 libffi"
+
+SRC_URI = "http://p11-glue.freedesktop.org/releases/${BP}.tar.gz"
+SRC_URI[md5sum] = "4e9bea1106628ffb820bdad24a819fac"
+SRC_URI[sha256sum] = "ef3a339fcf6aa0e32c8c23f79ba7191e57312be2bda8b24e6d121c2670539a5c"
+
+FILES_${PN}-dev += " \
+ ${libdir}/p11-kit-proxy.so \
+ ${libdir}/pkcs11/p11-kit-trust.so \
+"
+FILES_${PN}-dev += "${libdir}/pkcs11/*.la"
+FILES_${PN}-dbg += "${libdir}/pkcs11/.debug"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 13/22] Add a recipe for gcr
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (11 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 12/22] Add a recipe for p11-kit Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 14/22] Add a recipe for iso-codes Alexander Kanavin
` (9 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
gcr is a dependency of epiphany
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-gnome/gcr/gcr_3.16.0.bb | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 meta/recipes-gnome/gcr/gcr_3.16.0.bb
diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.16.0.bb
new file mode 100644
index 0000000..8b5b6e4
--- /dev/null
+++ b/meta/recipes-gnome/gcr/gcr_3.16.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "A library for bits of crypto UI and parsing etc"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt vala"
+
+inherit autotools gnomebase gtk-icon-cache gtk-doc
+
+SRC_URI[archive.md5sum] = "d5835680be0b6a838e02a528d5378d9c"
+SRC_URI[archive.sha256sum] = "ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075"
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/gcr-3 \
+"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 14/22] Add a recipe for iso-codes
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (12 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 13/22] Add a recipe for gcr Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 15/22] Add a recipe for libwnck3 Alexander Kanavin
` (8 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
iso-codes is a dependency of epiphany
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-support/iso-codes/iso-codes_3.58.bb | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 meta/recipes-support/iso-codes/iso-codes_3.58.bb
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.58.bb b/meta/recipes-support/iso-codes/iso-codes_3.58.bb
new file mode 100644
index 0000000..3df2ea9
--- /dev/null
+++ b/meta/recipes-support/iso-codes/iso-codes_3.58.bb
@@ -0,0 +1,15 @@
+SUMMARY = "ISO language, territory, currency, script codes and their translations"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fbc093901857fcd118f065f900982c24"
+
+SRC_URI = "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz"
+SRC_URI[md5sum] = "34097a0085f0979e28f9db66ec274c5e"
+SRC_URI[sha256sum] = "86af5735dce6e4eff2b983e5d8aa9a3dea1b8db702333ff20be89e45f7f35a72"
+
+# inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which
+# are inhibited by allarch
+DEPENDS = "gettext-native"
+
+inherit autotools allarch
+
+FILES_${PN} += "${datadir}/xml/"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 15/22] Add a recipe for libwnck3
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (13 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 14/22] Add a recipe for iso-codes Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 16/22] Add a recipe for gnome-desktop3 Alexander Kanavin
` (7 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
libwnck is a dependency of epiphany
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb
diff --git a/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb b/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb
new file mode 100644
index 0000000..6bc625a
--- /dev/null
+++ b/meta/recipes-gnome/libwnck/libwnck3_3.14.0.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Window navigation construction toolkit"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+BPN = "libwnck"
+
+SECTION = "x11/libs"
+DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native libxres"
+
+PR = "r1"
+
+PACKAGECONFIG ??= "startup-notification"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+
+inherit gnomebase
+SRC_URI[archive.md5sum] = "4538672e0d775fadedf10abeb8020047"
+SRC_URI[archive.sha256sum] = "f5080076346609b4c36394b879f3a86b92ced3b90a37cb54c8e9a14f00e7921c"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 16/22] Add a recipe for gnome-desktop3
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (14 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 15/22] Add a recipe for libwnck3 Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 17/22] Add a warning suppression patch to glib Alexander Kanavin
` (6 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
gnome-desktop3 is a dependency of epiphany
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../gnome-desktop/gnome-desktop3_3.16.2.bb | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
new file mode 100644
index 0000000..a0542c1
--- /dev/null
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
@@ -0,0 +1,25 @@
+SUMMARY = "GNOME library for reading .desktop files"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+BPN = "gnome-desktop"
+
+inherit gnome pkgconfig
+SRC_URI[archive.md5sum] = "ab5bf4cc94ad63639f42adcc1542b1f0"
+SRC_URI[archive.sha256sum] = "3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0"
+
+DEPENDS += "gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification"
+
+EXTRA_OECONF = "--disable-desktop-docs"
+
+do_configure_prepend () {
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+}
+
+PACKAGES =+ "libgnome-desktop3"
+FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml"
+
+RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas"
+
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 17/22] Add a warning suppression patch to glib
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (15 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 16/22] Add a recipe for gnome-desktop3 Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 18/22] Add a recipe gsettings-desktop-schemas Alexander Kanavin
` (5 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
Otherwise QA check will fail.
Some schemas in gsettings-desktop-schemas (such as proxy and locale)
are still using deprecated paths, as of 3.16.1. This causes warning
messages, and meta/lib/oe/rootfs.py complaints about them.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...warning-about-deprecated-paths-in-schemas.patch | 32 ++++++++++++++++++++++
meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
new file mode 100644
index 0000000..54e830c
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -0,0 +1,32 @@
+From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 12 Jun 2015 17:08:46 +0300
+Subject: [PATCH] Remove the warning about deprecated paths in schemas
+
+Some schemas in gsettings-desktop-schemas (such as proxy and locale)
+are still using deprecated paths, as of 3.16.1. This causes warning
+messages, and meta/lib/oe/rootfs.py complaints about them.
+---
+ gio/glib-compile-schemas.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
+index e42949b..ec79d7c 100644
+--- a/gio/glib-compile-schemas.c
++++ b/gio/glib-compile-schemas.c
+@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state,
+ return;
+ }
+
+- if (path && (g_str_has_prefix (path, "/apps/") ||
+- g_str_has_prefix (path, "/desktop/") ||
+- g_str_has_prefix (path, "/system/")))
+- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
+- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
+-
+ state->schema_state = schema_state_new (path, gettext_domain,
+ extends, extends_name, list_of);
+
+--
+2.1.4
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
index 8eaccfb..1e3d36a 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://uclibc.patch \
file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
file://allow-run-media-sdX-drive-mount-if-username-root.patch \
+ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
"
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 18/22] Add a recipe gsettings-desktop-schemas
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (16 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 17/22] Add a warning suppression patch to glib Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 19/22] Add a recipe for epiphany Alexander Kanavin
` (4 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
gsettings-desktop-schemas is a dependency of epiphany
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../gsettings-desktop-schemas_3.16.1.bb | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb
diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb
new file mode 100644
index 0000000..f2f2c75
--- /dev/null
+++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.16.1.bb
@@ -0,0 +1,13 @@
+SUMMARY = "GNOME desktop-wide GSettings schemas"
+HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "glib-2.0 intltool-native gobject-introspection-stub-native"
+
+inherit gnomebase gsettings gettext
+
+SRC_URI[archive.md5sum] = "baebbcf3c20591f98876e42fb0a3fd35"
+SRC_URI[archive.sha256sum] = "74fe9fdad510c8a6666febeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 19/22] Add a recipe for epiphany
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (17 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 18/22] Add a recipe gsettings-desktop-schemas Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 20/22] Remove the recipe for the obsolete webkit-gtk 1.8.3 Alexander Kanavin
` (3 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
Epiphany is replacing midori as the browser in oe-core recipe set
and poky distribution.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-gnome/epiphany/epiphany_3.16.1.bb | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 meta/recipes-gnome/epiphany/epiphany_3.16.1.bb
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.16.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.16.1.bb
new file mode 100644
index 0000000..3f45706
--- /dev/null
+++ b/meta/recipes-gnome/epiphany/epiphany_3.16.1.bb
@@ -0,0 +1,23 @@
+SUMMARY = "WebKit based web browser for GNOME"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr libwnck3 \
+ gsettings-desktop-schemas gnome-desktop3"
+
+inherit gnomebase gsettings
+SRC_URI[archive.md5sum] = "bf03453eac5701049c4ec82e1b0c8532"
+SRC_URI[archive.sha256sum] = "4e59a13c299d1ce726871958e1925b42f93d8c73bf1bb0decf79749be00e9666"
+
+EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO}"
+
+do_configure_prepend() {
+ touch ${S}/gnome-doc-utils.make
+ sed -i -e s:help::g ${S}/Makefile.am
+}
+
+FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
+FILES_${PN}-dbg += "${libdir}/${PN}/*/web-extensions/.debug/libephywebextension.so"
+RDEPENDS_${PN} = "iso-codes"
+RRECOMMENDS_${PN} = "ca-certificates"
+
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 20/22] Remove the recipe for the obsolete webkit-gtk 1.8.3
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (18 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 19/22] Add a recipe for epiphany Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 21/22] Remove the midori recipe and replace references to midori with epiphany Alexander Kanavin
` (2 subsequent siblings)
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
webkitgtk 2.8.3 is provided instead and midori browser is replaced by epiphany in
separate commits.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/security_flags.inc | 2 -
meta/recipes-sato/webkit/files/bison-2.6.patch | 558 ---------------------
meta/recipes-sato/webkit/files/no-gtkdoc.patch | 20 -
meta/recipes-sato/webkit/files/nodolt.patch | 19 -
.../webgit-gtk_fix_build_with_automake_1.12.patch | 62 ---
...bkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch | 26 -
.../0001-Enable-mips64-build.patch | 69 ---
.../webkit/webkit-gtk-1.8.3/aarch64.patch | 41 --
.../obsolete_automake_macros.patch | 14 -
meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 116 -----
10 files changed, 927 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/files/bison-2.6.patch
delete mode 100644 meta/recipes-sato/webkit/files/no-gtkdoc.patch
delete mode 100644 meta/recipes-sato/webkit/files/nodolt.patch
delete mode 100644 meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch
delete mode 100644 meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch
delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch
delete mode 100644 meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index 9608c7f..367995c 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -16,7 +16,6 @@ SECURITY_CFLAGS_powerpc = "-fstack-protector-all -D_FORTIFY_SOURCE=2"
SECURITY_CFLAGS_pn-dbus_powerpc = ""
SECURITY_CFLAGS_pn-dbus-ptest_powerpc = ""
SECURITY_CFLAGS_pn-libmatchbox_powerpc = ""
-SECURITY_CFLAGS_pn-webkit-gtk_powerpc = ""
# arm specific security flag issues
SECURITY_CFLAGS_pn-lttng-tools_arm = "${SECURITY_NO_PIE_CFLAGS}"
@@ -80,7 +79,6 @@ SECURITY_CFLAGS_pn-python-numpy = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-valgrind = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-webkit-gtk = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
# These 2 have text relco errors with the pie options enabled
diff --git a/meta/recipes-sato/webkit/files/bison-2.6.patch b/meta/recipes-sato/webkit/files/bison-2.6.patch
deleted file mode 100644
index d4aa674..0000000
--- a/meta/recipes-sato/webkit/files/bison-2.6.patch
+++ /dev/null
@@ -1,558 +0,0 @@
-Upstream-Status: Backport
-http://trac.webkit.org/changeset/124099
-
-Subversion Revision: 123651
-diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
-index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
---- a/Source/WebCore/css/CSSGrammar.y
-+++ b/Source/WebCore/css/CSSGrammar.y
-@@ -53,14 +53,13 @@ using namespace HTMLNames;
- #define YYMAXDEPTH 10000
- #define YYDEBUG 0
-
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
-
- %pure_parser
-
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
-+
- %union {
- bool boolean;
- char character;
-@@ -89,7 +88,7 @@ using namespace HTMLNames;
-
- %{
-
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
- return 1;
- }
-diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
-index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644
---- a/Source/WebCore/css/CSSParser.cpp
-+++ b/Source/WebCore/css/CSSParser.cpp
-@@ -114,7 +114,7 @@
- extern int cssyydebug;
- #endif
-
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
-
- using namespace std;
- using namespace WTF;
-diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y
-index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644
---- a/Source/WebCore/xml/XPathGrammar.y
-+++ b/Source/WebCore/xml/XPathGrammar.y
-@@ -34,6 +34,7 @@
- #include "XPathParser.h"
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
-
-@@ -44,8 +45,6 @@
- #define YYLTYPE_IS_TRIVIAL 1
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
-
- using namespace WebCore;
- using namespace XPath;
-@@ -53,6 +52,7 @@ using namespace XPath;
- %}
-
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
-
- %union
- {
-@@ -71,7 +71,7 @@ using namespace XPath;
- %{
-
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-
- %}
-
-@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
- Expr:
- OrExpr
- {
-- PARSER->m_topExpr = $1;
-+ parser->m_topExpr = $1;
- }
- ;
-
-@@ -138,7 +138,7 @@ AbsoluteLocationPath:
- '/'
- {
- $$ = new LocationPath;
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
- '/' RelativeLocationPath
-@@ -150,7 +150,7 @@ AbsoluteLocationPath:
- {
- $$ = $2;
- $$->insertFirstStep($1);
-- PARSER->unregisterParseNode($1);
-+ parser->unregisterParseNode($1);
- }
- ;
-
-@@ -159,22 +159,22 @@ RelativeLocationPath:
- {
- $$ = new LocationPath;
- $$->appendStep($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerParseNode($$);
- }
- |
- RelativeLocationPath '/' Step
- {
- $$->appendStep($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- |
- RelativeLocationPath DescendantOrSelf Step
- {
- $$->appendStep($2);
- $$->appendStep($3);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
- }
- ;
-
-@@ -183,58 +183,58 @@ Step:
- {
- if ($2) {
- $$ = new Step(Step::ChildAxis, *$1, *$2);
-- PARSER->deletePredicateVector($2);
-+ parser->deletePredicateVector($2);
- } else
- $$ = new Step(Step::ChildAxis, *$1);
-- PARSER->deleteNodeTest($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteNodeTest($1);
-+ parser->registerParseNode($$);
- }
- |
- NAMETEST OptionalPredicateList
- {
- String localName;
- String namespaceURI;
-- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
-- PARSER->m_gotNamespaceError = true;
-+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+ parser->m_gotNamespaceError = true;
- YYABORT;
- }
-
- if ($2) {
- $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
-- PARSER->deletePredicateVector($2);
-+ parser->deletePredicateVector($2);
- } else
- $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- AxisSpecifier NodeTest OptionalPredicateList
- {
- if ($3) {
- $$ = new Step($1, *$2, *$3);
-- PARSER->deletePredicateVector($3);
-+ parser->deletePredicateVector($3);
- } else
- $$ = new Step($1, *$2);
-- PARSER->deleteNodeTest($2);
-- PARSER->registerParseNode($$);
-+ parser->deleteNodeTest($2);
-+ parser->registerParseNode($$);
- }
- |
- AxisSpecifier NAMETEST OptionalPredicateList
- {
- String localName;
- String namespaceURI;
-- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
-- PARSER->m_gotNamespaceError = true;
-+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+ parser->m_gotNamespaceError = true;
- YYABORT;
- }
-
- if ($3) {
- $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
-- PARSER->deletePredicateVector($3);
-+ parser->deletePredicateVector($3);
- } else
- $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
-- PARSER->deleteString($2);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($2);
-+ parser->registerParseNode($$);
- }
- |
- AbbreviatedStep
-@@ -259,23 +259,23 @@ NodeTest:
- else if (*$1 == "comment")
- $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
-
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
- PI '(' ')'
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
- PI '(' LITERAL ')'
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
-- PARSER->deleteString($1);
-- PARSER->deleteString($3);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->deleteString($3);
-+ parser->registerNodeTest($$);
- }
- ;
-
-@@ -293,14 +293,14 @@ PredicateList:
- {
- $$ = new Vector<Predicate*>;
- $$->append(new Predicate($1));
-- PARSER->unregisterParseNode($1);
-- PARSER->registerPredicateVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerPredicateVector($$);
- }
- |
- PredicateList Predicate
- {
- $$->append(new Predicate($2));
-- PARSER->unregisterParseNode($2);
-+ parser->unregisterParseNode($2);
- }
- ;
-
-@@ -315,7 +315,7 @@ DescendantOrSelf:
- SLASHSLASH
- {
- $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -323,13 +323,13 @@ AbbreviatedStep:
- '.'
- {
- $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
- DOTDOT
- {
- $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -337,8 +337,8 @@ PrimaryExpr:
- VARIABLEREFERENCE
- {
- $$ = new VariableReference(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- '(' Expr ')'
-@@ -349,15 +349,15 @@ PrimaryExpr:
- LITERAL
- {
- $$ = new StringExpression(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- NUMBER
- {
- $$ = new Number($1->toDouble());
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- FunctionCall
-@@ -369,8 +369,8 @@ FunctionCall:
- $$ = createFunction(*$1);
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- FUNCTIONNAME '(' ArgumentList ')'
-@@ -378,9 +378,9 @@ FunctionCall:
- $$ = createFunction(*$1, *$3);
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->deleteExpressionVector($3);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->deleteExpressionVector($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -389,14 +389,14 @@ ArgumentList:
- {
- $$ = new Vector<Expression*>;
- $$->append($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerExpressionVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerExpressionVector($$);
- }
- |
- ArgumentList ',' Argument
- {
- $$->append($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- ;
-
-@@ -412,9 +412,9 @@ UnionExpr:
- $$ = new Union;
- $$->addSubExpression($1);
- $$->addSubExpression($3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -430,9 +430,9 @@ PathExpr:
- {
- $3->setAbsolute(true);
- $$ = new Path(static_cast<Filter*>($1), $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
- FilterExpr DescendantOrSelf RelativeLocationPath
-@@ -440,10 +440,10 @@ PathExpr:
- $3->insertFirstStep($2);
- $3->setAbsolute(true);
- $$ = new Path(static_cast<Filter*>($1), $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -453,9 +453,9 @@ FilterExpr:
- PrimaryExpr PredicateList
- {
- $$ = new Filter($1, *$2);
-- PARSER->unregisterParseNode($1);
-- PARSER->deletePredicateVector($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->deletePredicateVector($2);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -465,9 +465,9 @@ OrExpr:
- OrExpr OR AndExpr
- {
- $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -477,9 +477,9 @@ AndExpr:
- AndExpr AND EqualityExpr
- {
- $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -489,9 +489,9 @@ EqualityExpr:
- EqualityExpr EQOP RelationalExpr
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -501,9 +501,9 @@ RelationalExpr:
- RelationalExpr RELOP AdditiveExpr
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -513,17 +513,17 @@ AdditiveExpr:
- AdditiveExpr PLUS MultiplicativeExpr
- {
- $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
- AdditiveExpr MINUS MultiplicativeExpr
- {
- $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -533,9 +533,9 @@ MultiplicativeExpr:
- MultiplicativeExpr MULOP UnaryExpr
- {
- $$ = new NumericOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -546,8 +546,8 @@ UnaryExpr:
- {
- $$ = new Negative;
- $$->addSubExpression($2);
-- PARSER->unregisterParseNode($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($2);
-+ parser->registerParseNode($$);
- }
- ;
-
-diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
-index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644
---- a/Source/WebCore/xml/XPathParser.cpp
-+++ b/Source/WebCore/xml/XPathParser.cpp
-@@ -32,24 +32,21 @@
- #include "XPathEvaluator.h"
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
-
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
-+using namespace XPath;
-
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
-
- Parser* Parser::currentParser = 0;
--
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
-
- typedef HashMap<String, Step::Axis> AxisNamesMap;
-@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
- delete t;
- }
-
--}
--}
diff --git a/meta/recipes-sato/webkit/files/no-gtkdoc.patch b/meta/recipes-sato/webkit/files/no-gtkdoc.patch
deleted file mode 100644
index 4eb09dc..0000000
--- a/meta/recipes-sato/webkit/files/no-gtkdoc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-make install invokes a gtk-doc tool without checking that we have gtk-doc.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-Upstream-Status: Pending (https://bugs.webkit.org/show_bug.cgi?id=91239)
-
-Index: webkit-1.8.1/Tools/GNUmakefile.am
-===================================================================
---- webkit-1.8.1.orig/Tools/GNUmakefile.am
-+++ webkit-1.8.1/Tools/GNUmakefile.am
-@@ -330,7 +330,9 @@ if ENABLE_WEBKIT2
- fi; \
- fi
- endif
-+if ENABLE_GTK_DOC
- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-+endif
-
- uninstall-local:
- @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/meta/recipes-sato/webkit/files/nodolt.patch b/meta/recipes-sato/webkit/files/nodolt.patch
deleted file mode 100644
index e713e8b..0000000
--- a/meta/recipes-sato/webkit/files/nodolt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Dolt cause build error on some platform, so disable it.
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac
-===================================================================
---- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800
-+++ webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac 2011-01-21 11:11:15.000000000 +0800
-@@ -82,8 +82,6 @@
- AC_DISABLE_STATIC
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
--# use dolt to speedup the build
--DOLT
-
- AC_PATH_PROG(FLEX, flex)
- if test -z "$FLEX"; then
diff --git a/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch b/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch
deleted file mode 100644
index ad7c55f..0000000
--- a/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Upstream-Status: Pending
-
-automake 1.12 has deprecated use of mkdir_p, and it recommends
-use of MKDIR_P instead. Changed the code to avoid these kind
-of warning-errors.
-
-./.deps/DerivedSources
-make[1]: ./.deps/DerivedSources: Command not found
-make[1]: *** [all-local] Error 127
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/07/10
-
-Index: webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am
-===================================================================
---- webkit-gtk-1.7.2+svnr101488-r6.orig/GNUmakefile.am
-+++ webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am
-@@ -255,7 +255,7 @@ MAINTAINERCLEANFILES += \
- # Older automake versions (1.7) place Plo files in a different place so we need
- # to create the output directory manually.
- all-local: stamp-po
-- $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
-+ $(MKDIR_P) $(top_builddir)/$(DEPDIR)/DerivedSources
-
- # remove built sources and program directories
- clean-local:
-Index: webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am
-===================================================================
---- webkit-gtk-1.7.2+svnr101488-r6.orig/Source/WebKit/gtk/po/GNUmakefile.am
-+++ webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am
-@@ -132,13 +132,13 @@ DISTCLEANFILES += \
- $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
-
- po-install-data-local: all
-- $(mkdir_p) $(DESTDIR)$(datadir)
-+ $(MKDIR_P) $(DESTDIR)$(datadir)
- @catalogs='$(MOFILES)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed -e 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
-- $(mkdir_p) $(DESTDIR)$$dir; \
-+ $(MKDIR_P) $(DESTDIR)$$dir; \
- if test -r Source/WebKit/gtk/po/$$cat; then realcat=Source/WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \
- $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
- echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-@@ -173,13 +173,13 @@ po-install-data-local: all
- done
-
- po-installdirs-data-local:
-- $(mkdir_p) $(DESTDIR)$(datadir)
-+ $(MKDIR_P) $(DESTDIR)$(datadir)
- @catalogs='$(MOFILES)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
-- $(mkdir_p) $(DESTDIR)$$dir; \
-+ $(MKDIR_P) $(DESTDIR)$$dir; \
- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
- if test -n "$$lc"; then \
- if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff --git a/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch b/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
deleted file mode 100644
index e7e9083..0000000
--- a/meta/recipes-sato/webkit/files/webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-webkit-gtk: ANGLE doesn't build with bison 3
-
-Use %lex-param to set YYLEX_PARAM.
-
-Upstream-Status: Pending
-
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
----
- Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-index ec1a85c..15723cc 100644
---- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
-
- %union {
- struct {
---
-1.9.1
-
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch
deleted file mode 100644
index 5a42cd7..0000000
--- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/0001-Enable-mips64-build.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 4084d31d5b1fe3bf041881ad124873dbf3cd1868 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 17 May 2013 19:51:11 -0700
-Subject: [PATCH] Enable mips64 build
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- Source/JavaScriptCore/wtf/Platform.h | 2 +-
- Source/JavaScriptCore/wtf/dtoa/utils.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h
-===================================================================
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2012-08-20 09:30:25.000000000 -0700
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.624055787 -0700
-@@ -76,14 +76,19 @@
-
- /* CPU(MIPS) - MIPS 32-bit */
- /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
--#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
-- && defined(_ABIO32)
-+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
-+ || defined(__mips64))
-+#if defined(__mips64)
-+#define WTF_CPU_MIPS64 1
-+#define WTF_MIPS_ARCH __mips64
-+#else
- #define WTF_CPU_MIPS 1
-+#define WTF_MIPS_ARCH __mips
-+#endif
- #if defined(__MIPSEB__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
- #define WTF_MIPS_PIC (defined __PIC__)
--#define WTF_MIPS_ARCH __mips
- #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
- #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v)
- #define WTF_MIPS_ARCH_REV __mips_isa_rev
-@@ -295,7 +300,7 @@
-
- #endif /* ARM */
-
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
-+#if CPU(ARM) || CPU(MIPS) || CPU(MIPS64) || CPU(SH4) || CPU(SPARC)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
-
-@@ -899,6 +904,7 @@
- || CPU(ALPHA) \
- || CPU(SPARC64) \
- || CPU(S390X) \
-+ || CPU(MIPS64) \
- || CPU(PPC64)
- #define WTF_USE_JSVALUE64 1
- #else
-Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h
-===================================================================
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2012-08-20 09:26:05.000000000 -0700
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.424054793 -0700
-@@ -49,7 +49,7 @@
- defined(__ARMEL__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch
deleted file mode 100644
index a76b0ba..0000000
--- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/aarch64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h
-===================================================================
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.000000000 -0700
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:59:18.764056782 -0700
-@@ -304,6 +304,11 @@
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
-
-+/* CPU(AARCH64) - Aarch64 */
-+#if defined(__aarch64__)
-+#define WTF_CPU_AARCH64 1
-+#endif
-+
- /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
- virtual memory, not to choose a GUI toolkit ==== */
-
-@@ -905,7 +910,8 @@
- || CPU(SPARC64) \
- || CPU(S390X) \
- || CPU(MIPS64) \
-- || CPU(PPC64)
-+ || CPU(PPC64) \
-+ || CPU(AARCH64)
- #define WTF_USE_JSVALUE64 1
- #else
- #define WTF_USE_JSVALUE32_64 1
-Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h
-===================================================================
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.000000000 -0700
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:58:28.340056029 -0700
-@@ -49,7 +49,7 @@
- defined(__ARMEL__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
deleted file mode 100644
index d9e8444..0000000
--- a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Backport
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd webkit-1.8.3/configure.ac webkit-1.8.3/configure.ac
---- webkit-1.8.3/configure.ac 2012-08-20 19:35:38.000000000 +0300
-+++ webkit-1.8.3/configure.ac 2013-02-08 11:55:28.403397789 +0200
-@@ -111,7 +111,6 @@
-
- AC_PROG_CC
- AC_PROG_CXX
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- AC_SYS_LARGEFILE
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
deleted file mode 100644
index b9a9d7a..0000000
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-SUMMARY = "WebKit web rendering engine for the GTK+ platform"
-HOMEPAGE = "http://www.webkitgtk.org/"
-BUGTRACKER = "http://bugs.webkit.org/"
-
-LICENSE = "BSD & LGPLv2+"
-LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
- file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
- file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
-
-PR = "r1"
-
-# Choice of language backends - icu has issues on Big Endian machines so use pango
-ICU_LIB = "icu"
-ICU_LIB_powerpc = "pango"
-
-DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
- gtk+ flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}"
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
-
-# The libxt requires x11 in DISTRO_FEATURES
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "\
- http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \
- file://nodolt.patch \
- file://no-gtkdoc.patch \
- file://webgit-gtk_fix_build_with_automake_1.12.patch \
- file://bison-2.6.patch \
- file://obsolete_automake_macros.patch \
- file://0001-Enable-mips64-build.patch \
- file://aarch64.patch \
- file://webkit-gtk-ANGLE-doesn-t-build-with-bison-3.patch \
- "
-
-SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"
-SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7"
-
-# webkit-gtk can NOT be built on MIPS64 with n32 ABI
-COMPATIBLE_HOST_mips64n32 = "null"
-
-inherit autotools lib_package gtk-doc pkgconfig distro_features_check
-
-S = "${WORKDIR}/webkit-${PV}/"
-
-# Disabled by default because it pulls in obsolete gstreamer 0.10
-WEBKIT_AUDIOVIDEO ?= "--disable-video --disable-web-audio"
-
-EXTRA_OECONF = "\
- --enable-debug=no \
- --enable-svg \
- --enable-icon-database=yes \
- --enable-fullscreen-api \
- --enable-image-resizer \
- --enable-link-prefetch \
- --with-gtk=2.0 \
- --disable-geolocation \
- ${WEBKIT_AUDIOVIDEO} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
- UNICODE_CFLAGS=-D_REENTRANT \
- "
-EXTRA_OECONF_append_armv5 = " --disable-jit"
-EXTRA_OECONF_append_armv6 = " --disable-jit"
-
-#default unicode backend icu breaks in cross-compile when target and host are different endian type
-EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib"
-
-CPPFLAGS_append_powerpc = " -I${STAGING_INCDIR}/pango-1.0 \
- -I${STAGING_LIBDIR}/glib-2.0/include \
- -I${STAGING_INCDIR}/glib-2.0"
-
-# ld can run out of memory linking libwebkitgtk!
-#
-LDFLAGS += "-Wl,--no-keep-memory"
-
-EXTRA_AUTORECONF = " -I Source/autotools "
-
-
-#| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]':
-#| ./Source/JavaScriptCore/heap/Handle.h:141:79: instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]'
-#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here
-#| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align]
-#| {standard input}: Assembler messages:
-#| {standard input}:28873: Error: invalid immediate: 983040 is out of range
-#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110
-#| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
-#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
-#| Please submit a full bug report,
-#| with preprocessed source if appropriate.
-#| See <http://gcc.gnu.org/bugs.html> for instructions.
-#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1
-#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0'
-ARM_INSTRUCTION_SET = "arm"
-
-CONFIGUREOPT_DEPTRACK = ""
-
-do_configure_append() {
- # somethings wrong with icu, fix it up manually
- for makefile in $(find ${B} -name "GNUmakefile") ; do
- sed -i s:-I/usr/include::g $makefile
- done
-}
-
-do_install_append() {
- rmdir ${D}${libexecdir}
-}
-
-PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
-FILES_${PN}launcher = "${bindir}/GtkLauncher"
-FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
-FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*"
-FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/"
-FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \
- ${datadir}/webkitgtk-*/images \
- ${datadir}/glib-2.0/schemas"
-
-
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 21/22] Remove the midori recipe and replace references to midori with epiphany
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (19 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 20/22] Remove the recipe for the obsolete webkit-gtk 1.8.3 Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 13:19 ` [PATCH 22/22] poky: update distro files related to webkitgtk update and epiphany addition Alexander Kanavin
2015-06-17 16:01 ` [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Paul Eggleton
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../packagegroups/packagegroup-self-hosted.bb | 10 +++----
.../builder/files/builder_hob_start.sh | 8 +++---
meta/recipes-sato/midori/midori/liststore.patch | 29 --------------------
meta/recipes-sato/midori/midori_0.5.8.bb | 31 ----------------------
.../packagegroups/packagegroup-core-x11-sato.bb | 2 +-
5 files changed, 10 insertions(+), 70 deletions(-)
delete mode 100644 meta/recipes-sato/midori/midori/liststore.patch
delete mode 100644 meta/recipes-sato/midori/midori_0.5.8.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 531f729..cd3bddd 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -28,10 +28,10 @@ RDEPENDS_packagegroup-self-hosted = "\
packagegroup-self-hosted-host-tools \
"
-# midori depends on webkit-gtk which could not build for mips64
-MIDORI = "midori"
-MIDORI_mips64 = ""
-MIDORI_mips64n32 = ""
+# epiphany depends on webkitgtk which could not build for mips64
+EPIPHANY = "epiphany"
+EPIPHANY_mips64 = ""
+EPIPHANY_mips64n32 = ""
RDEPENDS_packagegroup-self-hosted-host-tools = "\
connman \
@@ -199,7 +199,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\
python-pygtk \
gtk-theme-clearlooks \
xdg-utils \
- ${MIDORI} \
+ ${EPIPHANY} \
leafpad \
pcmanfm \
vte \
diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_hob_start.sh
index 65a68ee..b394b09 100644
--- a/meta/recipes-graphics/builder/files/builder_hob_start.sh
+++ b/meta/recipes-graphics/builder/files/builder_hob_start.sh
@@ -18,10 +18,10 @@ if [ ! -d /home/builder/.local/share/applications ]; then
#register folders to open with PCManFM filemanager
xdg-mime default pcmanfm.desktop inode/directory
- #register html links and files with Midori
- xdg-mime default midori.desktop x-scheme-handler/http
- xdg-mime default midori.desktop x-scheme-handler/https
- xdg-mime default midori.desktop text/html
+ #register html links and files with epiphany
+ xdg-mime default epiphany.desktop x-scheme-handler/http
+ xdg-mime default epiphany.desktop x-scheme-handler/https
+ xdg-mime default epiphany.desktop text/html
#register text files with leafpad text editor
xdg-mime default leafpad.desktop text/plain
diff --git a/meta/recipes-sato/midori/midori/liststore.patch b/meta/recipes-sato/midori/midori/liststore.patch
deleted file mode 100644
index 4e5d666..0000000
--- a/meta/recipes-sato/midori/midori/liststore.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-GLib 2.44 has a GListStore type which is GLib.ListStore in Vala, resulting in an ambigous type and compile failure.
-
-Fix by using the full type name.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/extensions/history-list.vala b/extensions/history-list.vala
-index 3a864b1..f309c0c 100644
---- a/extensions/history-list.vala
-+++ b/extensions/history-list.vala
-@@ -319,7 +319,7 @@ namespace HistoryList {
- }
-
- private void create_widgets () {
-- ListStore model;
-+ Gtk.ListStore model;
- TreeIter iter;
- TreeIter? active_iter = null;
-
-@@ -331,7 +331,7 @@ namespace HistoryList {
-
- var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior");
-
-- model = new ListStore (2, typeof (string), typeof (int));
-+ model = new Gtk.ListStore (2, typeof (string), typeof (int));
-
- model.append (out iter);
- model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"),
diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb
deleted file mode 100644
index 1c027fe4..0000000
--- a/meta/recipes-sato/midori/midori_0.5.8.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "A lightweight web browser"
-HOMEPAGE = "http://midori-browser.org/"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver"
-
-SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV} \
- file://liststore.patch"
-
-SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976"
-SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381"
-
-# midori depends on webkit-gtk, and webkit-gtk can NOT be built on
-# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily.
-COMPATIBLE_HOST_mips64n32 = "null"
-
-inherit gtk-icon-cache pkgconfig vala pythonnative cmake distro_features_check
-
-# The webkit-gtk and libxscrnsaver requires x11 in DISTRO_FEATURES
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_OECMAKE = " \
- -DCMAKE_INSTALL_PREFIX=${prefix} \
- -DUSE_ZEITGEIST=0 \
-"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-RRECOMMENDS_${PN} += "glib-networking ca-certificates adwaita-icon-theme"
-
-FILES_${PN} += "${datadir}/appdata"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 04d1e99..353b2ba 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -48,7 +48,7 @@ FILEMANAGER ?= "pcmanfm"
FILEMANAGER_mips ?= ""
WEB ?= ""
-#WEB = "midori"
+#WEB = "epiphany"
SUMMARY_${PN}-apps = "Sato desktop - applications"
RDEPENDS_${PN}-apps = "\
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 22/22] poky: update distro files related to webkitgtk update and epiphany addition
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (20 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 21/22] Remove the midori recipe and replace references to midori with epiphany Alexander Kanavin
@ 2015-06-17 13:19 ` Alexander Kanavin
2015-06-17 16:01 ` [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Paul Eggleton
22 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2015-06-17 13:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta-yocto/conf/distro/include/distro_alias.inc | 2 +-
meta-yocto/conf/distro/include/maintainers.inc | 4 ++--
meta-yocto/conf/distro/include/package_regex.inc | 5 ++---
meta-yocto/conf/distro/include/poky-floating-revisions.inc | 1 -
meta-yocto/conf/distro/include/recipe_color.inc | 1 -
meta-yocto/conf/distro/include/upstream_tracking.inc | 2 --
6 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 0f8ed55..53386f3 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -473,7 +473,7 @@ DISTRO_PN_ALIAS_pn-v86d = "Debian=v86d Ubuntu=v86d"
DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto"
DISTRO_PN_ALIAS_pn-waffle = "OE-Core"
DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog"
-DISTRO_PN_ALIAS_pn-webkit-gtk = "Fedora=webkitgtk Ubuntu=libwebkit"
+DISTRO_PN_ALIAS_pn-webkitgtk = "Fedora=webkitgtk Ubuntu=libwebkit"
DISTRO_PN_ALIAS_pn-web-webkit = "OpenedHand"
DISTRO_PN_ALIAS_pn-weston = "Fedora=weston OpenSuSE=weston"
DISTRO_PN_ALIAS_pn-weston-init = "OE-Core"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index fdeb7f7..aab66d8 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -156,6 +156,7 @@ RECIPE_MAINTAINER_pn-eglibc-scripts = "Saul Wold <sgw@linux.intel.com>"
RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-enchant = "Cristian Iorga <cristian.iorga@intel.com>"
RECIPE_MAINTAINER_pn-encodings = "Ross Burton <ross.burton@intel.com>"
+RECIPE_MAINTAINER_pn-epiphany = "Alexander Kanavin <alexander.kanavin@intel.com>"
RECIPE_MAINTAINER_pn-ethtool = "Randy Witt <randy.e.witt@linux.intel.com>"
RECIPE_MAINTAINER_pn-expat = "Paul Eggleton <paul.eggleton@linux.intel.com>"
RECIPE_MAINTAINER_pn-file = "Robert Yang <liezhi.yang@windriver.com>"
@@ -444,7 +445,6 @@ RECIPE_MAINTAINER_pn-mesa-gl = "Ross Burton <ross.burton@intel.com>"
RECIPE_MAINTAINER_pn-meta-ide-support = "Jessica Zhang <jessica.zhang@intel.com>"
RECIPE_MAINTAINER_pn-meta-toolchain-qte = "Paul Eggleton <paul.eggleton@linux.intel.com>"
RECIPE_MAINTAINER_pn-meta-toolchain = "Jessica Zhang <jessica.zhang@intel.com>"
-RECIPE_MAINTAINER_pn-midori = "Alejandro Hernandez <alejandro.hernandez@linux.intel.com>"
RECIPE_MAINTAINER_pn-mingetty = "Kai Kang <kai.kang@windriver.com>"
RECIPE_MAINTAINER_pn-minicom = "Cristian Iorga <cristian.iorga@intel.com>"
RECIPE_MAINTAINER_pn-mini-x-session = "Saul Wold <sgw@linux.intel.com>"
@@ -680,7 +680,7 @@ RECIPE_MAINTAINER_pn-vte = "Ross Burton <ross.burton@intel.com>"
RECIPE_MAINTAINER_pn-waffle = "Ross Burton <ross.burton@intel.com>"
RECIPE_MAINTAINER_pn-watchdog = "Saul Wold <sgw@linux.intel.com>"
RECIPE_MAINTAINER_pn-wayland = "Ross Burton <ross.burton@intel.com>"
-RECIPE_MAINTAINER_pn-webkit-gtk = "Ross Burton <ross.burton@intel.com>"
+RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <alexander.kanavin@intel.com>"
RECIPE_MAINTAINER_pn-web-webkit = "Ross Burton <ross.burton@intel.com>"
RECIPE_MAINTAINER_pn-weston = "Ross Burton <ross.burton@intel.com>"
RECIPE_MAINTAINER_pn-wget = "Robert Yang <liezhi.yang@windriver.com>"
diff --git a/meta-yocto/conf/distro/include/package_regex.inc b/meta-yocto/conf/distro/include/package_regex.inc
index 4aeae89..d36e116 100644
--- a/meta-yocto/conf/distro/include/package_regex.inc
+++ b/meta-yocto/conf/distro/include/package_regex.inc
@@ -21,9 +21,6 @@ COMMON_REGEX = "(?P<pver>(\d+[\.-_]*)+)"
REGEX_URI_pn-wireless-tools = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
REGEX_pn-wireless-tools = "wireless_tools\.(?P<pver>(\d+)(\..*|))\.tar\.gz"
-REGEX_URI_pn-midori="http://midori-browser.org/download/source/"
-REGEX_pn-midori="midori_(?P<pver>((\d+[\.-_]*)+))_all_\.tar\.bz2"
-
REGEX_URI_pn-sqlite3="http://www.sqlite.org/"
REGEX_pn-sqlite3="${COMMON_REGEX}"
@@ -157,3 +154,5 @@ REGEX_pn-gtk-engines = "${GNOME2_STABLE}"
REGEX_pn-glib-networking = "${GNOME_STABLE}"
REGEX_pn-librsvg = "${GNOME_STABLE}"
REGEX_pn-libsoup-2.4 = "${GNOME_STABLE}"
+REGEX_pn-epiphany = "${GNOME_STABLE}"
+REGEX_pn-webkitgtk = "${GNOME_STABLE}"
diff --git a/meta-yocto/conf/distro/include/poky-floating-revisions.inc b/meta-yocto/conf/distro/include/poky-floating-revisions.inc
index 5b8c3a0..b11f2cd 100644
--- a/meta-yocto/conf/distro/include/poky-floating-revisions.inc
+++ b/meta-yocto/conf/distro/include/poky-floating-revisions.inc
@@ -41,7 +41,6 @@ SRCREV_pn-clutter ?= "${AUTOREV}"
SRCREV_pn-clutter-gst ?= "${AUTOREV}"
SRCREV_pn-gaku ?= "${AUTOREV}"
SRCREV_pn-gypsy ?= "${AUTOREV}"
-#SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
SRCREV_pn-aaina ?= "${AUTOREV}"
SRCREV_pn-clutter-cairo ?= "${AUTOREV}"
SRCREV_pn-table ?= "${AUTOREV}"
diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc
index 7e50500..f998154 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -397,7 +397,6 @@ RECIPE_COLOR_pn-valgrind = "yellow"
RECIPE_COLOR_pn-videoproto = "yellow"
RECIPE_COLOR_pn-watchdog = "yellow"
RECIPE_COLOR_pn-wbxml2 = "red"
-RECIPE_COLOR_pn-webkit-gtk = "yellow"
RECIPE_COLOR_pn-web-webkit = "yellow"
RECIPE_COLOR_pn-which = "yellow"
RECIPE_COLOR_pn-wireless-tools="yellow"
diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc b/meta-yocto/conf/distro/include/upstream_tracking.inc
index 96ca06c..6842df1 100644
--- a/meta-yocto/conf/distro/include/upstream_tracking.inc
+++ b/meta-yocto/conf/distro/include/upstream_tracking.inc
@@ -56,7 +56,6 @@ RECIPE_NO_UPDATE_REASON_pn-createrepo = "Versions after 0.9.* use YUM, so we hol
RECIPE_NO_UPDATE_REASON_pn-db= "API compatibility issue"
RECIPE_NO_UPDATE_REASON_pn-groff = "1.18.1.4 is latest GPLv2 Version no 1.21"
RECIPE_NO_UPDATE_REASON_pn-bash = "The latest version in yocto is 4.3.30"
-RECIPE_NO_UPDATE_REASON_pn-jpeg = "webkit-gtk 1.8.3 doesn't work with jpeg 9"
RECIPE_NO_UPDATE_REASON_pn-kernelshark = "0.2 is the latest version."
RECIPE_NO_UPDATE_REASON_pn-liberation-fonts = "2.00.0 - fontforge package required "
RECIPE_NO_UPDATE_REASON_pn-nettle = "3.0.0 breaks gnutls, api changes"
@@ -65,6 +64,5 @@ RECIPE_NO_UPDATE_REASON_pn-python-distribute = "0.7.3 only upgrades 0.6.32, can'
RECIPE_NO_UPDATE_REASON_pn-python-pygobject = "Newer versions of python-pygobject depend on gobject-introspection which doesn't cross-compile"
RECIPE_NO_UPDATE_REASON_pn-syslinux="Waiting for 4.06 for 3.3 kernel headers support"
RECIPE_NO_UPDATE_REASON_pn-texinfo = "Checking script parses directory wrong"
-RECIPE_NO_UPDATE_REASON_pn-webkit-gtk = ">= 1.10.2 needs ruby"
RECIPE_NO_UPDATE_REASON_pn-xdg-utils = "only release candidates available "
RECIPE_NO_UPDATE_REASON_pn-tremor = "Same revision on different SVN modules"
--
2.1.4
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany
2015-06-17 13:19 [PATCH 00/22] Update webkitgtk to latest stable upstream; replace midori with epiphany Alexander Kanavin
` (21 preceding siblings ...)
2015-06-17 13:19 ` [PATCH 22/22] poky: update distro files related to webkitgtk update and epiphany addition Alexander Kanavin
@ 2015-06-17 16:01 ` Paul Eggleton
2015-06-18 11:46 ` Alexander Kanavin
22 siblings, 1 reply; 38+ messages in thread
From: Paul Eggleton @ 2015-06-17 16:01 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
On Wednesday 17 June 2015 16:19:10 Alexander Kanavin wrote:
> This patch series updates webkitgtk to latest stable upstream release
> and replaces midori browser with epiphany.
>
> These patches should be applied on top of Jussi Kukkonen's gtk3 update to
> 3.16.
>
> Alexander Kanavin (22):
> Change tarball compression to xz for gnome recipes
> Enable icu feature in harfbuzz recipe
> Add arch conversion routine to cmake.bbclass
> Update jpeg recipe to version 9a
> Update libnotify to version 0.7.6
> Add a recipe for giflib
> Add a recipe for libyaml
> Add a recipe for ruby
> Add a recipe for libsecret
> Add a recipe for libwebp
> Add a recipe for webkitgtk 2.8.3
> Add a recipe for p11-kit
> Add a recipe for gcr
> Add a recipe for iso-codes
> Add a recipe for libwnck3
> Add a recipe for gnome-desktop3
> Add a warning suppression patch to glib
> Add a recipe gsettings-desktop-schemas
> Add a recipe for epiphany
> Remove the recipe for the obsolete webkit-gtk 1.8.3
> Remove the midori recipe and replace references to midori with
> epiphany
> poky: update distro files related to webkitgtk update and epiphany
> addition
A couple of minor things:
1) The shortlog for patches should be prefixed with the recipe or class being
modified/added/removed.
2) Changes for poky need to be sent to the poky mailing list rather than here.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 38+ messages in thread