Pull request #11

PATCH In review Martin Jansa 2 participants 8 messages Sep 6, 2011

lore

Share & tools

lore

Martin Jansa

author

2011-09-06 07:51 UTC #0 lore raw

cover Pull request #11

Small changes mostly to packaging and update LIC_FILES_CHKSUM after Copyright changes

The following changes since commit 08513a79f6a54201b38a0c5ee6c086a7cff15dde:

dbus-c++: use openembedded-core versions (2011-09-04 09:20:12 +0200)

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 (6):
e-base: bump EFL_SRCREV
recipes-efl: remove EFL_SRCREV_1.0.0
imlib2: package also /usr/src/debug files to ${PN}-dbg
e-wm: ignore autopoint errors
ecore: add ie /usr/lib/ecore/immodules/xim.so to ${PN}-dev
recipes-efl: update LIC_FILES_CHKSUM, Copyright was updated in r63187

 meta-efl/classes/e-base.bbclass                    |    2 +-
 .../e17/e-wm-theme-illume-efenniht_svn.bb          |    2 +-
 meta-efl/recipes-efl/e17/e-wm_svn.bb               |    4 ++--
 meta-efl/recipes-efl/e17/exquisite-theme-illume.bb |    2 +-
 meta-efl/recipes-efl/efl/ecore.inc                 |    3 ++-
 meta-efl/recipes-efl/efl/edb_svn.bb                |    2 +-
 meta-efl/recipes-efl/efl/edbus.inc                 |    2 +-
 meta-efl/recipes-efl/efl/eet.inc                   |    2 +-
 meta-efl/recipes-efl/efl/eeze.inc                  |    2 +-
 meta-efl/recipes-efl/efl/efreet.inc                |    2 +-
 meta-efl/recipes-efl/efl/eina.inc                  |    2 +-
 .../efl/elementary-theme-efenniht_svn.bb           |    4 ++--
 meta-efl/recipes-efl/efl/elementary_svn.bb         |    2 +-
 meta-efl/recipes-efl/efl/embryo.inc                |    2 +-
 meta-efl/recipes-efl/efl/engrave_svn.bb            |    2 +-
 meta-efl/recipes-efl/efl/epeg_svn.bb               |    2 +-
 meta-efl/recipes-efl/efl/evas.inc                  |    2 +-
 meta-efl/recipes-efl/efl/imlib2_svn.bb             |    2 +-
 18 files changed, 21 insertions(+), 20 deletions(-)

Signature · 1 line

1.7.6.1

Martin Jansa

author

2011-09-06 07:51 UTC #1 lore raw

PATCH 1/6 e-base: bump EFL_SRCREV

Signed-off-by Martin Jansa <[email protected]>

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

meta-efl/classes/e-base.bbclass +1 -1

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

Signature · 1 line

1.7.6.1

Martin Jansa

author

2011-09-06 07:51 UTC #2 lore raw

PATCH 2/6 recipes-efl: remove EFL_SRCREV_1.0.0

* with recipes from releases removed it doesn't make much sense anymore
* maybe will return after 1.1 release

Signed-off-by Martin Jansa <[email protected]>

---
 .../e17/e-wm-theme-illume-efenniht_svn.bb          |    2 +-
 meta-efl/recipes-efl/e17/exquisite-theme-illume.bb |    2 +-
 meta-efl/recipes-efl/efl/edb_svn.bb                |    2 +-
 .../efl/elementary-theme-efenniht_svn.bb           |    4 ++--
 meta-efl/recipes-efl/efl/engrave_svn.bb            |    2 +-
 meta-efl/recipes-efl/efl/epeg_svn.bb               |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb +1 -1

index 60df582..804f670 100644
@@ -7,7 +7,7 @@ RSUGGESTS_${PN} = "elementary-theme-efenniht"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT/BSD"
 
-SRCREV = "${EFL_SRCREV_1.0.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "0.0+svnr${SRCPV}"
 
 inherit e-base

meta-efl/recipes-efl/e17/exquisite-theme-illume.bb +1 -1

index c12405b..ba16190 100644
@@ -4,7 +4,7 @@ SECTION = "x11"
 DEPENDS = "edje-native"
 PV = "1.0+svnr${SRCPV}"
 PR = "r6"
-SRCREV = "${EFL_SRCREV_1.0.0}"
+SRCREV = "${EFL_SRCREV}"
 
 inherit e-base update-alternatives

meta-efl/recipes-efl/efl/edb_svn.bb +1 -1

index 4f7e58d..8b2338a 100644
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "zlib"
 PV = "1.0.5.050+svnr${SRCPV}"
 PR = "r1"
-SRCREV = "${EFL_SRCREV_1.0.0}"
+SRCREV = "${EFL_SRCREV}"
 
 inherit efl

meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb +2 -2

index 79557cd..68d9ee3 100644
@@ -6,8 +6,8 @@ RSUGGESTS_${PN} = "e-wm-theme-illume-efenniht"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT/BSD"
 
-SRCREV_THM_REV ?= "${EFL_SRCREV_1.0.0}"
-SRCREV_ELM_REV ?= "${EFL_SRCREV_1.0.0}"
+SRCREV_THM_REV ?= "${EFL_SRCREV}"
+SRCREV_ELM_REV ?= "${EFL_SRCREV}"
 
 SRCREV_FORMAT = "THM_REV"
 PV = "0.0+svnr${SRCPV}"

meta-efl/recipes-efl/efl/engrave_svn.bb +1 -1

index fefd6d4..91cfa92 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 DEPENDS = "evas ecore"
 PV = "0.0.0+svnr${SRCPV}"
 PR = "r1"
-SRCREV = "${EFL_SRCREV_1.0.0}"
+SRCREV = "${EFL_SRCREV}"
 
 inherit efl
 SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};proto=http;scmdata=keep"

meta-efl/recipes-efl/efl/epeg_svn.bb +1 -1

index 1ad5c36..9d66bb3 100644
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 DEPENDS = "jpeg"
 PV = "0.9.0+svnr${SRCPV}"
 PR = "r2"
-SRCREV = "${EFL_SRCREV_1.0.0}"
+SRCREV = "${EFL_SRCREV}"
 
 inherit efl
 SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};proto=http;scmdata=keep"

Signature · 1 line

1.7.6.1

Martin Jansa

author

2011-09-06 07:52 UTC #3 lore raw

PATCH 3/6 imlib2: package also /usr/src/debug files to ${PN}-dbg

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

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

meta-efl/recipes-efl/efl/imlib2_svn.bb +1 -1

index a2585e7..58fed9e 100644
@@ -27,7 +27,7 @@ do_install_append() {
 
 PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
-FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/"
+FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/"
 FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
 FILES_${PN}-bin = "${bindir}"
 FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"

Signature · 1 line

1.7.6.1

Martin Jansa

author

2011-09-06 07:52 UTC #4 lore raw

PATCH 4/6 e-wm: ignore autopoint errors

In reply to Martin Jansa

| autopoint: File config.rpath has been locally modified.
| autopoint: warning: File mkinstalldirs has been locally modified.
| autopoint: *** Some files have been locally modified. Not overwriting
  them because --force has not been specified. For your convenience, you
  find the local modifications in the file '/tmp/gtAHz0tp/autopoint.diff'.
| autopoint: *** Stop.
---
 meta-efl/recipes-efl/e17/e-wm_svn.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-efl/recipes-efl/e17/e-wm_svn.bb +1 -1

index 38257b5..cb7f445 100644
@@ -25,7 +25,7 @@ EXTRA_OECONF = "\
 "
 
 do_configure_prepend() {
-	autopoint
+	autopoint || true
 }
 
 do_install_append() {

Signature · 1 line

1.7.6.1

Martin Jansa

author

2011-09-06 07:52 UTC #5 lore raw

PATCH 5/6 ecore: add ie /usr/lib/ecore/immodules/xim.so to ${PN}-dev

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

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

meta-efl/recipes-efl/efl/ecore.inc +1 -0

index 89e578e..9f3d1a4 100644
@@ -73,6 +73,7 @@ FILES_${PN}-job = "${libdir}/libecore_job*.so.*"
 FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*"
 FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
 FILES_${PN}-input = "${libdir}/libecore_input*.so.*"
+FILES_${PN}-dev += "${libdir}/ecore/immodules/*.so"
 
 ECORE_OECONF = "\
   --x-includes=${STAGING_INCDIR}/X11 \

Signature · 1 line

1.7.6.1

Martin Jansa

author

2011-09-06 07:52 UTC #6 lore raw

PATCH 6/6 recipes-efl: update LIC_FILES_CHKSUM, Copyright was updated in r63187

In reply to Martin Jansa

* see http://trac.enlightenment.org/e/changeset/63187

Signed-off-by Martin Jansa <[email protected]>

---
 meta-efl/recipes-efl/e17/e-wm_svn.bb       |    2 +-
 meta-efl/recipes-efl/efl/ecore.inc         |    2 +-
 meta-efl/recipes-efl/efl/edbus.inc         |    2 +-
 meta-efl/recipes-efl/efl/eet.inc           |    2 +-
 meta-efl/recipes-efl/efl/eeze.inc          |    2 +-
 meta-efl/recipes-efl/efl/efreet.inc        |    2 +-
 meta-efl/recipes-efl/efl/eina.inc          |    2 +-
 meta-efl/recipes-efl/efl/elementary_svn.bb |    2 +-
 meta-efl/recipes-efl/efl/embryo.inc        |    2 +-
 meta-efl/recipes-efl/efl/evas.inc          |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

meta-efl/recipes-efl/e17/e-wm_svn.bb +1 -1

index cb7f445..2d0f44d 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment Window Manager Version 17"
 DEPENDS = "eet evas eina ecore edje efreet edbus eeze"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f523ab5986cc79b52a90d2ac3d5454a2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
 PR = "r19"

meta-efl/recipes-efl/efl/ecore.inc +1 -1

index 9f3d1a4..96bc26c 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Ecore is the Enlightenment application framework library"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cb293be68319f9fcb179d7f3daae5fbe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d6ff2c3c85de2faf5fd7dcd9ccfc8886"
 DEPENDS = "virtual/libiconv tslib curl eet evas glib-2.0 \
            libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil"
 DEPENDS_virtclass-native = "eet-native evas-native gettext-native"

meta-efl/recipes-efl/efl/edbus.inc +1 -1

index 8fe64d0..4f2e920 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c36b278587b5b7ac1f73c20b60212778"
+LIC_FILES_CHKSUM = "file://COPYING;md5=550b8cea13dacc4bf00508a8cce1074c"
 
 inherit efl

meta-efl/recipes-efl/efl/eet.inc +1 -1

index 5b8ccb2..de17e05 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "EET is the Enlightenment data storage library"
 DEPENDS = "pkgconfig zlib jpeg openssl eina gnutls"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4ca74999c2a19695474d532d2f2ac886"
+LIC_FILES_CHKSUM = "file://COPYING;md5=da947f414a2ca4323245f1abb1980953"
 
 inherit efl

meta-efl/recipes-efl/efl/eeze.inc +1 -1

index 5572836..5494d3c 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Eeze is a library to simplify the use of devices"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5388f2e926064f899c2481629ec3de18"
+LIC_FILES_CHKSUM = "file://COPYING;md5=315521fe061b6fd4290ef01db714a3c8"
 DEPENDS = "ecore eet udev"
 
 inherit efl

meta-efl/recipes-efl/efl/efreet.inc +1 -1

index 227b620..9aaeaa7 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment freedesktop.org library"
 DEPENDS = "ecore"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=49e56d2cc74d0b06fce18906e6ebc9ae"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9594ec75c5a57e71fccedcbe10dd3ef4"
 
 inherit efl

meta-efl/recipes-efl/efl/eina.inc +1 -1

index c3f654d..c512530 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Eina is the Enlightenment data library"
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=723bb07e0e90220fe8f03924969e5f4e"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9cc092d35d7bbfcd986232cde130a551"
 
 BBCLASSEXTEND = "native"
 INC_PR = "r0"

meta-efl/recipes-efl/efl/elementary_svn.bb +1 -1

index 1c8909f..fda1622 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=620edc2399d9155fc180a0adc2b0ab7c"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cdc6c12b238ccd62635a7517dfe89438"
 DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb"
 PV = "0.7.0+svnr${SRCPV}"
 PR = "r11"

meta-efl/recipes-efl/efl/embryo.inc +1 -1

index e307350..efd9319 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 inherit efl
 
 LICENSE = "MIT BSD CompuPhase"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6aa45e26c1ed178da910fd76b306a875"
+LIC_FILES_CHKSUM = "file://COPYING;md5=220a7f1107df42c62428d8ebe559ed14"
 
 BBCLASSEXTEND = "native"
 INC_PR = "r1"

meta-efl/recipes-efl/efl/evas.inc +1 -1

index bbe06cc..1328309 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Evas is the Enlightenment canvas API"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=702a085dc863c1c7c1e909db7175f5bf"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b9b25b03d63aa496552658c7e78b11a1"
 # can also depend on valgrind, libsdl-x11, directfb
 DEPENDS = "librsvg eina eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig libfribidi giflib"
 DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-native eet-native eina-native libfribidi-native"

Signature · 1 line

1.7.6.1

Koen Kooi

2011-09-06 10:28 UTC #7 lore raw

In reply to Martin Jansa

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

Op 06-09-11 09:46, Martin Jansa schreef:

Quoted 11 lines

Small changes mostly to packaging and update LIC_FILES_CHKSUM after Copyright changes
The following changes since commit
08513a79f6a54201b38a0c5ee6c086a7cff15dde:
dbus-c++: use openembedded-core versions (2011-09-04 09:20:12 +0200)
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

thanks,

Quoted 1 line

merged
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOZfSyMkyGM64RGpERAmkRAJ4nUZ1HqS8pOKqu6G0VXhFbQ5ZdRQCgtMq4 6ZTfl9nd+Qtq9S/iFKNQLK0=
=Vrb3
-----END PGP SIGNATURE-----