Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package efl for openSUSE:Factory checked in
at 2025-03-18 17:40:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/efl (Old)
and /work/SRC/openSUSE:Factory/.efl.new.19136 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "efl"
Tue Mar 18 17:40:18 2025 rev:56 rq:1254071 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/efl/efl.changes 2024-08-10 19:05:55.721119646
+0200
+++ /work/SRC/openSUSE:Factory/.efl.new.19136/efl.changes 2025-03-18
17:41:48.706820504 +0100
@@ -1,0 +2,6 @@
+Sun Mar 16 08:08:57 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- Make scim conditional, which is Factory drop candidate
+- Add patch efl_scim.patch
+
+-------------------------------------------------------------------
New:
----
efl_scim.patch
BETA DEBUG BEGIN:
New:- Make scim conditional, which is Factory drop candidate
- Add patch efl_scim.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ efl.spec ++++++
--- /var/tmp/diff_new_pack.0M9ZGq/_old 2025-03-18 17:41:50.602899775 +0100
+++ /var/tmp/diff_new_pack.0M9ZGq/_new 2025-03-18 17:41:50.606899943 +0100
@@ -1,7 +1,7 @@
#
# spec file for package efl
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -49,6 +49,7 @@
# If packages are targeted for anything other than openSUSE
%{?!icon_theme_cache_create_ghost:%define icon_theme_cache_create_ghost()
touch %{buildroot}%{_datadir}/icons/%{1}/icon-theme.cache}
%{?!icon_theme_cache_post:%define icon_theme_cache_post()
gtk-update-icon-cache %{_datadir}/icons/$1 &> /dev/null || :}
+%bcond_with scim
Name: efl
Version: 1.26.3
Release: 0
@@ -60,6 +61,8 @@
Patch1: efl-no-neon.patch
# PATCH-FIX-UPSTREAM
Patch2:
https://git.enlightenment.org/enlightenment/efl/commit/d9ec36e1de4c2a70ac82dc66a72c282dc42037b7.patch
+# PATCH-FIX-OPENSUSE drop scim
+Patch3: efl_scim.patch
BuildRequires: ImageMagick
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -99,7 +102,9 @@
BuildRequires: pkgconfig(mount)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(pixman-1)
+%if %{with scim}
BuildRequires: pkgconfig(scim)
+%endif
BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(systemd)
@@ -348,12 +353,14 @@
%description -n elua
A set of efl bindings for the LuaJIT environment.
+%if %{with scim}
%package -n ecore_imf-module-scim
Summary: SCIM module for Ecore
License: BSD-2-Clause
%description -n ecore_imf-module-scim
SCIM input method module for Ecore.
+%endif
%package -n evas-generic-loaders
Summary: Set of generic loaders for Evas
@@ -478,6 +485,9 @@
-Dwl=true \
-Dopengl=es-egl \
%endif
+%if %{with scim}
+ -Dscim=true \
+%endif
%if !0%{?luajit_present}
-Delua=false \
-Dlua-interpreter=lua \
@@ -704,8 +714,10 @@
%files -n elua
%{_datadir}/elua
+%if %{with scim}
%files -n ecore_imf-module-scim
%{_libdir}/ecore_imf/modules/scim
+%endif
%files -n enlightenment-theme-upstream
%{_datadir}/elementary/themes/default.edj
++++++ efl_scim.patch ++++++
Index: efl-1.26.3/meson_options.txt
===================================================================
--- efl-1.26.3.orig/meson_options.txt
+++ efl-1.26.3/meson_options.txt
@@ -16,6 +16,12 @@ option('x11',
description : 'X11 support in efl'
)
+option('scim',
+ type : 'boolean',
+ value : false,
+ description : 'scim imf support in efl'
+)
+
option('fb',
type : 'boolean',
value : false,
Index: efl-1.26.3/src/modules/ecore_imf/meson.build
===================================================================
--- efl-1.26.3.orig/src/modules/ecore_imf/meson.build
+++ efl-1.26.3/src/modules/ecore_imf/meson.build
@@ -1,7 +1,11 @@
mods = []
if get_option('x11')
- mods +=['ibus', 'xim', 'scim']
+ mods +=['ibus', 'xim']
+endif
+
+if get_option('scim')
+ mods += ['scim']
endif
if get_option('wl')
