diff options
| author |   David Seifert <soap@gentoo.org> | 2017-02-18 20:09:44 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2017-02-18 20:10:08 +0100 |
| commit | 51fd4fb2277b7117039a9572f242dd39ffd322cb (patch) | |
| tree | 0c01ec2ac166bd8165bf6a7418c28e842211b5c8 /sci-libs/plplot/files | |
| parent | dev-python/jupyter_console: Fix doc building (diff) | |
| download | gentoo-51fd4fb2277b7117039a9572f242dd39ffd322cb.tar.gz gentoo-51fd4fb2277b7117039a9572f242dd39ffd322cb.tar.bz2 gentoo-51fd4fb2277b7117039a9572f242dd39ffd322cb.zip | |
sci-libs/plplot: Version bump to 5.12.0
Bug: https://bugs.gentoo.org/show_bug.cgi?id=529382
Bug: https://bugs.gentoo.org/show_bug.cgi?id=554156
Bug: https://bugs.gentoo.org/show_bug.cgi?id=585114
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sci-libs/plplot/files')
| -rw-r--r-- | sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch | 13 | ||||
| -rw-r--r-- | sci-libs/plplot/files/plplot-5.12.0-multiarch.patch | 49 |
2 files changed, 62 insertions, 0 deletions
diff --git a/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch b/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch new file mode 100644 index 000000000000..2c053a2b1669 --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.12.0-java-install-path.patch @@ -0,0 +1,13 @@ +Java libs are installed into an already prefixed path. + +--- a/bindings/java/CMakeLists.txt ++++ b/bindings/java/CMakeLists.txt +@@ -189,7 +189,7 @@ + ) + endif(APPLE) + +- install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_HARDDIR}) ++ install(TARGETS plplotjavac_wrap LIBRARY DESTINATION ${JAVAWRAPPER_DIR}) + + set(JAVA_CLASSES) + foreach( srcfile ${JAVA_FILES_FULL} ) diff --git a/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch new file mode 100644 index 000000000000..63e92f5aa5ab --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.12.0-multiarch.patch @@ -0,0 +1,49 @@ +--- a/examples/c/Makefile.examples.in ++++ b/examples/c/Makefile.examples.in +@@ -25,9 +25,6 @@ + CC = @CC@ + EXEEXT = @EXEEXT@ + +-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ +-RPATHCMD = @RPATHCMD@ +- + @extXdrawable_true@extXdrawable_EXECUTABLES_list = \ + @extXdrawable_true@ extXdrawable_demo$(EXEEXT) + +--- a/examples/c++/Makefile.examples.in ++++ b/examples/c++/Makefile.examples.in +@@ -25,10 +25,7 @@ + CXX = @CXX@ + EXEEXT = @EXEEXT@ + +-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ +-RPATHCMD = @RPATHCMD@ + @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ +-@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@ + + @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \ + @wxwidgets_true@ @wxdemo_name@$(EXEEXT) +--- a/examples/f95/Makefile.examples.in ++++ b/examples/f95/Makefile.examples.in +@@ -25,9 +25,6 @@ + F95 = @FC@ + EXEEXT = @EXEEXT@ + +-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ +-FORTRAN_RPATHCMD = @FORTRAN_RPATHCMD@ +- + EXECUTABLES_list = \ + x00f$(EXEEXT) \ + x01f$(EXEEXT) \ +--- a/examples/tk/Makefile.examples.in ++++ b/examples/tk/Makefile.examples.in +@@ -24,9 +24,6 @@ + CC = @CC@ + EXEEXT = @EXEEXT@ + +-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ +-plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@ +- + EXECUTABLES_list = xtk01$(EXEEXT) + # Second and fourth examples depend on itk. + @itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT) |