diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 7bcddaac648eaf..d681ce14ba1e7d 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl -version=1.26.2 -revision=10 +version=1.28.1 +revision=1 build_style=meson configure_args=" -Dbuild-examples=false @@ -25,11 +25,11 @@ configure_args=" $(vopt_bool glib glib)" hostmakedepends="pkg-config gettext" makedepends=" - gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel + cmake gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel) - libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel + libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel libjxl-devel avahi-libs-devel eudev-libudev-devel libgomp-devel - libsndfile-devel libmount-devel LuaJIT-devel poppler-cpp-devel + libsndfile-devel libmount-devel LuaJIT-devel lua52-devel poppler-cpp-devel librsvg-devel libspectre-devel libraw-devel libopenjpeg2-devel libheif-devel libavif-devel $(vopt_if drm 'libdrm-devel libinput-devel libxkbcommon-devel') @@ -52,7 +52,7 @@ license="LGPL-2.1-only" homepage="https://enlightenment.org" changelog="https://git.enlightenment.org/core/efl.git/plain/NEWS" distfiles="https://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz" -checksum=2979cfbc728a1a1f72ad86c2467d861ed91e664d3f17ef03190fb5c5f405301c +checksum=84cf6145f9cc82bfff690005be24392c8f3c52f8e00ff04d8eea371429c09424 make_check=extended # comment to satisfy linter if [ "$XBPS_CHECK_PKGS" ]; then diff --git a/srcpkgs/enlightenment/patches/mips-name-clash.patch b/srcpkgs/enlightenment/patches/mips-name-clash.patch deleted file mode 100644 index 3570dc582812f6..00000000000000 --- a/srcpkgs/enlightenment/patches/mips-name-clash.patch +++ /dev/null @@ -1,158 +0,0 @@ -Source: @pullmoll -Upstream: no -Reason: variable name 'mips' clashes with target system headers - ---- a/src/bin/e_wallpaper_gen_main.c 2020-05-31 20:22:37.495587000 +0200 -+++ b/src/bin/e_wallpaper_gen_main.c 2020-11-09 17:21:27.533538646 +0100 -@@ -85,33 +85,33 @@ - { - int i, j = 0; - int nw, nh, pw = 0, ph = 0; -- Mip *mips = calloc(1, sizeof(Mip) * MAX_RES_NUM); -+ Mip *l_mips = calloc(1, sizeof(Mip) * MAX_RES_NUM); - -- if (!mips) return NULL; -+ if (!l_mips) return NULL; - for (i = 0; resolutions[i]; i += 2) - { - nh = resolutions[i + 1]; - nw = (w * nh) / h; - if ((nh >= h) || (nw >= w)) - { -- mips[j].from_w = pw; -- mips[j].from_h = ph; -- mips[j].to_w = 1000000000; -- mips[j].to_h = 1000000000; -- mips[j].last = EINA_TRUE; -+ l_mips[j].from_w = pw; -+ l_mips[j].from_h = ph; -+ l_mips[j].to_w = 1000000000; -+ l_mips[j].to_h = 1000000000; -+ l_mips[j].last = EINA_TRUE; - break; - } - -- mips[j].from_w = pw; -- mips[j].from_h = ph; -- mips[j].to_w = nw; -- mips[j].to_h = nh; -+ l_mips[j].from_w = pw; -+ l_mips[j].from_h = ph; -+ l_mips[j].to_w = nw; -+ l_mips[j].to_h = nh; - - j++; - pw = nw + 1; - ph = nh + 1; - } -- return mips; -+ return l_mips; - } - - EAPI int -@@ -123,9 +123,9 @@ - int bg_b = 64; - char dir_buf[128], img_buf[256], edc_buf[256], cmd_buf[1024], qual_buf[64]; - const char *dir, *quality_string = NULL, *img_name = NULL; -- Mip *mips = NULL; -+ Mip *l_mips = NULL; - int i, imw, imh, w, h, quality; -- int ret = 0, mips_num = 0; -+ int ret = 0, l_mips_num = 0; - Eina_Bool alpha; - FILE *f; - -@@ -207,25 +207,25 @@ - (!strcmp(mode, "scale_out")) || - (!strcmp(mode, "pan"))) - { // need to produce multiple scaled versions -- mips = _resolutions_calc(w, h); -- if (!mips) return 6; -- for (i = 0; mips[i].to_w; i++) -+ l_mips = _resolutions_calc(w, h); -+ if (!l_mips) return 6; -+ for (i = 0; l_mips[i].to_w; i++) - { -- mips_num++; -- if (mips[i].last) -+ l_mips_num++; -+ if (l_mips[i].last) - { - imw = w; - imh = h; - } - else - { -- imw = mips[i].to_w; -- imh = mips[i].to_h; -+ imw = l_mips[i].to_w; -+ imh = l_mips[i].to_h; - } - evas_object_resize(subwin, imw, imh); - evas_object_resize(image, imw, imh); - elm_win_render(subwin); -- if (mips[i].last) -+ if (l_mips[i].last) - snprintf(img_buf, sizeof(img_buf), "%s/img.png", - dir); - else -@@ -239,7 +239,7 @@ - } - } - // no multiple resolutions -0 save out original -- if (!mips) -+ if (!l_mips) - { - evas_object_resize(subwin, w, h); - evas_object_resize(image, w, h); -@@ -267,16 +267,16 @@ - snprintf(edc_buf, sizeof(edc_buf), "%s/bg.edc", dir); - f = fopen(edc_buf, "w"); - if (!f) goto cleanup; -- if ((mips) && (mips_num > 1)) -+ if ((l_mips) && (l_mips_num > 1)) - { - fprintf(f, - "images {\n" - " set { name: \"img\";\n"); -- for (i = mips_num - 1; i >= 0; i--) -+ for (i = l_mips_num - 1; i >= 0; i--) - { - fprintf(f, - " image {\n"); -- if (mips[i].last) -+ if (l_mips[i].last) - { - fprintf(f, - " image: \"img.png\" %s;\n", -@@ -284,8 +284,8 @@ - } - else - { -- imw = mips[i].to_w; -- imh = mips[i].to_h; -+ imw = l_mips[i].to_w; -+ imh = l_mips[i].to_h; - fprintf(f, - " image: \"img-%ix%i.png\" %s;\n", - imw, imh, quality_string); -@@ -293,8 +293,8 @@ - fprintf(f, - " size: %i %i %i %i;\n" - " }\n", -- mips[i].from_w, mips[i].from_h, -- mips[i].to_w, mips[i].to_h); -+ l_mips[i].from_w, l_mips[i].from_h, -+ l_mips[i].to_w, l_mips[i].to_h); - } - fprintf(f, - " }\n" -@@ -489,7 +489,7 @@ - } - ret = system(cmd_buf); - cleanup: -- free(mips); -+ free(l_mips); - ecore_file_recursive_rm(dir); - evas_object_del(win); - return ret; diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 2326fe401893a1..fb363251de161b 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,7 +1,7 @@ # Template file for 'enlightenment' pkgname=enlightenment -version=0.25.4 -revision=2 +version=0.27.1 +revision=1 build_style=meson configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false $(vopt_bool wayland wl)" @@ -16,7 +16,7 @@ maintainer="Orphaned " license="BSD-2-Clause" homepage="http://enlightenment.org" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=56db5d206b821b9a8831d26e713e410ac70b2255a6f43fcdf7c01eefde23b7a2 +checksum=b41df8771f60e3b96a1973ae566d7425c53a8339f18e54e31230218781da2fa9 lib32disabled=yes build_options="wayland" build_options_default="wayland" diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template index af9c3587f07627..c335986b04ade3 100644 --- a/srcpkgs/terminology/template +++ b/srcpkgs/terminology/template @@ -1,6 +1,6 @@ # Template file for 'terminology' pkgname=terminology -version=1.13.0 +version=1.14.0 revision=1 build_style=meson hostmakedepends="pkg-config efl gettext" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="BSD-2-Clause" homepage="https://www.enlightenment.org" distfiles="https://download.enlightenment.org/rel/apps/terminology/terminology-${version}.tar.xz" -checksum=16a37fecd7bbd63ec9de3ec6c0af331cee77d6dfda838a1b1573d6f298474da5 +checksum=f354057051b05cffb699e33836a1135db1d4ed8bf954f9b57dc0e93bc307514d post_install() { vlicense COPYING