4026e2478b
See http://www.seamonkey-project.org/releases/seamonkey2.2/ for details. - sync ipc patches from Firefox - remove a bunch of useless patches - install under lib/seamonkey-2.2 instead of using our homegrown install target. - install langpacks as plain xpi instead of unzipping them, greatly shrinking PLIST
40 lines
1.8 KiB
Plaintext
40 lines
1.8 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.10 2011/07/24 07:31:57 landry Exp $
|
|
hack to avoid conflict with our own MOZILLA_VERSION var.
|
|
fix linking of seamonkey-bin
|
|
--- configure.in.orig Mon Jun 27 04:55:51 2011
|
|
+++ configure.in Sat Jul 2 11:40:43 2011
|
|
@@ -251,7 +251,7 @@ dnl Get mozilla version from central milestone file
|
|
MOZILLA_VERSION=`$PERL $MOZILLA_SRCDIR/config/milestone.pl -topsrcdir $MOZILLA_SRCDIR`
|
|
|
|
changequote(,)
|
|
-MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\).*/\1/;'`
|
|
+MOZILLA_BRANCH_VERSION="5.0"
|
|
changequote([,])
|
|
|
|
dnl Set the Gecko branch version.
|
|
@@ -1126,7 +1126,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
|
|
MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
|
|
MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
|
|
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
|
|
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin:/usr/lib:/usr/local/lib:/lib -Wl,-rpath-link,$(prefix)/lib'
|
|
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin:/usr/lib:/usr/local/lib:${X11BASE}/lib -Wl,-rpath-link,$(prefix)/lib'
|
|
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
|
|
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
|
|
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
|
|
@@ -5070,14 +5070,7 @@ dnl ==================================================
|
|
|
|
# The GNOME component is built if one of
|
|
# gnome-vfs, gio, gconf or libnotify is available.
|
|
-if test "$MOZ_ENABLE_GCONF" || \
|
|
- test "$MOZ_ENABLE_GNOMEVFS" || \
|
|
- test "$MOZ_ENABLE_GIO" || \
|
|
- test "$MOZ_ENABLE_LIBNOTIFY"; then
|
|
- MOZ_ENABLE_GNOME_COMPONENT=1
|
|
-else
|
|
- MOZ_ENABLE_GNOME_COMPONENT=
|
|
-fi
|
|
+MOZ_ENABLE_GNOME_COMPONENT=
|
|
AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT)
|
|
|
|
dnl ========================================================
|