Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • trisquel/package-helpers
  • aklis/package-helpers
  • leny2010/package-helpers
  • fr33domlover/package-helpers
  • Legimet/package-helpers
  • ralphtheninja/package-helpers
  • damo22/package-helpers
  • wherrfrye/package-helpers
  • habs/package-helpers
  • pehjota/package-helpers
  • kpengboy/package-helpers
  • alvaro/package-helpers
  • salman/package-helpers
  • pabloyoyoista/package-helpers
  • mixalis/package-helpers
  • jorgesumle/package-helpers
  • a_slacker_here/package-helpers
  • chaosmonk/package-helpers
  • Beformed/package-helpers
  • dknight/package-helpers
  • proninyaroslav/package-helpers
  • adfeno/package-helpers
  • snd/package-helpers
  • davidpgil/package-helpers
  • diopon/package-helpers
  • ruben/package-helpers
  • bandali/package-helpers
  • joshaspinall/package-helpers
  • GNUtoo/package-helpers
  • Ark74/package-helpers
  • dragestil/package-helpers
  • bill-auger/package-helpers
  • andi89gi/package-helpers
  • Fikar/package-helpers
  • davidl/package-helpers
  • jas/package-helpers
  • parodper/package-helpers
  • David_Hedlund/package-helpers
  • dinomug/package-helpers
  • bf/package-helpers
  • hartkemd/package-helpers
  • del111/package-helpers
  • jxself/package-helpers
  • JacobK/package-helpers
44 results
Show changes
Commits on Source (42)
Showing
with 937 additions and 138 deletions
...@@ -8,7 +8,7 @@ Whether you've got a bugfix, documentation update, or new feature for us, these ...@@ -8,7 +8,7 @@ Whether you've got a bugfix, documentation update, or new feature for us, these
1. Install needed packages for running the helpers 1. Install needed packages for running the helpers
``` ```
sudo apt-get install cdbs devscripts dpkg-dev git gnupg patch quilt rpl sed sudo apt-get install cdbs devscripts dpkg-dev git gnupg2 patch quilt rpl sed sbuild
``` ```
1. Get the Trisquel build environment and follow the [README](https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/README.md) to setup your system for building 1. Get the Trisquel build environment and follow the [README](https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/README.md) to setup your system for building
......
...@@ -39,7 +39,7 @@ Those are the steps done by the helpers: ...@@ -39,7 +39,7 @@ Those are the steps done by the helpers:
* You don't need to use sudo in order to run those scripts, but some extra packages are needed: * You don't need to use sudo in order to run those scripts, but some extra packages are needed:
`sudo apt-get install cdbs devscripts dpkg-dev git gnupg patch quilt rpl sed python3-jsonschema python-pathlib` `sudo apt-get install cdbs devscripts dpkg-dev git gnupg2 patch quilt rpl sed sbuild`
* Take care to use the right sourcePackageName, many source packages produce * Take care to use the right sourcePackageName, many source packages produce
several binary packages. `apt-cache showsrc binary-package` can help you. several binary packages. `apt-cache showsrc binary-package` can help you.
......
...@@ -14,14 +14,14 @@ set _tilde 0 ...@@ -14,14 +14,14 @@ set _tilde 0
# #
############# end config ############## ############# end config ##############
deb http://archive.trisquel.info/trisquel @CODENAME@ main deb http://archive.trisquel.org/trisquel @CODENAME@ main
deb http://archive.trisquel.info/trisquel @CODENAME@-security main deb http://archive.trisquel.org/trisquel @CODENAME@-security main
deb http://archive.trisquel.info/trisquel @CODENAME@-updates main deb http://archive.trisquel.org/trisquel @CODENAME@-updates main
deb http://archive.trisquel.info/trisquel @CODENAME@-backports main deb http://archive.trisquel.org/trisquel @CODENAME@-backports main
deb-src http://archive.trisquel.info/trisquel @CODENAME@ main deb-src http://archive.trisquel.org/trisquel @CODENAME@ main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-security main deb-src http://archive.trisquel.org/trisquel @CODENAME@-security main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-updates main deb-src http://archive.trisquel.org/trisquel @CODENAME@-updates main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-backports main deb-src http://archive.trisquel.org/trisquel @CODENAME@-backports main
clean http://archive.trisquel.info/trisquel clean http://archive.trisquel.org/trisquel
trisquel
\ No newline at end of file
case $ARCH in default_mirror http://archive.trisquel.org/trisquel
amd64|i386)
default_mirror http://archive.trisquel.org/trisquel
;;
*)
default_mirror http://ports.trisquel.org/trisquel
;;
esac
mirror_style release mirror_style release
download_style apt download_style apt
finddebs_style from-indices finddebs_style from-indices
......
case $ARCH in default_mirror http://archive.trisquel.org/trisquel
amd64|i386)
default_mirror http://archive.trisquel.org/trisquel
;;
*)
default_mirror http://ports.trisquel.org/trisquel
;;
esac
mirror_style release mirror_style release
download_style apt download_style apt
finddebs_style from-indices finddebs_style from-indices
......
...@@ -11,3 +11,4 @@ version,codename,series,created,release,eol ...@@ -11,3 +11,4 @@ version,codename,series,created,release,eol
8.0 LTS,Flidas,flidas,2015-10-22,2018-04-18,2021-04-21 8.0 LTS,Flidas,flidas,2015-10-22,2018-04-18,2021-04-21
9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-04-26 9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-04-26
10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-04-23 10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-04-23
11.0 LTS,Aramo,aramo,2021-10-14,2027-04-21,2027-04-21
#filter substitution
#include @BOOKMARKS_INCLUDE_PATH@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<meta charset="UTF-8">
<title>@bookmarks_title@</title>
<h1>@bookmarks_heading@</h1>
<dl><p>
<dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
<dd>@bookmarks_toolbarfolder_description@
<dl>
</dl>
</dl>
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1" version="1.1"
id="aboutWordmark" id="aboutWordmark"
x="0px" x="0px"
...@@ -15,40 +8,66 @@ ...@@ -15,40 +8,66 @@
height="38px" height="38px"
viewBox="0 0 130 38" viewBox="0 0 130 38"
xml:space="preserve" xml:space="preserve"
inkscape:version="0.48.4 r9939" inkscape:version="1.2 (1:1.2+202205241504+da316b6974)"
sodipodi:docname="about-wordmark.svg"><metadata sodipodi:docname="about-wordmark.svg"
id="metadata9"><rdf:RDF><cc:Work xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs xmlns="http://www.w3.org/2000/svg"
id="defs7" /><sodipodi:namedview xmlns:svg="http://www.w3.org/2000/svg"
pagecolor="#ffffff" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
bordercolor="#666666" xmlns:cc="http://creativecommons.org/ns#"
borderopacity="1" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
objecttolerance="10" id="metadata9"><rdf:RDF><cc:Work
gridtolerance="10" rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
guidetolerance="10" rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
inkscape:pageopacity="0" id="defs7" /><sodipodi:namedview
inkscape:pageshadow="2" pagecolor="#ffffff"
inkscape:window-width="1364" bordercolor="#666666"
inkscape:window-height="711" borderopacity="1"
id="namedview5" objecttolerance="10"
showgrid="false" gridtolerance="10"
inkscape:zoom="9.788073" guidetolerance="10"
inkscape:cx="48.569985" inkscape:pageopacity="0"
inkscape:cy="11.314337" inkscape:pageshadow="2"
inkscape:window-x="0" inkscape:window-width="1918"
inkscape:window-y="0" inkscape:window-height="1008"
inkscape:window-maximized="1" id="namedview5"
inkscape:current-layer="aboutWordmark" /><text showgrid="false"
xml:space="preserve" inkscape:zoom="4.8940365"
style="font-size:28.27791785999999874px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6f6f6f;fill-opacity:1;stroke:none;font-family:Sans" inkscape:cx="77.952014"
x="0.4501974" inkscape:cy="4.9039275"
y="37.289883" inkscape:window-x="1366"
id="text2986" inkscape:window-y="0"
sodipodi:linespacing="125%"><tspan inkscape:window-maximized="1"
sodipodi:role="line" inkscape:current-layer="aboutWordmark"
id="tspan2988" inkscape:showpageshadow="2"
x="0.4501974" inkscape:pagecheckerboard="0"
y="37.289883" inkscape:deskcolor="#d1d1d1" /><g
style="font-weight:bold;-inkscape-font-specification:Sans Bold;fill:#6f6f6f;fill-opacity:1">Abrowser</tspan></text> aria-label="Abrowser"
</svg> id="text2986"
\ No newline at end of file style="line-height:0%;letter-spacing:0px;word-spacing:0px;fill:#6f6f6f"><path
d="M 10.419262,20.624147 4.9514648,37.289883 H 0.54685038 L 8.016745,17.186063 h 2.802936 z M 14.961952,37.289883 9.4803473,20.624147 9.0385051,17.186063 h 2.8305519 l 7.511317,20.10382 z M 14.713416,29.80618 v 3.244779 H 4.0953955 V 29.80618 Z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path166" /><path
d="m 20.995859,16.081457 h 3.97658 v 17.784149 l -0.400419,3.424277 h -3.576161 z m 13.434765,13.586648 v 0.289959 q 0,1.670715 -0.358997,3.06528 -0.345189,1.394564 -1.076991,2.416324 -0.731801,1.007953 -1.822599,1.574063 -1.07699,0.552303 -2.540592,0.552303 -1.36695,0 -2.374902,-0.552303 -0.994145,-0.552302 -1.670716,-1.560255 -0.676571,-1.007952 -1.090798,-2.361094 -0.414227,-1.353142 -0.62134,-2.95482 v -0.635148 q 0.207113,-1.601678 0.62134,-2.95482 0.414227,-1.353142 1.090798,-2.361094 0.676571,-1.007953 1.670716,-1.560255 0.994145,-0.552303 2.347287,-0.552303 1.477409,0 2.568207,0.56611 1.104606,0.552303 1.822599,1.574063 0.731802,1.007953 1.076991,2.402517 0.358997,1.380757 0.358997,3.051473 z m -3.97658,0.289959 v -0.289959 q 0,-0.9113 -0.138076,-1.712139 -0.124268,-0.814646 -0.441842,-1.422179 -0.317574,-0.621341 -0.869877,-0.980338 -0.538495,-0.358997 -1.394564,-0.358997 -0.814647,0 -1.380757,0.276152 -0.566111,0.276151 -0.938915,0.773224 -0.358997,0.497072 -0.552303,1.187451 -0.179498,0.67657 -0.207113,1.491217 v 1.808792 q 0.04142,1.090797 0.358997,1.933059 0.331381,0.828454 0.994145,1.311719 0.67657,0.469458 1.753561,0.469458 0.842262,0 1.394564,-0.331382 0.552303,-0.331382 0.85607,-0.938915 0.317574,-0.607533 0.441842,-1.422179 0.124268,-0.828455 0.124268,-1.794984 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path168" /><path
d="m 40.878758,25.60868 v 11.681203 h -3.97658 v -14.93979 h 3.741851 z m 4.501267,-3.35524 -0.06904,3.686621 q -0.289959,-0.04142 -0.704186,-0.06904 -0.400419,-0.04142 -0.731801,-0.04142 -0.842262,0 -1.463602,0.220921 -0.607533,0.207113 -1.02176,0.62134 -0.40042,0.40042 -0.607533,1.007953 -0.193306,0.593725 -0.220921,1.353142 L 39.760345,28.78442 q 0,-1.449794 0.289959,-2.66486 0.289959,-1.228874 0.842261,-2.140174 0.566111,-0.911299 1.380757,-1.408372 0.814647,-0.497072 1.864022,-0.497072 0.331382,0 0.676571,0.05523 0.345189,0.04142 0.56611,0.124268 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path170" /><path
d="m 46.194673,29.971871 v -0.289959 q 0,-1.6431 0.469457,-3.023857 0.469457,-1.394565 1.366949,-2.416325 0.897492,-1.02176 2.209211,-1.58787 1.311719,-0.579918 3.01005,-0.579918 1.698331,0 3.023858,0.579918 1.325526,0.56611 2.223018,1.58787 0.9113,1.02176 1.380757,2.416325 0.469458,1.380757 0.469458,3.023857 v 0.289959 q 0,1.629293 -0.469458,3.023858 -0.469457,1.380757 -1.380757,2.416324 -0.897492,1.02176 -2.209211,1.587871 -1.311719,0.56611 -3.01005,0.56611 -1.698331,0 -3.023857,-0.56611 -1.311719,-0.566111 -2.223019,-1.587871 -0.897492,-1.035567 -1.366949,-2.416324 -0.469457,-1.394565 -0.469457,-3.023858 z m 3.976579,-0.289959 v 0.289959 q 0,0.938915 0.165691,1.753561 0.165691,0.814647 0.524688,1.435988 0.372804,0.607533 0.96653,0.952722 0.593725,0.345189 1.449794,0.345189 0.828454,0 1.42218,-0.345189 0.593725,-0.345189 0.952722,-0.952722 0.358997,-0.621341 0.524688,-1.435988 0.179498,-0.814646 0.179498,-1.753561 v -0.289959 q 0,-0.911299 -0.179498,-1.712138 -0.165691,-0.814647 -0.538495,-1.435987 -0.358997,-0.635149 -0.952723,-0.994145 -0.593725,-0.358997 -1.435987,-0.358997 -0.842261,0 -1.435987,0.358997 -0.579918,0.358996 -0.952722,0.994145 -0.358997,0.62134 -0.524688,1.435987 -0.165691,0.800839 -0.165691,1.712138 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path172" /><path
d="m 67.057907,33.423763 3.106703,-11.07367 h 2.526785 l -0.814646,4.349384 -3.106703,10.590406 h -2.112558 z m -1.574062,-11.07367 2.223018,11.059863 0.207114,3.879927 H 65.428614 L 61.64534,22.350093 Z m 10.05191,10.880364 2.167788,-10.880364 h 3.852311 l -3.783273,14.93979 h -2.471555 z m -2.49917,-10.880364 3.092895,10.990825 0.428035,3.948965 H 74.431149 L 71.324446,26.713285 70.537415,22.350093 Z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path174" /><path
d="m 91.635383,33.16142 q 0,-0.428035 -0.248537,-0.773224 -0.248536,-0.345189 -0.925107,-0.635148 -0.662763,-0.303767 -1.919252,-0.552303 -1.13222,-0.248536 -2.112558,-0.621341 -0.96653,-0.386612 -1.684523,-0.925107 -0.704186,-0.538495 -1.104606,-1.270296 -0.400419,-0.745609 -0.400419,-1.698331 0,-0.938915 0.400419,-1.767369 0.414227,-0.828454 1.173644,-1.463602 0.773224,-0.648956 1.877829,-1.007953 1.118413,-0.372804 2.512978,-0.372804 1.946867,0 3.341431,0.621341 1.408372,0.62134 2.153981,1.712138 0.759416,1.07699 0.759416,2.457747 h -3.97658 q 0,-0.579918 -0.248536,-1.035567 -0.234729,-0.469458 -0.745609,-0.731802 -0.497072,-0.276151 -1.297911,-0.276151 -0.662763,0 -1.146028,0.234729 -0.483265,0.220921 -0.745609,0.607533 -0.248536,0.372804 -0.248536,0.828454 0,0.345189 0.138075,0.621341 0.151884,0.262343 0.483265,0.483264 0.331382,0.220922 0.85607,0.414227 0.538495,0.179499 1.325526,0.331382 1.615486,0.331382 2.885782,0.869877 1.270296,0.524688 2.015905,1.435987 0.745609,0.897492 0.745609,2.361094 0,0.994145 -0.441842,1.822599 -0.441843,0.828455 -1.270297,1.449795 -0.828454,0.607533 -1.98829,0.952722 -1.146028,0.331382 -2.582015,0.331382 -2.084943,0 -3.534738,-0.745609 -1.435987,-0.745608 -2.181595,-1.891637 -0.731802,-1.159835 -0.731802,-2.374901 h 3.769467 q 0.02761,0.814646 0.414227,1.311719 0.400419,0.497072 1.007952,0.717993 0.621341,0.220921 1.339334,0.220921 0.773224,0 1.284104,-0.207113 0.51088,-0.220921 0.773224,-0.579918 0.276152,-0.372804 0.276152,-0.856069 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path176" /><path
d="m 104.95968,37.566034 q -1.73975,0 -3.12051,-0.552303 -1.38075,-0.56611 -2.347285,-1.560255 -0.952722,-0.994145 -1.463602,-2.305864 -0.51088,-1.325527 -0.51088,-2.816744 v -0.552303 q 0,-1.698331 0.483265,-3.106703 0.483265,-1.408372 1.380757,-2.443939 0.911295,-1.035568 2.209215,-1.587871 1.29791,-0.56611 2.9272,-0.56611 1.58787,0 2.81674,0.524688 1.22888,0.524687 2.05733,1.491217 0.84226,0.96653 1.2703,2.319672 0.42803,1.339334 0.42803,2.982434 v 1.656909 H 99.215734 v -2.651054 h 7.966966 v -0.303766 q 0,-0.828454 -0.30377,-1.47741 -0.28995,-0.662763 -0.88368,-1.049375 -0.59373,-0.386612 -1.51883,-0.386612 -0.78703,0 -1.35314,0.345189 -0.56611,0.345189 -0.92511,0.96653 -0.34519,0.621341 -0.52469,1.463602 -0.16569,0.828454 -0.16569,1.822599 v 0.552303 q 0,0.897492 0.24854,1.656908 0.26234,0.759417 0.7318,1.311719 0.48326,0.552303 1.15983,0.85607 0.69038,0.303766 1.56026,0.303766 1.07699,0 2.0021,-0.414227 0.93891,-0.428035 1.61548,-1.284104 l 1.93306,2.098751 q -0.46946,0.67657 -1.2841,1.297911 -0.80084,0.621341 -1.93306,1.02176 -1.13222,0.386612 -2.58202,0.386612 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path178" /><path
d="m 117.33126,25.60868 v 11.681203 h -3.97658 v -14.93979 h 3.74186 z m 4.50127,-3.35524 -0.069,3.686621 q -0.28995,-0.04142 -0.70418,-0.06904 -0.40042,-0.04142 -0.7318,-0.04142 -0.84226,0 -1.46361,0.220921 -0.60753,0.207113 -1.02176,0.62134 -0.40041,0.40042 -0.60753,1.007953 -0.1933,0.593725 -0.22092,1.353142 l -0.80084,-0.248537 q 0,-1.449794 0.28996,-2.66486 0.28996,-1.228874 0.84226,-2.140174 0.56611,-0.911299 1.38076,-1.408372 0.81465,-0.497072 1.86402,-0.497072 0.33138,0 0.67657,0.05523 0.34519,0.04142 0.56611,0.124268 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path180" /></g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1" version="1.1"
id="aboutWordmark" id="aboutWordmark"
x="0px" x="0px"
...@@ -15,11 +8,18 @@ ...@@ -15,11 +8,18 @@
height="21.484577" height="21.484577"
viewBox="0 0 121.3271 21.484577" viewBox="0 0 121.3271 21.484577"
xml:space="preserve" xml:space="preserve"
inkscape:version="1.0.2 (1.0.2+r75+1)" inkscape:version="1.2 (1:1.2+202205241504+da316b6974)"
sodipodi:docname="firefox-wordmark.svg"><metadata sodipodi:docname="firefox-wordmark.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
id="metadata9"><rdf:RDF><cc:Work id="metadata9"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs7" /><sodipodi:namedview id="defs7" /><sodipodi:namedview
pagecolor="#ffffff" pagecolor="#ffffff"
bordercolor="#666666" bordercolor="#666666"
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="1918" inkscape:window-width="1918"
inkscape:window-height="1010" inkscape:window-height="1008"
id="namedview5" id="namedview5"
showgrid="false" showgrid="false"
inkscape:zoom="3.4606064" inkscape:zoom="3.4606064"
inkscape:cx="27.662416" inkscape:cx="27.885286"
inkscape:cy="-18.237972" inkscape:cy="-18.493869"
inkscape:window-x="0" inkscape:window-x="1366"
inkscape:window-y="0" inkscape:window-y="0"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="aboutWordmark" inkscape:current-layer="aboutWordmark"
...@@ -44,15 +44,35 @@ ...@@ -44,15 +44,35 @@
fit-margin-top="0" fit-margin-top="0"
fit-margin-left="0" fit-margin-left="0"
fit-margin-right="0" fit-margin-right="0"
fit-margin-bottom="0" /><text fit-margin-bottom="0"
xml:space="preserve" inkscape:showpageshadow="2"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none" inkscape:pagecheckerboard="0"
x="-0.096652985" inkscape:deskcolor="#d1d1d1" /><g
y="21.208426" aria-label="Abrowser"
id="text2986"><tspan id="text2986"
sodipodi:role="line" style="line-height:0%;letter-spacing:0px;word-spacing:0px;fill:#808080"><path
id="tspan2988" d="M 9.8724116,4.5426901 4.4046144,21.208426 H 0 L 7.4698947,1.1046055 H 10.272831 Z M 14.415102,21.208426 8.9334969,4.5426901 8.4916547,1.1046055 h 2.8305513 l 7.511318,20.1038205 z m -0.248537,-7.483703 v 3.244779 H 3.5485452 v -3.244779 z"
x="-0.096652985" style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
y="21.208426" id="path202" /><path
style="font-weight:bold;font-size:28.2779px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';fill:#ffffff;fill-opacity:1">Abrowser</tspan></text> d="m 20.449009,0 h 3.97658 v 17.784148 l -0.40042,3.424278 h -3.57616 z m 13.434764,13.586648 v 0.289959 q 0,1.670715 -0.358997,3.06528 -0.345189,1.394564 -1.07699,2.416324 -0.731801,1.007953 -1.822599,1.574063 -1.07699,0.552303 -2.540593,0.552303 -1.366949,0 -2.374901,-0.552303 -0.994145,-0.552303 -1.670716,-1.560255 -0.676571,-1.007953 -1.090798,-2.361094 -0.414227,-1.353142 -0.621341,-2.95482 v -0.635148 q 0.207114,-1.601678 0.621341,-2.95482 0.414227,-1.3531417 1.090798,-2.3610942 0.676571,-1.0079525 1.670716,-1.5602552 0.994145,-0.5523028 2.347286,-0.5523028 1.47741,0 2.568208,0.5661103 1.104606,0.5523028 1.822599,1.5740629 0.731801,1.0079525 1.07699,2.402517 0.358997,1.380757 0.358997,3.051473 z m -3.97658,0.289959 v -0.289959 q 0,-0.9113 -0.138075,-1.712139 Q 29.64485,11.059863 29.327276,10.45233 29.009701,9.8309889 28.457399,9.4719921 27.918904,9.1129953 27.062834,9.1129953 q -0.814646,0 -1.380757,0.2761514 -0.56611,0.2761514 -0.938914,0.7732243 -0.358997,0.497072 -0.552303,1.18745 -0.179498,0.676571 -0.207114,1.491218 v 1.808791 q 0.04142,1.090798 0.358997,1.93306 0.331382,0.828454 0.994145,1.311719 0.676571,0.469457 1.753561,0.469457 0.842262,0 1.394565,-0.331381 0.552303,-0.331382 0.856069,-0.938915 0.317574,-0.607533 0.441842,-1.42218 0.124268,-0.828454 0.124268,-1.794983 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path204" /><path
d="M 40.331907,9.5272224 V 21.208426 H 36.355328 V 6.2686362 h 3.741851 z m 4.501268,-3.3552392 -0.06904,3.6866209 q -0.289959,-0.041423 -0.704186,-0.069038 -0.40042,-0.041423 -0.731801,-0.041423 -0.842262,0 -1.463603,0.2209211 -0.607533,0.2071134 -1.02176,0.6213404 -0.400419,0.40042 -0.607533,1.007953 -0.193306,0.593725 -0.220921,1.353141 l -0.800839,-0.248536 q 0,-1.449795 0.289959,-2.664861 0.289959,-1.2288732 0.842262,-2.1401727 0.56611,-0.9112995 1.380757,-1.408372 0.814646,-0.4970725 1.864022,-0.4970725 0.331381,0 0.67657,0.05523 0.34519,0.041423 0.566111,0.1242681 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path206" /><path
d="m 45.647822,13.890414 v -0.289959 q 0,-1.643101 0.469458,-3.023857 0.469457,-1.3945648 1.366949,-2.4163249 0.897492,-1.0217601 2.209211,-1.5878704 1.311719,-0.5799179 3.01005,-0.5799179 1.698331,0 3.023857,0.5799179 1.325527,0.5661103 2.223019,1.5878704 0.911299,1.0217601 1.380757,2.4163249 0.469457,1.380756 0.469457,3.023857 v 0.289959 q 0,1.629293 -0.469457,3.023858 -0.469458,1.380757 -1.380757,2.416324 -0.897492,1.02176 -2.209211,1.587871 -1.311719,0.56611 -3.01005,0.56611 -1.698331,0 -3.023858,-0.56611 -1.311719,-0.566111 -2.223018,-1.587871 -0.897492,-1.035567 -1.366949,-2.416324 -0.469458,-1.394565 -0.469458,-3.023858 z m 3.97658,-0.289959 v 0.289959 q 0,0.938915 0.165691,1.753561 0.165691,0.814647 0.524687,1.435987 0.372805,0.607534 0.96653,0.952723 0.593726,0.345189 1.449795,0.345189 0.828454,0 1.42218,-0.345189 0.593725,-0.345189 0.952722,-0.952723 0.358997,-0.62134 0.524687,-1.435987 0.179499,-0.814646 0.179499,-1.753561 v -0.289959 q 0,-0.911299 -0.179499,-1.712138 Q 55.465004,11.07367 55.092199,10.45233 54.733202,9.8171813 54.139477,9.4581846 53.545752,9.0991878 52.70349,9.0991878 q -0.842262,0 -1.435987,0.3589968 -0.579918,0.3589967 -0.952723,0.9941454 -0.358996,0.62134 -0.524687,1.435987 -0.165691,0.800839 -0.165691,1.712138 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path208" /><path
d="M 66.511057,17.342306 69.61776,6.2686362 h 2.526785 L 71.329898,10.61802 68.223195,21.208426 H 66.110637 Z M 64.936994,6.2686362 67.160013,17.328499 67.367126,21.208426 H 64.881764 L 61.09849,6.2686362 Z M 74.988904,17.149 77.156692,6.2686362 h 3.852312 L 77.22573,21.208426 H 74.754175 Z M 72.489734,6.2686362 75.58263,17.259461 76.010664,21.208426 H 73.884299 L 70.777596,10.631828 69.990564,6.2686362 Z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path210" /><path
d="m 91.088532,17.079962 q 0,-0.428034 -0.248536,-0.773223 -0.248536,-0.34519 -0.925107,-0.635149 -0.662763,-0.303766 -1.919252,-0.552302 -1.132221,-0.248537 -2.112558,-0.621341 -0.96653,-0.386612 -1.684524,-0.925107 -0.704186,-0.538495 -1.104605,-1.270296 -0.40042,-0.745609 -0.40042,-1.698331 0,-0.9389149 0.40042,-1.767369 0.414227,-0.8284542 1.173643,-1.4636023 0.773224,-0.6489557 1.87783,-1.0079525 1.118413,-0.3728044 2.512977,-0.3728044 1.946867,0 3.341432,0.6213406 1.408372,0.6213406 2.15398,1.7121385 0.759417,1.0769904 0.759417,2.4577471 h -3.97658 q 0,-0.579918 -0.248536,-1.0355675 Q 90.453384,9.2786862 89.942504,9.0163424 89.445432,8.740191 88.644593,8.740191 q -0.662764,0 -1.146029,0.2347287 -0.483265,0.2209211 -0.745608,0.607533 -0.248537,0.3728043 -0.248537,0.8284543 0,0.345189 0.138076,0.62134 0.151883,0.262344 0.483265,0.483265 0.331382,0.220921 0.856069,0.414227 0.538495,0.179499 1.325527,0.331382 1.615485,0.331382 2.885782,0.869877 1.270296,0.524687 2.015905,1.435987 0.745608,0.897492 0.745608,2.361094 0,0.994145 -0.441842,1.822599 -0.441842,0.828454 -1.270296,1.449795 -0.828454,0.607533 -1.98829,0.952722 -1.146028,0.331382 -2.582015,0.331382 -2.084943,0 -3.534738,-0.745609 -1.435987,-0.745609 -2.181596,-1.891637 -0.731801,-1.159835 -0.731801,-2.374902 h 3.769466 q 0.02762,0.814647 0.414227,1.311719 0.40042,0.497073 1.007953,0.717994 0.621341,0.220921 1.339334,0.220921 0.773224,0 1.284104,-0.207113 0.51088,-0.220921 0.773224,-0.579918 0.276151,-0.372805 0.276151,-0.85607 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path212" /><path
d="m 104.41283,21.484577 q -1.73975,0 -3.12051,-0.552303 -1.380755,-0.56611 -2.347285,-1.560255 -0.952722,-0.994145 -1.463602,-2.305864 -0.51088,-1.325527 -0.51088,-2.816744 v -0.552303 q 0,-1.698331 0.483265,-3.106703 0.483264,-1.4083718 1.380756,-2.4439395 0.9113,-1.0355676 2.209216,-1.5878704 1.29791,-0.5661103 2.9272,-0.5661103 1.58787,0 2.81674,0.5246876 1.22888,0.5246876 2.05733,1.4912174 0.84226,0.9665299 1.2703,2.3196712 0.42803,1.339335 0.42803,2.982435 v 1.656908 H 98.668884 v -2.651053 h 7.966966 v -0.303766 q 0,-0.828454 -0.30377,-1.47741 -0.28995,-0.6627634 -0.88368,-1.0493753 -0.59373,-0.3866119 -1.51883,-0.3866119 -0.78703,0 -1.35314,0.3451892 -0.56611,0.3451892 -0.92511,0.96653 -0.34519,0.62134 -0.52469,1.463602 -0.16569,0.828454 -0.16569,1.822599 v 0.552303 q 0,0.897492 0.24854,1.656908 0.26234,0.759416 0.7318,1.311719 0.48326,0.552303 1.15983,0.856069 0.69038,0.303767 1.56026,0.303767 1.07699,0 2.0021,-0.414227 0.93891,-0.428035 1.61548,-1.284104 l 1.93306,2.09875 q -0.46946,0.676571 -1.2841,1.297912 -0.80084,0.62134 -1.93306,1.02176 -1.13222,0.386612 -2.58202,0.386612 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path214" /><path
d="M 116.78441,9.5272224 V 21.208426 h -3.97658 V 6.2686362 h 3.74186 z m 4.50127,-3.3552392 -0.069,3.6866209 q -0.28996,-0.041423 -0.70418,-0.069038 -0.40042,-0.041423 -0.7318,-0.041423 -0.84226,0 -1.46361,0.2209211 -0.60753,0.2071134 -1.02176,0.6213404 -0.40042,0.40042 -0.60753,1.007953 -0.1933,0.593725 -0.22092,1.353141 L 115.666,12.702963 q 0,-1.449795 0.28996,-2.664861 0.28996,-1.2288732 0.84226,-2.1401727 0.56611,-0.9112995 1.38076,-1.408372 0.81465,-0.4970725 1.86402,-0.4970725 0.33138,0 0.67657,0.05523 0.34519,0.041423 0.56611,0.1242681 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path216" /></g>
</svg> </svg>
#filter substitution
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<html>
<head>
<meta charset="UTF-8">
<!-- These localization links are not automatically applied to any XHR
response body and must be applied manually as well. They are included
so that viewing the file directly shows the results. -->
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/profile/default-bookmarks.ftl"/>
<title data-l10n-id="default-bookmarks-title">default-bookmarks-title</title>
</head>
<body>
<h1 data-l10n-id="default-bookmarks-heading">default-bookmarks-heading</h1>
<dl><p>
<dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">Bookmarks Toolbar</h3></dt>
</dl>
</body>
</html>
helpers/DATA/firefox/newtab/hnode.ico

1.37 KiB

helpers/DATA/firefox/newtab/hnode.png

62.3 KiB

...@@ -51,10 +51,18 @@ class RemoteSettings: ...@@ -51,10 +51,18 @@ class RemoteSettings:
DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE
_WRAPPER_NAME = 'data' _WRAPPER_NAME = 'data'
_LAST_MODIFIED_KEY_NAME = 'last_modified'
@classmethod
def get_collection_timestamp(cls, collection):
return max((record[cls._LAST_MODIFIED_KEY_NAME]
for record in collection.content), default=0)
@classmethod @classmethod
def wrap(cls, processed): def wrap(cls, processed):
return File(processed.path, {cls._WRAPPER_NAME: processed.content}) return File(processed.path,
{cls._WRAPPER_NAME: processed.content,
'timestamp': cls.get_collection_timestamp(processed)})
@classmethod @classmethod
def unwrap(cls, parsed_jsons): def unwrap(cls, parsed_jsons):
...@@ -88,13 +96,15 @@ class RemoteSettings: ...@@ -88,13 +96,15 @@ class RemoteSettings:
while timestamp in timestamps: while timestamp in timestamps:
timestamp += 1 timestamp += 1
timestamps.append(timestamp) timestamps.append(timestamp)
record['last_modified'] = timestamp record[cls._LAST_MODIFIED_KEY_NAME] = timestamp
if parsed_schema is not None: if parsed_schema is not None:
validate(record, schema=parsed_schema) validate(record, schema=parsed_schema)
result.append(record) result.append(record)
result.sort(
key=lambda record: record[cls._LAST_MODIFIED_KEY_NAME], reverse=True)
cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True) cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
return File(cls.OUTPUT_PATH, result) return File(cls.OUTPUT_PATH, result)
...@@ -109,7 +119,7 @@ class RemoteSettings: ...@@ -109,7 +119,7 @@ class RemoteSettings:
class Changes(RemoteSettings): class Changes(RemoteSettings):
JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json')) JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json'))
OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes.json' OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes'
@classmethod @classmethod
def wrap(cls, processed): def wrap(cls, processed):
...@@ -124,8 +134,8 @@ class Changes(RemoteSettings): ...@@ -124,8 +134,8 @@ class Changes(RemoteSettings):
for collection in unwrapped_jsons: for collection in unwrapped_jsons:
if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json': if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json':
latest_change = {} latest_change = {}
latest_change['last_modified'] = max( latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp(
(record['last_modified'] for record in collection.content), default=0) collection)
latest_change['bucket'] = collection.path.parent.name latest_change['bucket'] = collection.path.parent.name
latest_change['collection'] = collection.path.stem latest_change['collection'] = collection.path.stem
changes.append(latest_change) changes.append(latest_change)
......
...@@ -232,7 +232,7 @@ pref("browser.onboarding.updatetour", "performance,library,singlesearch,customiz ...@@ -232,7 +232,7 @@ pref("browser.onboarding.updatetour", "performance,library,singlesearch,customiz
pref("browser.onboarding.enabled", false); pref("browser.onboarding.enabled", false);
// New tab settings // New tab settings
pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.wikinews.org/wiki/"); pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.h-node.org/");
pref("browser.newtabpage.activity-stream.showTopSites",true); pref("browser.newtabpage.activity-stream.showTopSites",true);
pref("browser.newtabpage.activity-stream.feeds.section.topstories",false); pref("browser.newtabpage.activity-stream.feeds.section.topstories",false);
pref("browser.newtabpage.activity-stream.feeds.snippets",false); pref("browser.newtabpage.activity-stream.feeds.snippets",false);
......
...@@ -74,6 +74,12 @@ ...@@ -74,6 +74,12 @@
border-width: 1px 1px 1px 0px; border-width: 1px 1px 1px 0px;
} }
/* fix no cursor on dark theme*/
.caja-desktop.view .entry,
.caja-navigation-window .view .entry {
caret-color: #000;
}
/**************** /****************
* Mate-Panel * * Mate-Panel *
****************/ ****************/
......
...@@ -1758,17 +1758,17 @@ clean_sed ' ...@@ -1758,17 +1758,17 @@ clean_sed '
-EINVAL) -EINVAL)
}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware' }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware'
clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
clean_sed ' clean_sed "
/^int bnx2x_compare_fw_ver/,/^}$/{ /^int bnx2x_compare_fw_ver/,/^}$/{
/^ u32 my_fw = /i\ /[[:space:]]u32 my_fw = /i\\
/*(DEBLOBBED)*/ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /*(DEBLOBBED)*/
/^ u32 my_fw = /,/<< 24);/d; /[[:space:]]u32 my_fw = /,/<< 24);/d;
/^ u32 loaded_fw = /,/^$/{ /[[:space:]]u32 loaded_fw = /,/^$/{
/^$/i\ /^$/i\\
\ \\
u32 my_fw = ~loaded_fw; \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ u32 my_fw = ~loaded_fw;
} }
}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test' }" drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test'
clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
clean_sed ' clean_sed '
/static void bnx2x_init_wr_wb/{ /static void bnx2x_init_wr_wb/{
...@@ -3878,6 +3878,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo ...@@ -3878,6 +3878,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo
if $errors; then if $errors; then
echo errors above were ignored because of --force >&2 echo errors above were ignored because of --force >&2
else
echo cleaning up has completed successfully, without verification >&2
# Verification is largely manual, comparing the changes with
# those of a previous known (presumed) good version, e.g.
# git merge the previous known good version onto the current base
# version, and then git diff with this cleaned-up version.
# Creating a tarball of this version, named linux-*.*.tar,
# and running deblob-check on it may also help catch cleaning-up
# errors: .../deblob-check --use-awk -B linux-*.*.tar.
fi fi
exit 0 exit 0
...@@ -2281,7 +2281,7 @@ set_except () { ...@@ -2281,7 +2281,7 @@ set_except () {
defsnc 'static[ ]\(u16\|struct[ ]i2c_reg_u16\)[ ]\(bridge\|mt9\(v\(11[12]\|011\)\|m001\)\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c defsnc 'static[ ]\(u16\|struct[ ]i2c_reg_u16\)[ ]\(bridge\|mt9\(v\(11[12]\|011\)\|m001\)\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c
defsnc 'static[ ]\(u8\|struct[ ]i2c_reg_u8\)[ ]\(soi968\|ov\(76[67]0\|965[05]\)\|hv7131r\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c defsnc 'static[ ]\(u8\|struct[ ]i2c_reg_u8\)[ ]\(soi968\|ov\(76[67]0\|965[05]\)\|hv7131r\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c
defsnc 'static[ ]struct[ ]nand_ecclayout[ ]onenand_oob_128[ ]=' drivers/mtd/onenand/onenand_base.c defsnc 'static[ ]struct[ ]nand_ecclayout[ ]onenand_oob_128[ ]=' drivers/mtd/onenand/onenand_base.c
blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h' #blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h'
blob 'static[ ]int[ ]\(__devinit[ ]\)\?bnx2x_check_firmware[(]struct[ ]bnx2x[ ][*]bp[)][\n][{][^\n]*\([\n]\+[^\n}][^\n]*\)*[\n]\+[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' blob 'static[ ]int[ ]\(__devinit[ ]\)\?bnx2x_check_firmware[(]struct[ ]bnx2x[ ][*]bp[)][\n][{][^\n]*\([\n]\+[^\n}][^\n]*\)*[\n]\+[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c'
blobna 'if[ ][(][(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ][|][|][\n][ ]*[(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\)*[)][ ][{][^{}]*[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' blobna 'if[ ][(][(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ][|][|][\n][ ]*[(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\)*[)][ ][{][^{}]*[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c'
blobna 'sprintf[(]fw_file_name[ ][+][ ]offset,[ ]["]%d[.]%d[.]%d[.]%d[.]fw["]\(,[\n][ ]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)*[)][;]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' blobna 'sprintf[(]fw_file_name[ ][+][ ]offset,[ ]["]%d[.]%d[.]%d[.]%d[.]fw["]\(,[\n][ ]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)*[)][;]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c'
...@@ -2411,7 +2411,7 @@ set_except () { ...@@ -2411,7 +2411,7 @@ set_except () {
blob '#define[ ]_FW_NAME[(]api[)][ ]DRV_NAME[ ]["][.]["][ ]#api[ ]["]\.fw["]' drivers/media/video/iwmc3200top.h blob '#define[ ]_FW_NAME[(]api[)][ ]DRV_NAME[ ]["][.]["][ ]#api[ ]["]\.fw["]' drivers/media/video/iwmc3200top.h
blob '#define[ ]FW_FILE_VERSION\([ ]*[\\][\n][ ]__stringify[(]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ]["][.]["]\)\?\)\+' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' blob '#define[ ]FW_FILE_VERSION\([ ]*[\\][\n][ ]__stringify[(]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ]["][.]["]\)\?\)\+' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-["][ ]FW_FILE_VERSION[ ]["]\.fw' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-["][ ]FW_FILE_VERSION[ ]["]\.fw' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' #blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blob '#define[ ]FW_VERSION\([ ]__stringify[(]FW_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c blob '#define[ ]FW_VERSION\([ ]__stringify[(]FW_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c
blobname 'cxgb3[/]t3fw-["][ ]FW_VERSION[ ]["]\.bin' drivers/net/cxgb3/cxgb3_main.c blobname 'cxgb3[/]t3fw-["][ ]FW_VERSION[ ]["]\.bin' drivers/net/cxgb3/cxgb3_main.c
blob '#define[ ]TPSRAM_VERSION\([ ]__stringify[(]TP_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c blob '#define[ ]TPSRAM_VERSION\([ ]__stringify[(]TP_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c
...@@ -6164,12 +6164,26 @@ set_except () { ...@@ -6164,12 +6164,26 @@ set_except () {
   
# New in 5.12.9, 5.10.42. # New in 5.12.9, 5.10.42.
blobname '\(silead[/]\)\?gsl1680-chuwi-hi10-pro\.fw' drivers/platform/x86/touchscreen_dmi.c blobname '\(silead[/]\)\?gsl1680-chuwi-hi10-pro\.fw' drivers/platform/x86/touchscreen_dmi.c
# Added by Trisquel for nabia # Added by Trisquel for nabia
blobname '\(silead[/]\)\?gsl1680-chuwi-hibook\.fw' drivers/platform/x86/touchscreen_dmi.c blobname '\(silead[/]\)\?gsl1680-chuwi-hibook\.fw' drivers/platform/x86/touchscreen_dmi.c
blobna '[/][*][ ]linux-firmware\.git[ ]hash[ ][0-9a-f]*[ ][*][/]' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c blobna '[/][*][ ]linux-firmware\.git[ ]hash[ ][0-9a-f]*[ ][*][/]' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
blobname 'mediatek[/]WIFI_RAM_CODE_MT7922_1\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h blobname 'mediatek[/]WIFI_RAM_CODE_MT7922_1\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
blobname 'mediatek[/]WIFI_MT7922_patch_mcu_1_1_hdr\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h blobname 'mediatek[/]WIFI_MT7922_patch_mcu_1_1_hdr\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
   
# Backport bnx2x changes from 5.17 - Trisquel 10.0
blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)\(_V15\)\?[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)\(_V15\)\?[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h'
blob '#define[ ]FW_FILE_VERSION\(_V15\)\?\([ ]*[\\][\n][ ]__stringify[(]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\(_V15\)\?[)]\([ ]["][.]["]\)\?\)\+' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-["][ ]FW_FILE_VERSION\(_V15\)\?[ ]["]\.fw' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobna '\([,][\n \t]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)\+' drivers/net/wireless/broadcom/bnx2x/bnx2x_main.c
accept '[\t][\t][\t]goto[ ]request_firmware_exit[;]' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
blobna 'bp->fw_\(major\|minor\|eng\|rev\)[ ]=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?[;]\([\n][\t]*bp->fw_\(major\|minor\|eng\|rev\)[ ]=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?[;]\)*' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
blobna '\([,][\n \t]*bp->fw_\(major\|minor\|rev\)\)\+' drivers/net/wireless/broadcom/bnx2x/bnx2x_main.c
# Backport new in 5.16.3, 5.15.17, 5.10.94, 5.4.174, 4.19.226, 4.14.263. - Trisquel 10.0
accept 'static[ ]struct[ ]dvb_usb_device_properties[ ]\(p1100\|s660\|p7500\)_properties[ ]=[ ][{][\n]\([ ]\.\(caps\|usb_ctrl\|size_of_priv\)[ ]*=[ ][^",]*,[\n]*\)*[ ]\.firmware[ ]*=[ ]' drivers/media/usb/dvb-usb/dw2102.c
# New in 5.13-rc. # New in 5.13-rc.
# Sources are in cwsr_trap_handler_gfx9.asm. # Sources are in cwsr_trap_handler_gfx9.asm.
defsnc 'static[ ]const[ ]uint32_t[ ]cwsr_trap_aldebaran_hex\[\][ ]=' drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h defsnc 'static[ ]const[ ]uint32_t[ ]cwsr_trap_aldebaran_hex\[\][ ]=' drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
...@@ -6223,6 +6237,9 @@ set_except () { ...@@ -6223,6 +6237,9 @@ set_except () {
# New in 5.13.5 and 5.10.53. # New in 5.13.5 and 5.10.53.
blobna 'and[ ]booted[ ]am335x-pm-firmware\.elf\.[\n][ ][*][/]' Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt blobna 'and[ ]booted[ ]am335x-pm-firmware\.elf\.[\n][ ][*][/]' Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt
   
# Trisquel linux-hwe-5.13 adjustments
blobname 'gsl1680-rwc-nanote-p8\.fw' drivers/platform/x86/touchscreen_dmi.c
# New in 5.14-rc. # New in 5.14-rc.
accept '[ ]*nvidia,emc-registers[ ]=[ ]*<\(0x[0-9a-f]*[ \n]*\)*>[;]' Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml accept '[ ]*nvidia,emc-registers[ ]=[ ]*<\(0x[0-9a-f]*[ \n]*\)*>[;]' Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml
blobname 'msnv11\.bin' Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml blobname 'msnv11\.bin' Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml
......
...@@ -407,9 +407,12 @@ clean_sed ' ...@@ -407,9 +407,12 @@ clean_sed '
s,git://git\..*torvalds/linux\.git,/*(DEBLOBBED)*/, s,git://git\..*torvalds/linux\.git,/*(DEBLOBBED)*/,
' scripts/package/mkdebian 'upstream development repo' ' scripts/package/mkdebian 'upstream development repo'
clean_sed ' # The tarball name and its expansion do not include -libre.
s,Name: kernel,&-libre, # We could change KERNELPATH and keep this, but what else would break?
' scripts/package/mkspec 'package name' # Enabling this would require the other commented-out mkspec bits below.
# clean_sed '
# s,Name: kernel,&-libre,
# ' scripts/package/mkspec 'package name'
clean_sed ' clean_sed '
s,The Linux,The GNU Linux-libre, s,The Linux,The GNU Linux-libre,
...@@ -423,13 +426,22 @@ clean_sed ' ...@@ -423,13 +426,22 @@ clean_sed '
s,https\?://www\.kernel\.org,https://linux-libre.fsfla.org, s,https\?://www\.kernel\.org,https://linux-libre.fsfla.org,
' scripts/package/mkspec 'home page' ' scripts/package/mkspec 'home page'
# clean_sed '
# s,\(%description\) -n kernel-,\1 ,
# ' scripts/package/mkspec '-libre subpackages'
# clean_sed '
# /Provides: kernel-/{p;s,kernel-,&libre-,;}
# ' scripts/package/mkspec '-libre provides'
# As with rpms, we leave the package name as kernel.
clean_sed ' clean_sed '
s,\(%description\) -n kernel-,\1 , s,The upstream Linux kernel,The GNU Linux-libre kernel,
' scripts/package/mkspec '-libre subpackages' ' scripts/package/snapcraft.template 'description'
clean_sed ' clean_sed '
/Provides: kernel-/{p;s,kernel-,&libre-,;} s,Linux kernel,GNU Linux-libre,
' scripts/package/mkspec '-libre provides' ' scripts/package/snapcraft.template 'summary'
# Add reject_firmware and maybe_reject_firmware # Add reject_firmware and maybe_reject_firmware
grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h ||
...@@ -444,7 +456,7 @@ clean_sed '$i\ ...@@ -444,7 +456,7 @@ clean_sed '$i\
static inline int\ static inline int\
is_nonfree_firmware(const char *name)\ is_nonfree_firmware(const char *name)\
{\ {\
return strstr(name, NONFREE_FIRMWARE) != 0;\ return strstr(name, NONFREE_FIRMWARE) != 0;\
}\ }\
\ \
static inline int\ static inline int\
...@@ -460,6 +472,7 @@ firmware_reject_nowarn(const struct firmware **fw,\ ...@@ -460,6 +472,7 @@ firmware_reject_nowarn(const struct firmware **fw,\
{\ {\
const struct firmware *xfw = NULL;\ const struct firmware *xfw = NULL;\
int retval, retval0 = -ENOENT;\ int retval, retval0 = -ENOENT;\
if (fw) *fw = xfw;\
retval = firmware_request_nowarn(&xfw, NONFREE_FIRMWARE, device);\ retval = firmware_request_nowarn(&xfw, NONFREE_FIRMWARE, device);\
if (!retval) {\ if (!retval) {\
release_firmware(xfw);\ release_firmware(xfw);\
...@@ -494,6 +507,7 @@ reject_firmware_direct(const struct firmware **fw,\ ...@@ -494,6 +507,7 @@ reject_firmware_direct(const struct firmware **fw,\
{\ {\
const struct firmware *xfw = NULL;\ const struct firmware *xfw = NULL;\
int retval, retval0;\ int retval, retval0;\
if (fw) *fw = xfw;\
retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\
retval = request_firmware_direct(&xfw, NONFREE_FIRMWARE, device);\ retval = request_firmware_direct(&xfw, NONFREE_FIRMWARE, device);\
if (!retval) {\ if (!retval) {\
...@@ -534,6 +548,7 @@ reject_firmware_into_buf(const struct firmware **firmware_p, const char *name,\ ...@@ -534,6 +548,7 @@ reject_firmware_into_buf(const struct firmware **firmware_p, const char *name,\
{\ {\
const struct firmware *xfw = NULL;\ const struct firmware *xfw = NULL;\
int retval, retval0;\ int retval, retval0;\
if (firmware_p) *firmware_p = xfw;\
retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\
retval = request_firmware_into_buf(&xfw, NONFREE_FIRMWARE, device, buf, size);\ retval = request_firmware_into_buf(&xfw, NONFREE_FIRMWARE, device, buf, size);\
if (!retval) {\ if (!retval) {\
...@@ -3580,6 +3595,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo ...@@ -3580,6 +3595,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo
if $errors; then if $errors; then
echo errors above were ignored because of --force >&2 echo errors above were ignored because of --force >&2
else
echo cleaning up has completed successfully, without verification >&2
# Verification is largely manual, comparing the changes with
# those of a previous known (presumed) good version, e.g.
# git merge the previous known good version onto the current base
# version, and then git diff with this cleaned-up version.
# Creating a tarball of this version, named linux-*.*.tar,
# and running deblob-check on it may also help catch cleaning-up
# errors: .../deblob-check --use-awk -B linux-*.*.tar.
fi fi
exit 0 exit 0