From 0c91afcfb689ceac8176c3ea848049f5eea69936 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Thu, 26 Nov 2020 18:47:25 +0100 Subject: [PATCH 01/20] New package: libkml-1.3.0 libkml is a library to process Google-KML GEO files. It can be used in GDAL (libgdal), OSSIM, OTB and osgEarth --- srcpkgs/libkml-devel | 1 + srcpkgs/libkml/patches/NOUNCRYPT.patch | 17 +++++++++++++++++ srcpkgs/libkml/shlibs | 6 ++++++ srcpkgs/libkml/template | 24 ++++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 120000 srcpkgs/libkml-devel create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch create mode 100644 srcpkgs/libkml/shlibs create mode 100644 srcpkgs/libkml/template diff --git a/srcpkgs/libkml-devel b/srcpkgs/libkml-devel new file mode 120000 index 00000000000..cf12be102f4 --- /dev/null +++ b/srcpkgs/libkml-devel @@ -0,0 +1 @@ +libkml \ No newline at end of file diff --git a/srcpkgs/libkml/patches/NOUNCRYPT.patch b/srcpkgs/libkml/patches/NOUNCRYPT.patch new file mode 100644 index 00000000000..5b7e016c0e0 --- /dev/null +++ b/srcpkgs/libkml/patches/NOUNCRYPT.patch @@ -0,0 +1,17 @@ +minizip/crypt.h was removed from the packet minizip-1.2.11_2. + +with "#define NOUNCRYPT" libkml can be built without "crypt.h" +https://github.com/void-linux/void-packages/commit/952ac913cf +https://github.com/madler/zlib/pull/229 + +--- a/src/kml/base/contrib/minizip/unzip.c 2015-12-21 18:23:05.000000000 +0100 ++++ b/src/kml/base/contrib/minizip/unzip.c 2020-11-26 15:45:55.033835816 +0100 +@@ -42,7 +42,7 @@ + #include //RR + #include "unzip.h" + #include "iomem_simple.h" +-#undef NOUNCRYPT ++#define NOUNCRYPT + + #ifdef STDC + # include diff --git a/srcpkgs/libkml/shlibs b/srcpkgs/libkml/shlibs new file mode 100644 index 00000000000..71dbff62431 --- /dev/null +++ b/srcpkgs/libkml/shlibs @@ -0,0 +1,6 @@ +libkmlbase.so.1 libkml-1.3.0_1 +libkmlconvenience.so.1 libkml-1.3.0_1 +libkmldom.so.1 libkml-1.3.0_1 +libkmlengine.so.1 libkml-1.3.0_1 +libkmlregionator.so.1 libkml-1.3.0_1 +libkmlxsd.so.1 libkml-1.3.0_1 diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template new file mode 100644 index 00000000000..87ce6bc7706 --- /dev/null +++ b/srcpkgs/libkml/template @@ -0,0 +1,24 @@ +# Template file for 'libkml' +pkgname=libkml +version=1.3.0 +revision=1 +build_style=cmake +makedepends="zlib-devel expat-devel boost-devel minizip-devel uriparser-devel" +short_desc="Library to manipulate KML OGC files" +maintainer="Nyx70 " +license="GPL-3.0-or-later" +homepage="https://github.com/libkml/libkml" +distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz" +checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963 +patch_args=-Np1 + +libkml-devel_package() { + depends="$pkgname-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} From a1eb510ed0382a59ecd480270b2cbe533fef7574 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Sun, 13 Dec 2020 16:06:15 +0100 Subject: [PATCH 02/20] libkml: libkml-devel_package depends= fixed --- srcpkgs/libkml/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template index 87ce6bc7706..7d4f5a72660 100644 --- a/srcpkgs/libkml/template +++ b/srcpkgs/libkml/template @@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963 patch_args=-Np1 libkml-devel_package() { - depends="$pkgname-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From d8a675cc41e729e0fa9b34541a09b8177cce2ea1 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 14:09:43 +0100 Subject: [PATCH 03/20] common/shlibs: add libkml-1.3.0_1 shlibs --- common/shlibs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/shlibs b/common/shlibs index 33bcda7378e..70d026395b8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4001,3 +4001,10 @@ libnotcurses++.so.2 notcurses-2.0.4_1 libevemu.so.3 evemu-2.7.0_1 libantilib.so.1 libantimicrox-3.1.2_1 libinih.so.0 inih-52_1 +# qgis ... +libkmlbase.so.1 libkml-1.3.0_1 +libkmlconvenience.so.1 libkml-1.3.0_1 +libkmldom.so.1 libkml-1.3.0_1 +libkmlengine.so.1 libkml-1.3.0_1 +libkmlregionator.so.1 libkml-1.3.0_1 +libkmlxsd.so.1 libkml-1.3.0_1 From f6c43c57cb2d0cc0be5acbea4a8a28f0c2e83d57 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Fri, 27 Nov 2020 07:02:22 +0100 Subject: [PATCH 04/20] libgdal: postgresql and kml support added --- srcpkgs/libgdal/shlibs | 1 + srcpkgs/libgdal/template | 27 ++++++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/libgdal/shlibs diff --git a/srcpkgs/libgdal/shlibs b/srcpkgs/libgdal/shlibs new file mode 100644 index 00000000000..62062587b2c --- /dev/null +++ b/srcpkgs/libgdal/shlibs @@ -0,0 +1 @@ +libgdal.so.28 libgdal-3.2.0_1 diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index c858c4264f1..d27c76c4a8f 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,23 +1,32 @@ # Template file for 'libgdal' +# Modified by Monkey-7-12 +# + libgdal with additional postgresql and kml support pkgname=libgdal -version=3.0.4 -revision=6 +version=3.2.0 +revision=1 wrksrc="gdal-${version}" +build_wrksrc="gdal" build_style=gnu-configure -configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes" +configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes + $(vopt_with postgresql pg)" hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel" -makedepends="freexl-devel geos-devel jasper-devel json-c-devel +makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel - libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel - proj-devel sqlite-devel ocl-icd-devel" + libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel + proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel) + $(vopt_if kml libkml-devel)" short_desc="Geospatial Data Abstraction Library" -maintainer="Jürgen Buchmüller " +#maintainer="Jürgen Buchmüller " +maintainer="Monkey-7-12 " license="MIT" homepage="http://www.gdal.org/" -distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" -checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277 +distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz" +checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c subpackages="libgdal-devel libgdal-tools" +build_options="postgresql kml" +build_options_default="postgresql kml" + if [ -z "$CROSS_BUILD" ]; then makedepends+=" hdf5-devel" fi From a3d622d6353d481de6e8e16d5ffcf8369a16d333 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Sun, 13 Dec 2020 16:10:37 +0100 Subject: [PATCH 05/20] libgdal: python3-gdal new build in libgdal --- srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------ srcpkgs/python3-gdal | 1 + 2 files changed, 63 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/python3-gdal diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index d27c76c4a8f..bdc7b923225 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,36 +1,73 @@ # Template file for 'libgdal' # Modified by Monkey-7-12 # + libgdal with additional postgresql and kml support +# Modified by Nyx70 +# python3-gdal module +# --with-expat / --with-spatialite added (OSM support) pkgname=libgdal version=3.2.0 revision=1 wrksrc="gdal-${version}" build_wrksrc="gdal" build_style=gnu-configure -configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes +configure_args=" + --with-expat=yes + --with-liblzma=yes + --with-opencl=yes + --with-podofo=yes + --with-spatialite=yes + --with-sqlite3=yes + --with-webp=yes + --with-zstd=yes + $(vopt_if kml libkml) $(vopt_with postgresql pg)" -hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel" -makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel - libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel - libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel - proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel) - $(vopt_if kml libkml-devel)" +hostmakedepends="gettext-devel pkg-config python3-numpy json-c-devel swig" +makedepends="boost-devel expat-devel freexl-devel geos-devel jasper-devel + json-c-devel libcurl-devel libopenexr-devel libopenjpeg2-devel + libpodofo-devel libqhull-devel libspatialite-devel libwebp-devel + libxml2-devel libzstd-devel netcdf-devel ocl-icd-devel opencl-headers + pcre2-devel proj-devel python3-devel sqlite-devel + $(vopt_if kml libkml-devel) + $(vopt_if postgresql postgresql-libs-devel)" short_desc="Geospatial Data Abstraction Library" #maintainer="Jürgen Buchmüller " -maintainer="Monkey-7-12 " +#maintainer="Monkey-7-12 " +maintainer="Nyx70 " license="MIT" homepage="http://www.gdal.org/" distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz" checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c -subpackages="libgdal-devel libgdal-tools" +subpackages="python3-gdal libgdal-devel libgdal-tools" -build_options="postgresql kml" -build_options_default="postgresql kml" +build_options="kml postgresql" +build_options_default="kml postgresql" if [ -z "$CROSS_BUILD" ]; then makedepends+=" hdf5-devel" fi +do_build() { + : ${make_cmd:=make} + ${make_cmd} ${makejobs} ${make_build_args} ${make_build_target} + # python modules + rm -f swig/python/*_wrap.cpp + make -C swig/python generate + #pushd swig/python > /dev/null + cd swig/python + ${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target} +# popd > /dev/null +} + +do_install() { + : ${make_cmd:=make} + ${make_cmd} DESTDIR=${DESTDIR} install + # python modules + #pushd swig/python > /dev/null + cd swig/python + #${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install + ${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install +} + post_install() { vinstall gdal.pc 644 usr/lib/pkgconfig vlicense LICENSE.TXT @@ -55,3 +92,17 @@ libgdal-devel_package() { vmove usr/lib/*.so } } + +python3-gdal_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - Python3 bindings" + pkg_install() { + vmove usr/bin/*.py + vmove "usr/lib/python*" + vlicense $wrksrc/$build_wrksrc/LICENSE.TXT + vdoc $wrksrc/$build_wrksrc/swig/python/README.rst + mkdir -p ${PKGDESTDIR}/usr/share/${pkgname} + cp -r $wrksrc/$build_wrksrc/swig/python/samples ${PKGDESTDIR}/usr/share/${pkgname}/examples + rm -rf ${PKGDESTDIR}/lib + } +} diff --git a/srcpkgs/python3-gdal b/srcpkgs/python3-gdal new file mode 120000 index 00000000000..377d50dfc2b --- /dev/null +++ b/srcpkgs/python3-gdal @@ -0,0 +1 @@ +libgdal \ No newline at end of file From 41fdc999bb543021cfb891157756fa53cf7fa773 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 14:18:19 +0100 Subject: [PATCH 06/20] common/shlibs: update for libgdal-3.2.0 --- common/shlibs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index 70d026395b8..7725ef10a70 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2472,7 +2472,7 @@ libu2f-host.so.0 libu2f-host-1.0.0_1 libu2f-server.so.0 libu2f-server-1.0.1_2 libsqlcipher.so.0 sqlcipher-3.3.1_1 libgta.so.1 libgta-1.2.0_1 -libgdal.so.26 libgdal-3.0.0_1 +libgdal.so.28 libgdal-3.2.0_1 libosgViewer.so.131 osg-3.4.1_1 libosgShadow.so.131 osg-3.4.1_1 libosgParticle.so.131 osg-3.4.1_1 From 5963497131d5637282dc39fecbf3963d1a56f863 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 14:22:47 +0100 Subject: [PATCH 07/20] proj: update to 7.2.0. --- srcpkgs/proj/shlibs | 1 + srcpkgs/proj/template | 13 +++++++------ srcpkgs/proj/update | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/proj/shlibs delete mode 100644 srcpkgs/proj/update diff --git a/srcpkgs/proj/shlibs b/srcpkgs/proj/shlibs new file mode 100644 index 00000000000..3890e887d63 --- /dev/null +++ b/srcpkgs/proj/shlibs @@ -0,0 +1 @@ +libproj.so.19 proj-7.2.0_1 diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template index 51c4638234b..3a6569178e6 100644 --- a/srcpkgs/proj/template +++ b/srcpkgs/proj/template @@ -1,17 +1,19 @@ # Template file for 'proj' +# Modified by Monkey-7-12 pkgname=proj -version=6.3.2 +version=7.2.0 revision=1 build_style=cmake -configure_args="-DPROJ_TESTS=OFF" +configure_args="-DBUILD_TESTING=OFF" hostmakedepends="python3" -makedepends="sqlite-devel" +makedepends="sqlite-devel tiff-devel libcurl-devel" short_desc="Cartographic Projections Library" -maintainer="John " +#maintainer="John " +maintainer="Monkey-7-12 " license="MIT" homepage="https://proj4.org" distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz" -checksum=cb776a70f40c35579ae4ba04fb4a388c1d1ce025a1df6171350dc19f25b80311 +checksum=2957798e5fe295ff96a2af1889d0428e486363d210889422f76dd744f7885763 post_install() { vlicense COPYING @@ -22,7 +24,6 @@ proj-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/share/man/man3 vmove usr/lib/cmake vmove "usr/lib/*.so" } diff --git a/srcpkgs/proj/update b/srcpkgs/proj/update deleted file mode 100644 index 667700bc719..00000000000 --- a/srcpkgs/proj/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*RC*" From cf3a91de527537b44ba5394f674569a846f91396 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 14:24:26 +0100 Subject: [PATCH 08/20] common/shlibs: update for proj-7.2.0 --- common/shlibs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index 7725ef10a70..546148086de 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3096,7 +3096,7 @@ libwithsctp.so.1 lksctp-tools-1.0.17_1 libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4 libunshield.so.0 libunshield-0.6_1 libMyGUIEngine.so.3.4.0 libmygui-3.4.0_1 -libproj.so.18 proj-6.3.0_1 +libproj.so.19 proj-7.2.0_1 libnlopt.so.0 nlopt-2.4.2_1 libeb.so.16 libeb-4.3.3_1 libchipcard.so.6 libchipcard-5.0.4_1 From 820da619fbf1e4fa93b6d0786382252e161d30b5 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 15:21:31 +0100 Subject: [PATCH 09/20] New package: libspatialite-5.0.0 --- srcpkgs/libspatialite-devel | 1 + srcpkgs/libspatialite/shlibs | 2 ++ srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 120000 srcpkgs/libspatialite-devel create mode 100644 srcpkgs/libspatialite/shlibs create mode 100644 srcpkgs/libspatialite/template diff --git a/srcpkgs/libspatialite-devel b/srcpkgs/libspatialite-devel new file mode 120000 index 00000000000..588ba2ad7c0 --- /dev/null +++ b/srcpkgs/libspatialite-devel @@ -0,0 +1 @@ +libspatialite \ No newline at end of file diff --git a/srcpkgs/libspatialite/shlibs b/srcpkgs/libspatialite/shlibs new file mode 100644 index 00000000000..eee57edae59 --- /dev/null +++ b/srcpkgs/libspatialite/shlibs @@ -0,0 +1,2 @@ +libspatialite.so.7 libspatialite-5.0.0_1 +mod_spatialite.so.7 libspatialite-5.0.0_1 diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template new file mode 100644 index 00000000000..787ae797248 --- /dev/null +++ b/srcpkgs/libspatialite/template @@ -0,0 +1,34 @@ +# Template file for 'libspatialite' +# Modified by Nyx70 +# license changed +pkgname=libspatialite +version=5.0.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config libxml2" +makedepends="sqlite-devel minizip-devel zlib-devel proj-devel freexl-devel geos-devel + libxml2-devel" +depends="sqlite" +short_desc="Geospatial extension for SQLite" +maintainer="Bo Son " +license="MPL-1.0" +homepage="https://www.gaia-gis.it/fossil/libspatialite/index" +distfiles="http://www.gaia-gis.it/gaia-sins/${pkgname}-${version}.tar.gz" +checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac + +CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + +post_install() { + vlicense COPYING +} + +libspatialite-devel_package() { + depends="$pkgname-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} From 7b7b6af93d25652c2b072eede054f64fbf3a3c2d Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 15:22:17 +0100 Subject: [PATCH 10/20] common/shlibs: add libspatialite-5.0.0 shlibs --- common/shlibs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/shlibs b/common/shlibs index 546148086de..e1d1dfcfc2e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4008,3 +4008,5 @@ libkmldom.so.1 libkml-1.3.0_1 libkmlengine.so.1 libkml-1.3.0_1 libkmlregionator.so.1 libkml-1.3.0_1 libkmlxsd.so.1 libkml-1.3.0_1 +libspatialite.so.7 libspatialite-5.0.0_1 +mod_spatialite.so.7 libspatialite-5.0.0_1 From ba5a8bac0b4696f49e49550f06d12084069949d4 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 15:33:58 +0100 Subject: [PATCH 11/20] grass: update to 7.8.4. --- srcpkgs/grass/INSTALL | 5 ++++ srcpkgs/grass/REMOVE | 5 ++++ srcpkgs/grass/shlibs | 7 +++++ srcpkgs/grass/template | 64 +++++++++++++++++++++++++++++------------- 4 files changed, 61 insertions(+), 20 deletions(-) create mode 100644 srcpkgs/grass/INSTALL create mode 100644 srcpkgs/grass/REMOVE create mode 100644 srcpkgs/grass/shlibs diff --git a/srcpkgs/grass/INSTALL b/srcpkgs/grass/INSTALL new file mode 100644 index 00000000000..f10f31ce260 --- /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 00000000000..f10f31ce260 --- /dev/null +++ b/srcpkgs/grass/REMOVE @@ -0,0 +1,5 @@ +case "$ACTION" in +post) + ldconfig + ;; +esac diff --git a/srcpkgs/grass/shlibs b/srcpkgs/grass/shlibs new file mode 100644 index 00000000000..ef2810ae84d --- /dev/null +++ b/srcpkgs/grass/shlibs @@ -0,0 +1,7 @@ +libgrass_dbmibase.7.8.so grass-7.8.4_1 +libgrass_dbmiclient.7.8.so grass-7.8.4_1 +libgrass_gis.7.8.so grass-7.8.4_1 +libgrass_gproj.7.8.so grass-7.8.4_1 +libgrass_imagery.7.8.so grass-7.8.4_1 +libgrass_raster.7.8.so grass-7.8.4_1 +libgrass_vector.7.8.so grass-7.8.4_1 diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template index bccd691a811..82afecc3ec3 100644 --- a/srcpkgs/grass/template +++ b/srcpkgs/grass/template @@ -1,30 +1,54 @@ # Template file for 'grass' +# Modified by Monkey-7-12 +# Modified by Nyx70 pkgname=grass -version=7.6.1 -revision=4 -_binver=${version//./} -_binver=${_binver:0:2} +version=7.8.4 +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 " +configure_args="--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 python-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="python-numpy wxPython libgdal>=3.2.0_1" +short_desc="Geographic Resources Analysis Support System" +#maintainer="Alex Jarosch " +#maintainer="Monkey-7-12 " +maintainer="Nyx70 " 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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9 nocross="tries to execute target binaries" +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" + +build_options="geos mysql nls pthread postgres" +build_options_default="geos pthread postgres" + 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}\";" + vsed -i ${DESTDIR}/usr/bin/grass${_binver} -e "s:${DESTDIR}::" + # 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 } From c1b10726c9d52b447f63e89679059d28da39f687 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 15:34:53 +0100 Subject: [PATCH 12/20] common/shlibs: add grass-7.8.4 shlibs --- common/shlibs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/shlibs b/common/shlibs index e1d1dfcfc2e..fcb038a71c5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4010,3 +4010,10 @@ libkmlregionator.so.1 libkml-1.3.0_1 libkmlxsd.so.1 libkml-1.3.0_1 libspatialite.so.7 libspatialite-5.0.0_1 mod_spatialite.so.7 libspatialite-5.0.0_1 +libgrass_dbmibase.7.8.so grass-7.8.4_1 +libgrass_dbmiclient.7.8.so grass-7.8.4_1 +libgrass_gis.7.8.so grass-7.8.4_1 +libgrass_gproj.7.8.so grass-7.8.4_1 +libgrass_imagery.7.8.so grass-7.8.4_1 +libgrass_raster.7.8.so grass-7.8.4_1 +libgrass_vector.7.8.so grass-7.8.4_1 From f9352da98da055781bea1afaac38a17e141939f2 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 15:45:30 +0100 Subject: [PATCH 13/20] qscintilla-qt5: update to 2.11.5. --- srcpkgs/qscintilla-qt5/template | 14 ++++++++------ srcpkgs/qscintilla-qt5/update | 3 --- 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 srcpkgs/qscintilla-qt5/update diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template index e7eac8a82f4..7d88a42da7f 100644 --- a/srcpkgs/qscintilla-qt5/template +++ b/srcpkgs/qscintilla-qt5/template @@ -1,18 +1,20 @@ # Template file for 'qscintilla-qt5' +# Modified by Monkey-7-12 pkgname=qscintilla-qt5 -version=2.11.2 +version=2.11.5 revision=1 -wrksrc="QScintilla_gpl-${version}" +wrksrc="QScintilla-${version}" build_wrksrc=Qt4Qt5 build_style=qmake hostmakedepends="qt5-qmake" makedepends="qt5-devel" short_desc="Qt5 port of Neil Hodgson's Scintilla C++ editor class" -maintainer="Pierre Allegraud " -license="GPL-3.0-only" +#maintainer="Pierre Allegraud " +maintainer="Monkey-7-12 " +license="GPL-3.0-or-later" homepage="https://www.riverbankcomputing.com/software/qscintilla/intro" -distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz" -checksum=029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1 +distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz" +checksum=9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b if [ "$CROSS_BUILD" ]; then hostmakedepends="qt5-devel" diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update deleted file mode 100644 index 4c5ed097b26..00000000000 --- a/srcpkgs/qscintilla-qt5/update +++ /dev/null @@ -1,3 +0,0 @@ -site="https://www.riverbankcomputing.com/software/qscintilla/download" -pkgname=QScintilla_gpl -ignore="*dev*" From 5a07aa809415e1bd6499afc11d9803f32aa70cdf Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 15:48:25 +0100 Subject: [PATCH 14/20] New package: python3-PyQt5-Qsci-2.11.5 --- srcpkgs/python3-PyQt5-Qsci/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/python3-PyQt5-Qsci/template diff --git a/srcpkgs/python3-PyQt5-Qsci/template b/srcpkgs/python3-PyQt5-Qsci/template new file mode 100644 index 00000000000..d7446bc0627 --- /dev/null +++ b/srcpkgs/python3-PyQt5-Qsci/template @@ -0,0 +1,21 @@ +# Template file for 'python3-PyQt5-Qsci' +pkgname=python3-PyQt5-Qsci +version=2.11.5 +revision=1 +wrksrc="QScintilla-${version}" +build_wrksrc=Python +build_style=qmake +hostmakedepends="qt5-qmake" +makedepends="python3-devel qscintilla-qt5-devel>=${version} qscintilla-qt5-devel<=${version} + python3-PyQt5-devel qt5-devel python3-sip-devel" +short_desc="QScintilla Python3 bindings" +maintainer="Bo Son " +license="GPL-3.0-or-later" +homepage="https://www.riverbankcomputing.com/software/qscintilla/intro" +distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz" +checksum=9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b + +do_configure() { + export QMAKEFEATURES=${wrksrc}/Qt4Qt5/features/ + python3 configure.py --pyqt=PyQt5 +} From 8a3bb54af66ded61f53ebfe7ed41ba64fdef7e90 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 15:51:28 +0100 Subject: [PATCH 15/20] New package: python3-OWSLib-0.20.0 --- srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-OWSLib/template diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template new file mode 100644 index 00000000000..d9c36a6a2b4 --- /dev/null +++ b/srcpkgs/python3-OWSLib/template @@ -0,0 +1,19 @@ +# Template file for 'python3-OWSLib' +# Modified by Nyx70 +# license=BSD -> BSD-3-Clause +pkgname=python3-OWSLib +version=0.20.0 +revision=1 +wrksrc=OWSLib-${version} +build_style=python3-module +hostmakedepends="python3-devel python3-setuptools" +short_desc="OWSLib Python3 modules" +maintainer="Bo Son " +license="BSD-3-Clause" +homepage="https://geopython.github.io/OWSLib" +distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz" +checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66 + +post_install() { + vlicense LICENSE +} From 6766d125b7cce8f58acb9e9c5e13b3314181e0fe Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 17:11:02 +0100 Subject: [PATCH 16/20] New package: qgis-3.16.1 --- srcpkgs/qgis/shlibs | 7 +++++++ srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 srcpkgs/qgis/shlibs create mode 100644 srcpkgs/qgis/template diff --git a/srcpkgs/qgis/shlibs b/srcpkgs/qgis/shlibs new file mode 100644 index 00000000000..2a26c752a69 --- /dev/null +++ b/srcpkgs/qgis/shlibs @@ -0,0 +1,7 @@ +libqgis_analysis.so.3.16.1 qgis-3.16.1_1 +libqgis_app.so.3.16.1 qgis-3.16.1_1 +libqgis_core.so.3.16.1 qgis-3.16.1_1 +libqgis_gui.so.3.16.1 qgis-3.16.1_1 +libqgis_native.so.3.16.1 qgis-3.16.1_1 +libqgisgrass7.so.3.16.1 qgis-3.16.1_1 +libqgispython.so.3.16.1 qgis-3.16.1_1 diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template new file mode 100644 index 00000000000..d95a267dde6 --- /dev/null +++ b/srcpkgs/qgis/template @@ -0,0 +1,45 @@ +# Template file for 'qgis' +# Modified by Nyx70 +pkgname=qgis +version=3.16.1 +revision=1 +archs="x86_64" +wrksrc=QGIS-final-${version//./_} +build_style=cmake +configure_args="-D GRASS_PREFIX7=/usr/lib/grass78" +hostmakedepends="pkg-config flex bison python3 protobuf24" +makedepends="gsl-devel hdf5-devel protobuf24-devel + ocl-icd-devel opencl-clhpp + exiv2-devel expat-devel + libxml2-devel libzip-devel netcdf-devel + qt5-devel qt5-declarative-devel qt5-location-devel + qt5-serialport-devel qt5-webkit-devel + qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite + qt5-plugin-tds qwt-devel + qscintilla-qt5-devel python3-PyQt5-Qsci + qca-qt5-devel qca-qt5-ossl qtkeychain-qt5-devel + python3-devel python3-PyQt5-devel python3-PyQt5-devel-tools + geos-devel grass libgdal-devel proj-devel + libspatialite libspatialindex-devel libspatialite-devel + postgresql-libs-devel sqlite-devel" +# geos-devel grass>=7.8.0 grass<7.9.0 libgdal-devel proj-devel +depends="python3-PyQt5 python3-PyQt5-Qsci python3-PyQt5-sql python3-PyQt5-svg + python3-Jinja2 python3-OWSLib python3-Pygments + qt5-plugin-sqlite python3-dateutil python3-requests python3-yaml + python3-Pillow python3-gdal python3-psycopg2 python3-pytz qca-qt5-ossl + grass>=7.8.0 grass<7.9.0" +short_desc="QGIS - A Free and Open Source Geographic Information System" +#maintainer="Bo Son " +maintainer="Nyx70 " +license="GPL-3.0-or-later" +homepage="https://qgis.org" +distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz" +checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e + +do_install() { + cd ${wrksrc}/build + make DESTDIR="$DESTDIR" install + mv ${DESTDIR}/usr/share/qgis/python ${DESTDIR}/usr/lib/qgis/ + ln -s ../../lib/qgis/python ${DESTDIR}/usr/share/qgis/python + mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share/ +} From a8e321c95ad89f7305d3b02ce91cc78ad58552b3 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Tue, 8 Dec 2020 17:11:52 +0100 Subject: [PATCH 17/20] common/shlibs: add qgis-3.16.1 shlibs --- common/shlibs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/shlibs b/common/shlibs index fcb038a71c5..1680281c1a1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4017,3 +4017,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1 libgrass_imagery.7.8.so grass-7.8.4_1 libgrass_raster.7.8.so grass-7.8.4_1 libgrass_vector.7.8.so grass-7.8.4_1 +libqgis_analysis.so.3.16.1 qgis-3.16.1_1 +libqgis_app.so.3.16.1 qgis-3.16.1_1 +libqgis_core.so.3.16.1 qgis-3.16.1_1 +libqgis_gui.so.3.16.1 qgis-3.16.1_1 +libqgis_native.so.3.16.1 qgis-3.16.1_1 +libqgisgrass7.so.3.16.1 qgis-3.16.1_1 +libqgispython.so.3.16.1 qgis-3.16.1_1 From 4c8c65e7c388e64bbed58a6b21a929a117cd1376 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Wed, 9 Dec 2020 05:08:05 +0100 Subject: [PATCH 18/20] common/shlibs: updated libprotobuf-lite.so.24 and libspatialindex.so.6 added --- common/shlibs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/shlibs b/common/shlibs index 1680281c1a1..8235418077d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4002,6 +4002,8 @@ libevemu.so.3 evemu-2.7.0_1 libantilib.so.1 libantimicrox-3.1.2_1 libinih.so.0 inih-52_1 # qgis ... +libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1 +libspatialindex.so.6 libspatialindex-1.9.3_1 libkmlbase.so.1 libkml-1.3.0_1 libkmlconvenience.so.1 libkml-1.3.0_1 libkmldom.so.1 libkml-1.3.0_1 From 8aea3acdc3eed1f9fc4825368c8e352d44dafb2c Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Thu, 10 Dec 2020 09:48:03 +0100 Subject: [PATCH 19/20] grass: musl-patch added --- srcpkgs/grass/patches/musl-build-fix.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/grass/patches/musl-build-fix.patch diff --git a/srcpkgs/grass/patches/musl-build-fix.patch b/srcpkgs/grass/patches/musl-build-fix.patch new file mode 100644 index 00000000000..e8177836574 --- /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 + #include ++#include + + /* Grass and local include files */ + #include From b90df7d9d53c9f1a9b9a2705eb7642a725fa72a6 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Thu, 10 Dec 2020 09:50:36 +0100 Subject: [PATCH 20/20] qgis: archs= fixed --- srcpkgs/qgis/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template index d95a267dde6..d00d77c4ed0 100644 --- a/srcpkgs/qgis/template +++ b/srcpkgs/qgis/template @@ -3,7 +3,7 @@ pkgname=qgis version=3.16.1 revision=1 -archs="x86_64" +archs="x86_64*" wrksrc=QGIS-final-${version//./_} build_style=cmake configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"