Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/glabels/files: glabels-2.2.1-drop-gtk-doc.patch glabels-2.2.1-pkg-config-macro.patch
Date: Sun, 24 Feb 2008 11:04:01
Message-Id: E1JTEeE-0002SR-W7@stork.gentoo.org
1 eva 08/02/24 11:03:58
2
3 Added: glabels-2.2.1-drop-gtk-doc.patch
4 glabels-2.2.1-pkg-config-macro.patch
5 Log:
6 bump to 2.2.1 and remove broken 2.2.0
7 * fixes rotated labels clipping
8 * add missing pkg-config macro, fix bug #204276
9 * add ewarn about file format change, fix part of bug #206055
10 (Portage version: 2.1.4.4)
11
12 Revision Changes Path
13 1.1 app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch?rev=1.1&content-type=text/plain
17
18 Index: glabels-2.2.1-drop-gtk-doc.patch
19 ===================================================================
20 --- configure.old.in 2008-02-24 11:36:15.000000000 +0100
21 +++ configure.in 2008-02-24 11:40:45.000000000 +0100
22 @@ -22,8 +22,14 @@
23
24 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
25
26 +dnl Crazy hack for dropping the dep on gtk-doc
27 +AC_DEFUN(GTK_DOC_CHECK, [])
28 GTK_DOC_CHECK(1.0)
29
30 +dnl Crazy hack for dropping the dep on gtk-doc
31 +AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
32 +AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
33 +
34 dnl ---------------------------------------------------------------------------
35 dnl - LIBGLABELS API versioning
36 dnl ---------------------------------------------------------------------------
37 --- Makefile.am.old 2008-02-24 11:41:55.000000000 +0100
38 +++ Makefile.am 2008-02-24 11:42:16.000000000 +0100
39 @@ -10,8 +10,11 @@
40 libglabels \
41 src \
42 data \
43 - help \
44 - docs
45 + help
46 +
47 +if ENABLE_GTK_DOC
48 + SUBDIRS += docs
49 +endif
50
51 EXTRA_DIST = \
52 README \
53
54
55
56 1.1 app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch
57
58 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch?rev=1.1&view=markup
59 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch?rev=1.1&content-type=text/plain
60
61 Index: glabels-2.2.1-pkg-config-macro.patch
62 ===================================================================
63 --- configure.old.in 2008-02-24 11:36:15.000000000 +0100
64 +++ configure.in 2008-02-24 11:37:05.000000000 +0100
65 @@ -10,6 +10,7 @@
66 AM_CONFIG_HEADER(config.h)
67
68 AC_PROG_INTLTOOL([0.21])
69 +PKG_PROG_PKG_CONFIG
70
71 AM_PROG_LIBTOOL
72
73
74
75
76 --
77 gentoo-commits@l.g.o mailing list