efl upgrade

I'm testing even newer revisions for 1.1.0-beta, but with current elementary changes I'll keep it a bit longer in shr or jansa/test branch until API settle a bit again.. (ie elm_genlist/elm_gengrid API was unifiend to elm_gen around r64250 but today there is new plan to remove new elm_gen and merge gengrid to genlist and keep genlist api see r65700)

The following changes since commit f3ca7acd0b678a9247e432aee34512a26e30f509:

libsdl-x11: drop from meta-oe (2011-11-30 08:52:38 +0100)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/meta-efl
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-efl

Martin Jansa (11):
elsa: add sessreg xauth to RDEPENDS
elsa: add elsa.conf to CONFFILES
elsa: use common-* instead of system-auth in pam config
e-base: bump EFL_SRCREV for 1.1.0 alpha versions efl.bbclass: don't remove STAGING_LIBDIR STAGING_INCDIR from efl
pkgconfig files
epdf: drop upstream applied patch and ewl is gone too
eeze: pass /bin/true instead of eject which is not available
edje: fix license metadata
elementary: fix license metadata
elementary: add gettextize patch
elementary: disable web support

 meta-efl/classes/e-base.bbclass                    |    2 +-
 meta-efl/classes/efl.bbclass                       |    2 +-
 meta-efl/recipes-efl/e17/elfe_svn.bb               |    3 +-
 meta-efl/recipes-efl/efl/edje.inc                  |    5 +-
 meta-efl/recipes-efl/efl/eeze.inc                  |    3 +
 .../0001-elementary-gettextize-0.18.1.patch        |   76 ++++++++++++++++++++
 meta-efl/recipes-efl/efl/elementary_svn.bb         |    7 ++-
 ...am-use-common-auth-instead-of-system-auth.patch |   29 ++++++++
 meta-efl/recipes-efl/efl/elsa_svn.bb               |    8 ++-
 .../efl/epdf/epdf.poppler-0.16.api.change.patch    |   11 ---
 meta-efl/recipes-efl/efl/epdf_svn.bb               |    2 -
 meta-efl/recipes-efl/efl/evas_svn.bb               |    3 +-
 12 files changed, 126 insertions(+), 25 deletions(-)
 create mode 100644 meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch
 create mode 100644 meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch
 delete mode 100644 meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch

1.7.8.rc4

---
 meta-efl/recipes-efl/efl/elsa_svn.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

index d0e5e81..4dafdad 100644
@@ -10,7 +10,8 @@ S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
+PR = "r1"
 PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
-RDEPENDS_${PN} = "${PN}-themes"
+RDEPENDS_${PN} += "${PN}-themes sessreg xauth"

1.7.8.rc4

---
 meta-efl/recipes-efl/efl/elsa_svn.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

index 4dafdad..17af886 100644
@@ -15,3 +15,4 @@ PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
+CONFFILES_${PN} += "${sysconfdir}/elsa.conf"

1.7.8.rc4

---
 ...am-use-common-auth-instead-of-system-auth.patch |   29 ++++++++++++++++++++
 meta-efl/recipes-efl/efl/elsa_svn.bb               |    4 ++-
 2 files changed, 32 insertions(+), 1 deletions(-)
 create mode 100644 meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch

new file mode 100644
index 0000000..a9beea0
@@ -0,0 +1,29 @@
+From 27dc9147a822d69be90edd0d137b80c0c609d5d2 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Thu, 24 Nov 2011 13:25:33 +0100
+Subject: [PATCH] pam: use common-auth instead of system-auth
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ PROTO/elsa/data/elsa |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/data/elsa b/data/elsa
+index 3476d55..47d29222 100644
+--- a/data/elsa
++++ b/data/elsa
+@@ -1,7 +1,7 @@
+ # File autogenerated by pamd_mimic in pam eclass
+ 
+ 
+-auth	include		system-auth
+-account	include		system-auth
+-password	include		system-auth
+-session	include		system-auth
++auth	include		common-auth
++account	include		common-account
++password	include		common-password
++session	include		common-session
+-- 
+1.7.8.rc3
+

index 17af886..e2f6fd7 100644
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "e/apps"
 
 inherit e gettext
-SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
+  file://0001-pam-use-common-auth-instead-of-system-auth.patch \
+"
 S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"

1.7.8.rc4

---
 meta-efl/classes/e-base.bbclass      |    2 +-
 meta-efl/recipes-efl/e17/elfe_svn.bb |    3 +--
 meta-efl/recipes-efl/efl/evas_svn.bb |    3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

index 18df79b..d9c2275 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
 # usually tracks svn trunk HEAD
-EFL_SRCREV ?= "64506"
+EFL_SRCREV ?= "65428"
 # revision when 1.0.0 was released, for recipes which don't need rebuild so often
 EFL_SRCREV_1.0.0 ?= "56356"
 

index 13fe014..f6d6fdb 100644
@@ -5,7 +5,6 @@ PR = "${INC_PR}.1"
 
 require e-module.inc
 
-SRCREV = "64510" 
-# EFL_SRCREV
+SRCREV = "${EFL_SRCREV}"
 
 DEPENDS += "elementary"

index be39f65..3712760 100644
@@ -1,7 +1,6 @@
 require evas.inc
 
-#SRCREV = "${EFL_SRCREV}"
-SRCREV = "64516"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.0.999+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

1.7.8.rc4

* but replace those with ${libdir} and ${includedir}
* it was breaking edbus:
Cflags: -I${includedir}/e_dbus-1 -I/OE/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include/dbus-1.0 -I/OE/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/dbus-1.0/include after make install:
Cflags: -I${includedir}/e_dbus-1 /dbus-1.0 -I/OE/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/dbus-1.0/include
* and notice that dbus-1 is using -I{libdir} here, so replace it too

---
 meta-efl/classes/efl.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index f90dc1c..792343b 100644
@@ -15,7 +15,7 @@ do_configure_prepend() {
 
 do_install_prepend () {
 	for i in `find ${S}/ -name "*.pc" -type f` ; do \
-		sed -i -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' $i
+		sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i
 	done
 }
 

1.7.8.rc4

---
 .../efl/epdf/epdf.poppler-0.16.api.change.patch    |   11 -----------
 meta-efl/recipes-efl/efl/epdf_svn.bb               |    2 --
 2 files changed, 0 insertions(+), 13 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch

deleted file mode 100644
index 7c0ae65..0000000
@@ -1,11 +0,0 @@
-diff -uNr epdf.orig/src/lib/poppler/epdf_poppler_postscript.cpp epdf/src/lib/poppler/epdf_poppler_postscript.cpp
---- epdf.orig/src/lib/poppler/epdf_poppler_postscript.cpp	2011-09-30 20:50:03.580218578 +0200
-+++ epdf/src/lib/poppler/epdf_poppler_postscript.cpp	2011-09-30 20:49:11.573219667 +0200
-@@ -84,6 +84,7 @@
- 
-   // FIXME: fix postscript title
-   ps_dev = new PSOutputDev (postscript->filename,
-+                            postscript->pdfdoc,
-                             postscript->pdfdoc->getXRef(),
-                             postscript->pdfdoc->getCatalog(),
- 			    "PS title",

index d479da6..28da32b 100644
@@ -13,13 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 "
 
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
-           file://epdf.poppler-0.16.api.change.patch \
 "
 S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "\
     --enable-poppler \
-    --disable-ewl \
     --disable-mupdf \
 "
 

1.7.8.rc4

* hopefully better fix will be available upstream later
09:03:03 < discomfitor> only if an app makes an eject call
09:03:36 < discomfitor> in which case, the resulting exe call would be "/bin/true $mountpoint"
09:03:39 < discomfitor> which would do nothing
09:03:55 < discomfitor> so you would break those apps, but it doesn't seem to be an issue for embedded...
09:08:06 < JaMa> ok, I meant if it would be better for those apps to know that eject functionality is not available, but if this is fine for you I can live
with it too :)
09:09:26 < discomfitor> JaMa: hmm
09:09:37 < discomfitor> JaMa: I will consider that

---
 meta-efl/recipes-efl/efl/eeze.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

index 4b13984..7a06f9d 100644
@@ -8,6 +8,9 @@ inherit efl
 BBCLASSEXTEND = "native"
 INC_PR = "r2"
 
+# to make configure happy, but we don't have (and usually don't need)  eject on target
+EXTRA_OECONF += "--with-eject=${base_bindir}/true"
+
 # Some upgrade path tweaking
 AUTO_LIBNAME_PKGS = ""
 

1.7.8.rc4

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 30-11-11 09:16, Martin Jansa schreef:

How about:

RRECOMMENDS_${PN} += "eject" ?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7V9voACgkQMkyGM64RGpFm3ACcCBiZBj731XsqB7kdj9TAr/iy m+sAoIz331YvgrWbO1A9xToOxLXj6maU
=qaIj
-----END PGP SIGNATURE-----

The problem in SRCREV I was usin was that it was cheking the existance during build (so you had to have /usr/bin/eject on buildhost).

Later in r65358 and r65359 there were changes for runtime detections of utils, so with current EFL_SRCREV r65428 we should be fine and RRECOMMENDS_${PN} should be enough, I'll retest and send updated patch with next EFL_SRCREV bump.

Cheers,

Martin 'JaMa' Jansa     jabber: [email protected]

---
 meta-efl/recipes-efl/efl/edje.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

index b922f90..7c415d2 100644
@@ -2,8 +2,9 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "lua5.1 eet evas ecore embryo edje-native"
 DEPENDS_virtclass-native = "lua5.1-native evas-native ecore-native eet-native embryo-native"
 DEPENDS_virtclass-nativesdk = "evas-native ecore-native eet-native embryo-native"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1f2d83425ec8dfae5cd77f8ce52e872c"
+# GPLv2 because of epp in PN-utils
+LICENSE = "MIT BSD GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c18cc221a14a84b033db27794dc36df8"
 
 inherit efl
 

1.7.8.rc4

* in r65248 fix errant word 'either' in license.

---
 meta-efl/recipes-efl/efl/elementary_svn.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 6162abd..4051caf 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cdc6c12b238ccd62635a7517dfe89438"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10a051c72424b80bc784a3903651b43b"
 DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb"
 PV = "0.8.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"

1.7.8.rc4

* normally we would call gettextize from do_configure, but efl.bbclass is running

  do_configure_prepend() {
        autopoint || touch config.rpath

}
before that and this respects AM_GNU_GETTEXT_VERSION which is 0.17 and later it fails with;
*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.17 but the autoconf macros are from gettext version 0.18

---
 .../0001-elementary-gettextize-0.18.1.patch        |   76 ++++++++++++++++++++
 meta-efl/recipes-efl/efl/elementary_svn.bb         |    4 +-
 2 files changed, 79 insertions(+), 1 deletions(-)
 create mode 100644 meta-efl/recipes-efl/efl/elementary/0001-elementary-gettextize-0.18.1.patch

new file mode 100644
index 0000000..0dc1660
@@ -0,0 +1,76 @@
+From 5b81eac20242ece02f8bc42549783604a326f75d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Thu, 17 Nov 2011 11:36:29 +0100
+Subject: [PATCH] elementary: gettextize
+
+* was complaining about wrong version
+  *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.17 but the autoconf macros are from gettext version 0.18
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ Makefile.am  |    2 +-
+ configure.ac |    4 ++--
+ po/ChangeLog |   11 +++++++++++
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+ delete mode 100644 ChangeLog
+
+diff --git a/ChangeLog b/ChangeLog
+deleted file mode 100644
+index e69de29..0000000
+diff --git a/Makefile.am b/Makefile.am
+index 46d2871..419a429 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -56,7 +56,7 @@ endif
+ 
+ 
+ 
+-EXTRA_DIST = \
++EXTRA_DIST = config.rpath  \
+ README \
+ AUTHORS \
+ COPYING \
+diff --git a/configure.ac b/configure.ac
+index e5ad88c..f204693 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -631,7 +631,7 @@ EFL_ENABLE_BIN([elementary-test])
+ EFL_ENABLE_BIN([elementary-config])
+ 
+ m4_ifdef([AM_GNU_GETTEXT_VERSION], [
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18.1])
+ ])
+ 
+ m4_ifdef([AM_GNU_GETTEXT], [
+@@ -657,7 +657,7 @@ EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="
+ EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"])
+ 
+ 
+-AC_OUTPUT([
++AC_OUTPUT([ po/Makefile.in
+ Makefile
+ elementary.spec
+ elementary.pc
+diff --git a/po/ChangeLog b/po/ChangeLog
+index 31234d3..8ca1011 100644
+--- a/po/ChangeLog
++++ b/po/ChangeLog
+@@ -1,3 +1,14 @@
++2011-11-17  gettextize  <[email protected]>
++
++	* Makefile.in.in: New file, from gettext-0.18.1.
++	* Rules-quot: New file, from gettext-0.18.1.
++	* boldquot.sed: New file, from gettext-0.18.1.
++	* [email protected]: New file, from gettext-0.18.1.
++	* [email protected]: New file, from gettext-0.18.1.
++	* insert-header.sin: New file, from gettext-0.18.1.
++	* quot.sed: New file, from gettext-0.18.1.
++	* remove-potcdate.sin: New file, from gettext-0.18.1.
++
+ 2010-12-26  gettextize  <[email protected]>
+ 
+ 	* Makefile.in.in: New file, from gettext-0.17.
+-- 
+1.7.8.rc1
+

index 4051caf..840cb11 100644
@@ -6,7 +6,9 @@ PV = "0.8.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl gettext
-SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
+  file://0001-elementary-gettextize-0.18.1.patch \
+"
 S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "\

1.7.8.rc4

* we don't have webkit-efl in DEPENDS so it depends on build order if it's autodetected or not for elementary
* libewebkit0 is quite bit so we don't want to pull it to every image with elementary
* and we cannot split elementary web support to different package because libewebkit is linked directly from libelementary-ver-pre-svn-09.so.0.8.0

---
 meta-efl/recipes-efl/efl/elementary_svn.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

index 840cb11..6e9347e 100644
@@ -14,6 +14,7 @@ S = "${WORKDIR}/${SRCNAME}"
 EXTRA_OECONF = "\
   --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
   --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+  --disable-web \
 "
 
 do_compile_append() {

1.7.8.rc4

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 30-11-11 09:16, Martin Jansa schreef:

I was about to suggest splitting it...

... but you've already answered that :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7V90kACgkQMkyGM64RGpGU2QCeLWMPS7hTu+eOdbalBWFC7qGj MksAoI4wCu7TWda3b8qNG0uRUeRMXC0/
=aOVT
-----END PGP SIGNATURE-----

I was also thinking about spliting libewebkit a bit more SHR root@gjama / $ ls -lah /usr/lib/libewebkit.so.0.1.0 -rwxr-xr-x 1 root root 525K Nov 10 10:09 /usr/lib/libewebkit.so.0.1.0

525K is not that big, but:
SHR root@gjama / $ opkg info libewebkit0 | grep Size
Size: 13192646

lrwxrwxrwx 1 root root 19 Nov 28 15:47 /usr/lib/libewebkit.so.0 -> libewebkit.so.0.1.0
-rwxr-xr-x 1 root root 525K Nov 10 10:09 /usr/lib/libewebkit.so.0.1.0
lrwxrwxrwx 1 root root 30 Nov 28 15:47 /usr/lib/libjavascriptcore_efl.so.0 -> libjavascriptcore_efl.so.0.1.0
-rwxr-xr-x 1 root root 4.2M Nov 10 10:09 /usr/lib/libjavascriptcore_efl.so.0.1.0
lrwxrwxrwx 1 root root 23 Nov 28 15:47 /usr/lib/libwebcore_efl.so.0 -> libwebcore_efl.so.0.1.0
-rwxr-xr-x 1 root root 41M Nov 10 10:09 /usr/lib/libwebcore_efl.so.0.1.0
lrwxrwxrwx 1 root root 19 Nov 28 15:47 /usr/lib/libwtf_efl.so.0 -> libwtf_efl.so.0.1.0
-rwxr-xr-x 1 root root 413K Nov 10 10:09 /usr/lib/libwtf_efl.so.0.1.0 -rw-r--r-- 1 root root 116K Nov 10 10:06 /usr/share/ewebkit-0/themes/default.edj

and
SHR root@gjama / $ ldd /usr/lib/libewebkit.so.0.1.0 | grep web

        libwebcore_efl.so.0 => /usr/lib/libwebcore_efl.so.0 (0x403a5000)

So we cannot even pull only smaller 525K part of it..

Regards,

Martin 'JaMa' Jansa     jabber: [email protected]