[terminology] Update to new upstream 0.8.0
konradm
konradm at fedoraproject.org
Sun Feb 15 18:32:43 UTC 2015
commit c4fc9b67655c761786ff309d6a63efb03f4e58d4
Author: Conrad Meyer <cemeyer at uw.edu>
Date: Sun Feb 15 13:32:23 2015 -0500
Update to new upstream 0.8.0
.gitignore | 1 +
sources | 2 +-
terminology-0.8.0-fix-build-on-eina-1.7.x.diff | 26 ++++++++++++++++++++++++
terminology.spec | 10 +++++++-
4 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 571d734..371883f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/terminology-0.6.0.tar.gz
/terminology-0.6.1.tar.gz
/terminology-0.7.0.tar.gz
+/terminology-0.8.0.tar.xz
diff --git a/sources b/sources
index 85d1a2c..ad3f6d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e68d889f343886e11a8e4f4337486452 terminology-0.7.0.tar.gz
+02608be71082434a11ae04646d1a791d terminology-0.8.0.tar.xz
diff --git a/terminology-0.8.0-fix-build-on-eina-1.7.x.diff b/terminology-0.8.0-fix-build-on-eina-1.7.x.diff
new file mode 100644
index 0000000..7247086
--- /dev/null
+++ b/terminology-0.8.0-fix-build-on-eina-1.7.x.diff
@@ -0,0 +1,26 @@
+--- terminology-0.8.0/src/bin/main.c.orig 2015-02-15 07:44:38.000000000 -0500
++++ terminology-0.8.0/src/bin/main.c 2015-02-15 13:24:20.632867523 -0500
+@@ -871,10 +871,11 @@
+ main_trans_update(config);
+ main_media_update(config);
+ win_sizing_handle(wn);
+ win = win_evas_object_get(wn);
+ evas_object_show(win);
++#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
+ if (startup_split)
+ {
+ unsigned int i = 0;
+ void *pch = NULL;
+ Term *next = term;
+@@ -903,10 +904,11 @@
+ goto end;
+ }
+ }
+ if (cmds_list) eina_list_free(cmds_list);
+ }
++#endif
+ if (pos_set)
+ {
+ int screen_w, screen_h;
+
+ elm_win_screen_size_get(win, NULL, NULL, &screen_w, &screen_h);
diff --git a/terminology.spec b/terminology.spec
index 9d24a8a..0a3d2a6 100644
--- a/terminology.spec
+++ b/terminology.spec
@@ -1,11 +1,13 @@
Name: terminology
-Version: 0.7.0
+Version: 0.8.0
Release: 1%{?dist}
License: BSD
Summary: EFL based terminal emulator
Url: http://www.enlightenment.org
Group: User Interface/Desktops
-Source: http://download.enlightenment.org/rel/apps/%{name}/%{name}-%{version}.tar.gz
+Source: http://download.enlightenment.org/rel/apps/%{name}/%{name}-%{version}.tar.xz
+# Submitted upstream: https://phab.enlightenment.org/D1973
+Patch0: terminology-0.8.0-fix-build-on-eina-1.7.x.diff
BuildRequires: desktop-file-utils
BuildRequires: ecore-devel
@@ -24,6 +26,7 @@ Fast and lightweight terminal emulator using EFL libraries.
%prep
%setup -q
+%patch0 -p1
%build
%configure --disable-silent-rules
@@ -68,6 +71,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/terminology.desktop
%changelog
+* Sun Feb 15 2015 Conrad Meyer <cemeyer at uw.edu> - 0.8.0-1
+- Update to new upstream 0.8.0
+
* Mon Oct 13 2014 Conrad Meyer <cemeyer at uw.edu> - 0.7.0-1
- Update to new upstream 0.7.0 (now with localization)
- Add gettext BR per packaging guidelines on locale files
More information about the scm-commits
mailing list