From c7f7a7676e64390cc4b4a3757468bc7a091919b4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mar 18 2011 19:35:35 +0000 Subject: fix configure.ac to correctly use WEBKIT_LIBS from pkg-config (#670001, ) --- diff --git a/fix-webkit-config.patch b/fix-webkit-config.patch new file mode 100644 index 0000000..38ae7ed --- /dev/null +++ b/fix-webkit-config.patch @@ -0,0 +1,22 @@ +fix-webkit-config.patch + +From: Andy Clayton + +Fix configure.ac to correctly use WEBKIT_LIBS from pkg-config +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 79373b7..b781c81 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1005,7 +1005,7 @@ then + *) + # Unsure - check functions exist + oLIBS="$LIBS" +- LIBS="$LIBS -lwebkit-1.0" ++ LIBS="$LIBS ${WEBKIT_LIBS}" + AC_CHECK_FUNCS(webkit_web_view_load_uri) + LIBS="$oLIBS" + AC_MSG_CHECKING(for webkit_web_frame_print_full) diff --git a/gnucash.spec b/gnucash.spec index f6c45db..542b001 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -17,6 +17,7 @@ BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, slib >= 3a1-5, libtool, intltool BuildRequires: python-devel, libdbi-devel Patch0: gnucash-quiet.patch +Patch1: fix-webkit-config.patch Requires: gnucash-docs >= 2.2.0 Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) @@ -40,10 +41,12 @@ balanced books. %prep %setup -q %patch0 -p1 +%patch1 -p1 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build chmod 644 src/import-export/import-commodity-matcher.c +autoconf %configure --enable-error-on-warning=no \ --enable-ofx \ --enable-aqbanking \ @@ -133,6 +136,9 @@ fi %doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI %changelog +* Fri Mar 18 2011 Bill Nottingham - 2.4.4-2 +- fix configure.ac to correctly use WEBKIT_LIBS from pkg-config (#670001, ) + * Wed Mar 16 2011 Bill Nottingham - 2.4.4-1 - update to 2.4.4