February 2016 - openSUSE Commits - openSUSE Mailing Lists

commit vtkdata for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package vtkdata for openSUSE:Factory checked in at 2016-02-25 22:05:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtkdata (Old) and /work/SRC/openSUSE:Factory/.vtkdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vtkdata" Changes: -------- --- /work/SRC/openSUSE:Factory/vtkdata/vtkdata.changes 2015-09-19 06:55:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vtkdata.new/vtkdata.changes 2016-02-26 00:47:12.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 18 18:16:35 UTC 2016 - badshah400(a)gmail.com + +- Update to version 7.0.0: + + No changelog available. + +------------------------------------------------------------------- Old: ---- VTKData-6.3.0.tar.gz New: ---- VTKData-7.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtkdata.spec ++++++ --- /var/tmp/diff_new_pack.4PxwIc/_old 2016-02-26 00:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.4PxwIc/_new 2016-02-26 00:47:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package vtkdata # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,9 +17,9 @@ Name: vtkdata -Version: 6.3.0 +Version: 7.0.0 Release: 0 -%define series 6.3 +%define series 7.0 Summary: Kitware VTK Library Data License: BSD-3-Clause Group: Productivity/Scientific/Other ++++++ VTKData-6.3.0.tar.gz -> VTKData-7.0.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/vtkdata/VTKData-6.3.0.tar.gz /work/SRC/openSUSE:Factory/.vtkdata.new/VTKData-7.0.0.tar.gz differ: char 5, line 1

1 0

commit vtk for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2016-02-25 22:05:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtk (Old) and /work/SRC/openSUSE:Factory/.vtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vtk" Changes: -------- --- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2015-09-19 06:55:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new/vtk.changes 2016-02-26 00:47:02.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Feb 17 01:13:12 UTC 2016 - badshah400(a)gmail.com + +- Update to version 7.0.0: + + See https://blog.kitware.com/vtk-7-0-0/ for a detailed + article describing all the changes in this version. +- Add vtk-Rinterface-uintptr_t.patch to fix building: uintptr_t + is already defined in the R headers, uintptr_t definition in + <stdint.h> conflicts with the R definition and causes builds to + fail. This patch fixes the problem by commenting out the call + to include stdint.h (it was only being used for this solitary + symbol). +- Use python 3 for building, rename python- subpackages + accordingly to python3-. +- Update file lists in accordance with added/dropped binaries + upstream; affects vtk-examples, vtk-devel. +- Drop conditionals referencing outdated openSUSE version 12.3. +- Update rpmlintrc file to suppress rpmlint warnings for + "no-manual-page-for-binary": upstream does not supply manuals + for its binaries and does not plan to. + +------------------------------------------------------------------- Old: ---- VTK-6.3.0.tar.gz New: ---- VTK-7.0.0.tar.gz vtk-Rinterface-uintptr_t.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.RSgRR8/_old 2016-02-26 00:47:04.000000000 +0100 +++ /var/tmp/diff_new_pack.RSgRR8/_new 2016-02-26 00:47:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package vtk # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,9 +17,9 @@ Name: vtk -Version: 6.3.0 +Version: 7.0.0 Release: 0 -%define series 6.3 +%define series 7.0 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -32,6 +32,8 @@ Source1: vtk-rpmlintrc # PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah400(a)gmail.com -- Fix file containing DATE and TIME Patch1: vtk-fix-file-contains-date-time.patch +# PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch badshah400(a)gmail.com -- Only use uintptr_t definition from R headers; no longer include stdint.h +Patch2: vtk-Rinterface-uintptr_t.patch BuildRequires: Mesa-libGL-devel BuildRequires: R-base-devel BuildRequires: boost-devel @@ -59,14 +61,13 @@ BuildRequires: libtiff-devel BuildRequires: netcdf-devel BuildRequires: openmpi-devel -BuildRequires: python-devel - +BuildRequires: python3-devel BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: wget BuildRequires: zlib-devel %if 0%{?suse_version} > 1320 -BuildRequires: python-qt5-devel +BuildRequires: python3-qt5-devel BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5OpenGLExtensions) BuildRequires: pkgconfig(Qt5Sql) @@ -74,7 +75,7 @@ BuildRequires: pkgconfig(Qt5Widgets) %else BuildRequires: libqt4-devel -BuildRequires: python-qt4-devel +BuildRequires: python3-qt4-devel %endif %if %{?sles_version} BuildRequires: libxml2-devel @@ -125,8 +126,8 @@ Requires: libxml2-devel Requires: netcdf-devel Requires: openmpi-devel -Requires: python-%{name} = %{version} -Requires: python-%{name}-qt = %{version} +Requires: python3-%{name} = %{version} +Requires: python3-%{name}-qt = %{version} %description devel VTK is an open-source software system for image processing, 3D @@ -152,16 +153,15 @@ This package provides java bindings for VTK. -%package -n python-%{name} +%package -n python3-%{name} Summary: Python bindings for VTK Group: System/Libraries Requires: %{name} = %{version} # DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN Requires: openmpi-devel Requires: openmpi-libs -%{py_requires} -%description -n python-%{name} +%description -n python3-%{name} VTK is an open-source software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g., surface reconstruction, implicit modelling, @@ -170,26 +170,25 @@ This package provides python bindings for VTK. -%package -n python-%{name}-qt +%package -n python3-%{name}-qt Summary: Qt Python VTK widget Group: System/Libraries Requires: %{name} = %{version} Requires: %{name}-qt = %{version} -Requires: python-%{name} = %{version} +Requires: python3-%{name} = %{version} %if 0%{?suse_version} > 1320 Requires: libQt5OpenGL-devel Requires: libQt5OpenGLExtensions-devel-static Requires: libQt5Sql-devel Requires: libQt5WebKitWidgets-devel Requires: libQt5Widgets-devel -Requires: python-qt5 +Requires: python3-qt5 %else Requires: libqt4-devel -Requires: python-qt4 +Requires: python3-qt4 %endif -%{py_requires} -%description -n python-%{name}-qt +%description -n python3-%{name}-qt VTK is an open-source software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g., surface reconstruction, implicit modelling, @@ -261,6 +260,7 @@ %prep %setup -q -n VTK-%{version} %patch1 -p1 +%patch2 -p1 # Replace relative path ../../../VTKData with %%{_datadir}/%%{name}data-%%{version} # otherwise it will break on symlinks. @@ -281,7 +281,7 @@ -DBUILD_TESTING:BOOL=OFF \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DSIP_INCLUDE_DIR:Path=%{py_incdir} \ + -DSIP_INCLUDE_DIR:Path=%{py3_incdir} \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name}\ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{name} \ @@ -298,10 +298,7 @@ -DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF \ %endif -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \ -%if 0%{?suse_version} <= 1230 - -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \ -%endif - -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{py_ver}/site-packages \ + -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{py3_ver}/site-packages \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_JAVA:BOOL=ON \ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ @@ -318,7 +315,8 @@ -DModule_vtkFiltersStatisticsGnuR:BOOL=ON \ -DVTK_WRAP_TCL:BOOL=ON \ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ - -DVTK_USE_SYSTEM_NETCDF:BOOL=ON + -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \ + -DVTK_PYTHON_VERSION=3 make %{?_smp_mflags} VERBOSE=1 @@ -342,14 +340,6 @@ Generate2DAMRDataSetWithPulse Generate3DAMRDataSetWithPulse HierarchicalBoxPipeline -LabeledMesh -MultiBlock -Arrays -Cube -RGrid -SGrid -ImageDataLIC2DDemo -StructuredGridLIC2DDemo ImageSlicing DumpXMLFile ParticleReader @@ -362,25 +352,30 @@ Delaunay3D Delaunay3DAlpha finance +MultiBlock +BandedContours +FilledContours +TubesWithVaryingRadiusAndColors +BalloonWidget +Slider +Slider2D +LabeledMesh +Arrays +Cube +RGrid +SGrid AmbientSpheres Cylinder DiffuseSpheres SpecularSpheres -SurfaceLICDemo Cone Cone2 Cone3 Cone4 Cone5 Cone6 -BandedContours -FilledContours -TubesWithVaryingRadiusAndColors FixedPointVolumeRayCastMapperCT GPURenderDemo -BalloonWidget -Slider -Slider2D EOF # Install examples @@ -400,11 +395,11 @@ %post java -p /sbin/ldconfig %postun java -p /sbin/ldconfig -%post -n python-%{name} -p /sbin/ldconfig -%postun -n python-%{name} -p /sbin/ldconfig +%post -n python3-%{name} -p /sbin/ldconfig +%postun -n python3-%{name} -p /sbin/ldconfig -%post -n python-%{name}-qt -p /sbin/ldconfig -%postun -n python-%{name}-qt -p /sbin/ldconfig +%post -n python3-%{name}-qt -p /sbin/ldconfig +%postun -n python3-%{name}-qt -p /sbin/ldconfig %post qt -p /sbin/ldconfig %postun qt -p /sbin/ldconfig @@ -422,7 +417,6 @@ %defattr(-,root,root,-) %{_bindir}/%{name}EncodeString %{_bindir}/%{name}HashSource -%{_bindir}/%{name}ParseOGLExt %{_bindir}/%{name}WrapHierarchy %if 0%{?suse_version} <= 1320 %{_bindir}/%{name}mkg3states @@ -442,17 +436,17 @@ %{_libdir}/%{name}/%{name}.jar %{_libdir}/%{name}/*Java.so.* -%files -n python-%{name} +%files -n python3-%{name} %defattr(-,root,root,-) %{_bindir}/%{name}python %{_bindir}/p%{name}python %{_bindir}/%{name}WrapPython %{_bindir}/%{name}WrapPythonInit %{_libdir}/%{name}/*Python*.so.* -%{python_sitearch}/%{name}/ +%{python3_sitearch}/%{name}/ %dir %{_libdir}/%{name}/site-packages %{_libdir}/%{name}/site-packages/mpi4py/ -%exclude %{_libdir}/%{name}/*QtPython27D.so.* +%exclude %{_libdir}/%{name}/*QtPython*.so.* %files tcl %defattr(-,root,root,-) @@ -469,11 +463,11 @@ %{_libdir}/%{name}/lib*Qt*.so.* %dir %{_prefix}/%{qtdir}/plugins/designer %{_prefix}/%{qtdir}/plugins/designer/libQVTKWidgetPlugin.so -%exclude %{_libdir}/%{name}/*Python27D.so.* +%exclude %{_libdir}/%{name}/*Python*.so.* -%files -n python-%{name}-qt +%files -n python3-%{name}-qt %defattr(-,root,root,-) -%{_libdir}/%{name}/*QtPython27D.so.* +%{_libdir}/%{name}/*QtPython*.so.* %files examples -f build/examples.list %defattr(-,root,root,-) ++++++ VTK-6.3.0.tar.gz -> VTK-7.0.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/vtk/VTK-6.3.0.tar.gz /work/SRC/openSUSE:Factory/.vtk.new/VTK-7.0.0.tar.gz differ: char 5, line 1 ++++++ vtk-Rinterface-uintptr_t.patch ++++++ Index: VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx =================================================================== --- VTK-7.0.0.orig/Filters/StatisticsGnuR/vtkRInterface.cxx +++ VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx @@ -20,12 +20,15 @@ #include "vtkRInterface.h" +// uintptr_t is already defined in recent versions of R which therefore causes a +// clash when the same symbol is redefined in stddef.h + // for uintptr_t -#ifdef _MSC_VER -#include <stddef.h> -#else -#include <stdint.h> -#endif +// #ifdef _MSC_VER +// #include <stddef.h> +// #else +// #include <stdint.h> +// #endif #include "vtkInformation.h" #include "vtkInformationVector.h" ++++++ vtk-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.RSgRR8/_old 2016-02-26 00:47:04.000000000 +0100 +++ /var/tmp/diff_new_pack.RSgRR8/_new 2016-02-26 00:47:04.000000000 +0100 @@ -1,3 +1,6 @@ # FIXME: See if packaging can be tweaked to avoid these warnings later # python-vtk needs these devel files to work -addFilter("python-vtk.* devel-file-in-non-devel-package") +addFilter("python3-vtk.* devel-file-in-non-devel-package") + +# Upstream does not supply manuals for any binary, suppress warnings +addFilter(".* no-manual-page-for-binary")

1 0

commit tvtime for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package tvtime for openSUSE:Factory checked in at 2016-02-25 22:07:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tvtime (Old) and /work/SRC/openSUSE:Factory/.tvtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tvtime" Changes: -------- --- /work/SRC/openSUSE:Factory/tvtime/tvtime.changes 2014-11-11 09:59:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tvtime.new/tvtime.changes 2016-02-26 00:46:27.000000000 +0100 @@ -1,0 +2,41 @@ +Mon Feb 15 14:49:40 UTC 2016 - eshmarnev(a)suse.com + +- A Patch tvtime.linux-compiler.patch is being deleted +- A Patch tvtime-glibc.patch is being deleted +- A Patch tvtime-1.0.2-videoinput.patch is being deleted +- A Patch tvtime-gcc41.patch is being deleted +- A Patch tvtime-libpng15.patch is being deleted + +------------------------------------------------------------------- +Thu Nov 5 14:47:21 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 1.0.8 + * Change translation man pages and messages to use UTF-8 +- Changes from version 1.0.7 + * Fix warning about Makefiles ignoring the --datarootdir parameter + * Remove unused functions + * Safely assume C89 semantics and make RETSIGTYPE void + * Replace deprecated function XKeycodeToKeysym with XkbKeycodeToKeysym + * Add gitignore to plugins directory + * Link to libsupc++ instead of bringing in libstdc++. + * Actually call function + * Set subdir-objects automake option + * Revert "Set subdir-objects option for automake" + * Set automake flavour to foreign + * Set subdir-objects option for automake + * Revert accidental replacement of INSTALL file + * Turn automake silent by default + * Fix bashisms in boostrap + * Remove unused safetytime variable + * Remove embedded Debian packaging directory +- Do not longer ship INSTALL file + +------------------------------------------------------------------- +Sun Feb 15 19:24:18 UTC 2015 - crrodriguez(a)opensuse.org + +- Update to tvtime 1.0.6. +- Update URL/Source locations for future updates +- Remove all patches since none are needed now. +- tvtime now uses alsa instead of OSS emulation. + +------------------------------------------------------------------- Old: ---- tvtime-1.0.2-videoinput.patch tvtime-1.0.2.tar.bz2 tvtime-gcc41.patch tvtime-glibc.patch tvtime-libpng15.patch tvtime.linux-compiler.patch New: ---- tvtime-1.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tvtime.spec ++++++ --- /var/tmp/diff_new_pack.FDfddA/_old 2016-02-26 00:46:28.000000000 +0100 +++ /var/tmp/diff_new_pack.FDfddA/_new 2016-02-26 00:46:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tvtime # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,24 +17,18 @@ Name: tvtime -Version: 1.0.2 +Version: 1.0.8 Release: 0 Summary: High Quality Television Application License: GPL-2.0+ Group: Hardware/TV -Url: http://tvtime.net -Source: %{name}-%{version}.tar.bz2 -Patch0: tvtime-gcc41.patch -Patch1: tvtime-1.0.2-videoinput.patch -Patch2: tvtime.linux-compiler.patch -Patch3: tvtime-glibc.patch -# I haven't sent libpng15.patch upstream, because project from url -# seems to be dead -Patch4: tvtime-libpng15.patch +Url: http://www.linuxtv.org/ +Source: http://www.linuxtv.org/downloads/tvtime/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: libpng-devel -BuildRequires: libtool +#BuildRequires: libtool BuildRequires: update-desktop-files +BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(x11) @@ -43,8 +37,11 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xxf86vm) +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build +%lang_package + %description tvtime is a high quality television application for use with video capture cards. tvtime processes the input from a capture card and @@ -73,14 +70,9 @@ %prep %setup -q -%patch0 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build -autoreconf -i -f +#autoreconf -i -f %ifarch %ix86 RPM_OPT_FLAGS="%{optflags} -mmmx" export CXXFLAGS="-mmmx" @@ -91,20 +83,23 @@ %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -%suse_update_desktop_file -i net-tvtime AudioVideo TV +%suse_update_desktop_file -i tvtime AudioVideo TV %find_lang %{name} -%files -f %{name}.lang +%files %defattr(-, root, root) -%doc NEWS AUTHORS COPYING INSTALL ChangeLog README docs/html +%doc NEWS AUTHORS COPYING ChangeLog README docs/html %doc data/COPYING* %{_bindir}/* %dir %{_sysconfdir}/tvtime %config(noreplace) %{_sysconfdir}/tvtime/* %{_datadir}/tvtime -%{_datadir}/applications/net-tvtime.desktop +%{_datadir}/applications/tvtime.desktop %{_datadir}/icons/hicolor/ %{_datadir}/pixmaps/tvtime.* %{_mandir}/*/* +%files lang -f %{name}.lang +%defattr(-, root, root) + %changelog

1 0

commit treeline for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package treeline for openSUSE:Factory checked in at 2016-02-25 22:05:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/treeline (Old) and /work/SRC/openSUSE:Factory/.treeline.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "treeline" Changes: -------- --- /work/SRC/openSUSE:Factory/treeline/treeline.changes 2015-04-10 10:20:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.treeline.new/treeline.changes 2016-02-26 00:46:22.000000000 +0100 @@ -1,0 +2,31 @@ +Tue Feb 16 12:07:09 UTC 2016 - mkravec(a)suse.com + +- Update to version 2.0.2 + * Bug Fixes: + - Fixed a major regression in 2.0.1 that broke data editors for + most specialized field types (number, math, boolean, choice, etc.) + - Reduce the amount of work that a single undo command removes + from editors in the data edit view. + - Fixed a bug that prevented setting the unique ID reference + field on a newly created data type. + - Preserve hard newlines in text fields when converting TreeLine + 1.4.x files to this version. + - Fix problems preserving expand/collapse node states when + indenting and unindenting nodes. + * Updates: + - Added methods to the plugin interface that allow general + program options to be queried and changed. + - Improve text table import error messages by including the line + number where the problem is found. + - Modified the Treepad file import to use SpacedText fields to more + closely match Treepad formatting. + - An optional plugin was written that can export files to the + Treepad text file format. + - The TreeLine icon was replaced with a new one. Thanks to + David Reimer for contributing the artwork. + - The German and Portuguese GUI translations were updated. + - Updated the long text sample file to include the SpacedText field + type, and added a conditional equation to the math sample file. + - Updated the Math Field section of the documentation. + +------------------------------------------------------------------- Old: ---- treeline-1.9.7.tar.gz New: ---- treeline-2.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ treeline.spec ++++++ --- /var/tmp/diff_new_pack.diyO4p/_old 2016-02-26 00:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.diyO4p/_new 2016-02-26 00:46:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package treeline # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,24 +17,24 @@ Name: treeline +Version: 2.0.2 +Release: 0 Summary: Versatile Tree-Style Outliner for Defining Custom Data Schemas License: GPL-2.0+ Group: Productivity/Office/Other -Version: 1.9.7 -Release: 0 Url: http://treeline.bellz.org -BuildRequires: perl -BuildRequires: python3-devel -BuildRequires: update-desktop-files -BuildRequires: fdupes -Requires: python3-qt4 Source0: http://sourceforge.net/projects/treeline/files/%{version}/treeline-%{versio… -Source1: %name.desktop -Source2: x-%name.desktop -Source3: x-%name-gz.desktop +Source1: %{name}.desktop +Source2: x-%{name}.desktop +Source3: x-%{name}-gz.desktop Source4: x-treepad.desktop Source5: treeline.png Source99: treeline-rpmlintrc +BuildRequires: fdupes +BuildRequires: perl +BuildRequires: python3-devel +BuildRequires: update-desktop-files +Requires: python3-qt4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -58,16 +58,16 @@ toolkit, which makes it very portable. %prep -%setup -n TreeLine +%setup -q -n TreeLine for i in source/*.py; do - sed -i "s|#!/usr/bin/env python|#!/usr/bin/python|g" "$i" + sed -i "s|#!%{_bindir}/env python|#!%{_bindir}/python|g" "$i" done find source/ -type f -name '*.py' | while read f; do case $f in */treeline.py) continue;; esac - %__perl -i -n -e 'print unless m,^#!, and 1..1' "$f" + perl -i -n -e 'print unless m,^#!, and 1..1' "$f" done %build @@ -76,18 +76,20 @@ python3 install.py -x \ -p "%{_prefix}" \ -d "%{_docdir}/%{name}" \ - -b "%{buildroot}" + -b %{buildroot} -python3 -c "import compileall; compileall.compile_dir('%{buildroot}%{_prefix}/lib/treeline',2,ddir='%{_prefix}/lib/treeline')" +pushd %{buildroot}%{python_sitearch} +python3 -c "import compileall; compileall.compile_dir('%{buildroot}%{_libexecdir}/treeline',2,ddir='%{_libexecdir}/treeline')" +popd -%__install -d "%{buildroot}%{_datadir}/mimelnk/application" -%__install -m0644 \ +install -d "%{buildroot}%{_datadir}/mimelnk/application" +install -m0644 \ "%{SOURCE2}" \ "%{SOURCE3}" \ "%{SOURCE4}" \ "%{buildroot}%{_datadir}/mimelnk/application/" -%__install -D -m0644 "%{SOURCE5}" "%{buildroot}%{_datadir}/pixmaps/treeline.png" +install -D -m0644 "%{SOURCE5}" "%{buildroot}%{_datadir}/pixmaps/treeline.png" %suse_update_desktop_file -i treeline Office ProjectManagement ++++++ treeline-1.9.7.tar.gz -> treeline-2.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/doc/documentation.trl new/TreeLine/doc/documentation.trl --- old/TreeLine/doc/documentation.trl 2015-03-28 00:09:23.000000000 +0100 +++ new/TreeLine/doc/documentation.trl 2015-10-03 20:20:31.000000000 +0200 @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='utf-8'?> -<HEADINGS formathtml="y" item="y" line0="{*Name*}" line1="{*Name*}" tlversion="1.9.7" uniqueid="treeline_documentation"> +<HEADINGS formathtml="y" item="y" line0="{*Name*}" line1="{*Name*}" tlversion="2.0.2" uniqueid="treeline_documentation"> <Name idref="y" type="Text">TreeLine Documentation</Name> <HEADINGS item="y" uniqueid="introduction_1"> <Name>Introduction</Name> <PARAGRAPH icon="bullet_2" item="y" line0="{*Name*}" line1="{*Text*}" uniqueid="version"> <Name idref="y" type="Text">Version</Name> -<Text lines="8" type="Text">This document covers TreeLine, Version 1.9.7, released March 29, 2015 by Doug Bell.</Text> +<Text lines="8" type="Text">This document covers TreeLine, Version 2.0.2, released October 3, 2015 by Doug Bell.</Text> </PARAGRAPH> <PARAGRAPH item="y" uniqueid="why_treeline"> <Name>Why TreeLine?</Name> @@ -192,6 +192,14 @@ <Name>Fonts</Name> <Text>Fonts used for editing and output can be customized.</Text> </BULLETS> +<BULLETS item="y" uniqueid="languages"> +<Name>Languages</Name> +<Text>The user interface is available in English, German and Portuguese.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="plugins"> +<Name>Plugins</Name> +<Text>Plugin extension modules can be loaded to further customize TreeLine.</Text> +</BULLETS> </BULLET_HEADING> </HEADINGS> <HEADINGS item="y" uniqueid="system_requirements"> @@ -477,9 +485,9 @@ In equations, date fields are represented by the number of days since January 1, 1970, and time fields are the number of seconds since midnight. So date fields can be subtracted to give the number of days elapsed, and numbers of days can be added to or subtracted from dates to result in new dates. Time fields can be subtracted to give the number of seconds elapsed, and numbers of seconds can be added to or subtracted from times to result in new times. -The "if" comparison operator can be used to make the result depend on the value of another field. The expression is written as "&lt;true value&gt; if &lt;condition&gt; else &lt;false value&gt;". +The "if" comparison operator can be used to make the result depend on the value of another field. The expression is written as "true_value if condition else false_value". Of course, the "true_value", "condition" and "false_value" strings must be replaced with valid fields or expressions. If this operator is inserted from the operator list (under comparisons), it will include parenthesis as placeholders. These parenthesis are optional in the equations. -The "join" text function is used to combine text from several other fields (or from child nodes). The first argument to the function is a separator string that is placed between each piece of text. The remaining argument(s) are the text to be joined. +The "join" text function is used to combine text from several other fields (or from child nodes). The first argument to the function is a separator string that is placed between each piece of text. The remaining argument(s) are the text to be joined. By default, math fields are shown in the data edit view, but they are read-only. To hide them, uncheck the "Show math fields in the Data Edit View" box under "Tools &gt; General Options &gt; Features Available". @@ -750,6 +758,109 @@ </HEADINGS> <HEADINGS item="y" uniqueid="revision_history"> <Name>Revision History</Name> +<HEADINGS item="y" uniqueid="october_3_2015_-_release_202_new_stable"> +<Name>October 3, 2015 - Release 2.0.2 (new stable release)</Name> +<BULLET_HEADING item="y" uniqueid="bug_fixes_8"> +<Name>Bug Fixes</Name> +<BULLETS item="y" uniqueid="data_edit_regression"> +<Name>Data edit regression</Name> +<Text>Fixed a major regression in 2.0.1 that broke data editors for most specialized field types (number, math, boolean, choice, etc.)</Text> +</BULLETS> +</BULLET_HEADING> +<BULLET_HEADING item="y" uniqueid="compatibility_notes_2"> +<Name>Compatibility Notes</Name> +<BULLETS item="y" uniqueid="file_format_2"> +<Name>File format</Name> +<Text>There are some file format changes between TreeLine 1.4.x and this version of TreeLine.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="file_conversion_2"> +<Name>File conversion</Name> +<Text>Older files opened in this version are automatically converted when saved.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="file_compatibility_2"> +<Name>File compatibility</Name> +<Text>Files saved in this version may not be fully compatible with TreeLine 1.4.x.</Text> +</BULLETS> +</BULLET_HEADING> +</HEADINGS> +<HEADINGS item="y" uniqueid="september_26_2015_-_release_201_new_stable"> +<Name>September 26, 2015 - Release 2.0.1 (new stable release)</Name> +<BULLET_HEADING item="y" uniqueid="updates_9"> +<Name>Updates</Name> +<BULLETS item="y" uniqueid="plugin_options"> +<Name>Plugin options</Name> +<Text>Added methods to the plugin interface that allow general program options to be queried and changed.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="table_import_errors"> +<Name>Table import errors</Name> +<Text>Improve text table import error messages by including the line number where the problem is found.</Text> +</BULLETS> +</BULLET_HEADING> +<BULLET_HEADING item="y" uniqueid="bug_fixes_7"> +<Name>Bug Fixes</Name> +<BULLETS item="y" uniqueid="data_edit_undo"> +<Name>Data edit undo</Name> +<Text>Reduce the amount of work that a single undo command removes from editors in the data edit view.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="configuration_changes"> +<Name>Configuration changes</Name> +<Text>Fixed a bug that prevented setting the unique ID reference field on a newly created data type.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="legacy_newline_convert"> +<Name>Legacy newline convert</Name> +<Text>Preserve hard newlines in text fields when converting TreeLine 1.4.x files to this version.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="indent_expand_status"> +<Name>Indent expand status</Name> +<Text>Fix problems preserving expand/collapse node states when indenting and unindenting nodes.</Text> +</BULLETS> +</BULLET_HEADING> +</HEADINGS> +<HEADINGS item="y" uniqueid="may_17_2015_-_release_200_new_stable_release"> +<Name>May 17, 2015 - Release 2.0.0 (new stable release)</Name> +<BULLET_HEADING item="y" uniqueid="updates_8"> +<Name>Updates</Name> +<BULLETS item="y" uniqueid="treepad_import_update"> +<Name>Treepad import update</Name> +<Text>Modified the Treepad file import to use SpacedText fields to more closely match Treepad formatting.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="treepad_export"> +<Name>Treepad export</Name> +<Text>An optional plugin was written that can export files to the Treepad text file format.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="new_icon"> +<Name>New icon</Name> +<Text>The TreeLine icon was replaced with a new one. Thanks to David Reimer for contributing the artwork.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="translation_updates"> +<Name>Translation updates</Name> +<Text>The German and Portuguese GUI translations were updated.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="sample_file_updates"> +<Name>Sample file updates</Name> +<Text>Updated the long text sample file to include the SpacedText field type, and added a conditional equation to the math sample file.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="documentation_update"> +<Name>Documentation update</Name> +<Text>Updated the Math Field section of the documentation.</Text> +</BULLETS> +</BULLET_HEADING> +<BULLET_HEADING item="y" uniqueid="compatibility_notes"> +<Name>Compatibility Notes</Name> +<BULLETS item="y" uniqueid="file_format"> +<Name>File format</Name> +<Text>There are some file format changes between TreeLine 1.4.x and this version of TreeLine.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="file_conversion"> +<Name>File conversion</Name> +<Text>Older files opened in this version are automatically converted when saved.</Text> +</BULLETS> +<BULLETS item="y" uniqueid="file_compatibility_1"> +<Name>File compatibility</Name> +<Text>Files saved in this version may not be fully compatible with TreeLine 1.4.x.</Text> +</BULLETS> +</BULLET_HEADING> +</HEADINGS> <HEADINGS item="y" uniqueid="march_29_2015_-_release_197_unstable"> <Name>March 29, 2015 - Release 1.9.7 (unstable development snapshot)</Name> <BULLET_HEADING item="y" uniqueid="new_features_6"> @@ -789,21 +900,6 @@ <Text>Fixed a focus problem that made the pull-downs in choice and boolean field editors unusable on Linux.</Text> </BULLETS> </BULLET_HEADING> -<BULLET_HEADING item="y" uniqueid="compatibility_notes_1"> -<Name>Compatibility Notes</Name> -<BULLETS item="y" uniqueid="file_format_1"> -<Name>File format</Name> -<Text>There are some file format changes between TreeLine 1.4.x and this version of TreeLine.</Text> -</BULLETS> -<BULLETS item="y" uniqueid="file_conversion_1"> -<Name>File conversion</Name> -<Text>Older files opened in this version are automatically converted when saved.</Text> -</BULLETS> -<BULLETS item="y" uniqueid="file_compatibility"> -<Name>File compatibility</Name> -<Text>Files saved in this version may not be fully compatible with TreeLine 1.4.x.</Text> -</BULLETS> -</BULLET_HEADING> </HEADINGS> <HEADINGS item="y" uniqueid="march_10_2015_-_release_196_unstable"> <Name>March 10, 2015 - Release 1.9.6 (unstable development snapshot)</Name> Files old/TreeLine/icons/toolbar/32x32/helpabout.png and new/TreeLine/icons/toolbar/32x32/helpabout.png differ Files old/TreeLine/icons/toolbar/32x32/treeline.png and new/TreeLine/icons/toolbar/32x32/treeline.png differ Files old/TreeLine/icons/toolbar/32x32/treelogo.png and new/TreeLine/icons/toolbar/32x32/treelogo.png differ Files old/TreeLine/icons/tree/treelogo.png and new/TreeLine/icons/tree/treelogo.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/samples/110en_sample_basic_longtext.trl new/TreeLine/samples/110en_sample_basic_longtext.trl --- old/TreeLine/samples/110en_sample_basic_longtext.trl 2015-02-01 21:14:57.000000000 +0100 +++ new/TreeLine/samples/110en_sample_basic_longtext.trl 2015-05-10 20:31:10.000000000 +0200 @@ -1,21 +1,28 @@ <?xml version='1.0' encoding='utf-8'?> -<ROOT childtype="PLAIN_TEXT" item="y" line0="{*Name*}" line1="{*Name*}" tlversion="1.9.0" uniqueid="Text_Fields"> +<ROOT item="y" line0="{*Name*}" line1="{*Name*}" tlversion="1.9.7" uniqueid="Text_Fields"> <Name idref="y" type="Text">Text Fields</Name> <REGULAR_TEXT formathtml="y" item="y" line0="{*Name*}" line1="{*Name*}" line2="{*Text*}" uniqueid="Similar_to_Treepad"> <Name idref="y" type="Text">Similar to Treepad</Name> -<Text lines="12" type="Text">This file provides a single long text field for each node. -This is similar to how the Treepad program on windows is usually used.</Text> +<Text lines="12" type="Text">This file provides a single long text field for each node. This is similar to how the Treepad program on windows is usually used.</Text> </REGULAR_TEXT> <REGULAR_TEXT item="y" uniqueid="Regular_text_field"> <Name>Regular text field</Name> -<Text>The most commonly used field type is regular text. Formatting such as bold, itallics, font sizes and font colors can be used from the Edit menu.</Text> +<Text>The most commonly used field type is regular text. Formatting such as bold, italics, font sizes and font colors can be used from the Edit menu. + +It preserves carriage return spaces, but not multiple spaces within a line.</Text> </REGULAR_TEXT> -<HTML_TEXT formathtml="y" item="y" line0="{*Name*}" line1="{*Name*}" line2="{*Text*}" uniqueid="HTML_text_field"> +<HTML_TEXT formathtml="y" item="y" line0="{*Name*}" line1="{*Name*}" line2="{*Text*}" uniqueid="html_text_field"> <Name idref="y" type="Text">HTML text field</Name> -<Text lines="12" type="HtmlText">An HTML field allows tags such as itallics to be added manually. +<Text lines="12" type="HtmlText">An HTML field allows tags such as italics to be added manually. It does not preserve white space. Characters like &lt;, &gt;, and &amp; must be escaped.</Text> </HTML_TEXT> +<SPACED_TEXT formathtml="y" item="y" line0="{*Name*}" line1="{*Name*}{*Text*}" uniqueid="spaced_text_field"> +<Name idref="y" type="Text">Spaced text field</Name> +<Text lines="12" type="SpacedText">A spaced text field preserves all white space. + +It does not allow character formatting.</Text> +</SPACED_TEXT> </ROOT> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/samples/330en_sample_math_fields.trl new/TreeLine/samples/330en_sample_math_fields.trl --- old/TreeLine/samples/330en_sample_math_fields.trl 2015-02-01 21:14:57.000000000 +0100 +++ new/TreeLine/samples/330en_sample_math_fields.trl 2015-05-10 20:32:44.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<TOP_ASSEMBLY childtype="ASSEMBLY" item="y" line0="{*PartNumber*} {*Name*}" line1="Part {*PartNumber*}" line2="{*Name*}" line3="Assembly Level: {*Level*}" line4="Cost: {*TotalCost*}" tlversion="1.9.5" uniqueid="widget_top_assembly"> +<TOP_ASSEMBLY childtype="ASSEMBLY" item="y" line0="{*PartNumber*} {*Name*}" line1="Part {*PartNumber*}" line2="{*Name*}" line3="Assembly Level: {*Level*}" line4="Cost: {*TotalCost*}" tlversion="1.9.8" uniqueid="widget_top_assembly"> <PartNumber type="Text">123456</PartNumber> <Name idref="y" type="Text">Widget Top Assembly</Name> <Level format="#" type="Number">1</Level> @@ -13,12 +13,13 @@ <Cost eqn="sum({*&Cost*}) + {*LaborCost*}" format="0.00" prefix="$" type="Math">10.040000000000001</Cost> <TotalCost eqn="{**TotalCost*}" format="0.00" prefix="$" type="Math">23.89</TotalCost> <PercentCost eqn="{*Cost*} / {*TotalCost*} * 100" format="0" suffix="%" type="Math">42.02595228128925</PercentCost> -<PART item="y" line0="{*PartNumber*} {*Name*}" line1="Part {*PartNumber*}" line2="{*Name*}" line3="Assembly Level: {*Level*}" line4="Cost: {*Cost*}" line5="Percent Cost: {*PercentCost*}" uniqueid="lever"> +<PART item="y" line0="{*PartNumber*} {*Name*}" line1="Part {*PartNumber*}" line2="{*Name*}" line3="Assembly Level: {*Level*}" line4="Cost: {*Cost*}" line5="Percent Cost: {*PercentCost*}" line6="Cost Level: {*CostLevel*}" uniqueid="lever"> <PartNumber type="Text">987654</PartNumber> <Name idref="y" type="Text">Lever</Name> <Level eqn="{**Level*} + 1" format="#" type="Math">3</Level> <Cost format="0.00" prefix="$" type="Number">5.4</Cost> <PercentCost eqn="{*Cost*} / {**TotalCost*} * 100" format="0" suffix="%" type="Math">22.60359983256593</PercentCost> +<CostLevel eqn="('Low') if ({*PercentCost*} < 20) else ('High')" resulttype="text" type="Math">High</CostLevel> </PART> <PART item="y" uniqueid="lever_bolt"> <PartNumber>998877</PartNumber> @@ -26,6 +27,7 @@ <Level>3</Level> <Cost>2.89</Cost> <PercentCost>12.097111762243616</PercentCost> +<CostLevel>Low</CostLevel> </PART> </ASSEMBLY> <ASSEMBLY item="y" uniqueid="bracket_assembly"> @@ -42,6 +44,7 @@ <Level>3</Level> <Cost>6.2</Cost> <PercentCost>25.952281289242364</PercentCost> +<CostLevel>High</CostLevel> </PART> <PART item="y" uniqueid="bracket_pin"> <PartNumber>665544</PartNumber> @@ -49,6 +52,7 @@ <Level>3</Level> <Cost>1.9</Cost> <PercentCost>7.95311845960653</PercentCost> +<CostLevel>Low</CostLevel> </PART> </ASSEMBLY> </TOP_ASSEMBLY> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/dataeditview.py new/TreeLine/source/dataeditview.py --- old/TreeLine/source/dataeditview.py 2015-03-21 19:07:20.000000000 +0100 +++ new/TreeLine/source/dataeditview.py 2015-10-03 20:20:31.000000000 +0200 @@ -80,6 +80,7 @@ super().__init__(parent) self.editorClickPos = None self.lastEditor = None + self.prevNumLines = -1 def paint(self, painter, styleOption, modelIndex): """Paint the Data Edit Cells with support for rich text. @@ -166,6 +167,14 @@ if hasattr(editor, 'setLinkFromNode'): self.parent().internalLinkSelected.connect(editor. setLinkFromNode) + # viewport filter required to catch mouse events for undo limits + try: + editor.viewport().installEventFilter(self) + except AttributeError: + try: + editor.lineEdit().installEventFilter(self) + except AttributeError: + pass self.lastEditor = editor return editor return super().createEditor(parent, styleOption, modelIndex) @@ -208,10 +217,14 @@ cell = self.parent().item(modelIndex.row(), modelIndex.column()) if isinstance(cell, DataEditCell): if editor.modified: - undo.DataUndo(cell.node.modelRef.undoList, cell.node, True, - cell.field.name) + newText = editor.contents() + numLines = newText.count('\n') + skipUndoAvail = numLines == self.prevNumLines + self.prevNumLines = numLines + undo.DataUndo(cell.node.modelRef.undoList, cell.node, + skipUndoAvail, cell.field.name) try: - cell.node.setData(cell.field, editor.contents()) + cell.node.setData(cell.field, newText) except ValueError: editor.setErrorFlag() self.parent().nodeModified.emit(cell.node) @@ -281,17 +294,20 @@ key = QtGui.QKeySequence(event.modifiers() | event.key()) view.shortcutEntered.emit(key) return True - if (event.type() == QtCore.QEvent.FocusOut and - event.reason() in (QtCore.Qt.MouseFocusReason, - QtCore.Qt.TabFocusReason, - QtCore.Qt.BacktabFocusReason) and - (not hasattr(editor, 'calendar') or - not editor.calendar or not editor.calendar.isVisible()) and - (not hasattr(editor, 'intLinkDialog') or - not editor.intLinkDialog or - not editor.intLinkDialog.isVisible())): - self.parent().setCurrentCell(-1, -1) - return True + if event.type() == QtCore.QEvent.MouseButtonPress: + self.prevNumLines = -1 # reset undo avail for mose cursor changes + if event.type() == QtCore.QEvent.FocusOut: + self.prevNumLines = -1 # reset undo avail for any focus loss + if (event.reason() in (QtCore.Qt.MouseFocusReason, + QtCore.Qt.TabFocusReason, + QtCore.Qt.BacktabFocusReason) and + (not hasattr(editor, 'calendar') or + not editor.calendar or not editor.calendar.isVisible()) and + (not hasattr(editor, 'intLinkDialog') or + not editor.intLinkDialog or + not editor.intLinkDialog.isVisible())): + self.parent().setCurrentCell(-1, -1) + return True return super().eventFilter(editor, event) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/imports.py new/TreeLine/source/imports.py --- old/TreeLine/source/imports.py 2015-03-09 00:31:57.000000000 +0100 +++ new/TreeLine/source/imports.py 2015-09-23 03:39:06.000000000 +0200 @@ -67,6 +67,7 @@ filePath -- the file to import from if give, otherwise prompt user """ self.filePath = filePath + self.errorMessage = '' def interactiveImport(self, addWarning=False): """Prompt the user for import type & proceed with import. @@ -98,6 +99,7 @@ defaultFilePath, filters) if not self.filePath: return None + self.errorMessage = '' try: QtGui.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor) model = getattr(self, method)() @@ -110,10 +112,12 @@ format(self.filePath)) return None if not model: + message = _('Error - improper format in {0}').format(self.filePath) + if self.errorMessage: + message = '{0}\n{1}'.format(message, self.errorMessage) + self.errorMessage = '' QtGui.QMessageBox.warning(QtGui.QApplication.activeWindow(), - 'TreeLine', - _('Error - improper format in {0}'). - format(self.filePath)) + 'TreeLine', message) return model def importTabbedText(self): @@ -156,7 +160,9 @@ headings = [self.correctFieldName(name) for name in f.readline().split('\t')] tableFormat.addFieldList(headings, True, True) + lineNum = 1 for line in f: + lineNum += 1 if line.strip(): entries = line.split('\t') node = treenode.TreeNode(model.root, typeName, model) @@ -167,6 +173,8 @@ except IndexError: pass # fewer entries than headings is OK if entries: + self.errorMessage = (_('Too many entries on Line {0}'). + format(lineNum)) return None # abort if too few headings node.setUniqueId(True) return model @@ -232,6 +240,7 @@ model = treemodel.TreeModel(True) tpFormat = model.formats[treeformats.defaultTypeName] tpFormat.addFieldList([textFieldName], False, True) + tpFormat.fieldDict[textFieldName].changeType('SpacedText') with open(self.filePath, 'r', encoding=globalref.localTextEncoding) as f: textList = f.read().split('<end node> 5P9i0s8y19Z') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/plugininterface.py new/TreeLine/source/plugininterface.py --- old/TreeLine/source/plugininterface.py 2015-03-09 00:31:57.000000000 +0100 +++ new/TreeLine/source/plugininterface.py 2015-09-18 02:45:24.000000000 +0200 @@ -1196,6 +1196,35 @@ #************************************************************************** + # General Options: + #************************************************************************** + + def getOptionValue(self, name): + """Return the value of a general option item. + + See the setGenOptionDefaults function in the optiondefaults.py file + for available name values. + Raises a KeyError if the name is incorrect. + Arguments: + name -- the key name for the option + """ + return globalref.genOptions.getValue(name) + + def changeOptionValue(self, name, value): + """Set the name of an existing option to the given value. + + Returns True if changed, False if value is the same or not permitted. + See the setGenOptionDefaults function in the optiondefaults.py file + for available name values. + Raises a KeyError if the name is incorrect. + Arguments: + name -- the key name for the option + value -- a value or a string defining the value + """ + return globalref.genOptions.changeValue(name, value) + + + #************************************************************************** # Internal methods (not for plugin use): #************************************************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/setup.py new/TreeLine/source/setup.py --- old/TreeLine/source/setup.py 2015-03-09 00:31:57.000000000 +0100 +++ new/TreeLine/source/setup.py 2015-05-17 21:54:20.000000000 +0200 @@ -38,5 +38,5 @@ 'excludes': ['*.pyc'], 'icon': '../win/treeline.ico', 'include_msvcr': True, - 'build_exe': '../../TreeLine-1.9'}}, + 'build_exe': '../../TreeLine-2.0'}}, executables = [Executable('treeline.py', base=base)]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/treeline.py new/TreeLine/source/treeline.py --- old/TreeLine/source/treeline.py 2015-03-21 17:31:08.000000000 +0100 +++ new/TreeLine/source/treeline.py 2015-10-03 20:20:31.000000000 +0200 @@ -13,7 +13,7 @@ #****************************************************************************** __progname__ = 'TreeLine' -__version__ = '1.9.7' +__version__ = '2.0.2' __author__ = 'Doug Bell' docPath = None # modified by install script if required diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/treemaincontrol.py new/TreeLine/source/treemaincontrol.py --- old/TreeLine/source/treemaincontrol.py 2015-03-09 00:31:57.000000000 +0100 +++ new/TreeLine/source/treemaincontrol.py 2015-05-15 03:59:30.000000000 +0200 @@ -124,7 +124,7 @@ for path in iconPathList], ['', '32x32', '16x16']) globalref.toolIcons.loadAllIcons() - windowIcon = globalref.toolIcons.getIcon('treeline') + windowIcon = globalref.toolIcons.getIcon('treelogo') if windowIcon: QtGui.QApplication.setWindowIcon(windowIcon) globalref.treeIcons = icondict.IconDict(iconPathList, ['', 'tree']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/treenode.py new/TreeLine/source/treenode.py --- old/TreeLine/source/treenode.py 2015-02-01 21:14:57.000000000 +0100 +++ new/TreeLine/source/treenode.py 2015-09-20 03:11:26.000000000 +0200 @@ -224,6 +224,38 @@ """ globalref.mainControl.currentTreeView().collapse(self.index()) + def saveExpandViewStatus(self, statusDict=None): + """Recursively save the expand/collapse status of nodes in the branch. + + Saves by unique ID, returns dictionary. + Arguments: + statusDict -- a dictionary to save in + """ + if not statusDict: + statusDict = {} + statusDict[self.uniqueId] = self.isExpanded() + for node in self.childList: + statusDict = node.saveExpandViewStatus(statusDict) + return statusDict + + def restoreExpandViewStatus(self, statusDict): + """Recursively restore expand/collapse status of nodes in the branch. + + Arguments: + statusDict -- a dictionary with status by unique ID + """ + try: + expanded = statusDict[self.uniqueId] + if expanded: + self.expandInView() + else: + self.collapseInView() + return + except KeyError: + pass + for node in self.childList: + node.restoreExpandViewStatus(statusDict) + def setUniqueId(self, validate=False): """Add this node's unique ID to the ref dict. @@ -571,9 +603,12 @@ newParent = self.prevSibling() if not newParent: return + oldParent = self.parent + expandDict = oldParent.saveExpandViewStatus() self.parent.childList.remove(self) newParent.childList.append(self) self.parent = newParent + oldParent.restoreExpandViewStatus(expandDict) def unindent(self): """Make this node its parent's next sibling. @@ -581,10 +616,12 @@ sibling = self.parent if not sibling or not sibling.parent: return + expandDict = sibling.parent.saveExpandViewStatus() self.parent.childList.remove(self) pos = sibling.parent.childList.index(sibling) + 1 sibling.parent.childList.insert(pos, self) self.parent = sibling.parent + sibling.parent.restoreExpandViewStatus(expandDict) def wordSearch(self, wordList, titleOnly=False): """Return True if all words in wordlist are found in this node's data. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/treeopener.py new/TreeLine/source/treeopener.py --- old/TreeLine/source/treeopener.py 2015-02-01 21:14:57.000000000 +0100 +++ new/TreeLine/source/treeopener.py 2015-09-12 23:30:35.000000000 +0200 @@ -146,7 +146,10 @@ text = node.data.get(field.name, '') if text: if field.typeName == 'Text' and not field.oldHasHtml: - node.data[field.name] = xml.sax.saxutils.escape(text) + text = text.strip() + text = xml.sax.saxutils.escape(text) + text = text.replace('\n', ' \n') + node.data[field.name] = text elif (field.typeName == 'ExternalLink' and field.oldTypeName): dispName = node.data.get(field.oldLinkAltField, '') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TreeLine/source/undo.py new/TreeLine/source/undo.py --- old/TreeLine/source/undo.py 2015-03-09 00:31:57.000000000 +0100 +++ new/TreeLine/source/undo.py 2015-09-12 23:30:35.000000000 +0200 @@ -244,8 +244,12 @@ del self.treeFormats.fieldRenameDict[newName] self.treeFormats.changedIdFieldTypes = set() for typeObj in newTreeFormats.changedIdFieldTypes: - self.treeFormats.changedIdFieldTypes.add(self.treeFormats[typeObj. - name]) + try: + self.treeFormats.changedIdFieldTypes.add(self. + treeFormats[typeObj. + name]) + except KeyError: # not needed for new tree formats + pass listRef.addUndoObj(self, clearRedo) def undo(self, redoRef): Files old/TreeLine/translations/treeline_de.qm and new/TreeLine/translations/treeline_de.qm differ Files old/TreeLine/translations/treeline_pt.qm and new/TreeLine/translations/treeline_pt.qm differ

1 0

commit terminator for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package terminator for openSUSE:Factory checked in at 2016-02-25 22:09:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terminator (Old) and /work/SRC/openSUSE:Factory/.terminator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "terminator" Changes: -------- --- /work/SRC/openSUSE:Factory/terminator/terminator.changes 2014-11-18 22:45:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.terminator.new/terminator.changes 2016-02-26 00:45:59.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 20 12:01:51 UTC 2016 - tchvatal(a)suse.com + +- Version update to 0.78: + * Run the macro scriptlets for icons/desktop files + * Adjust filelist for the current state + * Fix few tiny rpmlint warnings +- Add patch: + * 0001-terminator-fix-RHBZ#1268289.patch + +------------------------------------------------------------------- Old: ---- terminator-0.97.tar.bz2 New: ---- 0001-terminator-fix-RHBZ#1268289.patch terminator-0.98.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terminator.spec ++++++ --- /var/tmp/diff_new_pack.dv7905/_old 2016-02-26 00:46:01.000000000 +0100 +++ /var/tmp/diff_new_pack.dv7905/_new 2016-02-26 00:46:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package terminator # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,15 +16,24 @@ # +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%else +Requires: python-vte +Requires: vte +BuildArch: noarch +%endif Name: terminator -Version: 0.97 +Version: 0.98 Release: 0 Summary: Store and run multiple GNOME terminals in one window License: GPL-2.0 Group: System/X11/Terminals Url: http://www.tenshu.net/terminator -Source0: terminator-%{version}.tar.bz2 +Source0: https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}… Patch0: terminator-desktop.patch +# PATCH-FIX-UPSTREAM: taken from fedora to fix ibus interactions +Patch1: 0001-terminator-fix-RHBZ#1268289.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gettext @@ -33,18 +42,12 @@ BuildRequires: python-devel BuildRequires: update-desktop-files Requires: python-gnome -%if 0%{?suse_version} > 1130 -Requires: python-vte -Requires: vte -%endif +Requires: python-psutil +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme Recommends: %{name}-lang Recommends: python-keybinder BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -%else -BuildArch: noarch -%endif %description Multiple GNOME terminals in one window. This is a project to produce @@ -54,46 +57,76 @@ arrangements of terminals for different tasks. %lang_package + %prep %setup -q %patch0 -#translation-update-upstream +%patch1 -p1 %build python setup.py build -#remove unsupported translations -for trans in ms jv af ur ka oc si fy tyv; do - rm -R ./build/mo/${trans} -done %install python setup.py install --root=%{buildroot} --prefix=%{_prefix} + rm -f %{buildroot}/%{_datadir}/icons/hicolor/icon-theme.cache rm -f %{buildroot}/%{_datadir}/applications/%{name}.desktop +rm -rf %{buildroot}%{_datadir}/doc/terminator/apidoc/.buildinfo +rm -rf %{buildroot}%{_datadir}/doc/terminator/html/.buildinfo + desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications data/%{name}.desktop %suse_update_desktop_file %{name} + %fdupes %{buildroot} %find_lang %{name} +%if 0%{?suse_version} >= 1140 %post -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : +%icon_theme_cache_post +%desktop_database_post %postun -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : +%icon_theme_cache_postun +%desktop_database_postun +%endif %files %defattr(-,root,root) %doc ChangeLog COPYING README -%{_datadir}/applications/%{name}.desktop -%{_mandir}/man1/%{name}.1* -%{_mandir}/man5/%{name}_config.5* -%{_bindir}/terminator +%dir %{_datadir}/doc/terminator +%dir %{_datadir}/icons/HighContrast +%dir %{_datadir}/icons/HighContrast/16x16 +%dir %{_datadir}/icons/HighContrast/16x16/actions +%dir %{_datadir}/icons/HighContrast/16x16/apps +%dir %{_datadir}/icons/HighContrast/16x16/status +%dir %{_datadir}/icons/HighContrast/22x22 +%dir %{_datadir}/icons/HighContrast/22x22/apps +%dir %{_datadir}/icons/HighContrast/24x24 +%dir %{_datadir}/icons/HighContrast/24x24/apps +%dir %{_datadir}/icons/HighContrast/32x32 +%dir %{_datadir}/icons/HighContrast/32x32/apps +%dir %{_datadir}/icons/HighContrast/48x48 +%dir %{_datadir}/icons/HighContrast/48x48/apps +%dir %{_datadir}/icons/HighContrast/scalable +%dir %{_datadir}/icons/HighContrast/scalable/apps +%{_datadir}/doc/%{name}/* +%{_mandir}/man1/%{name}.* +%{_mandir}/man5/%{name}_config.* +%{_bindir}/%{name}* %{_bindir}/remotinator - -%{_datadir}/icons/hicolor/*/*/termina* -%{_datadir}/pixmaps/terminator.png %{python_sitelib}/* +%dir %{_datadir}/appdata/ +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/*/%{name}*.png +%{_datadir}/icons/hicolor/*/*/%{name}*.svg +%{_datadir}/icons/HighContrast/*/*/%{name}*.png +%{_datadir}/icons/HighContrast/*/*/%{name}*.svg +%{_datadir}/icons/hicolor/16x16/status/terminal-bell.png +%{_datadir}/icons/HighContrast/16x16/status/terminal-bell.png +%{_datadir}/pixmaps/%{name}.png %files lang -f %{name}.lang +%defattr(-,root,root) %changelog ++++++ 0001-terminator-fix-RHBZ#1268289.patch ++++++ diff -Naur a/ChangeLog b/ChangeLog --- a/ChangeLog 2015-09-08 17:27:00.000000000 +0200 +++ b/ChangeLog 2015-10-10 11:55:37.000000000 +0200 @@ -1,3 +1,11 @@ +terminator trunk: + * Features + * Enhancements + * Bug fixes + * Fix for those not running IBus, where the IBus workaround caused + broken keys in other keymaps set with non-IBus tools (Steve + Boddy, LP#1494606) + terminator 0.98: * Features * Layout launcher with option or shortcut (Steve Boddy) diff -Naur a/debian/changelog b/debian/changelog --- a/debian/changelog 2015-09-08 17:27:00.000000000 +0200 +++ b/debian/changelog 2015-10-10 11:55:37.000000000 +0200 @@ -1,3 +1,9 @@ +terminator (0.98) trusty; urgency=low + + * New upstream release of 0.98 + + -- Stephen Boddy <stephen.j.boddy(a)gmail.com> Wed, 26 Aug 2015 20:28:10 +0200 + terminator (0.97~ppa3) saucy; urgency=low * No-change upload for saucy diff -Naur a/debian/control b/debian/control --- a/debian/control 2015-09-08 17:27:00.000000000 +0200 +++ b/debian/control 2015-10-10 11:55:37.000000000 +0200 @@ -14,7 +14,7 @@ Package: terminator Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-vte, python-gobject, python-gtk2 (>= 2.14.0), gconf2, libgtk2.0-bin, hicolor-icon-theme +Depends: ${python:Depends}, ${misc:Depends}, python-vte, python-gobject, python-gtk2 (>= 2.14.0), python-psutil, gconf2, libgtk2.0-bin, hicolor-icon-theme XB-Python-Version: ${python:Versions} Provides: x-terminal-emulator Recommends: xdg-utils, python-gnome2, python-keybinder diff -Naur a/remotinator b/remotinator --- a/remotinator 2015-09-08 17:27:00.000000000 +0200 +++ b/remotinator 2015-10-10 11:55:37.000000000 +0200 @@ -29,7 +29,7 @@ sys.exit(1) APP_NAME='remotinator' -APP_VERSION='0.97' +APP_VERSION='0.98' COMMANDS={ 'hsplit': ['terminal_hsplit', 'Split the current terminal horizontally'], diff -Naur a/terminator b/terminator --- a/terminator 2015-09-08 17:27:00.000000000 +0200 +++ b/terminator 2015-10-10 11:55:37.000000000 +0200 @@ -20,6 +20,8 @@ import sys import os +import psutil +import pwd try: ORIGCWD = os.getcwd() except OSError: @@ -57,7 +59,11 @@ # Workaround for IBus intefering with broadcast when using dead keys # Environment also needs IBUS_DISABLE_SNOOPER=1, or double chars appear # in the receivers. - os.environ['IBUS_DISABLE_SNOOPER']='1' + username = pwd.getpwuid(os.getuid()).pw_name + ibus_running = [p for p in psutil.process_iter() if p.name == 'ibus-daemon' and p.username == username] + ibus_running = len(ibus_running) > 0 + if ibus_running: + os.environ['IBUS_DISABLE_SNOOPER']='1' dbus_service = None @@ -69,7 +75,6 @@ # launch gui, return selection LAYOUTLAUNCHER=LayoutLauncher() else: - # Attempt to import our dbus server. If one exists already we will just # connect to that and ask for a new window. If not, we will create one and # continue. Failure to import dbus, or the global config option "dbus" @@ -112,6 +117,7 @@ TERMINATOR.set_origcwd(ORIGCWD) TERMINATOR.set_dbus_data(dbus_service) TERMINATOR.reconfigure() + TERMINATOR.ibus_running = ibus_running try: dbg('Creating a terminal with layout: %s' % OPTIONS.layout) diff -Naur a/terminatorlib/terminal.py b/terminatorlib/terminal.py --- a/terminatorlib/terminal.py 2015-09-08 17:27:00.000000000 +0200 +++ b/terminatorlib/terminal.py 2015-10-10 11:55:37.000000000 +0200 @@ -844,13 +844,14 @@ dbg('Terminal::on_keypress: Called on %s with no event' % widget) return(False) - # Workaround for IBus intefering with broadcast when using dead keys + # Workaround for IBus interfering with broadcast when using dead keys # Environment also needs IBUS_DISABLE_SNOOPER=1, or double chars appear # in the receivers. - if (event.state | gtk.gdk.MODIFIER_MASK ) ^ gtk.gdk.MODIFIER_MASK != 0: - dbg('Terminal::on_keypress: Ingore processed event with event.state %d' % event.state) - return(False) - + if self.terminator.ibus_running: + if (event.state | gtk.gdk.MODIFIER_MASK ) ^ gtk.gdk.MODIFIER_MASK != 0: + dbg('Terminal::on_keypress: Ignore processed event with event.state %d' % event.state) + return(False) + # FIXME: Does keybindings really want to live in Terminator()? mapping = self.terminator.keybindings.lookup(event) diff -Naur a/terminatorlib/terminator.py b/terminatorlib/terminator.py --- a/terminatorlib/terminator.py 2015-09-08 17:27:00.000000000 +0200 +++ b/terminatorlib/terminator.py 2015-10-10 11:55:37.000000000 +0200 @@ -32,6 +32,7 @@ pid_cwd = None gnome_client = None debug_address = None + ibus_running = None doing_layout = None layoutname = None

1 0

commit systester for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package systester for openSUSE:Factory checked in at 2016-02-25 22:07:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systester (Old) and /work/SRC/openSUSE:Factory/.systester.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systester" Changes: -------- --- /work/SRC/openSUSE:Factory/systester/systester.changes 2015-05-06 07:49:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systester.new/systester.changes 2016-02-26 00:45:45.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 21 23:35:05 UTC 2016 - crrodriguez(a)opensuse.org + +- Build against QT5. + * systester-qt5.patch + +------------------------------------------------------------------- New: ---- systester-qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systester.spec ++++++ --- /var/tmp/diff_new_pack.nkeTuX/_old 2016-02-26 00:45:46.000000000 +0100 +++ /var/tmp/diff_new_pack.nkeTuX/_new 2016-02-26 00:45:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package systester # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -26,9 +26,12 @@ Source: http://sourceforge.net/projects/systester/files/systester/1.5.0/%{name}-%{v… BuildRequires: gmp-devel BuildRequires: hicolor-icon-theme -BuildRequires: libqt4-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Widgets) BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: systester-qt5.patch ExclusiveArch: ix86 x86_64 %description @@ -40,11 +43,10 @@ %prep %setup -q - +%patch0 -p1 %build -# not a standard configure, don't replace with macro -./configure \ - --prefix=%{_prefix} +export CFLAGS="%optflags" +qmake-qt5 systester.pro QMAKE_CXXFLAGS="%optflags" make %{?_smp_mflags} pushd cli make %{?_smp_mflags} ++++++ systester-qt5.patch ++++++ --- systester-1.5.1.orig/systester.pro +++ systester-1.5.1/systester.pro @@ -1,9 +1,9 @@ include (conf.pri) TEMPLATE = app LANGUAGE = C++ - +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 CONFIG += qt warn_on release -static -QT += network +QT += gui network widgets FORMS = MainWindow.ui \ SplashWindow.ui \ --- systester-1.5.1.orig/SplashForm.cpp +++ systester-1.5.1/SplashForm.cpp @@ -43,8 +43,8 @@ SplashWindow::hideButtons () ui->closeButton->hide (); ui->waitEdit->show (); ui->copyrightEdit->clearHistory (); - ui->copyrightEdit->setOpenExternalLinks (TRUE); - ui->copyrightEdit->setOpenLinks (TRUE); + ui->copyrightEdit->setOpenExternalLinks (true); + ui->copyrightEdit->setOpenLinks (true); } void @@ -53,7 +53,7 @@ SplashWindow::showButtons () ui->licenseButton->show (); ui->closeButton->show (); ui->waitEdit->hide (); - ui->copyrightEdit->setVisible (TRUE); + ui->copyrightEdit->setVisible (true); } void

1 0

commit scantailor for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package scantailor for openSUSE:Factory checked in at 2016-02-25 22:08:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scantailor (Old) and /work/SRC/openSUSE:Factory/.scantailor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scantailor" Changes: -------- --- /work/SRC/openSUSE:Factory/scantailor/scantailor.changes 2015-01-24 22:21:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scantailor.new/scantailor.changes 2016-02-26 00:44:55.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 24 07:06:09 UTC 2016 - dmitry_r(a)opensuse.org + +- Fix build with boost 1.60 + * scantailor-boost-1.60.patch + +------------------------------------------------------------------- New: ---- scantailor-boost-1.60.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scantailor.spec ++++++ --- /var/tmp/diff_new_pack.zHRNvi/_old 2016-02-26 00:44:56.000000000 +0100 +++ /var/tmp/diff_new_pack.zHRNvi/_new 2016-02-26 00:44:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package scantailor # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -25,6 +25,8 @@ Url: http://scantailor.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}-icons.tar.bz2 +# PATCH-FIX-UPSTREAM scantailor-boost-1.60.patch -- Fix build with new boost +Patch1: scantailor-boost-1.60.patch BuildRequires: boost-devel >= 1.42 BuildRequires: cmake BuildRequires: hicolor-icon-theme @@ -52,6 +54,7 @@ %prep %setup -q -a 1 +%patch1 -p1 cp -p resources/icons/{COPYING,COPYING.icons} %build ++++++ scantailor-boost-1.60.patch ++++++ diff --git a/MainWindow.cpp b/MainWindow.cpp index 37426bf..dd0caed 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1898,8 +1898,8 @@ MainWindow::showInsertFileDialog(BeforeOrAfter before_or_after, ImageId const& e ImageFileInfo image_file_info(file_info, std::vector<ImageMetadata>()); ImageMetadataLoader::Status const status = ImageMetadataLoader::load( - files.at(i), bind(&std::vector<ImageMetadata>::push_back, - boost::ref(image_file_info.imageInfo()), _1) + files.at(i), boost::lambda::bind(&std::vector<ImageMetadata>::push_back, + boost::ref(image_file_info.imageInfo()), boost::lambda::_1) ); if (status == ImageMetadataLoader::LOADED) { @@ -1921,7 +1921,7 @@ MainWindow::showInsertFileDialog(BeforeOrAfter before_or_after, ImageId const& e } // Check if there is at least one DPI that's not OK. - if (std::find_if(new_files.begin(), new_files.end(), !bind(&ImageFileInfo::isDpiOK, _1)) != new_files.end()) { + if (std::find_if(new_files.begin(), new_files.end(), !boost::lambda::bind(&ImageFileInfo::isDpiOK, boost::lambda::_1)) != new_files.end()) { std::auto_ptr<FixDpiDialog> dpi_dialog(new FixDpiDialog(new_files, this)); dpi_dialog->setWindowModality(Qt::WindowModal); diff --git a/ThumbnailSequence.cpp b/ThumbnailSequence.cpp index b0dd21a..896b37c 100644 --- a/ThumbnailSequence.cpp +++ b/ThumbnailSequence.cpp @@ -491,7 +491,7 @@ ThumbnailSequence::Impl::Impl( m_pSelectionLeader(0) { m_graphicsScene.setContextMenuEventCallback( - bind(&Impl::sceneContextMenuEvent, this, _1) + boost::lambda::bind(&Impl::sceneContextMenuEvent, this, boost::lambda::_1) ); } @@ -605,7 +605,7 @@ ThumbnailSequence::Impl::invalidateThumbnail(PageInfo const& page_info) { ItemsById::iterator const id_it(m_itemsById.find(page_info.id())); if (id_it != m_itemsById.end()) { - m_itemsById.modify(id_it, bind(&Item::pageInfo, _1) = page_info); + m_itemsById.modify(id_it, boost::lambda::bind(&Item::pageInfo, boost::lambda::_1) = page_info); invalidateThumbnailImpl(id_it); } } @@ -725,10 +725,10 @@ ThumbnailSequence::Impl::invalidateAllThumbnails() // Sort pages in m_itemsInOrder using m_ptrOrderProvider. if (m_ptrOrderProvider.get()) { m_itemsInOrder.sort( - bind( + boost::lambda::bind( &PageOrderProvider::precedes, m_ptrOrderProvider.get(), - bind(&Item::pageId, _1), bind(&Item::incompleteThumbnail, _1), - bind(&Item::pageId, _2), bind(&Item::incompleteThumbnail, _2) + boost::lambda::bind(&Item::pageId, boost::lambda::_1), bind(&Item::incompleteThumbnail, boost::lambda::_1), + boost::lambda::bind(&Item::pageId, boost::lambda::_2), bind(&Item::incompleteThumbnail, boost::lambda::_2) ) ); } diff --git a/filters/deskew/Filter.cpp b/filters/deskew/Filter.cpp index 527d8f6..9fcb5c1 100644 --- a/filters/deskew/Filter.cpp +++ b/filters/deskew/Filter.cpp @@ -85,9 +85,9 @@ Filter::saveSettings(ProjectWriter const& writer, QDomDocument& doc) const QDomElement filter_el(doc.createElement("deskew")); writer.enumPages( - bind( + boost::lambda::bind( &Filter::writePageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/fix_orientation/Filter.cpp b/filters/fix_orientation/Filter.cpp index 6779c21..142b23d 100644 --- a/filters/fix_orientation/Filter.cpp +++ b/filters/fix_orientation/Filter.cpp @@ -100,9 +100,9 @@ Filter::saveSettings( QDomElement filter_el(doc.createElement("fix-orientation")); writer.enumImages( - bind( + boost::lambda::bind( &Filter::writeImageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/output/Filter.cpp b/filters/output/Filter.cpp index dd2f46a..b47c869 100644 --- a/filters/output/Filter.cpp +++ b/filters/output/Filter.cpp @@ -91,9 +91,9 @@ Filter::saveSettings( QDomElement filter_el(doc.createElement("output")); writer.enumPages( - bind( + boost::lambda::bind( &Filter::writePageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/page_layout/Filter.cpp b/filters/page_layout/Filter.cpp index df315c6..7e54d99 100644 --- a/filters/page_layout/Filter.cpp +++ b/filters/page_layout/Filter.cpp @@ -136,9 +136,9 @@ Filter::saveSettings( QDomElement filter_el(doc.createElement("page-layout")); writer.enumPages( - bind( + boost::lambda::bind( &Filter::writePageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/page_split/Filter.cpp b/filters/page_split/Filter.cpp index 83fd165..a830b99 100644 --- a/filters/page_split/Filter.cpp +++ b/filters/page_split/Filter.cpp @@ -110,9 +110,9 @@ Filter::saveSettings( ); writer.enumImages( - bind( + boost::lambda::bind( &Filter::writeImageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) ); diff --git a/filters/select_content/Filter.cpp b/filters/select_content/Filter.cpp index b0361b0..a442c84 100644 --- a/filters/select_content/Filter.cpp +++ b/filters/select_content/Filter.cpp @@ -119,9 +119,9 @@ Filter::saveSettings( QDomElement filter_el(doc.createElement("select-content")); writer.enumPages( - bind( + boost::lambda::bind( &Filter::writePageSettings, - this, boost::ref(doc), var(filter_el), _1, _2 + this, boost::ref(doc), var(filter_el), boost::lambda::_1, boost::lambda::_2 ) );

1 0

commit python3-Django for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package python3-Django for openSUSE:Factory checked in at 2016-02-25 22:08:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-02-08 09:47:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-Django.new/python3-Django.changes 2016-02-26 00:43:06.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 23 13:46:51 UTC 2016 - matwey.kornilov(a)gmail.com + +- Explicitly require Python >= 3.4 (Django 1.9 supports 3.4 and 3.5 only): + https://docs.djangoproject.com/en/1.9/releases/1.9/#python-compatibility + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-Django.spec ++++++ --- /var/tmp/diff_new_pack.TBWTWN/_old 2016-02-26 00:43:07.000000000 +0100 +++ /var/tmp/diff_new_pack.TBWTWN/_new 2016-02-26 00:43:07.000000000 +0100 @@ -27,7 +27,7 @@ Source1: https://www.djangoproject.com/m/pgp/Django-%{version}.checksum.txt Source99: python3-Django-rpmlintrc BuildRequires: fdupes -BuildRequires: python3-devel +BuildRequires: python3-devel >= 3.4 BuildRequires: python3-setuptools Requires: python3-Pillow Requires: python3-xml

1 0

commit python-requests for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package python-requests for openSUSE:Factory checked in at 2016-02-25 22:08:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-requests (Old) and /work/SRC/openSUSE:Factory/.python-requests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-requests" Changes: -------- --- /work/SRC/openSUSE:Factory/python-requests/python-requests.changes 2016-01-01 19:50:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-requests.new/python-requests.changes 2016-02-26 00:42:41.000000000 +0100 @@ -1,0 +2,40 @@ +Wed Feb 17 14:47:12 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 2.9.1 (changes since 2.8.1): + * The verify keyword argument now supports being passed a path to + a directory of CA certificates, not just a single-file bundle. + * Warnings are now emitted when sending files opened in text mode. + * Added the 511 Network Authentication Required status code to the + status code registry. + * For file-like objects that are not seeked to the very beginning, + we now send the content length for the number of bytes we will + actually read, rather than the total size of the file, allowing + partial file uploads. + * When uploading file-like objects, if they are empty or have no + obvious content length we set Transfer-Encoding: chunked rather + than Content-Length: 0. + * We correctly receive the response in buffered mode when + uploading chunked bodies. + * We now handle being passed a query string as a bytestring on + Python 3, by decoding it as UTF-8. + * Sessions are now closed in all cases (exceptional and not) when + using the functional API rather than leaking and waiting for + the garbage collector to clean them up. + * Correctly handle digest auth headers with a malformed qop + directive that contains no token, by treating it the same as if + no qop directive was provided at all. + * Minor performance improvements when removing specific cookies + by name. + * Fix errors when calculating cookie expiration dates in certain + locales. + * Update bundled urllib3 to 1.13.1. +- Rebase no-default-cacert.patch. +- Modify no-default-cacert.patch: output /etc/ssl/ca-bundle.pem + instead of neither NULL nor /etc/ssl/certs/ as a path to cacerts + bundle (boo#967128). +- Don't apply no-default-cacert.patch on SLE. +- Require ca-certificates package (but not on SLE). +- Tests are being improperly started and actual ones require + network connection, so fix and comment out. + +------------------------------------------------------------------- Old: ---- requests-2.8.1.tar.gz New: ---- requests-2.9.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-requests.spec ++++++ --- /var/tmp/diff_new_pack.Qyev6w/_old 2016-02-26 00:42:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Qyev6w/_new 2016-02-26 00:42:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-requests # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,30 +16,36 @@ # +%if 0%{?suse_version} < 1120 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif Name: python-requests -Version: 2.8.1 +Version: 2.9.1 Release: 0 Summary: Awesome Python HTTP Library That's Actually Usable License: Apache-2.0 Group: Development/Languages/Python -Url: http://python-requests.org +Url: http://python-requests.org/ Source: http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz -# PATCH-FIX-OPENSUSE no-default-cacert.patch -- completely ignore the internal CA bundle +# PATCH-FIX-OPENSUSE no-default-cacert.patch -- Completely ignore the internal CA bundle. Patch0: no-default-cacert.patch BuildRequires: python BuildRequires: python-devel BuildRequires: python-py BuildRequires: python-setuptools Requires: python -# really needed? +# Really needed? #Requires: python-ndg-httpsclient Requires: python-pyOpenSSL Requires: python-pyasn1 -%if 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%else +%if 0%{?suse_version} >= 1120 && !(0%{?suse_version} == 1315 && !0%{?is_opensuse}) +BuildRequires: ca-certificates +Requires: ca-certificates +%endif +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%else +BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif %description @@ -67,10 +73,10 @@ %prep %setup -q -n requests-%{version} -# For rpmlint warning: remove shebang from python library: -sed -i '/^#!/d' ./requests/certs.py +%if 0%{?suse_version} >= 1120 && !(0%{?suse_version} == 1315 && !0%{?is_opensuse}) %patch0 -p1 -rm ./requests/cacert.pem +rm -f requests/cacert.pem +%endif %build python setup.py build @@ -79,8 +85,9 @@ python setup.py install \ --root=%{buildroot} --prefix=%{_prefix} -%check -python setup.py test +# Tests require network access. +# %check +# python test_requests.py %files %defattr(-,root,root) ++++++ no-default-cacert.patch ++++++ --- /var/tmp/diff_new_pack.Qyev6w/_old 2016-02-26 00:42:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Qyev6w/_new 2016-02-26 00:42:41.000000000 +0100 @@ -5,7 +5,7 @@ +include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt --- a/requests/adapters.py +++ b/requests/adapters.py -@@ -180,9 +180,6 @@ class HTTPAdapter(BaseAdapter): +@@ -182,9 +182,6 @@ class HTTPAdapter(BaseAdapter): if not cert_loc: cert_loc = DEFAULT_CA_BUNDLE_PATH @@ -13,8 +13,8 @@ - raise Exception("Could not find a suitable SSL CA certificate bundle.") - conn.cert_reqs = 'CERT_REQUIRED' - conn.ca_certs = cert_loc - else: + + if not os.path.isdir(cert_loc): --- a/requests/certs.py +++ b/requests/certs.py @@ -18,8 +18,9 @@ try: @@ -23,9 +23,9 @@ """Return the preferred certificate bundle.""" - # vendored bundle inside Requests - return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ # in openSUSE we rely on openssl's default instead of -+ # hardcoding stuff elsewhere -+ return None ++ # in openSUSE we rely on ca-certificates instead of ++ # having an another bundle ++ return '/etc/ssl/ca-bundle.pem' if __name__ == '__main__': print(where()) ++++++ requests-2.8.1.tar.gz -> requests-2.9.1.tar.gz ++++++ ++++ 2521 lines of diff (skipped)

1 0

commit python-ldap for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '16

25 Feb '16

Hello community, here is the log from the commit of package python-ldap for openSUSE:Factory checked in at 2016-02-25 22:07:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ldap (Old) and /work/SRC/openSUSE:Factory/.python-ldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ldap" Changes: -------- --- /work/SRC/openSUSE:Factory/python-ldap/python-ldap.changes 2016-02-17 12:22:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-ldap.new/python-ldap.changes 2016-02-26 00:42:16.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 23 10:33:29 UTC 2016 - michael(a)stroeder.com + +- Use HTTPS links + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ldap.spec ++++++ --- /var/tmp/diff_new_pack.0BknXA/_old 2016-02-26 00:42:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0BknXA/_new 2016-02-26 00:42:16.000000000 +0100 @@ -22,8 +22,8 @@ Summary: Python LDAP interface License: Python-2.0 Group: Development/Libraries/Python -Url: http://www.python-ldap.org/ -Source: http://pypi.python.org/packages/source/p/python-ldap/python-ldap-%{version}… +Url: https://www.python-ldap.org/ +Source: https://pypi.python.org/packages/source/p/python-ldap/python-ldap-%{version… BuildRequires: cyrus-sasl-devel >= 2.1 BuildRequires: fdupes BuildRequires: krb5-devel

1 0