merge upstream changes

git-svn-id: https://xpra.org/svn/Xpra/trunk@21584 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Feb 7, 2019 · 52a4f45 · 52a4f45
1 parent 6ecd135
commit 52a4f45
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/osx/jhbuild/modulesets-stable/gtk-osx-unsupported.modules b/osx/jhbuild/modulesets-stable/gtk-osx-unsupported.modules
@@ -6,7 +6,7 @@
               href="http://ftp.gnome.org/pub/GNOME/sources/"/>
   <repository type='tarball' name='gnupg.org' href="https://gnupg.org/ftp/" />
   <repository type="tarball" name="iso-codes"
-	      href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
+	      href="http://salsa.debian.org/iso-codes-team/iso-codes/-/archive/"/>
   <repository type='tarball' name='github-tarball'
               href='https://github.com/'/>
   <repository type="tarball" name="curl.haxx.se"
@@ -31,7 +31,7 @@
 
   <!-- Iso-codes >= 3.68 requires Python3, a dependency too far. -->
   <autotools id="iso-codes" autogen-sh="configure">
-    <branch module="iso-codes-3.67.tar.xz" version="3.67"
+    <branch checkoutdir="iso-codes-iso-codes-3.67-080f941e075fef791b22feae659e8a510f57fe2c" module="iso-codes-3.67/iso-codes-3.67.tar.bz2" version="3.67"
 	    repo="iso-codes"/>
   </autotools>