[csw-devel] SF.net SVN: gar:[18729] csw/mgar/pkg/gnome-base/libgnomeprint/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat Jul 14 19:16:39 CEST 2012
Revision: 18729
http://gar.svn.sourceforge.net/gar/?rev=18729&view=rev
Author: chninkel
Date: 2012-07-14 17:16:39 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
gnome-base/libgnomeprint/trunk: fixed compilation errors and added various checkpkg overridees
Modified Paths:
--------------
csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/gnome-base/libgnomeprint/trunk/files/0001-add-missing-stdio.h-inclusion.patch
Modified: csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-07-14 12:59:23 UTC (rev 18728)
+++ csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-07-14 17:16:39 UTC (rev 18729)
@@ -26,8 +26,38 @@
#BUILD_DEP_PKGS += CSWgnomeicontheme
#BUILD_DEP_PKGS += CSWlibgnomeprint
#BUILD_DEP_PKGS += CSWlibgnomecanvas
-BUILD_DEP_PKGS += CSWgtk2devel
+BUILD_DEP_PKGS += CSWlibgtk2-dev
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWpango
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibart
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgnomecups
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibssl1-0-0
+
+CHECKPKG_OVERRIDES_CSWlibgnomeprintdoc += surplus-dependency|CSWlibgnomeprint
+
+CHECKPKG_OVERRIDES_CSWlibgnomeprintdoc += catalogname-does-not-match-pkgname|pkgname=CSWlibgnomeprintdoc|catalogname=libgnomeprint_doc|expected-catalogname=libgnomeprintdoc
+CHECKPKG_OVERRIDES_CSWlibgnomeprintdevel += catalogname-does-not-match-pkgname|pkgname=CSWlibgnomeprintdevel|catalogname=libgnomeprint_devel|expected-catalogname=libgnomeprintdevel
+CHECKPKG_OVERRIDES_CSWlibgnomeprint += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libgnomeprint/2.18.6/modules/libgnomeprintpapi.so
+CHECKPKG_OVERRIDES_CSWlibgnomeprint += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgnomeprint-2-2.so.0.1.0|soname=libgnomeprint-2-2.so.0|pkgname=CSWlibgnomeprint|expected=CSWlibgnomeprint2-2-0
+
+
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
SPKG_SOURCEURL = http://live.gnome.org/libgnomeprint
@@ -47,6 +77,12 @@
ARCHALL_CSWlibgnomeprintdoc = 1
+# New glib only available on Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+# To make sure the FILE type is recognized
+PATCHFILES += 0001-add-missing-stdio.h-inclusion.patch
+
STRIP_LIBTOOL = 1
CONFIGURE_ARGS = $(DIRPATHS)
Added: csw/mgar/pkg/gnome-base/libgnomeprint/trunk/files/0001-add-missing-stdio.h-inclusion.patch
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/files/0001-add-missing-stdio.h-inclusion.patch (rev 0)
+++ csw/mgar/pkg/gnome-base/libgnomeprint/trunk/files/0001-add-missing-stdio.h-inclusion.patch 2012-07-14 17:16:39 UTC (rev 18729)
@@ -0,0 +1,77 @@
+From d400ffff2a2b280fcd45515c3432aac959821c5d Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Fri, 13 Jul 2012 23:43:26 +0200
+Subject: [PATCH] Add missing stdio.h inclusion
+
+---
+ libgnomeprint/grammar.tab.h | 14 ++++++--------
+ libgnomeprint/modules/cups/gnome-print-cups-transport.c | 1 +
+ ltmain.sh | 2 +-
+ 3 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/libgnomeprint/grammar.tab.h b/libgnomeprint/grammar.tab.h
+index defb293..e0aed9c 100644
+--- a/libgnomeprint/grammar.tab.h
++++ b/libgnomeprint/grammar.tab.h
+@@ -1,10 +1,8 @@
++/* A Bison parser, made by GNU Bison 2.5. */
+
+-/* A Bison parser, made by GNU Bison 2.4.1. */
+-
+-/* Skeleton interface for Bison's Yacc-like parsers in C
++/* Bison interface for Yacc-like parsers in C
+
+- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+- Free Software Foundation, Inc.
++ Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -50,7 +48,7 @@
+ typedef union YYSTYPE
+ {
+
+-/* Line 1676 of yacc.c */
++/* Line 2068 of yacc.c */
+ #line 105 "./grammar.y"
+
+ gchar *s;
+@@ -60,8 +58,8 @@ typedef union YYSTYPE
+
+
+
+-/* Line 1676 of yacc.c */
+-#line 65 "grammar.tab.h"
++/* Line 2068 of yacc.c */
++#line 63 "grammar.tab.h"
+ } YYSTYPE;
+ # define YYSTYPE_IS_TRIVIAL 1
+ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
+diff --git a/libgnomeprint/modules/cups/gnome-print-cups-transport.c b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+index aeb7111..9112b28 100644
+--- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c
++++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <locale.h>
++#include <stdio.h>
+
+ #include <cups/cups.h>
+ #include <libgnomeprint/gnome-print.h>
+diff --git a/ltmain.sh b/ltmain.sh
+index 6939dcc..69394c9 100755
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5095,7 +5095,7 @@ func_mode_link ()
+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+ fi
+ for searchdir in $searchdirs; do
+- for search_ext in .la $std_shrext .so .a; do
++ for search_ext in $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+--
+1.7.10.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list