diff mbox series

[PATCHv3,4/5] package/enlightenment: bump to version 0.24.2

Message ID 20200801142035.4060526-4-romain.naour@gmail.com
State Accepted
Headers show
Series [PATCHv3,1/5] package/efl: bump to version 1.23.2 | expand

Commit Message

Romain Naour Aug. 1, 2020, 2:20 p.m. UTC
- Disable new dependency on polkit for now.
  - Add OFL license for fonts.
  - Update COPYING file hash.
  - Update indentation in hash file (two spaces)

See:
https://www.enlightenment.org/news/e24.2

enlightenment 0.24 require efl >= 1.24.

https://git.enlightenment.org/core/enlightenment.git/commit/?id=4b6467685e7ac9ae68f08bd524f332a908f5fa74

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/enlightenment/enlightenment.hash |  7 ++++---
 package/enlightenment/enlightenment.mk   | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

Comments

Thomas Petazzoni Aug. 5, 2020, 1:32 p.m. UTC | #1
On Sat,  1 Aug 2020 16:20:34 +0200
Romain Naour <romain.naour@gmail.com> wrote:

> diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash
> index f692a67aa1..6f3f518891 100644
> --- a/package/enlightenment/enlightenment.hash
> +++ b/package/enlightenment/enlightenment.hash
> @@ -1,3 +1,4 @@
> -# From https://www.enlightenment.org/news/e23_release
> -sha256	b8c5d040875576d3d3ad8572644f92a65e21291bcee6b0d62f74fbfd482afdf8	enlightenment-0.23.0.tar.xz
> -sha256	34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350	COPYING
> +# From https://www.enlightenment.org/news/e24.2
> +sha256  be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1  enlightenment-0.24.2.tar.xz
> +sha256  17dda7902d3e1a743f91cf2545f474be93f612768a9e9022593d788ecc83935a  COPYING
> +sh&256  f4ba47ef8f4ff588202e721ab10f0208a3fa678147e7f928e6b2820f2e646e13  src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt

   ^^^^ typo here (reported by "make check-package")

I fixed that and applied. Thanks!

Thomas
diff mbox series

Patch

diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash
index f692a67aa1..6f3f518891 100644
--- a/package/enlightenment/enlightenment.hash
+++ b/package/enlightenment/enlightenment.hash
@@ -1,3 +1,4 @@ 
-# From https://www.enlightenment.org/news/e23_release
-sha256	b8c5d040875576d3d3ad8572644f92a65e21291bcee6b0d62f74fbfd482afdf8	enlightenment-0.23.0.tar.xz
-sha256	34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350	COPYING
+# From https://www.enlightenment.org/news/e24.2
+sha256  be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1  enlightenment-0.24.2.tar.xz
+sha256  17dda7902d3e1a743f91cf2545f474be93f612768a9e9022593d788ecc83935a  COPYING
+sh&256  f4ba47ef8f4ff588202e721ab10f0208a3fa678147e7f928e6b2820f2e646e13  src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 43f79d59da..12827964e1 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -4,11 +4,12 @@ 
 #
 ################################################################################
 
-ENLIGHTENMENT_VERSION = 0.23.0
+ENLIGHTENMENT_VERSION = 0.24.2
 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
 ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
-ENLIGHTENMENT_LICENSE = BSD-2-Clause
-ENLIGHTENMENT_LICENSE_FILES = COPYING
+ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font)
+ENLIGHTENMENT_LICENSE_FILES = COPYING \
+	src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt
 
 ENLIGHTENMENT_DEPENDENCIES = \
 	host-pkgconf \
@@ -20,7 +21,8 @@  ENLIGHTENMENT_CONF_OPTS = \
 	-Dedje-cc=$(HOST_DIR)/bin/edje_cc \
 	-Deet=$(HOST_DIR)/bin/eet \
 	-Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \
-	-Dpam=false
+	-Dpam=false \
+	-Dpolkit=false
 
 # enlightenment.pc and /usr/lib/enlightenment/modules/*.so
 ENLIGHTENMENT_INSTALL_STAGING = YES