Attachment 232774 Details for Bug 251117 – 29.4.5 (unofficial branding by default)

[patch] 29.4.5 (unofficial branding by default)

www_palemoon.patch (text/plain), 14.37 KB, created by Olivier Certner on 2022-03-28 09:59:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Certner

Created: 2022-03-28 09:59:54 UTC

Size: 14.37 KB

patch

obsolete

>diff --git a/www/palemoon/Makefile b/www/palemoon/Makefile
>new file mode 100644
>index 000000000000..75ba03c1173a
>--- /dev/null
>+++ b/www/palemoon/Makefile
>@@ -0,0 +1,190 @@
>+# $FreeBSD$
>+
>+PORTNAME=	palemoon
>+DISTVERSION=	29.4.5
>+PORTREVISION=	0
>+CATEGORIES=	www
>+MASTER_SITES=	http://archive.palemoon.org/source/
>+DISTFILES=	palemoon-${DISTVERSION}.source.tar.xz
>+DIST_SUBDIR=	MoonchildProductions
>+
>+MAINTAINER=	olce.freebsd.ports@certner.fr
>+COMMENT=	Open-source web browser
>+
>+LICENSE=	MPL20 MISC
>+LICENSE_COMB=	multi
>+LICENSE_NAME_MISC=	Miscellaneous free and open-source licenses
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+LICENSE_FILE_MISC=	${WRKSRC}/platform/toolkit/content/license.html
>+LICENSE_PERMS_MISC=	dist-mirror pkg-mirror auto-accept
>+
>+ONLY_FOR_ARCHS=	amd64 i386
>+ONLY_FOR_ARCHS_REASON=Upstream only cares about i386/amd64
>+
>+# Common deps & build options
>+BUILD_DEPENDS=	autoconf-2.13:devel/autoconf213 \
>+		yasm:devel/yasm \
>+		zip:archivers/zip \
>+
>+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
>+		libdbus-glib-1.so:devel/dbus-glib \
>+		libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2
>+
>+USES=		pkgconfig perl5 gmake gnome xorg desktop-file-utils
>+USE_PERL5=	build
>+# XXX
>+# GTK3 support currently needs gtk20 and gconf2 to pass old-configure (and
>+# maybe more).
>+# See also: https://repo.palemoon.org/MoonchildProductions/UXP/issues/1638.
>+USE_GNOME=	cairo gdkpixbuf2 glib20 pango \
>+		gtk30 gtk20:build gconf2:build
>+USE_XORG=	xt x11 xcb xext xrender
>+
>+# We require GCC, but we need to make sure that
>+# there are no runtime dependencies to libstdc++, i.e., that libc++'s headers
>+# and libraries are used during compilation and link.
>+USES+=		compiler:gcc-c++11-lib
>+
>+# Not supported
>+NO_CCACHE=	t
>+
>+# Put this here pending creation of USES=gtar
>+BUILD_DEPENDS+=	gtar:archivers/gtar
>+BINARY_ALIAS+=	tar=${LOCALBASE}/bin/gtar
>+
>+USES+=		python:2.7,build
>+# BUILD_DEPENDS+=	tauthon:lang/tauthon
>+# BINARY_ALIAS+=	python=${LOCALBASE}/bin/tauthon \
>+# 		python2=${LOCALBASE}/bin/tauthon \
>+# 		python2.7=${LOCALBASE}/bin/tauthon
>+
>+BUNDLE_LIBS=	yes
>+
>+## Options
>+
>+OPTIONS_DEFINE+=	OFFICIAL_BRANDING
>+
>+OPTIONS_MULTI+=		SOUND
>+OPTIONS_MULTI_SOUND=	ALSA PULSEAUDIO SNDIO
>+OPTIONS_DEFAULT+=	ALSA
>+
>+OPTIONS_DEFINE+=	SYNC
>+
>+OPTIONS_DEFINE+=	SYSTEM_MALLOC
>+OPTIONS_DEFAULT+=	SYSTEM_MALLOC
>+
>+ALSA_BUILD_DEPENDS=	${PREFIX}/include/alsa/asoundlib.h:audio/alsa-lib
>+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>+PULSEAUDIO_BUILD_DEPENDS=${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
>+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
>+SNDIO_BUILD_DEPENDS=	${PREFIX}/include/sndio.h:audio/sndio
>+SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
>+
>+OFFICIAL_BRANDING_DESC=	Use artwork trademarked by Moonchild Productions
>+
>+SYNC_DESC=		Pale Moon Sync service (see https://www.palemoon.org/sync/)
>+
>+SYSTEM_MALLOC_DESC=	Use system jemalloc instead of bundled one
>+
>+.include <bsd.port.pre.mk>
>+
>+## Vars and targets
>+
>+WRKSRC=		${WRKDIR}/palemoon-source
>+
>+DOT_MOZCONFIG=	${WRKSRC}/.mozconfig
>+PM_BUILD_DIR=	${WRKSRC}/pmbuild
>+
>+.if ${PORT_OPTIONS:MOFFICIAL_BRANDING}
>+PALEMOON_DESKTOP=${WRKSRC}/palemoon/branding/official/palemoon.desktop
>+# Extract only -O options
>+PM_OPTIMIZE=-O2
>+PM_MOZCONFIG_REINPLACE_ARGS+=-e 's!^%%OFFICIAL_BRANDING%%!!'
>+RESTRICTED=Uses trademarked artwork not licensed for redistribution
>+.else
>+PALEMOON_DESKTOP=${WRKSRC}/palemoon/branding/unofficial/browser.desktop
>+# Extract only -O options
>+PM_OPTIMIZE=${CFLAGS:M-O*}
>+PM_MOZCONFIG_REINPLACE_ARGS+=-e 's!^%%OFFICIAL_BRANDING%%.*!!'
>+.endif
>+
>+.for VAR in PM_BUILD_DIR PM_OPTIMIZE
>+PM_MOZCONFIG_REINPLACE_ARGS+=-e 's!%%${VAR}%%!${${VAR}}!'
>+.endfor
>+
>+# Taken from bsd.gecko.mk. See comment there.
>+.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
>+MAKE_JOBS_NUMBER=	1
>+.endif
>+.if defined(MAKE_JOBS_NUMBER)
>+MOZ_MAKE_FLAGS+=	-j${MAKE_JOBS_NUMBER}
>+.endif
>+
>+# Prepare '.mozconfig' for 'configure'
>+pre-configure:
>+	${CP} ${FILESDIR}/dot.mozconfig ${DOT_MOZCONFIG}
>+	${REINPLACE_CMD} ${PM_MOZCONFIG_REINPLACE_ARGS} ${DOT_MOZCONFIG}
>+.if ${PORT_OPTIONS:MALSA}
>+	${ECHO_CMD} ac_add_options --enable-alsa >> ${DOT_MOZCONFIG}
>+.else
>+	${ECHO_CMD} ac_add_options --disable-alsa >> ${DOT_MOZCONFIG}
>+.endif
>+.if ${PORT_OPTIONS:MSNDIO}
>+	${ECHO_CMD} ac_add_options --enable-sndio >> ${DOT_MOZCONFIG}
>+.else
>+	${ECHO_CMD} ac_add_options --disable-sndio >> ${DOT_MOZCONFIG}
>+.endif
>+.if ${PORT_OPTIONS:MPULSEAUDIO}
>+	${ECHO_CMD} ac_add_options --enable-pulseaudio >> ${DOT_MOZCONFIG}
>+.else
>+	${ECHO_CMD} ac_add_options --disable-pulseaudio >> ${DOT_MOZCONFIG}
>+.endif
>+.if ! ${PORT_OPTIONS:MSYNC}
>+	${ECHO_CMD} ac_add_options --disable-sync >> ${DOT_MOZCONFIG}
>+.endif
>+.if ${PORT_OPTIONS:MSYSTEM_MALLOC}
>+	${ECHO_CMD} ac_add_options --disable-jemalloc >> ${DOT_MOZCONFIG}
>+.else
>+	${ECHO_CMD} ac_add_options --enable-jemalloc >> ${DOT_MOZCONFIG}
>+.endif
>+.if defined(MOZ_MAKE_FLAGS)
>+	${ECHO_CMD} mk_add_options MOZ_MAKE_FLAGS=${MOZ_MAKE_FLAGS:Q} \
>+		>> ${DOT_MOZCONFIG}
>+.endif
>+# Add build variables
>+.for VAR in CPP CXXCPP CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS \
>+	LD AS AR RANLIB OBJDUMP NM
>+.if defined(${VAR})
>+# Remove -rpath options to GCC's directory, we don't need them (no dependencies
>+# on libs compiled with gfortran, see
>+# https://wiki.freebsd.org/libgcc%20problem) and we don't want them (triggering
>+# a link to a different libgcc_s depending on whether GCC is installed at
>+# runtime).
>+	${ECHO_CMD} export ${VAR}=\"${${VAR}:N*-rpath*lib/gcc*}\" >> ${DOT_MOZCONFIG}
>+.endif
>+.endfor
>+
>+# Running 'mach configure' separately is "strongly discouraged" (see Mozilla's
>+# doc on build options configuration). But this does not seem relevant to Pale
>+# Moon.
>+do-configure:
>+	cd ${WRKSRC} && ${SETENV} PATH=${PATH} ./mach configure
>+
>+do-build:
>+	cd ${WRKSRC} && ${SETENV} PATH=${PATH} ./mach build
>+# Going through the package route (the only one documented upstream)
>+	cd ${WRKSRC} && ${SETENV} PATH=${PATH} ./mach package
>+
>+do-install:
>+	${TAR} -C ${STAGEDIR}${PREFIX}/lib \
>+		-xf ${PM_BUILD_DIR:Q}/dist/palemoon*.tar* \
>+		palemoon
>+	${RLN}  ${STAGEDIR}${PREFIX}/lib/palemoon/palemoon \
>+		${STAGEDIR}${PREFIX}/bin/palemoon
>+	${INSTALL_DATA} ${PALEMOON_DESKTOP} \
>+		${STAGEDIR}${PREFIX}/share/applications/palemoon.desktop
>+	${RLN}  ${STAGEDIR}${PREFIX}/lib/palemoon/browser/icons/mozicon128.png \
>+		${STAGEDIR}${PREFIX}/share/pixmaps/palemoon.png
>+
>+.include <bsd.port.post.mk>
>diff --git a/www/palemoon/distinfo b/www/palemoon/distinfo
>new file mode 100644
>index 000000000000..de635b94e9b5
>--- /dev/null
>+++ b/www/palemoon/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1648214433
>+SHA256 (MoonchildProductions/palemoon-29.4.5.source.tar.xz) = 8dd126dc9a002eb2f863f2197e2f36c14928e00a58e0989baf7d6b558c990eb1
>+SIZE (MoonchildProductions/palemoon-29.4.5.source.tar.xz) = 201085920
>diff --git a/www/palemoon/files/dot.mozconfig b/www/palemoon/files/dot.mozconfig
>new file mode 100644
>index 000000000000..47ce1b07ed1f
>--- /dev/null
>+++ b/www/palemoon/files/dot.mozconfig
>@@ -0,0 +1,31 @@
>+# Standard build options for Pale Moon
>+# See http://developer.palemoon.org/build/linux/
>+
>+# The 'configure' ports step replaces %%VAR%% with content of Makefile's VAR
>+# and appends lines to this file.
>+
>+mk_add_options MOZ_OBJDIR=%%PM_BUILD_DIR%%
>+
>+ac_add_options --enable-application=palemoon
>+ac_add_options --enable-optimize="-w %%PM_OPTIMIZE%%"
>+ac_add_options --enable-default-toolkit=cairo-gtk3
>+ac_add_options --enable-strip
>+ac_add_options --enable-devtools
>+ac_add_options --enable-av1
>+ac_add_options --disable-eme
>+ac_add_options --disable-webrtc
>+ac_add_options --disable-gamepad
>+ac_add_options --disable-tests
>+ac_add_options --disable-debug
>+ac_add_options --disable-necko-wifi
>+ac_add_options --disable-updater
>+ac_add_options --with-pthreads
>+
>+%%OFFICIAL_BRANDING%%ac_add_options --enable-official-branding
>+%%OFFICIAL_BRANDING%%export MOZILLA_OFFICIAL=1
>+
>+# Don't bother compressing, mach's package is just intermediate file
>+export MOZ_PKG_FORMAT=TAR
>+
>+# Below this line, build options depending on port options, as well as make and
>+# build flags, will be appended.
>diff --git a/www/palemoon/files/patch-mach b/www/palemoon/files/patch-mach
>new file mode 100644
>index 000000000000..f8fb6c04d2a3
>--- /dev/null
>+++ b/www/palemoon/files/patch-mach
>@@ -0,0 +1,60 @@
>+--- mach.orig	2021-11-10 12:12:26 UTC
>++++ mach
>+@@ -15,28 +15,26 @@ MCP_XZ=`which xz 2>/dev/null`
>+ MCP_TAR_BASEDIR="s/^./$MCP_APP-source/"
>+ MCP_TAR_FILENAME="$MCP_APP-$MCP_VERSION.source.tar.xz"
>+ MCP_TAR_COMMAND="tar cfJv ../$MCP_TAR_FILENAME . --transform $MCP_TAR_BASEDIR --exclude-vcs --warning=no-file-changed"
>+-MCP_TAR_EXCLUDES=(
>+-  "$MCP_APP/branding/beta"
>+-  "$MCP_APP/branding/unstable"
>+-  "platform/db/mork"
>+-  "platform/docs"
>+-  "platform/ldap"
>+-  "platform/libs/gmp-clearkey"
>+-  "platform/mailnews"
>+-  "platform/python/psutil/*.so"
>+-  "platform/python/psutil/*.pyd"
>+-  "platform/python/psutil/build"
>+-  "platform/xulrunner"
>+-  ".mozconfig"
>+-  ".gitattributes"
>+-  ".gitignore"
>+-  ".gitmodules"
>+-  "*.pyc"
>+-  "*.pyo"
>+-  "*.rej"
>+-  "*.orig"
>+-  "*.source.tar.xz"
>+-)
>++MCP_TAR_EXCLUDES="$MCP_APP/branding/beta \
>++  $MCP_APP/branding/unstable \
>++  platform/db/mork \
>++  platform/docs \
>++  platform/ldap \
>++  platform/libs/gmp-clearkey \
>++  platform/mailnews \
>++  platform/python/psutil/*.so \
>++  platform/python/psutil/*.pyd \
>++  platform/python/psutil/build \
>++  platform/xulrunner \
>++  .mozconfig \
>++  .gitattributes \
>++  .gitignore \
>++  .gitmodules \
>++  *.pyc \
>++  *.pyo \
>++  *.rej \
>++  *.orig \
>++  *.source.tar.xz"
>+ 
>+ if [ "$1" == "source" ]; then
>+   if [ -z "$MCP_XZ" ]; then
>+@@ -44,7 +42,7 @@ if [ "$1" == "source" ]; then
>+     exit 1
>+   fi
>+ 
>+-  for _value in "${MCP_TAR_EXCLUDES[@]}"; do
>++  for _value in ${MCP_TAR_EXCLUDES}; do
>+     MCP_TAR_COMMAND+=" --exclude=${_value}"
>+   done
>+ 
>diff --git a/www/palemoon/files/patch-platform_ipc_chromium_src_base_string16.cc b/www/palemoon/files/patch-platform_ipc_chromium_src_base_string16.cc
>new file mode 100644
>index 000000000000..f6c36f1d597b
>--- /dev/null
>+++ b/www/palemoon/files/patch-platform_ipc_chromium_src_base_string16.cc
>@@ -0,0 +1,10 @@
>+--- platform/ipc/chromium/src/base/string16.cc.orig	2022-02-11 15:09:55 UTC
>++++ platform/ipc/chromium/src/base/string16.cc
>+@@ -68,6 +68,6 @@ char16* c16memset(char16* s, char16 c, size_t n) {
>+ 
>+ }  // namespace base
>+ 
>+-template class std::basic_string<char16, base::string16_char_traits>;
>++inline template class std::basic_string<char16, base::string16_char_traits>;
>+ 
>+ #endif  // WCHAR_T_IS_UTF32
>diff --git a/www/palemoon/files/patch-platform_old-configure.in b/www/palemoon/files/patch-platform_old-configure.in
>new file mode 100644
>index 000000000000..a01366162c46
>--- /dev/null
>+++ b/www/palemoon/files/patch-platform_old-configure.in
>@@ -0,0 +1,11 @@
>+--- platform/old-configure.in.orig	2021-11-08 19:27:52 UTC
>++++ platform/old-configure.in
>+@@ -5305,7 +5305,7 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
>+ 
>+ # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS
>+ # and $NSPR_LIBS.
>+-ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`"
>++ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`"
>+ 
>+ if test "$_INTL_API" = no; then
>+     ac_configure_args="$ac_configure_args --without-intl-api"
>diff --git a/www/palemoon/pkg-descr b/www/palemoon/pkg-descr
>new file mode 100644
>index 000000000000..0ba49faf015d
>--- /dev/null
>+++ b/www/palemoon/pkg-descr
>@@ -0,0 +1,17 @@
>+Pale Moon(TM) offers you a browsing experience in a browser completely built
>+from its own, independently developed source that has been forked off from
>+Firefox/Mozilla code a number of years ago, with carefully selected features
>+and optimizations to improve the browser's stability and user experience, while
>+offering full customization and a growing collection of extensions and themes
>+to make the browser truly your own.
>+
>+Some of the main features:
>+- Based on the Unified XUL Platform (UXP) containing our own optimized layout
>+  and rendering engine (Goanna).
>+- Safe: Forked from mature Mozilla code and regularly updated with the latest
>+  security patches.
>+- Secure: Additional security features and security-aware development
>+- Zero ads; no telemetry, spyware or data gathering
>+- Familiar, efficient, fully customizable interface
>+
>+WWW: https://www.palemoon.org/
>diff --git a/www/palemoon/pkg-plist b/www/palemoon/pkg-plist
>new file mode 100644
>index 000000000000..877558baf31a
>--- /dev/null
>+++ b/www/palemoon/pkg-plist
>@@ -0,0 +1,57 @@
>+bin/palemoon
>+lib/palemoon/application.ini
>+lib/palemoon/browser/blocklist.xml
>+lib/palemoon/browser/chrome.manifest
>+lib/palemoon/browser/chrome/icons/default/default16.png
>+lib/palemoon/browser/chrome/icons/default/default32.png
>+lib/palemoon/browser/chrome/icons/default/default48.png
>+lib/palemoon/browser/components/components.manifest
>+lib/palemoon/browser/components/libbrowsercomps.so
>+lib/palemoon/browser/defaults/profile/chrome/userChrome-example.css
>+lib/palemoon/browser/defaults/profile/chrome/userContent-example.css
>+lib/palemoon/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
>+lib/palemoon/browser/icons/mozicon128.png
>+lib/palemoon/browser/palemoon.res
>+lib/palemoon/browser/searchplugins/bing.xml
>+lib/palemoon/browser/searchplugins/duckduckgo-palemoon.xml
>+lib/palemoon/browser/searchplugins/ecosia.xml
>+lib/palemoon/browser/searchplugins/ekoru.xml
>+lib/palemoon/browser/searchplugins/twitter.xml
>+lib/palemoon/browser/searchplugins/wikipedia.xml
>+lib/palemoon/browser/searchplugins/yahoo.xml
>+lib/palemoon/browser/ua-update.json
>+lib/palemoon/chrome.manifest
>+lib/palemoon/defaults/pref/channel-prefs.js
>+lib/palemoon/dependentlibs.list
>+lib/palemoon/dictionaries/en-US.aff
>+lib/palemoon/dictionaries/en-US.dic
>+lib/palemoon/gtk2/libmozgtk.so
>+lib/palemoon/icudt58l.dat
>+lib/palemoon/libfreebl3.chk
>+lib/palemoon/libfreebl3.so
>+lib/palemoon/liblgpllibs.so
>+lib/palemoon/libmozavcodec.so
>+lib/palemoon/libmozavutil.so
>+lib/palemoon/libmozgtk.so
>+lib/palemoon/libmozsqlite3.so
>+lib/palemoon/libnspr4.so
>+lib/palemoon/libnss3.so
>+lib/palemoon/libnssckbi.so
>+lib/palemoon/libnssutil3.so
>+lib/palemoon/libplc4.so
>+lib/palemoon/libplds4.so
>+lib/palemoon/libsmime3.so
>+lib/palemoon/libsoftokn3.chk
>+lib/palemoon/libsoftokn3.so
>+lib/palemoon/libssl3.so
>+lib/palemoon/libxul.so
>+lib/palemoon/palemoon
>+lib/palemoon/palemoon-bin
>+lib/palemoon/palemoon.res
>+lib/palemoon/platform.ini
>+lib/palemoon/plugin-container
>+lib/palemoon/precomplete
>+lib/palemoon/removed-files
>+lib/palemoon/run-mozilla.sh
>+share/applications/palemoon.desktop
>+share/pixmaps/palemoon.png

Actions: View | Diff

Attachments on bug 251117: 219655 | 222399 | 222461 | 223113 | 223856 | 224522 | 225726 | 226585 | 227606 | 228482 | 229396 | 229589 | 230118 | 231756 | 231786 | 232303 | 232774 | 232868 | 233707 | 243622