Merge pull request #164868 from OPNA2608/update/palemoon
palemoon: 29.4.4 -> 30.0.0
This commit is contained in:
commit
bef8290da1
2 changed files with 13 additions and 21 deletions
|
@ -6,7 +6,7 @@
|
|||
, dbus
|
||||
, dbus-glib
|
||||
, desktop-file-utils
|
||||
, fetchzip
|
||||
, fetchFromGitea
|
||||
, ffmpeg
|
||||
, fontconfig
|
||||
, freetype
|
||||
|
@ -44,12 +44,15 @@ assert with lib.strings; (
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.4.4";
|
||||
version = "30.0.0";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
|
||||
sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc=";
|
||||
src = fetchFromGitea {
|
||||
domain = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "02qdw8b7hphphc66m3m14r4pmcfiq2c5z4jcscm2nymy18ycb10f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -137,24 +140,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
./mach install
|
||||
|
||||
# Fix missing icon due to wrong WMClass
|
||||
# https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221
|
||||
substituteInPlace ./palemoon/branding/official/palemoon.desktop \
|
||||
--replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon'
|
||||
# Install official branding stuff (desktop file & icons)
|
||||
desktop-file-install --dir=$out/share/applications \
|
||||
./palemoon/branding/official/palemoon.desktop
|
||||
|
||||
# Install official branding icons
|
||||
./other-licenses/branding/palemoon/official/palemoon.desktop
|
||||
for iconname in default{16,22,24,32,48,256} mozicon128; do
|
||||
n=''${iconname//[^0-9]/}
|
||||
size=$n"x"$n
|
||||
install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
|
||||
install -Dm644 ./other-licenses/branding/palemoon/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
|
||||
done
|
||||
|
||||
# Remove unneeded SDK data from installation
|
||||
# https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729
|
||||
rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ _BUILD_64=@build64@
|
|||
_GTK_VERSION=@gtkversion@
|
||||
|
||||
# Standard build options for Pale Moon
|
||||
ac_add_options --enable-application=palemoon
|
||||
ac_add_options --enable-application=browser
|
||||
ac_add_options --enable-optimize="-O2 -w"
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION
|
||||
ac_add_options --enable-jemalloc
|
||||
|
@ -20,8 +20,6 @@ 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
|
||||
|
|
Loading…
Reference in a new issue