April 2015 - openSUSE Commits - openSUSE Mailing Lists

commit python3-openpyxl for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package python3-openpyxl for openSUSE:Factory checked in at 2015-04-05 02:03:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-openpyxl (Old) and /work/SRC/openSUSE:Factory/.python3-openpyxl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-openpyxl" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-openpyxl/python3-openpyxl.changes 2015-03-16 07:01:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-openpyxl.new/python3-openpyxl.changes 2015-04-05 02:04:09.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Apr 3 00:19:48 UTC 2015 - arun(a)gmx.de + +- update to version 2.2.1: + * PR54 Improved precision on times near midnight. + * PR55 Preserve macro buttons + * #429 Workbook fails to load because header and footers cannot be + parsed. + * #433 File-like object with encoding=None + * #434 SyntaxError when writing page breaks. + * #436 Read-only mode duplicates empty rows. + * #437 Cell.offset raises an exception + * #438 Cells with pivotButton and quotePrefix styles cannot be read + * #440 Error when customised versions of builtin formats + * #442 Exception raised when a fill element contains no children + * #444 Styles cannot be copied + +------------------------------------------------------------------- Old: ---- openpyxl-2.2.0.tar.gz New: ---- openpyxl-2.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-openpyxl.spec ++++++ --- /var/tmp/diff_new_pack.QLPM4W/_old 2015-04-05 02:04:10.000000000 +0200 +++ /var/tmp/diff_new_pack.QLPM4W/_new 2015-04-05 02:04:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-openpyxl -Version: 2.2.0 +Version: 2.2.1 Release: 0 Summary: A Python library to read/write Excel 2007 xlsx/xlsm files License: MIT and Python-2.0 ++++++ openpyxl-2.2.0.tar.gz -> openpyxl-2.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/PKG-INFO new/openpyxl-2.2.1/PKG-INFO --- old/openpyxl-2.2.0/PKG-INFO 2015-03-11 17:14:43.000000000 +0100 +++ new/openpyxl-2.2.1/PKG-INFO 2015-03-31 11:14:50.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: openpyxl -Version: 2.2.0 +Version: 2.2.1 Summary: A Python library to read/write Excel 2007 xlsx/xlsm files Home-page: http://openpyxl.readthedocs.org Author: See AUTHORS @@ -59,7 +59,6 @@ Release notes: http://openpyxl.readthedocs.org/en/latest/changes.html Platform: UNKNOWN -Classifier: Development Status :: 4 - Beta Classifier: Development Status :: 5 - Production/Stable Classifier: Operating System :: MacOS :: MacOS X Classifier: Operating System :: Microsoft :: Windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/__init__.py new/openpyxl-2.2.1/openpyxl/__init__.py --- old/openpyxl-2.2.0/openpyxl/__init__.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/__init__.py 2015-03-20 16:18:11.000000000 +0100 @@ -11,7 +11,7 @@ # constants -__version__ = '2.2.0' +__version__ = '2.2.1' __author__ = 'Eric Gazoni' __license__ = 'MIT/Expat' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/cell/cell.py new/openpyxl-2.2.1/openpyxl/cell/cell.py --- old/openpyxl-2.2.0/openpyxl/cell/cell.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/cell/cell.py 2015-03-31 11:12:52.000000000 +0200 @@ -71,6 +71,9 @@ NUMBER_REGEX = re.compile(r'^-?([\d]|[\d]+\.[\d]*|\.[\d]+|[1-9][\d]+\.?[\d]*)((E|e)[-+]?[\d]+)?$') ILLEGAL_CHARACTERS_RE = re.compile(r'[\000-\010]|[\013-\014]|[\016-\037]') +ERROR_CODES = ('#NULL!', '#DIV/0!', '#VALUE!', '#REF!', '#NAME?', '#NUM!', + '#N/A') + class Cell(StyleableObject): """Describes cell associated properties. @@ -90,13 +93,7 @@ '_comment', ) - ERROR_CODES = ('#NULL!', - '#DIV/0!', - '#VALUE!', - '#REF!', - '#NAME?', - '#NUM!', - '#N/A') + ERROR_CODES = ERROR_CODES TYPE_STRING = 's' TYPE_FORMULA = 'f' @@ -111,14 +108,17 @@ TYPE_NULL, TYPE_INLINE, TYPE_ERROR, TYPE_FORMULA_CACHE_STRING) - def __init__(self, worksheet, column, row, value=None, fontId=0, fillId=0, - borderId=0, alignmentId=0, protectionId=0, numFmtId=0, xfId=None): + def __init__(self, worksheet, column, row, value=None, fontId=0, + fillId=0, borderId=0, alignmentId=0, protectionId=0, numFmtId=0, + pivotButton=None, quotePrefix=None, xfId=None): self._font_id = fontId self._fill_id = fillId self._border_id = borderId self._alignment_id = alignmentId self._protection_id = protectionId self._number_format_id = numFmtId + self.quotePrefix = quotePrefix + self.pivotButton = pivotButton self.parent = worksheet self.column = column self.row = row @@ -363,8 +363,7 @@ :rtype: :class:`openpyxl.cell.Cell` """ - offset_column = get_column_letter( - column_index_from_string(self.column) + column) + offset_column = column_index_from_string(self.column) + column offset_row = self.row + row return self.parent.cell(column=offset_column, row=offset_row) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/profiling.py new/openpyxl-2.2.1/openpyxl/profiling.py --- old/openpyxl-2.2.0/openpyxl/profiling.py 2015-02-09 23:50:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/profiling.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ -from io import BytesIO -import os -from random import randint - -from openpyxl import Workbook -from openpyxl.xml.functions import XMLGenerator - -def make_worksheet(): - wb = Workbook() - ws = wb.active - for i in range(1000): - ws.append(list(range(100))) - return ws - - - - -def make_dump_worksheet(): - wb = Workbook(write_only=True) - ws = wb.create_sheet() - return ws - -def dump_writer(ws=None): - if ws is None: - ws = make_dump_worksheet() - for i in range(1000): - ws.append(list(range(100))) - - -COLUMNS = 100 -ROWS = 1000 -BOLD = 1 -ITALIC = 2 -UNDERLINE = 4 -RED_BG = 8 -formatData = [[None] * COLUMNS for _ in range(ROWS)] - -def generate_format_data(): - for row in range(ROWS): - for col in range(COLUMNS): - formatData[row][col] = randint(1, 15) - - -def styled_sheet(): - from openpyxl import Workbook - from openpyxl.styles import Font, Style, PatternFill, Color, colors - - wb = Workbook() - ws = wb.active - ws.title = 'Test 1' - - red_fill = PatternFill(fill_type='solid', fgColor=Color(colors.RED), bgColor=Color(colors.RED)) - empty_fill = PatternFill() - styles = [] - # pregenerate relevant styles - for row in range(ROWS): - _row = [] - for col in range(COLUMNS): - cell = ws.cell(row=row+1, column=col+1) - cell.value = 1 - font = {} - fill = PatternFill() - if formatData[row][col] & BOLD: - font['bold'] = True - if formatData[row][col] & ITALIC: - font['italic'] = True - if formatData[row][col] & UNDERLINE: - font['underline'] = 'single' - if formatData[row][col] & RED_BG: - fill = red_fill - cell.style = Style(font=Font(**font), fill=fill) - - #wb.save(get_output_path('test_openpyxl_style_std_pregen.xlsx')) - - -def read_workbook(): - from openpyxl import load_workbook - folder = os.path.split(__file__)[0] - src = os.path.join(folder, "files", "very_large.xlsx") - wb = load_workbook(src, read_only=True) - return wb - - -def rows_without_values(wb): - ws = wb.active - rows = ws.iter_rows() - for r, row in enumerate(rows): - for c, col in enumerate(row): - pass - print((r+1)* (c+1), "cells") - - -def rows_with_values(wb): - ws = wb.active - rows = ws.iter_rows() - for r, row in enumerate(rows): - for c, col in enumerate(row): - col.value - print((r+1)* (c+1), "cells") - -def col_index1(): - from openpyxl.cell import get_column_letter - for i in range(1, 18279): - c = get_column_letter(i) - - - -""" -Sample use -import cProfile -ws = make_worksheet() -cProfile.run("profiling.lxml_writer(ws)", sort="tottime") -""" - - -if __name__ == '__main__': - import cProfile - # ws = make_worksheet() - wb = read_workbook() - print("Looping without values") - cProfile.run("rows_without_values(wb)", sort="tottime") - print("Looping with values") - cProfile.run("rows_with_values(wb)", sort="tottime") - cProfile.run("make_worksheet()", sort="tottime") - #cProfile.run("lxml_writer(ws)", sort="tottime") - generate_format_data() - cProfile.run("styled_sheet()", sort="tottime") - ws = make_dump_worksheet() - cProfile.run("dump_writer(ws)", sort="tottime") - cProfile.run("col_index1()", sort="tottime") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/reader/excel.py new/openpyxl-2.2.1/openpyxl/reader/excel.py --- old/openpyxl-2.2.0/openpyxl/reader/excel.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/reader/excel.py 2015-03-31 11:12:52.000000000 +0200 @@ -131,7 +131,7 @@ if is_file_like: # fileobject must have been opened with 'rb' flag # it is required by zipfile - if hasattr(filename, 'encoding'): + if getattr(filename, 'encoding', None) is not None: raise IOError("File-object must be opened in binary mode") try: @@ -233,8 +233,7 @@ else: new_ws = read_worksheet(archive.read(worksheet_path), wb, sheet_name, shared_strings, wb.shared_styles, - color_index=wb._colors, - keep_vba=keep_vba) + color_index=wb._colors) new_ws.sheet_state = sheet.get('state') or 'visible' wb._add_sheet(new_ws) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/reader/style.py new/openpyxl-2.2.1/openpyxl/reader/style.py --- old/openpyxl-2.2.0/openpyxl/reader/style.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/reader/style.py 2015-03-31 11:12:52.000000000 +0200 @@ -42,6 +42,7 @@ self.border_list = IndexedList() self.alignments = IndexedList([Alignment()]) self.protections = IndexedList([Protection()]) + self.custom_number_formats = {} self.number_formats = IndexedList() def parse(self): @@ -58,9 +59,10 @@ """Read in custom numeric formatting rules from the shared style table""" custom_formats = {} num_fmts = self.root.findall('{%s}numFmts/{%s}numFmt' % (SHEET_MAIN_NS, SHEET_MAIN_NS)) - for num_fmt_node in num_fmts: - fmt_code = num_fmt_node.get('formatCode').lower() - self.number_formats.append(fmt_code) + for node in num_fmts: + idx = int(node.get('numFmtId')) + self.custom_number_formats[idx] = node.get('formatCode') + self.number_formats.append(node.get('formatCode')) def parse_color_index(self): @@ -154,10 +156,13 @@ fillId = int(xf.get("fillId", 0)) borderId = int(xf.get("borderId", 0)) - if numFmtId < 164: - format_code = builtin_formats.get(numFmtId, 'General') + # check for custom formats and normalise indices + + if numFmtId in self.custom_number_formats: + format_code = self.custom_number_formats[numFmtId] + attrs["numFmtId"] = self.number_formats.add(format_code) + 164 else: - format_code = self.number_formats[numFmtId-165] + format_code = builtin_formats[numFmtId] _style['number_format'] = format_code if bool_attrib(xf, 'applyAlignment'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/reader/worksheet.py new/openpyxl-2.2.1/openpyxl/reader/worksheet.py --- old/openpyxl-2.2.0/openpyxl/reader/worksheet.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/reader/worksheet.py 2015-03-31 11:12:52.000000000 +0200 @@ -65,6 +65,7 @@ self.guess_types = ws.parent._guess_types self.data_only = ws.parent.data_only self.styles = [dict(style) for style in self.ws.parent._cell_styles] + self.keep_vba = ws.parent.vba_archive is not None def parse(self): dispatcher = { @@ -129,7 +130,6 @@ style_id = int(style_id) style = self.styles[style_id] - column, row = coordinate_from_string(coordinate) cell = Cell(self.ws, column, row, **style) self.ws._add_cell(cell) @@ -297,7 +297,10 @@ def parse_legacy_drawing(self, element): - self.ws.vba_controls = element.get("r:id") + if self.keep_vba: + # Create an id that will not clash with any other ids that will + # be generated. + self.ws.vba_controls = 'vbaControlId' def parse_sheet_views(self, element): @@ -307,14 +310,14 @@ self.ws.sheet_view = SheetView.from_tree(el) -def fast_parse(ws, xml_source, shared_strings, style_table, color_index=None): +def fast_parse(ws, xml_source, shared_strings, style_table, color_index=None, keep_vba=False): parser = WorkSheetParser(ws, xml_source, shared_strings, style_table, color_index) parser.parse() del parser def read_worksheet(xml_source, parent, preset_title, shared_strings, - style_table, color_index=None, worksheet_path=None, keep_vba=False): + style_table, color_index=None, worksheet_path=None): """Read an xml worksheet""" if worksheet_path: ws = IterableWorksheet(parent, preset_title, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/styles/__init__.py new/openpyxl-2.2.1/openpyxl/styles/__init__.py --- old/openpyxl-2.2.0/openpyxl/styles/__init__.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/styles/__init__.py 2015-03-31 11:12:52.000000000 +0200 @@ -2,6 +2,7 @@ # Copyright (c) 2010-2015 openpyxl from openpyxl.descriptors import Typed +from openpyxl.compat import deprecated from .alignment import Alignment from .borders import Border, Side @@ -24,12 +25,12 @@ 'protection') __base__ = True - _font = Typed(expected_type=Font) - _fill = Typed(expected_type=Fill) - _border = Typed(expected_type=Border) - _alignment = Typed(expected_type=Alignment) + font = Typed(expected_type=Font) + fill = Typed(expected_type=Fill, allow_none=True) + border = Typed(expected_type=Border) + alignment = Typed(expected_type=Alignment) number_format = NumberFormatDescriptor() - _protection = Typed(expected_type=Protection) + protection = Typed(expected_type=Protection) def __init__(self, font=Font(), @@ -39,33 +40,24 @@ number_format=None, protection=Protection() ): - self._font = font - self._fill = fill - self._border = border - self._alignment = alignment + self.font = font + self.fill = fill + self.border = border + self.alignment = alignment self.number_format = number_format - self._protection = protection + self.protection = protection - @property - def font(self): - return StyleProxy(self._font) - - @property - def fill(self): - return StyleProxy(self._fill) - - @property - def border(self): - return StyleProxy(self._border) - - @property - def alignment(self): - return StyleProxy(self._alignment) - - @property - def protection(self): - return StyleProxy(self._protection) + @deprecated("Copy formatting objects like font directly") + def copy(self): + cls = self.__class__ + return cls(font=self.font.copy(), + fill=self.fill.copy(), + border=self.border.copy(), + alignment=self.alignment.copy(), + number_format=self.number_format, + protection=self.protection.copy() + ) DEFAULTS = Style() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/styles/fills.py new/openpyxl-2.2.1/openpyxl/styles/fills.py --- old/openpyxl-2.2.0/openpyxl/styles/fills.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/styles/fills.py 2015-03-31 11:12:52.000000000 +0200 @@ -48,7 +48,10 @@ @classmethod def from_tree(cls, el): - child = [c for c in el][0] + children = [c for c in el] + if not children: + return + child = children[0] if "patternFill" in child.tag: return PatternFill._from_tree(child) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/styles/styleable.py new/openpyxl-2.2.1/openpyxl/styles/styleable.py --- old/openpyxl-2.2.0/openpyxl/styles/styleable.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/styles/styleable.py 2015-03-31 11:12:52.000000000 +0200 @@ -1,7 +1,7 @@ from __future__ import absolute_import # Copyright (c) 2010-2015 openpyxl -from collections import namedtuple +from warnings import warn from openpyxl.utils.indexed_list import IndexedList from .numbers import BUILTIN_FORMATS, BUILTIN_FORMATS_REVERSE @@ -62,9 +62,11 @@ alignment = StyleDescriptor('_alignments', '_alignment_id') __slots__ = ('parent', '_font_id', '_border_id', '_fill_id', - '_alignment_id', '_protection_id', '_number_format_id') + '_alignment_id', '_protection_id', '_number_format_id', 'pivotButton', + 'quotePrefix') - def __init__(self, sheet, fontId=0, fillId=0, borderId=0, alignmentId=0, protectionId=0, numFmtId=0): + def __init__(self, sheet, fontId=0, fillId=0, borderId=0, alignmentId=0, + protectionId=0, numFmtId=0, pivotButton=None, quotePrefix=None): self._font_id = fontId self._fill_id = fillId self._border_id = borderId @@ -72,6 +74,8 @@ self._protection_id = protectionId self._number_format_id = numFmtId self.parent = sheet + self.pivotButton = pivotButton + self.quotePrefix = quotePrefix @property @@ -82,7 +86,10 @@ fillId=self._fill_id, fontId=self._font_id, numFmtId=self._number_format_id, - protectionId=self._protection_id) + protectionId=self._protection_id, + pivotButton=self.pivotButton, + quotePrefix=self.quotePrefix + ) return self.parent.parent._cell_styles.add(style) @@ -93,26 +100,30 @@ or self._fill_id or self._font_id or self._number_format_id - or self._protection_id) + or self._protection_id + or self.pivotButton + or self.quotePrefix + ) #legacy @property def style(self): + warn("Use formatting objects such as font directly") return Style( - font=self.font, - fill=self.fill, - border=self.border, - alignment=self.alignment, + font=self.font.copy(), + fill=self.fill.copy(), + border=self.border.copy(), + alignment=self.alignment.copy(), number_format=self.number_format, - protection=self.protection + protection=self.protection.copy() ) #legacy @style.setter def style(self, value): - self.font = value.font._StyleProxy__target - self.fill = value.fill._StyleProxy__target - self.border = value.border._StyleProxy__target - self.protection = value.protection._StyleProxy__target - self.alignment = value.alignment._StyleProxy__target + self.font = value.font.copy() + self.fill = value.fill.copy() + self.border = value.border.copy() + self.protection = value.protection.copy() + self.alignment = value.alignment.copy() self.number_format = value.number_format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/utils/datetime.py new/openpyxl-2.2.1/openpyxl/utils/datetime.py --- old/openpyxl-2.2.0/openpyxl/utils/datetime.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/utils/datetime.py 2015-03-31 11:12:52.000000000 +0200 @@ -58,10 +58,15 @@ value += 1 parts = list(jd2gcal(MJD_0, value + offset - MJD_0)) _, fraction = divmod(value, 1) + jumped = (parts[-1] == 0 and fraction > 0) diff = datetime.timedelta(days=fraction) + if 0 < abs(value) < 1: return days_to_time(diff) - return datetime.datetime(*parts[:3]) + diff + if not jumped: + return datetime.datetime(*parts[:3]) + diff + else: + return datetime.datetime(*parts[:3] + [0]) @lru_cache() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/workbook/workbook.py new/openpyxl-2.2.1/openpyxl/workbook/workbook.py --- old/openpyxl-2.2.0/openpyxl/workbook/workbook.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/workbook/workbook.py 2015-03-20 16:18:11.000000000 +0100 @@ -290,6 +290,8 @@ you will only be able to call this function once. Subsequents attempts to modify or save the file will raise an :class:`openpyxl.shared.exc.WorkbookAlreadySaved` exception. """ + if self.read_only: + raise TypeError("""Workbook is read-only""") if self.write_only: save_dump(self, filename) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/worksheet/header_footer.py new/openpyxl-2.2.1/openpyxl/worksheet/header_footer.py --- old/openpyxl-2.2.0/openpyxl/worksheet/header_footer.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/worksheet/header_footer.py 2015-03-20 16:18:11.000000000 +0100 @@ -109,7 +109,7 @@ m = SIZE_REGEX.search(text) if m: - self.font_size = m.group(0) + self.font_size = int(m.group('size')) text = SIZE_REGEX.sub('', text) m = COLOR_REGEX.search(text) @@ -194,14 +194,23 @@ (&L(?P<left>.+?))? (&C(?P<center>.+?))? (&R(?P<right>.+?))? -$""", re.VERBOSE) +$""", re.VERBOSE | re.DOTALL) + +# add support for multiline strings (how do re.flags combine?) + +from warnings import warn def _split_string(text): """Split the combined (decoded) string into left, center and right parts""" m = ITEM_REGEX.match(text) - return m.groupdict() + try: + parts = m.groupdict() + except AttributeError: + warn("""Cannot parse header or footer so it will be ignored""") + parts = {'left':'', 'right':'', 'center':''} + return parts HEADER_REGEX = re.compile(r"(&[ABDEGHINOPSTUXYZ\+\-])") # split part into commands FONT_REGEX = re.compile('&"(?P<font>.+)"') COLOR_REGEX = re.compile("&K(?P<color>[A-F0-9]{6})") -SIZE_REGEX = re.compile(r"&\d+") +SIZE_REGEX = re.compile(r"&(?P<size>\d+)") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/worksheet/iter_worksheet.py new/openpyxl-2.2.1/openpyxl/worksheet/iter_worksheet.py --- old/openpyxl-2.2.0/openpyxl/worksheet/iter_worksheet.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/worksheet/iter_worksheet.py 2015-03-31 11:12:52.000000000 +0200 @@ -96,7 +96,7 @@ if max_col is not None: empty_row = tuple(EMPTY_CELL for column in range(min_col, max_col + 1)) else: - expected_columns = [] + empty_row = [] row_counter = min_row p = iterparse(self.xml_source, tag=[ROW_TAG], remove_blank_text=True) @@ -110,6 +110,7 @@ # some rows are missing for row_counter in range(row_counter, row_id): + row_counter += 1 yield empty_row # return cells from a row diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/writer/excel.py new/openpyxl-2.2.1/openpyxl/writer/excel.py --- old/openpyxl-2.2.0/openpyxl/writer/excel.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/writer/excel.py 2015-03-31 11:12:52.000000000 +0200 @@ -105,6 +105,7 @@ image_id = 1 shape_id = 1 comments_id = 1 + vba_controls_id = 1 for i, sheet in enumerate(self.workbook.worksheets): archive.writestr(PACKAGE_WORKSHEETS + '/sheet%d.xml' % (i + 1), @@ -112,8 +113,9 @@ )) if (sheet._charts or sheet._images or sheet.relationships - or sheet._comment_count > 0): - rels = write_rels(sheet, drawing_id, comments_id) + or sheet._comment_count > 0 + or sheet.vba_controls is not None): + rels = write_rels(sheet, drawing_id, comments_id, vba_controls_id) archive.writestr( PACKAGE_WORKSHEETS + '/_rels/sheet%d.xml.rels' % (i + 1), tostring(rels) @@ -152,6 +154,9 @@ cw.write_comments_vml()) comments_id += 1 + if sheet.vba_controls is not None: + vba_controls_id += 1 + def _write_external_links(self, archive): """Write links to external workbooks""" wb = self.workbook diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/writer/relations.py new/openpyxl-2.2.1/openpyxl/writer/relations.py --- old/openpyxl-2.2.0/openpyxl/writer/relations.py 2015-02-09 16:59:20.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/writer/relations.py 2015-03-31 11:12:52.000000000 +0200 @@ -11,7 +11,7 @@ ) -def write_rels(worksheet, drawing_id, comments_id): +def write_rels(worksheet, drawing_id, comments_id, vba_controls_id): """Write relationships for the worksheet to xml.""" root = Element('{%s}Relationships' % PKG_REL_NS) for rel in worksheet.relationships: @@ -35,5 +35,9 @@ 'Type': VML_NS, 'Target': '../drawings/commentsDrawing%s.vml' % comments_id} SubElement(root, '{%s}Relationship' % PKG_REL_NS, attrs) + if worksheet.vba_controls is not None: + attrs = {'Id': worksheet.vba_controls, + 'Type': VML_NS, + 'Target': '../drawings/vmlDrawing%s.vml' % vba_controls_id} + SubElement(root, '{%s}Relationship' % PKG_REL_NS, attrs) return root - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/writer/worksheet.py new/openpyxl-2.2.1/openpyxl/writer/worksheet.py --- old/openpyxl-2.2.0/openpyxl/writer/worksheet.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/writer/worksheet.py 2015-03-31 11:12:52.000000000 +0200 @@ -199,7 +199,7 @@ tag = Element('rowBreaks', {'count': str(len(breaks)), 'manualBreakCount': str(len(breaks))}) for b in breaks: - tag.append(Element('brk', id=str(b), man=true, max='16383', + tag.append(Element('brk', id=str(b), man="true", max='16383', min='0')) return tag @@ -295,7 +295,8 @@ # add a legacyDrawing so that excel can draw comments if worksheet._comment_count > 0: - comments = Element('legacyDrawing', {'{%s}id' % REL_NS: 'commentsvml'}) + comments = Element('{%s}legacyDrawing' % SHEET_MAIN_NS, + {'{%s}id' % REL_NS: 'commentsvml'}) xf.write(comments) xml = out.getvalue() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl/xml/constants.py new/openpyxl-2.2.1/openpyxl/xml/constants.py --- old/openpyxl-2.2.0/openpyxl/xml/constants.py 2015-03-11 16:10:31.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl/xml/constants.py 2015-03-31 11:12:52.000000000 +0200 @@ -31,7 +31,7 @@ ARC_SHARED_STRINGS = PACKAGE_XL + '/sharedStrings.xml' ARC_CUSTOM_UI = 'customUI/customUI.xml' ARC_VBA = ('xl/vba', 'xl/activeX', 'xl/drawings', 'xl/media', 'xl/ctrlProps', - 'xl/worksheets/_rels', 'customUI', 'xl/printerSettings') + 'customUI', 'xl/printerSettings') ## namespaces # Dublin Core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl.egg-info/PKG-INFO new/openpyxl-2.2.1/openpyxl.egg-info/PKG-INFO --- old/openpyxl-2.2.0/openpyxl.egg-info/PKG-INFO 2015-03-11 17:14:43.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl.egg-info/PKG-INFO 2015-03-31 11:14:50.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: openpyxl -Version: 2.2.0 +Version: 2.2.1 Summary: A Python library to read/write Excel 2007 xlsx/xlsm files Home-page: http://openpyxl.readthedocs.org Author: See AUTHORS @@ -59,7 +59,6 @@ Release notes: http://openpyxl.readthedocs.org/en/latest/changes.html Platform: UNKNOWN -Classifier: Development Status :: 4 - Beta Classifier: Development Status :: 5 - Production/Stable Classifier: Operating System :: MacOS :: MacOS X Classifier: Operating System :: Microsoft :: Windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/openpyxl.egg-info/SOURCES.txt new/openpyxl-2.2.1/openpyxl.egg-info/SOURCES.txt --- old/openpyxl-2.2.0/openpyxl.egg-info/SOURCES.txt 2015-03-11 17:14:43.000000000 +0100 +++ new/openpyxl-2.2.1/openpyxl.egg-info/SOURCES.txt 2015-03-31 11:14:50.000000000 +0200 @@ -11,7 +11,6 @@ et_xmfile/xmlfile.py openpyxl/__init__.py openpyxl/conftest.py -openpyxl/profiling.py openpyxl.egg-info/PKG-INFO openpyxl.egg-info/SOURCES.txt openpyxl.egg-info/dependency_links.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openpyxl-2.2.0/setup.py new/openpyxl-2.2.1/setup.py --- old/openpyxl-2.2.0/setup.py 2015-03-11 17:14:11.000000000 +0100 +++ new/openpyxl-2.2.1/setup.py 2015-03-20 16:18:11.000000000 +0100 @@ -72,7 +72,6 @@ 'jdcal', ], classifiers=[ - 'Development Status :: 4 - Beta', 'Development Status :: 5 - Production/Stable', 'Operating System :: MacOS :: MacOS X', 'Operating System :: Microsoft :: Windows',

1 0

commit python3-Django for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package python3-Django for openSUSE:Factory checked in at 2015-04-05 02:03:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-Django (Old) and /work/SRC/openSUSE:Factory/.python3-Django.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-Django" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-Django/python3-Django.changes 2015-01-20 12:32:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-Django.new/python3-Django.changes 2015-04-05 02:04:08.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 3 00:09:16 UTC 2015 - arun(a)gmx.de + +- update to version 1.8: + * long list of changes, please see: https://docs.djangoproject.com/en/1.8/releases/1.8/ + +------------------------------------------------------------------- Old: ---- Django-1.7.3.checksum.txt Django-1.7.3.tar.gz New: ---- Django-1.8.checksum.txt Django-1.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-Django.spec ++++++ --- /var/tmp/diff_new_pack.NJS7cQ/_old 2015-04-05 02:04:09.000000000 +0200 +++ /var/tmp/diff_new_pack.NJS7cQ/_new 2015-04-05 02:04:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-Django # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: python3-Django -Version: 1.7.3 +Version: 1.8 Release: 0 Summary: A high-level Python Web framework License: BSD-3-Clause Group: Development/Languages/Python Url: http://www.djangoproject.com -Source: https://www.djangoproject.com/m/releases/1.7/Django-%{version}.tar.gz +Source: https://www.djangoproject.com/m/releases/1.8/Django-%{version}.tar.gz Source1: https://www.djangoproject.com/m/pgp/Django-%{version}.checksum.txt Source99: python3-Django-rpmlintrc BuildRequires: fdupes ++++++ Django-1.7.3.checksum.txt -> Django-1.8.checksum.txt ++++++ --- /work/SRC/openSUSE:Factory/python3-Django/Django-1.7.3.checksum.txt 2015-01-20 12:32:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-Django.new/Django-1.8.checksum.txt 2015-04-05 02:04:07.000000000 +0200 @@ -2,7 +2,7 @@ Hash: SHA256 This file contains MD5, SHA1, and SHA256 checksums for the source-code -tarball of Django 1.7.3, released January 13, 2015. +tarball and wheel files of Django 1.8, released April 1, 2015. To use this file, you will need a working install of PGP or other compatible public-key encryption software. You will also need to have @@ -17,47 +17,47 @@ gpg --verify <<THIS FILENAME>> -Once you have verified this file, you can use normal MD5, SHA1, or SHA256 +Once you have verified this file, you can use normal MD5, SHA2, or SHA256 checksumming applications to generate the checksums of the Django package and compare them to the checksums listed below. Release packages: ================= -Django 1.7.3 (tar.tgz): https://www.djangoproject.com/m/releases/1.7/Django-1.7.3.tar.gz -Django 1.7.3 (.whl): https://www.djangoproject.com/m/releases/1.7/Django-1.7.3-py2.py3-none-any.… +Django 1.8 (tar.tgz): https://www.djangoproject.com/m/releases/1.8/Django-1.8.tar.gz +Django 1.8 (.whl): https://www.djangoproject.com/m/releases/1.8/Django-1.8-py2.py3-none-any.whl MD5 checksums: ============== -bd24beec81e161d30ad925aef9d23e57 Django-1.7.3-py2.py3-none-any.whl -ea9a3fe7eca2280b233938a98c4a35a0 Django-1.7.3.tar.gz +6f3df764d5826f922eab2d8131c81e60 Django-1.8-py2.py3-none-any.whl +9a811faf67ca0f3e0d43e670a1cc503d Django-1.8.tar.gz SHA1 checksums: =============== -74a977b77880818335cf6ff3ae8d5d28bfadaaf6 Django-1.7.3-py2.py3-none-any.whl -2577e8e40999f5120b091c17e8cabfb518917ca2 Django-1.7.3.tar.gz +0a0610c98b03cebe3048cbcc5a11f5c868ee52d4 Django-1.8-py2.py3-none-any.whl +19f5468e100b5004b020b59d4f457483122b3e45 Django-1.8.tar.gz SHA256 checksums: ================= -72edd47b55ae748d29f1a71d5ca4b86e785c9fb974407cf242b3168e6f1b177e Django-1.7.3-py2.py3-none-any.whl -f226fb8aa438456968d403f6739de1cf2dad128db86f66ee2b41dfebe3645c5b Django-1.7.3.tar.gz +6a03ce2feafdd193a0ba8a26dbd9773e757d2e5d5e7933a62eac129813bd381a Django-1.8-py2.py3-none-any.whl +066bad42cb4c66944e7efcf7304d3d17f7b0eb222e53958cdd866420d2e8b412 Django-1.8.tar.gz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iQIbBAEBCAAGBQJUtWTMAAoJEB6Kvcdz7eJSrX0P91/cNLe5oISzWH/viWQpj3C7 -khbTl61sRakbx45mEqhW6GJqNxJwsyZuVDzL8sxXGvyRqRsLE2nd5stM2xHqXxMN -vZJUYeyUCBaH1ozCzhvA4k8mXSX7twy6puYKgk0FcuMbgFepkuqnqep6cryAmgOk -5tcTgxwF/bxUZ7YGa3AdQsIvLU6rGLupDIqMmG+8W94VwKg2+PhOEAv3iB6e1DxA -aOKI/leMbkxF3eG4HnvPTdO80cM63Sp+654Kj9d+Q94nMQY/pAp5q6j9lCxZFwYj -eak/joly9UZwlRMO1HeV8jCzcq/7xDe4OIQR1o2YY1hWK89yA1I1fT4TQTTlbBk3 -lPKrdkSxievYy7Ggs0+3f4534A5g3I05sd/w5R68L6QuXxZt/yZDQzpxkdE+bT4D -ZO0nVc3fZ0qlmTJIohtHjKK6MBcG9igAWz7VYmr/iDeUCdK1Y/b1TN+i4pmth2tX -NJJw9c0bev/A4+Qe1WCRodqd9Ipcs4MLKJMzIho75rhOLfUyC8JQWrISqSNc9PmQ -lj7sITcASQL7T55CdNalB1XRZig/Il0Qhoil7Mwae7/gwqz9IHMlW1VDntfaCdTN -83Nm80mDhgdm0i0lJHbUmlNAAgYT3W0mEyH3+5uep0PNn02ZhTTTPL7wzfZmCs+N -7PWSYlGP8/4JjD65yqw= -=/LA8 +iQIcBAEBCAAGBQJVHExxAAoJEB6Kvcdz7eJSqsYP+gNzf70QPvjjODJ0j7ERTIC9 +CiMpbt7jKhbkj2RQdQEWppWSSdg9R5iReU5KSSVaEwOQGJVHwCH3lGpdkTbZcq86 +e054S1eIGW4qwZQBYcxxqRhEQd9D0u1CvpLLdxsKpn6qveNI2vB0wAKv94jBJk9x +VAq9b4XDZkACmnTZhHOJjgD0PYWDe6SmApkIVdrxA01AFvCOpwsEOm7RZn5V2FoZ +RHyR9scqY7y68P0Dtq5yK7h6hUgVq1PbMqpz5TeVna5jI8w8bPUK5Nu2l+kVKaT3 +kdIT7g5VaILzlN76pu5wf2YBcm0zg5MvSMVJabZ5mxkxj19eu5g9vGt7XjWOnrbI +qw5S3UIrAkFCOxS5Ex8OEq+4VIfTbZBBXGNUljwsXVEUnCvziyr4P4JlTg1fsT1L +uzMZz3rXumvMtwfUkk5a84E5imGKlqKf1PHOJey7UGxqWHy9XCGYpCvvsJcj8/1S +vwHoNKgrHT5JRprqwf5dQaZdAuimsZkVUWmWyMYxIfYIFtdV1u0a42LCndg8tvvo +S+lcKdT+Ln0IvAjerEp+dPcpkOeoagiHzi6pajhufv3C9TcbzAvYLR9O2jUJdNNP +hywKeYQ2KqAIFbm21eRwjFVd88tel5MOLzX4AA5xWoNh5zkBcIY41bk2by9r7Wgh +LqmXTZWWX98OzSGr/666 +=uSLP -----END PGP SIGNATURE----- ++++++ Django-1.7.3.tar.gz -> Django-1.8.tar.gz ++++++ /work/SRC/openSUSE:Factory/python3-Django/Django-1.7.3.tar.gz /work/SRC/openSUSE:Factory/.python3-Django.new/Django-1.8.tar.gz differ: char 5, line 1

1 0

commit python3-Pillow for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package python3-Pillow for openSUSE:Factory checked in at 2015-04-05 02:03:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-Pillow (Old) and /work/SRC/openSUSE:Factory/.python3-Pillow.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-Pillow" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-Pillow/python3-Pillow.changes 2015-01-07 09:38:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-Pillow.new/python3-Pillow.changes 2015-04-05 02:04:06.000000000 +0200 @@ -1,0 +2,32 @@ +Fri Apr 3 00:15:08 UTC 2015 - arun(a)gmx.de + +- update to version 2.8.1: + * Bug fix: Catch struct.error on invalid JPEG, fixes #1163 [wiredfool, hugovk] + +- changes from version 2.8.0: + * Fix 32-bit BMP loading (RGBA or RGBX) [artscoop] + * Fix UnboundLocalError in ImageFile #1131 [davarisg] + * Re-enable test image caching [hugovk, homm] + * Fix: Cannot identify EPS images, fixes #1104 [hugovk] + * Configure setuptools to run nosetests, fixes #729 [aclark4life] + * Style/health fixes [radarhere, hugovk] + * Add support for HTTP response objects to Image.open() [mfitzp] + * Improve reference docs for PIL.ImageDraw.Draw.pieslice() #1145 + [audreyr] + * Added copy method font_variant() and accessible properties to + truetype() #1123 [radarhere] + * Fix ImagingEffectNoise #1128 [hugovk] + * Remove unreachable code [hugovk] + * Let Python do the endian stuff + tests #1121 [amoibos, radarhere] + * Fix webp decode memory leak #1114 [benoit-pierre] + * Fast path for opaque pixels in RGBa unpacker #1088 [bgilbert] + * Enable basic support for 'RGBa' raw encoding/decoding #1096 + [immerrr] + * Fix pickling L mode images with no palette, #1095 [hugovk] + * iPython display hook #1091 [wiredfool] + * Adjust buffer size when quality=keep, fixes #148 (again) + [wiredfool] + * Fix for corrupted bitmaps embedded in truetype fonts. #1072 + [jackyyf, wiredfool] + +------------------------------------------------------------------- Old: ---- Pillow-2.7.0.tar.gz New: ---- Pillow-2.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-Pillow.spec ++++++ --- /var/tmp/diff_new_pack.zoKkcw/_old 2015-04-05 02:04:07.000000000 +0200 +++ /var/tmp/diff_new_pack.zoKkcw/_new 2015-04-05 02:04:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-Pillow # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python3-Pillow -Version: 2.7.0 +Version: 2.8.1 Release: 0 Summary: Python Imaging Library (Fork) License: HPND ++++++ Pillow-2.7.0.tar.gz -> Pillow-2.8.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/python3-Pillow/Pillow-2.7.0.tar.gz /work/SRC/openSUSE:Factory/.python3-Pillow.new/Pillow-2.8.1.tar.gz differ: char 5, line 1

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2015-04-05 02:03:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2015-03-28 18:39:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2015-04-05 02:03:56.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 2 13:01:00 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to Chromium 41.0.2272.118 + Security fixes: + * CVE-2015-1233: A combination of V8, Gamepad and IPC bugs that + can lead to remote code execution outside of + the sandbox + * CVE-2015-1234: Buffer overflow via race condition in GPU + +------------------------------------------------------------------- Old: ---- chromium-41.0.2272.101.tar.xz New: ---- chromium-41.0.2272.118.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.fqlbk8/_old 2015-04-05 02:04:05.000000000 +0200 +++ /var/tmp/diff_new_pack.fqlbk8/_new 2015-04-05 02:04:05.000000000 +0200 @@ -20,7 +20,7 @@ %define chromium_system_libs 0 Name: chromium -Version: 41.0.2272.101 +Version: 41.0.2272.118 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ ++++++ chromium-41.0.2272.101.tar.xz -> chromium-41.0.2272.118.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-41.0.2272.101.tar.xz /work/SRC/openSUSE:Factory/.chromium.new/chromium-41.0.2272.118.tar.xz differ: char 27, line 1

1 0

commit jhbuild for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package jhbuild for openSUSE:Factory checked in at 2015-04-05 02:03:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jhbuild (Old) and /work/SRC/openSUSE:Factory/.jhbuild.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jhbuild" Changes: -------- --- /work/SRC/openSUSE:Factory/jhbuild/jhbuild.changes 2015-03-30 19:11:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jhbuild.new/jhbuild.changes 2015-04-05 02:03:48.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Mar 23 13:14:48 UTC 2015 - dimstar(a)opensuse.org + +- Update to version 3.16.0~20150323: + + world: change gitorious url + + 3.16: Use the 0.28 branch of vala + + 3.16: branch modules + + core-deps-3.16: WebKitGTK+ 2.8.0 + +------------------------------------------------------------------- Old: ---- jhbuild-3.16.0~20150318.tar.xz New: ---- jhbuild-3.16.0~20150323.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jhbuild.spec ++++++ --- /var/tmp/diff_new_pack.aaJCSE/_old 2015-04-05 02:03:49.000000000 +0200 +++ /var/tmp/diff_new_pack.aaJCSE/_new 2015-04-05 02:03:49.000000000 +0200 @@ -18,7 +18,7 @@ %define moduleset 3.16 Name: jhbuild -Version: 3.16.0~20150318 +Version: 3.16.0~20150323 Release: 0 Summary: Tool to build GNOME License: GPL-2.0+ ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.aaJCSE/_old 2015-04-05 02:03:49.000000000 +0200 +++ /var/tmp/diff_new_pack.aaJCSE/_new 2015-04-05 02:03:49.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://git.gnome.org/jhbuild</param> - <param name="changesrevision">ad7513fbf2bddbe5cb9786dbf3e91ec9d9dd9921</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">dce2b13b4c78cf98019daa9b10439b4cf213c1ca</param></service></servicedata> \ No newline at end of file ++++++ jhbuild-3.16.0~20150318.tar.xz -> jhbuild-3.16.0~20150323.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhbuild-3.16.0~20150318/modulesets/gnome-apps-3.16.modules new/jhbuild-3.16.0~20150323/modulesets/gnome-apps-3.16.modules --- old/jhbuild-3.16.0~20150318/modulesets/gnome-apps-3.16.modules 2015-03-18 22:29:33.000000000 +0100 +++ new/jhbuild-3.16.0~20150323/modulesets/gnome-apps-3.16.modules 2015-03-23 14:14:47.000000000 +0100 @@ -58,7 +58,7 @@ </autotools> <autotools id="bijiben"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="appstream-glib"/> <dep package="tracker"/> @@ -340,7 +340,7 @@ </autotools> <autotools id="gdl"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="intltool"/> <dep package="librsvg"/> @@ -417,7 +417,7 @@ </autotools> <autotools id="gnome-documents"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="evince"/> <dep package="gjs"/> @@ -538,7 +538,7 @@  <autotools id="anjuta"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="intltool"/> <dep package="glib"/> @@ -582,7 +582,7 @@ </autotools> <autotools id="evolution" autogenargs="--disable-autoar --disable-libcryptui --disable-pst-import"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="atk"/> <dep package="bogofilter"/> @@ -856,7 +856,7 @@ </autotools> <autotools id="gnome-nibbles"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="appstream-glib"/> <dep package="intltool"/> @@ -907,7 +907,7 @@ </autotools> <autotools id="gnome-photos"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="gegl"/> <dep package="cairo"/> @@ -939,7 +939,7 @@ </autotools> <autotools id="gnome-sudoku"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="appstream-glib"/> <dep package="c++"/> @@ -1122,7 +1122,7 @@ </autotools> <autotools id="orca"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="gtk+"/> <dep package="at-spi2-atk"/>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhbuild-3.16.0~20150318/modulesets/gnome-suites-core-3.16.modules new/jhbuild-3.16.0~20150323/modulesets/gnome-suites-core-3.16.modules --- old/jhbuild-3.16.0~20150318/modulesets/gnome-suites-core-3.16.modules 2015-03-18 22:29:33.000000000 +0100 +++ new/jhbuild-3.16.0~20150323/modulesets/gnome-suites-core-3.16.modules 2015-03-23 14:14:47.000000000 +0100 @@ -70,7 +70,7 @@ <if condition-set="freebsd"> <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/> </if> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="intltool"/> <dep package="libsoup"/> @@ -106,7 +106,7 @@ </autotools> <autotools id="gnome-online-accounts"> - <branch/> + <branch revision="gnome-3-16"/> <dependencies> <dep package="gtk+"/> <dep package="WebKit"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhbuild-3.16.0~20150318/modulesets/gnome-suites-core-deps-3.16.modules new/jhbuild-3.16.0~20150323/modulesets/gnome-suites-core-deps-3.16.modules --- old/jhbuild-3.16.0~20150318/modulesets/gnome-suites-core-deps-3.16.modules 2015-03-18 22:29:33.000000000 +0100 +++ new/jhbuild-3.16.0~20150323/modulesets/gnome-suites-core-deps-3.16.modules 2015-03-23 14:14:47.000000000 +0100 @@ -1189,7 +1189,7 @@ <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no"> <pkg-config>libvala-0.28.pc</pkg-config> - <branch/> + <branch revision="0.28"/> <dependencies> <dep package="glib"/> </dependencies> @@ -1297,9 +1297,9 @@ <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release"> <pkg-config>webkit2gtk-4.0.pc</pkg-config> <branch repo="webkitgtk.org" - module="webkitgtk-2.7.92.tar.xz" version="2.7.92" - hash="sha256:5bc7b2737f5372ca82136d3b349d08d2b6bcbc5841d7a6888f10302e6e36bb10" - size="10431452"> + module="webkitgtk-2.8.0.tar.xz" version="2.8.0" + hash="sha256:05fad239f5f035b0a3628bb7bc1536d916f772fc9ff95de22e3cec1af2ac6815" + size="10431576"> </branch> <dependencies> <dep package="c++"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhbuild-3.16.0~20150318/modulesets/gnome-world.modules new/jhbuild-3.16.0~20150323/modulesets/gnome-world.modules --- old/jhbuild-3.16.0~20150318/modulesets/gnome-world.modules 2015-03-18 22:29:33.000000000 +0100 +++ new/jhbuild-3.16.0~20150323/modulesets/gnome-world.modules 2015-03-23 14:14:47.000000000 +0100 @@ -78,7 +78,7 @@ <repository type="git" name="git.ardour.org" href="git://git.ardour.org/"/> <repository type="git" name="gitorious.org" - href="git://gitorious.org/"/> + href="https://gitorious.org/"/> <repository type="tarball" name="samba.org" href="https://ftp.samba.org/pub/"/> <repository type="tarball" name="sourceforge.net" @@ -544,7 +544,7 @@ </autotools> <autotools id="gstreamer-vaapi"> - <branch repo="gitorious.org" module="vaapi/gstreamer-vaapi"/> + <branch repo="gitorious.org" module="vaapi/gstreamer-vaapi.git"/> <dependencies> <dep package="gstreamer"/> <dep package="gst-plugins-base"/> @@ -1304,7 +1304,7 @@ </autotools> <autotools id="rhythmbox-gupnp" autogenargs="--with-rhythmbox=../rhythmbox"> - <branch repo="gitorious.org" module="gupnp/rhythmbox-gupnp"/> + <branch repo="gitorious.org" module="gupnp/rhythmbox-gupnp.git"/> <dependencies> <dep package="rhythmbox"/> <dep package="gupnp-av"/>

1 0

commit emacs-vm for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package emacs-vm for openSUSE:Factory checked in at 2015-04-05 02:03:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs-vm (Old) and /work/SRC/openSUSE:Factory/.emacs-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "emacs-vm" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs-vm/emacs-vm.changes 2013-10-25 12:59:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs-vm.new/emacs-vm.changes 2015-04-05 02:03:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 11 12:47:08 UTC 2015 - dimstar(a)opensuse.org + +- Use makeinfo --force to ignore the errors in vm.texinfo. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs-vm.spec ++++++ --- /var/tmp/diff_new_pack.8KSE9J/_old 2015-04-05 02:03:47.000000000 +0200 +++ /var/tmp/diff_new_pack.8KSE9J/_new 2015-04-05 02:03:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package emacs-vm # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,7 +62,7 @@ emacs_ver=$(rpm -q --qf '%{VERSION}' emacs) rm -rf lisp/*.elc %configure FLAGS="-batch -q -no-site-file -no-init-file -l \$(srcdir)/vm-build.el" --with-etcdir=%{_vmetcdir} --with-docdir=%{_vmdocdir} -make DESTDIR=${RPM_BUILD_ROOT} +make DESTDIR=${RPM_BUILD_ROOT} MAKEINFO="makeinfo --force" %install mkdir -p ${RPM_BUILD_ROOT}

1 0

commit ghostscript for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package ghostscript for openSUSE:Factory checked in at 2015-04-05 02:03:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghostscript (Old) and /work/SRC/openSUSE:Factory/.ghostscript.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghostscript" Changes: -------- --- /work/SRC/openSUSE:Factory/ghostscript/ghostscript-mini.changes 2014-10-01 07:40:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghostscript.new/ghostscript-mini.changes 2015-04-05 02:03:38.000000000 +0200 @@ -1,0 +2,36 @@ +Tue Mar 31 10:18:06 CEST 2015 - jsmeix(a)suse.de + +- Version upgrade to 9.16. Primarily a maintenance release. + There are no recorded incompatible changes (as of this writing). + Highlights in this release include: + * "LockColorants" command line option for tiffsep and psdcmyk + devices. + * Improved high level devices handling of Forms. + See http://www.ghostscript.com/doc/9.16/News.htm + For details see the News.htm and History9.htm files. +- fix.including.pread.pwrite.pthread_mutexattr_settype.diff + is no longer needed because it is fixed in the upstream sources. + +------------------------------------------------------------------- +Wed Mar 25 12:38:16 CET 2015 - jsmeix(a)suse.de + +- fix.including.pread.pwrite.pthread_mutexattr_settype.diff + fixes on SLE11 implicit declaration of function warnings + for 'pread' 'pwrite' 'pthread_mutexattr_settype' see + http://bugs.ghostscript.com/show_bug.cgi?id=695882 +- ppc64le-support.patch is a remainder of the previous patch + now the hunk for LCMS (lcms/include/lcms.h) is removed + because LCMS 1.x is removed since Ghostscript 9.16 + but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed + see http://bugs.ghostscript.com/show_bug.cgi?id=695544 + +------------------------------------------------------------------- +Fri Mar 20 17:12:34 CET 2015 - jsmeix(a)suse.de + +- Version upgrade to 9.16rc2 (second release candidate for 9.16). + For details see the News.htm and History9.htm files. + Regarding installing packages (in particular release candidates) + from the openSUSE build service development project "Printing" + see https://build.opensuse.org/project/show/Printing + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/ghostscript/ghostscript.changes 2014-10-01 07:40:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghostscript.new/ghostscript.changes 2015-04-05 02:03:38.000000000 +0200 @@ -1,0 +2,42 @@ +Tue Mar 31 10:18:06 CEST 2015 - jsmeix(a)suse.de + +- Version upgrade to 9.16. Primarily a maintenance release. + There are no recorded incompatible changes (as of this writing). + Highlights in this release include: + * "LockColorants" command line option for tiffsep and psdcmyk + devices. + * Improved high level devices handling of Forms. + See http://www.ghostscript.com/doc/9.16/News.htm + For details see the News.htm and History9.htm files. +- fix.including.pread.pwrite.pthread_mutexattr_settype.diff + is no longer needed because it is fixed in the upstream sources. + +------------------------------------------------------------------- +Wed Mar 25 12:38:16 CET 2015 - jsmeix(a)suse.de + +- fix.including.pread.pwrite.pthread_mutexattr_settype.diff + fixes on SLE11 implicit declaration of function warnings + for 'pread' 'pwrite' 'pthread_mutexattr_settype' see + http://bugs.ghostscript.com/show_bug.cgi?id=695882 +- ppc64le-support.patch is a remainder of the previous patch + now the hunk for LCMS (lcms/include/lcms.h) is removed + because LCMS 1.x is removed since Ghostscript 9.16 + but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed + see http://bugs.ghostscript.com/show_bug.cgi?id=695544 + +------------------------------------------------------------------- +Fri Mar 20 17:12:34 CET 2015 - jsmeix(a)suse.de + +- Version upgrade to 9.16rc2 (second release candidate for 9.16). + For details see the News.htm and History9.htm files. + Regarding installing packages (in particular release candidates) + from the openSUSE build service development project "Printing" + see https://build.opensuse.org/project/show/Printing + +------------------------------------------------------------------- +Fri Mar 20 10:52:47 CET 2015 - jsmeix(a)suse.de + +- For SLE12 build it with traditional CUPS 1.5.4 to ensure + it works on SLE12 both with CUPS 1.7.5 and CUPS 1.5.4. + +------------------------------------------------------------------- Old: ---- ghostscript-9.15.tar.gz New: ---- ghostscript-9.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.84Py4S/_old 2015-04-05 02:03:40.000000000 +0200 +++ /var/tmp/diff_new_pack.84Py4S/_new 2015-04-05 02:03:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghostscript-mini # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,30 +35,31 @@ # But only with the alphabetic prefix "9.pre15rc1" would be older than the previous version number "9.14" # because rpmvercmp would treat 9.pre15rc1 as 9.pre.15.rc1 and letters are older than numbers # so that we keep additionally the previous version number to upgrade from the previous version: -#Version: 9.14pre15rc2 +#Version: 9.15pre16rc2 # Normal version for Ghostscript releases is the upstream version: -Version: 9.15 +Version: 9.16 Release: 0 # tarball_version is used below to specify the directory via "setup -n": # Special tarball_version needed for Ghostscript release candidates e.g. "define tarball_version 9.15rc1". # For Ghostscript releases tarball_version and version are the same (i.e. the upstream version): %define tarball_version %{version} -#define tarball_version 9.15rc2 +#define tarball_version 9.16rc2 # built_version is used below in the install and files sections: # Separated built_version needed in case of Ghostscript release candidates e.g. "define built_version 9.15". # For Ghostscript releases built_version and version are the same (i.e. the upstream version): %define built_version %{version} -#define built_version 9.15 +#define built_version 9.16 # Source0...Source9 is for sources from upstream: # Special URLs for Ghostscript release candidates: -# URL for Source0: http://www.ghostscript.com/~chrisl/ghostscript-9.15rc2.tar.gz +# URL for Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16… # URL for MD5 checksums: http://www.ghostscript.com/~chrisl/MD5SUMS or http://www.ghostscript.com/~chrisl/MD5SUM -# MD5 checksum for Source0: 20bffacff52552aa1c430fe64403fb68 -#Source0: http://www.ghostscript.com/~chrisl/ghostscript-9.15rc2.tar.gz +# or http://downloads.ghostscript.com/public/.release_candidate/MD5SUMS +# MD5 checksum for Source0: 17983ee93d97596ffa72fd32be2426a4 +#Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16… # Normal URLs for Ghostscript releases: -# URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.15.tar.gz +# URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.16.tar.gz # URL for MD5 checksums: http://downloads.ghostscript.com/public/MD5SUMS -# MD5 checksum for Source0: 5a78ab0990ff6ec3a103576bc8777c46 +# MD5 checksum for Source0: 829319325bbdb83f5c81379a8f86f38f Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.tar.gz # Patch0...Patch9 is for patches from upstream: # @@ -66,7 +67,9 @@ # # Patch10...Patch99 is for patches from SUSE which are intended for upstream: # Patch11 ppc64le-support.patch is a remainder of the previous patch -# lcms2 has been fixed upstream not working and lcms has not been fixed +# now the hunk for LCMS (lcms/include/lcms.h) is removed +# because LCMS 1.x is removed since Ghostscript 9.16 +# but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed # see http://bugs.ghostscript.com/show_bug.cgi?id=695544 Patch11: ppc64le-support.patch # @@ -142,7 +145,9 @@ # use a directory name matching Source0 to make it work also for ghostscript-mini: %setup -q -n ghostscript-%{tarball_version} # Patch11 ppc64le-support.patch is a remainder of the previous patch -# lcms2 has been fixed upstream not working and lcms has not been fixed +# now the hunk for LCMS (lcms/include/lcms.h) is removed +# because LCMS 1.x is removed since Ghostscript 9.16 +# but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed # see http://bugs.ghostscript.com/show_bug.cgi?id=695544 %patch11 -p1 @@ -152,7 +157,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" autoreconf -fi # --docdir=%%{_defaultdocdir}/%%{name} does not work therefore it is not used. -# --disable-cups and --without-pdftoraster and --without-install-cups +# --disable-cups and --without-pdftoraster # to have nothing related to CUPS in the minimal Ghostscript. # --disable-dbus to have nothing related to D-Bus in the minimal Ghostscript. # --without-ijs to disable IJS printer driver support in the minimal Ghostscript. @@ -160,10 +165,12 @@ # but no printer drivers in the minimal Ghostscript. # --without-x to not use the X Window System. # --without-omni to disable the outdated and unmaintained omni driver. -# --without-jasper and --enable-openjpeg because since Ghostscript 9.05 JasPer is deprecated +# --enable-openjpeg because since Ghostscript 9.05 JasPer is deprecated +# (--without-jasper is now an unrecognized option by configure) # and Ghostscript now ships modified OpenJPEG sources for JPEG2000 decoding -# (replacing JasPer - although JasPer is still included for this release). +# (replacing JasPer - although JasPer is still included for this release) # Performance, reliability and memory use whilst decoding JPX streams are all improved. +# see also http://bugs.ghostscript.com/show_bug.cgi?id=691430 # --without-ufst and --without-luratech because those are relevant to commercial releases only # which would require a commercial license. # --without-libpaper disables libpaper support because SUSE does not have libpaper. @@ -180,14 +187,12 @@ --with-libiconv=maybe \ --enable-freetype \ --with-jbig2dec \ - --without-jasper \ --enable-openjpeg \ --enable-dynamic \ --without-ijs \ --disable-cups \ --disable-dbus \ --without-pdftoraster \ - --without-install-cups \ --with-drivers=FILES \ --without-x \ --disable-gtk \ @@ -240,11 +245,16 @@ ln -s ../../ghostscript/%{built_version}/doc ghostscript popd # Extract the catalog of devices which are actually built-in in exactly this Ghostscript: +# If a needed source file is no longer accessible fail intentionally as notification +# that something changed which needs adaptions here: +for F in devices/devs.mak devices/contrib.mak contrib/contrib.mak +do test -r $F || exit 99 +done # Do not pollute the build log file with zillions of meaningless messages: set +x cat /dev/null >catalog.devices for D in $( %{buildroot}/usr/bin/gs -h | sed -n -e '/^Available devices:/,/^Search path:/p' | egrep -v '^Available devices:|^Search path:' ) -do for F in base/devs.mak base/contrib.mak contrib/contrib.mak +do for F in devices/devs.mak devices/contrib.mak contrib/contrib.mak do sed -n -e '/ Catalog /,/ End of catalog /p' $F | grep "[[:space:]]$D[[:space:]]" | grep -o '[[:alnum:]].*' | tr -s '[:blank:]' ' ' | sed -e 's/ /\t/' | expand -t16 >>catalog.devices done done ++++++ ghostscript.spec ++++++ --- /var/tmp/diff_new_pack.84Py4S/_old 2015-04-05 02:03:40.000000000 +0200 +++ /var/tmp/diff_new_pack.84Py4S/_new 2015-04-05 02:03:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghostscript # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,21 @@ Name: ghostscript +# SLE12 needs special BuildRequires. +# For suse_version values see https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto +%if 0%{?suse_version} == 1315 +# For SLE12 by default CUPS 1.7.5 is provided and alternatively CUPS 1.5.4 is provided in the "legacy" module. +# For SLE12 build it with traditional CUPS 1.5.4 to ensure it works on SLE12 both with CUPS 1.7.5 and CUPS 1.5.4 +# because libcups and libcupsimage in CUPS 1.7.5 are backward compatible with CUPS 1.5.4 so that applications +# that have been built with CUPS 1.5.4 also work under CUPS 1.7.5 but the libraries in CUPS 1.7.5 provide +# some additional functions so that applications that have been built with CUPS 1.7.5 and use those +# additional functions would not work under CUPS 1.7.5. +# Only in the Printing project for SLE12 use cups154-ddk (a sub package of the cups154-SLE12 source package): +BuildRequires: cups154-devel +%else +# Anything what is not SLE12 (i.e. SLE11 and all openSUSE versions) have "normal" BuildRequires: BuildRequires: cups-devel +%endif # dbus-1-devel is needed for "configure --enable-dbus" (see below): BuildRequires: dbus-1-devel BuildRequires: freetype2-devel @@ -41,30 +55,31 @@ # But only with the alphabetic prefix "9.pre15rc1" would be older than the previous version number "9.14" # because rpmvercmp would treat 9.pre15rc1 as 9.pre.15.rc1 and letters are older than numbers # so that we keep additionally the previous version number to upgrade from the previous version: -#Version: 9.14pre15rc2 +#Version: 9.15pre16rc2 # Normal version for Ghostscript releases is the upstream version: -Version: 9.15 +Version: 9.16 Release: 0 # tarball_version is used below to specify the directory via "setup -n": # Special tarball_version needed for Ghostscript release candidates e.g. "define tarball_version 9.15rc1". # For Ghostscript releases tarball_version and version are the same (i.e. the upstream version): %define tarball_version %{version} -#define tarball_version 9.15rc2 +#define tarball_version 9.16rc2 # built_version is used below in the install and files sections: # Separated built_version needed in case of Ghostscript release candidates e.g. "define built_version 9.15". # For Ghostscript releases built_version and version are the same (i.e. the upstream version): %define built_version %{version} -#define built_version 9.15 +#define built_version 9.16 # Source0...Source9 is for sources from upstream: # Special URLs for Ghostscript release candidates: -# URL for Source0: http://www.ghostscript.com/~chrisl/ghostscript-9.15rc2.tar.gz +# URL for Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16… # URL for MD5 checksums: http://www.ghostscript.com/~chrisl/MD5SUMS or http://www.ghostscript.com/~chrisl/MD5SUM -# MD5 checksum for Source0: 20bffacff52552aa1c430fe64403fb68 -#Source0: http://www.ghostscript.com/~chrisl/ghostscript-9.15rc2.tar.gz +# or http://downloads.ghostscript.com/public/.release_candidate/MD5SUMS +# MD5 checksum for Source0: 17983ee93d97596ffa72fd32be2426a4 +#Source0: http://downloads.ghostscript.com/public/.release_candidate/ghostscript-9.16… # Normal URLs for Ghostscript releases: -# URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.15.tar.gz +# URL for Source0: http://downloads.ghostscript.com/public/ghostscript-9.16.tar.gz # URL for MD5 checksums: http://downloads.ghostscript.com/public/MD5SUMS -# MD5 checksum for Source0: 5a78ab0990ff6ec3a103576bc8777c46 +# MD5 checksum for Source0: 829319325bbdb83f5c81379a8f86f38f Source0: http://downloads.ghostscript.com/public/ghostscript-%{version}.tar.gz # Patch0...Patch9 is for patches from upstream: # @@ -72,7 +87,9 @@ # # Patch10...Patch99 is for patches from SUSE which are intended for upstream: # Patch11 ppc64le-support.patch is a remainder of the previous patch -# lcms2 has been fixed upstream not working and lcms has not been fixed +# now the hunk for LCMS (lcms/include/lcms.h) is removed +# because LCMS 1.x is removed since Ghostscript 9.16 +# but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed # see http://bugs.ghostscript.com/show_bug.cgi?id=695544 Patch11: ppc64le-support.patch # @@ -265,7 +282,9 @@ # use a directory name matching Source0 to make it work also for ghostscript-mini: %setup -q -n ghostscript-%{tarball_version} # Patch11 ppc64le-support.patch is a remainder of the previous patch -# lcms2 has been fixed upstream not working and lcms has not been fixed +# now the hunk for LCMS (lcms/include/lcms.h) is removed +# because LCMS 1.x is removed since Ghostscript 9.16 +# but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed # see http://bugs.ghostscript.com/show_bug.cgi?id=695544 %patch11 -p1 @@ -275,19 +294,22 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" autoreconf -fi # --docdir=%%{_defaultdocdir}/%%{name} does not work therefore it is not used. -# --enable-cups and --with-pdftoraster and --with-install-cups -# (--with-install-cups is new since version 9.04) -# to make and install cups/filter/gstoraster and cups/filter/gstopxl -# and related files (gstoraster.convs pxlcolor.ppd pxlmono.ppd). -# --enable-dbus to have colord support in gstoraster, see cups/colord.c (colord is accessed via D-Bus). +# --enable-cups but no longer --with-pdftoraster --enable-dbus --with-install-cups because +# --with-install-cups was introduced in version 9.04 but meanwhile it is an unrecognized option by configure +# because cups/filter/gstoraster and cups/filter/gstopxl and related files gstoraster.convs pxlcolor.ppd pxlmono.ppd +# are no longer provided by Ghostscript but were moved to the cups-filters package. +# also pdftoraster is provided by cups-filters and there is colord support that +# would need --enable-dbus because colord is accessed via D-Bus. # --with-ijs to enable IJS printer driver support (in particular needed by HPIJS). # --with-drivers=ALL to all file format drivers and all printer drivers. # --with-x to use the X Window System. # --without-omni to disable the outdated and unmaintained omni driver. -# --without-jasper and --enable-openjpeg because since Ghostscript 9.05 JasPer is deprecated +# --enable-openjpeg because since Ghostscript 9.05 JasPer is deprecated +# (--without-jasper is now an unrecognized option by configure) # and Ghostscript now ships modified OpenJPEG sources for JPEG2000 decoding -# (replacing JasPer - although JasPer is still included for this release). +# (replacing JasPer - although JasPer is still included for this release) # Performance, reliability and memory use whilst decoding JPX streams are all improved. +# see also http://bugs.ghostscript.com/show_bug.cgi?id=691430 # --without-ufst and --without-luratech because those are relevant to commercial releases only # which would require a commercial license. # --without-libpaper disables libpaper support because SUSE does not have libpaper. @@ -304,14 +326,10 @@ --with-libiconv=maybe \ --enable-freetype \ --with-jbig2dec \ - --without-jasper \ --enable-openjpeg \ --enable-dynamic \ --with-ijs \ --enable-cups \ - --enable-dbus \ - --with-pdftoraster \ - --with-install-cups \ --with-drivers=ALL \ --with-x \ --disable-gtk \ @@ -364,11 +382,16 @@ ln -s ../../ghostscript/%{built_version}/doc ghostscript popd # Extract the catalog of devices which are actually built-in in exactly this Ghostscript: +# If a needed source file is no longer accessible fail intentionally as notification +# that something changed which needs adaptions here: +for F in devices/devs.mak devices/contrib.mak contrib/contrib.mak +do test -r $F || exit 99 +done # Do not pollute the build log file with zillions of meaningless messages: set +x cat /dev/null >catalog.devices for D in $( %{buildroot}/usr/bin/gs -h | sed -n -e '/^Available devices:/,/^Search path:/p' | egrep -v '^Available devices:|^Search path:' ) -do for F in base/devs.mak base/contrib.mak contrib/contrib.mak +do for F in devices/devs.mak devices/contrib.mak contrib/contrib.mak do sed -n -e '/ Catalog /,/ End of catalog /p' $F | grep "[[:space:]]$D[[:space:]]" | grep -o '[[:alnum:]].*' | tr -s '[:blank:]' ' ' | sed -e 's/ /\t/' | expand -t16 >>catalog.devices done done ++++++ ghostscript-9.15.tar.gz -> ghostscript-9.16.tar.gz ++++++ /work/SRC/openSUSE:Factory/ghostscript/ghostscript-9.15.tar.gz /work/SRC/openSUSE:Factory/.ghostscript.new/ghostscript-9.16.tar.gz differ: char 5, line 1 ++++++ ppc64le-support.patch ++++++ --- /var/tmp/diff_new_pack.84Py4S/_old 2015-04-05 02:03:40.000000000 +0200 +++ /var/tmp/diff_new_pack.84Py4S/_new 2015-04-05 02:03:40.000000000 +0200 @@ -1,21 +1,3 @@ ---- ghostscript-9.15/lcms/include/lcms.h -+++ ghostscript-9.15/lcms/include/lcms.h -@@ -140,11 +140,15 @@ - #endif - - #if defined(__sgi__) || defined(__sgi) || defined(__powerpc__) || defined(sparc) || defined(__ppc__) || defined(__s390__) || defined(__s390x__) -+# ifndef __LITTLE_ENDIAN__ - # define USE_BIG_ENDIAN 1 -+# endif - #endif - - #if TARGET_CPU_PPC -+# ifndef __LITTLE_ENDIAN__ - # define USE_BIG_ENDIAN 1 -+# endif - #endif - - #if macintosh --- ghostscript-9.15/lcms2/include/lcms2.h +++ ghostscript-9.15/lcms2/include/lcms2.h @@ -67,6 +67,7 @@

1 0

commit yast2-pkg-bindings for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2015-04-05 02:03:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-pkg-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2015-03-09 10:02:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2015-04-05 02:03:30.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Mar 31 11:39:34 UTC 2015 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties(): "version" value contains a full + edition (in form "[epoch:]version[-release]"), additionaly return + also "version_epoch", "version_version" and "version_release" + with the parts of the edition (needed for FATE#318505) +- 3.1.23 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-3.1.22.tar.bz2 New: ---- yast2-pkg-bindings-3.1.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.ak43nB/_old 2015-04-05 02:03:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ak43nB/_new 2015-04-05 02:03:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.ak43nB/_old 2015-04-05 02:03:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ak43nB/_new 2015-04-05 02:03:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-3.1.22.tar.bz2 -> yast2-pkg-bindings-3.1.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.22/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-3.1.23/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-3.1.22/package/yast2-pkg-bindings-devel-doc.spec 2015-03-04 16:50:11.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.23/package/yast2-pkg-bindings-devel-doc.spec 2015-03-31 14:15:09.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc -Version: 3.1.22 +Version: 3.1.23 Release: 0 License: GPL-2.0 Group: Documentation/HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.22/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-3.1.23/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-3.1.22/package/yast2-pkg-bindings.changes 2015-03-04 16:50:11.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.23/package/yast2-pkg-bindings.changes 2015-03-31 14:15:09.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Mar 31 11:39:34 UTC 2015 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties(): "version" value contains a full + edition (in form "[epoch:]version[-release]"), additionaly return + also "version_epoch", "version_version" and "version_release" + with the parts of the edition (needed for FATE#318505) +- 3.1.23 + +------------------------------------------------------------------- Wed Mar 4 15:33:21 UTC 2015 - lslezak(a)suse.cz - removed obsolete patch callbacks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.22/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-3.1.23/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-3.1.22/package/yast2-pkg-bindings.spec 2015-03-04 16:50:11.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.23/package/yast2-pkg-bindings.spec 2015-03-31 14:15:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.22/src/Resolvable_Properties.cc new/yast2-pkg-bindings-3.1.23/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-3.1.22/src/Resolvable_Properties.cc 2015-03-04 16:50:11.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.23/src/Resolvable_Properties.cc 2015-03-31 14:15:10.000000000 +0200 @@ -60,7 +60,9 @@ @param kind_r kind of resolvable, can be `product, `patch, `package, `pattern or `language @param version version of the resolvable, if empty all versions are returned - @return list<map<string,any>> list of $[ "name":string, "version":string, "arch":string, "source":integer, "status":symbol, "locked":boolean, "on_system_by_user":boolean ] maps + @return list<map<string,any>> list of $[ "name":string, "version":string, + "version_epoch":integer (nil if not defined), "version_version":string, "version_release":string, + "arch":string, "source":integer, "status":symbol, "locked":boolean, "on_system_by_user":boolean ] maps status is `installed, `removed, `selected or `available, source is source ID or -1 if the resolvable is installed in the target if status is `available and locked is true then the object is set to taboo, if status is `installed and locked is true then the object locked @@ -69,9 +71,12 @@ on_system_by_user shows if the resolvable has been installed by user(USER,APPL_HIGH,APPL_LOW) or due solved dependencies. This information comes from the solver which cannot distinguis between the state USER,APPL_HIGH and APPL_LOW. + "version" value contains edition with all components in form "[epoch:]version[-release]", + "version_epoch", "version_version" and "version_release" values contain the parts of the edition. + Additionally to keys returned for all resolvables, there also some resolvable-specific ones: - + `product keys: + "category" + "display_name" @@ -127,7 +132,7 @@ + "code" + "packages" + "requested" - + If dependencies are requested, this keys are additionally used: + "provides" + "prerequires" @@ -184,7 +189,17 @@ YCPMap info; info->add(YCPString("name"), YCPString(item->name())); + // complete edition: [epoch:]version[-release] info->add(YCPString("version"), YCPString(item->edition().asString())); + + // parts of the edition + if (item->edition().epoch() == zypp::Edition::noepoch) + info->add(YCPString("version_epoch"), YCPVoid()); + else + info->add(YCPString("version_epoch"), YCPInteger(item->edition().epoch())); + info->add(YCPString("version_version"), YCPString(item->edition().version())); + info->add(YCPString("version_release"), YCPString(item->edition().release())); + info->add(YCPString("arch"), YCPString(item->arch().asString())); info->add(YCPString("description"), YCPString(item->description()));

1 0

commit psmisc for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package psmisc for openSUSE:Factory checked in at 2015-04-05 02:03:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psmisc (Old) and /work/SRC/openSUSE:Factory/.psmisc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "psmisc" Changes: -------- --- /work/SRC/openSUSE:Factory/psmisc/psmisc.changes 2014-04-26 09:58:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc.changes 2015-04-05 02:03:25.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 24 11:58:08 UTC 2015 - werner(a)suse.de + +- Add patch psmisc-22.21-boo908063.patch to avoid to close files + which are never open (boo#908063) + +------------------------------------------------------------------- New: ---- psmisc-22.21-boo908063.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psmisc.spec ++++++ --- /var/tmp/diff_new_pack.uIqO50/_old 2015-04-05 02:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.uIqO50/_new 2015-04-05 02:03:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package psmisc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ Patch0: %name-22.21.dif Patch1: %name-22.12-tigetstr.patch Patch2: %name-22.21-pstree.patch +# PATCH-FIX-SUSE boo#boo908063 -- partly upstream already +Patch3: %name-22.21-boo908063.patch Patch42: %{name}-22.21-upstream.patch # PATCH-FIX-UPSTREAM psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch bnc#874983 Patch43: %{name}-git-3638cc55b4d08851faba46635d737b24d016665b.patch @@ -55,6 +57,7 @@ %patch42 -p0 -b .up %patch1 -p0 -b .tigetstr %patch2 -p0 -b .pstree +%patch3 -p0 -b .thread %patch0 -p0 -b .0 %patch43 -p1 -b .fuserfix ++++++ psmisc-22.21-boo908063.patch ++++++ --- src/pstree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- src/pstree.c +++ src/pstree.c 2015-03-24 11:49:59.221518469 +0000 @@ -826,6 +826,7 @@ static char* get_threadname(const pid_t if (! (threadname = malloc(COMM_LEN + 2 + 1))) { exit(2); } + *threadname = '\0'; if (snprintf(path, PATH_MAX, "%s/%d/task/%d/stat", PROC_BASE, pid, tid) < 0) perror("get_threadname: asprintf"); if ( (file = fopen(path, "r")) != NULL) { @@ -839,10 +840,10 @@ static char* get_threadname(const pid_t return threadname; } } + fclose(file); } /* Fall back to old method */ sprintf(threadname, "{%.*s}", COMM_LEN, comm); - fclose(file); return threadname; }

1 0

commit xf86-input-evdev for openSUSE:Factory
by root＠hilbert.suse.de 05 Apr '15

05 Apr '15

Hello community, here is the log from the commit of package xf86-input-evdev for openSUSE:Factory checked in at 2015-04-05 02:03:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-evdev (Old) and /work/SRC/openSUSE:Factory/.xf86-input-evdev.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-input-evdev" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-evdev/xf86-input-evdev.changes 2014-12-17 19:18:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-input-evdev.new/xf86-input-evdev.changes 2015-04-05 02:03:19.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Mar 31 09:03:48 UTC 2015 - sndirsch(a)suse.com + +- Update to version 2.9.2 + * Two fixes in this release, one to support Android MT devices, + one to avoid an array index overflow. + +------------------------------------------------------------------- Old: ---- xf86-input-evdev-2.9.1.tar.bz2 New: ---- xf86-input-evdev-2.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-evdev.spec ++++++ --- /var/tmp/diff_new_pack.yukB7l/_old 2015-04-05 02:03:20.000000000 +0200 +++ /var/tmp/diff_new_pack.yukB7l/_new 2015-04-05 02:03:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-input-evdev # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xf86-input-evdev -Version: 2.9.1 +Version: 2.9.2 Release: 0 Summary: Generic Linux input driver for the Xorg X server License: MIT ++++++ xf86-input-evdev-2.9.1.tar.bz2 -> xf86-input-evdev-2.9.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/ChangeLog new/xf86-input-evdev-2.9.2/ChangeLog --- old/xf86-input-evdev-2.9.1/ChangeLog 2014-11-26 00:39:48.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/ChangeLog 2015-03-27 02:38:42.000000000 +0100 @@ -1,3 +1,37 @@ +commit 24368d8379cc47693dd1623168a6125faff57311 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri Mar 27 11:37:03 2015 +1000 + + evdev 2.9.2 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 4996694cc9b80ffef28289ea491965b16615f2d1 +Author: Tobias Himmer <provisorisch(a)online.de> +Date: Fri Jan 23 02:13:17 2015 +0100 + + Check for incoming MT slot indices exceeding the allocated number of slots. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88715 + + Signed-off-by: Tobias Himmer <provisorisch(a)online.de> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit abc4a8b60387c3c9ae8b0199bf61acede4f6dba2) + +commit 05f7057ad5716ccf643b80f2f5fbfff34783a950 +Author: Colin B. Macdonald <macdonald(a)maths.ox.ac.uk> +Date: Thu Jun 26 12:17:59 2014 +0100 + + Workaround lack of ABS_X on MT devices (#80470) + + Often on Android, we have ABS_MT_POSITION_X without ABS_X (which is contrary + to spec). We add fake ABS_X axis in that case. + + X.Org Bug 80470 <http://bugs.freedesktop.org/show_bug.cgi?id=80470> + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit b370ccdff8f721de75d3d91486cc4807668d040c) + commit cb3b023783fe73d9bbb7c9c6ba6c73048b8303ef Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Wed Nov 26 09:23:39 2014 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/Makefile.in new/xf86-input-evdev-2.9.2/Makefile.in --- old/xf86-input-evdev-2.9.1/Makefile.in 2014-11-26 00:33:59.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/Makefile.in 2015-03-27 02:36:54.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,17 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,15 +109,12 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/xorg-evdev.pc.in COPYING \ - ChangeLog INSTALL README compile config.guess config.sub \ - depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -200,6 +207,10 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/xorg-evdev.pc.in COPYING ChangeLog INSTALL README \ + compile config.guess config.sub depcomp install-sh ltmain.sh \ + missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -417,7 +428,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -673,15 +683,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -717,17 +727,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -909,6 +919,8 @@ ps ps-am tags tags-am uninstall uninstall-am \ uninstall-pkgconfigDATA +.PRECIOUS: Makefile + .PHONY: ChangeLog INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/aclocal.m4 new/xf86-input-evdev-2.9.2/aclocal.m4 --- old/xf86-input-evdev-2.9.1/aclocal.m4 2014-11-26 00:33:58.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/aclocal.m4 2015-03-27 02:36:34.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10727,7 +10727,7 @@ AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10739,10 +10739,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -10758,14 +10758,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10810,15 +10810,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10849,7 +10848,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11040,7 +11039,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11116,7 +11115,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11206,8 +11205,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -11280,7 +11279,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -11309,7 +11312,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11320,7 +11323,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -11330,7 +11333,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11351,7 +11354,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11401,7 +11404,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11440,7 +11443,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11469,7 +11472,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11516,7 +11519,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11535,7 +11538,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11616,7 +11619,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11676,7 +11679,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11704,7 +11707,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11723,7 +11726,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/configure new/xf86-input-evdev-2.9.2/configure --- old/xf86-input-evdev-2.9.1/configure 2014-11-26 00:33:59.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/configure 2015-03-27 02:36:35.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xf86-input-evdev 2.9.1. +# Generated by GNU Autoconf 2.69 for xf86-input-evdev 2.9.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-evdev' PACKAGE_TARNAME='xf86-input-evdev' -PACKAGE_VERSION='2.9.1' -PACKAGE_STRING='xf86-input-evdev 2.9.1' +PACKAGE_VERSION='2.9.2' +PACKAGE_STRING='xf86-input-evdev 2.9.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1363,7 +1363,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-input-evdev 2.9.1 to adapt to many kinds of systems. +\`configure' configures xf86-input-evdev 2.9.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1434,7 +1434,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-evdev 2.9.1:";; + short | recursive ) echo "Configuration of xf86-input-evdev 2.9.2:";; esac cat <<\_ACEOF @@ -1567,7 +1567,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-evdev configure 2.9.1 +xf86-input-evdev configure 2.9.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1891,7 +1891,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-evdev $as_me 2.9.1, which was +It was created by xf86-input-evdev $as_me 2.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2273,7 +2273,7 @@ # Initialize Automake -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2445,8 +2445,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2465,7 +2465,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2759,7 +2759,7 @@ # Define the identity of the package. PACKAGE='xf86-input-evdev' - VERSION='2.9.1' + VERSION='2.9.2' cat >>confdefs.h <<_ACEOF @@ -2793,8 +2793,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2852,6 +2852,7 @@ fi fi + # Initialize libtool # Check whether --enable-static was given. if test "${enable_static+set}" = set; then : @@ -18789,7 +18790,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-evdev $as_me 2.9.1, which was +This file was extended by xf86-input-evdev $as_me 2.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18855,7 +18856,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-input-evdev config.status 2.9.1 +xf86-input-evdev config.status 2.9.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/configure.ac new/xf86-input-evdev-2.9.2/configure.ac --- old/xf86-input-evdev-2.9.1/configure.ac 2014-11-26 00:33:56.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/configure.ac 2015-03-27 02:36:31.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-evdev], - [2.9.1], + [2.9.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xf86-input-evdev]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/include/Makefile.in new/xf86-input-evdev-2.9.2/include/Makefile.in --- old/xf86-input-evdev-2.9.1/include/Makefile.in 2014-11-26 00:33:59.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/include/Makefile.in 2015-03-27 02:36:54.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,12 +89,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = include -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(sdk_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(sdk_HEADERS) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -156,6 +165,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -322,7 +332,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign include/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -568,6 +577,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-sdkHEADERS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/man/Makefile.in new/xf86-input-evdev-2.9.2/man/Makefile.in --- old/xf86-input-evdev-2.9.1/man/Makefile.in 2014-11-26 00:33:59.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/man/Makefile.in 2015-03-27 02:36:54.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -37,7 +37,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -101,11 +111,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -159,6 +169,7 @@ am__installdirs = "$(DESTDIR)$(drivermandir)" DATA = $(driverman_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -331,7 +342,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -532,6 +542,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-drivermanDATA +.PRECIOUS: Makefile + # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(DRIVER_MAN_SUFFIX): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/src/Makefile.in new/xf86-input-evdev-2.9.2/src/Makefile.in --- old/xf86-input-evdev-2.9.1/src/Makefile.in 2014-11-26 00:33:59.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/src/Makefile.in 2015-03-27 02:36:54.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -41,7 +41,17 @@ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -105,12 +115,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -200,6 +209,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -381,7 +391,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -639,6 +648,8 @@ tags-am uninstall uninstall-@DRIVER_NAME@_drv_laLTLIBRARIES \ uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.9.1/src/evdev.c new/xf86-input-evdev-2.9.2/src/evdev.c --- old/xf86-input-evdev-2.9.1/src/evdev.c 2014-11-26 00:33:56.000000000 +0100 +++ new/xf86-input-evdev-2.9.2/src/evdev.c 2015-03-27 02:35:50.000000000 +0100 @@ -751,6 +751,14 @@ if (ev->code == ABS_MT_SLOT) { EvdevProcessTouch(pInfo); + if (ev->value >= num_slots(pEvdev) ) { + LogMessageVerbSigSafe(X_WARNING, 0, + "%s: Slot index %d out of bounds (max %d), touch events may be incorrect.\n", + pInfo->name, + ev->value, + num_slots(pEvdev) - 1); + return; + } pEvdev->cur_slot = ev->value; } else { @@ -1211,7 +1219,8 @@ { InputInfoPtr pInfo; EvdevPtr pEvdev; - int num_axes = 0, axis, i = 0; + int axis, i = 0; + int num_axes = 0; /* number of non-MT axes */ int num_mt_axes = 0, /* number of MT-only axes */ num_mt_axes_total = 0; /* total number of MT axes, including double-counted ones, excluding blacklisted */ @@ -1224,6 +1233,7 @@ if (!libevdev_has_event_type(pEvdev->dev, EV_ABS)) goto out; + /* Find number of absolute axis, including MT ones, will decrease later. */ for (i = 0; i < ABS_MAX; i++) if (libevdev_has_event_code(pEvdev->dev, EV_ABS, i)) num_axes++; @@ -1232,6 +1242,30 @@ goto out; #ifdef MULTITOUCH + /* Android drivers often have ABS_MT_POSITION_X but not ABS_X. + Loop over the MT->legacy axis table and add fake axes. */ + for (i = 0; i < ArrayLength(mt_axis_mappings); i++) + { + int mt_code = mt_axis_mappings[i].mt_code; + int code = mt_axis_mappings[i].code; + if (libevdev_has_event_code(pEvdev->dev, EV_ABS, mt_code) && + !libevdev_has_event_code(pEvdev->dev, EV_ABS, code)) + { + const struct input_absinfo* abs; + abs = libevdev_get_abs_info(pEvdev->dev, mt_code); + if (libevdev_enable_event_code(pEvdev->dev, EV_ABS, code, abs)) + { + xf86IDrvMsg(pInfo, X_ERROR, "Failed to fake axis %s.\n", + libevdev_event_code_get_name(EV_ABS, code)); + goto out; + } + xf86IDrvMsg(pInfo, X_INFO, "Faking axis %s.\n", + libevdev_event_code_get_name(EV_ABS, code)); + num_axes++; + } + } + + /* Absolute multitouch axes: adjust mapping and axes counts. */ for (axis = ABS_MT_SLOT; axis < ABS_MAX; axis++) { if (libevdev_has_event_code(pEvdev->dev, EV_ABS, axis)) @@ -1239,6 +1273,7 @@ int j; Bool skip = FALSE; + /* Setup mapping if axis is in MT->legacy axis table. */ for (j = 0; j < ArrayLength(mt_axis_mappings); j++) { if (mt_axis_mappings[j].mt_code == axis && @@ -1259,8 +1294,7 @@ } } - /* device only has mt-axes. the kernel should give us ABS_X etc for - backwards compat but some devices don't have it. */ + /* Panic if, after faking ABS_X etc, we still only have mt-axes. */ if (num_axes == 0 && num_mt_axes > 0) { xf86IDrvMsg(pInfo, X_ERROR, "found only multitouch-axes. That shouldn't happen.\n");

1 0