summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2017-02-11 21:29:44 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2017-02-11 21:29:56 +0100
commit212cc58cd2da78cadcd8a5365daaa0055fb06a2e (patch)
tree94ac4302e060ddeab273b4fdb1736d1733cb3891 /net-print/gutenprint/files
parentx11-misc/urxvtconfig: New package (diff)
downloadgentoo-212cc58cd2da78cadcd8a5365daaa0055fb06a2e.tar.gz
gentoo-212cc58cd2da78cadcd8a5365daaa0055fb06a2e.tar.bz2
gentoo-212cc58cd2da78cadcd8a5365daaa0055fb06a2e.zip
net-print/gutenprint: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-print/gutenprint/files')
-rw-r--r--net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch23
-rw-r--r--net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch60
2 files changed, 0 insertions, 83 deletions
diff --git a/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch b/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch
deleted file mode 100644
index f61fb69ccfd2..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN gutenprint-5.2.8.old/src/cups/Makefile.am gutenprint-5.2.8/src/cups/Makefile.am
---- gutenprint-5.2.8.old/src/cups/Makefile.am 2012-06-14 14:03:53.011828220 +0200
-+++ gutenprint-5.2.8/src/cups/Makefile.am 2012-06-14 14:04:57.672829331 +0200
-@@ -98,16 +98,16 @@
-
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
--cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
-
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
--gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
-
- rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
--rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
- rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
-
- ## Data
diff --git a/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch b/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch
deleted file mode 100644
index 99ef9b74c6e2..000000000000
--- a/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 233a909a77dd4c18d359bf32cd8ef99ed1b7b459 Mon Sep 17 00:00:00 2001
-From: speachy <>
-Date: Fri, 29 Jan 2016 12:41:21 +0000
-Subject: [PATCH] Apply patch from Brian Norris to switch from 'ijs-config' to
- 'pkg-config' for IJS support, as the former does not work for
- cross-compilation.
-
----
- configure.ac | 10 ++++------
- src/ghost/ijsgutenprint.c | 4 ++--
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 800794b..fac8361 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -371,9 +371,9 @@ if test "$BUILD_FOOMATIC_3" = "yes" ; then
- BUILD_FOOMATIC=yes
- fi
-
--AC_PATH_PROG(IJS_CONFIG, ijs-config)
-+PKG_CHECK_MODULES(IJS, ijs, [HAVE_IJS=yes], [HAVE_IJS=no])
-
--if test -z "${IJS_CONFIG}" ; then
-+if test "x${HAVE_IJS}" = "xno" ; then
- BUILD_GHOSTSCRIPT="no"
- else
- BUILD_GHOSTSCRIPT="yes"
-@@ -620,11 +620,9 @@ fi
-
- dnl ijs checks
- if test x${BUILD_GHOSTSCRIPT} = xyes ; then
-- if test -z "$IJS_CONFIG" ; then
-- AC_MSG_ERROR(Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed);
-+ if test -z "$HAVE_IJS" ; then
-+ AC_MSG_ERROR(Cannot find ijs; please ensure Ghostscript 6.53 or above is installed);
- fi
-- IJS_CFLAGS=`$IJS_CONFIG --cflags`
-- IJS_LIBS=`$IJS_CONFIG --libs`
- fi
-
- GUTENPRINT_RELEASE_VERSION=${GUTENPRINT_MAJOR_VERSION}.${GUTENPRINT_MINOR_VERSION}
-diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c
-index a3621a2..69aadf1 100644
---- a/src/ghost/ijsgutenprint.c
-+++ b/src/ghost/ijsgutenprint.c
-@@ -35,8 +35,8 @@
- #include <string.h>
- #include <unistd.h>
- #include <locale.h>
--#include <ijs.h>
--#include <ijs_server.h>
-+#include <ijs/ijs.h>
-+#include <ijs/ijs_server.h>
- #include <errno.h>
- #include <gutenprint/gutenprint-intl-internal.h>
-
---
-2.7.3
-