Merge pull request #11173 from Rmys/master

firefox-108.0 rebuild
2022-12-13 23:05:50 +03:00
parent 3780368050 da693dd33d
commit b8cd252c76
5 changed files with 16 additions and 4 deletions
@@ -93,6 +93,9 @@ def install():

    # Install branding icon
    pisitools.insinto("/usr/share/pixmaps", "browser/branding/official/default256.png", "firefox.png")
+
+    for s in (16, 22, 24, 32, 48, 64, 128, 256):
+        pisitools.insinto("/usr/share/icons/hicolor/%dx%d/apps" % (s,s), "browser/branding/official/default%d.png" % s, "firefox.png")
    
    # Install docs
    pisitools.dodoc("README*", "LICENSE")
@@ -21,9 +21,13 @@ export AR=llvm-ar
 export NM=llvm-nm
 export RANLIB=llvm-ranlib
 export LDFLAGS+=" -fuse-ld=lld"
-ac_add_options --allow-addon-sideload
+
+# Branding
 #ac_add_options --enable-official-branding
+ac_add_options --enable-update-channel=release
 ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZILLA_OFFICIAL=1

 # System libraries
 ac_add_options --with-system-nspr
@@ -21,9 +21,13 @@ export AR=llvm-ar
 export NM=llvm-nm
 export RANLIB=llvm-ranlib
 export LDFLAGS+=" -fuse-ld=lld"
-ac_add_options --allow-addon-sideload
-#ac_add_options --enable-official-branding
+
+# Branding
+ac_add_options --enable-official-branding
+ac_add_options --enable-update-channel=release
 ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZILLA_OFFICIAL=1

 # System libraries
 ac_add_options --with-system-nspr
@@ -1,6 +1,6 @@
 [Global]
 id=PisiLinux
-version=2.2
+version=2.3
 about=Mozilla Firefox for PisiLinux

 [Preferences]
@@ -131,6 +131,7 @@
 <!--             <Path fileType="executable">/usr/lib</Path> -->
            <Path fileType="executable">/usr/lib/firefox</Path>
            <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/icons/hicolor</Path>
        </Files>
        <AdditionalFiles>
            <!-- Desktop file -->