[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/, sci-visualization/gwyddion/files/
commit: 8dd8ded8b0a3f091e712ebb148b5c452853afaff
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri May 5 21:12:13 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri May 5 21:12:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd8ded8
sci-visualization/gwyddion: properly enable openexr support
Closes: https://bugs.gentoo.org/878253
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../gwyddion/files/gwyddion-2.62-automagic.patch | 35 +
sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild | 89 ++
2 files changed, 124 insertions(+)
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.62-automagic.patch
b/sci-visualization/gwyddion/files/gwyddion-2.62-automagic.patch
new file mode 100644
index ..67259e8e77c5
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.62-automagic.patch
@@ -0,0 +1,35 @@
+diff --git a/configure.ac b/configure.ac
+index 5a7465a..cc5a54d 100644
+--- a/configure.ac
b/configure.ac
+@@ -660,11 +660,13 @@ AM_CONDITIONAL([HAVE_CXX],[test "x$have_cxx" != xno])
+ #
+ # OpenEXR 2.x+
+ # Optional. Used for HDR greyscale OpenEXR pixmap import/export.
+-enable_exr=$have_cxx
+-PKG_CHECK_MODULES(EXR, [OpenEXR >= 2.0],
++GWY_WITH([exr],,[build with OpenEXR support])
++if test "x$enable_exr" != "xno"; then
++ PKG_CHECK_MODULES(EXR, [OpenEXR],
+ [AC_DEFINE(HAVE_EXR,1,
+ [Define if we have the OpenEXR 2.x+ package.])],
+ [enable_exr=no])
++fi
+ AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno])
+
+ #
+@@ -679,10 +681,13 @@ AM_CONDITIONAL([HAVE_HDF5],[test "x$enable_hdf5" != xno])
+ #
+ # CFITSIO
+ # Optional. Used for FITS image import.
+-PKG_CHECK_MODULES(CFITSIO, [cfitsio],
++GWY_WITH([cfitsio],,[build with cfitsio support])
++if test "x$enable_cfitsio" != "xno"; then
++ PKG_CHECK_MODULES(CFITSIO, [cfitsio],
+ [AC_DEFINE(HAVE_CFITSIO,1,
+ [Define if we have the cfitsio package.])],
+ [enable_cfitsio=no])
++fi
+ AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno])
+
+ #
diff --git a/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild
b/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild
new file mode 100644
index ..f3fb8344665c
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
+HOMEPAGE="http://gwyddion.net/;
+SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview
unique xml X zlib"
+
+RDEPEND="
+ >=dev-libs/glib-2.32
+ dev-libs/libzip
+ media-libs/libpng:0=
+ >=sci-libs/fftw-3.1:3.0=[openmp?]
+ virtual/libiconv
+ virtual/libintl
+ x11-libs/cairo
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libXmu
+ x11-libs/pango
+ bzip2? ( app-arch/bzip2 )
+ fits? ( sci-libs/cfitsio[bzip2?] )
+ jansson? ( dev-libs/jansson )
+ hdf5? ( sci-libs/hdf5[hl,zlib?] )
+ openexr? ( media-libs/openexr:= )
+ perl? ( dev-lang/perl:= )
+ ruby? ( dev-ruby/narray )
+ unique? ( dev-libs/libunique:3 )
+ sourceview? ( x11-libs/gtksourceview:2.0 )
+ xml? ( dev-libs/libxml2:2 )
+ zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.62-automagic.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+# There are python bindings (--enable-pygwy) but they are py2 only
+# 3D opengl rendering requires deprecated GTK-2 x11-libs/gtkglext
+src_configure() {
+ # hack for bug 741840
+ use doc && export GTK_DOC_PATH=/usr/share/gtk-doc
+
+ econf \
+ --disable-rpath \
+ --without-kde4-thumbnailer \
+ $(use_enable doc gtk-doc) \
+ $(use_enable openmp) \
+ $(use_enable nls) \
+ --disable-pygwy \
+ --without-python \
+ $(use_with bzip2) \
+ $(use_with fits cfitsio) \
+ $(use_with hdf5) \
+ $(use_with jansson) \
+ $(use_with perl) \
+ $(use_with ruby) \
+ $(use_with openexr exr) \
+ --without-gl \
+
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/, sci-visualization/gwyddion/files/
commit: 5b3f0d7261de9021367be928a5169ac8b342fac1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Aug 30 18:25:36 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 30 18:26:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3f0d72
sci-visualization/gwyddion: drop 2.56, EAPI-6--
Closes: https://bugs.gentoo.org/851699
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-visualization/gwyddion/Manifest| 1 -
.../gwyddion/files/gwyddion-2.56-automagic.patch | 34 --
sci-visualization/gwyddion/gwyddion-2.56.ebuild| 79 --
3 files changed, 114 deletions(-)
diff --git a/sci-visualization/gwyddion/Manifest
b/sci-visualization/gwyddion/Manifest
index 707291aef688..f0a82e062181 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,3 +1,2 @@
-DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B
f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3
SHA512
cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
DIST gwyddion-2.60.tar.xz 4973404 BLAKE2B
6ded40f34bfcd70db2e897abc1f07b070aca78e08c90661ee4fe281d19f16337ca81b5a4e2adaeb29e1870e8194eb77976910a54248842c8474864065d64defd
SHA512
e568df77ef580aaedfcdd1f746a78f3ca93676a07a331fc6e70f997780bb403d1c3967aa93440c7fa1f010bd01f5376700c869a38dacaf1f98b075c4c950cf54
DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B
e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed
SHA512
c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
b/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
deleted file mode 100644
index 720880570830..
--- a/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN gwyddion-2.56.orig/configure.ac gwyddion-2.56/configure.ac
gwyddion-2.56.orig/configure.ac2020-06-30 11:04:55.0 +0300
-+++ gwyddion-2.56/configure.ac 2020-06-30 13:22:00.881313300 +0300
-@@ -646,11 +646,13 @@
- #
- # OpenEXR
- # Optional. Used for HDR greyscale OpenEXR pixmap import/export.
--enable_exr=$have_cxx
--PKG_CHECK_MODULES(EXR, [OpenEXR],
-+GWY_WITH([exr],,[build with OpenEXR support])
-+if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then
-+ PKG_CHECK_MODULES(EXR, [OpenEXR],
- [AC_DEFINE(HAVE_EXR,1,
- [Define if we have the OpenEXR package.])],
- [enable_exr=no])
-+fi
- AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno])
-
- #
-@@ -665,10 +667,13 @@
- #
- # CFITSIO
- # Optional. Used for FITS image import.
--PKG_CHECK_MODULES(CFITSIO, [cfitsio],
-+GWY_WITH([cfitsio],,[build with cfitsio support])
-+if test "x$enable_cfitsio" != "xno"; then
-+ PKG_CHECK_MODULES(CFITSIO, [cfitsio],
- [AC_DEFINE(HAVE_CFITSIO,1,
- [Define if we have the cfitsio package.])],
- [enable_cfitsio=no])
-+fi
- AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno])
-
- #
diff --git a/sci-visualization/gwyddion/gwyddion-2.56.ebuild
b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
deleted file mode 100644
index 2a71870ce0e1..
--- a/sci-visualization/gwyddion/gwyddion-2.56.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg
-
-DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
-HOMEPAGE="http://gwyddion.net/;
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc fits gnome hdf5 nls openexr perl ruby sourceview xml X"
-
-RDEPEND="
- >=dev-libs/glib-2.32
- dev-libs/libzip
- media-libs/libpng:0=
- >=sci-libs/fftw-3.1:3.0=
- x11-libs/cairo
- >=x11-libs/gtk+-2.18:2
- x11-libs/libXmu
- x11-libs/pango
- fits? ( sci-libs/cfitsio )
- gnome? ( gnome-base/gconf:2 )
- hdf5? ( sci-libs/hdf5 )
- openexr? ( media-libs/openexr:= )
- perl? ( dev-lang/perl:= )
- ruby? ( dev-ruby/narray )
- sourceview? ( x11-libs/gtksourceview:2.0 )
- xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/, sci-visualization/gwyddion/files/
commit: 474366dad65b7205550ebdaccbecc231a639f638
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Jan 28 00:07:46 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue Jan 28 00:08:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474366da
sci-visualization/gwyddion: Fix generated mime data
Patch backported from upstream trunk
Closes: https://bugs.gentoo.org/706790
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch | 15 +++
.../{gwyddion-2.55-r1.ebuild => gwyddion-2.55-r2.ebuild} | 1 +
2 files changed, 16 insertions(+)
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
new file mode 100644
index 000..536790c1ac4
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
@@ -0,0 +1,15 @@
+Index: gwyddion/modules/file/ambprofile.c
+===
+--- gwyddion/modules/file/ambprofile.c (revision 22650)
gwyddion/modules/file/ambprofile.c (revision 22651)
+@@ -32,8 +32,8 @@
+ * Ambios XML profile data
+ *
+ *
+- *
+- *
++ *
++ *
+ *
+ *
+ *
diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild
b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
similarity index 97%
rename from sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild
rename to sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
index 7029da852fc..af6b4601506 100644
--- a/sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.55-automagic.patch"
+ "${FILESDIR}/${PN}-2.55-mime.patch"
)
src_prepare() {
