[openmeca] 03/03: add patches

Damien André damien-andre-guest at moszumanska.debian.org
Sat Jan 28 17:13:35 UTC 2017


This is an automated email from the git hooks/post-receive script.

damien-andre-guest pushed a commit to branch master
in repository openmeca.

commit addffb605c65764d3084067f7eff7b7dbe7e64c0
Author: Damien André <damien.andre at unilim.fr>
Date:   Sat Jan 28 17:48:26 2017 +0100

    add patches
---
 .pc/.quilt_patches        |   1 +
 .pc/.quilt_series         |   1 +
 .pc/.version              |   1 +
 .pc/applied-patches       |   1 +
 .pc/make-patch/Makefile   | 206 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/make-patch |  52 ++++++++++++
 debian/patches/series     |   1 +
 7 files changed, 263 insertions(+)

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..6b04c9d
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1 @@
+make-patch
diff --git a/.pc/make-patch/Makefile b/.pc/make-patch/Makefile
new file mode 100644
index 0000000..e17fa92
--- /dev/null
+++ b/.pc/make-patch/Makefile
@@ -0,0 +1,206 @@
+
+# The install path used when run a 'make install'
+ifndef DESTDIR
+	DESTDIR=/usr/local
+endif
+
+# the bin dir 
+BINDIR=bin
+
+# The qmake utility location (for unix-like systems)
+QMAKE=qmake
+
+
+
+####################################
+# Cross compile from unix to win32 #
+####################################
+# The mxe platform is used. So, you need to specifiy your mxe path. 
+# For example, if you type 'mxe=/home/omc/mxe make', 
+# it runs a cross-compilation
+
+# if mxe is used, the mxe path must be exported
+ifdef mxe
+	export PATH := $(mxe)/usr/bin:$(PATH)
+	mxe_bin = $(mxe)/usr/i686-w64-mingw32.static/qt5/bin
+endif
+
+####################################
+# Compile on OS X                  #
+####################################
+OSName := $(shell uname)
+
+####################################
+# Makefile targets                 #
+####################################
+.PHONY: all message boost qglviewer qwt chronoengine openmeca
+
+all: message
+	$(MAKE) boost
+	$(MAKE) qglviewer
+	$(MAKE) qwt
+	$(MAKE) chronoengine
+	$(MAKE) openmeca
+
+message:
+ifdef mxe
+	@echo 'cross compiling for win32...' ;\
+	sleep 1
+endif
+	@echo 'compiling...'
+
+clean:
+	-rm -rf SRC/Boost/BUILD
+	-rm -rf SRC/Boost/b2
+	-rm -rf SRC/Boost/bin.v2
+	-rm -rf SRC/Boost/bjam
+	-rm -rf SRC/Boost/bootstrap.log
+	-rm -rf SRC/Boost/project-config.jam*
+	-rm -rf SRC/Boost/tools/build/v2/engine/bin.*
+	-rm -rf SRC/Boost/tools/build/v2/engine/bootstrap/
+	-rm -rf SRC/QGLViewer/BUILD
+	-rm -rf SRC/QGLViewer/.qmake.stash
+	-rm -rf SRC/QGLViewer/Makefile
+	-rm -rf SRC/QGLViewer/Makefile.Debug
+	-rm -rf SRC/QGLViewer/Makefile.Release
+	-rm -rf SRC/QGLViewer/QGLViewer.prl
+	-rm -rf SRC/QGLViewer/QGLViewerd.prl
+	-rm -rf SRC/QGLViewer/object_script.*
+	-rm -rf SRC/ChronoEngine/BUILD
+	-rm -rf SRC/QGLViewer/.qmake.stash
+	-rm -rf SRC/ChronoEngine/Makefile.Debug
+	-rm -rf SRC/ChronoEngine/Makefile.Release
+	-rm -rf SRC/ChronoEngine/object_script.*
+	-rm -rf SRC/Qwt/BUILD
+	-rm -rf SRC/QGLViewer/.qmake.stash
+	-rm -rf SRC/Qwt/Makefile
+	-rm -rf SRC/OpenMeca/BUILD
+	-rm -rf SRC/QGLViewer/.qmake.stash
+	-rm -rf SRC/OpenMeca/Makefile.Debug
+	-rm -rf SRC/OpenMeca/Makefile.Release
+	-rm -rf SRC/OpenMeca/object_script.*
+	-rm -rf SRC/OpenMeca/Rsc/Help/Help.qch
+	-rm -rf SRC/OpenMeca/Rsc/Help/Help.qhc
+	-rm -rf SRC/OpenMeca/Rsc/Lang/openmeca_fr.qm
+
+
+install: all
+	@echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	echo '@@            Installing openmeca              @@'; \
+	echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	mkdir -p $(DESTDIR)/$(BINDIR)
+	cp -ar ./SRC/OpenMeca/BUILD/openmeca $(DESTDIR)/$(BINDIR)
+	@echo 'The openmeca executable was installed in the $(DESTDIR)/$(BINDIR) directory'
+
+
+uninstall: 
+	@echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	echo '@@           Uninstalling openmeca             @@'; \
+	echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	rm  $(DESTDIR)/$(BINDIR)/openmeca
+	@echo 'The openmeca executable was removed from $(DESTDIR)/$(BINDIR)'
+
+
+purge: uninstall
+	rm -rf $(HOME)/openmeca
+	@echo 'The openmeca config directory $(HOME)/openmeca was removed'
+
+
+boost: 
+	@echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	echo '@@     making the boost third party library    @@'; \
+	echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	sleep 1
+ifdef mxe
+	@echo 'cross boost compiling for win32 !'
+	@cd SRC/Boost ; \
+	echo 'using gcc : mxe : i686-w64-mingw32.static-g++ : <rc>i686-w64-mingw32.static-windres <archiver>i686-w64-mingw32.static-ar <ranlib>i686-w64-mingw32.static-ranlib ;' > 'user-config.jam';\
+	./bootstrap.sh ;\
+	./b2 --ignore-site-config --user-config=user-config.jam link=static target-os=windows variant=release toolset=gcc-mxe --with-serialization --prefix=./BUILD/ install
+else
+	@cd SRC/Boost ; \
+	./bootstrap.sh && ./b2 link=static runtime-link=static --with-serialization --prefix=./BUILD/ install
+endif
+	- at cd SRC/Boost/; ./edit-header-for-openmeca.sh 
+
+
+qglviewer:
+	@echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	echo '@@  making the qglviewer third party library   @@'; \
+	echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	sleep 1
+ifdef mxe
+	@echo 'cross compiling qglviewer for win32 !'
+	@cd SRC/QGLViewer ;\
+	$(mxe_bin)/qmake PREFIX=../BUILD;\
+	$(MAKE) install;
+else
+	@cd SRC/QGLViewer ; \
+	$(QMAKE) ; \
+	$(MAKE) install
+endif
+
+
+
+qwt:
+	@echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	echo '@@     making the qwt third party library      @@'; \
+	echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	sleep 1
+ifdef mxe
+	@echo 'cross compiling qwt for win32 !'
+	@cd SRC/Qwt ;\
+	$(mxe_bin)/qmake ;\
+	$(MAKE) install
+else
+	@cd SRC/Qwt ; \
+	$(QMAKE)  ; \
+	$(MAKE) install
+endif
+
+
+
+chronoengine:
+	@echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	echo '@@ making the chronoengine third party library @@'; \
+	echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	sleep 1
+ifdef mxe
+	@echo 'cross compiling chronoengine for win32 !'
+	@cd SRC/ChronoEngine ;\
+	$(mxe_bin)/qmake ;\
+	$(MAKE) install
+else
+	@cd SRC/ChronoEngine ; \
+	$(QMAKE)  ; \
+	$(MAKE) install
+endif
+
+
+
+openmeca:
+	@echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	echo '@@              making openmeca                @@'; \
+	echo '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'; \
+	sleep 1
+ifdef mxe
+	@echo 'cross compiling openmeca for win32 !'
+	@cd SRC/OpenMeca  ; \
+	lrelease ./OpenMeca.pro  ; \
+	qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch  ; \
+	qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
+	$(mxe_bin)/qmake ;\
+	$(MAKE)
+else
+	@cd SRC/OpenMeca  ; \
+	lrelease ./OpenMeca.pro  ; \
+	qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch  ; \
+	qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
+	$(QMAKE)  ; \
+	$(MAKE)
+ifeq ($(OSName),Darwin)
+	macdeployqt SRC/OpenMeca/BUILD/openmeca.app
+endif
+endif
+	@echo 'The executable was built in the OpenMeca/BUILD/openmeca directory';
+
diff --git a/debian/patches/make-patch b/debian/patches/make-patch
new file mode 100644
index 0000000..f83a3a2
--- /dev/null
+++ b/debian/patches/make-patch
@@ -0,0 +1,52 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openmeca (2.1.7-1) unstable; urgency=medium
+ .
+   [ Damien Andre ]
+   * Initial release. (Closes: #850590)
+Author: Damien Andre <dada at yakuru.fr>
+Bug-Debian: https://bugs.debian.org/850590
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openmeca-2.1.7.orig/Makefile
++++ openmeca-2.1.7/Makefile
+@@ -8,7 +8,8 @@ endif
+ BINDIR=bin
+ 
+ # The qmake utility location (for unix-like systems)
+-QMAKE=qmake
++QMAKE=qtchooser -qt=5 -run-tool=qmake 
++
+ 
+ 
+ 
+@@ -193,9 +194,9 @@ ifdef mxe
+ 	$(MAKE)
+ else
+ 	@cd SRC/OpenMeca  ; \
+-	lrelease ./OpenMeca.pro  ; \
+-	qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch  ; \
+-	qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
++	qtchooser -qt=5 -run-tool=lrelease ./OpenMeca.pro  ; \
++	qtchooser -qt=5 -run-tool=qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch  ; \
++	qtchooser -qt=5 -run-tool=qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
+ 	$(QMAKE)  ; \
+ 	$(MAKE)
+ ifeq ($(OSName),Darwin)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6b04c9d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+make-patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openmeca.git



More information about the debian-science-commits mailing list