diff --git a/.gitignore b/.gitignore index 7e8fe2a..89c6513 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /mate-terminal-1.11.0.tar.xz /mate-terminal-1.12.0.tar.xz /mate-terminal-1.12.1.tar.xz +/mate-terminal-1.14.0.tar.xz diff --git a/mate-terminal.spec b/mate-terminal.spec index 1dacd28..205ce37 100644 --- a/mate-terminal.spec +++ b/mate-terminal.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.12 +%global branch 1.14 # Settings used for build from snapshots. %{!?rel_build:%global commit ac33ed09bb41ba717df3722cc71e25c1aa5134c5} @@ -14,7 +14,7 @@ Summary: Terminal emulator for MATE Name: mate-terminal -Version: %{branch}.1 +Version: %{branch}.0 %if 0%{?rel_build} Release: 1%{?dist} %else @@ -31,15 +31,24 @@ URL: http://mate-desktop.org #Default to black bg white fg, unlimited scrollback, turn off use theme default Patch0: mate-terminal_better_defaults.patch +# gtk3 migration commits from upstream +Patch1: mate-terminal_0001-drop-ancient-and-irrelevant-gnome-files.patch +Patch2: mate-terminal_0002-window-react-on-WM-change-only-on-X11.patch +Patch3: mate-terminal_0003-use-About-dialog-from-GTK-instead-of-forked-one-from.patch +Patch4: mate-terminal_0004-use-dconf-directly-instead-of-wrapper-functions-from.patch +Patch5: mate-terminal_0005-copy-gsettings-helpers-from-libmate-desktop-see-also.patch +Patch6: mate-terminal_0006-drop-build-dep-on-libmate-desktop-it-s-not-needed-an.patch +Patch7: mate-terminal_0007-require-GTK-3.14-and-VTE-0.38-API-2.91-drop-with-gtk.patch +Patch8: mate-terminal_0008-drop-old-GTK-2-code.patch +Patch9: mate-terminal_0009-drop-old-code-for-VTE-0.38-it-was-used-in-GTK-2-buil.patch BuildRequires: dconf-devel BuildRequires: desktop-file-utils BuildRequires: glib2-devel -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: libSM-devel BuildRequires: mate-common -BuildRequires: vte-devel -BuildRequires: mate-desktop-devel +BuildRequires: vte291-devel # needed to get a gsettings schema, rhbz #908105 Requires: mate-desktop-libs @@ -54,6 +63,17 @@ clickable URLs. %setup -q%{!?rel_build:n %{name}-%{commit}} %patch0 -p1 -b .better_defaults +%patch1 -p1 -b .0001 +%patch2 -p1 -b .0002 +%patch3 -p1 -b .0003 +%patch4 -p1 -b .0004 +%patch5 -p1 -b .0005 +%patch6 -p1 -b .0006 +%patch7 -p1 -b .0007 +%patch8 -p1 -b .0008 +%patch9 -p1 -b .0009 + +NOCONFIGURE=1 ./autogen.sh %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh @@ -64,7 +84,6 @@ NOCONFIGURE=1 ./autogen.sh %build %configure --disable-static \ - --with-gtk=2.0 \ --disable-schemas-compile make %{?_smp_mflags} V=1 @@ -102,6 +121,10 @@ fi %changelog +* Sun Jun 12 2016 Wolfgang Ulbrich - 1.14.0-1 +- update to 1.14.0 release +- switch to gtk+-3 + * Fri Dec 04 2015 Wolfgang Ulbrich - 1.12.1-1 - update to 1.12.1 release diff --git a/sources b/sources index 6786572..a6e7e73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2bf11e16a2de72cd2ef2382073f0b26b mate-terminal-1.12.1.tar.xz +5c04daba17d994ad3d1b5f40f084df69 mate-terminal-1.14.0.tar.xz