From 62a92d254fa97339c4d26d9fd8fd7d1e2e29e4e2 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sat, 9 Mar 2019 20:52:33 +0100 Subject: updated branding patches for icedove-60.5.1 --- src/patches/icedove/fix-installdir.patch | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/patches/icedove/fix-installdir.patch') diff --git a/src/patches/icedove/fix-installdir.patch b/src/patches/icedove/fix-installdir.patch index 0ad46c6..73654be 100644 --- a/src/patches/icedove/fix-installdir.patch +++ b/src/patches/icedove/fix-installdir.patch @@ -6,13 +6,13 @@ Subject: fix installdir mail/app/Makefile.in | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in +diff --git a/comm/mail/app/Makefile.in b/comm/mail/app/Makefile.in index 74c164b..1c9ea15 100644 ---- a/mail/app/Makefile.in -+++ b/mail/app/Makefile.in -@@ -100,11 +100,20 @@ libs:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES)) +--- a/comm/mail/app/Makefile.in ++++ b/comm/mail/app/Makefile.in +@@ -100,6 +100,13 @@ libs:: $(addprefix icons/$(MOZ_WIDGET_TO - libs:: $(addprefix $(DIST)/branding/,$(BRANDED_ICON_FILES)) + libs:: $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/messengerWindow.ico $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default + +install:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES)) @@ -20,14 +20,7 @@ index 74c164b..1c9ea15 100644 + +install:: $(addprefix $(DIST)/branding,$(BRANDED_ICON_FILES)) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(installdir)/chrome/icons/default - endif - - ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT))) - libs:: - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default + -+install:: -+ $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(installdir)/chrome/icons/default endif libs:: $(srcdir)/profile/prefs.js -- cgit v1.2.2