xmw 14/11/24 21:45:46
Added: paps-0.6.8-fix-doxygen-acinclude.patch
paps-0.6.8-fix-freetype-include.patch
paps-0.6.8-fix-as-needed-build.patch
Log:
Revbump to fix as-needed, doxygen and freetype linkage (bug 514584, thanks
Hendrik v. Raven).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
62EEF090)
Revision Changes Path
1.1 app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch?rev=1.1&content-type=text/plain
Index: paps-0.6.8-fix-doxygen-acinclude.patch
===================================================================
--- paps-0.6.8/acinclude.m4
+++ paps-0.6.8/acinclude.m4
@@ -78,7 +78,7 @@
AC_PATH_TOOL([$1], [$2])
if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
- AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
+ AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
fi
])
@@ -101,7 +101,7 @@
# ----------------------------------------------------------
# Turn off the DX_CURRENT_FEATURE if the required feature is off.
AC_DEFUN([DX_CLEAR_DEPEND], [
-test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
+test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
])
# DX_FEATURE_ARG(FEATURE, DESCRIPTION,
1.1 app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch?rev=1.1&content-type=text/plain
Index: paps-0.6.8-fix-freetype-include.patch
===================================================================
--- paps-0.6.8/src/libpaps.c
+++ paps-0.6.8/src/libpaps.c
@@ -25,8 +25,8 @@
#include <pango/pango.h>
#include <pango/pangoft2.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
+#include <ftglyph.h>
+#include <ftoutln.h>
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
1.1 app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch?rev=1.1&content-type=text/plain
Index: paps-0.6.8-fix-as-needed-build.patch
===================================================================
--- paps-0.6.8/configure.in
+++ paps-0.6.8/configure.in
@@ -18,4 +18,6 @@
DX_INIT_DOXYGEN(libpaps, doxygen.cfg, doxygen-doc)
+PKG_CHECK_MODULES([PANGO], [pangoft2])
+
AC_OUTPUT(Makefile src/Makefile)
--- paps-0.6.8/src/Makefile.am
+++ paps-0.6.8/src/Makefile.am
@@ -7,21 +7,19 @@
bin_PROGRAMS = paps
paps_CFLAGS = -Wall
paps_SOURCES = paps.c
-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
-paps_LDFLAGS = `pkg-config --libs pangoft2`
+paps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(PANGO_LIBS)
paps_DEPENDENCIES = $(lib_LIBRARIES)
EXTRA_DIST = test_libpaps.c paps.1
# set the include path found by configure
-INCLUDES= $(all_includes) `pkg-config --cflags pangoft2`
+INCLUDES= $(all_includes) $(PANGO_CFLAGS)
# Test program
noinst_PROGRAMS = test_libpaps
test_libpaps_SOURCES = test_libpaps.c
-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
-test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
+test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(PANGO_LIBS)
test_libpaps_DEPENDENCIES = $(lib_LIBRARIES)
