1.14.2, disable scim by default, enable ibus
This commit is contained in:
Tom Callaway
parent
329934e721
commit
43f43b1a64
|
|
@ -2,3 +2,4 @@
|
|||
/efl-1.13.2.tar.xz
|
||||
/efl-1.14.0.tar.xz
|
||||
/efl-1.14.1.tar.xz
|
||||
/efl-1.14.2.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
diff -up efl-1.13.1/src/modules/evas/engines/gl_drm/evas_drm_main.c.fixme efl-1.13.1/src/modules/evas/engines/gl_drm/evas_drm_main.c
|
||||
--- efl-1.13.1/src/modules/evas/engines/gl_drm/evas_drm_main.c.fixme 2015-02-27 14:40:14.458467898 -0500
|
||||
+++ efl-1.13.1/src/modules/evas/engines/gl_drm/evas_drm_main.c 2015-02-27 14:40:31.853332094 -0500
|
||||
@@ -221,8 +221,10 @@ eng_window_new(Evas_Engine_Info_GL_Drm *
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+#ifdef GL_GLES
|
||||
gw->gl_context->egldisp = gw->egl_disp;
|
||||
gw->gl_context->eglctxt = gw->egl_context[0];
|
||||
+#endif
|
||||
|
||||
eng_window_use(gw);
|
||||
glsym_evas_gl_common_context_resize(gw->gl_context, w, h, rot);
|
||||
diff -up efl-1.13.1/src/modules/evas/engines/gl_drm/evas_engine.h.fixme efl-1.13.1/src/modules/evas/engines/gl_drm/evas_engine.h
|
||||
--- efl-1.13.1/src/modules/evas/engines/gl_drm/evas_engine.h.fixme 2015-02-27 14:40:51.648179559 -0500
|
||||
+++ efl-1.13.1/src/modules/evas/engines/gl_drm/evas_engine.h 2015-02-27 14:41:04.801079322 -0500
|
||||
@@ -10,6 +10,8 @@
|
||||
|
||||
#define GL_GLEXT_PROTOTYPES
|
||||
#include <EGL/egl.h>
|
||||
+#include <EGL/eglext.h>
|
||||
+#include <EGL/eglmesaext.h>
|
||||
#include <GLES2/gl2.h>
|
||||
#include <GLES2/gl2ext.h>
|
||||
#include "../gl_generic/Evas_Engine_GL_Generic.h"
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
diff -up efl-1.13.1/src/bin/edje/epp/cppalloc.c.noaddy efl-1.13.1/src/bin/edje/epp/cppalloc.c
|
||||
--- efl-1.13.1/src/bin/edje/epp/cppalloc.c.noaddy 2015-02-27 15:17:31.361456345 -0500
|
||||
+++ efl-1.13.1/src/bin/edje/epp/cppalloc.c 2015-02-27 15:17:40.397389751 -0500
|
||||
@@ -16,8 +16,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In other words, you are welcome to use, share and improve this program.
|
||||
* You are forbidden to forbid anyone else to use, share and improve
|
||||
diff -up efl-1.13.1/src/bin/edje/epp/cpperror.c.noaddy efl-1.13.1/src/bin/edje/epp/cpperror.c
|
||||
--- efl-1.13.1/src/bin/edje/epp/cpperror.c.noaddy 2015-02-27 15:15:41.334267241 -0500
|
||||
+++ efl-1.13.1/src/bin/edje/epp/cpperror.c 2015-02-27 15:16:50.293759012 -0500
|
||||
@@ -16,8 +16,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In other words, you are welcome to use, share and improve this program.
|
||||
* You are forbidden to forbid anyone else to use, share and improve
|
||||
diff -up efl-1.13.1/src/bin/edje/epp/cppexp.c.noaddy efl-1.13.1/src/bin/edje/epp/cppexp.c
|
||||
--- efl-1.13.1/src/bin/edje/epp/cppexp.c.noaddy 2015-02-27 15:17:02.579668466 -0500
|
||||
+++ efl-1.13.1/src/bin/edje/epp/cppexp.c 2015-02-27 15:17:20.407537075 -0500
|
||||
@@ -13,8 +13,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In other words, you are welcome to use, share and improve this program.
|
||||
* You are forbidden to forbid anyone else to use, share and improve
|
||||
diff -up efl-1.13.1/src/bin/edje/epp/cpphash.c.noaddy efl-1.13.1/src/bin/edje/epp/cpphash.c
|
||||
--- efl-1.13.1/src/bin/edje/epp/cpphash.c.noaddy 2015-02-27 15:18:45.989906337 -0500
|
||||
+++ efl-1.13.1/src/bin/edje/epp/cpphash.c 2015-02-27 15:18:55.706834724 -0500
|
||||
@@ -16,8 +16,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In other words, you are welcome to use, share and improve this program.
|
||||
* You are forbidden to forbid anyone else to use, share and improve
|
||||
diff -up efl-1.13.1/src/bin/edje/epp/cpplib.c.noaddy efl-1.13.1/src/bin/edje/epp/cpplib.c
|
||||
--- efl-1.13.1/src/bin/edje/epp/cpplib.c.noaddy 2015-02-27 15:18:24.378065615 -0500
|
||||
+++ efl-1.13.1/src/bin/edje/epp/cpplib.c 2015-02-27 15:18:35.423984207 -0500
|
||||
@@ -16,8 +16,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In other words, you are welcome to use, share and improve this program.
|
||||
* You are forbidden to forbid anyone else to use, share and improve
|
||||
diff -up efl-1.13.1/src/bin/edje/epp/cpplib.h.noaddy efl-1.13.1/src/bin/edje/epp/cpplib.h
|
||||
--- efl-1.13.1/src/bin/edje/epp/cpplib.h.noaddy 2015-02-27 15:17:49.679321344 -0500
|
||||
+++ efl-1.13.1/src/bin/edje/epp/cpplib.h 2015-02-27 15:18:01.774232204 -0500
|
||||
@@ -13,8 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICU
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
-along with this program; if not, write to the Free Software
|
||||
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
In other words, you are welcome to use, share and improve this program.
|
||||
You are forbidden to forbid anyone else to use, share and improve
|
||||
diff -up efl-1.13.1/src/bin/edje/epp/cppmain.c.noaddy efl-1.13.1/src/bin/edje/epp/cppmain.c
|
||||
--- efl-1.13.1/src/bin/edje/epp/cppmain.c.noaddy 2015-02-27 15:15:04.640537672 -0500
|
||||
+++ efl-1.13.1/src/bin/edje/epp/cppmain.c 2015-02-27 15:15:27.094372189 -0500
|
||||
@@ -14,8 +14,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In other words, you are welcome to use, share and improve this program.
|
||||
* You are forbidden to forbid anyone else to use, share and improve
|
||||
25
efl.spec
25
efl.spec
|
|
@ -4,11 +4,16 @@
|
|||
%global has_luajit 1
|
||||
%endif
|
||||
|
||||
# Look, you probably don't want this. scim is so 2012. ibus is the new hotness.
|
||||
# Enabling this means you'll almost certainly need to pass ECORE_IMF_MODULE=xim
|
||||
# to get anything to work. (*cough*terminology*cough*)
|
||||
%global with_scim 0
|
||||
|
||||
%global use_wayland 0
|
||||
|
||||
Name: efl
|
||||
Version: 1.14.1
|
||||
Release: 3%{?dist}
|
||||
Version: 1.14.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Collection of Enlightenment libraries
|
||||
License: BSD and LGPLv2+ and GPLv2 and zlib
|
||||
URL: http://enlightenment.org/
|
||||
|
|
@ -24,7 +29,11 @@ BuildRequires: libXext-devel libXfixes-devel libXinerama-devel libXrandr-devel
|
|||
BuildRequires: libXrender-devel libXScrnSaver-devel libXtst-devel libXcursor-devel
|
||||
BuildRequires: libXp-devel libXi-devel mesa-libGL-devel mesa-libEGL-devel
|
||||
BuildRequires: libblkid-devel libmount-devel systemd-devel harfbuzz-devel
|
||||
BuildRequires: libwebp-devel scim-devel tslib-devel SDL2-devel SDL-devel c-ares-devel
|
||||
BuildRequires: libwebp-devel tslib-devel SDL2-devel SDL-devel c-ares-devel
|
||||
%if %{with_scim}
|
||||
BuildRequires: scim-devel
|
||||
%endif
|
||||
BuildRequires: ibus-devel
|
||||
BuildRequires: doxygen systemd giflib-devel openjpeg-devel libdrm-devel
|
||||
%if %{use_wayland}
|
||||
BuildRequires: mesa-libwayland-egl-devel libwayland-client-devel
|
||||
|
|
@ -157,7 +166,13 @@ sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
|
|||
--enable-image-loader-webp \
|
||||
--enable-harfbuzz \
|
||||
--enable-sdl \
|
||||
--enable-ibus \
|
||||
%if %{with_scim}
|
||||
--enable-scim \
|
||||
%else
|
||||
--disable-scim \
|
||||
--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \
|
||||
%endif
|
||||
--enable-fb \
|
||||
%if %{use_wayland}
|
||||
--enable-wayland \
|
||||
|
|
@ -453,6 +468,10 @@ fi
|
|||
%{_libdir}/pkgconfig/evas*.pc
|
||||
|
||||
%changelog
|
||||
* Tue Jul 7 2015 Tom Callaway <spot@fedoraproject.org> - 1.14.2-1
|
||||
- disable scim by default
|
||||
- update to 1.14.2
|
||||
|
||||
* Sun Jul 5 2015 Conrad Meyer <cemeyer@uw.edu> - 1.14.1-3
|
||||
- Install eo_gdb autoload script with correct path
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue