Hello community, here is the log from the commit of package scratch for openSUSE:Factory checked in at 2017-05-08 19:02:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scratch (Old) and /work/SRC/openSUSE:Factory/.scratch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scratch" Mon May 8 19:02:56 2017 rev:6 rq:492907 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2017-04-11 09:39:29.565142419 +0200 +++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2017-05-08 19:03:50.201171526 +0200 @@ -1,0 +2,7 @@ +Thu May 4 15:12:19 UTC 2017 - sor.ale...@meowr.ru + +- Synchronise scratch-2.4.1-vala-0.36.patch with + https://bazaar.launchpad.net/~elementary-apps/scratch/master/revision/1828 + to restore Vala 0.35 or older compatibility. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scratch.spec ++++++ --- /var/tmp/diff_new_pack.XWpvnA/_old 2017-05-08 19:03:51.105043838 +0200 +++ /var/tmp/diff_new_pack.XWpvnA/_new 2017-05-08 19:03:51.109043273 +0200 @@ -16,7 +16,7 @@ # -%define major 0 +%define sover 0 %define _name scratch-text-editor Name: scratch Version: 2.4.1 @@ -26,7 +26,7 @@ Group: Productivity/Text/Editors Url: https://launchpad.net/scratch Source: https://launchpad.net/scratch/2.x/%{version}/+download/%{_name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM vala-0.36.patch avvi...@yandex.by -- Fix build with vala >= 0.36 +# PATCH-FIX-UPSTREAM vala-0.36.patch -- Fix build with vala >= 0.36. Patch0: scratch-2.4.1-vala-0.36.patch BuildRequires: cmake >= 2.8 BuildRequires: ctags @@ -53,9 +53,8 @@ BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.10 BuildRequires: pkgconfig(zeitgeist-2.0) Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires -%if 0%{?suse_version} >= 1315 +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120000 BuildRequires: pkgconfig(vte-2.91) %else BuildRequires: pkgconfig(vte-2.90) @@ -64,15 +63,17 @@ %description Scratch is a GTK+-based text editor designed for Elementary OS. It auto-saves files, and can remembers tabs and cursor positions. You -can install extensions to turn Scratch into a full-blown IDE, as well -as tweak the behavior and interface to your liking. It has -highlighting for many programming, scriptnig and markup languages. +can install extensions to turn Scratch into a full-blown IDE, as +well as tweak the behaviour and interface to your liking. It has +highlighting for many programming, scripting and markup languages. -%package -n lib%{name}core%{major} +%lang_package + +%package -n lib%{name}core%{sover} Summary: Scratch Library Group: System/Libraries -%description -n lib%{name}core%{major} +%description -n lib%{name}core%{sover} Extensible Text Editor for Elementary OS. This package contains the shared library. @@ -81,31 +82,29 @@ Summary: Development Files for Scratch Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: lib%{name}core%{major} = %{version} +Requires: lib%{name}core%{sover} = %{version} Recommends: pkgconfig(vapigen) %description devel Extensible Text Editor for Elementary OS. This package contains development files needed to develop plugins for -Scratch. - -%lang_package +for Scratch. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -# fails to compile https://bugs.launchpad.net/scratch/+bug/1456572 +# Fails to compile https://bugs.launchpad.net/scratch/+bug/1456572 sed -e '/add_subdirectory (filemanager)/d;/filemanager/q1' \ -e '/add_subdirectory (folder-manager)/d;/folder-manager/q1' \ -i ./plugins/CMakeLists.txt -# fails to compile https://bugs.launchpad.net/scratch/+bug/1456580 +# Fails to compile https://bugs.launchpad.net/scratch/+bug/1456580 sed -e '/add_subdirectory (outline)/d;/outline/q1' \ -i ./plugins/CMakeLists.txt -# fails to compile https://bugs.launchpad.net/scratch/+bug/1456581 +# Fails to compile https://bugs.launchpad.net/scratch/+bug/1456581 sed -e '/add_subdirectory (word-completion)/d;/word-completion/q1' \ -i ./plugins/CMakeLists.txt @@ -113,13 +112,12 @@ %cmake \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \ -DGSETTINGS_COMPILE=OFF - -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %cmake_install %suse_update_desktop_file org.pantheon.scratch -%fdupes %{buildroot}%{_datadir} +%fdupes %{buildroot}%{_datadir}/ %find_lang scratch-text-editor %{name}.lang %post @@ -130,8 +128,9 @@ %glib2_gsettings_schema_postun %desktop_database_postun -%post -n lib%{name}core%{major} -p /sbin/ldconfig -%postun -n lib%{name}core%{major} -p /sbin/ldconfig +%post -n lib%{name}core%{sover} -p /sbin/ldconfig + +%postun -n lib%{name}core%{sover} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -141,21 +140,21 @@ %{_datadir}/%{name}/ %{_datadir}/applications/org.pantheon.scratch.desktop %{_datadir}/glib-2.0/schemas/*.%{name}.*.xml +%dir %{_datadir}/appdata/ %{_datadir}/appdata/org.pantheon.scratch.appdata.xml -%dir %{_datadir}/appdata -%files -n lib%{name}core%{major} -%defattr(-,root,root,-) +%files lang -f %{name}.lang +%defattr(-,root,root) + +%files -n lib%{name}core%{sover} +%defattr(-,root,root) %{_libdir}/lib%{name}core.so.* %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/lib%{name}core.so %{_libdir}/pkgconfig/%{name}core.pc %{_datadir}/vala/vapi/%{name}core.* %{_includedir}/%{name}/ -%files lang -f %{name}.lang -%defattr(-,root,root,-) - %changelog ++++++ scratch-2.4.1-vala-0.36.patch ++++++ --- /var/tmp/diff_new_pack.XWpvnA/_old 2017-05-08 19:03:51.141038753 +0200 +++ /var/tmp/diff_new_pack.XWpvnA/_new 2017-05-08 19:03:51.141038753 +0200 @@ -1,42 +1,38 @@ -diff -ruN scratch-text-editor-2.4.1.orig/plugins/clipboard-history/ClipboardHistory.vala scratch-text-editor-2.4.1/plugins/clipboard-history/ClipboardHistory.vala ---- scratch-text-editor-2.4.1.orig/plugins/clipboard-history/ClipboardHistory.vala 2017-02-20 14:37:19.000000000 +0300 -+++ scratch-text-editor-2.4.1/plugins/clipboard-history/ClipboardHistory.vala 2017-04-01 04:10:46.360267441 +0300 -@@ -90,7 +90,7 @@ +--- a/plugins/clipboard-history/ClipboardHistory.vala ++++ b/plugins/clipboard-history/ClipboardHistory.vala +@@ -90,7 +90,11 @@ public class Scratch.Plugins.ClipboardHi // Delete last item, if the size of the list store > MAX_SIZE if (list_store.get_iter_from_string (out iter, (MAX_SIZE - 1).to_string ())) -- list_store.remove (iter); ++#if VALA_0_36 + list_store.remove (ref iter); ++#else + list_store.remove (iter); ++#endif // Delete dupplicates from list store, if exists delete_dupplicates (clipboard_content); -@@ -143,7 +143,7 @@ +@@ -143,7 +147,11 @@ public class Scratch.Plugins.ClipboardHi }); if (to_delete != null) -- list_store.remove (to_delete); ++#if VALA_0_36 + list_store.remove (ref to_delete); ++#else + list_store.remove (to_delete); ++#endif } void build_plugin_ui () { -@@ -214,7 +214,7 @@ +@@ -214,7 +222,11 @@ public class Scratch.Plugins.ClipboardHi if (!selection.get_selected(out model, out iter)) { return; } -- list_store.remove (iter); ++#if VALA_0_36 + list_store.remove (ref iter); ++#else + list_store.remove (iter); ++#endif // Hiding PlugIn, if no more items exist in the list store. if (!list_store.get_iter_first (out iter)) -diff -ruN scratch-text-editor-2.4.1.orig/plugins/outline/OutlinePlugin.vala scratch-text-editor-2.4.1/plugins/outline/OutlinePlugin.vala ---- scratch-text-editor-2.4.1.orig/plugins/outline/OutlinePlugin.vala 2017-02-20 14:37:19.000000000 +0300 -+++ scratch-text-editor-2.4.1/plugins/outline/OutlinePlugin.vala 2017-04-01 04:08:56.268222463 +0300 -@@ -139,7 +139,7 @@ - var text = doc.source_view; - Gtk.TextIter iter; - text.buffer.get_iter_at_line (out iter, line - 1); -- text.buffer.place_cursor (iter); -+ text.buffer.place_cursor (ref iter); - text.scroll_to_iter (iter, 0.0, true, 0.5, 0.5); - } - }
