SOURCES: liferea-xulrunner.patch - updated for 1.4.22d

megabajt megabajt at pld-linux.org
Sat Nov 22 13:02:16 CET 2008


Author: megabajt                     Date: Sat Nov 22 12:02:16 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.4.22d

---- Files affected:
SOURCES:
   liferea-xulrunner.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/liferea-xulrunner.patch
diff -u SOURCES/liferea-xulrunner.patch:1.5 SOURCES/liferea-xulrunner.patch:1.6
--- SOURCES/liferea-xulrunner.patch:1.5	Mon Oct  6 16:45:42 2008
+++ SOURCES/liferea-xulrunner.patch	Sat Nov 22 13:02:10 2008
@@ -1,18 +1,3 @@
-diff -urN liferea-1.4.20/configure.ac liferea-1.4.20.new/configure.ac
---- liferea-1.4.20/configure.ac	2008-09-28 12:14:41.000000000 +0200
-+++ liferea-1.4.20.new/configure.ac	2008-10-06 16:37:24.000000000 +0200
-@@ -184,11 +184,6 @@
-       AC_SUBST([XULRUNNER_HOME])
-       AC_SUBST(XULRUNNER_CFLAGS)
-       AC_SUBST(XULRUNNER_LIBS)
--      
--      if test "x$XULRUNNER_HOME" = "x" ; then
--      	AC_MSG_RESULT([Fatal: XulRunner enabled, but library directory could not be determined! This usually happens when running against unstable versions of XulRunner 1.9 which is not supported in all Linux distros. Please compile against a stable build of XulRunner 1.9 instead.])
--      	exit 1
--      fi
- 
-       MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' |  cut -c 3-`
-    
 diff -urN liferea-1.4.20/src/mozilla/Makefile.am liferea-1.4.20.new/src/mozilla/Makefile.am
 --- liferea-1.4.20/src/mozilla/Makefile.am	2007-07-23 19:56:53.000000000 +0200
 +++ liferea-1.4.20.new/src/mozilla/Makefile.am	2008-10-06 16:36:16.000000000 +0200
@@ -41,19 +26,3 @@
  
  if PLATFORM_WIN32
  
-diff -urN liferea-1.4.20/src/mozilla/xulrunner.c liferea-1.4.20.new/src/mozilla/xulrunner.c
---- liferea-1.4.20/src/mozilla/xulrunner.c	2008-07-01 19:04:55.000000000 +0200
-+++ liferea-1.4.20.new/src/mozilla/xulrunner.c	2008-10-06 16:36:16.000000000 +0200
-@@ -30,10 +30,12 @@
- 
- static void xulrunner_init(void) {
- 	
-+#ifndef XPCOM_GLUE
- 	/* gtk_moz_embed_set_comp_path() must not be called
- 	   without a component path for XulRunner. Passing
- 	   NULL will crash Liferea. */
- 	gtk_moz_embed_set_comp_path(XULRUNNER_HOME);
-+#endif
- 
- 	mozembed_init();	
- }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/liferea-xulrunner.patch?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list