From 25ee6f9c1b08e37997e192484b329f0444a1b911 Mon Sep 17 00:00:00 2001 From: andkrau Date: Mon, 18 Apr 2022 11:52:27 -0500 Subject: Revert "Issue MoonchildProductions/GRE#3025 - Remove MOZ_AUSTRALIS define from Basilisk." This reverts commit 9abdd5ee17ece53c42a1df9861e4d0b73a09bc69. --- basilisk/configure.in | 5 ++++- basilisk/confvars.sh | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/basilisk/configure.in b/basilisk/configure.in index f7d6864..13f2ad5 100644 --- a/basilisk/configure.in +++ b/basilisk/configure.in @@ -8,6 +8,9 @@ dnl Things we need to carry from confvars.sh AC_DEFINE(MOZ_PHOENIX) AC_SUBST(MOZ_PHOENIX) +AC_DEFINE(MOZ_AUSTRALIS) +AC_SUBST(MOZ_AUSTRALIS) + AC_DEFINE(MC_BASILISK) AC_SUBST(MC_BASILISK) @@ -19,4 +22,4 @@ dnl ======================================================== MOZ_ARG_DISABLE_BOOL(sync, [ --disable-sync Disable Sync], MOZ_SERVICES_SYNC=, - MOZ_SERVICES_SYNC=1) + MOZ_SERVICES_SYNC=1) \ No newline at end of file diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh index 01e364f..1eac1a7 100644 --- a/basilisk/confvars.sh +++ b/basilisk/confvars.sh @@ -6,6 +6,7 @@ MOZ_APP_BASENAME=Basilisk MOZ_APP_VENDOR=Moonchild MOZ_PHOENIX=1 +MOZ_AUSTRALIS=1 MC_BASILISK=1 MOZ_UPDATER= MOZ_BUNDLED_FONTS=1 -- cgit v1.2.3 From 198e5224eece6efe11acf1eedd8869ccba45ba44 Mon Sep 17 00:00:00 2001 From: andkrau Date: Mon, 18 Apr 2022 12:01:27 -0500 Subject: Additional fix for search after telemetry removal --- basilisk/components/search/content/search.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/basilisk/components/search/content/search.xml b/basilisk/components/search/content/search.xml index d7ec8e2..c07fd7e 100644 --- a/basilisk/components/search/content/search.xml +++ b/basilisk/components/search/content/search.xml @@ -444,7 +444,6 @@ isSuggestion: (!aOneOff && telemetrySearchDetails), selection: telemetrySearchDetails }; - BrowserSearch.recordSearchInTelemetry(engine, "searchbar", details); // null parameter below specifies HTML response for search let params = { postData: submission.postData, -- cgit v1.2.3 From c8734542eef01f828f1ddfb028746a6aa87c7f4e Mon Sep 17 00:00:00 2001 From: andkrau Date: Wed, 20 Apr 2022 10:58:47 -0500 Subject: Remove marionette from package manifest --- basilisk/installer/package-manifest.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in index 69c65cd..1d8b1df 100644 --- a/basilisk/installer/package-manifest.in +++ b/basilisk/installer/package-manifest.in @@ -502,11 +502,6 @@ @RESPATH@/components/PeerConnection.manifest #endif -@RESPATH@/chrome/marionette@JAREXT@ -@RESPATH@/chrome/marionette.manifest -@RESPATH@/components/marionette.manifest -@RESPATH@/components/marionette.js - #ifdef MOZ_WEBSPEECH @RESPATH@/components/dom_webspeechsynth.xpt #endif -- cgit v1.2.3 From 320a32dfcd8b44191ff9d09ba93543af7a633060 Mon Sep 17 00:00:00 2001 From: andkrau Date: Thu, 21 Apr 2022 15:30:08 -0500 Subject: Remove unused components from package-manifest.in --- basilisk/installer/package-manifest.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in index 1d8b1df..106f061 100644 --- a/basilisk/installer/package-manifest.in +++ b/basilisk/installer/package-manifest.in @@ -478,8 +478,6 @@ @RESPATH@/components/SettingsManager.manifest @RESPATH@/components/AppsService.js @RESPATH@/components/AppsService.manifest -@RESPATH@/components/recording-cmdline.js -@RESPATH@/components/recording-cmdline.manifest @RESPATH@/components/htmlMenuBuilder.js @RESPATH@/components/htmlMenuBuilder.manifest @@ -548,8 +546,6 @@ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest -@RESPATH@/chrome/recording.manifest -@RESPATH@/chrome/recording/* #ifdef MOZ_GTK @RESPATH@/browser/chrome/icons/default/default16.png @RESPATH@/browser/chrome/icons/default/default32.png -- cgit v1.2.3 From cbfb9b82d572925fceb7044b0015e2f1783fdfbd Mon Sep 17 00:00:00 2001 From: andkrau Date: Thu, 21 Apr 2022 18:08:04 -0500 Subject: Another fix for search after telemetry removal --- basilisk/components/search/content/search.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/basilisk/components/search/content/search.xml b/basilisk/components/search/content/search.xml index c07fd7e..1be5c00 100644 --- a/basilisk/components/search/content/search.xml +++ b/basilisk/components/search/content/search.xml @@ -398,8 +398,6 @@ if (!aEngine) { aEngine = this.currentEngine; } - BrowserSearch.recordOneoffSearchInTelemetry(aEngine, source, type, - aWhere); } } -- cgit v1.2.3 From 899085789ba506589f61a909a9fbd4a8dfcf22cf Mon Sep 17 00:00:00 2001 From: andkrau Date: Fri, 13 May 2022 12:11:01 -0500 Subject: remove GRE submodule --- .gitmodules | 3 --- platform | 1 - 2 files changed, 4 deletions(-) delete mode 160000 platform diff --git a/.gitmodules b/.gitmodules index 71daa90..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "platform"] - path = platform -url=https://repo.palemoon.org/MoonchildProductions/GRE.git \ No newline at end of file diff --git a/platform b/platform deleted file mode 160000 index e27eb9a..0000000 --- a/platform +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e27eb9af0a353205c9583c15122f7e6fe17bca88 -- cgit v1.2.3 From 194c2279298041bad59e2429f61fc59360bb0bef Mon Sep 17 00:00:00 2001 From: andkrau Date: Fri, 13 May 2022 12:21:07 -0500 Subject: Add UXP submodule --- .gitmodules | 4 ++++ platform | 1 + 2 files changed, 5 insertions(+) create mode 160000 platform diff --git a/.gitmodules b/.gitmodules index e69de29..7ce7310 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "platform"] + path = platform + url = https://repo.palemoon.org/MoonchildProductions/UXP.git + branch = release diff --git a/platform b/platform new file mode 160000 index 0000000..8760ce0 --- /dev/null +++ b/platform @@ -0,0 +1 @@ +Subproject commit 8760ce023c7cf7ab4e3676d41f8484c075992b76 -- cgit v1.2.3 From ad03351154e75db5ed2fce972e3cc0292a2925a0 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Fri, 3 Jun 2022 18:12:06 -0500 Subject: Revert "No Issue - Nuke remaining dbsoft contributions" This reverts commit 11f17b525f5dfb742f4311c5ea9bd97122caa6a1. --- basilisk/app/Makefile.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/basilisk/app/Makefile.in b/basilisk/app/Makefile.in index 19bc329..edb52e4 100644 --- a/basilisk/app/Makefile.in +++ b/basilisk/app/Makefile.in @@ -50,3 +50,50 @@ endif libs:: $(srcdir)/profile/channel-prefs.js $(NSINSTALL) -D $(DIST)/bin/defaults/pref $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) + +ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) + +MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME) + +ifdef MOZ_DEBUG +MAC_APP_NAME := $(MAC_APP_NAME)Debug +endif + +AB_CD = $(MOZ_UI_LOCALE) + +ifeq (zh-TW,$(AB_CD)) +LPROJ_ROOT := $(subst -,_,$(AB_CD)) +else +LPROJ_ROOT := $(firstword $(subst -, ,$(AB_CD))) +endif +LPROJ := Contents/Resources/$(LPROJ_ROOT).lproj + +clean clobber repackage:: + $(RM) -r $(dist_dest) + +MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/buildid.h) + +.PHONY: repackage +tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) + $(MKDIR) -p '$(dist_dest)/Contents/MacOS' + $(MKDIR) -p '$(dist_dest)/$(LPROJ)' + rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents '$(dist_dest)' --exclude English.lproj + rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(dist_dest)/$(LPROJ)' + sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' $(srcdir)/macbuild/Contents/Info.plist.in > '$(dist_dest)/Contents/Info.plist' + sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(dist_dest)/$(LPROJ)/InfoPlist.strings' + rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(dist_dest)/Contents/Resources' + rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS' + # MacOS-files-copy.in is a list of files that should be copies rather + # than symlinks and placed in .app/Contents/MacOS. + rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS' + $(RM) '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)' + rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS' + cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns' + cp -RL $(DIST)/branding/document.icns '$(dist_dest)/Contents/Resources/document.icns' +ifdef MOZ_UPDATER + $(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices' + mv -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices' + ln -s ../../../../Library/LaunchServices/org.mozilla.updater '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' +endif + printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo' +endif -- cgit v1.2.3 From ef0c5077da9a1eec8f07f76f7bea2bb924357733 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sat, 4 Jun 2022 14:16:01 -0500 Subject: Revert "No issue - Explicitly enable bundled fonts for building from platform release branch" This reverts commit 262b3061f85db28a79413284e2a8bab89b5bbbbd. --- basilisk/confvars.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh index 1eac1a7..11ca15a 100644 --- a/basilisk/confvars.sh +++ b/basilisk/confvars.sh @@ -9,7 +9,6 @@ MOZ_PHOENIX=1 MOZ_AUSTRALIS=1 MC_BASILISK=1 MOZ_UPDATER= -MOZ_BUNDLED_FONTS=1 # For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release # builds so add-on developers have something to target while maintaining -- cgit v1.2.3 From 297bd5c0cfa27cb2ebef08633029bf0970eba00c Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sat, 4 Jun 2022 14:17:43 -0500 Subject: Revert "No Issue - Always build with bundled fonts" This reverts commit 37651df28da69a3a0481b1984dc41d1238f795c3. --- basilisk/confvars.sh | 5 +++++ basilisk/installer/package-manifest.in | 2 ++ 2 files changed, 7 insertions(+) diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh index 11ca15a..64eb57e 100644 --- a/basilisk/confvars.sh +++ b/basilisk/confvars.sh @@ -10,6 +10,11 @@ MOZ_AUSTRALIS=1 MC_BASILISK=1 MOZ_UPDATER= +if test "$OS_ARCH" = "WINNT" -o \ + "$OS_ARCH" = "Linux"; then + MOZ_BUNDLED_FONTS=1 +fi + # For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release # builds so add-on developers have something to target while maintaining # Firefox compatiblity. diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in index 106f061..1a4f03f 100644 --- a/basilisk/installer/package-manifest.in +++ b/basilisk/installer/package-manifest.in @@ -50,7 +50,9 @@ @RESPATH@/chrome/@AB_CD@@JAREXT@ @RESPATH@/chrome/@AB_CD@.manifest @RESPATH@/dictionaries/* +#if defined(XP_WIN) || defined(XP_LINUX) @RESPATH@/fonts/* +#endif @RESPATH@/hyphenation/* @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js #ifdef HAVE_MAKENSISU -- cgit v1.2.3