Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ghostscript: add cups build_option
@ 2019-10-15 20:51 voidlinux-github
  2019-10-17  7:27 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-15 20:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ioraff/void-packages ghostscript
https://github.com/void-linux/void-packages/pull/15504

ghostscript: add cups build_option


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghostscript-15504.patch --]
[-- Type: text/x-diff, Size: 2465 bytes --]

From ca798eb4ec8f554ab92964cbfd846be3d0d190e3 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owenr@fferty.me>
Date: Tue, 15 Oct 2019 15:50:08 -0500
Subject: [PATCH] ghostscript: add cups build_option

---
 srcpkgs/ghostscript/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 6e6507be8fd..3c8691ded8b 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -10,17 +10,20 @@ distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo
 checksum=fc0f1fbacd3610c67a9f080487a0e021f14390c38a4b4df9723e2bdf2b90b619
 
 hostmakedepends="automake libtool pkg-config"
-makedepends="cups-devel dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
+makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 
+build_options="cups"
+build_options_default="cups"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"
 fi
 
 pre_configure() {
 	# force it to use system libs.
-	rm -rf cups/libs freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
+	rm -rf $(vopt_if cups cups/libs) freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
 
 	# add missing LDFLAGS
 	sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
@@ -40,7 +43,8 @@ do_configure() {
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--enable-fontconfig --enable-freetype --enable-openjpeg \
 		--with-libpaper --without-luratech --without-omni \
-		--with-system-libtiff --disable-compile-inits
+		--with-system-libtiff --disable-compile-inits \
+		$(vopt_if cups '' '--disable-cups')
 
 	# configure libijs
 	cd ijs
@@ -58,8 +62,7 @@ do_build() {
 
 do_install() {
 	# install ghostscript
-	make DESTDIR=${DESTDIR} cups_serverroot=${DESTDIR}/etc/cups \
-		cups_serverbin=${DESTDIR}/usr/lib/cups install install-so
+	make DESTDIR=${DESTDIR} $(vopt_if cups 'cups_serverroot=${DESTDIR}/etc/cups cups_serverbin=${DESTDIR}/usr/lib/cups') install install-so
 	# install license
 	vlicense LICENSE
 
@@ -71,7 +74,7 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	# Remove conflicting files with cups-filters.
-	rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}
+	$(vopt_if cups 'rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}')
 
 	cd ..
 	# Install missing file

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] ghostscript: add cups build_option
  2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
  2019-10-17  7:27 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-17  7:27 ` voidlinux-github
  2019-10-21 16:43 ` voidlinux-github
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-17  7:27 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by ioraff against master on the void-packages repository

https://github.com/ioraff/void-packages ghostscript
https://github.com/void-linux/void-packages/pull/15504

ghostscript: add cups build_option


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghostscript-15504.patch --]
[-- Type: text/x-diff, Size: 2465 bytes --]

From ac75d516ce66b5b1f146b55e698bc276c66e1c8d Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owenr@fferty.me>
Date: Tue, 15 Oct 2019 15:50:08 -0500
Subject: [PATCH] ghostscript: add cups build_option

---
 srcpkgs/ghostscript/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 6e6507be8fd..3c8691ded8b 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -10,17 +10,20 @@ distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo
 checksum=fc0f1fbacd3610c67a9f080487a0e021f14390c38a4b4df9723e2bdf2b90b619
 
 hostmakedepends="automake libtool pkg-config"
-makedepends="cups-devel dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
+makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 
+build_options="cups"
+build_options_default="cups"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"
 fi
 
 pre_configure() {
 	# force it to use system libs.
-	rm -rf cups/libs freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
+	rm -rf $(vopt_if cups cups/libs) freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
 
 	# add missing LDFLAGS
 	sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
@@ -40,7 +43,8 @@ do_configure() {
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--enable-fontconfig --enable-freetype --enable-openjpeg \
 		--with-libpaper --without-luratech --without-omni \
-		--with-system-libtiff --disable-compile-inits
+		--with-system-libtiff --disable-compile-inits \
+		$(vopt_if cups '' '--disable-cups')
 
 	# configure libijs
 	cd ijs
@@ -58,8 +62,7 @@ do_build() {
 
 do_install() {
 	# install ghostscript
-	make DESTDIR=${DESTDIR} cups_serverroot=${DESTDIR}/etc/cups \
-		cups_serverbin=${DESTDIR}/usr/lib/cups install install-so
+	make DESTDIR=${DESTDIR} $(vopt_if cups 'cups_serverroot=${DESTDIR}/etc/cups cups_serverbin=${DESTDIR}/usr/lib/cups') install install-so
 	# install license
 	vlicense LICENSE
 
@@ -71,7 +74,7 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	# Remove conflicting files with cups-filters.
-	rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}
+	$(vopt_if cups 'rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}')
 
 	cd ..
 	# Install missing file

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] ghostscript: add cups build_option
  2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
@ 2019-10-17  7:27 ` voidlinux-github
  2019-10-17  7:27 ` voidlinux-github
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-17  7:27 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by ioraff against master on the void-packages repository

https://github.com/ioraff/void-packages ghostscript
https://github.com/void-linux/void-packages/pull/15504

ghostscript: add cups build_option


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghostscript-15504.patch --]
[-- Type: text/x-diff, Size: 2465 bytes --]

From ac75d516ce66b5b1f146b55e698bc276c66e1c8d Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owenr@fferty.me>
Date: Tue, 15 Oct 2019 15:50:08 -0500
Subject: [PATCH] ghostscript: add cups build_option

---
 srcpkgs/ghostscript/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 6e6507be8fd..3c8691ded8b 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -10,17 +10,20 @@ distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo
 checksum=fc0f1fbacd3610c67a9f080487a0e021f14390c38a4b4df9723e2bdf2b90b619
 
 hostmakedepends="automake libtool pkg-config"
-makedepends="cups-devel dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
+makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 
+build_options="cups"
+build_options_default="cups"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"
 fi
 
 pre_configure() {
 	# force it to use system libs.
-	rm -rf cups/libs freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
+	rm -rf $(vopt_if cups cups/libs) freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
 
 	# add missing LDFLAGS
 	sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
@@ -40,7 +43,8 @@ do_configure() {
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--enable-fontconfig --enable-freetype --enable-openjpeg \
 		--with-libpaper --without-luratech --without-omni \
-		--with-system-libtiff --disable-compile-inits
+		--with-system-libtiff --disable-compile-inits \
+		$(vopt_if cups '' '--disable-cups')
 
 	# configure libijs
 	cd ijs
@@ -58,8 +62,7 @@ do_build() {
 
 do_install() {
 	# install ghostscript
-	make DESTDIR=${DESTDIR} cups_serverroot=${DESTDIR}/etc/cups \
-		cups_serverbin=${DESTDIR}/usr/lib/cups install install-so
+	make DESTDIR=${DESTDIR} $(vopt_if cups 'cups_serverroot=${DESTDIR}/etc/cups cups_serverbin=${DESTDIR}/usr/lib/cups') install install-so
 	# install license
 	vlicense LICENSE
 
@@ -71,7 +74,7 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	# Remove conflicting files with cups-filters.
-	rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}
+	$(vopt_if cups 'rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}')
 
 	cd ..
 	# Install missing file

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: ghostscript: add cups build_option
  2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
  2019-10-17  7:27 ` [PR PATCH] [Updated] " voidlinux-github
  2019-10-17  7:27 ` voidlinux-github
@ 2019-10-21 16:43 ` voidlinux-github
  2019-10-21 17:37 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-21 16:43 UTC (permalink / raw)
  To: ml

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/15504#issuecomment-544602563

Comment:
`revision` needs to be bumped

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] ghostscript: add cups build_option
  2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
                   ` (3 preceding siblings ...)
  2019-10-21 17:37 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-21 17:37 ` voidlinux-github
  2019-10-23 20:30 ` voidlinux-github
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-21 17:37 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by ioraff against master on the void-packages repository

https://github.com/ioraff/void-packages ghostscript
https://github.com/void-linux/void-packages/pull/15504

ghostscript: add cups build_option


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghostscript-15504.patch --]
[-- Type: text/x-diff, Size: 2716 bytes --]

From f6e1c2514a86ddd89204d9c394451ead339ce912 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owenr@fferty.me>
Date: Tue, 15 Oct 2019 15:50:08 -0500
Subject: [PATCH] ghostscript: add cups build_option

---
 srcpkgs/ghostscript/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 6e6507be8fd..38e281a259c 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
 version=9.27
-revision=1
+revision=2
 short_desc="Interpreter for the PostScript language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
@@ -10,17 +10,20 @@ distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo
 checksum=fc0f1fbacd3610c67a9f080487a0e021f14390c38a4b4df9723e2bdf2b90b619
 
 hostmakedepends="automake libtool pkg-config"
-makedepends="cups-devel dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
+makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 
+build_options="cups"
+build_options_default="cups"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"
 fi
 
 pre_configure() {
 	# force it to use system libs.
-	rm -rf cups/libs freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
+	rm -rf $(vopt_if cups cups/libs) freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
 
 	# add missing LDFLAGS
 	sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
@@ -40,7 +43,8 @@ do_configure() {
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--enable-fontconfig --enable-freetype --enable-openjpeg \
 		--with-libpaper --without-luratech --without-omni \
-		--with-system-libtiff --disable-compile-inits
+		--with-system-libtiff --disable-compile-inits \
+		$(vopt_if cups '' '--disable-cups')
 
 	# configure libijs
 	cd ijs
@@ -58,8 +62,7 @@ do_build() {
 
 do_install() {
 	# install ghostscript
-	make DESTDIR=${DESTDIR} cups_serverroot=${DESTDIR}/etc/cups \
-		cups_serverbin=${DESTDIR}/usr/lib/cups install install-so
+	make DESTDIR=${DESTDIR} $(vopt_if cups 'cups_serverroot=${DESTDIR}/etc/cups cups_serverbin=${DESTDIR}/usr/lib/cups') install install-so
 	# install license
 	vlicense LICENSE
 
@@ -71,7 +74,7 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	# Remove conflicting files with cups-filters.
-	rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}
+	$(vopt_if cups 'rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}')
 
 	cd ..
 	# Install missing file

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] ghostscript: add cups build_option
  2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
                   ` (2 preceding siblings ...)
  2019-10-21 16:43 ` voidlinux-github
@ 2019-10-21 17:37 ` voidlinux-github
  2019-10-21 17:37 ` voidlinux-github
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-21 17:37 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by ioraff against master on the void-packages repository

https://github.com/ioraff/void-packages ghostscript
https://github.com/void-linux/void-packages/pull/15504

ghostscript: add cups build_option


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghostscript-15504.patch --]
[-- Type: text/x-diff, Size: 2716 bytes --]

From f6e1c2514a86ddd89204d9c394451ead339ce912 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owenr@fferty.me>
Date: Tue, 15 Oct 2019 15:50:08 -0500
Subject: [PATCH] ghostscript: add cups build_option

---
 srcpkgs/ghostscript/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 6e6507be8fd..38e281a259c 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
 version=9.27
-revision=1
+revision=2
 short_desc="Interpreter for the PostScript language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
@@ -10,17 +10,20 @@ distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo
 checksum=fc0f1fbacd3610c67a9f080487a0e021f14390c38a4b4df9723e2bdf2b90b619
 
 hostmakedepends="automake libtool pkg-config"
-makedepends="cups-devel dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
+makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 
+build_options="cups"
+build_options_default="cups"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"
 fi
 
 pre_configure() {
 	# force it to use system libs.
-	rm -rf cups/libs freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
+	rm -rf $(vopt_if cups cups/libs) freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
 
 	# add missing LDFLAGS
 	sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
@@ -40,7 +43,8 @@ do_configure() {
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--enable-fontconfig --enable-freetype --enable-openjpeg \
 		--with-libpaper --without-luratech --without-omni \
-		--with-system-libtiff --disable-compile-inits
+		--with-system-libtiff --disable-compile-inits \
+		$(vopt_if cups '' '--disable-cups')
 
 	# configure libijs
 	cd ijs
@@ -58,8 +62,7 @@ do_build() {
 
 do_install() {
 	# install ghostscript
-	make DESTDIR=${DESTDIR} cups_serverroot=${DESTDIR}/etc/cups \
-		cups_serverbin=${DESTDIR}/usr/lib/cups install install-so
+	make DESTDIR=${DESTDIR} $(vopt_if cups 'cups_serverroot=${DESTDIR}/etc/cups cups_serverbin=${DESTDIR}/usr/lib/cups') install install-so
 	# install license
 	vlicense LICENSE
 
@@ -71,7 +74,7 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	# Remove conflicting files with cups-filters.
-	rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}
+	$(vopt_if cups 'rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}')
 
 	cd ..
 	# Install missing file

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] ghostscript: add cups build_option
  2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
                   ` (4 preceding siblings ...)
  2019-10-21 17:37 ` voidlinux-github
@ 2019-10-23 20:30 ` voidlinux-github
  2019-10-23 20:30 ` voidlinux-github
  2019-10-27  6:21 ` [PR PATCH] [Merged]: " voidlinux-github
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-23 20:30 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by ioraff against master on the void-packages repository

https://github.com/ioraff/void-packages ghostscript
https://github.com/void-linux/void-packages/pull/15504

ghostscript: add cups build_option


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghostscript-15504.patch --]
[-- Type: text/x-diff, Size: 2716 bytes --]

From 679148a05e895403b3b8a0dec128c135b8f62385 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owenr@fferty.me>
Date: Tue, 15 Oct 2019 15:50:08 -0500
Subject: [PATCH] ghostscript: add cups build_option

---
 srcpkgs/ghostscript/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 6e6507be8fd..38e281a259c 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
 version=9.27
-revision=1
+revision=2
 short_desc="Interpreter for the PostScript language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
@@ -10,17 +10,20 @@ distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo
 checksum=fc0f1fbacd3610c67a9f080487a0e021f14390c38a4b4df9723e2bdf2b90b619
 
 hostmakedepends="automake libtool pkg-config"
-makedepends="cups-devel dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
+makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 
+build_options="cups"
+build_options_default="cups"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"
 fi
 
 pre_configure() {
 	# force it to use system libs.
-	rm -rf cups/libs freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
+	rm -rf $(vopt_if cups cups/libs) freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
 
 	# add missing LDFLAGS
 	sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
@@ -40,7 +43,8 @@ do_configure() {
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--enable-fontconfig --enable-freetype --enable-openjpeg \
 		--with-libpaper --without-luratech --without-omni \
-		--with-system-libtiff --disable-compile-inits
+		--with-system-libtiff --disable-compile-inits \
+		$(vopt_if cups '' '--disable-cups')
 
 	# configure libijs
 	cd ijs
@@ -58,8 +62,7 @@ do_build() {
 
 do_install() {
 	# install ghostscript
-	make DESTDIR=${DESTDIR} cups_serverroot=${DESTDIR}/etc/cups \
-		cups_serverbin=${DESTDIR}/usr/lib/cups install install-so
+	make DESTDIR=${DESTDIR} $(vopt_if cups 'cups_serverroot=${DESTDIR}/etc/cups cups_serverbin=${DESTDIR}/usr/lib/cups') install install-so
 	# install license
 	vlicense LICENSE
 
@@ -71,7 +74,7 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	# Remove conflicting files with cups-filters.
-	rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}
+	$(vopt_if cups 'rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}')
 
 	cd ..
 	# Install missing file

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] ghostscript: add cups build_option
  2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
                   ` (5 preceding siblings ...)
  2019-10-23 20:30 ` voidlinux-github
@ 2019-10-23 20:30 ` voidlinux-github
  2019-10-27  6:21 ` [PR PATCH] [Merged]: " voidlinux-github
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-23 20:30 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by ioraff against master on the void-packages repository

https://github.com/ioraff/void-packages ghostscript
https://github.com/void-linux/void-packages/pull/15504

ghostscript: add cups build_option


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghostscript-15504.patch --]
[-- Type: text/x-diff, Size: 2716 bytes --]

From 679148a05e895403b3b8a0dec128c135b8f62385 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owenr@fferty.me>
Date: Tue, 15 Oct 2019 15:50:08 -0500
Subject: [PATCH] ghostscript: add cups build_option

---
 srcpkgs/ghostscript/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 6e6507be8fd..38e281a259c 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
 version=9.27
-revision=1
+revision=2
 short_desc="Interpreter for the PostScript language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
@@ -10,17 +10,20 @@ distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo
 checksum=fc0f1fbacd3610c67a9f080487a0e021f14390c38a4b4df9723e2bdf2b90b619
 
 hostmakedepends="automake libtool pkg-config"
-makedepends="cups-devel dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
+makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
 depends="gsfonts"
 
+build_options="cups"
+build_options_default="cups"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"
 fi
 
 pre_configure() {
 	# force it to use system libs.
-	rm -rf cups/libs freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
+	rm -rf $(vopt_if cups cups/libs) freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
 
 	# add missing LDFLAGS
 	sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
@@ -40,7 +43,8 @@ do_configure() {
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--enable-fontconfig --enable-freetype --enable-openjpeg \
 		--with-libpaper --without-luratech --without-omni \
-		--with-system-libtiff --disable-compile-inits
+		--with-system-libtiff --disable-compile-inits \
+		$(vopt_if cups '' '--disable-cups')
 
 	# configure libijs
 	cd ijs
@@ -58,8 +62,7 @@ do_build() {
 
 do_install() {
 	# install ghostscript
-	make DESTDIR=${DESTDIR} cups_serverroot=${DESTDIR}/etc/cups \
-		cups_serverbin=${DESTDIR}/usr/lib/cups install install-so
+	make DESTDIR=${DESTDIR} $(vopt_if cups 'cups_serverroot=${DESTDIR}/etc/cups cups_serverbin=${DESTDIR}/usr/lib/cups') install install-so
 	# install license
 	vlicense LICENSE
 
@@ -71,7 +74,7 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	# Remove conflicting files with cups-filters.
-	rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}
+	$(vopt_if cups 'rm -f ${DESTDIR}/usr/lib/cups/filter/{gstopxl,gstoraster}')
 
 	cd ..
 	# Install missing file

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: ghostscript: add cups build_option
  2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
                   ` (6 preceding siblings ...)
  2019-10-23 20:30 ` voidlinux-github
@ 2019-10-27  6:21 ` voidlinux-github
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-10-27  6:21 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

ghostscript: add cups build_option
https://github.com/void-linux/void-packages/pull/15504

Description:


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-10-27  6:21 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-15 20:51 [PR PATCH] ghostscript: add cups build_option voidlinux-github
2019-10-17  7:27 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-17  7:27 ` voidlinux-github
2019-10-21 16:43 ` voidlinux-github
2019-10-21 17:37 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-21 17:37 ` voidlinux-github
2019-10-23 20:30 ` voidlinux-github
2019-10-23 20:30 ` voidlinux-github
2019-10-27  6:21 ` [PR PATCH] [Merged]: " voidlinux-github

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).