Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] grass: update to 7.8.5.
@ 2021-04-23 12:27 Nyx70
  2021-04-25  2:56 ` [PR REVIEW] " ericonr
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Nyx70 @ 2021-04-23 12:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 940 bytes --]

There is a new pull request by Nyx70 against master on the void-packages repository

https://github.com/Nyx70/void-packages nýx/geo/grass
https://github.com/void-linux/void-packages/pull/30452

grass: update to 7.8.5.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully?
- [X] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):


A patch file from https://github.com/void-linux/void-packages/pull/30452.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nýx/geo/grass-30452.patch --]
[-- Type: text/x-diff, Size: 5985 bytes --]

From 20c246d758f978cd9415cb3a4ab67288354b864e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:33:58 +0100
Subject: [PATCH] grass: update to 7.8.5.

---
 srcpkgs/grass/INSTALL                      |  5 ++
 srcpkgs/grass/REMOVE                       |  5 ++
 srcpkgs/grass/files/grass.desktop          |  9 +++
 srcpkgs/grass/patches/musl-build-fix.patch | 12 ++++
 srcpkgs/grass/template                     | 78 ++++++++++++++++------
 5 files changed, 88 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/grass/INSTALL
 create mode 100644 srcpkgs/grass/REMOVE
 create mode 100644 srcpkgs/grass/files/grass.desktop
 create mode 100644 srcpkgs/grass/patches/musl-build-fix.patch

diff --git a/srcpkgs/grass/INSTALL b/srcpkgs/grass/INSTALL
new file mode 100644
index 000000000000..f10f31ce2607
--- /dev/null
+++ b/srcpkgs/grass/INSTALL
@@ -0,0 +1,5 @@
+case "$ACTION" in
+post)
+	ldconfig
+	;;
+esac
diff --git a/srcpkgs/grass/REMOVE b/srcpkgs/grass/REMOVE
new file mode 100644
index 000000000000..f10f31ce2607
--- /dev/null
+++ b/srcpkgs/grass/REMOVE
@@ -0,0 +1,5 @@
+case "$ACTION" in
+post)
+	ldconfig
+	;;
+esac
diff --git a/srcpkgs/grass/files/grass.desktop b/srcpkgs/grass/files/grass.desktop
new file mode 100644
index 000000000000..99645a65cf9c
--- /dev/null
+++ b/srcpkgs/grass/files/grass.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Grass
+Comment=
+Exec=grass78 -wxpython  %f
+Icon=/usr/lib/grass78/gui/icons/grass-48x48.png
+Terminal=true
+Type=Application
+Categories=Science;Education;
diff --git a/srcpkgs/grass/patches/musl-build-fix.patch b/srcpkgs/grass/patches/musl-build-fix.patch
new file mode 100644
index 000000000000..e8177836574a
--- /dev/null
+++ b/srcpkgs/grass/patches/musl-build-fix.patch
@@ -0,0 +1,12 @@
+error: unknown type name 'int64_t' patch for musl
+
+--- include/gis.h	2020-10-05 08:39:31.000000000 +0200
++++ include/gis.h	2020-12-10 08:21:58.788027542 +0100
+@@ -23,6 +23,7 @@
+ /* System include files */
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <stdint.h>
+ 
+ /* Grass and local include files */
+ #include <grass/config.h>
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..5ce88ecf75a1 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,66 @@
 # Template file for 'grass'
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.5
+revision=1
+_binver=${version%.*}
+_binver=${_binver//./}
 build_style=gnu-configure
-configure_args="--prefix=\${DESTDIR}/usr/share --bindir=\${DESTDIR}/usr/bin
- --with-freetype-includes=${XBPS_CROSS_BASE}/usr/include/freetype2"
-hostmakedepends="flex libgdal-tools pkg-config python-numpy tar"
-makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel
- fftw-devel cairo-devel glu-devel wxPython-devel"
-depends="python-numpy wxPython"
-short_desc="Geographic Resources Analysis Support System - GIS"
-maintainer="Alex Jarosch <research@alexj.at>"
+configure_args="--with-regex --prefix=\${DESTDIR}/usr/lib --bindir=\${DESTDIR}/usr/bin
+ --with-freetype-includes=${XBPS_CROSS_BASE}/usr/include/freetype2
+ $(vopt_with bzip2 bzlib)
+ $(vopt_with geos)
+ $(vopt_with mysql) $(vopt_if mysql --with-mysql-includes=/usr/include/mysql)
+ $(vopt_with nls)
+ $(vopt_with pthread)
+ $(vopt_with postgres)"
+hostmakedepends="flex libgdal-tools pkg-config python3-numpy python3-six tar
+ $(vopt_if nls gettext)"
+makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel fftw-devel
+ cairo-devel glu-devel wxPython-devel libzstd-devel bzip2-devel
+ $(vopt_if bzip2 bzip2-devel)
+ $(vopt_if geos geos-devel)
+ $(vopt_if mysql libmysqlclient-devel)
+ $(vopt_if nls gettext-devel)
+ $(vopt_if postgres postgresql-libs-devel)"
+depends="python3-numpy wxPython4 libgdal>=3.2.0_1"
+short_desc="Geographic Resources Analysis Support System"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="GPL-2.0-or-later"
 homepage="https://grass.osgeo.org/"
-distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
-checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+distfiles="https://github.com/OSGeo/grass/archive/${version}.tar.gz"
+checksum=a359bb665524ecccb643335d70f5436b1c84ffb6a0e428b78dffebacd983ff37
 nocross="tries to execute target binaries"
 
+build_options="pthread bzip2 nls geos mysql postgres"
+build_options_default="pthread"
+
+shlib_provides="libgrass_dbmibase.${version%.*}.so libgrass_dbmiclient.${version%.*}.so
+ libgrass_gis.${version%.*}.so libgrass_gproj.${version%.*}.so libgrass_imagery.${version%.*}.so
+ libgrass_raster.${version%.*}.so libgrass_vector.${version%.*}.so"
+
 post_install() {
-	# move grass76 libraries from /usr/share to /usr/lib
-	vmkdir usr/lib
-	mv ${DESTDIR}/usr/share/grass* ${DESTDIR}/usr/lib
-	# fixes a todo in GISBASE
-	sed -i ${DESTDIR}/usr/bin/grass${_binver} \
-		-e "105s;\(gisbase =\).*;\1 \"/usr/lib/grass-${version}\";"
+	# remove $DESTDIR in paths
+	vsed -i -e "s|${DESTDIR}||" \
+		${DESTDIR}/usr/bin/grass${_binver} \
+		${DESTDIR}/usr/lib/grass78/etc/fontcap \
+		${DESTDIR}/usr/lib/grass78/demolocation/.grassrc78 \
+		${DESTDIR}/usr/lib/grass78/include/Make/Platform.make \
+		${DESTDIR}/usr/lib/grass78/include/Make/Grass.make
+
+	# ld.so.conf
+	mkdir -p ${DESTDIR}/etc/ld.so.conf.d
+	echo "/usr/lib/grass${_binver}/lib" >${DESTDIR}/etc/ld.so.conf.d/grass${_binver}.conf
+
+	# profiles
+	mkdir -p ${DESTDIR}/etc/profile.d
+	echo 'export PATH="/usr/lib/grass'${_binver}'/bin:$PATH"' >${DESTDIR}/etc/profile.d/grass${_binver}.sh
+
+	# install .pc file
+	vinstall grass.pc 0644 usr/share/pkgconfig
+	vsed -i -e "s|\${DESTDIR}||" -e "s|grass-${version}|grass${_binver}|" \
+		${DESTDIR}/usr/share/pkgconfig/grass.pc
+
+	# desktop entry
+	vinstall ${FILESDIR}/grass.desktop 644 usr/share/applications
+	vsed -i "s|^Comment=.*|Comment=${short_desc}|" ${DESTDIR}/usr/share/applications/grass.desktop
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-04-27  9:59 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-23 12:27 [PR PATCH] grass: update to 7.8.5 Nyx70
2021-04-25  2:56 ` [PR REVIEW] " ericonr
2021-04-25  2:56 ` ericonr
2021-04-25  2:56 ` ericonr
2021-04-25 12:41 ` Nyx70
2021-04-25 12:41 ` Nyx70
2021-04-25 12:42 ` [PR PATCH] [Closed]: " Nyx70
2021-04-25 15:07 ` ericonr
2021-04-26 17:59 ` nezos
2021-04-26 18:50 ` ericonr
2021-04-26 19:43 ` nezos
2021-04-27  9:58 ` ar-jan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).