From 462c963c297363e4de09bc8d0b5dd17e791f695a Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Sat, 13 Feb 2021 20:04:43 +0100 Subject: [PATCH] split different builds up again; use this repo only for patches and the tarball build --- .gitlab-ci.yml | 104 +----- PKGBUILD | 325 ----------------- PKGBUILD_global_menubar | 324 ----------------- appimage/build_appimage.sh | 70 ---- appimage/content/.DirIcon | 1 - appimage/content/AppRun | 14 - appimage/content/io.gitlab.LibreWolf.desktop | 25 -- appimage/content/librewolf.png | Bin 12873 -> 0 bytes arch/01_build.sh | 17 - build.sh | 16 - .../build_tarball.sh => build_tarball.sh | 0 .../io.gitlab.LibreWolf.appdata.xml.in | 0 .../content => content}/launch_librewolf.sh | 0 .../content => content}/toggle-settings.sh | 0 flatpak/build_flatpak.sh | 78 ---- flatpak/content/io.gitlab.LibreWolf.desktop | 25 -- flatpak/content/io.gitlab.LibreWolf.json | 53 --- flatpak/content/shared-modules | 1 - librewolf.desktop | 340 ------------------ librewolf.install | 13 - prep-librewolf-dpkg.conf | 15 - prep-librewolf-dpkg.sh | 260 -------------- .../1_Install_Dependencies.sh | 0 .../2_Download_Source_Code.sh | 0 .../3_Configure_Source_Code.sh | 2 +- .../4_Build_Binary_Tarball.sh | 2 +- .../5_Configure_Binary_Tarball.sh | 2 +- trigger_pipeline.md | 43 --- 28 files changed, 5 insertions(+), 1725 deletions(-) delete mode 100644 PKGBUILD delete mode 100644 PKGBUILD_global_menubar delete mode 100755 appimage/build_appimage.sh delete mode 120000 appimage/content/.DirIcon delete mode 100755 appimage/content/AppRun delete mode 100644 appimage/content/io.gitlab.LibreWolf.desktop delete mode 100644 appimage/content/librewolf.png delete mode 100755 arch/01_build.sh delete mode 100755 build.sh rename binary_tarball/build_tarball.sh => build_tarball.sh (100%) rename {binary_tarball/content => content}/io.gitlab.LibreWolf.appdata.xml.in (100%) rename {binary_tarball/content => content}/launch_librewolf.sh (100%) rename {binary_tarball/content => content}/toggle-settings.sh (100%) delete mode 100755 flatpak/build_flatpak.sh delete mode 100644 flatpak/content/io.gitlab.LibreWolf.desktop delete mode 100644 flatpak/content/io.gitlab.LibreWolf.json delete mode 160000 flatpak/content/shared-modules delete mode 100644 librewolf.desktop delete mode 100644 librewolf.install delete mode 100644 prep-librewolf-dpkg.conf delete mode 100755 prep-librewolf-dpkg.sh rename {binary_tarball/scripts => scripts}/1_Install_Dependencies.sh (100%) rename {binary_tarball/scripts => scripts}/2_Download_Source_Code.sh (100%) rename {binary_tarball/scripts => scripts}/3_Configure_Source_Code.sh (98%) rename {binary_tarball/scripts => scripts}/4_Build_Binary_Tarball.sh (97%) rename {binary_tarball/scripts => scripts}/5_Configure_Binary_Tarball.sh (96%) delete mode 100644 trigger_pipeline.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d88540..179fc3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,22 +1,13 @@ stages: - build - - paks variables: GIT_SUBMODULE_STRATEGY: recursive # variables: - # TARBALL: $TARBALL - # ARCH: $ARCH - # FLATPAK: $FLATPAK - # APPIMAGE: $FLATPAK # pkgver: $PKGVER # pkgrel: $PKGREL # AARCH64: $AARCH64 # X86_64: $X86_64 - # download tarball if none available as artifact, - # ie. not built in the same pipeline run - # TARBALL_URL: $TARBALL_URL - # $RELEASE, to trigger deploy, maybe? .carch_aarch64: &carch_aarch64 variables: @@ -35,52 +26,6 @@ variables: paths: - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" -.arch_build_config: &arch_build_config - stage: build - script: - - ./arch/01_build.sh - artifacts: - name: "Librewolf-Arch-${pkgver}-${pkgrel}-${CARCH}" - paths: - - "librewolf-${pkgver}-${pkgrel}-${CARCH}.pkg.tar*" - -.flatpak_config: &flatpak_config - stage: paks - artifacts: - name: "Librewolf-${pkgver}-${pkgrel}-Flatpak-${CARCH}" - paths: - - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.flatpak" - - "${CI_PROJECT_DIR}/librewolf-${pkgver}-${pkgrel}.${CARCH}.flatpak-repo" - script: - - ./flatpak/build_flatpak.sh "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" "${CI_PROJECT_DIR}/librewolf-${pkgver}-${pkgrel}.${CARCH}.flatpak-repo" "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.flatpak" - -.appimage_config: &appimage_config - stage: paks - artifacts: - name: "Librewolf-${pkgver}-${pkgrel}-AppImage-${CARCH}" - paths: - - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.AppImage" - script: - - ./appimage/build_appimage.sh "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2" "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.AppImage" - -arch_x86_64: - image: archlinux/base - tags: [x86_64b] - <<: *carch_x86_64 - <<: *arch_build_config - only: - variables: - - $ARCH && $X86_64 - -arch_aarch64: - image: registry.gitlab.com/ohfp/manjaro-arm-docker - tags: [aarch64b] - <<: *carch_aarch64 - <<: *arch_build_config - only: - variables: - - $ARCH && $AARCH64 - tarball_x86_64: image: ubuntu:16.04 tags: [x86_64b] @@ -88,7 +33,7 @@ tarball_x86_64: <<: *tarball_build_config only: variables: - - $TARBALL && $X86_64 + - $X86_64 tarball_aarch64: image: arm64v8/ubuntu:16.04 @@ -97,49 +42,4 @@ tarball_aarch64: <<: *tarball_build_config only: variables: - - $TARBALL && $AARCH64 - -flatpak_x86_64: - image: ubuntu:16.04 - tags: [flat_runner] - cache: - paths: - - .flatpak-builder - key: flatpak_x86_64 - <<: *carch_x86_64 - <<: *flatpak_config - only: - variables: - - $FLATPAK && $X86_64 - -flatpak_aarch64: - image: arm64v8/ubuntu:16.04 - tags: [flat_runner_aarch64] - cache: - paths: - - .flatpak-builder - key: flatpak_aarch64 - <<: *carch_aarch64 - <<: *flatpak_config - only: - variables: - - $FLATPAK && $AARCH64 - -appimage_x86_64: - image: ubuntu:16.04 - tags: [x86_64b] - <<: *carch_x86_64 - <<: *appimage_config - only: - variables: - - $APPIMAGE && $X86_64 - -appimage_aarch64: - image: arm64v8/ubuntu:16.04 - tags: - - arm64 - <<: *carch_aarch64 - <<: *appimage_config - only: - variables: - - $APPIMAGE && $AARCH64 + - $AARCH64 diff --git a/PKGBUILD b/PKGBUILD deleted file mode 100644 index 00e15bf..0000000 --- a/PKGBUILD +++ /dev/null @@ -1,325 +0,0 @@ -# Maintainer: ohfp -# Contributor: Jan Alexander Steffens (heftig) -# Contributor: Ionut Biru -# Contributor: Jakub Schmidtke - -pkgname=librewolf -_pkgname=LibreWolf -# how to get ci vars instead? -pkgver=85.0.1 -pkgrel=1 -pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." -arch=(x86_64 aarch64) -license=(MPL GPL LGPL) -url="https://librewolf-community.gitlab.io/" -depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) -makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb - rust - autoconf2.13 clang llvm jack gtk2 nodejs cbindgen nasm - python-setuptools python-psutil python-zstandard git binutils lld) -optdepends=('networkmanager: Location detection via available WiFi networks' - 'libnotify: Notification integration' - 'pulseaudio: Audio support' - 'speech-dispatcher: Text-to-Speech' - 'hunspell-en_US: Spell checking, American English') -options=(!emptydirs !makeflags !strip) -_arch_svn=https://git.archlinux.org/svntogit/packages.git/plain/trunk -_settings_commit=3feb12464aa81df2f4ff162fce69890614c0ac8f -source_x86_64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz - $pkgname.desktop - "git+https://gitlab.com/${pkgname}-community/browser/common.git" - "git+https://gitlab.com/${pkgname}-community/settings.git" - "megabar.patch" - "remove_addons.patch" - "unity-menubar.patch") -source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz - $pkgname.desktop - "git+https://gitlab.com/${pkgname}-community/browser/common.git" - "git+https://gitlab.com/${pkgname}-community/settings.git" - "megabar.patch" - "remove_addons.patch" - "unity-menubar.patch" - arm.patch - https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch) - -sha256sums_x86_64=('e98f586aa4d58e7418da41a2d19cd30030d072f86edd24a3fd6f769284287cee' - '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' - 'SKIP' - 'SKIP' - '682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5' - 'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6' - 'ee302586f5291f809759f5eae3e5bad60b13007d9a9d37ac7f397597eb1d8665') -sha256sums_aarch64=('e98f586aa4d58e7418da41a2d19cd30030d072f86edd24a3fd6f769284287cee' - '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' - 'SKIP' - 'SKIP' - '682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5' - 'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6' - 'ee302586f5291f809759f5eae3e5bad60b13007d9a9d37ac7f397597eb1d8665' - '6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7' - '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') - -prepare() { - mkdir mozbuild - cd firefox-$pkgver - - cat >../mozconfig <>../mozconfig <>../mozconfig <.mozconfig ../mozconfig - <.mozconfig ../mozconfig - <.mozconfig ../mozconfig - <.mozconfig ../mozconfig - < -# Contributor: Ionut Biru -# Contributor: Jakub Schmidtke - -pkgname=librewolf -_pkgname=LibreWolf -# how to get ci vars instead? -pkgver=85.0 -pkgrel=1 -pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." -arch=(x86_64 aarch64) -license=(MPL GPL LGPL) -url="https://librewolf-community.gitlab.io/" -depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) -makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb - rust - autoconf2.13 clang llvm jack gtk2 nodejs cbindgen nasm - python-setuptools python-psutil python-zstandard git binutils lld) -optdepends=('networkmanager: Location detection via available WiFi networks' - 'libnotify: Notification integration' - 'pulseaudio: Audio support' - 'speech-dispatcher: Text-to-Speech' - 'hunspell-en_US: Spell checking, American English') -options=(!emptydirs !makeflags !strip) -_arch_svn=https://git.archlinux.org/svntogit/packages.git/plain/trunk -_settings_commit=640b375dc02c5b089f678ed16b0232d1c0cc0721 -source_x86_64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz - $pkgname.desktop - "git+https://gitlab.com/${pkgname}-community/browser/common.git" - "git+https://gitlab.com/${pkgname}-community/settings.git" - "megabar.patch" - "remove_addons.patch" - "unity-menubar.patch") -source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz - $pkgname.desktop - "git+https://gitlab.com/${pkgname}-community/browser/common.git" - "git+https://gitlab.com/${pkgname}-community/settings.git" - "megabar.patch" - "remove_addons.patch" - "unity-menubar.patch" - arm.patch - https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch) - -sha256sums_x86_64=('5f03712642f5e77de4581d2ba3ee3e87cfa44c3d2fdd8fe0fb56ea05a57f7b50' - '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' - 'SKIP' - 'SKIP' - '682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5' - 'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6' - 'ee302586f5291f809759f5eae3e5bad60b13007d9a9d37ac7f397597eb1d8665') -sha256sums_aarch64=('5f03712642f5e77de4581d2ba3ee3e87cfa44c3d2fdd8fe0fb56ea05a57f7b50' - '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' - 'SKIP' - 'SKIP' - '682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5' - 'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6' - 'ee302586f5291f809759f5eae3e5bad60b13007d9a9d37ac7f397597eb1d8665' - '6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7' - '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') - -prepare() { - mkdir mozbuild - cd firefox-$pkgver - - cat >../mozconfig <>../mozconfig <>../mozconfig <.mozconfig ../mozconfig - <.mozconfig ../mozconfig - <.mozconfig ../mozconfig - <.mozconfig ../mozconfig - <C`HyTAPJy_}P? z*(9@bXYQTZE8j+|tIA`clc56u04zlX8BG8H4)zfafQk$|7`c_%zz&G+Qi|HBu$Moo zRTS(T%|*e$9RL6h{P%`SWe1YOz9jXK)%VbHw(;;bce4g~dwX-(IXSpnn!8wYIJ?S;U4!!96Z!d5=1L>BXpHCG4LTVB2I|gPECYOkL^v( zpB;=1y&W8yoU1Wn48suztLL!@a3qtA*&1RTrI!1CoJ>6pC#C^t+wP`Bd8gg4{KfP9 zQAfM3vi;l-M0ste9w;Rh>PVT75!#9qzZD~e*eGPukI*UsLnvra6i_5)5CMw9iA~-q zIjBl^um0m3d8srkQksZY}_0rVB-giG&)I zh3yOqDImBf(g$0Kap8|HZN)%L!+^c~_|_O>f<%hqhzP-w5)lrKqJ zZ$|IvKaB41f73uHz8Rjz2BT?}D@eToUl>s9V=O=)*N9^jpLvbD#Do;f!i7MhMz$lQ zR^HH^8l$QqESi|#(sZ~`-}-$kYHZgpV#<7=Nrdo0`;$7ZQ_<>@BmzB z(j>^8J1{&*WIDJ@0ay?=7{>5-zqQrGq2U!EM5VgA;ov%>4`yr#b?{WpB-(Ea#*oM| zDAJ{DxP#@h+##TXt|UKks~17Sd1*h4#F{%f(qN!+jlHlY?gFC#q0A~oG?XO)&}Ec` zx6SIFv^K?ZQQ#o`EO7`x-%Ub&4YNvd(2}aU|#`A0c{E5bQ*pXOR(=1SbI1_O37r;;)G4*%#GK)YZH zBW(C9?FBaqWMMbj*@%3bar78)nu`0?h5nocGB<~DfwHIY8nzp3r9!8qio&JZOy9@e z8(pJNDyarM5sHy-?U!r{Q!5#n>g=B5~>3Bn>ty zaCm}ZHb)eKA6aLLl`hwd&-9qeZAtSMn=jSCk%H?6tu0~|{c=`=zV zy@D&zsQBt+kDd`#+J}i~Z3c;1Xp{~4Dgj?iuro_5YqLE@locJHjr}MgKQvj`!l}I= z6~^Z~PWoNsKTg1VA_bkQIoSwYc?5DU!TS5FIL0Aou=zJYHIY39`KE@+AbO02h{fFn z@`r516*OVDqol}fby(;dVSa1wU#sSFz^K~XS>>5t0Y1kjZG)B~4snc7XiDr7LK}B ziJptVl2Q%!PP&H8D2KciM5x+Ko7^)EdxM(ZwR;_SRug)+*#AqVrkcA?6tRC4U%Xv_ zfhy!CgFSIQ_%8UiMny42m()epueIT$2k3B>EU3-{rL&uCs3ycZxFhm(n2aua5|w+p ziMAe(0)@*YHzXhD%kFB5k0P#%rh6+B@su-`og!g9*Z9Bp=hKAeL-s7d(qvO^+)Gkg zrZxcvqL3{B`W~Z#37r|w+WRBO4dqrlJ+w~Um4+i`e5*v~{904Lp}&dWRVxOHemRg; zgH?|8CIW^RBD+U{i@ClVi7<>08()>|>eW9{E5u_0fq(v}fSQAWcx*UEpK^U5O|<-5 z&M?7D5}?kAR+rdzKyR;LEyMelI4q`3$8Z#){(+`oS42EW?FfF5D`=$P{OrJ^vy&3i zUo#mM4yUqpXKe1nzVu@ri^wT*_(!jUxP&Z@XfV{|av-2)vJ4m`48FL8L-cMFC=&R} zAJWlYVcCiE^llZ{V+^3K@&+j?uT3ksCOFUo2ZDh460cPEMGn07g<1$cRm|B-s|n6# z>pNYZW4P})yg-WYQBN7vM0ZzXEAEf43|X9IE>j$MfwDH}Yb%6K#}vqS&vI>HLGL0v zh#<{8ON;YhsKDg_K1_@OabUi>N%XGlvy~R%lpT`VjRtE6?W^?*RcknGLzYVtA*M<$BXgy z`if)-f@+Q~uC5<|P~!|mv^@A>p|(JNtDlf>FEnQ^-U82cp9mqHEhg)G2uZtm2=GmG zt#xr@87?JO48c7dI`R?Lfyrk$6E@7!Mu%w2-Tyaj-GAx1ghzIPJl~Y z0$)H+Ovyriz4C@QP7Um#*^-X+6m!w ztrkWyrAQcw7vcAsQMd(W0)Y5vdgyFX|@Rdgs5vgzB>HMUJnO!^E_ z&YK-SAzc}HpOE?rc6wEfx!%QKF|wUpH&J(X$QjG$6Qoif70jo0S*%kD29Uj5-e2dp zuwoAp+eMpJ%Ib6n9Cg0oo0ZuvMFl5C_LC3$ru`sGWm|go#t2QTCf074gKkl|fNH!i zg5Q^nq4_rrW?k%@{_Ux2!i-SSS;+!s$m71W>5>>bWcG+VZMO(!KTBs;g7b*K z2kqMkK7Mz(d`h}olHOEFsT-Zw$`Fg7$5e1^DX65t0nETzd#CEO{GYum_MI>lfS!60G()L%8=9A zK7|CW9=+hovX5(GPU)=QA5x;6Wep(l1lX^KU&JZuF4h2zIjE-MRe81?uJgl8x$>Gi zdh6`GnT_bEVFR~DxBTqH2&^rg*(}Y~rE#Tq|H@oI5++`u-_rju4z4fL?Dsss};0okjn@C9sip7eV>5KnTE}9 zY-oSfxgS2l-&z2=m7bXxaO#=!3s(4WR-6^ba_Lk+01FLiA!O@jYX@RO|A0qG?&iU! ztrV6Ui}T3?nY$kTo)^gUmV{+C!EM9*wqyw1Er%@;xy64Gw0RKG&`M!A(M`Qn4iTCh zbgDT@nQ1tJG4tMxcDaF1x)pfWT;*#|D{{^uaQsqDZVj)@Hc&z-c-J-O8}r!aQ+oB^yf)H^APw)PhY-~{51(V7bf1t}@8><- z$iRR5nyCvP`px>(TO!W=#oc!XM?-~&L!w2%QgU!z_Ei5C7ujrs8lM@kR@JCJ*adHIV!)TEZV_ z25$?ei%+BGP#+Yg7g=8kb*=6!$01%@L)#Fct?x|m$?OuV)4#FfgV?=?CO6v*#f0V( zxY&!TMY$vO*6w`mWFlofSElB*oMh2FDUc44mP7AcHLV8V6TWrQ08wZ(GO<5lE?|lN z{)B{FO}Cv@R4)QXYxwX(RxD_4MR{(d+S-28bo=Lz8Cw2XVFWP|Tn^CB52`&w7pbRC z?4h{46NpHLHoa%@ zeSuFV3VwBsZ~P*%#-;bR3TW}tlys~tc5$e}j+=z3>OF0}`;g3or8lAS@4fI;u2cCJ zSE+w4Djfbi%Z@tGziuO#}iZn*eX%CeXBLSTZLK8r!q1jhve&9t)^ zouwt5x9@Go&wMXNy`|| z#wdmb!mltXo?gz}On-TzmxpgvYjdmB%54}+%hPq6#c75uTKlk{k!Mj!*fMdoHlr+@ z0uYPh((&no{?$<18MUCCezqFO#z|1XJ*pAB@G0pyW6a_=v|AG-j=>~|H84dQSv_!? z1e%3R1P^?|+Oc-w6aaP=;_upMA{r%HVAES zzLAC;1j)Ng*T>SZO=AU}R%|EytgN-~pcdX{UxUMos%8wj6~ZPGTFV-v0RIsb#4E}M~Fs7tvkU1aX~!haGYlR#5H>L}u#kH>$tOp)p5 zG3~*@b+MG!=fYIwUaMy{5!)=b>Uo`~+{fb8G6bBTd$Vm6_a7RGFw+1Oka;z9vy8R6 z5Te{pX@hLjwSaSHe+0ZzAEhH(OWYB3Aa~l--rg@2+8Zy^&eeEvr9ch&g!aCi&9fPC zyQ4(A{Sgs4x)k2dM^o)cD5lzExzxLM5WfcP*6;Jvvy^{)KE=!v;yOB)4{&ImEvoA` z39Emk={^=FyZ*?5syGNY$X+L$+M{oKsZO-Rh>U}tV(uP`~ z`XqtJr@%ZDo1q^#B(p}Ono)7DSJx`wy2M6}_9!?+7&pSvXs39Z!ptJ{m2;om}C zd4g=gf#0WV=R0hs<=A}eku%#=7UW^{4VN zu;DMt?)SQzoSSGTNButRe=TlV)MzH}+6cemc?FPHPAIN7?4{#iA~NZ|ez?gu{d|6C z+pKM09o^uC?f?8;$S*l#?cD;0pH+x=28OL}p6VYCd?qZ9S=2eLF}(Zdpk~GBnM2eJ zlbO#sZ2D$BSC5i4LU13P z*Z5bEI+;#oj!(2wdRZG*UAn+}0{7*c@q!piqEt}t6NJ-7A^%&n5-X?5j!#k4-PIG>%m_KUryM6PG z0T)bev9jmkedzqfb8+xP?xqPvwYdfBQ0GC#-c$TK8IlP!n?>gJLQMJW!e_$LR@=PPB)$r0Ov83@gT}&5_+&r1o?( z&*4+F@alYlovl&Y_ z%i5mb7@)RqSemKNE8(Dp*^k-Br@r>(D=C-LAO3m@3Afi1q5xR05xc9`7Cc*A6i;r| z=DtlVn`iw(eJkp?H=_^tZk4Lj z%QT0)jO@v3JRO6_y`@j(s&kytpa}<29P_XLEvfY_KoXz_2zM|tRBy>>B~s0)m^uIz8ZPBIRQi5l zYr|#89BixqZA3r$#a76%jy}gR#a6HP7L3I4J-m-U@vbB}zH!oil8L`P?vq7nh%PRo z?q{JxD?kl4bQi_b{vy)Z*ihr{ej2&e>PJUm{bb3-4Y6QiKfj3eU~Ikt;tat-OdJsz z(5ydqm3l`n*918)e0Fa!y%|kzLVdxP<9D0g-trN}yOC&`cS3-;ow^%1m_L9fo=4e9 z5kb>nPn<1|;3cGgOFg0+*BZ)?0uaJ2+zE|+aA{(h zPp`X(gQRe}I>JEZ(43y)3Zo`y>JsSK)Sp-*9dWzRDc5GvYL zw5s{glD3F?g*w>gA3S+_OK^uZnE{>|TyUi}r$?D`WRu5q zG4z5_H;gAPsbHn9X<0Q;S`qQQb6EgK5tm4)6wPR3s)-P?^+Z{bB%e5QvTRhPp-O?m zh}-Kv7+`EH@JaaZV(S@8*X3dR(A$J((aF!yc!VgWR95@oN!V1!UQ_OU{o5&QFBMqi zYzd2a{u2a3cFzS4*IFU_P<^tun4B#j3t;C#C+DZb5)LU0+?lE|x17;m(EzrPIc?Z| z>*sU&OnyS?P9&SSQ40VB&PMSud_y=~#Nnu;>&vAOZNv2MM9j6)3X94i z>{TN(d2c|`dt%(z6;$=FT>YdYREZqR&e?%&88_x12+o5-0&f8D*|v8OWNe5_VPZmP z#JwB^uED|&>K-Pm$MX^H5tz;LsEA|4^}pOsFSe?9rRQM!^|YrU-mr9^^b zE7KB82j+gH%BVhidqsS=Z~2?Xf=mp@txEsO*HXWlST+^N)H;011N^VWoaleLR8{QD z5`QdeN&_PBeFeR={?R0>Q#X7YOW0S!NZU1x(~-Dy{6bM@eI5ESq|4J4(n@V?m@lu| zzJb>3Z>S_MwSGGQ%<Ejz@d_Jh*>8#oA&R|pc4y=TNqw#i;Nt$(& zE6xI72S=2vbJ0}YsD-sGwKq%TNoIa1ujM;Xn24$X=A*q0hVU(SR)2+yx6FDBvWOEx zjz_od-Y#XR5N1Ki_{Vp+$#8Mt%%QW2LbNQMa#k=4m(4H+H_b>q#^_(ZwKYrcVvpf| zo4#MFn&{mMv%Aq>DvL5)qC2rfUsrNXotm|g-|5SAmw^L*0%+2mcUIe9&ZjQz-Uqxf zo$ISD=_00CeMu7NOx?J$UHSal=v;H=4$u&B1>ggFogqy_cIW%9<~2RQJmk)gpJQfv zgjDK1;WZf#O>gK$=7ySVoqpq^fl}dK_-+kM&aGh4h#Sl%lJsK({RVm|QV|kaM8?e{ zQrnFrF0J=ko+u=U8tZUS*9?F#Z|X1{G_h(a%|>D8rH+;+!E9SGTPK^o*Q`%OeYqka7W0NnQfSOBg3gYTTT>=*Fk^kb}Qf4DQPkN`-;M2 z2wP__@+&<~JoqUQc_?&Xa^a)6dW)ZfJ3aRMw-BHN&u9drMtO>6x5vjAn*zIw9HO(8(c|i2 zXxGsfw$XoFc{3c9bmF-64I#*<4q=42M1ko~-Iqbt^r{SmKy&iLM7yEfRiC;@@k{LF zIGP&3*AF4)k$>YZ7KlD3WeYx}I}A!5ykCgq49ful4%vH4WuYH(;?gzgnFX$#X*Fli z3K8y8gFD_D$6@`1+8=n_0BOcVz^TiQTV#w#CHZ(v|83h zN9smSI&WMt(5|CEjV_o}4mc=h#GPi|NS&{t8zeV$8%Jk3o5K2E!z7Cs%z)6~)5p}j z+Ny?%pmS2+!qw2bOp_tOgjk^{=CmVDgxa&iNj4gtvaX;gZ$w3uI(Y%3Lf^Zz-p#6! z^H=f6?D0r10AVaj70WNqbvS1`CTXkE-k0^sWv$fTZA!bm10o^6;C=Et0%`8MJkL!H z%X`!%!_Xoh_X;Q_y7jS@Z~6+4e6B@axN971MSro9mG-T#Ps9;xev~wTqnMK!?K-{; zn;iO?tafK}ulorkLhA4bT-)4hn<*c{3Qxt&GVbX|{K8h7xQZ5nfYbZE>-t!{Ti{$M z;Tx*+;`4E4kO;7DvHH25@zFASLDTxn-&yYQ2@N%c6GU^2^Tyl9{X`re0iFQT$H$QZU=H&fvTM5 zM{GFpgc5b>55g{AhcoK6>ixXD{c>Y-tI#9HQxAqx8bkM0AD6JBbFdZ#GA`U5wLI~P z$J4TOj(NYmGiR8y_fyAY2hau+tLPK3w{XtirP$&6bms{VCxmOm1)UPwJg?Zu3sqf} zBfx6$#7}>zpA@0Z4?oUclMimE*2$vZ=ds3dgZZ~gGqQAI>Ntk^b&{S}1?e!vs3^Ry zJR#c_wi0OqFZ$j5u=?x2GekVyz#5zNH>rg=hVbc;7lN3^Qz2kl~_)E5qo{`bHEb6!`b*#Mkgig6ix>xG@FO_wZP-ztU36iSvTZ%DHBCFRCT?%c>~M-C(uHc?v^T{dDi>9 z$!a^kQgk|#YE0)8?_X`5>Y8?>Z*6ahS_5kw*l!P(OSy(-x`PZ!jqX%V5_sdGN&4}x z6?m}y^pedi-;2{r_awxxyUBMDr*_#0oxUgRqb~ZS%Lf@6P z?VCSti=m40@)ulZz!m;irw~}VD^1!mlH8b)#&(~(*$Hw?wj#EOk zl1WAmkYI>Z@1uu*0Dos8D;=3d-huAD?ccmq^fPSjoD$`WSvF4#Yf6Zt+@)%vn%Wv1 zDs9r*kMk>jn791y&)@Aa+UUBU@Kn#W4(tRgc3gJ(D{g0lgD&4IQ_G>=7jmzah0IQ( zO8)SjmHcw>1Zn*xjUlv*goU~whXD19B?e=pXJwWr?S>}Iskgq00dE~9E-C+FUT|r< zP-0&-*i$hwBWsI{*tVM1^=e*oiKvX=e3V)0jcI=E()o9W4WTsK=dfZ%rp-NR?A|?O7flWwR6rGg0!SQs z0e^4VzWes<`HP@I+>#Q-v4bznPI^-A32s9lBsV5T%RtVuWsWbM;R-m2wqWokgXQ%L z@i^X;O41_kza^I~yn3T>7Yq4wYg<2NSdGcuKR8B8G2sUGTlXoLn)3nyW(=Hgsxczo zI=w=sVay1DJB@Ltcr6^xKc^nDO0y`vHv|NOBIdOBM`NKnTA>;404aq+BLu;Wh~wMd zx@nyT^(gWCUPvjIY}u_b=iQPs)R%_ct1n|tyFP*5E2-~Gj%5!5_Y=|HH$sjhL^gvq z4Aq>Ypp3umee&GVni)kp$o_mJr$_ds6}4>SpP;dJ@kq)@-e*|t9^zQy5;_@cR-VJWHbQQ|}xW3|Q%II!4W~zd1zww`k7VJ=0 zM(0m+)dIuDKZ6bYplzCoMoR9 zAd!2IJld5TOG)1-(0@LICTLk6-m!Nf#AQpew*31!nK}h^(qPVfl?fX;0R=)$LMy7V zeK`aNc(-kC)?m9c+l3~!2{lsJ=P>wB9*o8g%Ix2&_GTUz*{^*mE2 z<3jn+H)o{e{NK=604BH3!cBE9BA5>o(Yl5?R&fP)59g2Pj;84WF-MC#j4++fOb56g zp!md#Zux%TID<9gUV@u)xcl)B4AC-6N@5sG%$#}u21+f+Y~m22tQoy=YBL?(wh#>D znOHwM@wBkw&~R#YrA^peWFr{6Rj@%oE+N4y(jbc!QO%)@Ot-Za;!96ocK@>&x#<;L zDN=UYDUhyFeETf>IzqXkoMJgbj7+w(5T8Q`6Ifq1>>J!c$jqNHZHr;?A05pMLW;%2 z8{pFOq58UinD=?{w@hz6y8WzL0lW`IGOhEAyC_*OlMcHd2~Ypxneyp=kK%s8zwF#0 z=m?DG@DgN$ZuFa~TNKSE82$HA- zc0BS_W8jIs&!u1L-i>|GmosyZHjWF=_Xh3=nSDBx&_V&FqG^F~Z>d-1&D2CFeO})wX7a`|JBdsD#6vBgulC$|DEX`Z7`l<->IM zt#MFv?aH8f4bCFF-MSzE?AjoNYXhLnSy9JIYYF}N)Y`_&i124T|3U-@mrdvH-w&5S zhr=V6+0cs39(Ua5J-IsrE*X8k%?y zijRujD3YYXc5IFou!TiG07CTc4mydaj_>#E*&w)cOEfXv|qU zr;b5KBtDr;_KXpy07wKslb+KxCooxB`LN#`QXk^v65MCzDWzy$W3cfuQPWU=Q=yYnuslmt~0OL$d)A~X;%O#2v9ti0Nzt_Z-4VVG} z`4SuG&nr!&{J%@Zo(ssI3q$XOj%b^%HiTP!bA>nWgnBHC>jD=|@n4_siAJ8l9mZK2 zDb5@=)q$v8F}Y|z<1AO2R}TPSXYT~{DMKTgiwlM7)V%qx z73|LDNH2O#`8+&2>MOO@ui)C_Kwr_{^PdbRD59Zi2%#vmwb3!yMzaEIWIm8#amdHb z3ilTWOo=_0+vfJF1E#+m zQu6OuJWC^TP5f7HfO-Zq7ZKOm;i%!~`A~8Z$U@uEQ{u8g7rBX1dHfap@<}-z#$ zpf=77W;jwpI6mZxP_I>1DgLVeFgyoPw>4~wru`2TJV5txh+|s;QiQyhA%(DT4>qyZ z<4~XgxKzF9`cQh4{)7JZZ=kcy6%@^BTY)!{)~C8YSMol-sXL2?k5zyvw~Rm3oDeqv zpmyA*_)36lrir!v+OaquXBvd`l7)PckVK+U9)G&=83TV2ar?R33$amQ&qz-vAR2FC zdaZ-!`^U~0DEv}sdZA9lY^V57!fZGFOC)UXl>TeF^j4w`6Y_hJmtca^g)?lUUv%j} zfP|7HT#xKIv%kJfv9wK$<|OI7@*W9AUQzoNVsy22Mdj2%mbUrSk|BKi&sx&|#U`2W zV#*vW@n~Ct`N>kgc*#LSWB?ek83MBR6%Wed z{N$pdiD)#Ya6$bavFVQj_z(LL3YQ34DqW_dqxpc}Zr!hewa`P!Q=ll!rxICeSK*_W zW=yEW?QI$TxC%ogdMpmQ74xjdAN13uQ$(|lx=fNNfPj=KGxTYiwy`GGKp01t4GA6- zjhmCuei+vq2_W?7U`w&6Nio-2kUpmvTpQ4#V_h@36a*`wTTz{><(I>7-{crjFDEJM zh6^Z4F?kwJV(*99JFfXAR$4`f6{21ubD#$($}X9g`NY3IQ&bh%3GSH@K#9jNmb5l3 z6~VZ(8);<>r(GgJg(Zr8?Fmv+$iL4-)#H_#a0f-DF&v=hv(XPyxCsKA$j*PtSViS6 z$L#_OF%@n{u|3U^)KjH=5j9?eq1sEOVfQ!?Thto!F#YXS0>kzT3{O=ZSO|5x55i1x;Egm zibnlE&P>I+)`w(~;UH~W7_3jqjDox61$FGZo19igp`uN=>njO738UWiVNLA9 zc_tf`MN}>ojb=sKp!p9DNBTcFTp?x23ZI80d{-_%(!u?RmQVxYR6|eV`A%qY#s;^Mf@Jc6FsSX@EKPr=`)Oc zukqEf(aN)o=0Sx>nBgRDt-ecOk>|o5^L^B~=-%a{ZMwq{c}GKq_hCSq!`LKJzG8%AqkP6h=`h&S5O6|%J(++E0BS=p z0fU`HXjjoc33X&`nw9Q5+Ya#iG9rE1UO5I?ndLCEj~cp~6Ju6(i5hwj;>Qb{EXk1C SL)c><07Y3R(u diff --git a/arch/01_build.sh b/arch/01_build.sh deleted file mode 100755 index 3ddab39..0000000 --- a/arch/01_build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -PKGBUILD_NAME=${PKGBUILD_NAME:-'PKGBUILD'} -pacman --noconfirm -Syu --needed base-devel -# this is a very ugly fix for recent makepkg-5.1-chmod-shenanigans, which mess up the build process in docker -sed -E -i 's/^chmod a-s \"\$BUILDDIR\"$/# chmod a-s \"\$BUILDDIR\"/' `which makepkg` -echo 'nobody ALL=(ALL) NOPASSWD: /usr/bin/pacman' >> /etc/sudoers -mkdir -p /home/nobody && chown -R nobody /home/nobody -usermod -d /home/nobody nobody -# we need to un-expire the account, otherwise PAM will complain -usermod -e '' nobody -chown -R nobody . -if [[ ! -z "${GLOBAL_MENUBAR}" ]];then - PKGBUILD_NAME='PKGBUILD_global_menubar' -fi -# makepkg will not run as root -sudo -u nobody -E -H makepkg --noconfirm --nosign --syncdeps --cleanbuild -p "${PKGBUILD_NAME}" diff --git a/build.sh b/build.sh deleted file mode 100755 index e1abd79..0000000 --- a/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -printf "\n------------------------------------- SCRIPT SETUP ------------------------------------------\n"; - -# Aborts the script upon any faliure -set -e; - -# Sets up script variables -SCRIPT_FOLDER=$(realpath $(dirname $0)); -BINARY_TARBALL=$SCRIPT_FOLDER/LibreWolf.tar.bz2; -APPIMAGE_FILE=$SCRIPT_FOLDER/LibreWolf.AppImage; -FLATPAK_REPO=$SCRIPT_FOLDER/librewolf-flatpak-repo; -FLATPAK_BUNDLE=$SCRIPT_FOLDER/LibreWolf.flatpak; - -$SCRIPT_FOLDER/binary_tarball/build_tarball.sh $BINARY_TARBALL; -$SCRIPT_FOLDER/appimage/build_appimage.sh $BINARY_TARBALL $APPIMAGE_FILE; -$SCRIPT_FOLDER/flatpak/build_flatpak.sh $BINARY_TARBALL $FLATPAK_REPO $FLATPAK_BUNDLE; diff --git a/binary_tarball/build_tarball.sh b/build_tarball.sh similarity index 100% rename from binary_tarball/build_tarball.sh rename to build_tarball.sh diff --git a/binary_tarball/content/io.gitlab.LibreWolf.appdata.xml.in b/content/io.gitlab.LibreWolf.appdata.xml.in similarity index 100% rename from binary_tarball/content/io.gitlab.LibreWolf.appdata.xml.in rename to content/io.gitlab.LibreWolf.appdata.xml.in diff --git a/binary_tarball/content/launch_librewolf.sh b/content/launch_librewolf.sh similarity index 100% rename from binary_tarball/content/launch_librewolf.sh rename to content/launch_librewolf.sh diff --git a/binary_tarball/content/toggle-settings.sh b/content/toggle-settings.sh similarity index 100% rename from binary_tarball/content/toggle-settings.sh rename to content/toggle-settings.sh diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh deleted file mode 100755 index a1f0318..0000000 --- a/flatpak/build_flatpak.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -printf "\n\n---------------------------------------- FLATPAK BUILD --------------------------------------------\n"; - -# Aborts the script upon any faliure -set -e; - -# Setup Script Variables -BINARY_TARBALL=$1; -FLATPAK_REPO=$2; -FLATPAK_BUNDLE=$3; -_SCRIPT_FOLDER=$(realpath $(dirname $0)); -_FLATHUB_REPO="flathub https://flathub.org/repo/flathub.flatpakrepo"; -_FLATHUB_PACKAGES_TO_INSTALL="org.gnome.Platform/${CARCH}/3.38 org.gnome.Sdk/${CARCH}/3.38 org.freedesktop.Platform//19.08 org.freedesktop.Sdk//19.08"; -_EXTRACTED_BINARY_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf -_FLATPAK_JSON_FILE=$_SCRIPT_FOLDER/content/io.gitlab.LibreWolf.json; -_FLATPAK_BUILD_SOURCE_FOLDER=$_SCRIPT_FOLDER/source; -_FLATPAK_BUILD_FOLDER=build-dir; - - -if [[ ! -z "${TARBALL_URL}" ]];then - apt update && apt install -y wget - wget "${TARBALL_URL}" -fi - -if [[ ! -f "${BINARY_TARBALL}" ]];then - echo "Tarball not provided via pipeline or download." - exit 1 -fi - -# Install build dependencies -printf "\nInstalling flatpak build dependencies\n"; - -# we're using a pre-prepared flatpak-image witch aarch64 -apt update && apt install -y software-properties-common -add-apt-repository -y ppa:alexlarsson/flatpak -apt update && apt install -y flatpak-builder bzip2 -flatpak remote-add --if-not-exists $_FLATHUB_REPO; -flatpak install -y flathub $_FLATHUB_PACKAGES_TO_INSTALL; - -# Extracts the binary tarball -printf "\nExtracting librewolf binary tarball\n"; -mkdir -p $_EXTRACTED_BINARY_TARBALL_FOLDER; -tar -xvf $BINARY_TARBALL -C $_EXTRACTED_BINARY_TARBALL_FOLDER; - -# Prepare for flatpak build -printf "\nPreparing files for flatpak build\n"; -mkdir -p $_FLATPAK_BUILD_SOURCE_FOLDER; -mv $_EXTRACTED_BINARY_TARBALL_FOLDER $_FLATPAK_BUILD_SOURCE_FOLDER; - -# Build Repo -printf "\nBuilding flatpak repository\n"; -cp "$_FLATPAK_JSON_FILE" ./; - -# add appstream metadata -# TODO: firefox uses files/share/appdata/ in their flatpak, but https://docs.flatpak.org/en/latest/conventions.html says otherwise. which is "more" correct? => using both for now, just in case... -install -Dvm644 "$_FLATPAK_BUILD_SOURCE_FOLDER/librewolf/io.gitlab.LibreWolf.appdata.xml" "$_SCRIPT_FOLDER/source/share/metainfo/io.gitlab.LibreWolf.appdata.xml" -install -Dvm644 "$_FLATPAK_BUILD_SOURCE_FOLDER/librewolf/io.gitlab.LibreWolf.appdata.xml" "$_SCRIPT_FOLDER/source/share/appdata/LibreWolf.appdata.xml" - -install -Dvm644 "$_SCRIPT_FOLDER/content/io.gitlab.LibreWolf.desktop" "$_SCRIPT_FOLDER/source/share/applications/LibreWolf.desktop" - -install -Dvm644 "$_FLATPAK_BUILD_SOURCE_FOLDER/librewolf/browser/chrome/icons/default/default128.png" "$_SCRIPT_FOLDER/source/share/icons/hicolor/128x128/apps/io.gitlab.LibreWolf.png" - -flatpak-builder --disable-rofiles-fuse --repo="$FLATPAK_REPO" "$_FLATPAK_BUILD_FOLDER" io.gitlab.LibreWolf.json; - -# Build bundle -printf "\nBuilding flatpak bundle\n"; -flatpak build-bundle $FLATPAK_REPO $FLATPAK_BUNDLE io.gitlab.LibreWolf master; - -# Clean up flatpak files -printf "\nCleaning up flatpak related files\n"; -rm -rf $_FLATPAK_BUILD_FOLDER; -rm -rf $_FLATPAK_BUILD_SOURCE_FOLDER; -# keep it cached -# rm -rf ./.flatpak-builder; - -# Delete the extracted binary tarball folder -printf "\nDeleting extracted binary tarball folder\n"; -rm -rf $_EXTRACTED_BINARY_TARBALL_FOLDER; diff --git a/flatpak/content/io.gitlab.LibreWolf.desktop b/flatpak/content/io.gitlab.LibreWolf.desktop deleted file mode 100644 index d55cf7d..0000000 --- a/flatpak/content/io.gitlab.LibreWolf.desktop +++ /dev/null @@ -1,25 +0,0 @@ -[Desktop Entry] -Name=LibreWolf -Exec=librewolf %u -Icon=io.gitlab.LibreWolf -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json; -StartupWMClass=LibreWolf -Categories=Network;WebBrowser; -StartupNotify=true -Terminal=false -X-MultipleArgs=false -Keywords=Internet;WWW;Browser;Web;Explorer; -Actions=new-window;new-private-window;profilemanager; - -[Desktop Action new-window] -Name=Open a New Window -Exec=librewolf %u - -[Desktop Action new-private-window] -Name=Open a New Private Window -Exec=librewolf --private-window %u - -[Desktop Action profilemanager] -Name=Open the Profile Manager -Exec=librewolf --ProfileManager %u diff --git a/flatpak/content/io.gitlab.LibreWolf.json b/flatpak/content/io.gitlab.LibreWolf.json deleted file mode 100644 index 2871030..0000000 --- a/flatpak/content/io.gitlab.LibreWolf.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "app-id": "io.gitlab.LibreWolf", - "runtime": "org.gnome.Platform", - "runtime-version": "3.38", - "sdk": "org.gnome.Sdk", - "command": "librewolf", - "rename-desktop-file": "LibreWolf.desktop", - "rename-appdata-file": "LibreWolf.appdata.xml", - "rename-icon": "io.gitlab.LibreWolf", - "modules": [ - "flatpak/content/shared-modules/dbus-glib/dbus-glib-0.110.json", - { - "name": "librewolf", - "buildsystem": "simple", - "build-commands": [ - "mkdir -p /app/share && mv librewolf -t /app/share", - "mv share/appdata /app/share", - "mv share/applications /app/share", - "mv share/icons /app/share", - "mv share/metainfo /app/share", - "mkdir -p /app/bin && ln -s /app/share/librewolf/librewolf /app/bin/" - ], - "sources": [ - { - "type": "dir", - "path": "flatpak/source" - } - ] - } - ], - "finish-args": [ - "--share=ipc", - "--socket=wayland", - "--socket=fallback-x11", - "--socket=pcsc", - "--socket=pulseaudio", - "--persist=.librewolf", - "--persist=.mozilla", - "--filesystem=xdg-download:rw", - "--device=dri", - "--filesystem=~/.config/dconf:ro", - "--env=DCONF_USER_CONFIG_DIR=.config/dconf", - "--talk-name=org.freedesktop.FileManager1", - "--system-talk-name=org.freedesktop.NetworkManager", - "--talk-name=org.a11y.Bus", - "--talk-name=org.gnome.SessionManager", - "--talk-name=org.freedesktop.ScreenSaver", - "--talk-name=org.gtk.vfs.*", - "--socket=session-bus", - "--env=MOZ_ENABLE_WAYLAND=1", - "--share=network" - ] -} diff --git a/flatpak/content/shared-modules b/flatpak/content/shared-modules deleted file mode 160000 index 8ce6437..0000000 --- a/flatpak/content/shared-modules +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8ce6437c269ef28c49984c11246d27be433c21d5 diff --git a/librewolf.desktop b/librewolf.desktop deleted file mode 100644 index ccc5795..0000000 --- a/librewolf.desktop +++ /dev/null @@ -1,340 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=LibreWolf -GenericName=Web Browser -GenericName[ar]=متصفح ويب -GenericName[ast]=Restolador Web -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[ca]=Navegador web -GenericName[cs]=Webový prohlížeč -GenericName[da]=Webbrowser -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής διαδικτύου -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fa]=مرورگر اینترنتی -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[gl]=Navegador Web -GenericName[he]=דפדפן אינטרנט -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[it]=Browser web -GenericName[ja]=ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[ku]=Geroka torê -GenericName[lt]=Interneto naršyklė -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=Internetový prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcı -GenericName[ug]=توركۆرگۈ -GenericName[uk]=Веб-браузер -GenericName[vi]=Trình duyệt Web -GenericName[zh_CN]=网络浏览器 -GenericName[zh_TW]=網路瀏覽器 -Comment=Browse the World Wide Web -Comment[ar]=تصفح الشبكة العنكبوتية العالمية -Comment[ast]=Restola pela Rede -Comment[bn]=ইন্টারনেট ব্রাউজ করুন -Comment[ca]=Navegueu per el web -Comment[cs]=Prohlížení stránek World Wide Webu -Comment[da]=Surf på internettet -Comment[de]=Im Internet surfen -Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) -Comment[es]=Navegue por la web -Comment[et]=Lehitse veebi -Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید -Comment[fi]=Selaa Internetin WWW-sivuja -Comment[fr]=Naviguer sur le Web -Comment[gl]=Navegar pola rede -Comment[he]=גלישה ברחבי האינטרנט -Comment[hr]=Pretražite web -Comment[hu]=A világháló böngészése -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[ku]=Li torê bigere -Comment[lt]=Naršykite internete -Comment[nb]=Surf på nettet -Comment[nl]=Verken het internet -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegue na Internet -Comment[pt_BR]=Navegue na Internet -Comment[ro]=Navigați pe Internet -Comment[ru]=Доступ в Интернет -Comment[sk]=Prehliadanie internetu -Comment[sl]=Brskajte po spletu -Comment[sv]=Surfa på webben -Comment[tr]=İnternet'te Gezinin -Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ -Comment[uk]=Перегляд сторінок Інтернету -Comment[vi]=Để duyệt các trang web -Comment[zh_CN]=浏览互联网 -Comment[zh_TW]=瀏覽網際網路 -Keywords=Internet;WWW;Browser;Web;Explorer -Keywords[ar]=انترنت;إنترنت;متصفح;ويب;وب -Keywords[ast]=Internet;WWW;Restolador;Web;Esplorador -Keywords[ca]=Internet;WWW;Navegador;Web;Explorador;Explorer -Keywords[cs]=Internet;WWW;Prohlížeč;Web;Explorer -Keywords[da]=Internet;Internettet;WWW;Browser;Browse;Web;Surf;Nettet -Keywords[de]=Internet;WWW;Browser;Web;Explorer;Webseite;Site;surfen;online;browsen -Keywords[el]=Internet;WWW;Browser;Web;Explorer;Διαδίκτυο;Περιηγητής;LibreWolf;Φιρεφοχ;Ιντερνετ -Keywords[es]=Explorador;Internet;WWW -Keywords[fi]=Internet;WWW;Browser;Web;Explorer;selain;Internet-selain;internetselain;verkkoselain;netti;surffaa -Keywords[fr]=Internet;WWW;Browser;Web;Explorer;Fureteur;Surfer;Navigateur -Keywords[he]=דפדפן;אינטרנט;רשת;אתרים;אתר;פיירפוקס;מוזילה; -Keywords[hr]=Internet;WWW;preglednik;Web -Keywords[hu]=Internet;WWW;Böngésző;Web;Háló;Net;Explorer -Keywords[it]=Internet;WWW;Browser;Web;Navigatore -Keywords[is]=Internet;WWW;Vafri;Vefur;Netvafri;Flakk -Keywords[ja]=Internet;WWW;Web;インターネット;ブラウザ;ウェブ;エクスプローラ -Keywords[nb]=Internett;WWW;Nettleser;Explorer;Web;Browser;Nettside -Keywords[nl]=Internet;WWW;Browser;Web;Explorer;Verkenner;Website;Surfen;Online -Keywords[pt]=Internet;WWW;Browser;Web;Explorador;Navegador -Keywords[pt_BR]=Internet;WWW;Browser;Web;Explorador;Navegador -Keywords[ru]=Internet;WWW;Browser;Web;Explorer;интернет;браузер;веб;файрфокс;огнелис -Keywords[sk]=Internet;WWW;Prehliadač;Web;Explorer -Keywords[sl]=Internet;WWW;Browser;Web;Explorer;Brskalnik;Splet -Keywords[tr]=İnternet;WWW;Tarayıcı;Web;Gezgin;Web sitesi;Site;sörf;çevrimiçi;tara -Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;переглядач;оглядач;браузер;веб;файрфокс;вогнелис;перегляд -Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web -Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;LibreWolf;ff;互联网;网站; -Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐 -Exec=/usr/lib/librewolf/librewolf %u -Icon=librewolf -Terminal=false -X-MultipleArgs=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json; -StartupNotify=true -StartupWMClass=LibreWolf -Categories=Network;WebBrowser; -Actions=new-window;new-private-window; - -[Desktop Action new-window] -Name=New Window -Name[ach]=Dirica manyen -Name[af]=Nuwe venster -Name[an]=Nueva finestra -Name[ar]=نافذة جديدة -Name[as]=নতুন উইন্ডো -Name[ast]=Ventana nueva -Name[az]=Yeni Pəncərə -Name[be]=Новае акно -Name[bg]=Нов прозорец -Name[bn_BD]=নতুন উইন্ডো (N) -Name[bn_IN]=নতুন উইন্ডো -Name[br]=Prenestr nevez -Name[brx]=गोदान उइन्ड'(N) -Name[bs]=Novi prozor -Name[ca]=Finestra nova -Name[cak]=K'ak'a' tzuwäch -Name[cs]=Nové okno -Name[cy]=Ffenestr Newydd -Name[da]=Nyt vindue -Name[de]=Neues Fenster -Name[dsb]=Nowe wokno -Name[el]=Νέο παράθυρο -Name[en_GB]=New Window -Name[en_US]=New Window -Name[en_ZA]=New Window -Name[eo]=Nova fenestro -Name[es_AR]=Nueva ventana -Name[es_CL]=Nueva ventana -Name[es_ES]=Nueva ventana -Name[es_MX]=Nueva ventana -Name[et]=Uus aken -Name[eu]=Leiho berria -Name[fa]=پنجره جدید -Name[ff]=Henorde Hesere -Name[fi]=Uusi ikkuna -Name[fr]=Nouvelle fenêtre -Name[fy_NL]=Nij finster -Name[ga_IE]=Fuinneog Nua -Name[gd]=Uinneag ùr -Name[gl]=Nova xanela -Name[gn]=Ovetã pyahu -Name[gu_IN]=નવી વિન્ડો -Name[he]=חלון חדש -Name[hi_IN]=नया विंडो -Name[hr]=Novi prozor -Name[hsb]=Nowe wokno -Name[hu]=Új ablak -Name[hy_AM]=Նոր Պատուհան -Name[id]=Jendela Baru -Name[is]=Nýr gluggi -Name[it]=Nuova finestra -Name[ja]=新しいウィンドウ -Name[ja_JP-mac]=新規ウインドウ -Name[ka]=ახალი ფანჯარა -Name[kk]=Жаңа терезе -Name[km]=បង្អួចថ្មី -Name[kn]=ಹೊಸ ಕಿಟಕಿ -Name[ko]=새 창 -Name[kok]=नवें जनेल -Name[ks]=نئئ وِنڈو -Name[lij]=Neuvo barcon -Name[lo]=ຫນ້າຕ່າງໃຫມ່ -Name[lt]=Naujas langas -Name[ltg]=Jauns lūgs -Name[lv]=Jauns logs -Name[mai]=नव विंडो -Name[mk]=Нов прозорец -Name[ml]=പുതിയ ജാലകം -Name[mr]=नवीन पटल -Name[ms]=Tetingkap Baru -Name[my]=ဝင်းဒိုးအသစ် -Name[nb_NO]=Nytt vindu -Name[ne_NP]=नयाँ सञ्झ्याल -Name[nl]=Nieuw venster -Name[nn_NO]=Nytt vindauge -Name[or]=ନୂତନ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ -Name[pl]=Nowe okno -Name[pt_BR]=Nova janela -Name[pt_PT]=Nova janela -Name[rm]=Nova fanestra -Name[ro]=Fereastră nouă -Name[ru]=Новое окно -Name[sat]=नावा विंडो (N) -Name[si]=නව කවුළුවක් -Name[sk]=Nové okno -Name[sl]=Novo okno -Name[son]=Zanfun taaga -Name[sq]=Dritare e Re -Name[sr]=Нови прозор -Name[sv_SE]=Nytt fönster -Name[ta]=புதிய சாளரம் -Name[te]=కొత్త విండో -Name[th]=หน้าต่างใหม่ -Name[tr]=Yeni pencere -Name[tsz]=Eraatarakua jimpani -Name[uk]=Нове вікно -Name[ur]=نیا دریچہ -Name[uz]=Yangi oyna -Name[vi]=Cửa sổ mới -Name[wo]=Palanteer bu bees -Name[xh]=Ifestile entsha -Name[zh_CN]=新建窗口 -Name[zh_TW]=開新視窗 -Exec=/usr/lib/librewolf/librewolf --new-window %u - -[Desktop Action new-private-window] -Name=New Private Window -Name[ach]=Dirica manyen me mung -Name[af]=Nuwe privaatvenster -Name[an]=Nueva finestra privada -Name[ar]=نافذة خاصة جديدة -Name[as]=নতুন ব্যক্তিগত উইন্ডো -Name[ast]=Ventana privada nueva -Name[az]=Yeni Məxfi Pəncərə -Name[be]=Новае акно адасаблення -Name[bg]=Нов прозорец за поверително сърфиране -Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো -Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো -Name[br]=Prenestr merdeiñ prevez nevez -Name[brx]=गोदान प्राइभेट उइन्ड' -Name[bs]=Novi privatni prozor -Name[ca]=Finestra privada nova -Name[cak]=K'ak'a' ichinan tzuwäch -Name[cs]=Nové anonymní okno -Name[cy]=Ffenestr Breifat Newydd -Name[da]=Nyt privat vindue -Name[de]=Neues privates Fenster -Name[dsb]=Nowe priwatne wokno -Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης -Name[en_GB]=New Private Window -Name[en_US]=New Private Window -Name[en_ZA]=New Private Window -Name[eo]=Nova privata fenestro -Name[es_AR]=Nueva ventana privada -Name[es_CL]=Nueva ventana privada -Name[es_ES]=Nueva ventana privada -Name[es_MX]=Nueva ventana privada -Name[et]=Uus privaatne aken -Name[eu]=Leiho pribatu berria -Name[fa]=پنجره ناشناس جدید -Name[ff]=Henorde Suturo Hesere -Name[fi]=Uusi yksityinen ikkuna -Name[fr]=Nouvelle fenêtre de navigation privée -Name[fy_NL]=Nij priveefinster -Name[ga_IE]=Fuinneog Nua Phríobháideach -Name[gd]=Uinneag phrìobhaideach ùr -Name[gl]=Nova xanela privada -Name[gn]=Ovetã ñemi pyahu -Name[gu_IN]=નવી ખાનગી વિન્ડો -Name[he]=חלון פרטי חדש -Name[hi_IN]=नयी निजी विंडो -Name[hr]=Novi privatni prozor -Name[hsb]=Nowe priwatne wokno -Name[hu]=Új privát ablak -Name[hy_AM]=Սկսել Գաղտնի դիտարկում -Name[id]=Jendela Mode Pribadi Baru -Name[is]=Nýr huliðsgluggi -Name[it]=Nuova finestra anonima -Name[ja]=新しいプライベートウィンドウ -Name[ja_JP-mac]=新規プライベートウインドウ -Name[ka]=ახალი პირადი ფანჯარა -Name[kk]=Жаңа жекелік терезе -Name[km]=បង្អួចឯកជនថ្មី -Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ -Name[ko]=새 사생활 보호 모드 -Name[kok]=नवो खाजगी विंडो -Name[ks]=نْو پرایوٹ وینڈو -Name[lij]=Nêuvo barcón privòu -Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່ -Name[lt]=Naujas privataus naršymo langas -Name[ltg]=Jauns privatais lūgs -Name[lv]=Jauns privātais logs -Name[mai]=नया निज विंडो (W) -Name[mk]=Нов приватен прозорец -Name[ml]=പുതിയ സ്വകാര്യ ജാലകം -Name[mr]=नवीन वैयक्तिक पटल -Name[ms]=Tetingkap Persendirian Baharu -Name[my]=New Private Window -Name[nb_NO]=Nytt privat vindu -Name[ne_NP]=नयाँ निजी सञ्झ्याल -Name[nl]=Nieuw privévenster -Name[nn_NO]=Nytt privat vindauge -Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ -Name[pl]=Nowe okno prywatne -Name[pt_BR]=Nova janela privativa -Name[pt_PT]=Nova janela privada -Name[rm]=Nova fanestra privata -Name[ro]=Fereastră privată nouă -Name[ru]=Новое приватное окно -Name[sat]=नावा निजेराक् विंडो (W ) -Name[si]=නව පුද්ගලික කවුළුව (W) -Name[sk]=Nové okno v režime Súkromné prehliadanie -Name[sl]=Novo zasebno okno -Name[son]=Sutura zanfun taaga -Name[sq]=Dritare e Re Private -Name[sr]=Нови приватан прозор -Name[sv_SE]=Nytt privat fönster -Name[ta]=புதிய தனிப்பட்ட சாளரம் -Name[te]=కొత్త ఆంతరంగిక విండో -Name[th]=หน้าต่างส่วนตัวใหม่ -Name[tr]=Yeni gizli pencere -Name[tsz]=Juchiiti eraatarakua jimpani -Name[uk]=Приватне вікно -Name[ur]=نیا نجی دریچہ -Name[uz]=Yangi maxfiy oyna -Name[vi]=Cửa sổ riêng tư mới -Name[wo]=Panlanteeru biir bu bees -Name[xh]=Ifestile yangasese entsha -Name[zh_CN]=新建隐私浏览窗口 -Name[zh_TW]=新增隱私視窗 -Exec=/usr/lib/librewolf/librewolf --private-window %u diff --git a/librewolf.install b/librewolf.install deleted file mode 100644 index 9acf7a4..0000000 --- a/librewolf.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo ">> If you want to reduce potential privacy leaks even further, you should consider" - echo ">> clearing a few settings required for updating/searching extensions:" - echo ">> extensions.getAddons.get.url" - echo ">> extensions.getAddons.langpacks.url" - echo ">> extensions.getAddons.link.url" - echo ">> extensions.getAddons.search.browseURL" - echo ">> extensions.update.url" - echo ">> extensions.update.background.url" - echo ">> If you do wish to install extensions the 'regular way'," - echo ">> a few more tweaks might be needed." - echo ">> I've kept the relevant settings unlocked for that specific reason." -} diff --git a/prep-librewolf-dpkg.conf b/prep-librewolf-dpkg.conf deleted file mode 100644 index a607c75..0000000 --- a/prep-librewolf-dpkg.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Config file for prep-librewolf-dpkg.sh -# Configure these settings before running that script. - -debian_firefox_version=84.0.2-1 # current version of Firefox package in Debian sid -firefox_version=84.0.2 # current version of Firefox - -librewolf_common_url=https://gitlab.com/librewolf-community/browser/common.git -librewolf_settings_url=https://gitlab.com/librewolf-community/settings.git -librewolf_linux_url=https://gitlab.com/librewolf-community/browser/linux.git - -# user configurable -git_source_dir=/home/librewolf/git # where LibreWolf git contents are cached -debian_dir=/home/librewolf/${firefox_version}/debian # where the firefox_debian.tar.xz file is extracted -source_dir=/home/librewolf/${firefox_version}/librewolf_${firefox_version} # where firefox.orig.tar.xz file is extracted with --strip-components=1 -work_dir=/home/librewolf/${firefox_version}/ diff --git a/prep-librewolf-dpkg.sh b/prep-librewolf-dpkg.sh deleted file mode 100755 index 023ddfb..0000000 --- a/prep-librewolf-dpkg.sh +++ /dev/null @@ -1,260 +0,0 @@ -#!/bin/sh -# File: prep-librewolf-dpkg.sh -# Location: https://gitlab.com/bgstack15/librewolf-linux.git -# Latest supported version: librewolf-84.0.2-2 -# Author: bgstack15 -# SPDX-License-Identifier: CC-BY-SA-4.0 -# Startdate: 2020-11-29 -# Title: Build Dpkg for LibreWolf -# Purpose: Prepare initial assets for running "dpkg-buildpackage -b -us -uc" for LibreWolf by adapting Debian Firefox assets -# History: -# Usage: -# Can send these final assets up to Open Build Service -# References: -# Script numbers from https://gitlab.com/librewolf-community/browser/linux/-/tree/master/binary_tarball/scripts -# Improve: -# Make this idempotent. Right now it is very much not. -# Dependencies: -# wget, git, tar, awk, sed - -##################################### -# Load settings - -# basically, dot-source the conf file. -test -z "${librewolf_dpkg_conf}" && export librewolf_dpkg_conf="$( find "$( dirname "${0}" )" -maxdepth 2 -name "$( basename "${0%%.sh}.conf" )" -print 2>/dev/null | head -n1 )" -test ! -r "${librewolf_dpkg_conf}" && { echo "Unable to load config file, which should be named the same as this script but with a .conf ending. Aborted." 1>&2 ; exit 1 ; } -. "${librewolf_dpkg_conf}" - -##################################### -# Download initial components - -# Download upstream Debian assets, which includes -# 1. orig tarball, which in Debian is not always the pristine contents from upstream source -# 2. debian/ directory which defines how to build a package for Debian -# 3. Debian source package control file -mkdir -p "${work_dir}" ; cd "${work_dir}" -test -z "${SKIP_DOWNLOAD}" && { - wget --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${firefox_version}".orig.tar.xz # -O librewolf_"${firefox_version}".orig.tar.xz - wget --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${debian_firefox_version}".debian.tar.xz # -O librewolf_"${debian_firefox_version}".debian.tar.xz - wget --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${debian_firefox_version}".dsc # -O librewolf_"${debian_firefox_version}".dsc -} - -# extract these contents to where they belong -mkdir -p "${source_dir}" -test -z "${SKIP_EXTRACT}" && { - echo "Extracting files from orig and debian tarballs. This might take a while." 1>&2 - tar -C "${source_dir}" -Jx --strip-components=1 -f firefox_"${firefox_version}".orig.tar.xz - tar -C "$( dirname "${debian_dir}" )" -Jxf firefox_"${debian_firefox_version}".debian.tar.xz - # dsc file is a text file and needs no extraction -} - -# Download git sources -test -z "${SKIP_GIT}" && ( - # yes, use a sub-shell because of this cd. pushd is a bash builtin, but we are using sh and not bash. - cd "${git_source_dir}" - git clone "${librewolf_common_url}" common - git clone "${librewolf_settings_url}" settings - git clone "${librewolf_linux_url}" linux -) - -##################################### -# Script 1 tasks - -# update debian/control file -# update fields and add libjack-dev -sed -i -r "${debian_dir}"/control \ - -e '/^[[:alpha:]]+: firefox/s/firefox/librewolf/' \ - -e '/^Package:.*-l10/,$d' \ - -e '/^Maintainer:/{s/Maintainer:/XSBC-Original-Maintainer:/;iMaintainer: B. Stack ' -e '}' \ - -e '/^Uploaders:/d' \ - -e '/libasound2-dev/s/libasound2-dev,/libasound2-dev, libjack-dev,/;' \ - -e '/^Vcs-/d' \ - -e '/Breaks:.*xul-ext-torbutton/d' \ - -e '/Description:/,+8{/Description:/,/^\s*$/d}' -cat <<'EOF' >> "${debian_dir}"/control -Description: LibreWolf variant of Mozilla Firefox web browser - LibreWolf is a build of Firefox that seeks to protect user privacy, - security, and freedom. -EOF - -##################################### -# Script 2 tasks - -# none. Dependencies are handled by the build environment by interpreting the dsc file. - -##################################### -# Script 3 tasks - -# overlay the orig tarball contents with LibreWolf contents -# LibreWolf branding -cp -pr "${git_source_dir}"/common/source_files/browser/branding "${source_dir}"/browser/ -# update mozconfig with needed info -sed -i -e '/with-app-name=/d' "${debian_dir}"/browser.mozconfig.in -cat <> "${debian_dir}"/browser.mozconfig.in - -# Start of LibreWolf effects -ac_add_options --disable-tests -ac_add_options --disable-debug - -ac_add_options --prefix=/usr -ac_add_options --enable-release -ac_add_options --enable-hardening -ac_add_options --enable-rust-simd - -# Branding ac_add_options --enable-update-channel=release -ac_add_options --with-app-name=librewolf -ac_add_options --with-app-basename=LibreWolf -ac_add_options --with-branding=browser/branding/librewolf -ac_add_options --with-distribution-id=io.gitlab.librewolf -ac_add_options --with-unsigned-addon-scopes=app,system -ac_add_options --allow-addon-sideload -export MOZ_REQUIRE_SIGNING=0 - -# Features -ac_add_options --enable-jack -ac_add_options --disable-crashreporter - -# Disables crash reporting, telemetry and other data gathering tools -mk_add_options MOZ_CRASHREPORTER=0 -mk_add_options MOZ_DATA_REPORTING=0 -mk_add_options MOZ_SERVICES_HEALTHREPORT=0 -mk_add_options MOZ_TELEMETRY_REPORTING=0 - -ac_add_options --disable-elf-hack - -# LibreWolf binary release uses clang-11 but Debian builds Firefox with gcc so this is irrelevant. -#export CC='clang-11' -#export CXX='clang++-11' -#export AR=llvm-ar-11 -#export NM=llvm-nm-11 -#export RANLIB=llvm-ranlib-11 - -ac_add_options --enable-optimize -EOF - -# add patches to debian/patches -mkdir -p "${debian_dir}"/patches/librewolf -cp -pr "${git_source_dir}"/linux/megabar.patch "${git_source_dir}"/linux/remove_addons.patch \ - "${git_source_dir}"/linux/deb_patches/*.patch \ - "${debian_dir}"/patches/librewolf/ -cat <> "${debian_dir}"/patches/series -librewolf/lower-python3-requirement.patch -p1 -librewolf/armhf-reduce-linker-memory-use.patch -p1 -#librewolf/build-with-libstdc++-7.patch -p1 -librewolf/fix-armhf-webrtc-build.patch -p1 -librewolf/webrtc-fix-compiler-flags-for-armhf.patch -p1 -librewolf/python3-remove-variable-annotations.patch -p1 -librewolf/python3-remove-fstrings.patch -p1 -librewolf/python3-remove-pep487.patch -p1 -librewolf/silence-gtk-style-assertions.patch -p1 -librewolf/sandbox-update-arm-syscall-numbers.patch -p1 -librewolf/remove_addons.patch -p1 -librewolf/megabar.patch -p1 -EOF -# observe that build-with-libstdc++-7 is disabled for this dpkg. Debian builds Firefox with gcc, not clang. -# fix some fuzz in remove_addons.patch. The space is important! -sed -i -r -e 's/libs /l10n /;' "${debian_dir}"/patches/librewolf/remove_addons.patch - -# additional main LibreWolf activities -# disable pocket in source -sed -i "/'pocket'/d" "${source_dir}"/browser/components/moz.build -sed -i "/SaveToPocket\.init/d" "${source_dir}"/browser/components/BrowserGlue.jsm -# Remove internal plugin certificates -sed -i -r -e '/organizationalUnit.{0,5}=.{0,5}Mozilla/{N;N;N;d}' "${source_dir}"/toolkit/mozapps/extensions/internal/XPIInstall.jsm -# allow SearchEngines option in non-ESR builds -sed -i -r -e '/enterprise_only/s#true#false#g;' "${source_dir}"/browser/components/enterprisepolicies/schemas/policies-schema.json - -##################################### -# Script 4 tasks - -sed -i -r -e '2{ - iexport DEB_BUILD_HARDENING=1 - ;iexport DEB_BUILD_HARDENING_STACKPROTECTOR=1 - ;iexport DEB_BUILD_HARDENING_FORTIFY=1 - ;iexport DEB_BUILD_HARDENING_FORMAT=1 - ;iexport DEB_BUILD_HARDENING_PIE=1 - ;iexport CPP -} -/^EXPORTS/{ - iCPPFLAGS += -D_FORTIFY_SOURCE=2 - ;iCFLAGS += -march=x86-64 -mtune=generic -O2 -pipe -fno-plt - ;iCXXFLAGS += -march=x86-64 -mtune=generic -O2 -pipe -fno-plt - ;iLDFLAGS += -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -} -2{ - iexport MOZ_NOSPAM=1 - iexport MACH_USE_SYSTEM_PYTHON=1 -} -' "${debian_dir}"/rules - -##################################### -# Additional steps for dpkg implementation - -# fix the binary name that gets installed in /usr/bin, and disable crash reporter by changing what variable name it looks for that will enable it -sed -i -e '/%if browser/,+2s/firefox/librewolf/' \ - -e '/%if CRASH_REPORTER/s/CRASH_REPORTER/CRASH_REPORTER_ENABLED/' \ - "${debian_dir}"/browser.install.in - -# instruct dpkg to include the librewolf settings -rm -rf "${debian_dir}"/librewolf_settings -cp -pr "${git_source_dir}"/settings "${debian_dir}"/librewolf_settings -rm -rf "${debian_dir}"/librewolf_settings/.git* -cat <> "${debian_dir}"/browser.install.in -debian/librewolf_settings/librewolf.cfg usr/lib/@browser@ -debian/librewolf_settings/defaults usr/lib/@browser@ -debian/librewolf_settings/distribution usr/lib/@browser@ -EOF - -# add changelog contents for LibreWolf -new_changelog="$( mktemp )" -{ - cat < $( date "+%a, %d %b %+4Y %T %z" ) - -EOF - cat "${debian_dir}"/changelog -} > "${new_changelog}" -cat "${new_changelog}" > "${debian_dir}"/changelog - -rm -f "${new_changelog:-NOTHINGTODEL}" - -##################################### -# Build new assets -# dpkg-buildpackage needs the orig tarball, debian tarball, and dsc file. - -echo "Building new tarballs. This might take a while." 1>&2 - -# orig tarball -cd "${work_dir}" -tar -Jc -f librewolf_"${firefox_version}".orig.tar.xz -C "$( dirname "${source_dir}" )" librewolf_"${firefox_version}" - -# debian tarball -tar -Jc -f librewolf_"${debian_firefox_version}".debian.tar.xz -C "$( dirname "${debian_dir}" )" debian - -# dsc file, which needs to be modified -cd "${work_dir}" -sed -r \ - -e '/^(Files|Checksums-.{0,8}):/,$d' \ - -e '1,/^Format:/{/^Format:/!{d}}' \ - -e 's/^([[:alpha:]]+:).* firefox(-l10n[^\s]*)*/\1 librewolf/' \ - -e '/firefox-l10n/d' \ - -e '/^Maintainer:/{s/Maintainer:/XSBC-Original-Maintainer:/;iMaintainer: B. Stack ' -e '}' \ - -e '/^Uploaders:/d' \ - -e '/libasound2-dev/s/libasound2-dev,/libasound2-dev, libjack-dev,/;' \ - -e '/^Vcs-/d' \ - -e '/^ firefox/s/firefox/librewolf/g' \ - firefox_"${debian_firefox_version}".dsc > librewolf_"${debian_firefox_version}".dsc -{ - echo "Files:" - for word in librewolf*z ; - do - printf "%s %s\n" "$( stat -c '%s' "${word}" )" "$( md5sum "${word}" )" - done | awk '{print " "$2,$1,$3}' -} >> librewolf_"${debian_firefox_version}".dsc - -# And now you have in the ${work_dir} location three files. -# librewolf_80.3.orig.tar.xz librewolf_80.3-1.debian.tar.xz librewolf_80.3-1.dsc diff --git a/binary_tarball/scripts/1_Install_Dependencies.sh b/scripts/1_Install_Dependencies.sh similarity index 100% rename from binary_tarball/scripts/1_Install_Dependencies.sh rename to scripts/1_Install_Dependencies.sh diff --git a/binary_tarball/scripts/2_Download_Source_Code.sh b/scripts/2_Download_Source_Code.sh similarity index 100% rename from binary_tarball/scripts/2_Download_Source_Code.sh rename to scripts/2_Download_Source_Code.sh diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh similarity index 98% rename from binary_tarball/scripts/3_Configure_Source_Code.sh rename to scripts/3_Configure_Source_Code.sh index 2fc0dcf..14e176b 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/scripts/3_Configure_Source_Code.sh @@ -5,7 +5,7 @@ set -e # Setup Script Variables srcdir=$1; -CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} +CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} _COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git'; _MOZBUILD=$srcdir/../mozbuild diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/scripts/4_Build_Binary_Tarball.sh similarity index 97% rename from binary_tarball/scripts/4_Build_Binary_Tarball.sh rename to scripts/4_Build_Binary_Tarball.sh index 1ac283b..5489158 100755 --- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh +++ b/scripts/4_Build_Binary_Tarball.sh @@ -6,7 +6,7 @@ set -e # Setup Script Variables srcdir=$1; OUTPUT_TARBALL=$2; -CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} +CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} _SOURCE_CODE_BINARY_TARBALL_LOCATION="${srcdir}/firefox-${pkgver}/obj/dist/librewolf*.tar.bz2"; _MOZBUILD=$srcdir/../mozbuild export DEB_BUILD_HARDENING=1 diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh similarity index 96% rename from binary_tarball/scripts/5_Configure_Binary_Tarball.sh rename to scripts/5_Configure_Binary_Tarball.sh index 827dbfe..84505dd 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/scripts/5_Configure_Binary_Tarball.sh @@ -8,7 +8,7 @@ set -e; BINARY_TARBALL=$1; TOGGLE_SETTINGS_SCRIPT=$2; LAUNCHER_SCRIPT=$3; -CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} +CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} _SCRIPT_FOLDER=$(realpath $(dirname $0)); _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; _SETTINGS_COMMIT=3feb12464aa81df2f4ff162fce69890614c0ac8f diff --git a/trigger_pipeline.md b/trigger_pipeline.md deleted file mode 100644 index 1cc994d..0000000 --- a/trigger_pipeline.md +++ /dev/null @@ -1,43 +0,0 @@ -# Pipeline - -## Triggering - -The pipeline can currently only triggered manually. The version and variants to be build need -to be specified via variables: - -* **pkgver** is the upstream Firefox release version -* **pkgrel** is the "Arch-style" package version[^1] -* **TARBALL** should a tarball be built (on Ubuntu 16.04 Xenial at the time of writing) -* **ARCH** should an Arch package be built -* **FLATPAK** should a Flatpak be built from a Tarball -* **APPIMAGE** should an AppImage be built from a Tarball -* **AARCH64** build for `aarch64` -* **X86_64** build for `x86_64` -* **TARBALL_URL** provide a tarball download URL for Flatpak or AppImage builds if the tarball is not built in the same pipeline run - -Builds can be combined, so a full run for `x86_64` and `aarch64` including Arch releases, tarball build and Appimage and FlatPak releases is possible. - -Variables are either unset, or have to be set (to `true`). - -### Browser - -Pipelines can be manually triggered from https://gitlab.com/librewolf-community/browser/linux/pipelines/new - -### Commandline - -Triggering from the commandline is possible via curl, but a valid Gitlab token needs to be provided. - -The following is an example that only builds the tarball and the Flatpak and AppImage for `x86_64`: - -```bash -curl --header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \ ---header "Content-Type: application/json" \ ---data '{ "ref": "master", "variables": [ {"key": "TARBALL", "value": "true"}, {"key": "FLATPAK", "value": "true"}, {"key": "APPIMAGE", "value": "true"}, {"key": "pkgver", "value": "74.0"}, {"key": "pkgrel", "value": "3"}, {"key": "X86_64", "value": "true"} ] }' \ -"https://gitlab.com/api/v4/projects/12829184/pipeline" -``` - -[^1]: *The release number. This is usually a positive integer number that allows to differentiate -between consecutive builds of the same version of a package. As fixes and additional features are -added to the PKGBUILD that influence the resulting package, the pkgrel should be incremented by 1. -When a new version of the software is released, this value must be reset to 1.* -https://wiki.archlinux.org/index.php/PKGBUILD#pkgrel