| 1 |
dang 08/06/20 15:50:01 |
| 2 |
|
| 3 |
Added: liferea-1.4.16b-xulrunner-1.9.patch |
| 4 |
Log: |
| 5 |
Bump to 1.4.16b |
| 6 |
|
| 7 |
New world order for liferea: |
| 8 |
- xulrunner is now 1.9 |
| 9 |
- No more firefox 2 support |
| 10 |
- webkit support works, and will be committed as soon as there is a |
| 11 |
maskable use flag for arches that haven't keyworded it. |
| 12 |
(Portage version: 2.1.5.6) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 net-news/liferea/files/liferea-1.4.16b-xulrunner-1.9.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-news/liferea/files/liferea-1.4.16b-xulrunner-1.9.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-news/liferea/files/liferea-1.4.16b-xulrunner-1.9.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: liferea-1.4.16b-xulrunner-1.9.patch |
| 21 |
=================================================================== |
| 22 |
Files liferea-1.4.16b.orig/.aclocal.m4.swp and liferea-1.4.16b/.aclocal.m4.swp differ |
| 23 |
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.16b.orig/configure.ac liferea-1.4.16b/configure.ac |
| 24 |
--- liferea-1.4.16b.orig/configure.ac 2008-06-11 18:08:41.000000000 -0400 |
| 25 |
+++ liferea-1.4.16b/configure.ac 2008-06-20 10:59:28.000000000 -0400 |
| 26 |
@@ -23,6 +23,8 @@ AC_ISC_POSIX |
| 27 |
AC_PROG_CC |
| 28 |
AM_PROG_CC_STDC |
| 29 |
AM_PROG_CC_C_O |
| 30 |
+dnl Mozilla needs C++; don't make conditional, or autoconf fails |
| 31 |
+AC_PROG_CXX |
| 32 |
AC_HEADER_STDC |
| 33 |
AC_PROG_INSTALL |
| 34 |
AC_PROG_LN_S |
| 35 |
@@ -168,7 +170,7 @@ dnl ********* |
| 36 |
if test "x$enable_xulrunner" = "xyes" ; then |
| 37 |
|
| 38 |
AC_MSG_CHECKING([for XulRunner 1.9+ support]) |
| 39 |
- PKG_CHECK_MODULES(XULRUNNER, libxul-embedding, XULRUNNER_PROVIDER=libxul-embedding, XULRUNNER_PROVIDER=) |
| 40 |
+ PKG_CHECK_MODULES(XULRUNNER, libxul-embedding-unstable, XULRUNNER_PROVIDER=libxul-embedding-unstable, XULRUNNER_PROVIDER=) |
| 41 |
|
| 42 |
if test "x$XULRUNNER_PROVIDER" = "x" ; then |
| 43 |
AC_MSG_CHECKING([for XulRunner 1.8 support]) |
| 44 |
@@ -186,9 +188,6 @@ if test "x$enable_xulrunner" = "xyes" ; |
| 45 |
AC_SUBST(XULRUNNER_LIBS) |
| 46 |
|
| 47 |
MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' | cut -c 3-` |
| 48 |
- |
| 49 |
- dnl the Mozilla XPCOM access means C++ |
| 50 |
- AC_PROG_CXX |
| 51 |
fi |
| 52 |
fi |
| 53 |
|
| 54 |
@@ -248,9 +247,6 @@ if test "x$enable_mozilla" = "xyes" ; th |
| 55 |
|
| 56 |
dnl AC_MSG_RESULT([$gecko_provider found!]) |
| 57 |
|
| 58 |
- dnl the Mozilla XPCOM access means C++ |
| 59 |
- AC_PROG_CXX |
| 60 |
- |
| 61 |
dnl Note: with the infos from mozilla-gtkmozembed.pc |
| 62 |
dnl we got all includes and libraries for the C interface |
| 63 |
dnl to Mozilla, but not the XPCOM headers we also need. |
| 64 |
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.16b.orig/src/mozilla/xulrunner.c liferea-1.4.16b/src/mozilla/xulrunner.c |
| 65 |
--- liferea-1.4.16b.orig/src/mozilla/xulrunner.c 2007-07-23 13:56:53.000000000 -0400 |
| 66 |
+++ liferea-1.4.16b/src/mozilla/xulrunner.c 2008-06-20 10:50:59.000000000 -0400 |
| 67 |
@@ -30,10 +30,12 @@ |
| 68 |
|
| 69 |
static void xulrunner_init(void) { |
| 70 |
|
| 71 |
+#ifndef XPCOM_GLUE |
| 72 |
/* gtk_moz_embed_set_comp_path() must not be called |
| 73 |
without a component path for XulRunner. Passing |
| 74 |
NULL will crash Liferea. */ |
| 75 |
gtk_moz_embed_set_comp_path(XULRUNNER_HOME); |
| 76 |
+#endif |
| 77 |
|
| 78 |
mozembed_init(); |
| 79 |
} |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
-- |
| 84 |
gentoo-commits@l.g.o mailing list |
Archives