commit fb0a17751aef77c05e60ecbf87b1aef9bdd13fa2
Author: Jakub Bogusz <[email protected]>
Date: Sat Feb 23 20:46:22 2013 +0100
- system-xulrunner patch seems obsolete, but only xulrunner 17.x is
supported
icedove-system-xulrunner.patch | 49 ------------------------------------------
icedove.spec | 3 +--
2 files changed, 1 insertion(+), 51 deletions(-)
---
diff --git a/icedove.spec b/icedove.spec
index 26c17c6..48d494e 100644
--- a/icedove.spec
+++ b/icedove.spec
@@ -48,7 +48,6 @@ Source4: %{name}.desktop
Source5: %{name}.sh
Patch0: %{name}-branding.patch
Patch1: %{name}-enigmail-shared.patch
-Patch2: %{name}-system-xulrunner.patch
Patch3: %{name}-fonts.patch
Patch4: %{name}-install.patch
Patch5: %{name}-hunspell.patch
@@ -100,6 +99,7 @@ BuildRequires: yasm
BuildRequires: zip
%if %{with xulrunner}
BuildRequires: xulrunner-devel >= %{xulrunner_ver}
+BuildRequires: xulrunner-devel < 2:18
%else
Requires: myspell-common
Requires: nspr >= 1:%{nspr_ver}
@@ -197,7 +197,6 @@ cd mozilla
/bin/sh %{SOURCE3}
%patch0 -p1
%{?with_enigmail:%patch1 -p1}
-%{?with_xulrunner:%patch2 -p1}
%patch3 -p1
%patch4 -p1
%patch6 -p1
diff --git a/icedove-system-xulrunner.patch b/icedove-system-xulrunner.patch
deleted file mode 100644
index 4260f50..0000000
--- a/icedove-system-xulrunner.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- mozilla/mail/app/Makefile.in.orig 2012-04-28 21:31:30.000000000 +0200
-+++ mozilla/mail/app/Makefile.in 2012-05-29 20:12:43.887999371 +0200
-@@ -44,6 +44,8 @@
-
- AB_CD = $(MOZ_UI_LOCALE)
-
-+DIST_FILES = application.ini
-+
- GRE_MILESTONE = $(shell $(PYTHON)
$(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini
Build Milestone)
- GRE_BUILDID = $(shell $(PYTHON)
$(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini
Build BuildID)
-
-@@ -79,6 +81,7 @@
- $(srcdir)/profile/channel-prefs.js \
- $(NULL)
-
-+ifndef LIBXUL_SDK
- ifneq (,$(filter OS2 Darwin WINNT,$(OS_ARCH)))
- PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
- else
-@@ -88,8 +91,6 @@
-
- CPPSRCS = nsMailApp.cpp
-
--DIST_FILES = application.ini
--
- LOCAL_INCLUDES += \
- -I$(MOZILLA_SRCDIR)/toolkit/xre \
- -I$(MOZILLA_SRCDIR)/xpcom/base \
-@@ -116,6 +117,8 @@
- LIBS += $(MOZ_DBUS_GLIB_LIBS)
- endif
-
-+endif # LIBXUL_SDK
-+
- ifndef MOZ_WINCONSOLE
- ifdef MOZ_DEBUG
- MOZ_WINCONSOLE = 1
-@@ -233,6 +236,11 @@
- $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default*
$(DESTDIR)$(mozappdir)/chrome/icons/default
- endif
-
-+ifdef LIBXUL_SDK
-+libs::
-+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX)
$(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
-+endif
-+
- ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
- ifneq (,$(filter-out Darwin,$(OS_ARCH)))
- $(MOZ_APP_NAME):: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS)
$(DEPTH)/config/autoconf.mk
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedove.git/commitdiff/fb0a17751aef77c05e60ecbf87b1aef9bdd13fa2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
