diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-02-24 11:03:58 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-02-24 11:03:58 +0000 |
| commit | ecbe3671d6eb28c03de8d817cdfe3e3cbfcce1a7 (patch) | |
| tree | 76de36ca6b0918b2b4440d532b56596c5e0e44e8 /app-office/glabels/files | |
| parent | Make sure we respect libdir for path to cracklib dicts. (diff) | |
| download | gentoo-2-ecbe3671d6eb28c03de8d817cdfe3e3cbfcce1a7.tar.gz gentoo-2-ecbe3671d6eb28c03de8d817cdfe3e3cbfcce1a7.tar.bz2 gentoo-2-ecbe3671d6eb28c03de8d817cdfe3e3cbfcce1a7.zip | |
bump to 2.2.1 and remove broken 2.2.0
* fixes rotated labels clipping
* add missing pkg-config macro, fix bug #204276
* add ewarn about file format change, fix part of bug #206055
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-office/glabels/files')
| -rw-r--r-- | app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch | 33 | ||||
| -rw-r--r-- | app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch | 10 |
2 files changed, 43 insertions, 0 deletions
diff --git a/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch b/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch new file mode 100644 index 000000000000..e916b05987b6 --- /dev/null +++ b/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch @@ -0,0 +1,33 @@ +--- configure.old.in 2008-02-24 11:36:15.000000000 +0100 ++++ configure.in 2008-02-24 11:40:45.000000000 +0100 +@@ -22,8 +22,14 @@ + + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + ++dnl Crazy hack for dropping the dep on gtk-doc ++AC_DEFUN(GTK_DOC_CHECK, []) + GTK_DOC_CHECK(1.0) + ++dnl Crazy hack for dropping the dep on gtk-doc ++AM_CONDITIONAL(ENABLE_GTK_DOC, 0, []) ++AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, []) ++ + dnl --------------------------------------------------------------------------- + dnl - LIBGLABELS API versioning + dnl --------------------------------------------------------------------------- +--- Makefile.am.old 2008-02-24 11:41:55.000000000 +0100 ++++ Makefile.am 2008-02-24 11:42:16.000000000 +0100 +@@ -10,8 +10,11 @@ + libglabels \ + src \ + data \ +- help \ +- docs ++ help ++ ++if ENABLE_GTK_DOC ++ SUBDIRS += docs ++endif + + EXTRA_DIST = \ + README \ diff --git a/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch b/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch new file mode 100644 index 000000000000..26016d32f8d3 --- /dev/null +++ b/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch @@ -0,0 +1,10 @@ +--- configure.old.in 2008-02-24 11:36:15.000000000 +0100 ++++ configure.in 2008-02-24 11:37:05.000000000 +0100 +@@ -10,6 +10,7 @@ + AM_CONFIG_HEADER(config.h) + + AC_PROG_INTLTOOL([0.21]) ++PKG_PROG_PKG_CONFIG + + AM_PROG_LIBTOOL + |