ports/contrib (3.7): cairomm, gsl, potrace, inkscape: adopted

6 Mar 2023

commit fc5ba76e81015869f6e57343ec8296f8b658a3cc
Author: John McQuah <jmcquah@disroot.org>
Date:   Sun Mar 5 22:04:37 2023 -0500

    cairomm, gsl, potrace, inkscape: adopted
    
    gsl, potrace: adopted
    
    inkscape: adopted

diff --git a/cairomm/.signature b/cairomm/.signature
index e180a5197..dcc2e7147 100644
--- a/cairomm/.signature
+++ b/cairomm/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/82y7RbNGdpvzzpVuqIbUnjTzAMK4GM5OAaNgq6dR+Fi5SCF1SjNvm/z81RF30l8hcS4vtuRzz3iXQkaMgxaQk=
-SHA256 (Pkgfile) = 454c3927981b1b7d8347317c438a97d33e5d0c62959d91679b235e3f2c4f525c
+RWSagIOpLGJF35EB9B9mT9NkIu4gIVDg+sARg9MWbjwyB3RASvFxCq6bHr8ZHI271jQUjZCDr46YBVzIdOhTsNZoBh0icAz6CAI=
+SHA256 (Pkgfile) = eb5117efbd61335c3255b955b8e561b66f1bea1e0a1ccf73de494b1822cc2949
 SHA256 (.footprint) = 4298d3de2c4e4f22b06d88214e36192e4be7e9ae34cf922793b4401aa9a3db21
 SHA256 (cairomm-1.16.2.tar.xz) = 6a63bf98a97dda2b0f55e34d1b5f3fb909ef8b70f9b8d382cb1ff3978e7dc13f
diff --git a/cairomm/Pkgfile b/cairomm/Pkgfile
index 67cc80618..8b024e2ec 100644
--- a/cairomm/Pkgfile
+++ b/cairomm/Pkgfile
@@ -1,6 +1,6 @@
 # Description: C++ wrapper for the cairo graphics library.
 # URL: https://cairographics.org/cairomm/
-# Maintainer: Danny Rawlins, crux at romster dot me
+# Maintainer: John McQuah, jmcquah at disroot dot org
 # Depends on: cairo libsigc++
 
 name=cairomm
@@ -9,9 +9,12 @@ release=1
 source=(https://cairographics.org/releases/$name-$version.tar.xz)
 
 build() {
-	meson setup build $name-$version --prefix=/usr \
-		--buildtype=plain
+	meson setup build $name-$version \
+		--prefix=/usr \
+		--buildtype=plain \
+		-D b_lto=true \
+		-D b_pie=true
 
-	meson compile -C build -j ${JOBS:-1}
-	DESTDIR=$PKG meson install -C build
+	ninja -C build -j ${JOBS:-1}
+	DESTDIR=$PKG ninja -C build install
 }
diff --git a/gsl/.footprint b/gsl/.footprint
index c9a89b258..b78a035a9 100644
--- a/gsl/.footprint
+++ b/gsl/.footprint
@@ -272,13 +272,9 @@ drwxr-xr-x	root/root	usr/include/gsl/
 -rw-r--r--	root/root	usr/include/gsl/gsl_wavelet.h
 -rw-r--r--	root/root	usr/include/gsl/test_source.c
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libgsl.a
--rw-r--r--	root/root	usr/lib/libgslcblas.a
--rwxr-xr-x	root/root	usr/lib/libgslcblas.la
 -rwxr-xr-x	root/root	usr/lib/libgslcblas.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libgslcblas.so.0 -> libgslcblas.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libgslcblas.so -> libgslcblas.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libgsl.la
 -rwxr-xr-x	root/root	usr/lib/libgsl.so.27.0.0
 lrwxrwxrwx	root/root	usr/lib/libgsl.so.27 -> libgsl.so.27.0.0
 lrwxrwxrwx	root/root	usr/lib/libgsl.so -> libgsl.so.27.0.0
diff --git a/gsl/.signature b/gsl/.signature
index 34bfa5557..529c31f17 100644
--- a/gsl/.signature
+++ b/gsl/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37FEgeok0VYBD+7oPYiE+ZnTMJp45Yu8m3GtfLuoI34Z689W9EGXy2x4+4zjeqmjvLYSGKG9fL7QFLsstLnSKAs=
-SHA256 (Pkgfile) = 8803a53c818035b5f57801c2f1ee6c63f9c78ff88702bcf557850e2423d8bf5f
-SHA256 (.footprint) = ef2498d9d98250dab9e1abf349bda82d63e6656af2f00e7feb8f010b6bde0990
+RWSagIOpLGJF33q8lOpaHiOz5HXf6UHW8E0dQssGmiKMA9ywRrxdiUr66y8kHEzfZva7x8TTrGQeu05RKEa/Ki9kW2uGP/2rhAQ=
+SHA256 (Pkgfile) = c2254e6b94a8a2b5f63b8b83ff34233d9ed9aa1da8127474ea545d68352af93a
+SHA256 (.footprint) = 72c1826bb412c336016ed0c4fcac28c37aeef9912f22944f4cd2a0be0c07ba08
 SHA256 (gsl-2.7.1.tar.gz) = dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b
diff --git a/gsl/Pkgfile b/gsl/Pkgfile
index 91b8c9afd..889353214 100644
--- a/gsl/Pkgfile
+++ b/gsl/Pkgfile
@@ -1,6 +1,6 @@
 # Description: A numerical library for C and C++ programmers.
 # URL: http://www.gnu.org/software/gsl/
-# Maintainer: Danny Rawlins, crux at romster dot me
+# Maintainer: John McQuah, jmcquah at disroot dot org
 
 name=gsl
 version=2.7.1
@@ -10,10 +10,12 @@ source=(https://ftp.gnu.org/gnu/gsl/$name-$version.tar.gz)
 build() {
 	cd $name-$version
 
-	./configure --prefix=/usr
+	./configure --prefix=/usr \
+		--disable-static
 
 	make
 	make DESTDIR=$PKG install
 
-	rm -r $PKG/usr/share/info
+	rm -r $PKG/usr/share/info \
+		$PKG/usr/lib/*.la
 }
diff --git a/inkscape/.footprint b/inkscape/.footprint
index eaf014a74..465d8156a 100644
--- a/inkscape/.footprint
+++ b/inkscape/.footprint
@@ -4480,8 +4480,5 @@ drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/inkscape.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/inkview.1.gz
-drwxr-xr-x	root/root	usr/share/man/pt_BR/
-drwxr-xr-x	root/root	usr/share/man/pt_BR/man1/
--rw-r--r--	root/root	usr/share/man/pt_BR/man1/inkview.1.gz
 drwxr-xr-x	root/root	usr/share/metainfo/
 -rw-r--r--	root/root	usr/share/metainfo/org.inkscape.Inkscape.appdata.xml
diff --git a/inkscape/.signature b/inkscape/.signature
index 0100343cc..381a8af1a 100644
--- a/inkscape/.signature
+++ b/inkscape/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wsYcZqbNtcd7oVz/Aa8C7aG+y5iccOgaW7ptGpjLdoqy2I50kNGgFeCIlZm+qTe2qh/vLcsBI1Z+vupJe11lA8=
-SHA256 (Pkgfile) = 1d1bd0e7e1f0f651ae7402fa8f4e7bdafeef787398cf7a0916dec2fc066f7425
-SHA256 (.footprint) = dc290d674156d86ea071f4d9b338dfd5f577f3bcbca08ad6b6c008ac087062f0
+RWSagIOpLGJF3ylfyTw3sytGjKk8+uCd72DsCKQfkN6jusxcF7lKmZXOS1vpH+E9FJery/7FczZvplFPZ6kFK+7wrNLtTzy5gwI=
+SHA256 (Pkgfile) = 98d32e6b5493fb4633370b51ae5f46236cdfcb7888dcfcef179973cdeead490a
+SHA256 (.footprint) = 5c00c27fb6db20868048ca03ba45bfdd147fc23bd6e84ec9838b1d6b8e8c33b2
 SHA256 (inkscape-1.2.2.tar.xz) = a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4
-SHA256 (poppler-22.09.0.tar.xz) = d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile
index 8b19e77b2..8a6618ce5 100644
--- a/inkscape/Pkgfile
+++ b/inkscape/Pkgfile
@@ -1,54 +1,20 @@
 # Description: An open source SVG editor.
 # URL: https://www.inkscape.org/
-# Maintainer: Danny Rawlins, crux at romster dot me
+# Maintainer: John McQuah, jmcquah at disroot dot org
 # Depends on: boehm-gc boost double-conversion graphicsmagick gsl gtkmm3 libsoup libxslt poppler-glib popt potrace gdl
 
 name=inkscape
-_name=inkscape-INKSCAPE
 version=1.2.2
-_version=1.2_2022-05-15_dc2aedaf03
-_pversion=22.09.0
-_psoversion=124
 release=3
-source=(https://inkscape.org/gallery/item/37360/inkscape-1.2.2.tar.xz
-	https://poppler.freedesktop.org/poppler-$_pversion.tar.xz)
-
-poppler() {
-	cmake -S poppler-$_pversion -B build-poppler -G Ninja \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-D CMAKE_INSTALL_LIBDIR=lib \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-		-D ENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-		-D ENABLE_UTILS=ON \
-		-D ENABLE_CPP=ON \
-		-D ENABLE_GLIB=ON \
-		-D ENABLE_QT5=OFF \
-		-D ENABLE_ZLIB=ON \
-		-D ENABLE_CMS=lcms2 \
-		-D ENABLE_LIBOPENJPEG=none \
-		-D WITH_NSS3=OFF \
-		-Wno-dev
-
-	cmake --build build-poppler
-	DESTDIR=$SRC/poppler cmake --install build-poppler
-	install -D -t $PKG/usr/lib/inkscape $SRC/poppler/usr/lib/libpoppler.so.$_psoversion
-
-	export CXXFLAGS+=" -I$SRC/poppler/usr/include -I$SRC/poppler/usr/include/poppler"
-	export PKG_CONFIG_PATH="$SRC/poppler/usr/lib/pkgconfig:$PKG_CONFIG_PATH"
-}
+source=(https://inkscape.org/gallery/item/37360/inkscape-$version.tar.xz)
 
 build() {
-	#[ ! -e "/usr/lib/inkscape/libpoppler.so.$_psoversion" ] &&
-	#poppler
-
 	# https://gitlab.gnome.org/GNOME/glib/-/issues/2331
 	CFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66 -L/usr/lib/inkscape'
 	CXXFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66 -L/usr/lib/inkscape'
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/inkscape"
 
-	cmake -S inkscape-1.2.2_2022-12-01_b0a8486541 -B build -G Ninja \
+	cmake -S inkscape-${version}* -B build -G Ninja \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_INSTALL_LIBDIR=lib \
 		-D CMAKE_BUILD_TYPE=Release \
@@ -64,11 +30,12 @@ build() {
 		$PKG/usr/share/locale \
 		$PKG/usr/share/inkscape/doc
 
-	find $PKG/usr/share/inkscape \( -name 'README' -o -name 'README.*' \) -exec rm -f {} +
+	find $PKG/usr/share/inkscape \( -name 'README' -o -name 'README.*' \) -delete
 
 	/usr/bin/python3 -mcompileall $PKG
 	/usr/bin/python3 -O -m compileall $PKG
 	/usr/bin/python3 -OO -m compileall $PKG
 
-	rm -rf $PKG/usr/share/man/zh_TW
+	rm -rf	$PKG/usr/share/man/zh_TW \
+		$PKG/usr/share/man/pt_BR
 }
diff --git a/potrace/.footprint b/potrace/.footprint
index 835aab8b5..e3d8876e9 100644
--- a/potrace/.footprint
+++ b/potrace/.footprint
@@ -5,8 +5,6 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/potracelib.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libpotrace.a
--rwxr-xr-x	root/root	usr/lib/libpotrace.la
 lrwxrwxrwx	root/root	usr/lib/libpotrace.so -> libpotrace.so.0.0.6
 lrwxrwxrwx	root/root	usr/lib/libpotrace.so.0 -> libpotrace.so.0.0.6
 -rwxr-xr-x	root/root	usr/lib/libpotrace.so.0.0.6
diff --git a/potrace/.signature b/potrace/.signature
index 928067e3f..1069a78f3 100644
--- a/potrace/.signature
+++ b/potrace/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37yq75qPZ1kLDgnu5WURCKHyFAw8p6b6WDZn4mJ8UPdS98iO7GaA2Os89N6b/riiL3nKAdKZNGwgcUt4JWz3zww=
-SHA256 (Pkgfile) = fc94a8dcc901fa14e87905e29bccf8bcc8aea79a36f2870583a43c5d4b7ffd8e
-SHA256 (.footprint) = c02548b6d39a94a29c4d01808c3007eb782bc748dd0140dcf0a1b7e036ef7e37
+RWSagIOpLGJF3/RUjzcno1jinLRUz1WbOpOCbfBKOWJFMvuhKvbSHDKhtG7mQ9jZHNExhhqisebLrhmes39mKWLAu1VfHW/R1A8=
+SHA256 (Pkgfile) = 8e79d5e67a055777093a1819e90ac7ff097ceace92c78015a1754b22c800d5ad
+SHA256 (.footprint) = b96b5801aa02bbda21602c6f5772e1322ccec86a4a3cbf0740b86fbe274e3b91
 SHA256 (potrace-1.16.tar.gz) = be8248a17dedd6ccbaab2fcc45835bb0502d062e40fbded3bc56028ce5eb7acc
diff --git a/potrace/Pkgfile b/potrace/Pkgfile
index c7e8424b9..9561beab0 100644
--- a/potrace/Pkgfile
+++ b/potrace/Pkgfile
@@ -1,6 +1,6 @@
 # Description: Utility for tracing a bitmap (input: PBM,PGM,PPM,BMP; output: EPS,PS,PDF,SVG,DXF,PGM,Gimppath,XFig)
 # URL: http://potrace.sourceforge.net/
-# Maintainer: Danny Rawlins, crux at romster dot me
+# Maintainer: John McQuah, jmcquah at disroot dot org
 # Depends on: zlib
 
 name=potrace
@@ -16,9 +16,11 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
+		--disable-static \
+		--enable-metric \
 		--with-libpotrace
 
 	make
 	make DESTDIR=$PKG install
-	rm -r $PKG/usr/share/doc
+	rm -r $PKG/usr/share/doc $PKG/usr/lib/*.la
 }

    

crux＠crux.nu

tags

participants (1)