Update webkitgtk to latest stable upstream; replace midori with epiphany

index 6ca13cb..e5c6776 100644
@@ -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"

index 848bf53..4f91b76 100644
@@ -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"
 

index 1f9fe8b..80b7033 100644
@@ -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"
 

index 321eb7f..78cc005 100644
@@ -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 \

index 65b79f0..a31eb55 100644
@@ -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"

index 036aa27..c30454c 100644
@@ -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")

index 4d2b613..c57c973 100644
@@ -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"
 

index 681b856..15267ca 100644
@@ -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"
 

index 0ac323e..a8b0e4f 100644
@@ -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] = "fadebe2e799ab159169ee3198415ff85"

index 4605c76..f4e4250 100644
@@ -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 \
 "

index e29469b..0f8f9b5 100644
@@ -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"
 

index 88696a4..2b1b910 100644
@@ -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"

index 9dab39064..68bc16d 100644
@@ -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"

index a199126..87c30be 100644
@@ -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"

index c174246..ae3cc02 100644
@@ -30,12 +30,22 @@ OECMAKE_EXTRA_ROOT_PATH ?= ""
 OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
 OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
 
+# 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} )

deleted file mode 100644
index 3b8fa69..0000000
@@ -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 (<[email protected]>, 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 (<[email protected]>, 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 <[email protected]>  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 <[email protected]>  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 <[email protected]>
-+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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>
-+    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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>
-+  * Add README.Debian in /usr/share/libjpeg62-dev
-+
-+ -- Bill Allombert <[email protected]>  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
-+    <[email protected]> closes: #129412 Thanks, Colin Marquardt.
-+
-+ -- Bill Allombert <[email protected]>  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, <[email protected]>
-+  * Patch config.guess to use version in the autotools-dev package. 
-+  * Correct Section: field of libjpeg62 and libjpeg62-dev.
-+
-+ -- Bill Allombert <[email protected]>  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 <[email protected]>
-+  * Apply patch from <http://sylvana.net/jpegcrop/transupp.c> by
-+    <[email protected]> closes: #114415 Thanks, <[email protected]>
-+    
-+ -- Bill Allombert <[email protected]>  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 <[email protected]>.
-+  * Fix formating of description of libjpeg-progs. 
-+    closes: #114378 Thanks, Colin Watson <[email protected]>.
-+  * Install jpegint.h header needed by some apps. closes: #100171
-+  * Remove unused/empty debian/postrm.
-+    closes: #24849 Thanks, Adrian Bridgett <[email protected]>.
-+  * Install wizard.doc file. closes: #64807 Thanks <[email protected]>.
-+  * 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 <[email protected]>
-+  * Standards-Version is now 3.5.6.
-+
-+ -- Bill Allombert <[email protected]>  Fri,  9 Nov 2001 22:40:16 +0100
-+
-+libjpeg6b (6b-1.3) frozen unstable; urgency=low
-+
-+  * Non-Maintainer Upload.
-+  * Added Build-Depends.
-+  * Gil Bahat <[email protected]> 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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  Thu, 22 Oct 1998 05:49:48 -0700
-+
-+libjpeg6b (6b-1) unstable; urgency=low
-+
-+  * New binary packages for 6b
-+  * New upstream release
-+
-+ -- Mark Mickan <[email protected]>  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 <[email protected]> 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 <[email protected]> and later maintained by Mark Mickan.
-+
-+Current Debian maintainer is Bill Allombert <[email protected]>.
-+
-+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 <[email protected]>
-+.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 <[email protected]>
-+.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)

44 lines not on this page · raw message

similarity index 53%
rename from meta/recipes-core/jpeg/jpeg_8d.bb
rename to meta/recipes-core/jpeg/jpeg_9a.bb
index da23302..ea2e65d 100644
@@ -3,39 +3,17 @@ 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"
-
-inherit autotools 
+	  "
 
-EXTRA_OECONF="--enable-static --enable-shared"
-EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"'
+SRC_URI[md5sum] = "3353992aecaee1805ef4109aadd433e7"
+SRC_URI[sha256sum] = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"
 
-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
-}
+inherit autotools
 
 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."

deleted file mode 100644
index e6ee89b..0000000
@@ -1,21 +0,0 @@
-SUMMARY = "Library for sending desktop notifications to a notification daemon"
-SECTION = "libs"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-PR = "r1"
-
-DEPENDS = "dbus gtk+ dbus-glib"
-
-inherit gnomebase distro_features_check
-
-# 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"
-
-do_configure_prepend() {
-    sed -i /GTK3/d ${S}/configure.ac
-    sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' ${S}/tests/Makefile.am
-}

new file mode 100644
index 0000000..5d7b4ce
@@ -0,0 +1,12 @@
+SUMMARY = "Library for sending desktop notifications to a notification daemon"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+DEPENDS = "dbus gtk+3 dbus-glib"
+
+inherit gnomebase distro_features_check gtk-doc
+
+SRC_URI[archive.md5sum] = "a4997019d08f46f3bf57b78e6f795a59"
+SRC_URI[archive.sha256sum] = "0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837"
+

new file mode 100644
index 0000000..f1facac
@@ -0,0 +1,19 @@
+SUMMARY = "shared library for GIF images"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
+
+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"

new file mode 100644
index 0000000..3c4a00e
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Kirill Simonov <[email protected]>
+# Date 1417197312 21600
+# Node ID 2b9156756423e967cfd09a61d125d883fca6f4f2
+# Parent  053f53a381ff6adbbc93a31ab7fdee06a16c8a33
+Removed invalid simple key assertion (thank to Jonathan Gray).
+
+The patch comes from 
+
+https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2
+
+Upstream-Status: Backport
+
+Signed-off-by: Yue Tao <[email protected]>
+
+diff -r 053f53a381ff -r 2b9156756423 src/scanner.c
+--- a/src/scanner.c	Wed Mar 26 13:55:54 2014 -0500
++++ b/src/scanner.c	Fri Nov 28 11:55:12 2014 -0600
+@@ -1106,13 +1106,6 @@
+             && parser->indent == (ptrdiff_t)parser->mark.column);
+ 
+     /*
+-     * A simple key is required only when it is the first token in the current
+-     * line.  Therefore it is always allowed.  But we add a check anyway.
+-     */
+-
+-    assert(parser->simple_key_allowed || !required);    /* Impossible. */
+-
+-    /*
+      * If the current position may start a simple key, save it.
+      */
+ 

new file mode 100644
index 0000000..b015577
@@ -0,0 +1,21 @@
+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 \
+           file://libyaml-CVE-2014-9130.patch \
+          "
+
+SRC_URI[md5sum] = "5fe00cda18ca5daeb43762b80c38e06e"
+SRC_URI[sha256sum] = "7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749"
+
+S = "${WORKDIR}/yaml-${PV}"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"

new file mode 100644
index 0000000..ba60191
@@ -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/
+}

new file mode 100644
index 0000000..8b68450
@@ -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"] = "-"

42 lines not on this page · raw message

new file mode 100644
index 0000000..cebc83b
@@ -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"

new file mode 100644
index 0000000..3ab2e5b
@@ -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"

new file mode 100644
index 0000000..f3e719e
@@ -0,0 +1,56 @@
+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/${BPN}-${PV}.tar.xz \
+  "
+SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae"
+SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20"
+
+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
+EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=False "
+EXTRA_OECMAKE_append_powerpc64 = " -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.1 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 "
+EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=False "
+
+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/*"
+

new file mode 100644
index 0000000..7ad9626e
@@ -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"

new file mode 100644
index 0000000..8b5b6e4
@@ -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 \
+"

new file mode 100644
index 0000000..07be69b
@@ -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
+
+FILES_${PN} += "${datadir}/xml/"

new file mode 100644
index 0000000..d0f5175
@@ -0,0 +1,15 @@
+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"
+
+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"

new file mode 100644
index 0000000..1f2f06c
@@ -0,0 +1,21 @@
+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 iso-codes"
+
+EXTRA_OECONF = "--disable-desktop-docs"
+
+PACKAGES =+ "libgnome-desktop3"
+FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml"
+
+RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas"
+

new file mode 100644
index 0000000..54e830c
@@ -0,0 +1,32 @@
+From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+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
+

index 8eaccfb..1e3d36a 100644
@@ -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"

new file mode 100644
index 0000000..f2f2c75
@@ -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"

new file mode 100644
index 0000000..2681ab5
@@ -0,0 +1,24 @@
+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 += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
+SRC_URI[archive.md5sum] = "3296af4532b8019775f4b40d21a341ae"
+SRC_URI[archive.sha256sum] = "d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1"
+
+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}/epiphany/*/web-extensions/.debug/libephywebextension.so"
+RDEPENDS_${PN} = "iso-codes"
+RRECOMMENDS_${PN} = "ca-certificates"
+

new file mode 100644
index 0000000..2585d7f
@@ -0,0 +1,33 @@
+From 30f03a256efe375a4d5c3a24bf4168ebf380e3ab Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 30 Jul 2015 15:13:23 +0300
+Subject: [PATCH] yelp.m4: drop the check for itstool
+
+It isn't used for anything during build, so there's no need to provide
+it as a recipe.
+
+Upstream-Status: Inappropriate [tarball-specific issue]
+---
+ m4/yelp.m4 | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/m4/yelp.m4 b/m4/yelp.m4
+index 5db847f..1b6ede4 100644
+--- a/m4/yelp.m4
++++ b/m4/yelp.m4
+@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir],
+ HELP_DIR="$with_help_dir"
+ AC_SUBST(HELP_DIR)
+ 
+-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
+-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
+-if test x"$ITSTOOL" = x; then
+-  AC_MSG_ERROR([itstool not found])
+-fi
+-
+ AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
+ AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
+ if test x"$XMLLINT" = x; then
+-- 
+2.1.4
+

index ff600fa..14ac0bf 100644
@@ -21,7 +21,6 @@ SECURITY_CFLAGS_powerpc = "-fstack-protector-all ${lcl_maybe_fortify}"
 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}"

@@ -86,7 +85,6 @@ SECURITY_CFLAGS_pn-python3 = "${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

558 lines not on this page · raw message

deleted file mode 100644
index 4eb09dc..0000000
@@ -1,20 +0,0 @@
-make install invokes a gtk-doc tool without checking that we have gtk-doc.
-
-Signed-off-by: Ross Burton <[email protected]>
-
-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`; \

deleted file mode 100644
index e713e8b..0000000
@@ -1,19 +0,0 @@
-Dolt cause build error on some platform, so disable it.
-
-Signed-off-by: Zhai Edwin <[email protected]>
-
-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

62 lines not on this page · raw message

deleted file mode 100644
index e7e9083..0000000
@@ -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 <[email protected]>
----
- 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
-

69 lines not on this page · raw message

41 lines not on this page · raw message

deleted file mode 100644
index d9e8444..0000000
@@ -1,14 +0,0 @@
-Upstream-Status: Backport
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-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

116 lines not on this page · raw message

index 7d5a41a..d38be26 100644
@@ -28,11 +28,6 @@ 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 = ""
-
 RDEPENDS_packagegroup-self-hosted-host-tools = "\
     connman \
     connman-plugin-ethernet \

@@ -198,7 +193,7 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\
     python-pygtk \
     gtk-theme-clearlooks \
     xdg-utils \
-    ${MIDORI} \
+    epiphany \
     leafpad \
     pcmanfm \
     vte \

index 65a68ee..b394b09 100644
@@ -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

deleted file mode 100644
index 4e5d666..0000000
@@ -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 <[email protected]>
-
-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"),

deleted file mode 100644
index 1c027fe4..0000000
@@ -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"

index 04d1e99..353b2ba 100644
@@ -48,7 +48,7 @@ FILEMANAGER ?= "pcmanfm"
 FILEMANAGER_mips ?= ""
 
 WEB ?= ""
-#WEB = "midori"
+#WEB = "epiphany"
 
 SUMMARY_${PN}-apps = "Sato desktop - applications"
 RDEPENDS_${PN}-apps = "\

index ec8570d..bd3da9c 100644
@@ -472,7 +472,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"

index 0c29ade..d844a47 100644
@@ -25,9 +25,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="releaselog/${COMMON_REGEX}.html"
 

@@ -94,6 +91,7 @@ REGEX_URI_pn-python-smartpm="https://launchpad.net/smart/trunk/"
 REGEX_URI_pn-lsof = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/"
 REGEX_URI_pn-pbzip2 = "http://compression.ca/pbzip2/"
 REGEX_URI_pn-quicky = "http://qt-apps.org/content/download.php?content=80325&id=1&tan=10417482"
+REGEX_URI_pn-libwebp = "http://downloads.webmproject.org/releases/webp/index.html"
 
 # The engine tries to use directory versioning but is a false-positive
 REGEX_URI_pn-intltool = "https://launchpad.net/intltool/trunk/"

@@ -227,6 +225,10 @@ REGEX_pn-clutter-gtk-1.0 = "${GNOME_STABLE}"
 REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}"
 REGEX_pn-cogl-1.0 = "${GNOME_STABLE}"
 REGEX_pn-adwaita-icon-theme = "${GNOME_STABLE}"
+REGEX_pn-epiphany = "${GNOME_STABLE}"
+REGEX_pn-webkitgtk = "${GNOME_STABLE}"
+REGEX_pn-p11-kit = "${GNOME_STABLE}"
+REGEX_pn-gnome-desktop3 = "${GNOME_STABLE}"
 
 # not GNOME related but uses same even-minor-release-is-stable logic
 REGEX_pn-dbus = "${GNOME_STABLE}"

index 996d9e0..a9b33f1 100644
@@ -31,8 +31,6 @@ CHECK_DATE_pn-unfs3 = "Jun 10, 2015"
 RECIPE_NO_UPDATE_REASON_pn-base-passwd = "Version 3.5.38 requires cdebconf for update-passwd utility"
 RECIPE_NO_UPDATE_REASON_pn-chkconfig = "Version 1.5 requires selinux"
 RECIPE_NO_UPDATE_REASON_pn-createrepo = "Versions after 0.9.* use YUM, so we hold at 0.4.11"
-RECIPE_NO_UPDATE_REASON_pn-jpeg = "webkit-gtk 1.8.3 doesn't work with jpeg 9"
 RECIPE_NO_UPDATE_REASON_pn-liberation-fonts = "2.x depends on fontforge package, which is not yet provided in oe-core"
 RECIPE_NO_UPDATE_REASON_pn-pkgconfig = "removes glib-conf, adds circular depends"
 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-webkit-gtk = ">= 1.10.2 needs ruby"