Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2016-07-01 10:00:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2016-06-02 09:39:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2016-07-01 10:00:52.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Jun 19 13:43:54 UTC 2016 - [email protected] + +- Update to version 3.16.1: + + Fix regression in support for file comparisons from pipes. + + Add open build service directories to the version control + filter. + + Add darcs to list of loaded plugins. + + Fix the dark style. + + Windows build fixes. +- Drop meld-add_osc_to_vcs_list.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- meld-3.16.0.tar.xz meld-add_osc_to_vcs_list.patch New: ---- meld-3.16.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.CJvC9E/_old 2016-07-01 10:00:52.000000000 +0200 +++ /var/tmp/diff_new_pack.CJvC9E/_new 2016-07-01 10:00:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: meld -Version: 3.16.0 +Version: 3.16.1 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ @@ -26,8 +26,6 @@ Source: http://download.gnome.org/sources/meld/3.16/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE meld-nodocs.patch [email protected] -- We do not want COPYING and NEWS installed like this Patch0: meld-nodocs.patch -# PATCH-FEATURE-OPENSUSE meld-add_osc_to_vcs_list.patch bgo#766617 [email protected] -- add .osc folder to the list of files ignored as VCS -Patch1: meld-add_osc_to_vcs_list.patch BuildRequires: fdupes # Needed for glib2_gsettings_schema macros BuildRequires: glib2-devel @@ -75,7 +73,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 translation-update-upstream %build ++++++ meld-3.16.0.tar.xz -> meld-3.16.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/NEWS new/meld-3.16.1/NEWS --- old/meld-3.16.0/NEWS 2016-04-30 23:34:44.000000000 +0200 +++ new/meld-3.16.1/NEWS 2016-06-19 02:21:29.000000000 +0200 @@ -1,4 +1,17 @@ +2016-06-19 meld 3.16.1 +====================== + + Fixes: + + * Fix regression in support for file comparisons from pipes (Kai Willadsen) + * Add open build service directories to the version control filter + (Dominique Leuenberger) + * Add darcs to list of loaded plugins (pbgc) + * Fix the dark style (Kai Willadsen) + * Windows build fixes (Kai Willadsen) + + 2016-05-01 meld 3.16.0 ====================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/PKG-INFO new/meld-3.16.1/PKG-INFO --- old/meld-3.16.0/PKG-INFO 2016-04-30 23:34:59.000000000 +0200 +++ new/meld-3.16.1/PKG-INFO 2016-06-19 02:22:05.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: meld -Version: 3.16.0 +Version: 3.16.1 Summary: Visual diff and merge tool Home-page: http://meldmerge.org Author: Kai Willadsen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/data/org.gnome.meld.gschema.xml new/meld-3.16.1/data/org.gnome.meld.gschema.xml --- old/meld-3.16.0/data/org.gnome.meld.gschema.xml 2016-04-15 22:43:53.000000000 +0200 +++ new/meld-3.16.1/data/org.gnome.meld.gschema.xml 2016-06-19 02:15:56.000000000 +0200 @@ -220,7 +220,7 @@ [ ("Backups", true, "#*# .#* ~* *~ *.{orig,bak,swp}"), ("OS-specific metadata", true, ".DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini"), - ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout _FOSSIL_ .fos CVS _darcs .git .svn"), + ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout _FOSSIL_ .fos CVS _darcs .git .svn .osc"), ("Binaries", true, "*.{pyc,a,obj,o,so,la,lib,dll,exe}"), ("Media", false, "*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}") ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/data/styles/meld-dark.xml new/meld-3.16.1/data/styles/meld-dark.xml --- old/meld-3.16.0/data/styles/meld-dark.xml 2016-04-15 22:43:53.000000000 +0200 +++ new/meld-3.16.1/data/styles/meld-dark.xml 2016-06-18 03:19:18.000000000 +0200 @@ -11,7 +11,7 @@ <style name="meld:error" background="#fce94f" foreground="#faad3d" line-background="#fdf8cd"/> <style name="meld:inline" background="#3465a4"/> <style name="meld:current-line-highlight" background="#111100"/> - <style name="meld:unknown-text" background="#aaaaaa"/> + <style name="meld:unknown-text" foreground="#aaaaaa"/> <style name="meld:syncpoint-outline" foreground="#bbbbbb"/> <style name="meld:current-chunk-highlight" background="#rgba(255, 255, 255, 0.1)"/> <style name="meld:dimmed" foreground="#999999"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/meld/conf.py new/meld-3.16.1/meld/conf.py --- old/meld-3.16.0/meld/conf.py 2016-04-30 23:33:52.000000000 +0200 +++ new/meld-3.16.1/meld/conf.py 2016-06-19 02:17:58.000000000 +0200 @@ -3,7 +3,7 @@ import sys __package__ = "meld" -__version__ = "3.16.0" +__version__ = "3.16.1" # START; these paths are clobbered on install by meld.build_helpers DATADIR = os.path.join(sys.prefix, "share", "meld") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/meld/filediff.py new/meld-3.16.1/meld/filediff.py --- old/meld-3.16.0/meld/filediff.py 2016-04-26 23:19:12.000000000 +0200 +++ new/meld-3.16.1/meld/filediff.py 2016-06-19 02:15:56.000000000 +0200 @@ -1047,10 +1047,15 @@ self.fileentry[pane].set_file(gfile) self.msgarea_mgr[pane].clear() - self.textbuffer[pane].data.reset(gfile) + buf = self.textbuffer[pane] + buf.data.reset(gfile) + + if buf.data.is_special: + loader = GtkSource.FileLoader.new_from_stream( + buf, buf.data.sourcefile, buf.data.gfile.read()) + else: + loader = GtkSource.FileLoader.new(buf, buf.data.sourcefile) - loader = GtkSource.FileLoader.new( - self.textbuffer[pane], self.textbuffer[pane].data.sourcefile) if custom_candidates: loader.set_candidate_encodings(custom_candidates) loader.load_async( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/meld/meldbuffer.py new/meld-3.16.1/meld/meldbuffer.py --- old/meld-3.16.0/meld/meldbuffer.py 2016-04-24 23:36:43.000000000 +0200 +++ new/meld-3.16.1/meld/meldbuffer.py 2016-06-19 02:15:56.000000000 +0200 @@ -197,6 +197,15 @@ return self.gfile @property + def is_special(self): + try: + info = self._gfile.query_info( + Gio.FILE_ATTRIBUTE_STANDARD_TYPE, 0, None) + return info.get_file_type() == Gio.FileType.SPECIAL + except (AttributeError, GLib.GError): + return False + + @property def writable(self): try: info = self.gfiletarget.query_info( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/meld/vc/__init__.py new/meld-3.16.1/meld/vc/__init__.py --- old/meld-3.16.0/meld/vc/__init__.py 2016-04-15 22:43:53.000000000 +0200 +++ new/meld-3.16.1/meld/vc/__init__.py 2016-06-19 02:15:56.000000000 +0200 @@ -28,7 +28,7 @@ # FIXME: This is a horrible hack to help cx_Freeze pick up these plugins when # freezing the distributable package. -from . import git, mercurial, bzr, svn +from . import git, mercurial, bzr, svn, darcs # Tuple with module name and vc.NAME field, ordered according to best-guess # as to which VC a user is likely to want by default in a multiple-VC situation @@ -37,6 +37,7 @@ "mercurial", "bzr", "svn", + "darcs", ) _plugins = [importlib.import_module("." + vc, __package__) for vc in vc_names] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.16.0/setup_win32.py new/meld-3.16.1/setup_win32.py --- old/meld-3.16.0/setup_win32.py 2016-04-15 22:43:53.000000000 +0200 +++ new/meld-3.16.1/setup_win32.py 2016-06-18 03:19:18.000000000 +0200 @@ -66,6 +66,7 @@ "includes": ["gi"], "packages": ["gi", "weakref"], "include_files": include_files, + "bin_path_excludes": [""], } @@ -145,12 +146,15 @@ ['COPYING', 'NEWS'] ), ('share/meld', - ['data/meld.css', 'data/meld-dark.css'] + ['data/meld.css'] ), ('share/meld/icons', glob.glob("data/icons/*.png") + glob.glob("data/icons/COPYING*") ), + ('share/meld/styles', + glob.glob("data/styles/*.xml") + ), ('share/meld/ui', glob.glob("data/ui/*.ui") + glob.glob("data/ui/*.xml") ),
