Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (1aa349f51c297e1e0497d58ff88c01d51ccb9c43)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (1aa349f51c297e1e0497d58ff88c01d51ccb9c43)
  • Date: Sun, 10 Feb 2008 03:54:40 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

news/liferea/HISTORY | 5 ++++
news/liferea/PRE_BUILD | 1
news/liferea/webkit.c | 2 -
news/liferea/webkitgtk.patch | 46
+++++++++++++++++++++++++++++++++++++++++++
4 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit 1aa349f51c297e1e0497d58ff88c01d51ccb9c43
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

liferea: Added fixes for recent changes in webkigtk.

diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index 2067971..ad1044c 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,8 @@
+2008-02-10 George Sherwood <george AT beernabeer.com>
+ * PRE_BUILD: Added patch.
+ * webkitgtk.patch: Added to fix problem with new *.pc file.
+ * webkit.c: Updated with new location for webkit.h
+
2008-02-02 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.4.12

diff --git a/news/liferea/PRE_BUILD b/news/liferea/PRE_BUILD
index ca7430e..8d6d6f6 100755
--- a/news/liferea/PRE_BUILD
+++ b/news/liferea/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/webkitgtk.patch &&
cp -v $SCRIPT_DIRECTORY/webkit.c src/webkit
diff --git a/news/liferea/webkit.c b/news/liferea/webkit.c
index 4d4f1c0..8628241 100644
--- a/news/liferea/webkit.c
+++ b/news/liferea/webkit.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

-#include <webkit.h>
+#include <webkit/webkit.h>

#include "conf.h"
#include "common.h"
diff --git a/news/liferea/webkitgtk.patch b/news/liferea/webkitgtk.patch
new file mode 100644
index 0000000..45cc607
--- /dev/null
+++ b/news/liferea/webkitgtk.patch
@@ -0,0 +1,46 @@
+--- configure.orig 2008-02-09 23:23:06.000000000 +0400
++++ configure 2008-02-09 23:24:52.000000000 +0400
+@@ -24571,12 +24571,12 @@
+ pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"WebKitGtk\"") >&5
+- ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"webkit-1.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "webkit-1.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "WebKitGtk" 2>/dev/null`
++ pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit-1.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24589,12 +24589,12 @@
+ pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"WebKitGtk\"") >&5
+- ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"webkit-1.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "webkit-1.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "WebKitGtk" 2>/dev/null`
++ pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit-1.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24613,9 +24613,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "WebKitGtk"`
++ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "webkit-1.0"`
+ else
+- WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "WebKitGtk"`
++ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "webkit-1.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$WEBKIT_PKG_ERRORS" >&5



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (1aa349f51c297e1e0497d58ff88c01d51ccb9c43), George Sherwood, 02/10/2008

Archive powered by MHonArc 2.6.24.

Top of Page