Commit a70d0b67 authored by Anton Gladky's avatar Anton Gladky

Refresh, update patches.

parent 8d9cc1c9
......@@ -2,10 +2,10 @@ Description: remove google analytics script
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2014-01-14
Index: yade/doc/sphinx/templates/layout.html
Index: trunk-2016.06a/doc/sphinx/templates/layout.html
===================================================================
--- yade.orig/doc/sphinx/templates/layout.html
+++ yade/doc/sphinx/templates/layout.html
--- trunk-2016.06a.orig/doc/sphinx/templates/layout.html
+++ trunk-2016.06a/doc/sphinx/templates/layout.html
@@ -16,19 +16,6 @@
{% endblock %}
......
From 01fea359c04d08f93d2feddcd07b31bc794dbb37 Mon Sep 17 00:00:00 2001
From: Anton Gladky <gladky.anton@gmail.com>
Date: Thu, 19 May 2016 22:51:22 +0200
Subject: [PATCH] Split QGLViewer.cmake on qt4 and qt5 versions.
Qt4 support will be completely removed after the next
stable Yade release.
---
CMakeLists.txt | 3 ++-
cMake/FindQGLVIEWER-qt4.cmake | 24 ++++++++++++++++++++++++
cMake/FindQGLVIEWER-qt5.cmake | 24 ++++++++++++++++++++++++
cMake/FindQGLVIEWER.cmake | 25 -------------------------
4 files changed, 50 insertions(+), 26 deletions(-)
create mode 100644 cMake/FindQGLVIEWER-qt4.cmake
create mode 100644 cMake/FindQGLVIEWER-qt5.cmake
delete mode 100644 cMake/FindQGLVIEWER.cmake
Index: trunk-1.20.0/CMakeLists.txt
===================================================================
--- trunk-1.20.0.orig/CMakeLists.txt
+++ trunk-1.20.0/CMakeLists.txt
@@ -219,9 +219,9 @@ IF(ENABLE_GUI)
FIND_PACKAGE(OpenGL)
FIND_PACKAGE(GLUT)
FIND_PACKAGE(glib2)
- FIND_PACKAGE(QGLVIEWER)
IF(USE_QT5)
+ FIND_PACKAGE(QGLVIEWER-qt5 REQUIRED)
FIND_PACKAGE(Qt5 CONFIG REQUIRED Widgets Xml OpenGL)
SET(CMAKE_AUTOMOC ON)
FIND_PACKAGE(Qt5Widgets)
@@ -238,6 +238,7 @@ IF(ENABLE_GUI)
SET(ENABLE_GUI OFF)
ENDIF(Qt5Widgets_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND)
ELSE(USE_QT5) # Use Qt4
+ FIND_PACKAGE(QGLVIEWER-qt4 REQUIRED)
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL)
IF(QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND)
SET(GUI_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${QGLVIEWER_LIBRARIES})
Index: trunk-1.20.0/cMake/FindQGLVIEWER-qt4.cmake
===================================================================
--- /dev/null
+++ trunk-1.20.0/cMake/FindQGLVIEWER-qt4.cmake
@@ -0,0 +1,24 @@
+# - Try to find QGLViewer
+# Once done this will define
+#
+# QGLVIEWER_FOUND - system has QGLViewer
+# QGLVIEWER_INCLUDE_DIR - the QGLViewer include directory
+# QGLVIEWER_LIBRARIES - Link these to use QGLViewer
+
+find_path(QGLVIEWER_INCLUDE_DIR
+ NAMES qglviewer.h
+ PATHS /usr/include/QGLViewer
+ )
+
+find_library(QGLVIEWER_LIBRARIES
+ NAMES QGLViewer QGLViewer-qt4
+)
+
+IF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
+ SET(QGLVIEWER_FOUND TRUE)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQGLVIEWER_FOUND")
+ENDIF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
+
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER-qt4 DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES)
Index: trunk-1.20.0/cMake/FindQGLVIEWER-qt5.cmake
===================================================================
--- /dev/null
+++ trunk-1.20.0/cMake/FindQGLVIEWER-qt5.cmake
@@ -0,0 +1,24 @@
+# - Try to find QGLViewer
+# Once done this will define
+#
+# QGLVIEWER_FOUND - system has QGLViewer
+# QGLVIEWER_INCLUDE_DIR - the QGLViewer include directory
+# QGLVIEWER_LIBRARIES - Link these to use QGLViewer
+
+find_path(QGLVIEWER_INCLUDE_DIR
+ NAMES qglviewer.h
+ PATHS /usr/include/QGLViewer
+ )
+
+find_library(QGLVIEWER_LIBRARIES
+ NAMES QGLViewer QGLViewer-qt5
+)
+
+IF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
+ SET(QGLVIEWER_FOUND TRUE)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQGLVIEWER_FOUND")
+ENDIF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
+
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER-qt5 DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES)
Index: trunk-1.20.0/cMake/FindQGLVIEWER.cmake
===================================================================
--- trunk-1.20.0.orig/cMake/FindQGLVIEWER.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# - Try to find QGLViewer
-# Once done this will define
-#
-# QGLVIEWER_FOUND - system has QGLViewer
-# QGLVIEWER_INCLUDE_DIR - the QGLViewer include directory
-# QGLVIEWER_LIBRARIES - Link these to use QGLViewer
-
-find_path(QGLVIEWER_INCLUDE_DIR
- NAMES qglviewer.h
- PATHS /usr/include/QGLViewer
- )
-
-find_library(QGLVIEWER_LIBRARIES
- NAMES QGLViewer QGLViewer-qt4
-)
-
-IF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
- SET(QGLVIEWER_FOUND TRUE)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQGLVIEWER_FOUND")
-ENDIF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
-
-
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES)
From 00b36dcb963b5be397cdce6dca8e543e9f374668 Mon Sep 17 00:00:00 2001
From: Anton Gladky <gladky.anton@gmail.com>
Date: Thu, 3 Dec 2015 17:41:45 +0100
Subject: [PATCH] Fix warning in newer matplotlib.
---
py/plot.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/py/plot.py b/py/plot.py
index b51e3fe..538c59d 100644
--- a/py/plot.py
+++ b/py/plot.py
@@ -352,7 +352,7 @@ def update(self):
# dx,dy=[numpy.average(numpy.diff(dta[current-window:current])) for dta in self.xdata,self.ydata]
#except IndexError: pass
# there must be an easier way to find on-screen derivative angle, ask on the matplotlib mailing list
- axes=self.line.get_axes()
+ axes=self.line.axes()
p=axes.patch; xx,yy=p.get_verts()[:,0],p.get_verts()[:,1]; size=max(xx)-min(xx),max(yy)-min(yy)
aspect=(size[1]/size[0])*(1./axes.get_data_ratio())
angle=math.atan(aspect*dy/dx)
@@ -435,7 +435,7 @@ def createLines(pStrip,ySpecs,isY1=True,y2Exists=False):
# if current value is NaN, use zero instead
scatter=pylab.scatter(scatterPt[0] if not math.isnan(scatterPt[0]) else 0,scatterPt[1] if not math.isnan(scatterPt[1]) else 0,s=scatterSize,color=line.get_color(),**scatterMarkerKw)
currLineRefs.append(LineRef(line,scatter,line2,data[pStrip],data[d[0]]))
- axes=line.get_axes()
+ axes=line.axes
labelLoc=(legendLoc[0 if isY1 else 1] if y2Exists>0 else 'best')
l=pylab.legend(loc=labelLoc)
if hasattr(l,'draggable'): l.draggable(True)
@@ -472,7 +472,7 @@ def liveUpdate(timestamp):
for l in currLineRefs:
l.update()
figs.add(l.line.get_figure())
- axes.add(l.line.get_axes())
+ axes.add(l.line.axes)
linesData.add(id(l.ydata))
# find callables in y specifiers, create new lines if necessary
for ax in axes:
@@ -591,7 +591,7 @@ def plot(noShow=False,subPlots=True):
"""
createPlots(subPlots=subPlots)
global currLineRefs
- figs=set([l.line.get_axes().get_figure() for l in currLineRefs])
+ figs=set([l.line.axes.get_figure() for l in currLineRefs])
if not hasattr(list(figs)[0],'show') and not noShow:
import warnings
warnings.warn('plot.plot not showing figure (matplotlib using headless backend?)')
@@ -612,10 +612,10 @@ def closeFigureCallback(event):
ff=event.canvas.figure
# remove closed axes from our update list
global currLineRefs
- currLineRefs=[l for l in currLineRefs if l.line.get_axes().get_figure()!=ff]
+ currLineRefs=[l for l in currLineRefs if l.line.axes.get_figure()!=ff]
f.canvas.mpl_connect('close_event',closeFigureCallback)
else:
- figs=list(set([l.line.get_axes().get_figure() for l in currLineRefs]))
+ figs=list(set([l.line.get_figure() for l in currLineRefs]))
if len(figs)==1: return figs[0]
else: return figs
......@@ -2,8 +2,10 @@ Description: Fix some machine-specific items in documentation.
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2016-06-02
--- yade-1.20.0.orig/doc/sphinx/introduction.rst
+++ yade-1.20.0/doc/sphinx/introduction.rst
Index: trunk-2016.06a/doc/sphinx/introduction.rst
===================================================================
--- trunk-2016.06a.orig/doc/sphinx/introduction.rst
+++ trunk-2016.06a/doc/sphinx/introduction.rst
@@ -157,15 +157,11 @@ Normal simulations, however, are run con
In [1]: O.pause()
......@@ -82,8 +84,10 @@ Last-Update: 2016-06-02
In [6]: O.interactions[100,10111]
ValueError: No such interaction
--- yade-1.20.0.orig/doc/sphinx/tutorial-geo.rst
+++ yade-1.20.0/doc/sphinx/tutorial-geo.rst
Index: trunk-2016.06a/doc/sphinx/tutorial-geo.rst
===================================================================
--- trunk-2016.06a.orig/doc/sphinx/tutorial-geo.rst
+++ trunk-2016.06a/doc/sphinx/tutorial-geo.rst
@@ -85,9 +85,9 @@ The following creates periodic cloud of
Yade [1]: sp=pack.SpherePack()
......@@ -96,8 +100,10 @@ Last-Update: 2016-06-02
Yade [1]: O.engines+=[PeriTriaxController(goal=(-1e4,-1e4,-.1),stressMask=0b011,maxUnbalanced=.2,doneHook='functionToRunWhenFinished()')]
--- yade-1.20.0.orig/doc/sphinx/tutorial-hands-on.rst
+++ yade-1.20.0/doc/sphinx/tutorial-hands-on.rst
Index: trunk-2016.06a/doc/sphinx/tutorial-hands-on.rst
===================================================================
--- trunk-2016.06a.orig/doc/sphinx/tutorial-hands-on.rst
+++ trunk-2016.06a/doc/sphinx/tutorial-hands-on.rst
@@ -320,8 +320,6 @@ In order to avoid such tasks, shorthand
Yade [1]: s=utils.sphere((0,0,0),radius=1) # create sphere particle centered at (0,0,0) with radius=1
......@@ -142,8 +148,10 @@ Last-Update: 2016-06-02
Yade [1]: newton.damping
Instead of typing everything into the command-line, one can describe simulation in a file (*script*) and then run yade with that file as an argument. We will therefore no longer show the command-line unless necessary; instead, only the script part will be shown. Like this::
--- yade-1.20.0.orig/doc/sphinx/user.rst
+++ yade-1.20.0/doc/sphinx/user.rst
Index: trunk-2016.06a/doc/sphinx/user.rst
===================================================================
--- trunk-2016.06a.orig/doc/sphinx/user.rst
+++ trunk-2016.06a/doc/sphinx/user.rst
@@ -45,10 +45,6 @@ If no :yref:`Material` is specified when
Yade [2]: idConcrete=O.materials.append(FrictMat(young=30e9,poisson=.2,frictionAngle=.6,label="concrete"))
......
This diff is collapsed.
01_remove_google_analytics.patch
02_FixMatplotLibWarning.patch
01fea359c04d08f93d2feddcd07b31bc794dbb37.patch
fix_glibc223.patch
05_reproducible-builds.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment