Update for moving repositories to 'freedesktop.org'.

7 files changed, 92 insertions, 138 deletions

diff --git a/developer.html b/developer.html
index b05abe7..7a0df2a 100644
--- a/developer.html
+++ b/developer.html
@@ -67,52 +67,29 @@
               <p><a href="download.html">Download a source
                   archive</a></p>
 
-              <p>Use this to browse, compile, and use the source
-                locally.</p>
-            </li>
-            <li class="emph">
-              <p><a href="https://git.savannah.gnu.org/cgit/freetype/">Use
-                  the cgit page</a></p>
-
-              <p>It will let you view our source code and the changes
-                that occurred lately.</p>
+              <p>This is for browsing, compiling, and using the source
+                code locally.</p>
             </li>
             <li class="emph">
               <p>Use git access</p>
 
-              <p>The complete FreeType repositories can be downloaded
-                using git.  Enter these commands for anonymous
-                read-only access of the repositories:</p>
-
-              <div class="quote">
-                <tt>git clone git://git.sv.nongnu.org/freetype/freetype2.git<br>
-                  git clone git://git.sv.nongnu.org/freetype/freetype2-demos.git</tt>
-              </div>
-
-              <p>If you are behind a Firewall which disables port
-                9418, you might try the HTTP protocol:</p>
-
-              <div class="quote">
-                <tt>git clone https://git.sv.nongnu.org/r/freetype/freetype2.git<br>
-                  git clone https://git.sv.nongnu.org/r/freetype/freetype2-demos.git</tt>
-              </div>
+              <p>FreeType's git repositories are available
+                from <a href="https://gitlab.freedesktop.org/freetype">freedesktop.org's
+                gitlab instance</a>.</p>
 
-              <p>Please read</p>
-        
               <div class="quote">
-                <a href="https://sv.nongnu.org/maintenance/UsingGit">https://sv.nongnu.org/maintenance/UsingGit</a>
+                <tt>git clone https://gitlab.freedesktop.org/freetype/freetype.git<br>
+                  git clone https://gitlab.freedesktop.org/freetype/freetype-demos.git</tt>
               </div>
-
-              <p>for more details on the git setup of Savannah (for
-                example, how to check out the git repositories with a
-                CVS client, if necessary).</p>
             </li>
             <li class="emph">
               <p>Use anonymous CVS access</p>
 
               <p>Other, no longer maintained FreeType repositories
-                which exist for historical interest only can be
-                downloaded through CVS and
+                (which exist for historical interest only) can be
+                downloaded
+                from <a href="https://savannah.nongnu.org/">Savannah</a>
+                through CVS and
                 viewed <a href="https://cvs.savannah.gnu.org/viewvc/?root=freetype">here</a>.
                 Use the following value for the <tt>CVSROOT</tt>
                 environment variable (or the equivalent <tt>-d</tt>
@@ -142,16 +119,16 @@
         <div id="bug-report">
           <h2>Reporting a Bug</h2>
 
-          <p>In case you find a bug which you think is related to
+          <p>In case you find a bug, which you think is related to
             FreeType, please check the problematic font with one of
             our demo programs, for example <b>ftview</b>
-            or <b>ftstring</b>.  In case the problem persists, go to
-            the <a href="https://savannah.nongnu.org/bugs/?group=freetype">Savannah
-            bug database for FreeType</a> and check whether the
-            problem has been reported already.  Otherwise, please
-            submit a bug report.  It might be useful to use the git
-            version (see above) of FreeType for testing since we don't
-            release FreeType very often.</p>
+            or <b>ftstring</b>.  In case the problem persists, consult
+            <a href="https://gitlab.freedesktop.org/groups/freetype/-/issues">FreeType's
+            issue list</a> to find out whether the problem has been
+            reported already.  Otherwise, please submit a new issue.
+            It is helpful to use the git version (see above) of
+            FreeType and its demo programs for testing if possible
+            since we don't release FreeType very often.</p>
         </div>
 
 
@@ -160,7 +137,9 @@
         <div id="patches">
           <h2>Submitting Patches</h2>
 
-          <p>Please submit patches to
+          <p>For larger changes please
+            provide <a href="https://gitlab.freedesktop.org/groups/freetype/-/merge_requests">merge
+            requests</a>.  Alternatively, you can submit patches to
             the <a href="mailto:freetype-devel@nongnu.org">freetype-devel@nongnu.org</a>
             mailing list &ndash; and thank you in advance for your
             work on improving FreeType!<p>
@@ -231,9 +210,9 @@
 
           <p>Bindings are
             available <a href="https://github.com/rougier/freetype-py/">here</a>.
-            The Python Imaging Library
-            (<a href="https://www.pythonware.com/products/pil/">PIL</a>)
-            can be built to use FreeType for font rendering, giving
+            <a href="https://pypi.org/project/Pillow/">Pillow</a>, the
+            successor of the Python Imaging Library (PIL), can be
+            built to use FreeType for font rendering, giving
             high-level access to fonts.</p>
 
           <p>A more extensive set of Python bindings, designed to work
@@ -285,7 +264,7 @@
           <p>One of the simplest way to compile FreeType is from the
             command line using one of the following tools.</p>
 
-        
+
           <h3>GNU Make</h3>
 
           <p>FreeType comes with a sophisticated build system that is
@@ -329,51 +308,29 @@
             binaries of GNU Make for Windows.</p>
 
 
-          <h3>FT&nbsp;Jam</h3>
+          <h3>Meson</h3>
 
-          <p>Unfortunately, the GNU Make-based build system described
-            above is rather complex due to various technical reasons,
-            one of them being the <em>really</em> weird syntax used in
-            Makefiles.  Since release 2.0.2, the FreeType library can
-            also be created with an alternative build tool
-            named <b>Jam</b>.</p>
+          <p>Right now, support for
+            <a href="https://mesonbuild.com/">Meson</a> is
+            experimental and available for the library only, without
+            the demo programs.  It is planned to fix this eventually,
+            making Meson a first-class build system.</p>
 
-          <p>Briefly, Jam is a small, efficient, portable and
-            open-source replacement for <tt>make</tt> that is both a
-            lot easier to use and more powerful.</p>
 
-          <ul>
-            <li>
-              <p>Jam control files (named <em>Jamfiles</em>) are
-              portable among platforms and compilers and thus do not
-              need to be edited for each specific build (unlike the
-              ugly <tt>Makefile.in</tt> trick used commonly on
-              Unix).</p>
-            </li>
-            <li>
-              <p>The syntax of Jamfiles is simple, expressive and
-              allows you to define your own functions.</p>
-            </li>
-            <li>
-              <p>Jam performs lots of nifty things for you, like
-              automatic header dependencies computations.</p>
-            </li>
-            <li>
-              <p>Jam only does project builds, it is not a
-              configuration tool and is trivially compatible with
-              Autoconf on Unix.</p>
-            </li>
-          </ul>
+          <h3>CMake</h3>
+
+          <p>FreeType can also be built with
+            <a href="https://cmake.org/">CMake</a>.  Note, however,
+            that this is contributed code not officially
+            supported.</p>
 
-          <p>Find more information on <a href="jam/index.html">the
-              FT&nbsp;Jam page</a>.</p>
         </div>
 
 
         <!-- ************************************************** -->
 
         <div class="updated">
-          <p>Last update: 14-Jul-2020</p>
+          <p>Last update: 16-Jan-2021</p>
         </div>
       </div>
     </div>
diff --git a/download.html b/download.html
index c33c6cf..5196e37 100644
--- a/download.html
+++ b/download.html
@@ -75,8 +75,8 @@
           <p>Windows DLLs of FreeType can also be downloaded
             directly
             from <a href="https://github.com/ubawurinna/freetype-windows-binaries">a
-            github repository</a> (version 2.7.1, built with VS Express
-            2012).  Older DLLs compiled with MinGW are available from
+            github repository</a> (version 2.10.4, built with VS Express
+            2017).  Older DLLs compiled with MinGW are available from
             <a href="http://gnuwin32.sourceforge.net/packages/freetype.htm">download
             page</a> (version 2.3.5) of
             the <a href="http://gnuwin32.sourceforge.net/">GnuWin32</a>
@@ -99,19 +99,22 @@
         <div id="snapshots">
           <h2>Development Versions</h2>
 
-          <p>Using
-            Savannah's <a href="https://git.savannah.gnu.org/cgit/freetype/">cgit</a>
-            interface you can download snapshots created on the fly
-            for any commit entry.</p>
-
-          <p>Downloading and compiling a development snapshot is one
-            of the first things to do when you encounter something
-            that looks like a bug in FreeType.  Note that we do not
-            guarantee that all development snapshots work on a given
-            day, though this should be the normal case.</p>
-
-          <p>For more details on compilation, please read the file
-            <a href="https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/README.git"><code>README.git</code></a>,
+          <p>The gitlab instance of freedesktop.org provides snapshots
+            of both
+            the <a href="https://gitlab.freedesktop.org/freetype/freetype">freetype.git</a>
+            and <a href="https://gitlab.freedesktop.org/freetype/freetype-demos">freetype-demos.git</a>
+            repositories.</p>
+
+          <p>Downloading and compiling a development snapshot (or
+            using the git repositories directly) is one of the first
+            things to do when you encounter something that looks like
+            a bug in FreeType.  Note that we do not guarantee that all
+            development snapshots work on a given day, though such
+            glitches should happen very rarely.</p>
+
+          <p>For more details on compilation from git, please read the
+            file
+            <a href="https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/README.git"><code>README.git</code></a>,
             located in FreeType's top directory.</p>
         </div>
 
@@ -148,7 +151,7 @@ This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.</pre>
 
-          <p>Newer version work also, of course.</p>
+          <p>Newer versions work also, of course.</p>
 
 
           <h3>Project Files</h3>
@@ -167,33 +170,8 @@ PARTICULAR PURPOSE.</pre>
 
         <!-- ************************************************** -->
 
-        <div id="ftjam">
-          <h3>FreeType Jam for Win32 and GNU/Linux</h3>
-
-          <p>Since release 2.0.2, FreeType and its demo programs can
-            be compiled with an alternative build tool called
-            &lsquo;jam&rsquo;.  Jam is a small, portable, and
-            open-source replacement for &lsquo;make&rsquo; that is a
-            lot easier to use, and which transparently supports
-            multiple platforms <em>and</em> compilers.</p>
-
-          <p>Binaries are available from
-            the <a href="https://sourceforge.net/projects/freetype/files">download
-            page on SourceForge</a>.</p>
-
-          <p><a href="jam/index.html">This page</a> gives more
-            information regarding Jam and FreeType.</p>
-
-          <p class="warning">Due to lack of resources, there is no Jam
-            support currently for FreeType.  Volunteers are highly
-            welcomed.</p>
-        </div>
-
-
-        <!-- ************************************************** -->
-
         <div class="updated">
-          <p>Last update: 13-Feb-2018</p>
+          <p>Last update: 16-Jan-2021</p>
         </div>
       </div>
     </div>
diff --git a/freetype2/docs/index.html b/freetype2/docs/index.html
index 5c3e3d6..89e0dc2 100644
--- a/freetype2/docs/index.html
+++ b/freetype2/docs/index.html
@@ -73,9 +73,9 @@
 
           <p>FreeType is released under two open-source licenses: our
             own
-            BSD-like <a href="http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT">FreeType
+            BSD-like <a href="https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT">FreeType
               License</a> and
-            the <a href="http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/GPLv2.TXT">GNU
+            the <a href="https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/GPLv2.TXT">GNU
               Public License, Version&nbsp;2</a>.  It can thus be used
             by any kind of projects, be they proprietary or not.</p>
 
@@ -245,7 +245,7 @@
         <!-- ************************************************** -->
 
         <div class="updated">
-          <p>Last update: 17-Aug-2020</p>
+          <p>Last update: 16-Jan-2021</p>
         </div>
       </div>
     </div>
diff --git a/freetype2/docs/tutorial/step2.html b/freetype2/docs/tutorial/step2.html
index b5ef3f6..becab1f 100644
--- a/freetype2/docs/tutorial/step2.html
+++ b/freetype2/docs/tutorial/step2.html
@@ -1327,7 +1327,7 @@ for ( n = 0; n &lt; num_glyphs; n++ )
 
           <p>This code is the basis of the FreeType&nbsp;2
             demonstration program
-            named <a href="http://git.savannah.gnu.org/cgit/freetype/freetype2-demos.git/tree/src/ftstring.c"><code>ftstring.c</code></a>.
+            named <a href="https://gitlab.freedesktop.org/freetype/freetype-demos/-/blob/master/src/ftstring.c"><code>ftstring.c</code></a>.
             It could be easily extended to perform advanced text
             layout or word-wrapping in the first part, without
             changing the second one.</p>
@@ -1342,13 +1342,13 @@ for ( n = 0; n &lt; num_glyphs; n++ )
 
           <p>A FreeType demo program that shows how glyph caching can
             be implemented
-            is <a href="http://git.savannah.gnu.org/cgit/freetype/freetype2-demos.git/tree/src/ftview.c"><code>ftview.c</code></a>.
+            is <a href="https://gitlab.freedesktop.org/freetype/freetype-demos/-/blob/master/src/ftview.c"><code>ftview.c</code></a>.
             In general, &lsquo;ftview&rsquo; is the main program used
             by the FreeType developer team to check the validity of
             loading, parsing, and rendering fonts.</p>
 
           <p>Another very useful demo program
-            is <a href="http://git.savannah.gnu.org/cgit/freetype/freetype2-demos.git/tree/src/ftdiff.c"><code>ftdiff.c</code></a>,
+            is <a href="https://gitlab.freedesktop.org/freetype/freetype-demos/-/blob/master/src/ftstring.c"><code>ftdiff.c</code></a>,
             demonstrating the use and the optical results of the
             various rendering and hinting modes provided by FreeType.
             In particular, it also demonstrates how to do sub-pixel
@@ -1523,7 +1523,7 @@ pixels_y = design_y * y_scale;</pre>
         <!-- ************************************************** -->
 
         <div class="updated">
-          <p>Last update: 13-Feb-2018</p>
+          <p>Last update: 16-Jan-2021</p>
         </div>
       </div>
     </div>
diff --git a/gsoc.html b/gsoc.html
index 175838c..bdb62f6 100644
--- a/gsoc.html
+++ b/gsoc.html
@@ -96,7 +96,7 @@
                 2020 project</a> now provides a good framework that
                 can act as a starting point for better integration.
                 In addition, we are moving to the gitlab instance
-                of <a href="https://gitlab.freedesktop.org/freetype/freetype">freedesktop.org</a>;
+                of <a href="https://gitlab.freedesktop.org/freetype">freedesktop.org</a>;
                 this implies that access to its CI abilities should be
                 straightforward.</p>
 
@@ -324,7 +324,7 @@
         <!-- ************************************************** -->
 
         <div class="updated">
-          <p>Last update: 15-Jan-2021</p>
+          <p>Last update: 16-Jan-2021</p>
         </div>
       </div>
     </div>
diff --git a/index.html b/index.html
index 718042b..c2e38bb 100644
--- a/index.html
+++ b/index.html
@@ -101,6 +101,25 @@
           <h2>News &amp; Updates</h2>
 
 
+          <h4>FreeType moved to freedesktop.org</h4>
+          <div class="date">2021-01-16</div>
+
+          <p>We are now using the infrastructure of
+            the <a href="https://gitlab.freedesktop.org/freetype">gitlab
+              instance of freedesktop.org</a>.  All bug issues have been
+            imported (kudos to Anurag Thakur for doing this tedious
+            job!), together with the git repositories, which have been
+            renamed
+            to <a href="https://gitlab.freedesktop.org/freetype/freetype">freetype</a>
+            and <a href="https://gitlab.freedesktop.org/freetype/freetype-demos">freetype-demos</a>
+            (this is, we are dropping the&nbsp;&lsquo;2&rsquo; in the
+            repository names).</p>
+
+          <p>The git repositories
+            at <a href="https://savannah.nongnu.org/projects/freetype/">Savannah</a>
+            will stay as mirrors.</p>
+
+
           <h4>FreeType 2.10.4</h4>
           <div class="date">2020-10-20</div>
 
@@ -243,8 +262,8 @@
           <p>The FreeType project was accepted to be part
             of <a href="https://developers.google.com/open-source/gsoc/">Google
             Summer of Code</a> 2017!  Here's <a href="gsoc.html">a
-            link</a> to our ideas list – if you have another one,
-            please write to
+            link</a> to our ideas list &ndash; if you have another
+            one, please write to
             our <a href="mailto:freetype-devel@nongnu.org">mailing
             list</a> so that we can discuss your suggestions,
             eventually adding them to the list.  And if you want to
diff --git a/license.html b/license.html
index 09c6013..c3c95f6 100644
--- a/license.html
+++ b/license.html
@@ -61,7 +61,7 @@
 
           <ul>
             <li>
-              <p>The <a href="https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT">FreeType
+              <p>The <a href="https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT">FreeType
                   License</a> (FTL) is the most commonly used one.  It
                 is a BSD-style license with a credit clause and thus
                 compatible with the GNU Public License (GPL)
@@ -69,7 +69,7 @@
                 version&nbsp;2.</p>
             </li>
             <li>
-              <p>The <a href="https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/GPLv2.TXT">GNU
+              <p>The <a href="https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/GPLv2.TXT">GNU
                   General Public License</a> (GPL), version&nbsp;2.
                 Use it for all projects which use the GPLv2 also, or
                 which need a license compatible to the GPLv2.</p>
@@ -80,7 +80,7 @@
         <!-- ************************************************** -->
 
         <div class="updated">
-          <p>Last update: 13-Feb-2018</p>
+          <p>Last update: 16-Jan-2021</p>
         </div>
       </div>
     </div>