pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #241560 from SuperSandro2000/betterbird

betterbird: 102.8.0-bb30 -> 102.12.0-bb37

authored by

Sandro and committed by
GitHub 198d11ec 55a23e0f

+42 -77
unified split
-44
pkgs/applications/networking/mailreaders/betterbird/betterbird.diff
··· 1 - --- a/12-feature-linux-systray-example.patch 2 - +++ b/12-feature-linux-systray-example.patch 3 - @@ -8,18 +8,15 @@ diff --git a/third_party/appindicator/Makefile b/third_party/appindicator/Makefi 4 - new file mode 100644 5 - --- /dev/null 6 - +++ b/third_party/appindicator/Makefile 7 - -@@ -0,0 +1,34 @@ 8 - +@@ -0,0 +1,31 @@ 9 - +# Code from https://github.com/AyatanaIndicators/libayatana-appindicator 10 - +# and related repositories. 11 - +# See https://github.com/AyatanaIndicators/libayatana-appindicator/issues/46 for build instructions. 12 - +# You need: sudo aptitude install libdbusmenu-gtk3-dev 13 - + 14 - -+CFLAGS=`pkg-config --cflags gtk+-3.0 glib-2.0` \ 15 - -+ -I/usr/include/libdbusmenu-glib-0.4/ \ 16 - -+ -I/usr/include/libdbusmenu-gtk3-0.4/ \ 17 - -+ -I/usr/include/glib-2.0 18 - ++CFLAGS=`pkg-config --cflags gtk+-3.0 glib-2.0 dbusmenu-gtk3-0.4` \ 19 - + 20 - -+LDFLAGS=`pkg-config --libs gtk+-3.0 glib-2.0` -ldbusmenu-glib -ldbusmenu-gtk3 21 - ++LDFLAGS=`pkg-config --libs dbusmenu-gtk3-0.4` 22 - + 23 - +OBJECTS=betterbird-systray-icon.o \ 24 - + app-indicator.o \ 25 - --- a/1790619-send-progress-width.patch 26 - +++ b/1790619-send-progress-width.patch 27 - @@ -31,6 +21,7 @@ 28 - scrolling="false"> 29 - <head> 30 - <title>&sendDialog.title;</title> 31 - + <link rel="localization" href="branding/brand.ftl" /> 32 - + <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script> 33 - <script defer="defer" src="chrome://messenger/content/messengercompose/sendProgress.js"></script> 34 - - <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script> 35 - --- a/1777788-fix-dialog-size.patch 36 - +++ b/1777788-fix-dialog-size.patch 37 - @@ -22,6 +22,7 @@ diff --git a/mailnews/compose/content/sendProgress.xhtml b/mailnews/compose/cont 38 - scrolling="false"> 39 - <head> 40 - <title>&sendDialog.title;</title> 41 - + <link rel="localization" href="branding/brand.ftl" /> 42 - <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script> 43 - <script defer="defer" src="chrome://messenger/content/messengercompose/sendProgress.js"></script> 44 - </head>
+42 -33
pkgs/applications/networking/mailreaders/betterbird/default.nix
··· 9 9 , thunderbird-unwrapped 10 10 }: 11 11 12 - ((buildMozillaMach rec { 12 + let 13 + version = "102.12.0"; 14 + majVer = lib.versions.major version; 15 + 16 + betterbird-patches = fetchFromGitHub { 17 + owner = "Betterbird"; 18 + repo = "thunderbird-patches"; 19 + rev = "${version}-bb37"; 20 + postFetch = '' 21 + echo "Retrieving external patches" 22 + 23 + echo "#!${runtimeShell}" > external.sh 24 + # if no external patches need to be downloaded, don't fail 25 + { grep " # " $out/${majVer}/series-M-C || true ; } >> external.sh 26 + { grep " # " $out/${majVer}/series || true ; } >> external.sh 27 + sed -i -e '/^#/d' external.sh 28 + sed -i -e 's/\/rev\//\/raw-rev\//' external.sh 29 + sed -i -e 's|\(.*\) # \(.*\)|curl \2 -o $out/${majVer}/external/\1|' external.sh 30 + chmod 700 external.sh 31 + 32 + mkdir $out/${majVer}/external 33 + SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt 34 + . ./external.sh 35 + rm external.sh 36 + ''; 37 + sha256 = "sha256-LH0dgWqariutfaOCPIUZrHzZ8oCbZF1VaaKQIQS4aL8="; 38 + }; 39 + in ((buildMozillaMach { 13 40 pname = "betterbird"; 14 - version = "102.8.0"; 41 + inherit version; 15 42 16 43 applicationName = "Betterbird"; 17 44 binaryName = "betterbird"; 18 45 inherit (thunderbird-unwrapped) application extraPatches; 19 46 20 47 src = fetchurl { 21 - # https://download.cdn.mozilla.net/pub/mozilla.org/thunderbird/releases/ 48 + # https://download.cdn.mozilla.net/pub/thunderbird/releases/ 22 49 url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; 23 - sha512 = "2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8"; 50 + sha512 = "303787a8f22a204e48784d54320d5f4adaeeeedbe4c2294cd26ad75792272ffc9453be7f0ab1434214b61a2cc46982c23c4fd447c4d80d588df4a7800225ddee"; 24 51 }; 25 52 26 - extraPostPatch = let 27 - majVer = lib.versions.major version; 28 - betterbird = fetchFromGitHub { 29 - owner = "Betterbird"; 30 - repo = "thunderbird-patches"; 31 - rev = "${version}-bb30"; 32 - postFetch = '' 33 - echo "Retrieving external patches" 34 - 35 - echo "#!${runtimeShell}" > external.sh 36 - grep " # " $out/${majVer}/series-M-C >> external.sh 37 - grep " # " $out/${majVer}/series >> external.sh 38 - sed -i -e 's/\/rev\//\/raw-rev\//' external.sh 39 - sed -i -e 's|\(.*\) # \(.*\)|curl \2 -o $out/${majVer}/external/\1|' external.sh 40 - chmod 700 external.sh 41 - 42 - mkdir $out/${majVer}/external 43 - SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt 44 - . ./external.sh 45 - rm external.sh 46 - ''; 47 - sha256 = "sha256-ouJSFz/5shNR9puVjrZRJq90DHTeSx7hAnDpuhkBsDo="; 48 - }; 49 - in thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' 53 + extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' 50 54 PATH=$PATH:${lib.makeBinPath [ git ]} 51 55 patches=$(mktemp -d) 52 56 for dir in branding bugs external features misc; do 53 - cp -r ${betterbird}/${majVer}/$dir/*.patch $patches/ 57 + cp -r ${betterbird-patches}/${majVer}/$dir/*.patch $patches/ 58 + # files is not in series file and duplicated with external patch 59 + [[ $dir == bugs ]] && rm $patches/1820504-optimise-grapheme-m-c.patch 54 60 done 55 - cp ${betterbird}/${majVer}/series* $patches/ 61 + cp ${betterbird-patches}/${majVer}/series* $patches/ 56 62 chmod -R +w $patches 57 63 58 64 cd $patches 59 - patch -p1 < ${./betterbird.diff} 65 + # fix FHS paths to libdbusmenu 60 66 substituteInPlace 12-feature-linux-systray.patch \ 61 67 --replace "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \ 62 68 --replace "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/" ··· 103 109 webrtcSupport = false; 104 110 105 111 pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" 106 - }).overrideAttrs(oldAttrs: { 112 + }).overrideAttrs (oldAttrs: { 107 113 postInstall = oldAttrs.postInstall or "" + '' 108 114 mv $out/lib/thunderbird/* $out/lib/betterbird 109 115 rmdir $out/lib/thunderbird/ ··· 112 118 ''; 113 119 114 120 doInstallCheck = false; 115 - requiredSystemFeatures = []; 121 + 122 + passthru = oldAttrs.passthru // { 123 + inherit betterbird-patches; 124 + }; 116 125 })