wok-next rev 20200
libgnomeprint: add bison 3 patch
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Fri Nov 03 17:38:15 2017 +0100 (2017-11-03) |
| parents | c3d04e304a7a |
| children | 6ae55fd90407 |
| files | libgnomeprint-dev/receipt libgnomeprint/receipt libgnomeprint/stuff/patches/bison3.patch libgnomeprint/stuff/patches/series |
line diff
1.1 --- a/libgnomeprint-dev/receipt Fri Nov 03 16:28:49 2017 +0200 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,30 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="libgnomeprint-dev" 1.7 -VERSION="2.18.8" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="GNOME print library" 1.10 -MAINTAINER="pankso@slitaz.org" 1.11 -LICENSE="GPL2" 1.12 -WANTED="libgnomeprint" 1.13 -WEB_SITE="http://www.gnome.org/" 1.14 - 1.15 -DEPENDS="gtk+-dev popt-dev libxml2-dev pkg-config" 1.16 - 1.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.18 -genpkg_rules() 1.19 -{ 1.20 - mkdir -p $fs/usr/lib 1.21 - 1.22 - # Copy static libs 1.23 - cp -a $install/usr/lib/*.*a $fs/usr/lib 1.24 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.25 - cp -a $install/usr/lib/$WANTED $fs/usr/lib 1.26 - 1.27 - cp -a $install/usr/include $fs/usr 1.28 - 1.29 - # Remove shared libs 1.30 - rm $fs/usr/lib/$WANTED/$VERSION/modules/*.so* 1.31 - rm $fs/usr/lib/$WANTED/$VERSION/modules/*/*.so* 1.32 -} 1.33 -
2.1 --- a/libgnomeprint/receipt Fri Nov 03 16:28:49 2017 +0200 2.2 +++ b/libgnomeprint/receipt Fri Nov 03 17:38:15 2017 +0100 2.3 @@ -1,4 +1,4 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="libgnomeprint" 2.8 VERSION="2.18.8" 2.9 @@ -10,14 +10,13 @@ 2.10 WEB_SITE="http://www.gnome.org/" 2.11 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 2.12 2.13 -DEPENDS="gtk+ popt libxml2 libart_lgpl" 2.14 BUILD_DEPENDS="pkg-config glib-dev pango-dev intltool flex libart_lgpl-dev \ 2.15 libxml2-dev" 2.16 +SPLIT="libgnomeprint libgnomeprint-dev" 2.17 2.18 # Rules to configure and make the package. 2.19 compile_rules() 2.20 { 2.21 - cd $src 2.22 ./configure \ 2.23 --with-html-dir=/usr/share/doc \ 2.24 --without-cups \ 2.25 @@ -28,17 +27,37 @@ 2.26 # Rules to gen a SliTaz package suitable for Tazpkg. 2.27 genpkg_rules() 2.28 { 2.29 - mkdir -p $fs/usr/lib $fs/usr/share/locale 2.30 + case $PACKAGE in 2.31 + libgnomeprint) 2.32 + DEPENDS="gtk+ popt libxml2 libart_lgpl" 2.33 + mkdir -p $fs/usr/lib $fs/usr/share/locale 2.34 2.35 - # Copy shared libs 2.36 - cp -a $install/usr/lib/*.so* $fs/usr/lib 2.37 - cp -a $install/usr/lib/$PACKAGE $fs/usr/lib 2.38 + # Copy shared libs 2.39 + cp -a $install/usr/lib/*.so* $fs/usr/lib 2.40 + cp -a $install/usr/lib/$PACKAGE $fs/usr/lib 2.41 2.42 - cp -a $install/usr/share/locale/fr $fs/usr/share/locale 2.43 - cp -a $install/usr/share/$PACKAGE $fs/usr/share 2.44 + cp -a $install/usr/share/locale/fr $fs/usr/share/locale 2.45 + cp -a $install/usr/share/$PACKAGE $fs/usr/share 2.46 2.47 - # Remove static libs 2.48 - rm $fs/usr/lib/$PACKAGE/$VERSION/modules/*.*a 2.49 - rm $fs/usr/lib/$PACKAGE/$VERSION/modules/*/*.*a 2.50 + # Remove static libs 2.51 + rm $fs/usr/lib/$PACKAGE/$VERSION/modules/*.*a 2.52 + rm $fs/usr/lib/$PACKAGE/$VERSION/modules/*/*.*a 2.53 + ;; 2.54 + libgnomeprint-dev) 2.55 + CAT="development|GNOME print library" 2.56 + DEPENDS="gtk+-dev popt-dev libxml2-dev pkg-config" 2.57 + mkdir -p $fs/usr/lib 2.58 + 2.59 + # Copy static libs 2.60 + cp -a $install/usr/lib/*.*a $fs/usr/lib 2.61 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 2.62 + cp -a $install/usr/lib/$WANTED $fs/usr/lib 2.63 + 2.64 + cp -a $install/usr/include $fs/usr 2.65 + 2.66 + # Remove shared libs 2.67 + rm $fs/usr/lib/$WANTED/$VERSION/modules/*.so* 2.68 + rm $fs/usr/lib/$WANTED/$VERSION/modules/*/*.so* 2.69 + ;; 2.70 + esac 2.71 } 2.72 -
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/libgnomeprint/stuff/patches/bison3.patch Fri Nov 03 17:38:15 2017 +0100 3.3 @@ -0,0 +1,37 @@ 3.4 +--- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig 2010-02-09 13:32:51.000000000 +0100 3.5 ++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y 2013-11-03 21:44:59.859877696 +0100 3.6 +@@ -6,8 +6,6 @@ 3.7 + #include <libgnomeprint/types.h> 3.8 + #include <libgnomeprint/gnome-print-filter.h> 3.9 + 3.10 +-#define YYPARSE_PARAM graph 3.11 +- 3.12 + static void 3.13 + set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s) 3.14 + { 3.15 +@@ -99,7 +97,7 @@ 3.16 + } 3.17 + 3.18 + static int yylex (void *lvalp); 3.19 +-static int yyerror (const char *s); 3.20 ++static int yyerror (graph_t *g, const char *s); 3.21 + %} 3.22 + 3.23 + %union { 3.24 +@@ -117,6 +115,7 @@ 3.25 + %type <p> pool 3.26 + 3.27 + %pure_parser 3.28 ++%parse-param { graph_t *graph } 3.29 + 3.30 + %start graph 3.31 + %% 3.32 +@@ -185,7 +184,7 @@ 3.33 + %% 3.34 + 3.35 + static int 3.36 +-yyerror (const char *s) 3.37 ++yyerror (graph_t *g, const char *s) 3.38 + { 3.39 + return -1; 3.40 + }