package/efl: bump to 1.20.7

PATCH New Romain Naour 2 participants 15 messages Mar 15, 2018 – Mar 17, 2018

lore

Share & tools

lore

Romain Naour

author

2018-03-15 22:50 UTC #0 lore raw

PATCH 1/6 package/efl: bump to 1.20.7

See https://www.enlightenment.org/news/efl-1.20.7

Signed-off-by Romain Naour <[email protected]>

---
 package/efl/efl.hash | 4 ++--
 package/efl/efl.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/efl/efl.hash +2 -2

index 5507bda3ef..1391d1f707 100644
@@ -1,5 +1,5 @@
-# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.6.tar.xz.sha256
-sha256	56c67ea77435753a4f324a0a13488ba58f4ed7eb35a97c1a354fdc79c39a32c1	efl-1.20.6.tar.xz
+# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.7.tar.xz.sha256
+sha256 b0a9b765bcd7b012f1072da1d491fc8671aa089473f746901d93f5807a2c76fe  efl-1.20.7.tar.xz
 sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341  COMPLIANCE
 sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37  COPYING
 sha256 781ee841d15835b393bfe7d4c6497dc1b05217479abd40daceaf7aa102a758e1  licenses/COPYING.BSD

package/efl/efl.mk +1 -1

index 7085796756..6ef7d53385 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EFL_VERSION = 1.20.6
+EFL_VERSION = 1.20.7
 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
 EFL_SITE = http://download.enlightenment.org/rel/libs/efl
 EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT

Signature · 1 line

2.14.3

Romain Naour

author

2018-03-15 22:50 UTC #1 lore raw

PATCH 2/6 package/enlightenment: fix meson warning

--disable-rpath was added by m4/lib-link.m4 with autotools based buildsystem. Now we use meson, we don't have such option anymore.

The autotools eet-eet and eldbus_codegen options are named respectively eet and eldbus-codegen with meson.

Fixes:
WARNING: Unknown command line options: "eet-eet, eldbus_codegen, rpath"

Signed-off-by Romain Naour <[email protected]>

---
This patch can be backported to 2018.02.x

---
 package/enlightenment/enlightenment.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

package/enlightenment/enlightenment.mk +3 -4

index 17309619ad..0d87119bb3 100644
@@ -22,10 +22,9 @@ ENLIGHTENMENT_MESON_OPTS += \
 	--buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
 	--cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \
 	-Dedje-cc=$(HOST_DIR)/bin/edje_cc \
-	-Deet-eet=$(HOST_DIR)/bin/eet \
-	-Deldbus_codegen=$(HOST_DIR)/bin/eldbus-codegen \
-	-Dpam=false \
-	-Drpath=false
+	-Deet=$(HOST_DIR)/bin/eet \
+	-Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \
+	-Dpam=false
 
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true

Signature · 1 line

2.14.3

Peter Korsgaard

2018-03-17 08:39 UTC #2 lore raw

PATCH 2/6 package/enlightenment: fix meson warning

Quoted 5 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
--disable-rpath was added by m4/lib-link.m4 with autotools based buildsystem. Now we use meson, we don't have such option anymore.

Quoted 7 lines

The autotools eet-eet and eldbus_codegen options are named respectively eet and eldbus-codegen with meson.
Fixes:
WARNING: Unknown command line options: "eet-eet, eldbus_codegen, rpath"
Signed-off-by Romain Naour <[email protected]>

Committed, thanks.

Quoted 2 lines

---
This patch can be backported to 2018.02.x

Thanks. I'll do a backport run in a few days.

Signature · 1 line

Bye, Peter Korsgaard

Romain Naour

author

2018-03-15 22:50 UTC #3 lore raw

PATCH 3/6 package/enlightenment: bump to 0.22.2

In reply to Romain Naour

See https://www.enlightenment.org/news/e0.22.2_release

Signed-off-by Romain Naour <[email protected]>

---
 package/enlightenment/enlightenment.hash | 4 ++--
 package/enlightenment/enlightenment.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/enlightenment/enlightenment.hash +2 -2

index 10e8facf35..686d0ef3be 100644
@@ -1,3 +1,3 @@
-# From https://www.enlightenment.org/news/e0.22.1_release
-sha256	207b6b88dafc4932ab007a835510823c5a1dd8c191876ac037628176ca77a7e0	enlightenment-0.22.1.tar.xz
+# From https://www.enlightenment.org/news/e0.22.2_release
+sha256	4d581ef85246f0cba003427bb9b3758e3de137babea1cdd2affd70a2cbe1632c	enlightenment-0.22.2.tar.xz
 sha256	34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350	COPYING

package/enlightenment/enlightenment.mk +1 -1

index 0d87119bb3..6ee983db76 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ENLIGHTENMENT_VERSION = 0.22.1
+ENLIGHTENMENT_VERSION = 0.22.2
 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
 ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
 ENLIGHTENMENT_LICENSE = BSD-2-Clause

Signature · 1 line

2.14.3

Peter Korsgaard

2018-03-17 08:40 UTC #4 lore raw

PATCH 3/6 package/enlightenment: bump to 0.22.2

Quoted 4 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
See https://www.enlightenment.org/news/e0.22.2_release
Signed-off-by Romain Naour <[email protected]>

Committed, thanks.

This also seems like purely bugfixes. Would this also be a candidate for 2018.02.x?

Signature · 1 line

Bye, Peter Korsgaard

Romain Naour

author

2018-03-15 22:50 UTC #5 lore raw

PATCH 4/6 package/x11r7/xkeyboard-config: install to staging

In reply to Romain Naour

enlightenment doesn't detect xkeyboard-config since it's missing from staging.

Fixes:
Dependency xkeyboard-config found: NO

Signed-off-by Romain Naour <[email protected]>

Cc Bernd Kuhls <[email protected]>

---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 3 +++
 1 file changed, 3 insertions(+)

package/x11r7/xkeyboard-config/xkeyboard-config.mk +3 -0

index d9998aa489..9a8838dde1 100644
@@ -10,6 +10,9 @@ XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-conf
 XKEYBOARD_CONFIG_LICENSE = MIT
 XKEYBOARD_CONFIG_LICENSE_FILES = COPYING
 
+# xkeyboard-config.pc
+XKEYBOARD_CONFIG_INSTALL_STAGING = YES
+
 XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps
 XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp

Signature · 1 line

2.14.3

Peter Korsgaard

2018-03-17 08:54 UTC #6 lore raw

PATCH 4/6 package/x11r7/xkeyboard-config: install to staging

Quoted 10 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
enlightenment doesn't detect xkeyboard-config since it's missing from staging.
Fixes:
Dependency xkeyboard-config found: NO
Signed-off-by Romain Naour <[email protected]>
Cc Bernd Kuhls <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Romain Naour

author

2018-03-15 22:50 UTC #7 lore raw

PATCH 5/6 package/enlightenment: add xkeyboard-config optional dependency

In reply to Romain Naour

The meson build systemd is checking for xkeyboard-config optional dependency but there is no option to handle it.

Signed-off-by Romain Naour <[email protected]>

---
 package/enlightenment/enlightenment.mk | 4 ++++
 1 file changed, 4 insertions(+)

package/enlightenment/enlightenment.mk +4 -0

index 6ee983db76..ae68888aac 100644
@@ -41,6 +41,10 @@ else
 ENLIGHTENMENT_MESON_OPTS += -Dmixer=false
 endif
 
+ifeq ($(BR2_PACKAGE_XKEYBOARD_CONFIG),y)
+ENLIGHTENMENT_DEPENDENCIES += xkeyboard-config
+endif
+
 define ENLIGHTENMENT_CONFIGURE_CMDS
 	rm -rf $(@D)/build
 	mkdir -p $(@D)/build

Signature · 1 line

2.14.3

Peter Korsgaard

2018-03-17 08:55 UTC #8 lore raw

PATCH 5/6 package/enlightenment: add xkeyboard-config optional dependency

Quoted 6 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
The meson build systemd is checking for xkeyboard-config optional dependency but there is no option to handle it.
Signed-off-by Romain Naour <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Romain Naour

author

2018-03-15 22:50 UTC #9 lore raw

PATCH 6/6 package/enlightenment: install to staging

In reply to Romain Naour

enlightenment provide enlightenment.pc and some shared libraries.

Signed-off-by Romain Naour <[email protected]>

---
 package/enlightenment/enlightenment.mk | 3 +++
 1 file changed, 3 insertions(+)

package/enlightenment/enlightenment.mk +3 -0

index ae68888aac..ba6b54143e 100644
@@ -26,6 +26,9 @@ ENLIGHTENMENT_MESON_OPTS += \
 	-Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \
 	-Dpam=false
 
+# enlightenment.pc and /usr/lib/enlightenment/modules/*.so
+ENLIGHTENMENT_INSTALL_STAGING = YES
+
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true
 ENLIGHTENMENT_DEPENDENCIES += systemd

Signature · 1 line

2.14.3

Peter Korsgaard

2018-03-17 08:56 UTC #10 lore raw

PATCH 6/6 package/enlightenment: install to staging

Quoted 3 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
enlightenment provide enlightenment.pc and some shared libraries.

Committed, thanks.

Do we have any packages today needing these?

Signature · 1 line

Bye, Peter Korsgaard

Romain Naour

author

2018-03-17 12:12 UTC #11 lore raw

PATCH 6/6 package/enlightenment: install to staging

Le 17/03/2018 ? 09:56, Peter Korsgaard a ?crit?:

Quoted 8 lines

Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
enlightenment provide enlightenment.pc and some shared libraries.
Committed, thanks.
Do we have any packages today needing these?

I don't think so. But It can be used for custom enlightenment extensions, from a Buildroot sdk.

Best regards,
Romain

Peter Korsgaard

2018-03-17 08:37 UTC #12 lore raw

PATCH 1/6 package/efl: bump to 1.20.7

In reply to Romain Naour

Quoted 4 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
See https://www.enlightenment.org/news/efl-1.20.7
Signed-off-by Romain Naour <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Peter Korsgaard

2018-03-17 08:38 UTC #13 lore raw

PATCH 1/6 package/efl: bump to 1.20.7

In reply to Romain Naour

Quoted 4 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
See https://www.enlightenment.org/news/efl-1.20.7
Signed-off-by Romain Naour <[email protected]>

Sorry, forgot to ask - Would this be a candidate for 2018.02.x as well?

Signature · 1 line

Bye, Peter Korsgaard

Romain Naour

author

2018-03-17 12:05 UTC #14 lore raw

PATCH 1/6 package/efl: bump to 1.20.7

Hi Peter,

Le 17/03/2018 ? 09:38, Peter Korsgaard a ?crit?:

Quoted 7 lines

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
See https://www.enlightenment.org/news/efl-1.20.7
Signed-off-by Romain Naour <[email protected]>
Sorry, forgot to ask - Would this be a candidate for 2018.02.x as well?

Yes probably, this is a bugfix release. Same for enlightenment. In the past, such version bump was merged in next during stabilization period (see b0dc300b73124b42ea3465973e20b962f064a870 "bump to 1.20.6" in next).

Best regards,
Romain