Skip to content
Browse files

Improved paps patches

  • Loading branch information...
1 parent 1ca9c2a commit b64a67326c47cbac62a35be1da5baaab3764829f @elbryan committed Feb 3, 2010
View
25 app-text/paps/files/0001-Fixed-pango-ft2-check-and-fixed-Makefile.am.patch
@@ -1,12 +1,12 @@
-From 640d67a1e5aa9cf5da4506579ebbb9da07505eda Mon Sep 17 00:00:00 2001
+From ffb5d3052704378d7e294ff4edcab0edc48d7e51 Mon Sep 17 00:00:00 2001
From: Fabiano Francesconi <fabiano.francesconi@gmail.com>
Date: Wed, 3 Feb 2010 18:27:30 +0100
Subject: [PATCH 1/2] Fixed pango-ft2 check and fixed Makefile.am
---
configure.in | 7 +++++++
- src/Makefile.am | 11 ++++-------
- 2 files changed, 11 insertions(+), 7 deletions(-)
+ src/Makefile.am | 17 +++++++----------
+ 2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/configure.in b/configure.in
index c9b3ae0..6730123 100644
@@ -27,10 +27,15 @@ index c9b3ae0..6730123 100644
DX_CHM_FEATURE(OFF)
DX_CHI_FEATURE(OFF)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 8f4bf0d..3848e1d 100644
+index 8f4bf0d..31ae169 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -5,23 +5,20 @@ libpaps_a_inc_HEADERS = libpaps.h
+@@ -1,27 +1,24 @@
+ man_MANS = paps.1
+-lib_LIBRARIES = libpaps.a
++noinst_LIBRARIES = libpaps.a
+ libpaps_a_SOURCES = libpaps.c
+ libpaps_a_inc_HEADERS = libpaps.h
libpaps_a_incdir = $(includedir)
bin_PROGRAMS = paps
@@ -39,8 +44,9 @@ index 8f4bf0d..3848e1d 100644
paps_SOURCES = paps.c
-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
-paps_LDFLAGS = `pkg-config --libs pangoft2`
-+paps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(pangoft2_LIBS)
- paps_DEPENDENCIES = $(lib_LIBRARIES)
+-paps_DEPENDENCIES = $(lib_LIBRARIES)
++paps_LDADD = $(noinst_LIBRARIES) $(all_libraries) $(pangoft2_LIBS)
++paps_DEPENDENCIES = $(noinst_LIBRARIES)
EXTRA_DIST = test_libpaps.c paps.1
@@ -55,9 +61,10 @@ index 8f4bf0d..3848e1d 100644
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) $(pangoft2_LIBS)
- test_libpaps_DEPENDENCIES = $(lib_LIBRARIES)
+-test_libpaps_DEPENDENCIES = $(lib_LIBRARIES)
-
++test_libpaps_LDADD = $(noinst_LIBRARIES) $(all_libraries) $(pangoft2_LIBS)
++test_libpaps_DEPENDENCIES = $(noinst_LIBRARIES)
--
1.6.4.4
View
2 app-text/paps/files/0002-Fixed-acinclude.m4.patch
@@ -1,4 +1,4 @@
-From f7636b6b15ca0d64c47507bc60654845f6ef19b5 Mon Sep 17 00:00:00 2001
+From 69c667e3bab1c6d9d14b1e93b4b7c3fecd976a32 Mon Sep 17 00:00:00 2001
From: Fabiano Francesconi <fabiano.francesconi@gmail.com>
Date: Wed, 3 Feb 2010 18:28:42 +0100
Subject: [PATCH 2/2] Fixed acinclude.m4

0 comments on commit b64a673

Please sign in to comment.
Something went wrong with that request. Please try again.