[gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/files/, dev-libs/efl/
commit: fd3c09be674aeae592bea312b004c5e689c44173 Author: Joonas Niilola gentoo org> AuthorDate: Tue Aug 15 06:12:23 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 15 06:12:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd3c09be dev-libs/efl: add upstream compatibility with gettext-0.22 patch Closes: https://bugs.gentoo.org/909530 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/efl/efl-1.26.3-r2.ebuild | 3 +- .../efl/files/efl-1.26.3-gettext-0.22-fix.patch| 38 ++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dev-libs/efl/efl-1.26.3-r2.ebuild b/dev-libs/efl/efl-1.26.3-r2.ebuild index 3926f8a65117..ca9fd1880009 100644 --- a/dev-libs/efl/efl-1.26.3-r2.ebuild +++ b/dev-libs/efl/efl-1.26.3-r2.ebuild @@ -128,12 +128,13 @@ DEPEND="${RDEPEND} wayland? ( dev-libs/wayland-protocols )" BDEPEND="${PYTHON_DEPS} virtual/pkgconfig - examples? ( +Date: Mon, 14 Aug 2023 21:39:05 +0500 +Subject: [PATCH] examples: edje - add charset header to po files. + +Solved compilation error with novel gettext-0.22. +@fix +--- + src/examples/edje/en_IN/domain_name.po | 5 + + src/examples/edje/hi_IN/domain_name.po | 5 + + 2 files changed, 10 insertions(+) + +diff --git a/src/examples/edje/en_IN/domain_name.po b/src/examples/edje/en_IN/domain_name.po +index f461123404..131579ee36 100644 +--- a/src/examples/edje/en_IN/domain_name.po b/src/examples/edje/en_IN/domain_name.po +@@ -1,3 +1,8 @@ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: UTF-8\n" ++ + msgid "LOADING" + msgstr "Loading..." + +diff --git a/src/examples/edje/hi_IN/domain_name.po b/src/examples/edje/hi_IN/domain_name.po +index 809cf6f399..fcb0e85d00 100644 +--- a/src/examples/edje/hi_IN/domain_name.po b/src/examples/edje/hi_IN/domain_name.po +@@ -1,3 +1,8 @@ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: UTF-8\n" ++ + msgid "LOADING" + msgstr "लोड हो रहा है..." +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/files/, dev-libs/efl/
commit: 9088957da743bd19ba56a001852568916b5d393a Author: orbea riseup net> AuthorDate: Fri Apr 28 16:36:57 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Mon May 1 08:05:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9088957d dev-libs/efl: add upstream patch for libressl This patch was accepted upstream and fixed the build with libressl >= 3.5.0. Upstream-PR: https://git.enlightenment.org/enlightenment/efl/pulls/10 Upstream-Commit: https://git.enlightenment.org/enlightenment/efl/commit/bdd5b244e6a6161228f4a98210cefd9ef8a12e85 Upstream-Commit: https://git.enlightenment.org/enlightenment/efl/commit/0e22417f4579333a967fb5ce65ab339dfc066753 Bug: https://bugs.gentoo.org/903001 Closes: https://github.com/gentoo/gentoo/pull/30794 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/efl/efl-1.26.3-r1.ebuild| 4 + dev-libs/efl/files/efl-1.26.3-libressl.patch | 191 +++ 2 files changed, 195 insertions(+) diff --git a/dev-libs/efl/efl-1.26.3-r1.ebuild b/dev-libs/efl/efl-1.26.3-r1.ebuild index 8b00eb21d056..fb26d694f9b3 100644 --- a/dev-libs/efl/efl-1.26.3-r1.ebuild +++ b/dev-libs/efl/efl-1.26.3-r1.ebuild @@ -131,6 +131,10 @@ BDEPEND="${PYTHON_DEPS} nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner )" +PATCHES=( + "${FILESDIR}"/${PN}-1.26.3-libressl.patch #903001 +) + pkg_setup() { # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV} diff --git a/dev-libs/efl/files/efl-1.26.3-libressl.patch b/dev-libs/efl/files/efl-1.26.3-libressl.patch new file mode 100644 index ..6bb1b6bb83e3 --- /dev/null +++ b/dev-libs/efl/files/efl-1.26.3-libressl.patch @@ -0,0 +1,191 @@ +https://bugs.gentoo.org/903001 +https://git.enlightenment.org/enlightenment/efl/pulls/10 +https://git.enlightenment.org/enlightenment/efl/commit/bdd5b244e6a6161228f4a98210cefd9ef8a12e85 +https://git.enlightenment.org/enlightenment/efl/commit/0e22417f4579333a967fb5ce65ab339dfc066753 + +From bdd5b244e6a6161228f4a98210cefd9ef8a12e85 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Mon, 4 Jul 2022 09:05:38 -0700 +Subject: [PATCH] Support LibreSSL 3.5.x + +LibreSSL 3.5.x now works with the standard OpenSSL code paths. +--- + src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++-- + src/lib/eet/eet_cipher.c | 8 + src/lib/emile/emile_cipher_openssl.c | 14 +++--- + 3 files changed, 17 insertions(+), 17 deletions(-) + +From 0e22417f4579333a967fb5ce65ab339dfc066753 Mon Sep 17 00:00:00 2001 +From: "Carsten Haitzler (Rasterman)" +Date: Mon, 1 Aug 2022 17:35:52 +0100 +Subject: [PATCH] eet emile - cipher - add braces for if defines to be clear on + order of op + +--- + src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++-- + src/lib/eet/eet_cipher.c | 8 + src/lib/emile/emile_cipher_openssl.c | 10 +- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c +index e59c6811c9..56c8a595eb 100644 +--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c +@@ -27,7 +27,7 @@ + static int + efl_net_socket_bio_create(BIO *b) + { +-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x305fL) || ((OPENSSL_VERSION_NUMBER >= 0x1010L) && !defined(LIBRESSL_VERSION_NUMBER)) +BIO_set_init(b, 1); +BIO_set_data(b, NULL); +BIO_set_flags(b, 0); +@@ -44,7 +44,7 @@ static int + efl_net_socket_bio_destroy(BIO *b) + { +if (!b) return 0; +-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x305fL) || ((OPENSSL_VERSION_NUMBER >= 0x1010L) && !defined(LIBRESSL_VERSION_NUMBER)) +BIO_set_init(b, 0); +BIO_set_data(b, NULL); +BIO_set_flags(b, 0); +@@ -63,7 +63,7 @@ efl_net_socket_bio_read(BIO *b, char *buf, int len) + .mem = buf, + .len = len +}; +-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x305fL) || ((OPENSSL_VERSION_NUMBER >= 0x1010L) && !defined(LIBRESSL_VERSION_NUMBER)) +Eo *sock = BIO_get_data(b); + #else +Eo *sock = b->ptr; +@@ -99,7 +99,7 @@ efl_net_socket_bio_write(BIO *b, const char *buf, int len) + .mem = buf, + .len = len +}; +-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER) ++#if (LIBRESSL_VERSION_NUMBER >= 0x305fL) || ((OPENSSL_VERSION_NUMBER >= 0x1010L) && !defined(LIBRESSL_VERSION_NUMBER)) +Eo *sock = BIO_get_data(b); + #else +Eo *sock = b->ptr; +@@ -146,7 +146,7 @@ efl_net_socket_bio_puts(BIO *b, const char *str) + static BIO_METHOD * + __efl_net_
[gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/files/, dev-libs/efl/
commit: 32578b4efcf9161fef1b2267cc1fc2d31aa52a7e Author: Joonas Niilola gmail com> AuthorDate: Wed Dec 5 07:16:15 2018 + Commit: Michał Górny gentoo org> CommitDate: Wed Dec 5 08:35:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32578b4e dev-libs/efl: revbump 1.21.1 to fix evas-preload segfault - thanks to tbartdev gmx-topmail.de for the patch - upstream bug: https://phab.enlightenment.org/T7354 Closes: https://bugs.gentoo.org/671876 Package-Manager: Portage[mgorny]-2.3.51.1 Signed-off-by: Joonas Niilola gmail.com> Signed-off-by: Michał Górny gentoo.org> dev-libs/efl/efl-1.21.1-r1.ebuild | 279 + .../efl-1.21.1-fix_evas_preload_segfault.patch | 10 + 2 files changed, 289 insertions(+) diff --git a/dev-libs/efl/efl-1.21.1-r1.ebuild b/dev-libs/efl/efl-1.21.1-r1.ebuild new file mode 100644 index 000..c6e1fed2916 --- /dev/null +++ b/dev-libs/efl/efl-1.21.1-r1.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2-utils pax-utils xdg-utils + +DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" +HOMEPAGE="https://www.enlightenment.org"; +SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"; + +LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="avahi +bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm" + +REQUIRED_USE=" + ?? ( opengl egl ) + ?? ( opengl gles ) + fbcon? ( !tslib ) + gles? ( + || ( X wayland ) + !sdl + egl + ) + ibus? ( glib ) + opengl? ( X ) + pulseaudio? ( sound ) + sdl? ( opengl ) + vnc? ( X fbcon ) + wayland? ( egl gles !opengl ) + xim? ( X ) + xpresent? ( X ) +" + +RDEPEND=" + net-misc/curl + media-libs/libpng:0= + sys-apps/dbus + sys-apps/util-linux + sys-libs/zlib:= + virtual/jpeg:0= + avahi? ( net-dns/avahi ) + connman? ( net-misc/connman ) + drm? ( + dev-libs/libinput + media-libs/mesa[gbm] + x11-libs/libdrm + x11-libs/libxkbcommon + ) + egl? ( media-libs/mesa[egl] ) + fontconfig? ( media-libs/fontconfig ) + fribidi? ( dev-libs/fribidi ) + gif? ( media-libs/giflib:= ) + gles? ( media-libs/mesa[gles2] ) + glib? ( dev-libs/glib:2 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + harfbuzz? ( media-libs/harfbuzz ) + hyphen? ( dev-libs/hyphen ) + ibus? ( app-i18n/ibus ) + jpeg2k? ( media-libs/openjpeg:0= ) + libuv? ( dev-libs/libuv ) + luajit? ( dev-lang/luajit:= ) + !luajit? ( dev-lang/lua:* ) + nls? ( sys-devel/gettext ) + pdf? ( app-text/poppler:=[cxx] ) + physics? ( sci-physics/bullet:= ) + postscript? ( app-text/libspectre ) + pulseaudio? ( media-sound/pulseaudio ) + raw? ( media-libs/libraw:= ) + scim? ( app-i18n/scim ) + sdl? ( + media-libs/libsdl2 + virtual/opengl + ) + sound? ( media-libs/libsndfile ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + svg? ( + gnome-base/librsvg + x11-libs/cairo + ) + system-lz4? ( app-arch/lz4 ) + systemd? ( sys-apps/systemd ) + tiff? ( media-libs/tiff:0= ) + tslib? ( x11-libs/tslib:= ) + unwind? ( sys-libs/libunwind ) + valgrind? ( dev-util/valgrind ) + vlc? ( media-video/vlc ) + vnc? ( net-libs/libvncserver ) + wayland? ( + dev-libs/wayland + media-libs/mesa[gles2,wayland] + x11-libs/libxkbcommon + ) + webp? ( media-libs/libwebp:= ) + X? ( + media-libs/freetype + x11-libs/libXcursor + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver + gles? ( + x11-libs/libX11 +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/files/, dev-libs/efl/
commit: 1c8cf2757d1e8085ed7b1969718ce22650edb23f Author: Alon Bar-Lev gentoo org> AuthorDate: Sat Mar 4 00:36:03 2017 + Commit: Alon Bar-Lev gentoo org> CommitDate: Sat Mar 4 00:37:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8cf275 dev-libs/efl: support gnutls-3.4 Bug: 584924 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/efl/efl-1.17.0-r1.ebuild | 279 + dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch | 39 2 files changed, 318 insertions(+) diff --git a/dev-libs/efl/efl-1.17.0-r1.ebuild b/dev-libs/efl/efl-1.17.0-r1.ebuild new file mode 100644 index 000..27b0c680047 --- /dev/null +++ b/dev-libs/efl/efl-1.17.0-r1.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +MY_P=${P/_/-} + +if [[ "${PV}" == "" ]] ; then + EGIT_SUB_PROJECT="core" + EGIT_URI_APPEND="${PN}" +elif [[ *"${PV}" == *"_pre"* ]] ; then + MY_P=${P%%_*} + SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"; + EKEY_STATE="snap" +else + SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"; + EKEY_STATE="release" +fi + +inherit enlightenment pax-utils + +DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" +IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l valgrind wayland webp X xim xine xpm" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" + +REQUIRED_USE=" + pulseaudio? ( sound ) + opengl? ( || ( X sdl wayland ) ) + gles? ( || ( X wayland ) ) + gles? ( !sdl ) + gles? ( egl ) + sdl?( opengl ) + wayland?( egl !opengl gles ) + xim?( X ) +" + +RDEPEND=" + drm? ( + >=dev-libs/libinput-0.8 + media-libs/mesa[gbm] + >=x11-libs/libdrm-2.4 + >=x11-libs/libxkbcommon-0.3.0 + ) + fontconfig? ( media-libs/fontconfig ) + fribidi? ( dev-libs/fribidi ) + gif? ( media-libs/giflib ) + glib? ( dev-libs/glib:2 ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + harfbuzz? ( media-libs/harfbuzz ) + ibus? ( app-i18n/ibus ) + jpeg2k? ( media-libs/openjpeg:0 ) + !oldlua? ( >=dev-lang/luajit-2.0.0 ) + oldlua? ( dev-lang/lua:* ) + physics? ( >=sci-physics/bullet-2.80 ) + pixman? ( x11-libs/pixman ) + png? ( media-libs/libpng:0= ) + pulseaudio? ( media-sound/pulseaudio ) + scim? ( app-i18n/scim ) + sdl? ( + media-libs/libsdl2 + virtual/opengl + ) + sound? ( media-libs/libsndfile ) + systemd? ( sys-apps/systemd ) + tiff? ( media-libs/tiff:0= ) + tslib? ( x11-libs/tslib ) + valgrind? ( dev-util/valgrind ) + wayland? ( + >=dev-libs/wayland-1.8.0 + >=x11-libs/libxkbcommon-0.3.1 + media-libs/mesa[gles2,wayland] + ) + webp? ( media-libs/libwebp ) + X? ( + x11-libs/libXcursor + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXp + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver + + opengl? ( + x11-libs/libX11 + x11-libs/libXrender + virtual/opengl + ) + + gles? ( + x11-libs/libX11 + x11-libs/libXrender + virtual/opengl + ) + ) + xine? ( >=media-libs/xine-lib-1.1.1 ) + xpm? ( x11-libs/libXpm ) + + sys-apps/dbus + >=sys-apps/util-linux-2.20.0 + sys-libs/zlib + virtual/jpeg:0= + + !dev-libs/ecore + !dev-libs/edbus + !dev-libs/eet + !dev-libs/eeze + !dev-libs/efreet + !dev-libs/eina + !dev-libs/eio + !dev-libs/embryo + !dev-libs/eobj + !dev-libs/ephysics +