summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-01-08 05:14:06 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-01-08 05:14:06 +0800
commit6b7c9a8270b623b1006ae87d7596d499f3978023 (patch)
tree162fd3dbc52fed32732d629b2349be861ebaf66b
parent8a8ac6caed18d0df42db5b9ada514673e7893c15 (diff)
downloadmarcuscom-ports-6b7c9a8270b623b1006ae87d7596d499f3978023.tar
marcuscom-ports-6b7c9a8270b623b1006ae87d7596d499f3978023.tar.gz
marcuscom-ports-6b7c9a8270b623b1006ae87d7596d499f3978023.tar.bz2
marcuscom-ports-6b7c9a8270b623b1006ae87d7596d499f3978023.tar.lz
marcuscom-ports-6b7c9a8270b623b1006ae87d7596d499f3978023.tar.xz
marcuscom-ports-6b7c9a8270b623b1006ae87d7596d499f3978023.tar.zst
marcuscom-ports-6b7c9a8270b623b1006ae87d7596d499f3978023.zip
Just restore the 2.28.1 patch to fix the libxul problem. This will fix
a crash on startup. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13381 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/yelp/Makefile3
-rw-r--r--x11/yelp/files/patch-src_yelp-gecko-utils.cpp11
2 files changed, 8 insertions, 6 deletions
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 714012674..484449269 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11/yelp/Makefile,v 1.147 2010/01/06 14:24:09 kwm Exp $
#
PORTNAME= yelp
PORTVERSION= 2.29.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/yelp/files/patch-src_yelp-gecko-utils.cpp b/x11/yelp/files/patch-src_yelp-gecko-utils.cpp
index 07c7f5715..2c4d781ee 100644
--- a/x11/yelp/files/patch-src_yelp-gecko-utils.cpp
+++ b/x11/yelp/files/patch-src_yelp-gecko-utils.cpp
@@ -1,12 +1,13 @@
---- src/yelp-gecko-utils.cpp.orig 2010-01-07 15:44:16.000000000 -0500
-+++ src/yelp-gecko-utils.cpp 2010-01-07 15:46:48.000000000 -0500
-@@ -28,7 +28,9 @@
+--- src/yelp-gecko-utils.cpp.orig 2009-03-29 23:21:59.000000000 -0400
++++ src/yelp-gecko-utils.cpp 2009-03-29 23:25:48.000000000 -0400
+@@ -28,8 +28,10 @@
#include <nsStringAPI.h>
#ifdef HAVE_GECKO_1_9
-+#define XPCOM_GLUE 1
++#ifdef XPCOM_GLUE
#include <gtkmozembed_glue.cpp>
-+#undef XPCOM_GLUE
#endif
++#endif
#include <gtkmozembed.h>
+ #include <gtkmozembed_internal.h>