Compare commits

95 Commits

Author SHA256 Message Date
b80028c567 Accepting request 1203957 from home:fstrba:branches:science
Use SOURCE_DATE_EPOCH for reproducible jar mtime

OBS-URL: https://build.opensuse.org/request/show/1203957
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=159
2024-09-28 11:16:05 +00:00
4ae02e8da6 Accepting request 1202238 from home:badshah400:branches:science
Add plplot-numpy-2.0-compat.patch for compatibility with numpy >= 2.0 (gh#PLplot/PLplot#10); patch taken from upstream PR and updated to fix tests.

OBS-URL: https://build.opensuse.org/request/show/1202238
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=157
2024-09-20 15:22:43 +00:00
49b9e04e54 Accepting request 1166086 from home:badshah400:branches:science
* Disable python3.12 as it is not supported by upstream.
* Fix doc pakcage location.
* Add plplot-pkgconfig-includedir.patch: Use CMAKE_INSTALL_FULL_<dir> macros to fix incorrect include and lib dirs in pkgconfig file (https://sourceforge.net/p/plplot/bugs/207/).

OBS-URL: https://build.opensuse.org/request/show/1166086
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=155
2024-04-10 08:04:22 +00:00
ed16b9576c OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=153 2023-06-30 04:49:28 +00:00
5c6541874e OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=152 2023-06-30 04:46:10 +00:00
74ae0299b1 OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=151 2023-06-29 20:45:25 +00:00
813ea89b8a OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=150 2023-06-29 10:39:43 +00:00
7f179ffe06 OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=149 2023-06-29 10:32:31 +00:00
9c6c76a2bb OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=148 2023-06-29 10:31:17 +00:00
b4667f36e5 Accepting request 1095385 from home:badshah400:branches:science
- Adapt specfile to build plplot against multiple python flavours.
- Set $HOME to current dir during %check to ensure fontconfig does not complain about un-writable cache dirs.
- Add plplot-libharu-version-check.patch: Fix check for libharu version when configuring build with cmake.
- New subpackages: plplot-driver-pdf, plplot-pyqt5-cmake.
- Make doc package noarch.

OBS-URL: https://build.opensuse.org/request/show/1095385
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=147
2023-06-29 08:13:32 +00:00
1ac7040788 Accepting request 1084179 from home:badshah400:branches:science
Disable octave also for TW (openSUSE >= 1550) since plplot does not support octave >= 8.0.

OBS-URL: https://build.opensuse.org/request/show/1084179
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=145
2023-05-04 13:22:05 +00:00
5cf896f6d7 Accepting request 957794 from home:mlin7442:rebuild_fails_154
fix build on Leap 15.4

OBS-URL: https://build.opensuse.org/request/show/957794
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=144
2022-02-26 19:51:13 +00:00
6da8d25e7e Accepting request 950017 from home:badshah400:branches:science
Enforce CMAKE_INSTALL_LIBDIR=%{_libdir} to ensure pkgconfig file substitutions for libdir are correct; this became an issue after we switched to using the cmake macro for configuring (boo#1195074).

OBS-URL: https://build.opensuse.org/request/show/950017
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=143
2022-01-30 23:22:29 +00:00
d145edd11c Accepting request 904312 from home:StevenK:branches:science
- Change shebangs for Python examples to be Python 3.
- Add patch support-python3-pythondemos.patch so pythondemos.py will
  run under Python 3.

OBS-URL: https://build.opensuse.org/request/show/904312
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=142
2021-07-06 13:50:55 +00:00
4d5d195aa8 Accepting request 903980 from home:badshah400:branches:science
- Enable building octave bindings for openSUSE >= 1550 (TW) i586 and x86_64 where
  swig has been patched to support octave 6+.

OBS-URL: https://build.opensuse.org/request/show/903980
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=141
2021-07-05 00:46:00 +00:00
810ba1a257 Accepting request 898560 from home:badshah400:gcc11fix
Enforce std=c++14 to avoid build failures with GCC 11 that defaults to c++17.

OBS-URL: https://build.opensuse.org/request/show/898560
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=139
2021-06-12 13:03:42 +00:00
43d24d7ae5 Accepting request 883045 from home:StefanBruens:branches:science
- Reenable qhull support, link against reentrant libqhull_r:
  0001-Use-reentrant-libqhull_r-instead-of-deprecated-libqh.patch
- Some minor specfile cleanups

OBS-URL: https://build.opensuse.org/request/show/883045
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=137
2021-04-06 12:09:41 +00:00
39cd0b4b0a Accepting request 871657 from home:badshah400:branches:science
Add plplot-drop-FindLua-cmake-module.patch to drop in-house FindLua.cmake module, which is severely dated, to use cmake's own module and fix building for lua >= 5.4; patch taken from upstream.

OBS-URL: https://build.opensuse.org/request/show/871657
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=135
2021-02-14 13:25:55 +00:00
e1a1d7de45 Accepting request 861899 from home:badshah400:branches:science
Disable octave bindings until compilation against octave 6 is fixed (fix should happen mostly in swig, see gh#swig/swig#1893).

OBS-URL: https://build.opensuse.org/request/show/861899
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=134
2021-01-13 01:27:32 +00:00
fcf2fa32cb Accepting request 858158 from home:dimstar:Factory
- Fix dependency of -devel package when built without qhull
  support: libcsironn0 does not exist in this case.

OBS-URL: https://build.opensuse.org/request/show/858158
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=132
2020-12-22 13:35:09 +00:00
Matthias Mailänder
63d2b51602 Accepting request 851562 from home:badshah400:branches:science
* Disable csironn library since it does not build against recent qhull (libqhull_r).
* Disable ada bindings: does not build with fPIC.
* BuildRequires: python3-sip4-devel for openSUSE >= 1550 to enable pyqt5 bindings.
* Pass `-DCMAKE_SKIP_RPATH:BOOL=OFF -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON` to cmake to fix build issues caused by Leap 15.2's incorrect cmake macros (doesn't hurt for other distros anyway).

OBS-URL: https://build.opensuse.org/request/show/851562
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=131
2020-11-29 13:30:37 +00:00
80c790c4a5 OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=129 2020-07-21 11:37:01 +00:00
9b8e8e3b94 OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=128 2020-07-21 11:36:13 +00:00
2d10eee0b5 Accepting request 822011 from home:michel_mno:branches:science
- Add _constraints for PowerPC avoid "no space left on device" build error

OBS-URL: https://build.opensuse.org/request/show/822011
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=127
2020-07-21 11:20:21 +00:00
20e8f65e70 Accepting request 820901 from home:badshah400:branches:science
- Add plplot-include-QPainterPath.patch: Include QPainterPath header when building Qt modules, needed for Qt >= 5.15.0; patch from upstream.
- Re-enable octave bindings (issue with swig and octave seems to be fixed now).
- Reorganise the distribution of cmake files so that each cmake file belongs in the right package.

OBS-URL: https://build.opensuse.org/request/show/820901
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=125
2020-07-17 12:51:41 +00:00
673f9daf39 Accepting request 778824 from home:olh
- actually fix the OCaml bindings with plplot-ocaml.patch
- use autosetup, build verbose

OBS-URL: https://build.opensuse.org/request/show/778824
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=123
2020-02-25 12:54:55 +00:00
d6bb0b2dd5 Accepting request 778775 from home:badshah400:branches:science
- Re-enable csironn bindings for openSUSE >= 1550 as they build
  again (due to fixes to qhull package).

OBS-URL: https://build.opensuse.org/request/show/778775
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=122
2020-02-25 08:16:27 +00:00
614b8cc931 Accepting request 778765 from home:olh
- add conditional for OCaml bindings, they depend on camlidl

OBS-URL: https://build.opensuse.org/request/show/778765
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=121
2020-02-24 14:14:21 +00:00
a7f679c19d Accepting request 769908 from home:dimstar:Factory
- Do not require libcsironn0 from the -devel package on
  suse_version>=1550, where this is no longer built.


Fixes the issue reported  opensuse-factory@

https://lists.opensuse.org/opensuse-factory/2020-02/msg00013.html

OBS-URL: https://build.opensuse.org/request/show/769908
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=119
2020-02-04 11:41:21 +00:00
b39783d3ca Accepting request 756786 from home:badshah400:branches:science
- plplotqt-devel no longer Requires libqt4-devel, instead the
  appropriate Qt5 headers.

OBS-URL: https://build.opensuse.org/request/show/756786
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=117
2019-12-13 20:09:34 +00:00
f96e67966c Accepting request 756767 from home:badshah400:branches:science
- Disable libcsironn on openSUSE >= 1550 to prevent build
  failures.
- Fix shapelib dependency: BuildRequires: pkgconfig(shapelib)
  instead of BuildRequires: shapelib; install additional shapelib
  files as part of plplot-common.

OBS-URL: https://build.opensuse.org/request/show/756767
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=116
2019-12-13 10:05:38 +00:00
06c3fcaab5 Accepting request 733418 from home:olh:branches:science
- Add ExclusiveArch, based on build_ada in gcc.spec

OBS-URL: https://build.opensuse.org/request/show/733418
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=114
2019-09-29 18:57:44 +00:00
95d5b203e6 Accepting request 707837 from home:alois:branches:science
- Update to version 5.15.0
  * Bug fixes
  * Update PLplot to be consistent with modern free software
  * Rewrite the configuration of the INSTALL_RPATH target
    property
  * Rewrite the rpath configuration of traditionally built
    examples
  * Factor the PLplot export files
  * Introduce symbolic constants in our color-map routines
  * New implementation of the range checks for the validity of
    cmap0 and cmap1 user input
  * New implementation of the -bg command-line option
  * Implement ctest for the build system of the installed
    examples

OBS-URL: https://build.opensuse.org/request/show/707837
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=112
2019-06-05 13:18:32 +00:00
d85b8111c7 Accepting request 691590 from home:badshah400:branches:science
- Disable octave bindings until compilation against octave 5.1.x
  is supported.

OBS-URL: https://build.opensuse.org/request/show/691590
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=110
2019-04-06 20:49:06 +00:00
125b964e6a Accepting request 668659 from home:badshah400:branches:science
- Update to version 5.14.0:
- Drop plplot-fix-pkgconfig-checks.patch: upstreamed.
- Update shlib package names in keeping with upstream so versions.
- Enable octave bindings: compilation against 4.4.x has been fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/668659
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=108
2019-01-28 23:02:17 +00:00
Ismail Dönmez
bb23289c1b Accepting request 653062 from home:badshah400:branches:science
- Add plplot-fix-pkgconfig-checks.patch: Fix pkg-config based
  checks for installed dependencies; patch taken from upstream
  git.

OBS-URL: https://build.opensuse.org/request/show/653062
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=106
2018-12-01 13:19:48 +00:00
Ismail Dönmez
8740bdc160 Accepting request 626747 from home:badshah400:branches:science
- Re-enable libcsirocsa and libscironn for i586: these are now
  building (go figure!)

OBS-URL: https://build.opensuse.org/request/show/626747
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=104
2018-08-01 13:03:58 +00:00
a9d91779f9 Accepting request 614356 from home:badshah400:branches:science
- Disable octave bindings until compilation against octave 4.4 is
  sorted out; remove conditionals for setting octave_enabled as
  plplot is unresolvable against openSUSE < 1320 anyway.

OBS-URL: https://build.opensuse.org/request/show/614356
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=102
2018-06-09 14:22:18 +00:00
Ismail Dönmez
777c500f4f Accepting request 605365 from home:badshah400:branches:science
- plplot-devel should not depend on shared libs which are not
  built: %{csirocsa_shlib} and %{csironn_shlib} on certain archs.

OBS-URL: https://build.opensuse.org/request/show/605365
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=100
2018-05-09 09:33:10 +00:00
b86c4805c9 Accepting request 604729 from home:Guillaume_G:branches:openSUSE:Factory:ARM
- Handle aarch64, ppc64 and ppc64le, not only x86_64 for libs

OBS-URL: https://build.opensuse.org/request/show/604729
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=99
2018-05-08 14:02:37 +00:00
Ismail Dönmez
1179c23bdc Accepting request 601554 from home:badshah400:branches:science
- Fix building for i586 by packaging x86_64-only libraries only
  for the latter arch.

OBS-URL: https://build.opensuse.org/request/show/601554
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=97
2018-04-26 13:05:12 +00:00
Matthias Mailänder
b14e241b23 Accepting request 577239 from home:badshah400:branches:science
Changes in light of https://build.opensuse.org/request/show/576062

OBS-URL: https://build.opensuse.org/request/show/577239
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=95
2018-02-16 15:57:02 +00:00
Ismail Dönmez
cd0b188a24 Accepting request 575993 from home:badshah400:branches:science
- Replace even more python2 Requires with python3 ones; this
  finally fixes build failures on openSUSE:Leap:15.0.

OBS-URL: https://build.opensuse.org/request/show/575993
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=94
2018-02-13 12:30:17 +00:00
Ismail Dönmez
1b29727858 Accepting request 575512 from home:badshah400:branches:science
- Swap leftover python2 Requires for explicitly python3 ones,
  rename python package to python3-plplot.

OBS-URL: https://build.opensuse.org/request/show/575512
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=92
2018-02-12 10:31:29 +00:00
Ismail Dönmez
d6a9d03ef4 Accepting request 547069 from home:badshah400:branches:science
- Switch to using explicit python3 BuildRequires (plplot is
  "unresolvable" for openSUSE <= 1320 anyway); adapt file lists
  accordingly.
- Drop conditionals referring to old openSUSE versions <= 1320.

- Drop legacy dependencies: pkgconfig(gnome-python-2.0) and
  pkgconfig(pygtk-2.0) are not in use.

OBS-URL: https://build.opensuse.org/request/show/547069
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=90
2017-12-01 13:48:08 +00:00
Ismail Dönmez
746d7899fd Accepting request 546378 from home:badshah400:branches:science
- Fix License tag in specfile for plplot-octave subpackage: While
  everything else is licensed as LGPL-2.1+, the Octave bindings
  are licensed as GPL-2.0+.

OBS-URL: https://build.opensuse.org/request/show/546378
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=89
2017-11-30 10:14:16 +00:00
a7e59c2a62 Accepting request 541310 from home:badshah400:branches:science
- Drop BuildRequires on libgnomui and libgnomeprintui, as they are
  not really required any more (boo#1067727).
- Change hashbangs for python based examples so that they refer
  directly to the python binary instead of doing so via env.

OBS-URL: https://build.opensuse.org/request/show/541310
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=88
2017-11-17 10:31:57 +00:00
140735cb99 Accepting request 531058 from home:fstrba:branches:science
Remove the left-over dependency on gcc-java

OBS-URL: https://build.opensuse.org/request/show/531058
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=86
2017-10-04 11:43:58 +00:00
Ismail Dönmez
d1c4dfe602 Accepting request 519055 from home:badshah400:branches:science
- Update to version 5.13.0:
  * Bug fixes.
  * The Python binding and examples now work for both Python 2 and
    3.
  * Change the Fortran naming convention.
  * Fix many "space in prefix" issues.
  * Complete rewrite of IPC between -dev wxwidgets and wxPLViewer.
  * Implement a new Windows GDI (wingdi) device driver.
  * Implement new Python extension module to support pytkdemo.
  * Fix OCaml inconsistencies for example 8.
  * Improve the implementation of the OCaml binding.
- Add shapelib BuildRequires for added features.
- Rename fortran shared lib and devel package in keeping with
  corresponding shared object naming changes.
- Use ctest for the check section. This allows the disabling of
  tests that either fail because of issues with the test codes
  themselves (octave), or because of lack of a full Xserver (Qt
  tests).

OBS-URL: https://build.opensuse.org/request/show/519055
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=84
2017-08-28 09:27:13 +00:00
d701316c5f Accepting request 504141 from home:alarrosa:branches:science
- Add LDFLAGS=-fPIC to fix the ada compiler test to link successfully
  and enable the generation of ada bindings in Factory.

OBS-URL: https://build.opensuse.org/request/show/504141
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=82
2017-06-20 13:59:39 +00:00
9334265253 Accepting request 456417 from home:jengelh:branches:science
- Remove Requires(post) since there is not even a %post section.
- Trim descriptions for size, fix wrong summaries.

OBS-URL: https://build.opensuse.org/request/show/456417
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=80
2017-02-11 22:53:13 +00:00
Matthias Mailänder
910fed8b72 Accepting request 455373 from home:badshah400:branches:science
Update to v5.12.0; almost completely reworked spec file to comply with shared lib policies, fix wrong timestamp from previous changelog entry. **Note to reviewer: Please do not auto-forward to Factory**

OBS-URL: https://build.opensuse.org/request/show/455373
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=79
2017-02-08 17:06:01 +00:00
355c106ebd Accepting request 448347 from home:bmwiedemann:branches:science
build-fix: kill our Xvfb after use

OBS-URL: https://build.opensuse.org/request/show/448347
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=77
2017-01-12 05:14:00 +00:00
Ismail Dönmez
dc6ceccbea Accepting request 444979 from home:badshah400:branches:science
fix factory build failure

OBS-URL: https://build.opensuse.org/request/show/444979
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=75
2016-12-09 08:28:26 +00:00
Matthias Mailänder
68d93c1e36 Accepting request 435907 from home:badshah400:branches:science
- Temporarily disable octave bindings as a workaround to build
  failures caused by octave's upgrade to version 4.2.0 in Factory.

OBS-URL: https://build.opensuse.org/request/show/435907
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=73
2016-10-23 05:39:27 +00:00
Matthias Mailänder
0838138026 Accepting request 419317 from home:badshah400:branches:science
- Enable tk bindings for all openSUSE versions; problem with
  Xvfb segfaulting that prevent building tk bindings for Leap:42.2
  and > 13.2 are worked around by passing the -noreset option to
  Xvfb (see boo#992429).

OBS-URL: https://build.opensuse.org/request/show/419317
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=71
2016-08-15 05:33:41 +00:00
2e8a6db827 Accepting request 417409 from home:badshah400:branches:science
- Define macro "octave_enabled" to consistently check when
  octave bindings are disabled (only for openSUSE:Leap:42.1).
- Disable tk bindings also for openSUSE:Leap:42.2 -- it does not
  build because of Xvfb crash (boo#992429).

OBS-URL: https://build.opensuse.org/request/show/417409
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=69
2016-08-08 10:59:17 +00:00
Matthias Mailänder
f12954ad75 Accepting request 417266 from home:badshah400:branches:science
- Enable octave bindings for openSUSE >= 13.2; builds just fine
  now.

OBS-URL: https://build.opensuse.org/request/show/417266
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=68
2016-08-06 17:21:55 +00:00
Matthias Mailänder
e567a1c75c Accepting request 417258 from home:badshah400:branches:science
- Add plplot-cmake36-pkg_check_pkgconfig_macro.patch to fix
  plplot's defined pkg_check_pkgconfig macro to work with
  cmake >= 3.6; patch sent upstream.

OBS-URL: https://build.opensuse.org/request/show/417258
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=67
2016-08-06 14:22:23 +00:00
aa9cbed7b8 Accepting request 388290 from home:michel_mno:branches:science
- disable Tk bindings in Factory need more change in spec
  to avoid ppc64 build error.

This change request is for ppc64.
Note that the remaining ppc64le unresolvable should be solved
when sr 383085 (of gcc package)  will be in Factory.

OBS-URL: https://build.opensuse.org/request/show/388290
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=65
2016-04-13 00:04:05 +00:00
Matthias Mailänder
792ab2638b Accepting request 382746 from home:badshah400:branches:science
- Disable octave bindings for openSUSE > 13.2 temporarily until
  related build failures are sorted out.
- Tk in Factory is not compatible with plplot apparently, turn
  off tk bindings until fix found.
- Bump required cmake version to 3.0.2, has been required since
  v5.11.1.
- Some rpmlint warning cleanups from using macros in comments.

OBS-URL: https://build.opensuse.org/request/show/382746
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=63
2016-04-02 16:47:32 +00:00
0f187de09a Accepting request 346301 from home:posophe:branches:science
little improvement

OBS-URL: https://build.opensuse.org/request/show/346301
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=61
2015-11-25 22:59:24 +00:00
ae69531572 Accepting request 323989 from home:badshah400:branches:science
- Disable octave bindings for openSUSE:42 as it doesn't have a recent enough swig (>= 3.0) to support this.

OBS-URL: https://build.opensuse.org/request/show/323989
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=59
2015-08-18 12:22:20 +00:00
2af58a8438 Accepting request 322260 from home:badshah400:branches:science
Update to version 5.11.1

OBS-URL: https://build.opensuse.org/request/show/322260
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=57
2015-08-13 09:33:58 +00:00
Ismail Dönmez
8546c3227c Accepting request 318728 from home:badshah400:branches:science
Fix builds, enable octave bindings back, drop old conditionals, fix lua_version for openSUSE > 13.2

OBS-URL: https://build.opensuse.org/request/show/318728
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=55
2015-07-26 11:33:15 +00:00
99c1c271b8 Accepting request 311345 from home:badshah400:branches:science
Disable octave bindings because builds fail with octave >= 4.0

OBS-URL: https://build.opensuse.org/request/show/311345
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=53
2015-06-09 19:08:04 +00:00
0f67f838b1 Accepting request 295784 from home:badshah400:branches:science
Update to version 5.11.0

OBS-URL: https://build.opensuse.org/request/show/295784
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=51
2015-04-13 19:24:37 +00:00
26e3c5a800 Accepting request 290871 from home:jengelh:branches:science
- Remove redundant ldconfig requires
- Build with wxWidgets 3

OBS-URL: https://build.opensuse.org/request/show/290871
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=49
2015-03-15 18:08:09 +00:00
Matthias Mailänder
b9bae88901 Accepting request 283536 from home:sfalken:branches:science
- Added 0001-fix_for_cmake_3.1.patch to fix building on cmake>3.0
  772223c638/

OBS-URL: https://build.opensuse.org/request/show/283536
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=47
2015-01-31 10:25:39 +00:00
Ismail Dönmez
f74cf81d66 Accepting request 251757 from home:sfalken:branches:science
- Added -fno-strict-aliasing to CFLAGS and CXXFLAGS to clear warning:
  [  138s] I: Program is likely to break with new gcc. Try -fno-strict-aliasing.
  [  138s] W: plplot strict-aliasing-punning /home/abuild/rpmbuild/BUILD/plplot-5.10.0/builddir/bindings/java/plplotjavacJAVA_wrap.c:2441, 2454, 2467, 2480, 2493, 2506, 2519, 2532, 2545, 2558, 2571, 2597, 2610, 2623, 2636, 2649, 2662, 2675, 2688, 2701, 2714, 2727, 2740, 2753, 2767, 2777, 10385

OBS-URL: https://build.opensuse.org/request/show/251757
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=45
2014-09-24 08:22:35 +00:00
Ismail Dönmez
607aaf0267 Accepting request 241803 from home:badshah400:branches:science
- Re-enable the tcl-tk bindings for factory as the problem seems
  to have fixed itself (likely due to tk update).

OBS-URL: https://build.opensuse.org/request/show/241803
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=43
2014-07-22 08:52:54 +00:00
Matthias Mailänder
ad58643451 Accepting request 239237 from home:badshah400:branches:science
Disable tk bindings for Factory, until a fix is ascertained

OBS-URL: https://build.opensuse.org/request/show/239237
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=41
2014-07-02 16:21:42 +00:00
Matthias Mailänder
575baed2dd Accepting request 222108 from home:badshah400:branches:science
Update to 5.10.0

OBS-URL: https://build.opensuse.org/request/show/222108
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=39
2014-02-13 15:30:15 +00:00
67f292df9e Accepting request 220433 from home:badshah400:Staging:plplot
Re-enable octave bindings; patched swig with support for octave >= 3.8.0 is now in science and should fix previous build failures.

OBS-URL: https://build.opensuse.org/request/show/220433
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=37
2014-01-31 06:35:56 +00:00
Matthias Mailänder
a65db23ff7 Accepting request 212679 from home:badshah400:branches:science
Workaround build failures by turning off octave bindings for now.

OBS-URL: https://build.opensuse.org/request/show/212679
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=35
2014-01-03 09:53:29 +00:00
65ac769bb3 Accepting request 212382 from home:badshah400:branches:science
Update to 5.9.11

OBS-URL: https://build.opensuse.org/request/show/212382
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=33
2013-12-28 16:27:33 +00:00
Matthias Mailänder
dc925ddfe2 Accepting request 201971 from home:badshah400:branches:science
Update to 5.9.10; drop patches no longer needed; add patch to fix examples with lua 5.2

OBS-URL: https://build.opensuse.org/request/show/201971
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=31
2013-10-03 15:15:36 +00:00
Ismail Dönmez
5bcd3b8d7a Accepting request 195797 from home:badshah400:branches:science
Properly *fix* build failures in Factory while enabling tcl/tk bindings

OBS-URL: https://build.opensuse.org/request/show/195797
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=29
2013-08-21 12:03:56 +00:00
a80df2093e Accepting request 195773 from home:badshah400:branches:science
Disable tck/tk bindings completely for Factory to workaround build failures from usage of interp->result which is deprecated in Tcl 8.6

OBS-URL: https://build.opensuse.org/request/show/195773
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=28
2013-08-21 08:03:14 +00:00
Ismail Dönmez
97eecb21d4 Accepting request 144715 from home:badshah400:branches:science
Work around build failure in Factory by disabling ada bindings.

OBS-URL: https://build.opensuse.org/request/show/144715
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=26
2012-12-08 16:38:31 +00:00
Ismail Dönmez
742a9cc4e0 Accepting request 134712 from home:namtrac:bugfix
- Add plplot-5.9.9-ada-pic.patch to compile Ada code with -fPIC

OBS-URL: https://build.opensuse.org/request/show/134712
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=24
2012-09-17 16:44:05 +00:00
Matthias Mailänder
87734f5808 Accepting request 124888 from home:badshah400:branches:science
Enable octave bindings also for openSUSE 12.1; enabling on openSUSE < 12.1 causes build failues, so octave bindings are turned off for openSUSE < 12.1

OBS-URL: https://build.opensuse.org/request/show/124888
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=22
2012-06-14 04:34:24 +00:00
Ismail Dönmez
48450f379d Accepting request 120998 from home:badshah400:branches:science
Enable octave bindings for plplot for openSUSE > 12.1 since octave is in Factory now.

OBS-URL: https://build.opensuse.org/request/show/120998
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=20
2012-05-15 06:14:25 +00:00
Ismail Dönmez
2bcd525ac6 Accepting request 114951 from home:dimstar:gcc47
Fix build with ada 4.7...

OBS-URL: https://build.opensuse.org/request/show/114951
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=18
2012-04-22 15:46:22 +00:00
Ismail Dönmez
5cb7169c48 Accepting request 112915 from home:badshah400:branches:science
Fix lapack BuildRequires to enable building for openSUSE <= 12.1

OBS-URL: https://build.opensuse.org/request/show/112915
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=16
2012-04-07 17:29:50 +00:00
37fbba33e8 Accepting request 104487 from devel:openSUSE:Factory:patch-license
patch license to follow spdx.org standard

OBS-URL: https://build.opensuse.org/request/show/104487
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=14
2012-02-13 14:18:53 +00:00
Werner Hoch
9eb23bb5f9 Accepting request 104153 from home:badshah400:branches:science
Enable lua bindings for factory again, by using BuildRequires: pkgconfig(lua) < 5.2

OBS-URL: https://build.opensuse.org/request/show/104153
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=13
2012-02-12 19:55:48 +00:00
Werner Hoch
269186f19f Accepting request 103689 from home:badshah400:branches:science
Drop lua bindings for factory. Package does not build with lua > 5.1

OBS-URL: https://build.opensuse.org/request/show/103689
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=12
2012-02-11 14:00:39 +00:00
Werner Hoch
3f40966749 build fix dropping qhull requirement
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=11
2011-11-20 09:31:21 +00:00
Stephan Kulow
a70c8f839e Accepting request 88343 from home:badshah400:branches:science
Update to version 5.9.9 -- bug fix release

OBS-URL: https://build.opensuse.org/request/show/88343
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=9
2011-10-19 05:22:14 +00:00
Detlef Steuer
2bb93cd5ce Accepting request 86244 from home:dimstar:branches:science
- Fix typo in Patch tagline.

OBS-URL: https://build.opensuse.org/request/show/86244
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=8
2011-10-03 14:48:48 +00:00
OBS User buildservice-autocommit
f7bcf82e5b Updating link to change in openSUSE:Factory/plplot revision 4.0
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=fb55d8f17e0ca05907ff5f89b75f371d
2011-08-15 09:24:08 +00:00
b787ea0728 Accepting request 78769 from home:badshah400:branches:science
Corrected package group tag for sub-package plplot-ada-devel

OBS-URL: https://build.opensuse.org/request/show/78769
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=6
2011-08-14 08:29:50 +00:00
Werner Hoch
e019d40291 Accepting request 78764 from home:badshah400:branches:science
Reconfigured to enable building ada bindings (changes to .spec and rpmlintrc files; new sub-packages: plplot-ada and plplot-ada-devel)

OBS-URL: https://build.opensuse.org/request/show/78764
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=5
2011-08-14 08:12:13 +00:00
OBS User buildservice-autocommit
12f008f259 Updating link to change in openSUSE:Factory/plplot revision 2.0
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=76388b7a1f37fdcca4d1c8616811f1d2
2011-08-04 09:08:28 +00:00
18 changed files with 2733 additions and 650 deletions

View File

@@ -0,0 +1,239 @@
From 07c5fb9d551dd04dd1d4e9e287c3901b7353b948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 4 Apr 2021 15:56:15 +0200
Subject: [PATCH] Use reentrant libqhull_r instead of deprecated libqhull
The non-reentrant version has been deprecated by upstream and is no longer
built by default.
The reentrant version is available since qhull 2015.1. As the old-style
qhull/* headers were removed with qhull 2011.1 these are no longer
relevant.
---
cmake/modules/FindQHULL.cmake | 14 +++++++-------
cmake/modules/csiro.cmake | 6 +-----
lib/nn/delaunay.c | 21 ++++++++++-----------
src/CMakeLists.txt | 4 ++--
src/plgridd.c | 27 +++++++++++++--------------
5 files changed, 33 insertions(+), 39 deletions(-)
diff --git a/cmake/modules/FindQHULL.cmake b/cmake/modules/FindQHULL.cmake
index d5485ed..ba8c7aa 100644
--- a/cmake/modules/FindQHULL.cmake
+++ b/cmake/modules/FindQHULL.cmake
@@ -16,27 +16,27 @@ include(FindPackageHandleStandardArgs)
# that is what is supplied by upstream qhull, and if the user is
# finding a local install of the upstream library below, he wants to
# access that same upstream version of the headers to be consistent.
-find_file(QHULL_HEADER_FILE NAMES libqhull/qhull_a.h qhull/qhull_a.h)
+find_file(QHULL_HEADER_FILE NAMES libqhull_r/qhull_ra.h)
if(QHULL_HEADER_FILE)
# message(STATUS "QHULL_HEADER_FILE = ${QHULL_HEADER_FILE}")
- if(QHULL_HEADER_FILE MATCHES "libqhull")
+ if(QHULL_HEADER_FILE MATCHES "libqhull_r")
set(HAS_LIBQHULL_INCLUDE ON)
- else(QHULL_HEADER_FILE MATCHES "libqhull")
+ else()
set(HAS_LIBQHULL_INCLUDE OFF)
- endif(QHULL_HEADER_FILE MATCHES "libqhull")
+ endif()
# Determine grandparent directory of header file
get_filename_component(QHULL_INCLUDE_DIRS ${QHULL_HEADER_FILE} DIRECTORY)
get_filename_component(QHULL_INCLUDE_DIRS ${QHULL_INCLUDE_DIRS} DIRECTORY)
elseif(NOT QHULL_HEADER_FILE AND NOT QHULL_FIND_QUIETLY)
- message(STATUS "Neither qhull/qhull_a.h header nor libqhull/qhull_a.h could be found")
+ message(STATUS "libqhull_r/qhull_ra.h could not be found")
endif(QHULL_HEADER_FILE)
-find_library(QHULL_LIBRARY qhull)
+find_library(QHULL_LIBRARY qhull_r)
if( QHULL_LIBRARY )
get_filename_component(QHULL_LIBRARY_DIRS ${QHULL_LIBRARY} DIRECTORY)
set(QHULL_LIBRARIES ${QHULL_LIBRARY})
elseif(NOT QHULL_LIBRARY AND NOT QHULL_FIND_QUIETLY)
- message(STATUS "qhull library could not be found")
+ message(STATUS "qhull_r library could not be found")
endif(QHULL_LIBRARY)
find_package_handle_standard_args(QHULL
diff --git a/cmake/modules/csiro.cmake b/cmake/modules/csiro.cmake
index cd427c4..c0df044 100644
--- a/cmake/modules/csiro.cmake
+++ b/cmake/modules/csiro.cmake
@@ -89,11 +89,7 @@ if(PL_HAVE_QHULL)
message(STATUS "WARNING: function qh_new_qhull not found. Setting PL_HAVE_QHULL to OFF.")
set(PL_HAVE_QHULL OFF CACHE BOOL "Enable use of the Qhull library" FORCE)
endif(NOT QH_NEW_EXIST)
- if(HAS_LIBQHULL_INCLUDE)
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Check_realT_size.c "#include <libqhull/qhull_a.h>")
- else(HAS_LIBQHULL_INCLUDE)
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Check_realT_size.c "#include <qhull/qhull_a.h>")
- endif(HAS_LIBQHULL_INCLUDE)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Check_realT_size.c "#include <libqhull_r/qhull_ra.h>")
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/Check_realT_size.c
"
int main(void)
diff --git a/lib/nn/delaunay.c b/lib/nn/delaunay.c
index f44c990..b0143c7 100644
--- a/lib/nn/delaunay.c
+++ b/lib/nn/delaunay.c
@@ -34,11 +34,7 @@
#include <limits.h>
#include <float.h>
#ifdef USE_QHULL
-#ifdef HAS_LIBQHULL_INCLUDE
-#include <libqhull/qhull_a.h>
-#else
-#include <qhull/qhull_a.h>
-#endif
+#include <libqhull_r/qhull_ra.h>
#else
#include "triangle.h"
#endif
@@ -388,7 +384,10 @@ delaunay* delaunay_build( int np, point points[], int ns, int segments[], int nh
// climax
//
- exitcode = qh_new_qhull( dim, np, qpoints, ismalloc,
+ qhT context = { 0 };
+ qhT* qh = &context;
+
+ exitcode = qh_new_qhull( qh, dim, np, qpoints, ismalloc,
flags, outfile, errfile );
if ( !exitcode )
@@ -433,8 +432,8 @@ delaunay* delaunay_build( int np, point points[], int ns, int segments[], int nh
}
}
- qh_findgood_all( qh facet_list );
- qh_countfacets( qh facet_list, NULL, !qh_ALL, &numfacets,
+ qh_findgood_all( qh, qh->facet_list );
+ qh_countfacets( qh, qh->facet_list, NULL, !qh_ALL, &numfacets,
&numsimplicial, &totneighbors, &numridges,
&numcoplanars, &numtricoplanars );
@@ -462,7 +461,7 @@ delaunay* delaunay_build( int np, point points[], int ns, int segments[], int nh
j = 0;
FOREACHvertex_( facet->vertices )
- t->vids[j++] = qh_pointid( vertex->point );
+ t->vids[j++] = qh_pointid( qh, vertex->point );
j = 0;
FOREACHneighbor_( facet )
@@ -548,8 +547,8 @@ delaunay* delaunay_build( int np, point points[], int ns, int segments[], int nh
}
free( qpoints );
- qh_freeqhull( !qh_ALL ); // free long memory
- qh_memfreeshort( &curlong, &totlong ); // free short memory and memory allocator
+ qh_freeqhull( qh, !qh_ALL ); // free long memory
+ qh_memfreeshort( qh, &curlong, &totlong ); // free short memory and memory allocator
if ( curlong || totlong )
fprintf( errfile,
"qhull: did not free %d bytes of long memory (%d pieces)\n",
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 757b4ed..18c6016 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -259,9 +259,9 @@ if(PL_HAVE_QHULL)
# No *.pc files for lib subdirectory libraries so must add relevant bits
# to the plplot.pc file instead.
if(QHULL_RPATH)
- list(APPEND pc_libplplot_LINK_FLAGS -l${WRITEABLE_TARGET}csironn -L${QHULL_RPATH} -lqhull)
+ list(APPEND pc_libplplot_LINK_FLAGS -l${WRITEABLE_TARGET}csironn -L${QHULL_RPATH} -lqhull_r)
else(QHULL_RPATH)
- list(APPEND pc_libplplot_LINK_FLAGS -l${WRITEABLE_TARGET}csironn -lqhull)
+ list(APPEND pc_libplplot_LINK_FLAGS -l${WRITEABLE_TARGET}csironn -lqhull_r)
endif(QHULL_RPATH)
# Needed by plgridd.c.
diff --git a/src/plgridd.c b/src/plgridd.c
index 3982016..607e5a3 100644
--- a/src/plgridd.c
+++ b/src/plgridd.c
@@ -32,11 +32,7 @@
#include "../lib/nn/nn.h"
// PLPLOT_NONN not #defined or tested for more than a decade.
#ifdef PLPLOT_NONN // another DTLI, based only on QHULL, not nn
-#ifdef HAS_LIBQHULL_INCLUDE
-#include <libqhull/qhull_a.h>
-#else //#ifdef HAS_LIBQHULL_INCLUDE
-#include <qhull/qhull_a.h>
-#endif //#ifdef HAS_LIBQHULL_INCLUDE
+#include <libqhull_r/qhull_ra.h>
#endif //#ifdef PLPLOT_NONN
#endif //#ifdef PL_HAVE_QHUL
@@ -852,8 +848,11 @@ grid_adtli( PLFLT_VECTOR x, PLFLT_VECTOR y, PLFLT_VECTOR z, int npts,
points[i * dim + 1] = y[i];
}
+ qhT context = { 0 };
+ qhT* qh = &context;
+
#if 1 // easy way
- exitcode = qh_new_qhull( dim, npts, points, ismalloc,
+ exitcode = qh_new_qhull( qh, dim, npts, points, ismalloc,
flags, outfile, errfile );
#else
qh_init_A( stdin, stdout, stderr, 0, NULL );
@@ -899,17 +898,17 @@ grid_adtli( PLFLT_VECTOR x, PLFLT_VECTOR y, PLFLT_VECTOR z, int npts,
#endif
// Without the setjmp(), Qhull will exit() after reporting an error
- exitcode = setjmp( qh errexit );
+ exitcode = setjmp( qh->errexit );
if ( !exitcode )
{
- qh NOerrexit = False;
+ qh->NOerrexit = False;
for ( i = 0; i < nptsx; i++ )
for ( j = 0; j < nptsy; j++ )
{
l = 0;
point[0] = xg[i];
point[1] = yg[j];
- qh_setdelaunay( 3, 1, point );
+ qh_setdelaunay( qh, 3, 1, point );
// several ways to find the triangle given a point follow.
@@ -942,7 +941,7 @@ grid_adtli( PLFLT_VECTOR x, PLFLT_VECTOR y, PLFLT_VECTOR z, int npts,
// Another possibility is to implement the 'walking
// triangle algorithm
- facet = qh_findfacet_all( point, &bestdist, &isoutside, &totpart );
+ facet = qh_findfacet_all( qh, point, &bestdist, &isoutside, &totpart );
if ( facet->upperdelaunay )
zops->set( zgp, i, j, NaN );
@@ -950,7 +949,7 @@ grid_adtli( PLFLT_VECTOR x, PLFLT_VECTOR y, PLFLT_VECTOR z, int npts,
{
FOREACHvertex_( facet->vertices )
{
- k = qh_pointid( vertex->point );
+ k = qh_pointid( qh, vertex->point );
xt[l] = x[k];
yt[l] = y[k];
zt[l] = z[k];
@@ -969,12 +968,12 @@ grid_adtli( PLFLT_VECTOR x, PLFLT_VECTOR y, PLFLT_VECTOR z, int npts,
}
}
}
- qh NOerrexit = True;
+ qh->NOerrexit = True;
}
free( points );
- qh_freeqhull( !qh_ALL ); // free long memory
- qh_memfreeshort( &curlong, &totlong ); // free short memory and memory allocator
+ qh_freeqhull( qh, !qh_ALL ); // free long memory
+ qh_memfreeshort( qh, &curlong, &totlong ); // free short memory and memory allocator
if ( curlong || totlong )
fprintf( errfile,
"qhull: did not free %d bytes of long memory (%d pieces)\n",
--
2.30.2

13
_constraints Normal file
View File

@@ -0,0 +1,13 @@
<constraints>
<overwrite>
<conditions>
<arch>ppc64</arch>
<arch>ppc64le</arch>
</conditions>
<hardware>
<disk>
<size unit="M">4600</size>
</disk>
</hardware>
</overwrite>
</constraints>

3
plplot-5.15.0.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b92de4d8f626a9b20c84fc94f4f6a9976edd76e33fb1eae44f6804bdcc628c7b
size 15380293

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:24608c584011aec0d282e7d0dfdbd25651129baf5e6dc95b72794b4cc8379ad4
size 10527246

View File

@@ -0,0 +1,16 @@
Index: plplot-5.15.0/bindings/ada/CMakeLists.txt
===================================================================
--- plplot-5.15.0.orig/bindings/ada/CMakeLists.txt
+++ plplot-5.15.0/bindings/ada/CMakeLists.txt
@@ -18,6 +18,10 @@
if(ENABLE_ada)
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+ ADD_DEFINITIONS(-fPIC)
+ ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+
# Specification files containing, e.g., variables, types, and subprogramme (subprocedure) declarations.
set(SPEC_SOURCE_LIST
plplot.ads

View File

@@ -0,0 +1,203 @@
Index: plplot-5.15.0/cmake/modules/FindLua.cmake
===================================================================
--- plplot-5.15.0.orig/cmake/modules/FindLua.cmake
+++ /dev/null
@@ -1,198 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindLua
-# -------
-#
-#
-#
-# Locate Lua library This module defines
-#
-# ::
-#
-# LUA_FOUND - if false, do not try to link to Lua
-# LUA_LIBRARIES - both lua and lualib
-# LUA_INCLUDE_DIR - where to find lua.h
-# LUA_VERSION_STRING - the version of Lua found
-# LUA_VERSION_MAJOR - the major version of Lua
-# LUA_VERSION_MINOR - the minor version of Lua
-# LUA_VERSION_PATCH - the patch version of Lua
-#
-#
-#
-# Note that the expected include convention is
-#
-# ::
-#
-# #include "lua.h"
-#
-# and not
-#
-# ::
-#
-# #include <lua/lua.h>
-#
-# This is because, the lua location is not standardized and may exist in
-# locations other than lua/
-
-unset(_lua_include_subdirs)
-unset(_lua_library_names)
-unset(_lua_append_versions)
-
-# this is a function only to have all the variables inside go away automatically
-function(_lua_set_version_vars)
- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
-
- if (Lua_FIND_VERSION_EXACT)
- if (Lua_FIND_VERSION_COUNT GREATER 1)
- set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
- endif ()
- elseif (Lua_FIND_VERSION)
- # once there is a different major version supported this should become a loop
- if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
- if (Lua_FIND_VERSION_COUNT EQUAL 1)
- set(_lua_append_versions ${LUA_VERSIONS5})
- else ()
- foreach (subver IN LISTS LUA_VERSIONS5)
- if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
- list(APPEND _lua_append_versions ${subver})
- endif ()
- endforeach ()
- endif ()
- endif ()
- else ()
- # once there is a different major version supported this should become a loop
- set(_lua_append_versions ${LUA_VERSIONS5})
- endif ()
-
- list(APPEND _lua_include_subdirs "include/lua" "include")
-
- foreach (ver IN LISTS _lua_append_versions)
- string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
- list(APPEND _lua_include_subdirs
- include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
- include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
- include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
- )
- endforeach ()
-
- set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
- set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
-endfunction(_lua_set_version_vars)
-
-function(_lua_check_header_version _hdr_file)
- # At least 5.[012] have different ways to express the version
- # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
- # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
- file(STRINGS "${_hdr_file}" lua_version_strings
- REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
-
- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
- if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
- set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
- else ()
- string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
- if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
- endif ()
- string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
- string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
- endif ()
- foreach (ver IN LISTS _lua_append_versions)
- if (ver STREQUAL "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
- set(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR} PARENT_SCOPE)
- set(LUA_VERSION_MINOR ${LUA_VERSION_MINOR} PARENT_SCOPE)
- set(LUA_VERSION_PATCH ${LUA_VERSION_PATCH} PARENT_SCOPE)
- set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE)
- return()
- endif ()
- endforeach ()
-endfunction(_lua_check_header_version)
-
-_lua_set_version_vars()
-
-if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
- _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
-endif ()
-
-if (NOT LUA_VERSION_STRING)
- foreach (subdir IN LISTS _lua_include_subdirs)
- unset(LUA_INCLUDE_PREFIX CACHE)
- find_path(LUA_INCLUDE_PREFIX ${subdir}/lua.h
- HINTS
- ENV LUA_DIR
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /sw # Fink
- /opt/local # DarwinPorts
- /opt/csw # Blastwave
- /opt
- )
- if (LUA_INCLUDE_PREFIX)
- _lua_check_header_version("${LUA_INCLUDE_PREFIX}/${subdir}/lua.h")
- if (LUA_VERSION_STRING)
- set(LUA_INCLUDE_DIR "${LUA_INCLUDE_PREFIX}/${subdir}")
- break()
- endif ()
- endif ()
- endforeach ()
-endif ()
-unset(_lua_include_subdirs)
-unset(_lua_append_versions)
-
-if (LUA_VERSION_STRING)
- set(_lua_library_names
- lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}
- lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
- lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
- lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
- )
-endif ()
-
-find_library(LUA_LIBRARY
- NAMES ${_lua_library_names} lua
- HINTS
- ENV LUA_DIR
- PATH_SUFFIXES lib
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /sw
- /opt/local
- /opt/csw
- /opt
-)
-unset(_lua_library_names)
-
-if (LUA_LIBRARY)
- # include the math library for Unix
- if (UNIX AND NOT APPLE AND NOT BEOS)
- find_library(LUA_MATH_LIBRARY m)
- set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
-
- # include dl library for statically-linked Lua library
- get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
- if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
- list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
- endif()
-
- # For Windows and Mac, don't need to explicitly include the math library
- else ()
- set(LUA_LIBRARIES "${LUA_LIBRARY}")
- endif ()
-endif ()
-
-#include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
- REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
- VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)

View File

@@ -0,0 +1,12 @@
Index: plplot-5.15.0/include/qt.h
===================================================================
--- plplot-5.15.0.orig/include/qt.h
+++ plplot-5.15.0/include/qt.h
@@ -67,6 +67,7 @@
#include <QMainWindow>
#include <QPicture>
#include <QMutex>
+#include <QPainterPath>
#include "plDevs.h"
#include "plplotP.h"

View File

@@ -0,0 +1,12 @@
Index: plplot-5.15.0/cmake/modules/pdf.cmake
===================================================================
--- plplot-5.15.0.orig/cmake/modules/pdf.cmake
+++ plplot-5.15.0/cmake/modules/pdf.cmake
@@ -47,6 +47,7 @@ if(PLD_pdf)
# Determine that version in cross-platform way.
set(check_libharu_version_source "
#include \"hpdf.h\"
+#include \"hpdf_version.h\"
int main(void)
{
// True if version is 2.3.0 or later....

View File

@@ -1,151 +0,0 @@
diff -up plplot-5.9.7/examples/c/Makefile.examples.in.multiarch plplot-5.9.7/examples/c/Makefile.examples.in
--- plplot-5.9.7/examples/c/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
+++ plplot-5.9.7/examples/c/Makefile.examples.in 2010-10-11 12:15:53.248142693 -0600
@@ -25,8 +25,6 @@ CC = @CC@
EXEEXT = @EXEEXT@
@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
@gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \
@gcw_true@ plplotcanvas_demo$(EXEEXT) \
@@ -82,29 +82,29 @@ clean:
rm -f $(EXECUTABLES_list)
@gcw_true@plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c
-@gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
-@gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
+@gcw_true@@pkg_config_true@ $(CC) $< -o $@ \
+@gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
@gcw_true@@pkg_config_false@ $(CC) $< -o $@ \
@gcw_true@@pkg_config_false@ `plplot-config --cflags --libs --with-gcw`
@gcw_true@plplotcanvas_animation$(EXEEXT): plplotcanvas_animation.c
-@gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
-@gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
+@gcw_true@@pkg_config_true@ $(CC) $< -o $@ \
+@gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
@gcw_true@@pkg_config_true@ `pkg-config --cflags --libs gthread-2.0`
@gcw_true@@pkg_config_false@ $(CC) $< -o \
@gcw_true@@pkg_config_false@ $@ `plplot-config --cflags --libs --with-gcw` \
@gcw_true@@pkg_config_false@ @GCWTHREAD_CFLAGS@ @GCWTHREAD_LIBS@
@extXdrawable_true@@pkg_config_true@extXdrawable_demo$(EXEEXT): extXdrawable_demo.c
-@extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
-@extXdrawable_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0`
+@extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ \
+@extXdrawable_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0`
@extcairo_true@@pkg_config_true@ext-cairo-test$(EXEEXT): ext-cairo-test.c
-@extcairo_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
-@extcairo_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG) cairo`
+@extcairo_true@@pkg_config_true@ $(CC) $< -o $@ \
+@extcairo_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG) cairo`
.c$(EXEEXT):
-@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)`
+@pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)`
@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs`
.SUFFIXES: .c $(EXEEXT)
diff -up plplot-5.9.7/examples/c++/Makefile.examples.in.multiarch plplot-5.9.7/examples/c++/Makefile.examples.in
--- plplot-5.9.7/examples/c++/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
+++ plplot-5.9.7/examples/c++/Makefile.examples.in 2010-10-11 12:16:25.047202989 -0600
@@ -25,10 +25,7 @@ CXX = @CXX@
EXEEXT = @EXEEXT@
@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
@qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
-@qt_gui_true@@pkg_config_true@qt_RPATHCMD = @qt_RPATHCMD@
@wxwidgets_true@@pkg_config_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
@wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT)
@@ -80,18 +80,18 @@ clean:
rm -f $(EXECUTABLES_list)
@wxwidgets_true@@pkg_config_true@wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp
-@wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
+@wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
# Note, must filter out -p options which confuse $(QT_MOC_EXECUTABLE). Such
# options (e.g., -pthread) tend to appear in the static driver case.
@qt_gui_true@@pkg_config_true@moc_qt_PlotWindow.cpp: qt_PlotWindow.h
-@qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config --cflags-only-I plplot$(LIB_TAG)-qt` $< -o $@
+@qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `pkg-config --cflags-only-I plplot$(LIB_TAG)-qt` $< -o $@
@qt_gui_true@@pkg_config_true@qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp
-@qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-qt`
+@qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `pkg-config --cflags --libs plplot$(LIB_TAG)-qt`
.cc$(EXEEXT):
-@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
+@pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
@pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++`
.SUFFIXES: .cc $(EXEEXT)
diff -up plplot-5.9.7/examples/f77/Makefile.examples.in.multiarch plplot-5.9.7/examples/f77/Makefile.examples.in
--- plplot-5.9.7/examples/f77/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
+++ plplot-5.9.7/examples/f77/Makefile.examples.in 2010-10-11 12:15:53.251143648 -0600
@@ -25,8 +25,6 @@ F77 = @F77@
EXEEXT = @EXEEXT@
@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01f$(EXEEXT) \
@@ -70,7 +70,7 @@ clean:
rm -f $(EXECUTABLES_list)
.f$(EXEEXT):
-@pkg_config_true@ $(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
+@pkg_config_true@ $(F77) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
@pkg_config_false@ $(F77) $< -o $@ `plplot-config --cflags --libs --with-f77`
.SUFFIXES: .f $(EXEEXT)
diff -up plplot-5.9.7/examples/f95/Makefile.examples.in.multiarch plplot-5.9.7/examples/f95/Makefile.examples.in
--- plplot-5.9.7/examples/f95/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
+++ plplot-5.9.7/examples/f95/Makefile.examples.in 2010-10-11 12:15:53.252143716 -0600
@@ -25,8 +25,6 @@ F95 = @FC@
EXEEXT = @EXEEXT@
@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01f$(EXEEXT) \
@@ -69,7 +69,7 @@ clean:
rm -f $(EXECUTABLES_list)
.f90$(EXEEXT):
-@pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
+@pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
@pkg_config_false@ $(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95`
.SUFFIXES: .f90 $(EXEEXT)
diff -up plplot-5.9.7/examples/tk/Makefile.examples.in.multiarch plplot-5.9.7/examples/tk/Makefile.examples.in
--- plplot-5.9.7/examples/tk/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
+++ plplot-5.9.7/examples/tk/Makefile.examples.in 2010-10-11 12:15:53.253143630 -0600
@@ -24,8 +24,6 @@ CC = @CC@
EXEEXT = @EXEEXT@
@pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = xtk01$(EXEEXT)
# Second and fourth examples depend on itk.
@@ -37,7 +35,7 @@ clean:
rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list)
.c$(EXEEXT):
-@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
+@pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl`
.SUFFIXES: .c $(EXEEXT)

View File

@@ -0,0 +1,239 @@
From 0bf0fe35c044326c6720e14c7ab3df8c55868f2a Mon Sep 17 00:00:00 2001
From: Jan Kohnert <jan@jan-kohnert.de>
Date: Sun, 14 Jul 2024 14:46:48 +0200
Subject: [PATCH] Patch to make PLplot work with Numpy-2.0.0.
---
.gitignore | 4 ++++
bindings/python/Pltk_init.i | 2 +-
bindings/python/plplotc.i | 2 +-
cmake/modules/python.cmake | 12 +++++-------
examples/python/x08.py | 6 +++---
examples/python/x21.py | 8 ++++----
examples/python/x33.py | 24 ++++++++++++------------
7 files changed, 30 insertions(+), 28 deletions(-)
Index: plplot-5.15.0/.gitignore
===================================================================
--- plplot-5.15.0.orig/.gitignore
+++ plplot-5.15.0/.gitignore
@@ -29,3 +29,7 @@ tmp/
# Ignore Mac OS X generated file/directory attribute storage files
\.DS_Store
\._\.DS_Store
+
+# Ignore CLion config/buils directory
+.idea/
+cmake-build-debug/
Index: plplot-5.15.0/bindings/python/Pltk_init.i
===================================================================
--- plplot-5.15.0.orig/bindings/python/Pltk_init.i
+++ plplot-5.15.0/bindings/python/Pltk_init.i
@@ -24,7 +24,7 @@
%{
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <Python.h>
-#include <arrayobject.h>
+#include <numpy/arrayobject.h>
#include "plplot.h"
#include "plplotP.h"
Index: plplot-5.15.0/bindings/python/plplotc.i
===================================================================
--- plplot-5.15.0.orig/bindings/python/plplotc.i
+++ plplot-5.15.0/bindings/python/plplotc.i
@@ -46,7 +46,7 @@
%{
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include <arrayobject.h>
+#include <numpy/arrayobject.h>
#include "plplot.h"
#include "plplotP.h"
Index: plplot-5.15.0/cmake/modules/python.cmake
===================================================================
--- plplot-5.15.0.orig/cmake/modules/python.cmake
+++ plplot-5.15.0/cmake/modules/python.cmake
@@ -107,20 +107,18 @@ if(ENABLE_python)
execute_process(
COMMAND
${PYTHON_EXECUTABLE} -c "import numpy; print(numpy.get_include())"
- OUTPUT_VARIABLE NUMPY_INCLUDE_PATH_PARENT
+ OUTPUT_VARIABLE NUMPY_GET_INCLUDE
RESULT_VARIABLE NUMPY_ERR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(NUMPY_ERR)
set(NUMPY_INCLUDE_PATH)
else(NUMPY_ERR)
- # We use the full path name (including numpy on the end), but
- # Double-check that all is well with that choice.
find_path(
- NUMPY_INCLUDE_PATH
- arrayobject.h
- ${NUMPY_INCLUDE_PATH_PARENT}/numpy
- )
+ NUMPY_INCLUDE_PATH
+ numpy/arrayobject.h
+ ${NUMPY_GET_INCLUDE}
+ )
endif(NUMPY_ERR)
endif(NOT NUMPY_INCLUDE_PATH)
Index: plplot-5.15.0/examples/python/x08.py
===================================================================
--- plplot-5.15.0.orig/examples/python/x08.py
+++ plplot-5.15.0/examples/python/x08.py
@@ -104,13 +104,13 @@ def main(w):
y0 = 0.5*(YPTS - 1)
b = 0.7*y0
for i in range(indexxmin, indexxmax):
- square_root = sqrt(1. - min(1., ((double(i) - x0)/a)**2))
+ square_root = sqrt(1. - min([1., ((double(i) - x0)/a**2)]))
# Add 0.5 to find nearest integer and therefore preserve symmetry
# with regard to lower and upper bound of y range.
- indexymin[i] = max(0, int(0.5 + y0 - b*square_root))
+ indexymin[i] = max([0, int(0.5 + y0 - b*square_root)])
# indexymax calculated with the convention that it is 1
# greater than highest valid index.
- indexymax[i] = min(YPTS, 1 + int(0.5 + y0 + b*square_root))
+ indexymax[i] = min([YPTS, 1 + int(0.5 + y0 + b*square_root)])
zlimited[i][indexymin[i]:indexymax[i]] = z[i][indexymin[i]:indexymax[i]]
w.pllightsource(1., 1., 1.)
Index: plplot-5.15.0/examples/python/x21.py
===================================================================
--- plplot-5.15.0.orig/examples/python/x21.py
+++ plplot-5.15.0/examples/python/x21.py
@@ -131,8 +131,8 @@ def main(w):
if isnan(zg[i][j]):
zg[i][j] = 0.0
dist = 0.0
- for ii in range(max(i-1,0),min(i+2,xp)):
- for jj in range(max(j-1,0),min(j+2,yp)):
+ for ii in range(max([i-1,0]),min([i+2,xp])):
+ for jj in range(max([j-1,0]),min([j+2,yp])):
if (not isnan(zg[ii][jj])):
d = abs(ii-i) + abs(jj-j)
if (d != 1.0) :
@@ -148,8 +148,8 @@ def main(w):
lzM = max(zg.flat)
lzm = min(zg.flat)
- lzm = min(lzm,zmin)
- lzM = max(lzM,zmax)
+ lzm = min([lzm,zmin])
+ lzM = max([lzM,zmax])
lzm = lzm - 0.01
lzM = lzM + 0.01
Index: plplot-5.15.0/examples/python/x33.py
===================================================================
--- plplot-5.15.0.orig/examples/python/x33.py
+++ plplot-5.15.0/examples/python/x33.py
@@ -435,7 +435,7 @@ def main(w):
nlegend += 1
else:
nlegend -= 1
- nlegend = max(1, nlegend)
+ nlegend = max([1, nlegend])
opt_array = zeros(nlegend, "int")
text_colors = zeros(nlegend, "int")
text = zeros(nlegend, "S200")
@@ -469,12 +469,12 @@ def main(w):
w.plsfont(w.PL_FCI_MONO, -1, -1)
w.plscol0a( 15, 32, 32, 32, 0.70 )
- nrow = min(3, nlegend)
+ nrow = min([3, nlegend])
ncolumn = 0
(legend_width, legend_height) = \
w.pllegend( opt, position, x, y,
- 0.025, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 1.5,
+ 0.025, 15, 1, 1, int(nrow), ncolumn, opt_array, 1.0, 1.0, 1.5,
1., text_colors, text,
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
@@ -572,7 +572,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Set up symbol legend entries with various symbols.
for i in range(nlegend):
@@ -595,7 +595,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Set up symbol legend entries with various numbers of symbols.
for i in range(nlegend):
@@ -617,7 +617,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Set up box legend entries with various colours.
for i in range(nlegend):
@@ -642,7 +642,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Set up box legend entries with various patterns.
for i in range(nlegend):
@@ -664,7 +664,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Set up box legend entries with various box pattern line widths.
for i in range(nlegend):
@@ -686,7 +686,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Set up line legend entries with various colours.
for i in range(nlegend):
@@ -710,7 +710,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Set up line legend entries with various styles
for i in range(nlegend):
@@ -731,7 +731,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Set up line legend entries with various widths.
for i in range(nlegend):
@@ -752,7 +752,7 @@ def main(w):
box_colors, box_patterns, box_scales, box_line_widths,
line_colors, line_styles, line_widths,
symbol_colors, symbol_scales, symbol_numbers, symbols )
- max_height = max(max_height, legend_height)
+ max_height = max([max_height, legend_height])
# Color bar examples
values_small = [ -1.0e-20, 1.0e-20 ]

98
plplot-ocaml.patch Normal file
View File

@@ -0,0 +1,98 @@
--- a/bindings/ocaml/CMakeLists.txt
+++ b/bindings/ocaml/CMakeLists.txt
@@ -224,7 +224,7 @@ if(ENABLE_ocaml)
# ocamlopt as appropriate). This failure is likely the cause
# of the ldd -r errors for the ocaml examples unless they are created
# with ocamlc or ocamlopt using the appropriate rpath option.
- COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl ${ocaml_LIBRARIES_FLAGS} plplot_core_stubs.o plplot_impl.o
+ COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} ${CAMLIDL_LIB_FILE} ${ocaml_LIBRARIES_FLAGS} plplot_core_stubs.o plplot_impl.o
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o
${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o
@@ -249,7 +249,7 @@ if(ENABLE_ocaml)
# ocamlopt as appropriate). This failure is likely the cause
# of the ldd -r errors for the ocaml examples unless they are created
# with ocamlc or ocamlopt using the appropriate rpath option.
- COMMAND ${OCAMLMKLIB} -o installed_plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS} plplot_core_stubs.o plplot_impl.o
+ COMMAND ${OCAMLMKLIB} -o installed_plplot_stubs -L${CAMLIDL_LIB_DIR} ${CAMLIDL_LIB_FILE} ${installed_ocaml_LIBRARIES_FLAGS} plplot_core_stubs.o plplot_impl.o
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o
${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o
@@ -330,7 +330,7 @@ if(ENABLE_ocaml)
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/plplot.cma
- COMMAND ${OCAMLC} -a -custom -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS}
+ COMMAND ${OCAMLC} -a -custom -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib ${CAMLIDL_LIB_FILE} ${ocaml_LIBRARIES_FLAGS}
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
@@ -341,7 +341,7 @@ if(ENABLE_ocaml)
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.cma
- COMMAND ${OCAMLC} -a -custom -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS}
+ COMMAND ${OCAMLC} -a -custom -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib ${CAMLIDL_LIB_FILE} ${installed_ocaml_LIBRARIES_FLAGS}
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
@@ -399,7 +399,7 @@ if(ENABLE_ocaml)
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/plplot.cmxa
${CMAKE_CURRENT_BINARY_DIR}/plplot.a
- COMMAND ${OCAMLOPT} -a -o plplot.cmxa plplot_core.cmx plplot.cmx -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS}
+ COMMAND ${OCAMLOPT} -a -o plplot.cmxa plplot_core.cmx plplot.cmx -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib ${CAMLIDL_LIB_FILE} ${ocaml_LIBRARIES_FLAGS}
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmx
${CMAKE_CURRENT_BINARY_DIR}/plplot.cmx
@@ -411,7 +411,7 @@ if(ENABLE_ocaml)
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.cmxa
${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.a
- COMMAND ${OCAMLOPT} -a -o installed_plplot.cmxa plplot_core.cmx plplot.cmx -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS}
+ COMMAND ${OCAMLOPT} -a -o installed_plplot.cmxa plplot_core.cmx plplot.cmx -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib ${CAMLIDL_LIB_FILE} ${installed_ocaml_LIBRARIES_FLAGS}
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmx
${CMAKE_CURRENT_BINARY_DIR}/plplot.cmx
--- a/cmake/modules/ocaml.cmake
+++ b/cmake/modules/ocaml.cmake
@@ -115,17 +115,24 @@ if(ENABLE_ocaml)
OUTPUT_VARIABLE CAMLIDL_LIB_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
- find_path(CAMLIDL_LIB_DIR libcamlidl.a PATHS ${CAMLIDL_LIB_PATH} ${OCAML_LIB_PATH} )
+ message(STATUS "CAMLIDL_LIB_PATH = ${CAMLIDL_LIB_PATH}")
+ find_file(CAMLIDL_LIB_FILE libcamlidl.a libcamlidl_stubs.a PATHS ${CAMLIDL_LIB_PATH} ${OCAML_LIB_PATH} )
+ get_filename_component(CAMLIDL_LIB_DIR ${CAMLIDL_LIB_FILE} DIRECTORY)
+ message(STATUS "CAMLIDL_LIB_FILE = ${CAMLIDL_LIB_FILE}")
+ message(STATUS "CAMLIDL_LIB_DIR = ${CAMLIDL_LIB_DIR}")
else(OCAMLFIND)
- find_path(CAMLIDL_LIB_DIR libcamlidl.a PATHS ${OCAML_LIB_PATH} )
- endif(OCAMLFIND)
- if(CAMLIDL_LIB_DIR)
+ find_file(CAMLIDL_LIB_FILE libcamlidl.a libcamlidl_stubs.a PATHS ${OCAML_LIB_PATH} )
+ get_filename_component(CAMLIDL_LIB_DIR ${CAMLIDL_LIB_FILE} DIRECTORY)
+ message(STATUS "CAMLIDL_LIB_FILE = ${CAMLIDL_LIB_FILE}")
message(STATUS "CAMLIDL_LIB_DIR = ${CAMLIDL_LIB_DIR}")
- else(CAMLIDL_LIB_DIR)
+ endif(OCAMLFIND)
+ if(CAMLIDL_LIB_FILE)
+ message(STATUS "CAMLIDL_LIB_FILE = ${CAMLIDL_LIB_FILE}")
+ else(CAMLIDL_LIB_FILE)
message(STATUS "WARNING: "
"The camlidl library not found. Disabling OCaml binding")
set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml binding" FORCE)
- endif(CAMLIDL_LIB_DIR)
+ endif(CAMLIDL_LIB_FILE)
endif(ENABLE_ocaml)
@@ -134,7 +141,7 @@ if(ENABLE_ocaml)
# standard.
set(
OCAML_INSTALL_DIR
- ${CMAKE_INSTALL_PREFIX}/lib/ocaml
+ ${OCAML_LIB_PATH}
CACHE PATH "PLplot install location for ocaml files"
)
list(APPEND INSTALL_LOCATION_VARIABLES_LIST OCAML_INSTALL_DIR)

View File

@@ -0,0 +1,27 @@
Index: plplot-5.15.0/pkgcfg/plplot-template.pc.in
===================================================================
--- plplot-5.15.0.orig/pkgcfg/plplot-template.pc.in
+++ plplot-5.15.0/pkgcfg/plplot-template.pc.in
@@ -1,6 +1,6 @@
-libdir=@LIB_DIR@
-includedir=@INCLUDE_DIR@
-drvdir=@LIB_DIR@/plplot@PLPLOT_VERSION@/drivers
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+drvdir=@CMAKE_INSTALL_FULL_LIBDIR@/plplot@PLPLOT_VERSION@/drivers
Name: PLplot @PC_SHORT_NAME@
Description: Scientific plotting library (@PC_PRECISION@@PC_LONG_NAME@)
Index: plplot-5.15.0/CMakeLists.txt
===================================================================
--- plplot-5.15.0.orig/CMakeLists.txt
+++ plplot-5.15.0/CMakeLists.txt
@@ -95,6 +95,8 @@ endif(POLICY CMP0086)
# install trees.
set(PROJECT_NAMESPACE PLPLOT::)
+include(GNUInstallDirs)
+
option(USE_WRITEABLE_TARGET_TEST_PREFIX "Option to test library and executable targets which have both writeable and (ALIASed namespaced) read-only versions of their targets in the build tree and namespaced read-only targets in the install tree. This test prepends a prefix to the writeable version of the target name so as a result any such target referred to in the build tree without a writeable (\"writeable_target_test_prefix_)\") or read-only (\"PLPLOT::\") prefix should be discovered by this test (N.B. unless the unprefixed target reference occurs in CMake logic branches that are unexecuted by the particular configuration options that are chosen which makes this test necessary but not sufficient)." OFF)
if(USE_WRITEABLE_TARGET_TEST_PREFIX)
set(WRITEABLE_TARGET writeable_target_test_prefix_)

View File

@@ -0,0 +1,28 @@
--- plplot-5.15.0/examples/java/CMakeLists.txt 2024-09-26 18:42:42.679062899 +0200
+++ plplot-5.15.0/examples/java/CMakeLists.txt 2024-09-26 19:09:37.234642501 +0200
@@ -60,6 +60,15 @@
"33"
)
+if (DEFINED ENV{SOURCE_DATE_EPOCH})
+ execute_process(
+ COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" "+%Y-%m-%dT%H:%M:%SZ"
+ OUTPUT_VARIABLE COMPILATION_DATE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+else ()
+ string (TIMESTAMP COMPILATION_DATE "+%Y-%m-%dT%H:%M:%SZ")
+endif ()
+
if(CORE_BUILD)
set(java_SRCS)
foreach(STRING_INDEX ${java_STRING_INDICES})
@@ -133,7 +142,8 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot.jar
COMMAND ${CMAKE_Java_ARCHIVE}
- -cf ${CMAKE_CURRENT_BINARY_DIR}/plplot.jar -C ${CMAKE_BINARY_DIR}/bindings/java plplot/core -C ${CMAKE_CURRENT_BINARY_DIR} plplot/examples
+ --date=${COMPILATION_DATE} --create --file=${CMAKE_CURRENT_BINARY_DIR}/plplot.jar
+ -C ${CMAKE_BINARY_DIR}/bindings/java plplot/core -C ${CMAKE_CURRENT_BINARY_DIR} plplot/examples
DEPENDS ${java_CLASSES} ${java_CORE_CLASSES}
)

View File

@@ -1,8 +0,0 @@
addFilter("plplot-qt.* shlib-policy-name-error")
addFilter("plplot-wxwidgets.* shlib-policy-name-error")
addFilter("plplot-qt.* shlib-policy-missing-suffix")
addFilter("plplot-wxwidgets.* shlib-policy-missing-suffix")
addFilter("plplot-tcltk.* shlib-policy-missing-suffix")
addFilter("plplot-fortran.* shlib-policy-missing-suffix")
addFilter("plplot.* shlib-policy-missing-suffix")

View File

@@ -1,21 +0,0 @@
diff -ur plplot-5.9.8.orig//drivers/wxwidgets.cpp plplot-5.9.8//drivers/wxwidgets.cpp
--- plplot-5.9.8.orig//drivers/wxwidgets.cpp 2011-08-01 23:29:39.000000000 +0530
+++ plplot-5.9.8//drivers/wxwidgets.cpp 2011-08-02 01:06:57.323000001 +0530
@@ -231,7 +231,7 @@
if ( ucs4[i] != (PLUNICODE) plplotEsc ) // a character to display
{
ucs4_to_utf8( ucs4[i], utf8 );
- strncat( utf8_string, utf8, max_string_length );
+ strncat( utf8_string, utf8, sizeof(utf8_string)-strlen(utf8_string)-1 );
i++;
continue;
}
@@ -239,7 +239,7 @@
if ( ucs4[i] == (PLUNICODE) plplotEsc ) // a escape character to display
{
ucs4_to_utf8( ucs4[i], utf8 );
- strncat( utf8_string, utf8, max_string_length );
+ strncat( utf8_string, utf8, sizeof(utf8_string)-strlen(utf8_string)-1);
i++;
continue;
}

View File

@@ -1,3 +1,782 @@
-------------------------------------------------------------------
Thu Sep 26 17:17:45 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* plplot-reproducible-jar-mtime.patch
+ Use SOURCE_DATE_EPOCH for reproducible jar mtime
+ Applied if building with Java >= 17
-------------------------------------------------------------------
Sun Sep 15 22:27:50 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Add plplot-numpy-2.0-compat.patch for compatibility with numpy
>= 2.0 (gh#PLplot/PLplot#10); patch taken from upstream PR and
updated to fix tests.
-------------------------------------------------------------------
Mon Apr 8 05:34:11 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Disable python3.12 as it is not supported by upstream.
- Fix doc pakcage location.
-------------------------------------------------------------------
Fri Jan 26 21:57:04 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Add plplot-pkgconfig-includedir.patch: Use
CMAKE_INSTALL_FULL_<dir> macros to fix incorrect include and lib
dirs in pkgconfig file
(https://sourceforge.net/p/plplot/bugs/207/).
-------------------------------------------------------------------
Sun Jun 25 06:45:13 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
- Adapt specfile to build plplot against multiple python flavours.
- Set $HOME to current dir during %check to ensure fontconfig does
not complain about un-writable cache dirs.
- Add plplot-libharu-version-check.patch: Fix check for libharu
version when configuring build with cmake.
- New subpackages:
* plplot-driver-pdf: PDf driver based on libharu; new
BuildRequires: libharu-devel.
* plplot-pyqt5-cmake: CMake files for building cmake based
projects using python3-plplot-pyqt5. CMake files are not
versioned according to python3 versioning, and so can only
help when using the pyqt5 bindings with the primary python3
version. NOTE: Currently pkg is noop as pyqt5 bindings do not
build for python 3.11, since sip4 is not available for the
latter.
- Make doc package noarch.
- Have python310-plplot-pyqt5 obsolete plplot-python3-qt5.
- Have python311-plplot explicitly obsolete python3-plplot to
avoid file conflicts during upgrades.
- Let python310-plplot = %{version}-%{release} conflict with
python3-plplot < %{version}-%{release}.
-------------------------------------------------------------------
Wed May 3 06:35:14 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
- Disable octave also for TW (openSUSE >= 1550) since plplot does
not support octave >= 8.0.
-------------------------------------------------------------------
Sat Feb 26 14:58:47 UTC 2022 - Max Lin <mlin@suse.com>
- BuildRequires python3-sip4 for Leap 15.4
-------------------------------------------------------------------
Sun Jan 30 16:33:59 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
- Enforce CMAKE_INSTALL_LIBDIR=%{_libdir} to ensure pkgconfig
file substitutions for libdir are correct; this became an issue
after we switched to using the cmake macro for configuring
(boo#1195074).
-------------------------------------------------------------------
Tue Jul 6 05:52:58 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
- Change shebangs for Python examples to be Python 3.
- Add patch support-python3-pythondemos.patch so pythondemos.py will
run under Python 3.
-------------------------------------------------------------------
Fri Jul 2 23:33:31 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Enable building octave bindings for openSUSE >= 1550 (TW) where
swig has been patched to support octave 6+.
-------------------------------------------------------------------
Tue Jun 8 22:25:22 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Enforce std=c++14 to avoid build failures with GCC 11 that
defaults to c++17.
-------------------------------------------------------------------
Sun Apr 4 13:56:35 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Reenable qhull support, link against reentrant libqhull_r:
0001-Use-reentrant-libqhull_r-instead-of-deprecated-libqh.patch
- Some minor specfile cleanups
-------------------------------------------------------------------
Sat Feb 13 12:24:34 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Add plplot-drop-FindLua-cmake-module.patch to drop in-house
FindLua.cmake module, which is severely dated, to use cmake's
own module and fix building for lua >= 5.4; patch taken from
upstream.
-------------------------------------------------------------------
Sat Jan 9 13:26:01 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Disable octave bindings until compilation against octave 6 is
fixed (fix should happen mostly in swig, see gh#swig/swig#1893).
-------------------------------------------------------------------
Tue Dec 22 12:57:42 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix dependency of -devel package when built without qhull
support: libcsironn0 does not exist in this case.
-------------------------------------------------------------------
Sat Nov 28 19:03:52 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Disable csironn library since it does not build against recent
qhull (libqhull_r).
- Disable ada bindings: does not build with fPIC.
- BuildRequires: python3-sip4-devel for openSUSE >= 1550 to enable
pyqt5 bindings.
- Pass `-DCMAKE_SKIP_RPATH:BOOL=OFF
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON` to cmake to fix build issues
caused by Leap 15.2's incorrect cmake macros (doesn't hurt for
other distros anyway).
-------------------------------------------------------------------
Tue Jul 21 11:36:26 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Disable octave bindings for openSUSE < 1550 where they fail to
build.
-------------------------------------------------------------------
Mon Jul 20 12:50:23 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>
- Add _constraints for PowerPC avoid "no space left on device" build error
-------------------------------------------------------------------
Tue Jul 14 13:22:12 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Add plplot-include-QPainterPath.patch: Include QPainterPath
header when building Qt modules, needed for Qt >= 5.15.0; patch
from upstream.
- Re-enable octave bindings (issue with swig and octave seems to
be fixed now).
- Reorganise the distribution of cmake files so that each cmake
file belongs in the right package.
-------------------------------------------------------------------
Mon Feb 24 14:17:15 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Re-enable csironn bindings for openSUSE >= 1550 as they build
again (due to fixes to qhull package).
-------------------------------------------------------------------
Mon Feb 24 10:12:09 UTC 2020 - olaf@aepfle.de
- add conditional for OCaml bindings, they depend on camlidl
- actually fix the OCaml bindings with plplot-ocaml.patch
- use autosetup, build verbose
-------------------------------------------------------------------
Tue Feb 4 09:40:55 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Do not require libcsironn0 from the -devel package on
suse_version>=1550, where this is no longer built.
-------------------------------------------------------------------
Fri Dec 13 10:57:12 UTC 2019 - Atri Bhattacharya <badshah400@gmail.com>
- plplotqt-devel no longer Requires libqt4-devel, instead the
appropriate Qt5 headers.
-------------------------------------------------------------------
Thu Dec 12 13:18:30 UTC 2019 - Atri Bhattacharya <badshah400@gmail.com>
- Disable libcsironn on openSUSE >= 1550 to prevent build
failures.
- Fix shapelib dependency: BuildRequires: pkgconfig(shapelib)
instead of BuildRequires: shapelib; install additional shapelib
files as part of plplot-common.
-------------------------------------------------------------------
Thu Sep 26 12:21:47 UTC 2019 - olaf@aepfle.de
- Add ExclusiveArch, based on build_ada in gcc.spec
-------------------------------------------------------------------
Wed Jun 5 12:07:27 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
- Update to version 5.15.0
* Bug fixes
* Update PLplot to be consistent with modern free software
* Rewrite the configuration of the INSTALL_RPATH target
property
* Rewrite the rpath configuration of traditionally built
examples
* Factor the PLplot export files
* Introduce symbolic constants in our color-map routines
* New implementation of the range checks for the validity of
cmap0 and cmap1 user input
* New implementation of the -bg command-line option
* Implement ctest for the build system of the installed
examples
-------------------------------------------------------------------
Thu Apr 4 14:57:16 UTC 2019 - Atri Bhattacharya <badshah400@gmail.com>
- Disable octave bindings until compilation against octave 5.1.x
is supported.
-------------------------------------------------------------------
Fri Jan 25 12:40:02 UTC 2019 - badshah400@gmail.com
- Update to version 5.14.0:
* Update control of Python version
* Rewrite the build-system logic for determining PYQT_SIP_DIR
and PYQT_SIP_FLAGS
* Implement plStatic2dGrid
* Difference report default device changed from psc to svg
* Resolve the remaining difference report issues
* Improve command-line parsing
* Cleanup of plmap
* wxwidgets development status
* First step toward using best CMake-3 practices for our build
system
* Update PLplot to be consistent with modern free software
* Rewrite documentation of PLplot testing
* Configure the ps and psttf device drivers just like all other
device drivers
* Bug fixes
- Drop plplot-fix-pkgconfig-checks.patch: upstreamed.
- Update shlib package names in keeping with upstream so versions.
- Enable octave bindings: compilation against 4.4.x has been fixed
upstream.
-------------------------------------------------------------------
Fri Nov 30 12:43:55 UTC 2018 - badshah400@gmail.com
- Add plplot-fix-pkgconfig-checks.patch: Fix pkg-config based
checks for installed dependencies; patch taken from upstream
git.
-------------------------------------------------------------------
Tue Jul 31 12:50:31 UTC 2018 - badshah400@gmail.com
- Re-enable libcsirocsa and libscironn for i586: these are now
building (go figure!)
-------------------------------------------------------------------
Tue Jun 5 12:13:36 UTC 2018 - badshah400@gmail.com
- Disable octave bindings until compilation against octave 4.4 is
sorted out; remove conditionals for setting octave_enabled as
plplot is unresolvable against openSUSE < 1320 anyway.
-------------------------------------------------------------------
Tue May 8 03:24:17 UTC 2018 - badshah400@gmail.com
- plplot-devel should not depend on shared libs which are not
built: %{csirocsa_shlib} and %{csironn_shlib} on certain archs.
-------------------------------------------------------------------
Mon May 7 08:13:10 UTC 2018 - guillaume.gardet@opensuse.org
- Handle aarch64, ppc64 and ppc64le, not only x86_64 for libs
-------------------------------------------------------------------
Thu Apr 26 12:49:52 UTC 2018 - badshah400@gmail.com
- Fix building for i586 by packaging x86_64-only libraries only
for the latter arch.
-------------------------------------------------------------------
Fri Feb 16 12:24:17 UTC 2018 - badshah400@gmail.com
- Remove python3-base from Requires for %{name}-tcltk; it is
unneeded in light of python(abi) getting pulled in
automatically.
-------------------------------------------------------------------
Mon Feb 12 17:19:40 UTC 2018 - badshah400@gmail.com
- Replace even more python2 Requires with python3 ones; this
finally fixes build failures on openSUSE:Leap:15.0.
-------------------------------------------------------------------
Mon Feb 12 08:38:48 UTC 2018 - badshah400@gmail.com
- Swap leftover python2 Requires for explicitly python3 ones,
rename python package to python3-plplot.
-------------------------------------------------------------------
Fri Dec 1 10:08:56 UTC 2017 - badshah400@gmail.com
- Switch to using explicit python3 BuildRequires (plplot is
"unresolvable" for openSUSE <= 1320 anyway); adapt file lists
accordingly.
- Drop conditionals referring to old openSUSE versions <= 1320.
-------------------------------------------------------------------
Fri Dec 1 08:26:44 UTC 2017 - dimstar@opensuse.org
- Drop legacy dependencies: pkgconfig(gnome-python-2.0) and
pkgconfig(pygtk-2.0) are not in use.
-------------------------------------------------------------------
Wed Nov 29 08:20:50 UTC 2017 - badshah400@gmail.com
- Fix License tag in specfile for plplot-octave subpackage: While
everything else is licensed as LGPL-2.1+, the Octave bindings
are licensed as GPL-2.0+.
-------------------------------------------------------------------
Sat Nov 11 22:51:26 UTC 2017 - badshah400@gmail.com
- Drop BuildRequires on libgnomui and libgnomeprintui, as they are
not really required any more (boo#1067727).
- Change hashbangs for python based examples so that they refer
directly to the python binary instead of doing so via env.
-------------------------------------------------------------------
Wed Oct 4 07:40:37 UTC 2017 - fstrba@suse.com
- Remove the stale gcc-java dependency, since gcc-java is bound to
go soon and it is really not needed for building here
-------------------------------------------------------------------
Sat Aug 26 15:29:06 UTC 2017 - badshah400@gmail.com
- Update to version 5.13.0:
* Bug fixes.
* The Python binding and examples now work for both Python 2 and
3.
* Change the Fortran naming convention.
* Fix many "space in prefix" issues.
* Complete rewrite of IPC between -dev wxwidgets and wxPLViewer.
* Implement a new Windows GDI (wingdi) device driver.
* Implement new Python extension module to support pytkdemo.
* Fix OCaml inconsistencies for example 8.
* Improve the implementation of the OCaml binding.
- Add shapelib BuildRequires for added features.
- Rename fortran shared lib and devel package in keeping with
corresponding shared object naming changes.
- Use ctest for the check section. This allows the disabling of
tests that either fail because of issues with the test codes
themselves (octave), or because of lack of a full Xserver (Qt
tests).
-------------------------------------------------------------------
Fri Jun 16 10:17:09 UTC 2017 - alarrosa@suse.com
- Add LDFLAGS=-fPIC to fix the ada compiler test to link successfully
and enable the generation of ada bindings in Factory.
-------------------------------------------------------------------
Sat Feb 11 18:20:06 UTC 2017 - jengelh@inai.de
- Remove Requires(post) since there is not even a %post section.
- Trim descriptions for size, fix wrong summaries.
-------------------------------------------------------------------
Tue Feb 7 17:06:28 UTC 2017 - badshah400@gmail.com
- Switch to building with Qt5 instead of Qt4.
- Add BuildRequires on qhull, this generates a new shared lib
now packaged as %{csironn_shlib}.
- Drop unused cmake variables.
- Rename devel pkgs to follow their corresponding shared library
nomenclature.
- Split out wxPLViewer into its own subpackage, which is now
called %{name}-wxwidgets (the shared lib which was using this
name previously has been renamed in keeping with shlib policy).
- Drop %{name}-rpmlintrc file, as it is no longer needed.
- Since version 5.12.0 plplot's fortran bindings depend on
gcc-fortran >= 6.0.
-------------------------------------------------------------------
Mon Jan 30 06:59:30 UTC 2017 - badshah400@gmail.com
- Update to version 5.12.0:
* Bug fixes.
* Rewrite the CMake Ada language support.
* Rewrite the Fortran binding.
* Supply old Fortran binding and examples option.
* Backwards incompatibilities introduced by the new Fortran
binding.
* Examples reworked for the -DPL_DOUBLE=OFF case.
* Changes to our Ada bindings and examples.
* Changes to our tclmatrix library.
* Backwards-incompatible changes to our Tcl/Tk bindings and
examples.
* Substantial rewrite of the DocBook documentation.
* Default page size consistency.
* Updated D language support.
* Modernized build-system support for Qt4 and Qt5.
* Implemented support for pyqt5.
* Addressed -DPL_DOUBLE=OFF issues.
* Replaced "Lena" with "Chloe".
* Removed trailing blanks on most text files in our source tree.
* Make our wxwidgets find module consistent with the official
version for CMake-3.7.1.
* Introduction of two new generic pointer types to help protect
against a planned future C API breakage.
* Introduction of additional self-describing names for the types
of arguments used in our C API.
* Implement submission of dashboards to the <my.cdash.org> cdash
server.
* Substantial update and rename of the Python examples.
* Linux efficiency improvements for the wxwidgets device driver.
- Drop plplot-cmake36-pkg_check_pkgconfig_macro.patch: upstreamed.
- Rebase plplot-5.9.9-ada-pic.patch for updated version.
- Fix timestamp on previous changelog entry.
- Back to installing plplot.pc by default instead of plplot-c.pc.
- Rename plplot-fortran to libplplotf95-%{sover} as it now
contains a single shared lib.
- Apply shared library packaging guidelines wherever appropriate;
remove corresponding %{name}-rpmlintrc snippet. Shared lib
naming not applied to %{name}-tcltk-libs as all the SO in this
package are always required together and have their SO numbers
bumped in lock-step with each other.
- Rename %{name}-tcltk to %{name}-tcltk-libs.
- Except for the most basic drivers, package individual drivers in
their own subpackages. Users need to individually install
drivers they need, only mem and null drivers will be installed
by default [with any of the devel pkgs, for example].
- Split out a %{name}-common package with the most basic drivers
and common example files included; require it from all driver
subpackage, and -devel packages.
-------------------------------------------------------------------
Sat Dec 31 21:09:00 UTC 2016 - bwiedemann@suse.com
- build-fix: kill our Xvfb after use
-------------------------------------------------------------------
Fri Dec 9 00:26:55 UTC 2016 - badshah400@gmail.com
- plplot.pc installs as plplot-c.pc with cmake >= 3.7.1 (now in
openSUSE:Factory). Manually install a symlink plplot.pc to
plplot-c.pc for consistency.
-------------------------------------------------------------------
Tue Oct 18 11:50:29 UTC 2016 - badshah400@gmail.com
- Temporarily disable octave bindings as a workaround to build
failures caused by octave's upgrade to version 4.2.0 in Factory.
-------------------------------------------------------------------
Sun Aug 14 23:54:09 UTC 2016 - badshah400@gmail.com
- Enable tk bindings for all openSUSE versions; problem with
Xvfb segfaulting that prevent building tk bindings for Leap:42.2
and > 13.2 are worked around by passing the -noreset option to
Xvfb (see boo#992429).
-------------------------------------------------------------------
Mon Aug 8 07:45:35 UTC 2016 - badshah400@gmail.com
- Define macro "octave_enabled" to consistently check when
octave bindings are disabled (only for openSUSE:Leap:42.1).
- Disable tk bindings also for openSUSE:Leap:42.2 -- it does not
build because of Xvfb crash (boo#992429).
-------------------------------------------------------------------
Sat Aug 6 14:25:12 UTC 2016 - badshah400@gmail.com
- Enable octave bindings for openSUSE >= 13.2; builds just fine
now.
-------------------------------------------------------------------
Sat Aug 6 13:50:06 UTC 2016 - badshah400@gmail.com
- Add plplot-cmake36-pkg_check_pkgconfig_macro.patch to fix
plplot's defined pkg_check_pkgconfig macro to work with
cmake >= 3.6; patch sent upstream.
-------------------------------------------------------------------
Tue Apr 12 15:15:22 UTC 2016 - normand@linux.vnet.ibm.com
- disable Tk bindings in Factory need more change in spec
to avoid ppc64 build error.
-------------------------------------------------------------------
Wed Mar 30 14:52:11 UTC 2016 - badshah400@gmail.com
- Disable octave bindings for openSUSE > 13.2 temporarily until
related build failures are sorted out.
- Tk in Factory is not compatible with plplot apparently, turn
off tk bindings until fix found.
- Bump required cmake version to 3.0.2, has been required since
v5.11.1.
- Some rpmlint warning cleanups from using macros in comments.
-------------------------------------------------------------------
Wed Nov 25 22:23:07 UTC 2015 - p.drouand@gmail.com
- Remove pkgconfig(libagg) requirement; the package doesn't build
against it anyway
-------------------------------------------------------------------
Tue Aug 18 10:35:48 UTC 2015 - badshah400@gmail.com
- Disable octave bindings for openSUSE:42 as it doesn't have
a recent enough swig (>= 3.0) to support this.
-------------------------------------------------------------------
Thu Aug 13 05:06:41 UTC 2015 - badshah400@gmail.com
- Update to version 5.11.1:
+ Bug fixes.
+ Improve traditional build linking for nondynamic device
drivers case.
+ Comply with a NEW value for the CMake CMP0022, CMP0023 and
CMP0026 policies.
+ Plot labels as date / time are now available for 3D plots.
+ Comprehensive testing script improvements.
+ Build system and file cleanup concerning retired devices.
+ Many improvements and bug fixes for the new wxwidgets device.
+ Substantially improved results for comprehensive testing of
PLplot on the Cygwin platform.
+ Initial success of comprehensive testing of PLplot on the
MSYS2 platform.
- Drop plplot-swig-3.0.6.patch: incorporated upstream (use
-DTRY_OCTAVE4=ON option to build against octave 4.0 if
available).
- Disable plmeta driver: fails to build.
- Disable building tests: we can't seem to get make check
working anyway.
-------------------------------------------------------------------
Sun Jul 26 06:16:23 UTC 2015 - badshah400@gmail.com
- Add plplot-swig-3.0.6.patch to fix builds against swig 3.0.6;
patch taken from Fedora and accepted upstream.
- Enable octave bindings back, patch against swig to fix its
octave4 bindings has already entered develprojects and Factory.
- Define %{lua_version} to be 5.3 for openSUSE > 13.2 (Factory
has lua 5.3.x now).
- Drop conditionals for EOL openSUSE versions.
-------------------------------------------------------------------
Tue Jun 9 17:09:17 UTC 2015 - badshah400@gmail.com
- Disable octave bindings for now, since build fails with
octave >= 4.0 (now in science and TW).
-------------------------------------------------------------------
Mon Apr 13 17:26:17 UTC 2015 - badshah400@gmail.com
- Update to version 5.11.0:
+ Long list of changes, incl. backward incompatible changes
over version 5.10.0; see
/usr/share/doc/packages/plplot/README.release for a full
list.
- Adapt file-list to dropping of the 'd' suffix for shared libs.
- Drop 0001-fix_for_cmake_3.1.patch: incorporated upstream.
- Enable plmeta driver, it is now actively maintained by
upstream again.
- Add new binaries and man files installed by upstream.
-------------------------------------------------------------------
Sun Mar 15 17:10:28 UTC 2015 - jengelh@inai.de
- Remove redundant ldconfig requires
- Build with wxWidgets 3
-------------------------------------------------------------------
Sat Jan 31 00:18:15 UTC 2015 - sfalken@opensuse.org
- Added 0001-fix_for_cmake_3.1.patch to fix building on cmake>3.0
http://sourceforge.net/p/plplot/plplot/ci/772223c638ecf5dc740c9f3dd7a6883c6d2c83d2/
-------------------------------------------------------------------
Tue Sep 23 23:04:08 UTC 2014 - sfalken@opensuse.org
- Added -fno-strict-aliasing to CFLAGS and CXXFLAGS to clear warning:
[ 138s] I: Program is likely to break with new gcc. Try -fno-strict-aliasing.
[ 138s] W: plplot strict-aliasing-punning /home/abuild/rpmbuild/BUILD/plplot-5.10.0/builddir/bindings/java/plplotjavacJAVA_wrap.c:2441, 2454, 2467, 2480, 2493, 2506, 2519, 2532, 2545, 2558, 2571, 2597, 2610, 2623, 2636, 2649, 2662, 2675, 2688, 2701, 2714, 2727, 2740, 2753, 2767, 2777, 10385
-------------------------------------------------------------------
Mon Jul 21 23:00:31 UTC 2014 - badshah400@gmail.com
- Re-enable the tcl-tk bindings for factory as the problem seems
to have fixed itself (likely due to tk update).
-------------------------------------------------------------------
Sun Jun 29 14:39:24 UTC 2014 - badshah400@gmail.com
- Disable tcl-tk bindings for factory until we manage to fix what
is going wrong.
-------------------------------------------------------------------
Thu Feb 13 01:31:27 UTC 2014 - badshah400@gmail.com
- Update to version 5.10.0:
+ Update the parts of the build system that find Tcl-related
software
+ Update api.xml to be consistent with our public API defined by
plplot.h
- Packaging changes:
+ Drop plplot-avoid-config_h-nameclash.patch: incorporated
upstream
+ Add BuildRequires: xorg-x11-server as %configure requires
x-server to find and enable the tk bindings now
+ Implement a %check section to carry out build testing, but
disable actual testing until octave tests are fixed
+ Also package the FAQ file as %doc.
-------------------------------------------------------------------
Thu Jan 30 13:00:30 UTC 2014 - badshah400@gmail.com
- Enable octave bindings (requires patched swig version from
devel:tools:building)
- Add patch plplot-avoid-config_h-nameclash.patch to fix build
errors when octave bindings are enabled for openSUSE > 13.1;
patch taken from upstream svn.
-------------------------------------------------------------------
Thu Jan 2 20:07:27 UTC 2014 - badshah400@gmail.com
- Turn off octave bindings until bugs with octave >= 3.8.0 are
fixed upstream.
-------------------------------------------------------------------
Mon Dec 23 10:04:57 UTC 2013 - badshah400@gmail.com
- Update to version 5.9.11:
+ Change CMake variable NUMERIC_INCLUDE_PATH to
NUMPY_INCLUDE_PATH
- Overhaul of the build system and bindings for Tcl and friends
- Substantial overhaul of the build system for the Qt components
- Packaging changes:
- Drop patches:
- plplot-lua-5_2.patch: incorporated upstream
- plplot-tcl-import-usage.patch: incorporated upstream
- A shared library file was added to the tcltk bindings, also
package this appropriately (and its related devel files)
- BuildRequires: pkgconfig(lasi) for openSUSE 13.1 and above,
so that psttf driver can be built as well
- The driver pstex is disabled as recommended by upstream
- Remove conditionals solely necessitated by EOL versions of
openSUSE.
-------------------------------------------------------------------
Wed Oct 2 13:11:48 UTC 2013 - badshah400@gmail.com
- Update to version 5.9.10:
+ The format for map data used by plmap has changed
+ Python support for Numeric has been dropped
+ Backwards-incompatible API change to non-integer line widths
+ Improvements to the build system for the Cygwin case
+ The plcolorbar API has been finalized
+ Documentation of the new legend and color bar capabilities of
PLplot
+ The D bindings and examples have been converted from the
old version of D (D1) to the new version of D (D2)
+ The DocBook documentation for PLplot is now generated using
modern XML/XSL backend tools for DocBook
+ Implement experimental build_projects sub-project
+ Implement extremely simple "00" example
+ Convert to using the Allura form of SourceForge software
+ Use NON_TRANSITIVE linking by default for the shared libraries
case for all non-windows systems
+ Update f95 examples to take larger advantage of Fortran 95
capabilities
+ Substantial additions to the doxygen documentation
- Packaging changes:
+ Turn ada bindings back on
+ Remove restriction on lua version used, since package now
builds with lua version >= 5.2 as well
+ Turn off f77 bindings, as recommended by upstream
+ Drop patches that have been incorporated upstream:
- plplot-multiarch.patch
- plplot-gcc-ada46-libs.patch
- plplot-strncat.patch
- Add plplot-lua-5_2.patch to replace usage of log10, deprecated
in lua 5.2, in favour of log(,10) in some lua based examples.
-------------------------------------------------------------------
Tue Aug 20 03:16:20 UTC 2013 - badshah400@gmail.com
- Pass "-DUSE_INTERP_RESULT" to CFLAGS for openSUSE >= 13.1 to fix
build failures from usage of interp->result which is deprecated
in Tcl 8.6
- In addition, use plplot-tcl-import-usage.patch to fix type
inconsistency in Tcl_Import (for >= 13.1 only); re-enable
building of tck/tk bindings for openSUSE 13.1.
-------------------------------------------------------------------
Tue Aug 20 03:06:46 UTC 2013 - badshah400@gmail.com
- Disable tck/tk bindings completely for Factory to workaround
build failures from usage of interp->result which is deprecated
in Tcl 8.6.
-------------------------------------------------------------------
Sat Dec 8 16:01:29 UTC 2012 - badshah400@gmail.com
- Disable ada bindings for Factory as they cause build errors.
-------------------------------------------------------------------
Mon Sep 17 16:25:49 UTC 2012 - idonmez@suse.com
- Add plplot-5.9.9-ada-pic.patch to compile Ada code with -fPIC
-------------------------------------------------------------------
Tue May 29 13:15:00 UTC 2012 - badshah400@gmail.com
- Enable octave bindings also for openSUSE 12.1; building octave
bindings fail on openSUSE < 12.1 and have been turned off.
-------------------------------------------------------------------
Mon May 14 17:43:29 UTC 2012 - badshah400@gmail.com
- Enable octave bindings for openSUSE > 12.1 since octave is now
in factory. The octave bindings are packaged in a separate
package called plplot-octave.
-------------------------------------------------------------------
Sun Apr 22 15:06:37 UTC 2012 - dimstar@opensuse.org
- Extend plplot-gcc-ada46-libs.patch to include gnat-4.7 in plus.
-------------------------------------------------------------------
Sat Apr 7 08:31:21 UTC 2012 - badshah400@gmail.com
- Update lapack buildrequires in keeping with lapack package
naming changes in devel project; enables building on openSUSE
12.1 and 11.4 again.
-------------------------------------------------------------------
Mon Feb 13 10:53:50 UTC 2012 - coolo@suse.com
- patch license to follow spdx.org standard
-------------------------------------------------------------------
Sun Feb 12 17:51:38 UTC 2012 - badshah400@gmail.com
- Enable lua bindings for factory again, using BuildRequires:
pkgconfig(lua) < 5.2.
-------------------------------------------------------------------
Thu Feb 9 22:45:38 UTC 2012 - badshah400@gmail.com
- Disable lua bindings for factory, since build fails with
lua > 5.1
-------------------------------------------------------------------
Sun Nov 20 09:29:37 UTC 2011 - werner.ho@gmx.de
- dropped the qhull requirement from the spec-file
I've not seen any need of it in the INSTALL/README files
-------------------------------------------------------------------
Tue Oct 18 00:58:03 UTC 2011 - badshah400@gmail.com
- Update to version 5.9.9
+ Minor bug fixes for Windows platform
-------------------------------------------------------------------
Mon Oct 3 11:53:46 UTC 2011 - dimstar@opensuse.org
- Fix typo in Patch tagline.
-------------------------------------------------------------------
Mon Aug 8 23:56:24 UTC 2011 - badshah400@gmail.com
- Enable ada bindings
- Added plplot-gcc-ada46-libs.patch to enable compilation with
gcc-ada = 4.6
-------------------------------------------------------------------
Mon Aug 1 19:44:18 UTC 2011 - badshah400@gmail.com

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,13 @@
Index: plplot-5.15.0/examples/python/pythondemos.py
===================================================================
--- plplot-5.15.0.orig/examples/python/pythondemos.py
+++ plplot-5.15.0/examples/python/pythondemos.py
@@ -53,7 +53,6 @@ for i in range(0,34):
w.plend()
if len(failed) != 0:
- import string
- print "Failed script(s): " + string.join(failed,", ")
+ print("Failed script(s): " + ", ".join(failed))
sys.exit(1)