Commit 32cbff8958352babc4a5783488d6b9a6fc6689e6 - getfem++

Refresh patches. Anton Gladky 7 years ago

4 changed file(s) with 62 addition(s) and 42 deletion(s). Raw diff Collapse all Expand all

-16

debian/patches/04_fix_FTBFS.patch less more

1	1	Author: Anton Gladky <gladk@debian.org>
2	2	Last-Update: <2016-04-15>
3	3
4		Index: getfem-5.0/interface/src/gf_asm.cc
	4	Index: getfem-5.1/interface/src/gf_asm.cc
5	5	===================================================================
6		--- getfem-5.0.orig/interface/src/gf_asm.cc
7		+++ getfem-5.0/interface/src/gf_asm.cc
8		@@ -219,7 +219,7 @@ void asm_stabilization_patch_matrix
	6	--- getfem-5.1.orig/interface/src/gf_asm.cc
	7	+++ getfem-5.1/interface/src/gf_asm.cc
	8	@@ -218,7 +218,7 @@ void asm_stabilization_patch_matrix
9	9
10	10	int nparts = 1;
11	11	#ifdef GETFEM_HAVE_METIS

14	14	# ifdef GETFEM_HAVE_METIS_OLD_API
15	15	std::vector<int> adjwgt(k); // actually Metis would also accept NULL instead of an empty array
16	16	int wgtflag = 2, numflag = 0, edgecut;
17		Index: getfem-5.0/contrib/xfem_contact/xfem_dirichlet.cc
18		===================================================================
19		--- getfem-5.0.orig/contrib/xfem_contact/xfem_dirichlet.cc
20		+++ getfem-5.0/contrib/xfem_contact/xfem_dirichlet.cc
21		@@ -32,7 +32,6 @@
22		#include "getfem/getfem_model_solvers.h"
23		#include "getfem/getfem_mesh_im_level_set.h"
24		#include "getfem/getfem_partial_mesh_fem.h"
25		-#include "getfem/getfem_Coulomb_friction.h"
26		#include "getfem/getfem_import.h"
27		#include "getfem/getfem_inter_element.h"
28		#include "gmm/gmm.h"

-8

debian/patches/05_disable_failing_test.patch less more

1	1	Author: Anton Gladky <gladk@debian.org>
2	2	Last-Update: 2016-08-13
3	3
4		Index: getfem/tests/Makefile.am
	4	Index: getfem++-5.1+dfsg1/tests/Makefile.am
5	5	===================================================================
6		--- getfem.orig/tests/Makefile.am
7		+++ getfem/tests/Makefile.am
	6	--- getfem++-5.1+dfsg1.orig/tests/Makefile.am
	7	+++ getfem++-5.1+dfsg1/tests/Makefile.am
8	8	@@ -28,8 +28,6 @@ check_PROGRAMS = \
9	9	test_interpolated_fem \
10	10	test_range_basis \

104	104	geo_trans_inv.param \
105	105	heat_equation.pl \
106	106	heat_equation.param \
107		Index: getfem/contrib/Makefile.am
	107	Index: getfem++-5.1+dfsg1/contrib/Makefile.am
108	108	===================================================================
109		--- getfem.orig/contrib/Makefile.am
110		+++ getfem/contrib/Makefile.am
	109	--- getfem++-5.1+dfsg1.orig/contrib/Makefile.am
	110	+++ getfem++-5.1+dfsg1/contrib/Makefile.am
111	111	@@ -1,3 +1,3 @@
112	112	SUBDIRS = icare delaminated_crack aposteriori xfem_stab_unilat_contact \
113	113	bimaterial_crack_test mixed_elastostatic xfem_contact crack_plate \
114		- inter_element_test static_contact_gears level_set_contact
115		+ inter_element_test static_contact_gears
	114	- static_contact_gears level_set_contact test_plasticity
	115	+ static_contact_gears

-4

debian/patches/06_gcc-6.patch less more

1	1	Author: Anton Gladky <gladk@debian.org>
2	2	Last-Update: 2016-08-08
3	3
4		--- getfem++-5.0.orig/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
5		+++ getfem++-5.0/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
	4	Index: getfem-5.1/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
	5	===================================================================
	6	--- getfem-5.1.orig/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
	7	+++ getfem-5.1/contrib/bimaterial_crack_test/bimaterial_crack_test.cc
6	8	@@ -43,7 +43,7 @@
7	9	#include "getfem/getfem_interpolated_fem.h"
8	10

12	14
13	15
14	16	/* some GetFEM++ types that we will be using */
15		--- getfem++-5.0.orig/contrib/bimaterial_crack_test/crack_exact_solution.h
16		+++ getfem++-5.0/contrib/bimaterial_crack_test/crack_exact_solution.h
	17	Index: getfem-5.1/contrib/bimaterial_crack_test/crack_exact_solution.h
	18	===================================================================
	19	--- getfem-5.1.orig/contrib/bimaterial_crack_test/crack_exact_solution.h
	20	+++ getfem-5.1/contrib/bimaterial_crack_test/crack_exact_solution.h
17	21	@@ -32,7 +32,7 @@
18	22	#include "getfem/getfem_mesh_fem_global_function.h"
19	23

+42

-14

debian/patches/07_disable_scilab.patch less more

1	1	Author: Anton Gladky <gladk@debian.org>
2	2	Last-Update: 2016-08-08
3	3
4		Index: getfem/interface/src/Makefile.am
	4	Index: getfem++-5.1+dfsg1/interface/src/Makefile.am
5	5	===================================================================
6		--- getfem.orig/interface/src/Makefile.am
7		+++ getfem/interface/src/Makefile.am
	6	--- getfem++-5.1+dfsg1.orig/interface/src/Makefile.am
	7	+++ getfem++-5.1+dfsg1/interface/src/Makefile.am
8	8	@@ -6,12 +6,7 @@ if BUILDPYTHON
9	9	subdirPYTHON=python
10	10	endif

19	19
20	20	RPC_INC_DIR=@RPC_INC_DIR@
21	21
22		Index: getfem/m4/Makefile.in
	22	Index: getfem++-5.1+dfsg1/m4/Makefile.in
23	23	===================================================================
24		--- getfem.orig/m4/Makefile.in
25		+++ getfem/m4/Makefile.in
26		@@ -92,7 +92,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
	24	--- getfem++-5.1+dfsg1.orig/m4/Makefile.in
	25	+++ getfem++-5.1+dfsg1/m4/Makefile.in
	26	@@ -100,7 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
27	27	$(top_srcdir)/m4/ax_prog_fc_mpi.m4 $(top_srcdir)/m4/libtool.m4 \
28	28	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
29	29	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
30	30	- $(top_srcdir)/m4/scilab.m4 $(top_srcdir)/configure.ac
	31	+ $(top_srcdir)/configure.ac
31	32	am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
32	33	$(ACLOCAL_M4)
33		mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
34		@@ -275,7 +274,6 @@ datarootdir = @datarootdir@
	34	DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
	35	@@ -173,12 +173,9 @@ FC = @FC@
	36	FCFLAGS = @FCFLAGS@
	37	FCLIBS = @FCLIBS@
	38	FGREP = @FGREP@
	39	-GETFEM_BUILD_INTERFACE_PATH = @GETFEM_BUILD_INTERFACE_PATH@
	40	-GETFEM_INTERFACE_PATH = @GETFEM_INTERFACE_PATH@
	41	GETFEM_SERVER = @GETFEM_SERVER@
	42	GFSERVERFLAGS = @GFSERVERFLAGS@
	43	GREP = @GREP@
	44	-HAVE_SCILAB = @HAVE_SCILAB@
	45	IM_METHODS = @IM_METHODS@
	46	IM_METHODS_LOC = @IM_METHODS_LOC@
	47	INSTALL = @INSTALL@
	48	@@ -242,13 +239,6 @@ QHULL_LIBS = @QHULL_LIBS@
	49	RANLIB = @RANLIB@
	50	RPC_INC_DIR = @RPC_INC_DIR@
	51	RPC_LIB = @RPC_LIB@
	52	-SCILAB_DIR = @SCILAB_DIR@
	53	-SCILAB_EXE = @SCILAB_EXE@
	54	-SCILAB_TOOLBOX_DIR = @SCILAB_TOOLBOX_DIR@
	55	-SCILAB_VERSION = @SCILAB_VERSION@
	56	-SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
	57	-SCILAB_VERSION_MICRO = @SCILAB_VERSION_MICRO@
	58	-SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
	59	SED = @SED@
	60	SET_MAKE = @SET_MAKE@
	61	SHELL = @SHELL@
	62	@@ -286,7 +276,6 @@ datarootdir = @datarootdir@
35	63	docdir = @docdir@
36	64	dvidir = @dvidir@
37	65	exec_prefix = @exec_prefix@

39	67	host = @host@
40	68	host_alias = @host_alias@
41	69	host_cpu = @host_cpu@
42		Index: getfem/configure.ac
	70	Index: getfem++-5.1+dfsg1/configure.ac
43	71	===================================================================
44		--- getfem.orig/configure.ac
45		+++ getfem/configure.ac
46		@@ -977,43 +977,6 @@ fi
	72	--- getfem++-5.1+dfsg1.orig/configure.ac
	73	+++ getfem++-5.1+dfsg1/configure.ac
	74	@@ -971,43 +971,6 @@ fi
47	75	AM_CONDITIONAL(BUILDPYTHON, test x$usepython = xYES)
48	76	AM_CONDITIONAL(BUILDPYTHONPAR, test x$ac_python_mpi4py = xYES)
49	77

87	115
88	116	dnl -----------------------------------------------
89	117	dnl Outputs
90		@@ -1053,8 +1016,6 @@ interface/src/matlab/Makefile
	118	@@ -1047,8 +1010,6 @@ interface/src/matlab/Makefile
91	119	interface/src/matlab/private/Makefile \
92	120	interface/src/python/Makefile \
93	121	interface/src/python/setup.py \