summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnome-base/libgnomeprint
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnome-base/libgnomeprint')
-rw-r--r--gnome-base/libgnomeprint/Manifest1
-rw-r--r--gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch39
-rw-r--r--gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch39
-rw-r--r--gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch89
-rw-r--r--gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch9
-rw-r--r--gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild73
-rw-r--r--gnome-base/libgnomeprint/metadata.xml5
7 files changed, 255 insertions, 0 deletions
diff --git a/gnome-base/libgnomeprint/Manifest b/gnome-base/libgnomeprint/Manifest
new file mode 100644
index 000000000000..ad251ddc1d1e
--- /dev/null
+++ b/gnome-base/libgnomeprint/Manifest
@@ -0,0 +1 @@
+DIST libgnomeprint-2.18.8.tar.bz2 880489 SHA256 1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691 SHA512 eca4f118e918f8db04332c3c6df5370ee45497057b44747457b05f0517c55b38271b24cdf7493b8ba24875b2d53d99b5e64d5d63a04cd7fd895cb02ae1606469 WHIRLPOOL cfe18a12dfa0b3a8e659e8bff07764fcf93d02fc7e28f8d9f52796fe1044a30b257ab15a21b88438696841d7b8a61976c9af64971039141b73fa55ec00537a37
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch
new file mode 100644
index 000000000000..d9fbbdd84fb9
--- /dev/null
+++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch
@@ -0,0 +1,39 @@
+http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch
+
+--- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig 2010-02-09 13:32:51.000000000 +0100
++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y 2013-11-03 21:44:59.859877696 +0100
+@@ -6,8 +6,6 @@
+ #include <libgnomeprint/types.h>
+ #include <libgnomeprint/gnome-print-filter.h>
+
+-#define YYPARSE_PARAM graph
+-
+ static void
+ set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s)
+ {
+@@ -99,7 +97,7 @@
+ }
+
+ static int yylex (void *lvalp);
+-static int yyerror (const char *s);
++static int yyerror (graph_t *g, const char *s);
+ %}
+
+ %union {
+@@ -117,6 +115,7 @@
+ %type <p> pool
+
+ %pure_parser
++%parse-param { graph_t *graph }
+
+ %start graph
+ %%
+@@ -185,7 +184,7 @@
+ %%
+
+ static int
+-yyerror (const char *s)
++yyerror (graph_t *g, const char *s)
+ {
+ return -1;
+ }
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
new file mode 100644
index 000000000000..999c6f075203
--- /dev/null
+++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
@@ -0,0 +1,39 @@
+From ffbc68cc8518c7e7263a42d4284b749b40c5e871 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 29 Jun 2014 10:47:41 +0200
+Subject: [PATCH] Use AC_PATH_TOOL to find proper cups-config.
+
+---
+ configure.in | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 729278d..186fabf 100644
+--- a/configure.in
++++ b/configure.in
+@@ -223,17 +223,18 @@ AC_ARG_WITH(cups,
+ )
+ if test "x$try_cups" = "xyes"; then
+ PKG_CHECK_MODULES(CUPS, "gmodule-2.0")
++ AC_PATH_TOOL(CUPS_CONFIG, cups-config)
+ AC_MSG_CHECKING(for CUPS libraries version >= 1.1.20)
+- if cups-config --version --libs > /dev/null 2>&1; then
+- verstxt=`cups-config --version`
++ if $CUPS_CONFIG --version --libs > /dev/null 2>&1; then
++ verstxt=`$CUPS_CONFIG --version`
+ vers=`echo "$verstxt" | \
+ awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+ if test "$vers" -lt 1001020; then
+ AC_MSG_RESULT(Cups found but the version found is less than 1.1.20)
+ cups_msg="Version requirement not satisfied"
+ else
+- CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`"
+- CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`"
++ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --libs`"
++ CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`"
+ AC_MSG_RESULT(Found version $verstxt)
+ fi
+
+--
+2.0.0
+
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
new file mode 100644
index 000000000000..c0cb5957fae8
--- /dev/null
+++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
@@ -0,0 +1,89 @@
+From cf17a44bd5b8aac1c73f3bb00ca872cd8f08df4a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 17 Mar 2014 00:01:10 -0400
+Subject: [PATCH] Update freetype includes to work with >=freetype-2.5.1
+
+---
+ configure.in | 22 +++-------------------
+ libgnomeprint/gnome-font-face.c | 2 +-
+ libgnomeprint/gnome-print-gdi.c | 2 +-
+ libgnomeprint/gnome-rfont.c | 4 ++--
+ 4 files changed, 7 insertions(+), 23 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index c15bb69..aebe591 100644
+--- a/configure.in
++++ b/configure.in
+@@ -162,25 +162,9 @@ LDFLAGS="$LDFLAGS $LIBM"
+ dnl =================================
+ dnl Checking for freetype2
+ dnl =================================
+-FREETYPE_LIBS=
+-FREETYPE_CFLAGS=
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-if test "x$FREETYPE_CONFIG" = "xno" ; then
+- AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
+-else
+- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+-fi
+-
+-libgnomeprint_save_ldflags=$LDFLAGS
+-LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+-
+-freetype_version=false
+-AC_MSG_NOTICE([checking for sufficiently new FreeType (at least 2.0.5)])
+-AC_CHECK_LIB(freetype, FT_Get_Postscript_Name,:,[
+- AC_MSG_ERROR(You need FreeType2 (freetype-devel 2.0.5 or greater package) for this version of libgnomeprint)])
+-
+-LDFLAGS=$libgnomeprint_save_ldflags
++dnl "freetype2 >= 17" means freetype-2.5.1
++PKG_CHECK_MODULES(FREETYPE, freetype2 >= 17, ,
++ [PKG_CHECK_MODULES(FREETYPE, freetype2, [FREETYPE_CFLAGS="$FREETYPE_CFLAGS -I`$PKG_CONFIG --variable=includedir freetype2`/freetype2/freetype"])])
+
+ dnl =================================
+ dnl END: Checking for freetype2
+diff --git a/libgnomeprint/gnome-font-face.c b/libgnomeprint/gnome-font-face.c
+index 0447377..f9f8f3e 100644
+--- a/libgnomeprint/gnome-font-face.c
++++ b/libgnomeprint/gnome-font-face.c
+@@ -36,7 +36,7 @@
+ #include <stdarg.h>
+ #include <locale.h>
+
+-#include <freetype/ftoutln.h>
++#include <ftoutln.h>
+
+ #include <libgnomeprint/gnome-print-private.h>
+ #include <libgnomeprint/gnome-font-private.h>
+diff --git a/libgnomeprint/gnome-print-gdi.c b/libgnomeprint/gnome-print-gdi.c
+index f89a8e8..7755673 100755
+--- a/libgnomeprint/gnome-print-gdi.c
++++ b/libgnomeprint/gnome-print-gdi.c
+@@ -36,7 +36,7 @@
+ #include <libgnomeprint/gp-gc-private.h>
+
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
++#include FT_FREETYPE_H
+
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+diff --git a/libgnomeprint/gnome-rfont.c b/libgnomeprint/gnome-rfont.c
+index 55ec261..09e5a6e 100644
+--- a/libgnomeprint/gnome-rfont.c
++++ b/libgnomeprint/gnome-rfont.c
+@@ -28,8 +28,8 @@
+
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftbbox.h>
++#include <ftglyph.h>
++#include <ftbbox.h>
+ #include <libart_lgpl/art_misc.h>
+ #include <libart_lgpl/art_affine.h>
+ #include <libart_lgpl/art_vpath.h>
+--
+1.9.0
+
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch
new file mode 100644
index 000000000000..dd9195434e87
--- /dev/null
+++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch
@@ -0,0 +1,9 @@
+--- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c
++++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+@@ -34,6 +34,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <stdio.h>
+ #include <unistd.h>
+ #include <locale.h>
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild
new file mode 100644
index 000000000000..4c41051048fe
--- /dev/null
+++ b/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils gnome2 multilib-minimal
+
+DESCRIPTION="Printer handling for Gnome"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="2.2"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cups doc"
+
+RDEPEND=">=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
+ >=media-libs/libart_lgpl-2.3.21-r2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ cups? (
+ >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}]
+ >=net-print/libgnomecups-0.2.3-r3[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ >=dev-util/intltool-0.35
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ sys-devel/flex
+ sys-devel/bison
+ doc? (
+ ~app-text/docbook-xml-dtd-4.1.2
+ >=dev-util/gtk-doc-0.9 )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-stdio-include.patch \
+ "${FILESDIR}"/${P}-freetype-2.5.1.patch \
+ "${FILESDIR}"/${P}-bison3.patch \
+ "${FILESDIR}"/${P}-cups-config.patch
+ eautoreconf
+ gnome2_src_prepare
+
+ # Drop DEPRECATED flags, bug #384807
+ sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' \
+ configure.in configure || die
+ sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+ libgnomeprint/ttsubset/Makefile.am \
+ libgnomeprint/ttsubset/Makefile.in || die
+}
+
+multilib_src_configure() {
+ # Disable papi support until papi is in portage; avoids automagic
+ # dependencies on an untracked library.
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(use_with cups) \
+ --without-papi \
+ --disable-static
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS BUGS ChangeLog* NEWS README"
+ einstalldocs
+}
diff --git a/gnome-base/libgnomeprint/metadata.xml b/gnome-base/libgnomeprint/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/gnome-base/libgnomeprint/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>