January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit votca-tools for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package votca-tools for openSUSE:Factory checked in at 2016-01-21 23:43:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-tools (Old) and /work/SRC/openSUSE:Factory/.votca-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "votca-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/votca-tools/votca-tools.changes 2015-10-20 00:05:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.votca-tools.new/votca-tools.changes 2016-01-22 01:09:31.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 15 22:45:01 UTC 2016 - junghans(a)votca.org + +- Upgrade to 1.3 + * details: https://github.com/votca/csg/blob/master/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- votca-tools-1.3_rc1.tar.gz New: ---- votca-tools-1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-tools.spec ++++++ --- /var/tmp/diff_new_pack.SDxLQm/_old 2016-01-22 01:09:34.000000000 +0100 +++ /var/tmp/diff_new_pack.SDxLQm/_new 2016-01-22 01:09:34.000000000 +0100 @@ -1,7 +1,7 @@ # # votca_tools.spec # -# Copyright (c) 2013-2015 Christoph Junghans <junghans(a)votca.org> +# Copyright (c) 2013-2016 Christoph Junghans <junghans(a)votca.org> # # Originally written by Jussi Lehtola <jussilehtola(a)fedoraproject.org> # Fixed for multi-distro build by Klaus Kaempf <kkaempf(a)suse.de> @@ -10,14 +10,13 @@ # Name: votca-tools -Version: 1.3~rc1 -%define uversion 1.3_rc1 +Version: 1.3 Release: 0 Summary: VOTCA tools library Group: Productivity/Scientific/Chemistry License: Apache-2.0 URL: http://www.votca.org -Source0: https://github.com/votca/tools/archive/v%{uversion}.tar.gz#/%{name}-%{uvers… +Source0: https://github.com/votca/tools/archive/v%{version}.tar.gz#/%{name}-%{versio… BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,7 +54,7 @@ %package devel Summary: Development headers and libraries for votca-tools Group: Development/Libraries/C and C++ -Requires: libvotca_tools3 = %{version}-%{release} +Requires: libvotca_tools3 = %{version} %description devel Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is @@ -65,7 +64,7 @@ This package contains development headers and libraries for votca-tools. %prep -%setup -n tools-%{uversion} -q +%setup -n tools-%{version} -q %build %if %{defined fedora} ++++++ votca-tools-1.3_rc1.tar.gz -> votca-tools-1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.3_rc1/.travis.yml new/tools-1.3/.travis.yml --- old/tools-1.3_rc1/.travis.yml 2015-09-23 19:46:08.000000000 +0200 +++ new/tools-1.3/.travis.yml 2016-01-15 22:48:59.000000000 +0100 @@ -4,71 +4,86 @@ language: cpp -before_install: - - if [[ $CTP = yes ]]; then sudo add-apt-repository -y ppa:boost-latest/ppa; fi #newer boost for libboost_timer - - sudo apt-get update - - sudo apt-get install cmake libfftw3-dev libgsl0-dev txt2tags libboost-program-options-dev libboost-filesystem-dev libboost-system-dev libexpat1-dev libsqlite3-dev pkg-config mercurial - - if [[ $MAN ]]; then sudo apt-get install pgf texlive-fonts-recommended texlive-latex-extra doxygen graphviz; fi - - if [[ $TEST = *cma* ]]; then sudo apt-get install python-numpy gnuplot-nox; fi - - if [[ $TEST = *imc ]]; then sudo apt-get install octave; fi - - if [[ $TEST = *simplex* ]]; then sudo apt-get install gnuplot-nox; fi - - if [[ $TEST = *realtime ]]; then sudo apt-get install gnuplot-nox; fi - - if [[ $GROMACS != yes ]]; then sudo apt-get install gromacs-dev; fi - - if [[ $CTP = yes ]]; then sudo apt-get install libboost1.48-all-dev; fi - -env: #NINJA=1 is currently not support by Travis' cmake, enable when >=2.8.9 - - WERROR=yes J=4 #J>4 triggers an internal compiler in travis' g++ - - CTP=yes WERROR=yes J=4 - - CTP=yes WALL=yes J=4 - - J=1 - - BDIR=build J=4 - - BDIR=build J=1 - - MAN=yes J=4 - - MINIMAL=yes J=4 - - CSG_MDRUN_STEPS=500 TEST=hexane/ibi_bonded J=4 - - CSG_MDRUN_STEPS=500 TEST=hexane/ibi J=4 - - CSG_MDRUN_STEPS=500 TEST=methanol/ibi J=4 - - CSG_MDRUN_STEPS=10000 TEST=methanol/imc J=4 - - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.938/re J=4 - - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.938/simplex J=4 - - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.062/re J=4 - - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.062/simplex J=4 - - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.5/re J=4 - - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.5/simplex J=4 - - CSG_MDRUN_STEPS=500 TEST=propane/ibi J=4 - - CSG_MDRUN_STEPS=10000 TEST=propane/imc J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/cma/density J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/cma/simple J=4 GROMACS=yes - - CSG_MDRUN_STEPS=500 TEST=spce/ibi J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/ibi_pressure J=4 - - CSG_MDRUN_STEPS=10000 TEST=spce/imc J=4 - - CSG_MDRUN_STEPS=10000 TEST=spce/realtime J=4 - - CSG_MDRUN_STEPS=5000 TEST=spce/re J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/simplex/density J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/simplex/pressure J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/simplex/simple J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/tf J=4 GROMACS=yes - - CSG_MDRUN_STEPS=500 TEST=urea-water/ibi J=4 - - CSG_MDRUN_STEPS=500 TEST=urea-water/kb-ibi J=4 - -matrix: - exclude: - - compiler: clang - env: J=1 #this test just tests the buildsystem - - compiler: clang - env: BDIR=build J=1 #just tests the buildsystem +sudo: false + +addons: + apt: + sources: boost-latest + packages: + - cmake + - ccache + - libfftw3-dev + - libgsl0-dev + - txt2tags + - libboost1.55-all-dev + - libexpat1-dev + - libsqlite3-dev + - pkg-config + - pgf + - texlive-fonts-recommended + - texlive-latex-extra + - doxygen + - graphviz + - python-numpy + - gnuplot-nox + - octave + - gromacs-dev + +env: + global: + - GMX_MAX_THREADS=8 + - CCACHE_CPP2=yes + matrix: #NINJA=1 is currently not support by Travis' cmake, enable when >=2.8.9 + - WERROR=yes J=4 #J>4 triggers an internal compiler in travis' g++ + - J=1 + - BDIR=build J=4 + - BDIR=build J=1 + - MAN=yes J=4 + - MINIMAL=yes J=4 + - CSG_MDRUN_STEPS=500 TEST=hexane/ibi_bonded J=4 + - CSG_MDRUN_STEPS=500 TEST=hexane/ibi J=4 + - CSG_MDRUN_STEPS=500 TEST=methanol/ibi J=4 + - CSG_MDRUN_STEPS=10000 TEST=methanol/imc J=4 + - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.938/re J=4 + - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.938/simplex J=4 + - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.062/re J=4 + - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.062/simplex J=4 + - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.5/re J=4 + - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.5/simplex J=4 + - CSG_MDRUN_STEPS=500 TEST=propane/ibi J=4 + - CSG_MDRUN_STEPS=10000 TEST=propane/imc J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/cma/density J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/cma/simple J=4 GROMACS=yes + - CSG_MDRUN_STEPS=500 TEST=spce/ibi J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/ibi_pressure J=4 + - CSG_MDRUN_STEPS=10000 TEST=spce/imc J=4 + - CSG_MDRUN_STEPS=10000 TEST=spce/realtime J=4 + - CSG_MDRUN_STEPS=5000 TEST=spce/re J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/simplex/density J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/simplex/pressure J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/simplex/simple J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/tf J=4 GROMACS=yes + - CSG_MDRUN_STEPS=500 TEST=urea-water/ibi J=4 + - CSG_MDRUN_STEPS=500 TEST=urea-water/kb-ibi J=4 before_script: - - rm -vrf * .git - wget https://raw.githubusercontent.com/votca/buildutil/master/build.sh && chmod 755 build.sh - - if [[ $TEST = *cma* ]]; then wget http://www.lri.fr/~hansen/cma.py; fi #we set PYTHONPATH="$PWD" below + - mkdir -p "$HOME/votca/src" "$HOME/votca/share/votca/scripts/inverse" "$HOME/bin" + - wget -O "$HOME/votca/share/votca/scripts/inverse/cma.py" http://www.lri.fr/~hansen/cma.py + - ln -s /usr/bin/ccache "$HOME/bin/clang++" + - ln -s /usr/bin/ccache "$HOME/bin/clang" script: - - PYTHONPATH="$PWD" ./build.sh -Wdu --prefix $PWD ${MAN:+--devdoc} + - PATH="$HOME/bin:/usr/lib/ccache:$PATH" ./build.sh -Wu --prefix "$HOME/votca" ${MAN:+--devdoc} ${TEST:+--runtest=$TEST} ${WERROR:+--warn-to-errors} ${MINIMAL:+--minimal} ${J:+-j$J} ${BDIR:+--builddir=$BDIR} ${NINJA:+--ninja} ${WALL:+--Wall} + --directory "$HOME/votca/src" --no-clean --depth 1 --gmx-release 4.6.7 tools ${GROMACS:+gromacs} csg csgapps ${MAN:+csg-manual} ${TEST:+csg-tutorials} - ${CTP:+kmc moo ctp} + ${CTP:+kmc moo ctp} ${GROMACS:+-DGMX_USE_RDTSCP=OFF} ${GROMACS:+-DGROMACS_PKG_OVERWRITE=libgmx} + +cache: + directories: + - $HOME/.ccache compiler: - clang diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.3_rc1/CMakeLists.txt new/tools-1.3/CMakeLists.txt --- old/tools-1.3_rc1/CMakeLists.txt 2015-09-23 19:46:08.000000000 +0200 +++ new/tools-1.3/CMakeLists.txt 2016-01-15 22:48:59.000000000 +0100 @@ -2,7 +2,7 @@ project(votca-tools) -set(PROJECT_VERSION "1.3_rc1") +set(PROJECT_VERSION "1.3") string(REGEX REPLACE "^[1-9]+\\.([1-9]+).*$" "\\1" SOVERSION "${PROJECT_VERSION}") if (NOT ${SOVERSION} MATCHES "[1-9]+") message(FATAL_ERROR "Could not determind SOVERSION from ${PROJECT_VERSION}")

1 0

commit mate-menu for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package mate-menu for openSUSE:Factory checked in at 2016-01-21 23:43:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-menu (Old) and /work/SRC/openSUSE:Factory/.mate-menu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-menu" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-menu/mate-menu.changes 2016-01-13 22:46:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-menu.new/mate-menu.changes 2016-01-22 01:09:29.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Jan 18 14:08:33 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 5.6.7: + * Fix intends in mate-menu execute.py. + * Do not use mate-folder.png that doesn't exist in freedesktop + specification. + * Fix configurator crash due to changes in Gtk 2.24.29. + * Do not crash if lsb_release is not available (boo#959024). +- Remove 0001-execute-fix.patch, 0001-recent-icon.patch, + 0003-fix-configurator-crash.patch: fixed upstream. +- Add 0001-fix-path-find.patch. +- Only recommend lsb-release. + +------------------------------------------------------------------- Old: ---- 0001-execute-fix.patch 0001-recent-icon.patch 0003-fix-configurator-crash.patch mate-menu-5.6.6.tar.gz New: ---- 0001-fix-path-find.patch mate-menu-5.6.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-menu.spec ++++++ --- /var/tmp/diff_new_pack.QFVbAc/_old 2016-01-22 01:09:31.000000000 +0100 +++ /var/tmp/diff_new_pack.QFVbAc/_new 2016-01-22 01:09:31.000000000 +0100 @@ -17,25 +17,21 @@ %define _name mate_menu -%define _rev 37bbd306cb0c +%define _rev cb3ee3ec1f8e Name: mate-menu -Version: 5.6.6 +Version: 5.6.7 Release: 0 Summary: Advanced MATE menu License: GPL-2.0+ Group: System/GUI/Other -Url: https://bitbucket.org/ubuntu-mate/mate-tweak +Url: https://bitbucket.org/ubuntu-mate/mate-menu Source: https://bitbucket.org/ubuntu-mate/%{name}/get/%{version}.tar.gz#/%{name}-%{… -# PATCH-FIX-UPSTREAM 0001-execute-fix.patch p.drouand(a)gmail.com -- Fix intends in mate-menu execute.py. -Patch0: 0001-execute-fix.patch -# PATCH-FIX-UPSTREAM 0001-recent-icon.patch p.drouand(a)gmail.com -- mate-folder.png icon doesn't exist in icon themes, use folder.png. -Patch1: 0001-recent-icon.patch +# PATCH-FIX-UPSTREAM 0001-fix-path-find.patch sor.alexei(a)meowr.ru +Patch0: 0001-fix-path-find.patch # PATCH-FIX-OPENSUSE 0002-xterm-no-symlink-dep.patch sor.alexei(a)meowr.ru -- Remove dependency on x-terminal-emulator Debian's symlink. -Patch2: 0002-xterm-no-symlink-dep.patch +Patch1: 0002-xterm-no-symlink-dep.patch # PATCH-FEATURE-OPENSUSE 0002-yast2-software.patch sor.alexei(a)meowr.ru -- Use YaST2 and GNOME PackageKit package managers. -Patch3: 0002-yast2-software.patch -# PATCH-FIX-UPSTREAM 0003-fix-configurator-crash.patch sor.alexei(a)meowr.ru -- Fix crash in mate-menu configurator. -Patch4: 0003-fix-configurator-crash.patch +Patch2: 0002-yast2-software.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: python >= 2.4 @@ -46,7 +42,6 @@ Requires: gvfs Requires: libmate-desktop-2-17 Requires: libmate-panel-applet-4-1 -Requires: lsb-release Requires: mate-menus Requires: mozo Requires: python-configobj @@ -56,6 +51,7 @@ Requires: python-xlib Requires: xdg-utils Recommends: %{name}-lang +Recommends: lsb-release BuildArch: noarch %glib2_gsettings_schema_requires @@ -74,8 +70,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 sed -i 's/su-to-root/xdg-su/g' %{_name}/execute.py %build ++++++ 0001-fix-path-find.patch ++++++ diff -paur a/lib/mate-menu.py b/lib/mate-menu.py --- a/lib/mate-menu.py 2016-01-18 16:59:19.000000000 +0300 +++ b/lib/mate-menu.py 2016-01-19 12:52:23.395199920 +0300 @@ -73,19 +73,6 @@ xdg.Config.setWindowManager('MATE') from mate_menu.execute import * -def find_on_path(self, command): - """Is command on the executable search path?""" - if 'PATH' not in os.environ: - return False - path = os.environ['PATH'] - for element in path.split(os.pathsep): - if not element: - continue - filename = os.path.join(element, command) - if os.path.isfile(filename) and os.access(filename, os.X_OK): - return True - return False - class MainWindow( object ): """This is the main class for the application""" @@ -576,12 +563,14 @@ class MenuWin( object ): def createPanelButton( self ): self.button_icon = Gtk.Image.new_from_file( self.buttonIcon ) self.systemlabel = Gtk.Label(label= "%s " % self.buttonText ) - if find_on_path('lsb_release'): + try: process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) out, err = process.communicate() tooltip = out.replace('Description:', '').strip() self.systemlabel.set_tooltip_text(tooltip) self.button_icon.set_tooltip_text(tooltip) + except FileNotFoundError: + pass if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: self.button_box = Gtk.HBox() ++++++ mate-menu-5.6.6.tar.gz -> mate-menu-5.6.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu-config.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu-config.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu-config.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu-config.py 2016-01-18 14:59:19.000000000 +0100 @@ -383,18 +383,27 @@ self.headingColorLabel.set_sensitive( widget.get_active() ) def getBackgroundColor( self ): - color = Gdk.Color(0,0,0) - self.backgroundColor.get_color(color) + try: + color = self.backgroundColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.backgroundColor.get_color(color) return self.gdkColorToString( color ) def getBorderColor( self ): - color = Gdk.Color(0,0,0) - self.borderColor.get_color(color) + try: + color = self.borderColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.borderColor.get_color(color) return self.gdkColorToString( color ) def getHeadingColor( self ): - color = Gdk.Color(0,0,0) - self.headingColor.get_color(color) + try: + color = self.borderColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.borderColor.get_color(color) return self.gdkColorToString( color ) def gdkColorToString( self, gdkColor ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu.py 2016-01-18 14:59:19.000000000 +0100 @@ -19,7 +19,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__='5.6.6' +__VERSION__='5.6.7' import ctypes import gc @@ -73,6 +73,19 @@ from mate_menu.execute import * +def find_on_path(self, command): + """Is command on the executable search path?""" + if 'PATH' not in os.environ: + return False + path = os.environ['PATH'] + for element in path.split(os.pathsep): + if not element: + continue + filename = os.path.join(element, command) + if os.path.isfile(filename) and os.access(filename, os.X_OK): + return True + return False + class MainWindow( object ): """This is the main class for the application""" @@ -563,11 +576,13 @@ def createPanelButton( self ): self.button_icon = Gtk.Image.new_from_file( self.buttonIcon ) self.systemlabel = Gtk.Label(label= "%s " % self.buttonText ) - process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) - out, err = process.communicate() - tooltip = out.replace('Description:', '').strip() - self.systemlabel.set_tooltip_text(tooltip) - self.button_icon.set_tooltip_text(tooltip) + if find_on_path('lsb_release'): + process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) + out, err = process.communicate() + tooltip = out.replace('Description:', '').strip() + self.systemlabel.set_tooltip_text(tooltip) + self.button_icon.set_tooltip_text(tooltip) + if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: self.button_box = Gtk.HBox() self.button_box.pack_start( self.button_icon, False, False, 0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/execute.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/execute.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/execute.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/execute.py 2016-01-18 14:59:19.000000000 +0100 @@ -50,7 +50,7 @@ except Exception, detail: print detail return False - cmd = cmd.split() + cmd = cmd.split() cmd = RemoveArgs(cmd) try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/applications.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/applications.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/applications.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/applications.py 2016-01-18 14:59:19.000000000 +0100 @@ -879,6 +879,7 @@ startupMenuItem.connect( "toggled", self.onAddToStartup, widget ) self.mateMenuWin.stopHiding() + gtk.gtk_menu_popup.argtypes = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_uint, c_uint] gtk.gtk_menu_popup(hash(mTree), None, None, None, None, event.button, event.time) def searchPopup( self, widget=None, event=None ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/recent.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/recent.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/recent.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/recent.py 2016-01-18 14:59:19.000000000 +0100 @@ -57,7 +57,7 @@ self.width = 250 #Plugin icon - self.icon = 'mate-folder.png' + self.icon = 'folder.png' self.settings = EasyGSettings ("org.mate.mate-menu.plugins.recent")

1 0

commit ima-evm-utils for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ima-evm-utils for openSUSE:Factory checked in at 2016-01-21 23:43:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ima-evm-utils (Old) and /work/SRC/openSUSE:Factory/.ima-evm-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ima-evm-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/ima-evm-utils/ima-evm-utils.changes 2015-12-03 13:32:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ima-evm-utils.new/ima-evm-utils.changes 2016-01-22 01:09:26.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 19 09:32:33 UTC 2016 - meissner(a)suse.com + +- ima-evm-utils-fix-docbook-xsl-directory.patch: + fixed the nwalsh docbook directory again + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ima-evm-utils.spec ++++++ --- /var/tmp/diff_new_pack.aleDP7/_old 2016-01-22 01:09:29.000000000 +0100 +++ /var/tmp/diff_new_pack.aleDP7/_new 2016-01-22 01:09:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ima-evm-utils # -# 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define sover 0 %define libname libimaevm%{sover} ++++++ ima-evm-utils-fix-docbook-xsl-directory.patch ++++++ --- /var/tmp/diff_new_pack.aleDP7/_old 2016-01-22 01:09:29.000000000 +0100 +++ /var/tmp/diff_new_pack.aleDP7/_new 2016-01-22 01:09:29.000000000 +0100 @@ -1,12 +1,13 @@ ---- a/Makefile.am.orig 2014-09-23 14:09:05.000000000 +0200 -+++ b/Makefile.am 2015-01-21 18:00:23.762694050 +0100 -@@ -24,7 +24,7 @@ +Index: ima-evm-utils-1.0/Makefile.am +=================================================================== +--- ima-evm-utils-1.0.orig/Makefile.am ++++ ima-evm-utils-1.0/Makefile.am +@@ -24,7 +24,7 @@ rpm: $(tarname) rpmbuild -ba --nodeps $(SPEC) # requires asciidoc, xslproc, docbook-xsl -MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl -+MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/nwalsh/1.78.1/manpages/docbook.xsl ++MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/nwalsh/1.79.0/manpages/docbook.xsl evmctl.1.html: README @asciidoc -o $@ $< -

1 0

commit openlmi-networking for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package openlmi-networking for openSUSE:Factory checked in at 2016-01-21 23:43:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openlmi-networking (Old) and /work/SRC/openSUSE:Factory/.openlmi-networking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openlmi-networking" Changes: -------- --- /work/SRC/openSUSE:Factory/openlmi-networking/openlmi-networking.changes 2015-03-25 10:01:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openlmi-networking.new/openlmi-networking.changes 2016-01-22 01:09:25.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 19 09:12:49 UTC 2016 - kkaempf(a)suse.com + +- NetworkManager changed include directory layout + 0001-Adapt-to-new-NetworkManager-include-directory-layout.patch + +------------------------------------------------------------------- New: ---- 0001-Adapt-to-new-NetworkManager-include-directory-layout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openlmi-networking.spec ++++++ --- /var/tmp/diff_new_pack.4VK8FB/_old 2016-01-22 01:09:26.000000000 +0100 +++ /var/tmp/diff_new_pack.4VK8FB/_new 2016-01-22 01:09:26.000000000 +0100 @@ -35,6 +35,9 @@ # PATCH-FIX-UPSTREAM cim-schema 2.40.0 adds new interfaces Patch4: AddIPProtocolEndpoint_RemoveIPProtocolEndpoint.patch +# PATCH-FIX-OPENSUSE +Patch5: 0001-Adapt-to-new-NetworkManager-include-directory-layout.patch + # Upstream name has been changed from cura-networking to openlmi-networking Provides: cura-networking%{?_isa} = %{version}-%{release} Obsoletes: cura-networking < 0.0.5-1 @@ -78,6 +81,7 @@ %patch2 -p1 %endif %patch4 -p1 +%patch5 -p1 %build %cmake ++++++ 0001-Adapt-to-new-NetworkManager-include-directory-layout.patch ++++++ >From c5ed50ef195391c14f869af04c7200d23b170c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 19 Jan 2016 10:10:11 +0100 Subject: [PATCH] Adapt to new NetworkManager include directory layout Latest NetworkManager seems to have moved include files from /usr/include to /usr/include/NetworkManager. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9b3f8c4be731..a654437e8011 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,7 +46,7 @@ add_library(${LIBRARY_NAME} SHARED include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${KONKRETCMPI_INCLUDE_DIR} ${DBUSGLIB_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} - ${NM_INCLUDE_DIR} ${UUID_INCLUDE_DIR} ${OPENLMI_INCLUDE_DIR} + ${NM_INCLUDE_DIRS} ${UUID_INCLUDE_DIR} ${OPENLMI_INCLUDE_DIR} ) target_link_libraries(${LIBRARY_NAME} ${KONKRETCMPI_LIBRARIES} ${DBUSGLIB_LIBRARIES} -- 2.7.0

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2016-01-21 23:43:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2015-12-09 22:14:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-01-22 01:09:21.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Jan 15 16:13:32 UTC 2016 - kgronlund(a)suse.com + +- Update to version 2.2.0+git.1452874360.0988ac4: + + Release 2.2.0 + + low: don't use deprecated crm_attribute -U option + + high: cibconfig: Fix XML import bug for cloned groups (bsc#959895) + + medium: ui_cib: Call crm_shadow in batch mode to avoid spawning subshell (bsc#961392) + + high: cibconfig: fail if new object already exists (bsc#959965) + + high: cibconfig: Preserve failure through edit (bsc#959965) + + low: hb_report: Drop function from event patterns + + medium: ui_history: Add events command (bsc#952449) + + medium: scripts: Reformat scripts to simplified form + + medium: scripts: Load single file yml scripts + + low: clidisplay: Avoid crash when colorizing None + + medium: cibconfig: Detect false container children + + medium: history: Ignore central log + + medium: history: Fix live report refresh (bsc#950422) (bsc#927414) + +------------------------------------------------------------------- Old: ---- crmsh-2.2.0~rc3+git.1449475283.649c9d2.tar.bz2 New: ---- crmsh-2.2.0+git.1452874360.0988ac4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.siH12D/_old 2016-01-22 01:09:24.000000000 +0100 +++ /var/tmp/diff_new_pack.siH12D/_new 2016-01-22 01:09:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package crmsh # -# 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 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0~rc3+git.1449475283.649c9d2 +Version: 2.2.0+git.1452874360.0988ac4 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 @@ -196,8 +196,7 @@ %defattr(-,root,root) %{_sbindir}/crm -%{python_sitelib}/crmsh -%{python_sitelib}/crmsh*.egg-info +%{python_sitelib}/crmsh* %{_datadir}/%{name} %exclude %{_datadir}/%{name}/tests ++++++ _service ++++++ --- /var/tmp/diff_new_pack.siH12D/_old 2016-01-22 01:09:24.000000000 +0100 +++ /var/tmp/diff_new_pack.siH12D/_new 2016-01-22 01:09:24.000000000 +0100 @@ -3,7 +3,7 @@ <param name="url">git://github.com/ClusterLabs/crmsh.git</param> <param name="scm">git</param> <param name="filename">crmsh</param> - <param name="versionformat">2.2.0~rc3+git.%ct.%h</param> + <param name="versionformat">2.2.0+git.%ct.%h</param> <param name="revision">master</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.siH12D/_old 2016-01-22 01:09:24.000000000 +0100 +++ /var/tmp/diff_new_pack.siH12D/_new 2016-01-22 01:09:24.000000000 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">649c9d2f0f4a178adadc74f084e565e7f16ee7af</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">0988ac4d1d2b42a705640bd946f3eb9420258d65</param></service></servicedata> \ No newline at end of file ++++++ crmsh-2.2.0~rc3+git.1449475283.649c9d2.tar.bz2 -> crmsh-2.2.0+git.1452874360.0988ac4.tar.bz2 ++++++ ++++ 8213 lines of diff (skipped)

1 0

commit uhd for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package uhd for openSUSE:Factory checked in at 2016-01-21 23:43:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uhd (Old) and /work/SRC/openSUSE:Factory/.uhd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "uhd" Changes: -------- --- /work/SRC/openSUSE:Factory/uhd/uhd.changes 2016-01-01 19:50:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.uhd.new/uhd.changes 2016-01-22 01:09:17.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 31 10:22:49 UTC 2015 - wk(a)ire.pw.edu.pl + +- Update sources to version 3.9.2 +- Drop 0003-uhd-C-API-wrapper-fix-commit-30f87afcba71a07.patch: + included upstream + +------------------------------------------------------------------- Old: ---- 0003-uhd-C-API-wrapper-fix-commit-30f87afcba71a07.patch uhd-3.9.1.tar.gz uhd-images_003.009.001-release.tar.gz New: ---- uhd-3.9.2.tar.gz uhd-images_003.009.002-release.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uhd.spec ++++++ --- /var/tmp/diff_new_pack.3jtHV4/_old 2016-01-22 01:09:20.000000000 +0100 +++ /var/tmp/diff_new_pack.3jtHV4/_new 2016-01-22 01:09:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package uhd # -# 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 @@ -18,17 +18,16 @@ Name: uhd %define libname libuhd003 -Version: 3.9.1 +Version: 3.9.2 Release: 0 -%define src_ver 003.009.001 -%define img_ver 003.009.001 +%define src_ver 003.009.002 +%define img_ver 003.009.002 Summary: The driver for USRP SDR boards License: GPL-3.0+ Group: Hardware/Other Url: http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki Source0: http://files.ettus.com/binaries/uhd_stable/uhd_%{src_ver}-release/uhd-%{ver… Source1: http://files.ettus.com/binaries/images/uhd-images_%{img_ver}-release.tar.gz -Patch0: 0003-uhd-C-API-wrapper-fix-commit-30f87afcba71a07.patch BuildRequires: boost-devel >= 1.36 BuildRequires: cmake >= 2.6 BuildRequires: docutils @@ -110,7 +109,6 @@ %prep %setup -q -%patch0 -p2 # remove buildtime from documentation echo "HTML_TIMESTAMP = NO" >> docs/Doxyfile.in ++++++ uhd-3.9.1.tar.gz -> uhd-3.9.2.tar.gz ++++++ ++++ 4855 lines of diff (skipped) ++++++ uhd-images_003.009.001-release.tar.gz -> uhd-images_003.009.002-release.tar.gz ++++++ /work/SRC/openSUSE:Factory/uhd/uhd-images_003.009.001-release.tar.gz /work/SRC/openSUSE:Factory/.uhd.new/uhd-images_003.009.002-release.tar.gz differ: char 5, line 1

1 0

commit virt-manager for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2016-01-21 23:43:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2016-01-08 15:23:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2016-01-22 01:09:12.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Jan 18 13:43:47 MST 2016 - carnold(a)suse.com + +- bsc#962221 - virt-install: 'NoneType' object has no attribute + 'isdigit' + eae7dc06-fix-URL-installs-when-content-length-header-missing.patch + +------------------------------------------------------------------- +Fri Jan 8 11:50:46 MST 2016 - carnold(a)suse.com + +- bsc#960828 - Unable to create qcow2 volumes on remote KVM with + virt-manager + virtinst-vol-default-nocow.patch +- bsc#960724 - virt-manager fails to create Virtual machines on a + CentOS7 host + virtinst-set-qemu-emulator.patch +- Upstream bug fix + 89c3638b-fix-detection-that-libvirtd-is-stopped.patch + +------------------------------------------------------------------- New: ---- 89c3638b-fix-detection-that-libvirtd-is-stopped.patch eae7dc06-fix-URL-installs-when-content-length-header-missing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -37,6 +37,8 @@ Source1: virt-install.rb Source2: virt-install.desktop # Upstream Patches +Patch1: 89c3638b-fix-detection-that-libvirtd-is-stopped.patch +Patch2: eae7dc06-fix-URL-installs-when-content-length-header-missing.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -157,6 +159,8 @@ %prep %setup -q # Upstream Patches +%patch1 -p1 +%patch2 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 ++++++ 89c3638b-fix-detection-that-libvirtd-is-stopped.patch ++++++ Subject: connection: fix detection that libvirtd is stopped From: Pavel Hrdina phrdina(a)redhat.com Tue Jan 5 10:17:37 2016 +0100 Date: Fri Jan 8 10:21:42 2016 +0100: Git: 89c3638b63e5b251db92ef7066c1753bfa469d38 In case that libvirtd is stopped, we could receive another type of error from libvirt "libvirtError: internal error: client socket is closed". This one is usually reported from local connection. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> Index: virt-manager-1.3.2/virtManager/connection.py =================================================================== --- virt-manager-1.3.2.orig/virtManager/connection.py +++ virt-manager-1.3.2/virtManager/connection.py @@ -1298,6 +1298,7 @@ class vmmConnection(vmmGObject): from_remote = getattr(libvirt, "VIR_FROM_REMOTE", None) from_rpc = getattr(libvirt, "VIR_FROM_RPC", None) sys_error = getattr(libvirt, "VIR_ERR_SYSTEM_ERROR", None) + internal_error = getattr(libvirt, "VIR_ERR_INTERNAL_ERROR", None) dom = -1 code = -1 @@ -1309,7 +1310,7 @@ class vmmConnection(vmmGObject): self.get_uri(), exc_info=True) if (dom in [from_remote, from_rpc] and - code in [sys_error]): + code in [sys_error, internal_error]): e = None logging.debug("Not showing user error since libvirtd " "appears to have stopped.") ++++++ eae7dc06-fix-URL-installs-when-content-length-header-missing.patch ++++++ Subject: urlfetcher: Fix URL installs when content-length header missing From: Cole Robinson crobinso(a)redhat.com Tue Jan 12 12:45:02 2016 -0500 Date: Tue Jan 12 12:45:02 2016 -0500: Git: eae7dc061968a83fef8ebb632c8f939621ff22b1 Suggested-by: bduff(a)sjm.com Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== --- virt-manager-1.3.2.orig/virtinst/urlfetcher.py +++ virt-manager-1.3.2/virtinst/urlfetcher.py @@ -186,8 +186,11 @@ class _HTTPURLFetcher(_URLFetcher): """ response = requests.get(url, stream=True) response.raise_for_status() - size = response.headers.get('content-length') - return response, size.isdigit() and int(size) or None + try: + size = int(response.headers.get('content-length')) + except: + size = None + return response, size def _write(self, urlobj, fileobj): """ ++++++ virtinst-add-ppc64-arch-support.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,10 +1,10 @@ Reference: bnc#869024 Add s390x and ppc64 support -Index: virt-manager-1.3.0/virtinst/urlfetcher.py +Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.3.0/virtinst/urlfetcher.py -@@ -427,6 +427,10 @@ def _distroFromSUSEContent(fetcher, arch +--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.2/virtinst/urlfetcher.py +@@ -430,6 +430,10 @@ def _distroFromSUSEContent(fetcher, arch arch = "i586" elif cbuf.find("s390x") != -1: arch = "s390x" @@ -15,7 +15,7 @@ dclass = GenericDistro if distribution: -@@ -966,10 +970,12 @@ class SuseDistro(Distro): +@@ -969,10 +973,12 @@ class SuseDistro(Distro): oldkern += "64" oldinit += "64" ++++++ virtinst-detect-oes-distros.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,10 +1,10 @@ Enhancement to correctly detect Open Enterprise Server media is selected as the installation source. -Index: virt-manager-1.3.0/virtinst/urlfetcher.py +Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.3.0/virtinst/urlfetcher.py -@@ -439,6 +439,10 @@ def _distroFromSUSEContent(fetcher, arch +--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.2/virtinst/urlfetcher.py +@@ -442,6 +442,10 @@ def _distroFromSUSEContent(fetcher, arch dclass = SLEDDistro if distro_version is None: distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] ++++++ virtinst-nfs-install-sanitize.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -5,10 +5,10 @@ and carry the latter form around internally" We need the RFC version to work correctly whereas redhat's anaconda needs their own modified version. -Index: virt-manager-1.3.0/virtinst/util.py +Index: virt-manager-1.3.2/virtinst/util.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/util.py -+++ virt-manager-1.3.0/virtinst/util.py +--- virt-manager-1.3.2.orig/virtinst/util.py ++++ virt-manager-1.3.2/virtinst/util.py @@ -552,3 +552,22 @@ def getInstallRepos(enabled_sources_only return (index_dom0, zypper_output) @@ -32,10 +32,10 @@ + + return url + -Index: virt-manager-1.3.0/virtinst/distroinstaller.py +Index: virt-manager-1.3.2/virtinst/distroinstaller.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/distroinstaller.py -+++ virt-manager-1.3.0/virtinst/distroinstaller.py +--- virt-manager-1.3.2.orig/virtinst/distroinstaller.py ++++ virt-manager-1.3.2/virtinst/distroinstaller.py @@ -49,6 +49,8 @@ def _sanitize_url(url): """ Do nothing for http or ftp, but make sure nfs is in the expected format @@ -45,10 +45,10 @@ if url.startswith("nfs://"): # Convert RFC compliant NFS nfs://server/path/to/distro # to what mount/anaconda expect nfs:server:/path/to/distro -Index: virt-manager-1.3.0/virtinst/urlfetcher.py +Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.3.0/virtinst/urlfetcher.py +--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.2/virtinst/urlfetcher.py @@ -33,6 +33,7 @@ import urllib2 import urlparse @@ -57,7 +57,7 @@ ######################################################################### -@@ -295,7 +296,8 @@ class _MountedURLFetcher(_LocalURLFetche +@@ -298,7 +299,8 @@ class _MountedURLFetcher(_LocalURLFetche logging.debug("Preparing mount at " + self._srcdir) if self.location.startswith("nfs:"): ++++++ virtinst-s390x-disable-graphics.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,9 +1,9 @@ Reference: bnc#869024 Disable graphics on s390x -Index: virt-manager-1.3.0/virtinst/guest.py +Index: virt-manager-1.3.2/virtinst/guest.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/guest.py -+++ virt-manager-1.3.0/virtinst/guest.py +--- virt-manager-1.3.2.orig/virtinst/guest.py ++++ virt-manager-1.3.2/virtinst/guest.py @@ -123,7 +123,10 @@ class Guest(XMLBuilder): self.skip_default_channel = False self.skip_default_sound = False @@ -43,7 +43,7 @@ return self.add_device(VirtualGraphics(self.conn)) -@@ -1052,7 +1057,7 @@ class Guest(XMLBuilder): +@@ -1034,7 +1039,7 @@ class Guest(XMLBuilder): if self._hv_only_supports_virtio(): return True ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,43 +1,26 @@ Use the correct qemu emulator based on the architecture. We want to get away from using the old qemu-dm emulator for Xen HVM guests so default to qemu-system-i386. -Index: virt-manager-1.3.0/virtinst/guest.py +Index: virt-manager-1.3.2/virtinst/guest.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/guest.py -+++ virt-manager-1.3.0/virtinst/guest.py -@@ -849,14 +849,29 @@ class Guest(XMLBuilder): +--- virt-manager-1.3.2.orig/virtinst/guest.py ++++ virt-manager-1.3.2/virtinst/guest.py +@@ -849,14 +849,11 @@ class Guest(XMLBuilder): self.emulator = None return - if self.emulator: -+ if self.conn.is_qemu(): -+ if self.os.arch == "s390x": -+ preferred_emulator = "/usr/bin/qemu-system-s390x" -+ elif self.os.arch == "ppc64" or self.os.arch == "ppc64le": -+ preferred_emulator = "/usr/bin/qemu-system-ppc64" -+ else: -+ preferred_emulator = "/usr/bin/qemu-system-x86_64" -+ elif self.conn.is_lxc(): -+ preferred_emulator = "/usr/lib/libvirt/libvirt_lxc" -+ if not os.path.exists(preferred_emulator): -+ preferred_emulator = "/usr/lib64/libvirt/libvirt_lxc" -+ else: -+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386" -+ if self.emulator and self.emulator == preferred_emulator: - return - -- if self.os.is_hvm() and self.type == "xen": +- return +- + if self.os.is_hvm() and self.type == "xen": - if self.conn.caps.host.cpu.arch == "x86_64": - self.emulator = "/usr/lib64/xen/bin/qemu-dm" - else: - self.emulator = "/usr/lib/xen/bin/qemu-dm" -+ if os.path.exists(preferred_emulator): -+ self.emulator = preferred_emulator -+ elif self.os.is_hvm() and self.type == "xen": -+ # We don't want to use the old qemu-dm for xen -+ self.emulator = "/usr/lib/xen/bin/qemu-system-i386" -+ elif not self.emulator: -+ self.emulator = "/usr/bin/qemu-kvm" ++ # Force not using Xen's old qemu-dm except for remote ++ # connections where we don't know the Xen version ++ if not self.conn.is_remote() or not self.emulator: ++ self.emulator = "/usr/lib/xen/bin/qemu-system-i386" def _set_cpu_defaults(self): self.cpu.set_topology_defaults(self.vcpus) ++++++ virtinst-vol-default-nocow.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -4,19 +4,33 @@ Signed-off-by: Chunyan Liu <cyliu(a)suse.com> -Index: virt-manager-1.3.0/virtinst/storage.py +Index: virt-manager-1.3.2/virtinst/storage.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/storage.py -+++ virt-manager-1.3.0/virtinst/storage.py -@@ -716,6 +716,11 @@ class StorageVolume(_StorageObject): +--- virt-manager-1.3.2.orig/virtinst/storage.py ++++ virt-manager-1.3.2/virtinst/storage.py +@@ -716,6 +716,12 @@ class StorageVolume(_StorageObject): lazy_refcounts = XMLProperty("./target/features/lazy_refcounts", is_bool=True, default_cb=_lazy_refcounts_default_cb) + def _nocow_default_cb(self): -+ return True ++ return self.conn.check_support( ++ self.conn.SUPPORT_CONN_NOCOW) + nocow = XMLProperty("./target/nocow", + is_bool=True, default_cb=_nocow_default_cb) + ###################### # Public API helpers # +Index: virt-manager-1.3.2/virtinst/support.py +=================================================================== +--- virt-manager-1.3.2.orig/virtinst/support.py ++++ virt-manager-1.3.2/virtinst/support.py +@@ -314,6 +314,8 @@ SUPPORT_CONN_VCPU_PLACEMENT = _make( + SUPPORT_CONN_MEM_STATS_PERIOD = _make( + function="virDomain.setMemoryStatsPeriod", + version="1.1.1", hv_version={"qemu": 0}) ++SUPPORT_CONN_NOCOW = _make( ++ version="1.2.18", hv_version={"qemu": "2.2.0", "test": 0}) + + # This is for disk <driver name=qemu>. xen supports this, but it's + # limited to arbitrary new enough xen, since I know libxl can handle it ++++++ virtman-add-connect-default.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,10 +1,10 @@ Enhancement for when no hypervisor can be found locally it opens the new connection dialog. -Index: virt-manager-1.3.0/virtManager/engine.py +Index: virt-manager-1.3.2/virtManager/engine.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/engine.py -+++ virt-manager-1.3.0/virtManager/engine.py -@@ -207,9 +207,6 @@ class vmmEngine(vmmGObject): +--- virt-manager-1.3.2.orig/virtManager/engine.py ++++ virt-manager-1.3.2/virtManager/engine.py +@@ -236,9 +236,6 @@ class vmmEngine(vmmGObject): except: logging.exception("Error talking to PackageKit") @@ -14,7 +14,7 @@ warnmsg = _("The 'libvirtd' service will need to be started.\n\n" "After that, virt-manager will connect to libvirt on\n" "the next application start up.") -@@ -223,7 +220,11 @@ class vmmEngine(vmmGObject): +@@ -252,7 +249,11 @@ class vmmEngine(vmmGObject): if not connected and do_start: manager.err.ok(_("Libvirt service must be started"), warnmsg) ++++++ virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -6,11 +6,11 @@ 4) Edit the VM's /etc/default/grub file and remove the crashkernel information and then run grub2-mkconfig /boot/grub2/grub.cfg. 5) Start the VM and within the VM's terminal type "echo 'c' > /proc/sysrq-trigger" -Index: virt-manager-1.3.0/virtManager/manager.py +Index: virt-manager-1.3.2/virtManager/manager.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/manager.py -+++ virt-manager-1.3.0/virtManager/manager.py -@@ -857,7 +857,7 @@ class vmmManager(vmmGObjectUI): +--- virt-manager-1.3.2.orig/virtManager/manager.py ++++ virt-manager-1.3.2/virtManager/manager.py +@@ -854,7 +854,7 @@ class vmmManager(vmmGObjectUI): show_pause = bool(vm and vm.is_unpauseable()) else: show_pause = bool(vm and vm.is_pauseable()) @@ -19,10 +19,10 @@ if vm and vm.managedsave_supported: self.change_run_text(vm.has_managed_save()) -Index: virt-manager-1.3.0/virtManager/vmmenu.py +Index: virt-manager-1.3.2/virtManager/vmmenu.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/vmmenu.py -+++ virt-manager-1.3.0/virtManager/vmmenu.py +--- virt-manager-1.3.2.orig/virtManager/vmmenu.py ++++ virt-manager-1.3.2/virtManager/vmmenu.py @@ -31,6 +31,7 @@ class _VMMenu(Gtk.Menu): self._parent = src self._current_vm_cb = current_vm_cb ++++++ virtman-eepro100.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:16.000000000 +0100 @@ -1,9 +1,9 @@ Enhancement to add the eepro100 NIC for KVM -Index: virt-manager-1.3.0/virtManager/addhardware.py +Index: virt-manager-1.3.2/virtManager/addhardware.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/addhardware.py -+++ virt-manager-1.3.0/virtManager/addhardware.py -@@ -565,6 +565,7 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-1.3.2.orig/virtManager/addhardware.py ++++ virt-manager-1.3.2/virtManager/addhardware.py +@@ -571,6 +571,7 @@ class vmmAddHardware(vmmGObjectUI): if vm.is_hvm(): mod_list = [] if vm.get_hv_type() in ["kvm", "qemu", "test"]: ++++++ virtman-libvirtd-not-running.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:16.000000000 +0100 @@ -1,9 +1,9 @@ Use the correct systemd to start libvirt. -Index: virt-manager-1.3.0/virtManager/packageutils.py +Index: virt-manager-1.3.2/virtManager/packageutils.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/packageutils.py -+++ virt-manager-1.3.0/virtManager/packageutils.py -@@ -154,8 +154,8 @@ def start_libvirtd(): +--- virt-manager-1.3.2.orig/virtManager/packageutils.py ++++ virt-manager-1.3.2/virtManager/packageutils.py +@@ -143,8 +143,8 @@ def start_libvirtd(): logging.debug("libvirtd not running, asking system-config-services " "to start it") scs = Gio.DBusProxy.new_sync(bus, 0, None, ++++++ virtman-load-stored-uris.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:16.000000000 +0100 @@ -1,7 +1,8 @@ -diff -rup a/virtManager/engine.py b/virtManager/engine.py ---- a/virtManager/engine.py 2015-12-07 01:23:13.000000000 +0100 -+++ b/virtManager/engine.py 2015-12-13 15:39:06.911652459 +0100 -@@ -260,9 +260,22 @@ class vmmEngine(vmmGObject): +Index: virt-manager-1.3.2/virtManager/engine.py +=================================================================== +--- virt-manager-1.3.2.orig/virtManager/engine.py ++++ virt-manager-1.3.2/virtManager/engine.py +@@ -257,9 +257,22 @@ class vmmEngine(vmmGObject): def load_stored_uris(self): uris = self.config.get_conn_uris() or [] ++++++ virtman-packages.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:16.000000000 +0100 @@ -4,10 +4,10 @@ libvirt packages (kvm vs xen). Only install those libvirt packages for which the host is booted. This patch has a corresponding spec file change (%define libvirt_kvm_packages and %define libvirt_xen_packages). -Index: virt-manager-1.3.0/setup.py +Index: virt-manager-1.3.2/setup.py =================================================================== ---- virt-manager-1.3.0.orig/setup.py -+++ virt-manager-1.3.0/setup.py +--- virt-manager-1.3.2.orig/setup.py ++++ virt-manager-1.3.2/setup.py @@ -299,8 +299,11 @@ class configure(distutils.core.Command): ("prefix=", None, "installation prefix"), ("qemu-user=", None, @@ -45,10 +45,10 @@ if self.kvm_package_names is not None: template += "hv_packages = %s\n" % self.kvm_package_names if self.askpass_package_names is not None: -Index: virt-manager-1.3.0/virtcli/cliconfig.py +Index: virt-manager-1.3.2/virtcli/cliconfig.py =================================================================== ---- virt-manager-1.3.0.orig/virtcli/cliconfig.py -+++ virt-manager-1.3.0/virtcli/cliconfig.py +--- virt-manager-1.3.2.orig/virtcli/cliconfig.py ++++ virt-manager-1.3.2/virtcli/cliconfig.py @@ -83,7 +83,8 @@ class _CLIConfig(object): _get_param("preferred_distros", "")) self.hv_packages = _split_list(_get_param("hv_packages", "")) @@ -59,10 +59,10 @@ self.default_graphics = _get_param("default_graphics", "spice") self.default_hvs = _split_list(_get_param("default_hvs", "")) -Index: virt-manager-1.3.0/virtManager/config.py +Index: virt-manager-1.3.2/virtManager/config.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/config.py -+++ virt-manager-1.3.0/virtManager/config.py +--- virt-manager-1.3.2.orig/virtManager/config.py ++++ virt-manager-1.3.2/virtManager/config.py @@ -172,7 +172,8 @@ class vmmConfig(object): self.default_qemu_user = CLIConfig.default_qemu_user self.preferred_distros = CLIConfig.preferred_distros @@ -73,11 +73,11 @@ self.askpass_package = CLIConfig.askpass_package self.default_graphics_from_config = CLIConfig.default_graphics self.default_hvs = CLIConfig.default_hvs -Index: virt-manager-1.3.0/virtManager/engine.py +Index: virt-manager-1.3.2/virtManager/engine.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/engine.py -+++ virt-manager-1.3.0/virtManager/engine.py -@@ -197,21 +197,18 @@ class vmmEngine(vmmGObject): +--- virt-manager-1.3.2.orig/virtManager/engine.py ++++ virt-manager-1.3.2/virtManager/engine.py +@@ -226,21 +226,18 @@ class vmmEngine(vmmGObject): ret = None try:

1 0

commit virt-viewer for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at 2016-01-21 23:43:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old) and /work/SRC/openSUSE:Factory/.virt-viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-viewer" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2015-12-20 10:52:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-viewer.new/virt-viewer.changes 2016-01-22 01:09:09.000000000 +0100 @@ -1,0 +2,58 @@ +Mon Jan 11 08:51:09 MST 2016 - carnold(a)suse.com + +- Update to virt-viewer version 3.1 + virt-viewer-3.1.tar.bz2 + - Last release to support GTK2 for Linux. The next 4.0 release + will be GTK3 only + - Don’t add URI scheme / path info to oVirt URIs + - Require spice-gtk >= 0.30 + - Enable webdav folder sharing with spice + - Add preferences UI dialog + - Take –direct into account when checking if guest is reachable + - Take SPICE proxy into account when connecting to oVirt + instances + - Fail gracefully when hostname is not returned by oVirt + - Don’t show empty foreign menu on secondary displays + - Avoid accidentally trying to connect to port 0 when oVirt + doesn’t specify a port number + - Correctly update geometry when enabling/disabling display heads + - Avoid accidentally creating extra monitors when using + configuration file monitor mapping + - Exit normally when cancelling connect dialog + - Don’t wait for a guest that we know will never show up + - Fix crash when using –reconnect with SPICE + - Avoid zooming out if it would decrease window size below + minimum required for top menu display + - Fix crash when disabling last enabled display + - Honour changes in display position from guest + - Don’t show error dialog twice for unknown graphics type + - Allow to cancel oVirt auth without error + - Set sensitivity of display menu based on whether it is usable + or not + - Set sensitivity of tool bar buttons based on whether they are + usable or not + - Set guest name reported by VNC + - Fix crash when using gtk-vnc 0.3.8 + - Fix alt-tab behaviour in choose VM dialog + - Don’t allow missing display in monitor mapping config + - Add –with-osid flag to configure to allow specifying the + operating system build target. The values should be based on + libosinfo OS short IDs. + - Ensure windows installer places menu icon for all users not + just admin. Requires manual uninstall of previous windows + version + - Require address in remote viewer connect dialog + - Automatically retry VNC connection after auth failure + - Drop GTK2 support for Windows builds + - Enable keepalives on libvirt conncetion + - Allow resize of window to arbitrary size + - Fix thread safety handling event callbacks + - Avoid deprecation warnings with newer glib + - Pulled in multiple fixes for event loop from libvirt-glib + - Fix misc bugs reported by coverity + - Fix binary ID in MSI installer + - Stop polling libvirt after reconnecting to libvirt +- Drop old tarball + virt-viewer-3.0.tar.bz2 + +------------------------------------------------------------------- Old: ---- virt-viewer-3.0.tar.bz2 New: ---- virt-viewer-3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package virt-viewer # -# 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if %suse_version >= 1315 %define gtk_arg --with-gtk=3.0 %else @@ -25,10 +26,10 @@ Summary: Virtual Machine Viewer License: GPL-2.0+ Group: System/Monitoring -Version: 3.0 +Version: 3.1 Release: 0 Url: http://www.virt-manager.org -Source0: virt-viewer-3.0.tar.bz2 +Source0: virt-viewer-3.1.tar.bz2 Patch50: netcat.patch Patch51: windows-keycombo.patch Patch52: netware-keycombo.patch ++++++ netcat.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:11.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-viewer-3.0/src/virt-viewer-app.c +Index: virt-viewer-3.1/src/virt-viewer-app.c =================================================================== ---- virt-viewer-3.0.orig/src/virt-viewer-app.c -+++ virt-viewer-3.0/src/virt-viewer-app.c +--- virt-viewer-3.1.orig/src/virt-viewer-app.c ++++ virt-viewer-3.1/src/virt-viewer-app.c @@ -691,7 +691,7 @@ virt_viewer_app_open_tunnel_ssh(const ch else g_string_append_printf(cat, "UNIX-CONNECT:%s", unixsock); ++++++ netware-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:11.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-viewer-3.0/src/virt-viewer-window.c +Index: virt-viewer-3.1/src/virt-viewer-window.c =================================================================== ---- virt-viewer-3.0.orig/src/virt-viewer-window.c -+++ virt-viewer-3.0/src/virt-viewer-window.c +--- virt-viewer-3.1.orig/src/virt-viewer-window.c ++++ virt-viewer-3.1/src/virt-viewer-window.c @@ -538,6 +538,15 @@ static const struct keyComboDef keyCombo { { GDK_Control_L, GDK_Alt_L, GDK_BackSpace, GDK_VoidSymbol }, N_("Ctrl+Alt+_Backspace"), NULL}, { { GDK_Control_R, GDK_Scroll_Lock, GDK_Scroll_Lock, GDK_VoidSymbol }, N_("Ctrl+Scroll+Scroll"), NULL}, @@ -27,10 +27,10 @@ { { GDK_Control_L, GDK_Alt_L, GDK_F11, GDK_VoidSymbol }, N_("Ctrl+Alt+F11"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F12, GDK_VoidSymbol }, N_("Ctrl+Alt+F12"), NULL}, { { GDK_VoidSymbol }, "" , NULL}, -Index: virt-viewer-3.0/src/virt-gtk-compat.h +Index: virt-viewer-3.1/src/virt-gtk-compat.h =================================================================== ---- virt-viewer-3.0.orig/src/virt-gtk-compat.h -+++ virt-viewer-3.0/src/virt-gtk-compat.h +--- virt-viewer-3.1.orig/src/virt-gtk-compat.h ++++ virt-viewer-3.1/src/virt-gtk-compat.h @@ -35,13 +35,17 @@ G_BEGIN_DECLS #if GTK_CHECK_VERSION(3, 0, 0) ++++++ reverse-3d5627d7-for-xen.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:11.000000000 +0100 @@ -8,10 +8,10 @@ Even when the server doesn't provide a display connection address, virt-viewer is able to connect to guest with libvirt attach. -Index: virt-viewer-3.0/src/virt-viewer.c +Index: virt-viewer-3.1/src/virt-viewer.c =================================================================== ---- virt-viewer-3.0.orig/src/virt-viewer.c -+++ virt-viewer-3.0/src/virt-viewer.c +--- virt-viewer-3.1.orig/src/virt-viewer.c ++++ virt-viewer-3.1/src/virt-viewer.c @@ -428,18 +428,17 @@ virt_viewer_extract_connect_info(VirtVie ghost = virt_viewer_extract_xpath_string(xmldesc, xpath); } else { ++++++ virt-viewer-3.0.tar.bz2 -> virt-viewer-3.1.tar.bz2 ++++++ ++++ 71557 lines of diff (skipped) ++++++ virtview-desktop.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:12.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:12.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-viewer-3.0/data/remote-viewer.desktop.in +Index: virt-viewer-3.1/data/remote-viewer.desktop.in =================================================================== ---- virt-viewer-3.0.orig/data/remote-viewer.desktop.in -+++ virt-viewer-3.0/data/remote-viewer.desktop.in +--- virt-viewer-3.1.orig/data/remote-viewer.desktop.in ++++ virt-viewer-3.1/data/remote-viewer.desktop.in @@ -1,10 +1,22 @@ [Desktop Entry] _Name=Remote Viewer ++++++ windows-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:12.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:12.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-viewer-3.0/src/virt-viewer-window.c +Index: virt-viewer-3.1/src/virt-viewer-window.c =================================================================== ---- virt-viewer-3.0.orig/src/virt-viewer-window.c -+++ virt-viewer-3.0/src/virt-viewer-window.c +--- virt-viewer-3.1.orig/src/virt-viewer-window.c ++++ virt-viewer-3.1/src/virt-viewer-window.c @@ -536,6 +536,7 @@ struct keyComboDef { static const struct keyComboDef keyCombos[] = { { { GDK_Control_L, GDK_Alt_L, GDK_Delete, GDK_VoidSymbol }, N_("Ctrl+Alt+_Del"), "<virt-viewer>/send/secure-attention"}, @@ -10,10 +10,10 @@ { { GDK_VoidSymbol }, "" , NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F1, GDK_VoidSymbol }, N_("Ctrl+Alt+F_1"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F2, GDK_VoidSymbol }, N_("Ctrl+Alt+F_2"), NULL}, -Index: virt-viewer-3.0/src/virt-gtk-compat.h +Index: virt-viewer-3.1/src/virt-gtk-compat.h =================================================================== ---- virt-viewer-3.0.orig/src/virt-gtk-compat.h -+++ virt-viewer-3.0/src/virt-gtk-compat.h +--- virt-viewer-3.1.orig/src/virt-gtk-compat.h ++++ virt-viewer-3.1/src/virt-gtk-compat.h @@ -37,6 +37,8 @@ G_BEGIN_DECLS #define GDK_Shift_L GDK_KEY_Shift_L #define GDK_VoidSymbol GDK_KEY_VoidSymbol

1 0

commit tulip for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at 2016-01-21 23:43:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tulip (Old) and /work/SRC/openSUSE:Factory/.tulip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tulip" Changes: -------- --- /work/SRC/openSUSE:Factory/tulip/tulip.changes 2015-10-12 10:02:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2016-01-22 01:09:00.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Jan 11 08:37:00 UTC 2016 - kkaempf(a)suse.com + +- Update to 4.8.0 + This release offers some new features, mainly : + - new layout plugins coming from the newly integrated OGDF v2015.05 + - an improved version of the Color mapping plugin with predefined + color schemes added from ColorBrewer.org + - a compressed format for the TLPB import/export plugins + + It adds some improvements in : + - the computation performance of K-Core and Louvain clustering measures + - the graphical user interface of the Self Organizing map dedicated view + + Many bugs have been also fixed especially in : + - the Python dedicated view and IDE + - the Edge bundling plugin + - the Scatter plot, Histogram and Pixel oriented dedicated views + +- drop 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch + (upstream) + +------------------------------------------------------------------- Old: ---- 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch tulip-4.7.0_src.tar.gz New: ---- tulip-4.8.0_src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tulip # -# 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 @@ -20,11 +20,11 @@ Summary: Visualization of huge graphs License: GPL-2.0+ Group: Productivity/Graphics/Visualization/Graph -Version: 4.7.0 +# .so version +%define tulip_version 4.8 +Version: %{tulip_version}.0 Release: 0 Url: http://www.tulip-software.org/ -# .so version -%define tulip_version 4.7 Source: %{name}-%{version}_src.tar.gz Source1: %{name}.desktop Source4: %{name}-rpmlintrc @@ -40,7 +40,6 @@ # Fix FindFTGL.cmake Patch6: 0006-Find-system-ftgl.patch # FIX-UPSTREAM (upstream commit r10874) -Patch7: 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch Patch8: use-libbfd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -175,7 +174,7 @@ Group: Productivity/Graphics/Visualization/Graph %description -n libtulip -See package 'tulip' for details. +A library for handling large graphs. See package 'tulip' for details. %package ogdf Summary: A library for displaying graph in a GL context @@ -183,7 +182,7 @@ Requires: Mesa %description ogdf -See package 'tulip' for details. +A library for displaying graph in a GL context. See package 'tulip' for details. %package python Summary: Python bindings for tulip @@ -202,10 +201,10 @@ Requires: Mesa %description -n libtulip-ogl -See package 'tulip' for details. +A library for displaying graph in a GL context. See package 'tulip' for details. %prep -%setup -q -n %{name} +%setup -q dos2unix CMakeLists.txt %patch1 -p1 # not yet %patch2 -p1 @@ -213,7 +212,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %build @@ -252,7 +250,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a rm -f $RPM_BUILD_ROOT/%{_datadir}/tulip/doc/tulip-user/html/.buildinfo rm -f $RPM_BUILD_ROOT/%{_datadir}/tulip/doc/tulip-python/html/.buildinfo -%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip/doc +%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip %fdupes $RPM_BUILD_ROOT%{_docdir}/tulip %fdupes $RPM_BUILD_ROOT%{_includedir}/tulip @@ -264,6 +262,18 @@ %postun -n libtulip-ogl -p /sbin/ldconfig +%post ogdf -p /sbin/ldconfig + +%postun ogdf -p /sbin/ldconfig + +%post python -p /sbin/ldconfig + +%postun python -p /sbin/ldconfig + +%post devel -p /sbin/ldconfig + +%postun devel -p /sbin/ldconfig + %files %defattr(-,root,root) %{_bindir}/tulip @@ -283,8 +293,19 @@ %files python %defattr(-,root,root) %{_libdir}/libtulip-python-%{tulip_version}.so -%{python_sitearch}/*.so -%{python_sitearch}/*.py* +%dir %{python_sitearch}/tulip +%dir %{python_sitearch}/tulip/native +%dir %{python_sitearch}/tulipgui +%dir %{python_sitearch}/tulipgui/native +%dir %{python_sitearch}/tulipogl +%dir %{python_sitearch}/tulipogl/native +%{python_sitearch}/tulip/native/*.so +%{python_sitearch}/tulip/*.py* +%{python_sitearch}/tulipgui/native/*.so +%{python_sitearch}/tulipgui/*.py* +%{python_sitearch}/tulipogl/native/*.so +%{python_sitearch}/tulipogl/*.py* +%{python_sitearch}/tulipplugins.py* %dir %{_datadir}/tulip/apiFiles %{_datadir}/tulip/apiFiles/* ++++++ 0001-Install-to-lib64.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 5322882d51bdf94ce0558320e956e926feccfa9f Mon Sep 17 00:00:00 2001 +From 07873ab7e6904e1c9ed21b260a1b91c4442318b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 09:51:21 +0100 Subject: [PATCH 1/6] Install to lib64 @@ -8,10 +8,10 @@ 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c493239d1cfa..3ed6f49567f2 100644 +index 8f4af01a80b9..60e795702b5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -387,7 +387,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) +@@ -520,7 +520,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) ## ======================================================== ## Install paths ## ======================================================== @@ -26,5 +26,5 @@ SET(TulipGlyphPluginsInstallDir ${TulipPluginsInstallDir}/glyph/) SET(TulipViewPluginsInstallDir ${TulipPluginsInstallDir}/view/) -- -2.1.4 +2.6.4 ++++++ 0002-Enable-tlprender.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 0749491e172afae66aa9d209ddcbdae1c80b2d8e Mon Sep 17 00:00:00 2001 +From efa26e169d37c61262bb3d495829a1948b38dc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 09:52:57 +0100 Subject: [PATCH 2/6] Enable tlprender @@ -17,5 +17,5 @@ ENDIF(APPLE) +ADD_SUBDIRECTORY(tlprender) -- -2.1.4 +2.6.4 ++++++ 0003-Enable-PPC-and-PPC64.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 51037fee41d564fd20eb64ba9556f69a0c381450 Mon Sep 17 00:00:00 2001 +From d60ad852f5bee564d95a3effae2f9ade1d2afd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 09:56:52 +0100 Subject: [PATCH 3/6] Enable PPC and PPC64 @@ -23,5 +23,5 @@ #define OS_ARCHITECTURE "other" #endif -- -2.1.4 +2.6.4 ++++++ 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 087e4bdbdbddb3d3be72c13fdf30375cb378f526 Mon Sep 17 00:00:00 2001 +From 9d7722acd89c08b695a6d674906490c05dfd0fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 10:03:05 +0100 Subject: [PATCH 4/6] Include string.h for libpng16 in GlTextureManager.cpp @@ -20,5 +20,5 @@ #include <tulip/GlTextureManager.h> -- -2.1.4 +2.6.4 ++++++ 0005-Use-system-ftgl-lib-if-available.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,48 +1,49 @@ -From 2c50bea125f608970371d879e084d25232736bf0 Mon Sep 17 00:00:00 2001 +From e07efca6e14eacf4de651b8a4e5333a44c0bb5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 10:15:54 +0100 Subject: [PATCH 5/6] Use system ftgl lib if available --- CMakeLists.txt | 10 ++++++++-- - thirdparty/CMakeLists.txt | 2 ++ - 2 files changed, 10 insertions(+), 2 deletions(-) + thirdparty/CMakeLists.txt | 4 +++- + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ed6f49567f2..248ef79f3f97 100644 +index 60e795702b5f..75123c7f8424 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -363,8 +363,14 @@ endif(QUAZIP_FOUND) +@@ -495,8 +495,14 @@ IF(NOT BUILD_CORE_ONLY) - SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src) - SET(QxtLibrary qxt-tulip-${TulipMMVersion}) --SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) --SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) -+IF(SYSTEM_FTGL) -+ FIND_PACKAGE(FTGL) -+ SET(FTGLInclude ${FTGL_INCLUDE_DIR}) -+ SET(FTGLLibrary ${FTGL_LIBRARIES}) -+ELSE() -+ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) -+ SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) -+ENDIF() + SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src) + SET(QxtLibrary qxt-tulip-${TulipMMVersion}) +- SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) +- SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) ++ IF(SYSTEM_FTGL) ++ FIND_PACKAGE(FTGL) ++ SET(FTGLInclude ${FTGL_INCLUDE_DIR}) ++ SET(FTGLLibrary ${FTGL_LIBRARIES}) ++ ELSE() ++ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) ++ SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) ++ ENDIF() + SET(Tess2Include ${PROJECT_SOURCE_DIR}/thirdparty/libtess2/Include) + SET(Tess2Library tess2-tulip-${TulipMMVersion}) ENDIF(NOT BUILD_CORE_ONLY) - - SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 49dd579a1780..3161df543454 100644 +index 50c05a73346a..8f1675327b13 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt -@@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(libqhull) +@@ -7,7 +7,9 @@ ADD_SUBDIRECTORY(OGDF) + ADD_SUBDIRECTORY(libqhull) ADD_SUBDIRECTORY(yajl) - IF(NOT BUILD_CORE_ONLY) +-ADD_SUBDIRECTORY(ftgl) +IF(NOT SYSTEM_FTGL) - ADD_SUBDIRECTORY(ftgl) ++ ADD_SUBDIRECTORY(ftgl) +ENDIF(NOT SYSTEM_FTGL) + ADD_SUBDIRECTORY(libtess2) IF(NOT QUAZIP_FOUND) ADD_SUBDIRECTORY(quazip) - ENDIF(NOT QUAZIP_FOUND) -- -2.1.4 +2.6.4 ++++++ 0006-Find-system-ftgl.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 90e5d27d3e4f1215faa12a7b318f8fdf4f94f178 Mon Sep 17 00:00:00 2001 +From 0c5415a5b819536fd4e8e20fc65fa0122d08b101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 11:04:20 +0100 Subject: [PATCH 6/6] Find system ftgl @@ -39,5 +39,5 @@ /usr/X11/lib /usr/X11R6/lib -- -2.1.4 +2.6.4 ++++++ tulip-4.7.0_src.tar.gz -> tulip-4.8.0_src.tar.gz ++++++ /work/SRC/openSUSE:Factory/tulip/tulip-4.7.0_src.tar.gz /work/SRC/openSUSE:Factory/.tulip.new/tulip-4.8.0_src.tar.gz differ: char 5, line 1

1 0

commit ghc-prelude-extras for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-prelude-extras for openSUSE:Factory checked in at 2016-01-21 23:43:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-prelude-extras (Old) and /work/SRC/openSUSE:Factory/.ghc-prelude-extras.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-prelude-extras" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-prelude-extras/ghc-prelude-extras.changes 2015-09-17 09:19:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-prelude-extras.new/ghc-prelude-extras.changes 2016-01-22 01:08:51.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 18 12:22:55 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.4.0.3 +* Add instances for Const +* Add instances for tuples up to 9 + +------------------------------------------------------------------- Old: ---- prelude-extras-0.4.0.2.tar.gz New: ---- prelude-extras-0.4.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-prelude-extras.spec ++++++ --- /var/tmp/diff_new_pack.PJcD1l/_old 2016-01-22 01:08:53.000000000 +0100 +++ /var/tmp/diff_new_pack.PJcD1l/_new 2016-01-22 01:08:53.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name prelude-extras Name: ghc-prelude-extras -Version: 0.4.0.2 +Version: 0.4.0.3 Release: 0 Summary: Haskell 98 - higher order versions of Prelude classes License: BSD-3-Clause ++++++ prelude-extras-0.4.0.2.tar.gz -> prelude-extras-0.4.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prelude-extras-0.4.0.2/CHANGELOG.markdown new/prelude-extras-0.4.0.3/CHANGELOG.markdown --- old/prelude-extras-0.4.0.2/CHANGELOG.markdown 2015-09-09 16:25:36.000000000 +0200 +++ new/prelude-extras-0.4.0.3/CHANGELOG.markdown 2016-01-17 02:56:58.000000000 +0100 @@ -1,3 +1,8 @@ +0.4.0.3 +------- +* Add instances for `Const` +* Add instances for tuples up to 9 + 0.4.0.2 ------- * Mark `Prelude.Extras` as Trustworthy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prelude-extras-0.4.0.2/LICENSE new/prelude-extras-0.4.0.3/LICENSE --- old/prelude-extras-0.4.0.2/LICENSE 2015-09-09 16:25:36.000000000 +0200 +++ new/prelude-extras-0.4.0.3/LICENSE 2016-01-17 02:56:58.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright 2011-2014 Edward Kmett +Copyright 2011-2016 Edward Kmett All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prelude-extras-0.4.0.2/prelude-extras.cabal new/prelude-extras-0.4.0.3/prelude-extras.cabal --- old/prelude-extras-0.4.0.2/prelude-extras.cabal 2015-09-09 16:25:36.000000000 +0200 +++ new/prelude-extras-0.4.0.3/prelude-extras.cabal 2016-01-17 02:56:58.000000000 +0100 @@ -1,6 +1,6 @@ name: prelude-extras category: Polymorphism, Combinators -version: 0.4.0.2 +version: 0.4.0.3 license: BSD3 cabal-version: >= 1.6 license-file: LICENSE @@ -9,7 +9,7 @@ stability: provisional homepage: http://github.com/ekmett/prelude-extras bug-reports: http://github.com/ekmett/prelude-extras/issues -copyright: Copyright (C) 2011-2014 Edward A. Kmett +copyright: Copyright (C) 2011-2016 Edward A. Kmett synopsis: Higher order versions of Prelude classes tested-with: GHC == 7.10.2, GHC == 7.8.4, GHC == 7.6.3, GHC == 7.4.2, GHC == 7.0.4 description: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prelude-extras-0.4.0.2/src/Prelude/Extras.hs new/prelude-extras-0.4.0.3/src/Prelude/Extras.hs --- old/prelude-extras-0.4.0.2/src/Prelude/Extras.hs 2015-09-09 16:25:36.000000000 +0200 +++ new/prelude-extras-0.4.0.3/src/Prelude/Extras.hs 2016-01-17 02:56:58.000000000 +0100 @@ -1,12 +1,12 @@ {-# LANGUAGE CPP #-} -{-# LANGUAGE DeriveFunctor #-} -{-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveTraversable #-} -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ > 702 +{-# LANGUAGE StandaloneDeriving #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +#if __GLASGOW_HASKELL__ > 702 #define DEFAULT_SIGNATURES {-# LANGUAGE DefaultSignatures #-} #endif -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 701 +#if __GLASGOW_HASKELL__ >= 701 -- GHC.Conc isn't generally safe, but we're just using TVar {-# LANGUAGE Trustworthy #-} #endif @@ -44,13 +44,16 @@ ) where import Control.Applicative -import Control.Arrow (first) -import Control.Concurrent (Chan, MVar) -import Data.Complex (Complex) import Data.Fixed import Data.IORef (IORef) import Data.Monoid +#if MIN_VERSION_base(4,4,0) +import Data.Complex (Complex) import Data.Ratio (Ratio) +import Control.Concurrent (Chan, MVar) +#else +import Control.Concurrent (MVar) +#endif import Foreign.ForeignPtr (ForeignPtr) import Foreign.Ptr (Ptr, FunPtr) import Foreign.StablePtr (StablePtr) @@ -80,7 +83,7 @@ class Eq1 f where (==#) :: Eq a => f a -> f a -> Bool #ifdef DEFAULT_SIGNATURES - default (==#) :: (Eq (f a), Eq a) => f a -> f a -> Bool + default (==#) :: Eq (f a) => f a -> f a -> Bool (==#) = (==) #endif @@ -88,9 +91,7 @@ a /=# b = not (a ==# b) instance Eq1 Maybe where - Just a ==# Just b = a == b - Nothing ==# Nothing = True - _ ==# _ = False + (==#) = (==) instance Eq a => Eq1 (Either a) where (==#) = (==) @@ -100,7 +101,7 @@ #if MIN_VERSION_base(4,8,0) instance Eq1 Identity where (==#) = (==) -instance Eq1 f => Eq1 (Alt f) where Alt x ==# Alt y = x ==# y +deriving instance Eq1 f => Eq1 (Alt f) #endif #if MIN_VERSION_base(4,7,0) instance Eq1 Proxy where (==#) = (==) @@ -111,6 +112,12 @@ #if MIN_VERSION_base(4,6,0) instance Eq1 Down where (==#) = (==) #endif +#if MIN_VERSION_base(4,8,0) +instance Eq a => Eq1 (Const a) where (==#) = (==) +#else +instance Eq a => Eq1 (Const a) where + Const a ==# Const b = a == b +#endif instance Eq1 Dual where (==#) = (==) instance Eq1 Sum where (==#) = (==) instance Eq1 Product where (==#) = (==) @@ -130,23 +137,48 @@ instance Eq1 Chan where (==#) = (==) #endif +instance Eq a => Eq1 ((,) a) where (==#) = (==) +instance (Eq a, Eq b) => Eq1 ((,,) a b) where (==#) = (==) +instance (Eq a, Eq b, Eq c) => Eq1 ((,,,) a b c) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d) => Eq1 ((,,,,) a b c d) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e) => Eq1 ((,,,,,) a b c d e) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f) => Eq1 ((,,,,,,) a b c d e f) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g) => Eq1 ((,,,,,,,) a b c d e f g) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g, Eq h) => Eq1 ((,,,,,,,,) a b c d e f g h) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g, Eq h, Eq i) => Eq1 ((,,,,,,,,,) a b c d e f g h i) where (==#) = (==) + class Eq2 f where (==##) :: (Eq a, Eq b) => f a b -> f a b -> Bool #ifdef DEFAULT_SIGNATURES - default (==##) :: (Eq (f a b), Eq a, Eq b) => f a b -> f a b -> Bool + default (==##) :: Eq (f a b) => f a b -> f a b -> Bool (==##) = (==) #endif (/=##) :: (Eq2 f, Eq a, Eq b) => f a b -> f a b -> Bool a /=## b = not (a ==## b) -instance Eq2 Either where - (==##) = (==) +instance Eq2 Either where (==##) = (==) + +#if MIN_VERSION_base(4,8,0) +instance Eq2 Const where (==##) = (==) +#else +instance Eq2 Const where Const x ==## Const y = x == y +#endif + +instance Eq2 (,) where (==##) = (==) +instance Eq a => Eq2 ((,,) a) where (==##) = (==) +instance (Eq a, Eq b) => Eq2 ((,,,) a b) where (==##) = (==) +instance (Eq a, Eq b, Eq c) => Eq2 ((,,,,) a b c) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d) => Eq2 ((,,,,,) a b c d) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e) => Eq2 ((,,,,,,) a b c d e) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f) => Eq2 ((,,,,,,,) a b c d e f) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g) => Eq2 ((,,,,,,,,) a b c d e f g) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g, Eq h) => Eq2 ((,,,,,,,,,) a b c d e f g h) where (==##) = (==) class Eq1 f => Ord1 f where compare1 :: Ord a => f a -> f a -> Ordering #ifdef DEFAULT_SIGNATURES - default compare1 :: (Ord (f a), Ord a) => f a -> f a -> Ordering + default compare1 :: Ord (f a) => f a -> f a -> Ordering compare1 = compare #endif @@ -171,7 +203,7 @@ instance Ord1 [] where compare1 = compare #if MIN_VERSION_base(4,8,0) instance Ord1 Identity where compare1 = compare -instance Ord1 f => Ord1 (Alt f) where compare1 (Alt x) (Alt y) = compare1 x y +deriving instance Ord1 f => Ord1 (Alt f) #endif #if MIN_VERSION_base(4,7,0) instance Ord1 Proxy where compare1 = compare @@ -182,6 +214,12 @@ #if MIN_VERSION_base(4,6,0) instance Ord1 Down where compare1 = compare #endif +#if MIN_VERSION_base(4,8,0) +instance Ord a => Ord1 (Const a) where compare1 = compare +#else +instance Ord a => Ord1 (Const a) where + compare1 (Const x) (Const y) = compare x y +#endif instance Ord1 Dual where compare1 = compare instance Ord1 Sum where compare1 = compare instance Ord1 Product where compare1 = compare @@ -192,6 +230,16 @@ instance Ord1 ForeignPtr where compare1 = compare instance Ord1 Fixed where compare1 = compare +instance Ord a => Ord1 ((,) a) where compare1 = compare +instance (Ord a, Ord b) => Ord1 ((,,) a b) where compare1 = compare +instance (Ord a, Ord b, Ord c) => Ord1 ((,,,) a b c) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d) => Ord1 ((,,,,) a b c d) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e) => Ord1 ((,,,,,) a b c d e) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f) => Ord1 ((,,,,,,) a b c d e f) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g) => Ord1 ((,,,,,,,) a b c d e f g) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g, Ord h) => Ord1 ((,,,,,,,,) a b c d e f g h) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g, Ord h, Ord i) => Ord1 ((,,,,,,,,,) a b c d e f g h i) where compare1 = compare + -- needs Haskell 2011 -- instance Ord1 Complex where compare1 = compare @@ -199,7 +247,7 @@ class Eq2 f => Ord2 f where compare2 :: (Ord a, Ord b) => f a b -> f a b -> Ordering #ifdef DEFAULT_SIGNATURES - default compare2 :: (Ord (f a b), Ord a, Ord b) => f a b -> f a b -> Ordering + default compare2 :: Ord (f a b) => f a b -> f a b -> Ordering compare2 = compare #endif @@ -224,11 +272,26 @@ | otherwise = y instance Ord2 Either where compare2 = compare +#if MIN_VERSION_base(4,8,0) +instance Ord2 Const where compare2 = compare +#else +instance Ord2 Const where Const x `compare2` Const y = compare x y +#endif + +instance Ord2 (,) where compare2 = compare +instance Ord a => Ord2 ((,,) a) where compare2 = compare +instance (Ord a, Ord b) => Ord2 ((,,,) a b) where compare2 = compare +instance (Ord a, Ord b, Ord c) => Ord2 ((,,,,) a b c) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d) => Ord2 ((,,,,,) a b c d) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e) => Ord2 ((,,,,,,) a b c d e) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f) => Ord2 ((,,,,,,,) a b c d e f) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g) => Ord2 ((,,,,,,,,) a b c d e f g) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g, Ord h) => Ord2 ((,,,,,,,,,) a b c d e f g h) where compare2 = compare class Show1 f where showsPrec1 :: Show a => Int -> f a -> ShowS #ifdef DEFAULT_SIGNATURES - default showsPrec1 :: (Show (f a), Show a) => Int -> f a -> ShowS + default showsPrec1 :: Show (f a) => Int -> f a -> ShowS showsPrec1 = showsPrec #endif showList1 :: (Show a) => [f a] -> ShowS @@ -237,14 +300,12 @@ show1 :: (Show1 f, Show a) => f a -> String show1 x = shows1 x "" - shows1 :: (Show1 f, Show a) => f a -> ShowS shows1 = showsPrec1 0 instance Show1 Maybe where showsPrec1 = showsPrec instance Show1 [] where showsPrec1 = showsPrec instance Show a => Show1 (Either a) where showsPrec1 = showsPrec -instance Show a => Show1 ((,) a) where showsPrec1 = showsPrec #if MIN_VERSION_base(4,8,0) instance Show1 Identity where showsPrec1 = showsPrec #endif @@ -266,6 +327,15 @@ $ showString "Alt " . showsPrec1 11 x #endif +#if MIN_VERSION_base(4,8,0) +instance Show a => Show1 (Const a) where showsPrec1 = showsPrec +#else +instance Show a => Show1 (Const a) where + showsPrec1 p (Const x) + = showParen (p > 10) + $ showString "Const " + . showsPrec 11 x +#endif instance Show1 Dual where showsPrec1 = showsPrec instance Show1 Sum where showsPrec1 = showsPrec instance Show1 Product where showsPrec1 = showsPrec @@ -278,12 +348,20 @@ instance Show1 Complex where showsPrec1 = showsPrec #endif --- instance Show1 Complex +instance Show a => Show1 ((,) a) where showsPrec1 = showsPrec +instance (Show a, Show b) => Show1 ((,,) a b) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c) => Show1 ((,,,) a b c) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d) => Show1 ((,,,,) a b c d) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e) => Show1 ((,,,,,) a b c d e) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f) => Show1 ((,,,,,,) a b c d e f) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g) => Show1 ((,,,,,,,) a b c d e f g) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g, Show h) => Show1 ((,,,,,,,,) a b c d e f g h) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g, Show h, Show i) => Show1 ((,,,,,,,,,) a b c d e f g h i) where showsPrec1 = showsPrec class Show2 f where showsPrec2 :: (Show a, Show b) => Int -> f a b -> ShowS #ifdef DEFAULT_SIGNATURES - default showsPrec2 :: (Show (f a b), Show a, Show b) => Int -> f a b -> ShowS + default showsPrec2 :: Show (f a b) => Int -> f a b -> ShowS showsPrec2 = showsPrec #endif showList2 :: (Show a, Show b) => [f a b] -> ShowS @@ -296,8 +374,22 @@ shows2 :: (Show2 f, Show a, Show b) => f a b -> ShowS shows2 = showsPrec2 0 -instance Show2 (,) where showsPrec2 = showsPrec instance Show2 Either where showsPrec2 = showsPrec +#if MIN_VERSION_base(4,8,0) +instance Show2 Const where showsPrec2 = showsPrec +#else +instance Show2 Const where showsPrec2 = showsPrec1 +#endif + +instance Show2 (,) where showsPrec2 = showsPrec +instance Show a => Show2 ((,,) a) where showsPrec2 = showsPrec +instance (Show a, Show b) => Show2 ((,,,) a b) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c) => Show2 ((,,,,) a b c) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d) => Show2 ((,,,,,) a b c d) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e) => Show2 ((,,,,,,) a b c d e) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f) => Show2 ((,,,,,,,) a b c d e f) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g) => Show2 ((,,,,,,,,) a b c d e f g) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g, Show h) => Show2 ((,,,,,,,,,) a b c d e f g h) where showsPrec2 = showsPrec showList__ :: (a -> ShowS) -> [a] -> ShowS showList__ _ [] s = "[]" ++ s @@ -309,7 +401,7 @@ class Read1 f where readsPrec1 :: Read a => Int -> ReadS (f a) #ifdef DEFAULT_SIGNATURES - default readsPrec1 :: (Read (f a), Read a) => Int -> ReadS (f a) + default readsPrec1 :: Read (f a) => Int -> ReadS (f a) readsPrec1 = readsPrec #endif @@ -362,10 +454,6 @@ readsPrec1 = readsPrec readList1 = readList -instance Read a => Read1 ((,) a) where - readsPrec1 = readsPrec - readList1 = readList - #if MIN_VERSION_base(4,8,0) instance Read1 Identity where readsPrec1 = readsPrec @@ -389,7 +477,6 @@ readList1 = readList #else instance Read1 ZipList where - readList1 = readList1Default readsPrec1 _ = readParen False $ \s -> do ("ZipList" , s1) <- lex s @@ -407,13 +494,24 @@ readList1 = readList #elif MIN_VERSION_base(4,6,0) instance Read1 Down where - readList1 = readList1Default readsPrec1 p = readParen (p > 10) $ \s -> do ("Down",s1) <- lex s (x ,s2) <- readsPrec 11 s1 return (Down x, s2) #endif +#if MIN_VERSION_base(4,8,0) +instance Read a => Read1 (Const a) where + readsPrec1 = readsPrec + readList1 = readList +#else +instance Read a => Read1 (Const a) where + readsPrec1 p = readParen (p > 10) $ \s -> + do ("Const",s1) <- lex s + (x ,s2) <- readsPrec 11 s1 + return (Const x, s2) +#endif + instance Read1 Dual where readsPrec1 = readsPrec readList1 = readList @@ -440,10 +538,20 @@ readList1 = readList #endif +instance Read a => Read1 ((,) a) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b) => Read1 ((,,) a b) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c) => Read1 ((,,,) a b c) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d) => Read1 ((,,,,) a b c d) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e) => Read1 ((,,,,,) a b c d e) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f) => Read1 ((,,,,,,) a b c d e f) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g) => Read1 ((,,,,,,,) a b c d e f g) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g, Read h) => Read1 ((,,,,,,,,) a b c d e f g h) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g, Read h, Read i) => Read1 ((,,,,,,,,,) a b c d e f g h i) where readsPrec1 = readsPrec; readList1 = readList + class Read2 f where readsPrec2 :: (Read a, Read b) => Int -> ReadS (f a b) #ifdef DEFAULT_SIGNATURES - default readsPrec2 :: (Read (f a b), Read a, Read b) => Int -> ReadS (f a b) + default readsPrec2 :: Read (f a b) => Int -> ReadS (f a b) readsPrec2 = readsPrec #endif readList2 :: (Read a, Read b) => ReadS [f a b] @@ -457,13 +565,29 @@ readListPrec2 = readS_to_Prec (\_ -> readList2) #endif -instance Read2 (,) where +instance Read2 Either where readsPrec2 = readsPrec readList2 = readList -instance Read2 Either where +#if MIN_VERSION_base(4,8,0) +instance Read2 Const where readsPrec2 = readsPrec readList2 = readList +#else +instance Read2 Const where + readsPrec2 = readsPrec1 + readList2 = readList1 +#endif + +instance Read2 (,) where readsPrec2 = readsPrec; readList2 = readList +instance Read a => Read2 ((,,) a) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b) => Read2 ((,,,) a b) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c) => Read2 ((,,,,) a b c) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d) => Read2 ((,,,,,) a b c d) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d, Read e) => Read2 ((,,,,,,) a b c d e) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f) => Read2 ((,,,,,,,) a b c d e f) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g) => Read2 ((,,,,,,,,) a b c d e f g) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g, Read h) => Read2 ((,,,,,,,,,) a b c d e f g h) where readsPrec2 = readsPrec; readList2 = readList read2 :: (Read2 f, Read a, Read b) => String -> f a b read2 s = either error id (readEither2 s) @@ -491,7 +615,7 @@ readListPrec2Default = list readPrec2 #endif --- annoying to hav to copy these from Text.Read +-- annoying to have to copy these from Text.Read list :: ReadPrec a -> ReadPrec [a] -- ^ @(list p)@ parses a list of things parsed by @p@, -- using the usual square-bracket syntax. @@ -513,38 +637,26 @@ xs <- listRest True return (x:xs) +-- If Show1 and Read1 are ever derived by the same mechanism as +-- Show and Read, rather than GND, that will change their behavior +-- here. newtype Lift1 f a = Lift1 { lower1 :: f a } - deriving (Functor, Foldable, Traversable) + deriving (Functor, Foldable, Traversable, Eq1, Ord1, Show1, Read1) -instance Eq1 f => Eq1 (Lift1 f) where Lift1 a ==# Lift1 b = a ==# b -instance Ord1 f => Ord1 (Lift1 f) where Lift1 a `compare1` Lift1 b = compare1 a b -instance Show1 f => Show1 (Lift1 f) where showsPrec1 d (Lift1 a) = showsPrec1 d a -instance Read1 f => Read1 (Lift1 f) where - readsPrec1 d = map (first Lift1) . readsPrec1 d - -instance (Eq1 f, Eq a) => Eq (Lift1 f a) where Lift1 a == Lift1 b = a ==# b -instance (Ord1 f, Ord a) => Ord (Lift1 f a) where Lift1 a `compare` Lift1 b = compare1 a b -instance (Show1 f, Show a) => Show (Lift1 f a) where showsPrec d (Lift1 a) = showsPrec1 d a -instance (Read1 f, Read a) => Read (Lift1 f a) where - readsPrec d = map (first Lift1) . readsPrec1 d +instance (Eq1 f, Eq a) => Eq (Lift1 f a) where (==) = (==#) +instance (Ord1 f, Ord a) => Ord (Lift1 f a) where compare = compare1 +instance (Show1 f, Show a) => Show (Lift1 f a) where showsPrec = showsPrec1 +instance (Read1 f, Read a) => Read (Lift1 f a) where readsPrec = readsPrec1 newtype Lift2 f a b = Lift2 { lower2 :: f a b } - deriving (Functor, Foldable, Traversable) + deriving (Functor, Foldable, Traversable, Eq2, Ord2, Show2, Read2) -instance Eq2 f => Eq2 (Lift2 f) where Lift2 a ==## Lift2 b = a ==## b -instance Ord2 f => Ord2 (Lift2 f) where Lift2 a `compare2` Lift2 b = compare2 a b -instance Show2 f => Show2 (Lift2 f) where showsPrec2 d (Lift2 a) = showsPrec2 d a -instance Read2 f => Read2 (Lift2 f) where - readsPrec2 d = map (first Lift2) . readsPrec2 d - -instance (Eq2 f, Eq a) => Eq1 (Lift2 f a) where Lift2 a ==# Lift2 b = a ==## b -instance (Ord2 f, Ord a) => Ord1 (Lift2 f a) where Lift2 a `compare1` Lift2 b = compare2 a b -instance (Show2 f, Show a) => Show1 (Lift2 f a) where showsPrec1 d (Lift2 a) = showsPrec2 d a -instance (Read2 f, Read a) => Read1 (Lift2 f a) where - readsPrec1 d = map (first Lift2) . readsPrec2 d - -instance (Eq2 f, Eq a, Eq b) => Eq (Lift2 f a b) where Lift2 a == Lift2 b = a ==## b -instance (Ord2 f, Ord a, Ord b) => Ord (Lift2 f a b) where Lift2 a `compare` Lift2 b = compare2 a b -instance (Show2 f, Show a, Show b) => Show (Lift2 f a b) where showsPrec d (Lift2 a) = showsPrec2 d a -instance (Read2 f, Read a, Read b) => Read (Lift2 f a b) where - readsPrec d = map (first Lift2) . readsPrec2 d +instance (Eq2 f, Eq a) => Eq1 (Lift2 f a) where (==#) = (==##) +instance (Ord2 f, Ord a) => Ord1 (Lift2 f a) where compare1 = compare2 +instance (Show2 f, Show a) => Show1 (Lift2 f a) where showsPrec1 = showsPrec2 +instance (Read2 f, Read a) => Read1 (Lift2 f a) where readsPrec1 = readsPrec2 + +instance (Eq2 f, Eq a, Eq b) => Eq (Lift2 f a b) where (==) = (==##) +instance (Ord2 f, Ord a, Ord b) => Ord (Lift2 f a b) where compare = compare2 +instance (Show2 f, Show a, Show b) => Show (Lift2 f a b) where showsPrec = showsPrec2 +instance (Read2 f, Read a, Read b) => Read (Lift2 f a b) where readsPrec = readsPrec2

1 0