diff options
5 files changed, 0 insertions, 144 deletions
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch deleted file mode 100644 index 174985a7eb..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ed31fd89f4c77d89390774d29427898a85b25ab1 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Fri, 1 Aug 2014 13:58:36 +0200 -Subject: [PATCH] configure: use pkgconfig for freetype - -Upstream-status: Pending -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - configure.in | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/configure.in b/configure.in -index 729278d..e569429 100644 ---- a/configure.in -+++ b/configure.in -@@ -164,13 +164,11 @@ 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 -+PKG_CHECK_MODULES(FREETYPE2, freetype2, -+ FREETYPE_CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" -+ FREETYPE_LIBS="$LIBS $FREETYPE2_LIBS", -+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) -+) - - libgnomeprint_save_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS $FREETYPE_LIBS" --- -1.9.0 - diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch deleted file mode 100644 index 29d410a0ab..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: libgnomeprint-2.18.8/libgnomeprint/grammar.y -=================================================================== ---- libgnomeprint-2.18.8.orig/libgnomeprint/grammar.y -+++ libgnomeprint-2.18.8/libgnomeprint/grammar.y -@@ -99,7 +99,7 @@ gnome_print_filter_parse_prop (GnomePrin - } - - static int yylex (void *lvalp); --static int yyerror (const char *s); -+static int yyerror (graph_t *g, const char *s); - %} - - %union { -@@ -117,6 +117,7 @@ static int yyerror (const char *s); - %type <p> pool - - %pure_parser -+%parse-param { graph_t *graph } - - %start graph - %% -@@ -185,7 +186,7 @@ graph: filter { - %% - - static int --yyerror (const char *s) -+yyerror (graph_t *g, const char *s) - { - return -1; - } diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch deleted file mode 100644 index 53235a12d3..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c ---- libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c 2009-04-19 19:45:36.000000000 +0200 -+++ libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c 2012-12-23 12:34:52.058643537 +0100 -@@ -35,6 +35,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - #include <unistd.h> -+#include <stdio.h> - #include <locale.h> - - #include <cups/cups.h> diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch deleted file mode 100644 index 7a27ecd239..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch +++ /dev/null @@ -1,38 +0,0 @@ -Use proper method to include freetype headers - -FreeType wants to use these special macros to include its APIs -so be it. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c -=================================================================== ---- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-font-face.c -+++ libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c -@@ -36,7 +36,9 @@ - #include <stdarg.h> - #include <locale.h> - --#include <freetype/ftoutln.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H -+ - - #include <libgnomeprint/gnome-print-private.h> - #include <libgnomeprint/gnome-font-private.h> -Index: libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c -=================================================================== ---- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-rfont.c -+++ libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c -@@ -28,8 +28,8 @@ - - #include <ft2build.h> - #include FT_FREETYPE_H --#include <freetype/ftglyph.h> --#include <freetype/ftbbox.h> -+#include FT_GLYPH_H -+#include FT_BBOX_H - #include <libart_lgpl/art_misc.h> - #include <libart_lgpl/art_affine.h> - #include <libart_lgpl/art_vpath.h> diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb deleted file mode 100644 index a462a4b9e6..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "GPLv2" -SECTION = "x11/gnome/libs" - -DEPENDS = "bison-native flex-native libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common freetype" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit gnomebase - -SRC_URI += "file://fix.includes.patch \ - file://freetype.patch \ - file://0001-configure-use-pkgconfig-for-freetype.patch \ - file://bison3-support.patch \ - " -SRC_URI[archive.md5sum] = "63b05ffb5386e131487c6af30f4c56ac" -SRC_URI[archive.sha256sum] = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691" -GNOME_COMPRESS_TYPE="bz2" - -FILES_${PN}-dbg += "\ - ${libdir}/${PN}/${PV}/modules/.debug \ - ${libdir}/${PN}/${PV}/modules/*/.debug \ -" -FILES_${PN}-staticdev += "\ - ${libdir}/${PN}/${PV}/modules/*.a \ - ${libdir}/${PN}/${PV}/modules/*/*.a \ -" - -PNBLACKLIST[libgnomeprint] ?= "Depends on broken libgnomecups - the recipe will be removed on 2017-09-01 unless the issue is fixed" |