Skip to content

Commit

Permalink
#1575: reduce our diff against upstream
Browse files Browse the repository at this point in the history 
git-svn-id: https://xpra.org/svn/Xpra/trunk@17847 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
@totaam
totaam committed Jan 3, 2018
1 parent 0442a43 commit 1526621
Show file tree
Hide file tree
Showing 4 changed files with 309 additions and 390 deletions.
88 changes: 33 additions & 55 deletions osx/jhbuild/modulesets-stable/bootstrap.modules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@
<repository type="tarball" name="intltool"
href="http://launchpad.net/intltool/trunk/"/>

<autotools id="make" bootstrap="true">
<branch repo="ftp.gnu.org" module="make/make-3.82.tar.gz" version="3.82"/>
</autotools>

<autotools id='readline' autogen-sh="configure">
<branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
version="6.3">
<branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
version="7.0">
</branch>
</autotools>

Expand All @@ -40,29 +36,21 @@
</autotools>

<autotools id="xz" autogen-sh="configure" bootstrap="true">
<branch repo="tukaani.org" module="xz/xz-5.2.1.tar.bz2" version="5.2.1"/>
<branch repo="tukaani.org" module="xz/xz-5.2.3.tar.bz2" version="5.2.3"/>
</autotools>

<autotools id="apr">
<branch repo="apache.org" module="apr/apr-1.4.5.tar.bz2" version="1.4.5"/>
<branch repo="apache.org" module="apr/apr-1.5.2.tar.bz2" version="1.5.2"/>
</autotools>

<autotools id="apr-util" autogenargs="--with-apr=$PREFIX/bin/apr-1-config">
<branch repo="apache.org" module="apr/apr-util-1.3.12.tar.bz2"
version="1.3.12"/>
<dependencies>
<branch repo="apache.org" module="apr/apr-util-1.5.4.bz2"
version="1.5.4" />
<dependencies>
<dep package="apr"/>
</dependencies>
</autotools>

<autotools id="subversion">
<branch repo="apache.org" module="subversion/subversion-1.5.9.tar.bz2"
version="1.5.9"/>
<dependencies>
<dep package="apr-util"/>
</dependencies>
</autotools>

<autotools id="gettext-tools" autogen-sh="configure"
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib">
<branch repo="ftp.gnu.org" source-subdir="gettext-tools"
Expand All @@ -72,29 +60,22 @@
<!-- cmakes ./configure is picky about invalid flags so we manually set it -->
<autotools id="cmake" autogen-sh="bootstrap"
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
<branch repo="cmake" module="v3.2/cmake-3.2.1.tar.gz" version="3.2.1">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/cmake-libnetwork.patch" strip="1"/>
<branch repo="cmake" module="v3.10/cmake-3.10.0.tar.gz" version="3.10.0">
</branch>
</autotools>

<autotools id="m4" autogen-sh="configure" bootstrap="true">
<branch repo="ftp.gnu.org"
module="m4/m4-1.4.17.tar.xz" version="1.4.17"/>
</autotools>

<autotools id="autoconf" autogen-sh="configure" bootstrap="true">
<branch repo="ftp.gnu.org"
module="autoconf/autoconf-2.69.tar.xz" version="2.69"/>
<dependencies>
<dep package="xz"/>
<dep package="m4"/>
</dependencies>
</autotools>

<autotools id="autoconf-archive" autogen-sh="configure">
<branch repo="ftp.gnu.org"
module="autoconf-archive/autoconf-archive-2016.09.16.tar.xz"
version="2016-09.16"/>
module="autoconf-archive/autoconf-archive-2017.03.21.tar.xz"
version="2017-03-21"/>
</autotools>

<autotools id="libtool" autogen-sh="configure" bootstrap="true">
Expand Down Expand Up @@ -154,38 +135,38 @@
<autotools id="pkg-config" autogen-sh="configure"
autogenargs="--with-internal-glib">
<branch repo="pkgconfig"
module="pkg-config-0.28.tar.gz" version="0.28"/>
module="pkg-config-0.29.2.tar.gz" version="0.29.2"/>
</autotools>

<!-- 10.5-10.10 have 2.3, gstreamer requires 2.4. -->
<!-- MacOS provides 2.3 (presumably the last GPL2 version, gstreamer
requires 2.4. -->
<autotools id="bison" autogen-sh="configure">
<branch repo="ftp.gnu.org" module="bison/bison-3.0.2.tar.xz"
version="3.0.2"/>
</autotools>

<autotools id="bison2" autogen-sh="configure">
<branch repo="ftp.gnu.org" module="bison/bison-2.7.1.tar.xz"
version="2.7.1"/>
<branch repo="ftp.gnu.org" module="bison/bison-3.0.4.tar.xz"
version="3.0.4">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/bison-3.0.4-vasnprintf.patch" strip="1"/>
</branch>
<dependencies>
<dep package='flex'/>
</dependencies>
</autotools>

<!-- 10.4 has 2.5.4, too old for gstreamer (and probably others as well)
10.6-10.10 have 2.5.35, 10.5 2.5.33 -->

<!-- MacOS hasn't updated flex since 2012. Since it's BSD-licensed
it must be just because Apple doesn't use it and doesn't
care. We'll provide something more up-to-date. -->
<autotools id="flex" autogen-sh="configure">
<branch repo="sourceforge" module="flex/flex-2.5.37.tar.bz2"
version="2.5.37"/>
<branch module="flex/flex-2.6.0.tar.xz" version="2.6.0"
repo="sourceforge" />
</autotools>

<!-- Expat could be skipped for >= 10.5 since it's is part of the SDK there. -->

<autotools id="expat" autogen-sh="configure">
<branch module="expat/expat-2.2.0.tar.gz" version="2.2.0"
hash="sha256:d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff"/>
<branch module="expat/expat-2.2.0.tar.bz2" version="2.2.0"
repo="sourceforge"/>
</autotools>

<perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
<branch repo="cpan"
module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
version="2.41"/>
module="authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz"
version="2.44"/>
<dependencies>
<dep package="expat"/>
</dependencies>
Expand All @@ -203,8 +184,8 @@

<!-- Needed for building Gnome apps from the repository -->
<autotools id="gnome-common">
<branch module="gnome-common/3.14/gnome-common-3.14.0.tar.xz" version="3.14.0"
hash="sha256:4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c"/>
<branch module="gnome-common/3.18/gnome-common-3.18.0.tar.xz" version="3.18.0"
hash="sha256:22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"/>
</autotools>
<!-- This is generated by tarring up the needed docbook stylesheets
for gtk-doc to work. If someone wants to work on a setup that
Expand All @@ -215,7 +196,7 @@
-->
<autotools id="gtk-osx-docbook" autogen-sh="configure"
supports-non-srcdir-builds="no" >
<branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.2.tar.gz"
<branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.2.tar.bz2"
version="1.2"/>
</autotools>

Expand All @@ -232,13 +213,10 @@
<metamodule id="meta-bootstrap">
<dependencies>
<dep package="xz"/>
<dep package="make"/> <!-- Needed for Tiger, skipped otherwise -->
<dep package="subversion"/> <!-- Needed for Tiger, skipped otherwise -->
<dep package="gettext-tools" /> <!-- Needed for 64-bit -->
<dep package="readline" />
<dep package="bash" /> <!-- Needed for El Cap and later to work around SIP. -->
<dep package="cmake"/>
<dep package="m4"/> <!-- Can be skipped for Leopard and later -->
<dep package="autoconf" />
<dep package="autoconf-archive" />
<dep package="libtool" />
Expand Down
60 changes: 32 additions & 28 deletions osx/jhbuild/modulesets-stable/gtk-osx-bootstrap.modules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<moduleset>

<repository type="tarball" name="ftp.gnome.org" default="yes"
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
<repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
<repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="tarball" name="jpeg"
href="http://www.ijg.org/files/"/>
href="http://www.ijg.org/files/"/>
<repository type="tarball" name="libtiff"
href="http://download.osgeo.org/"/>
<repository type="tarball" name="fontconfig"
Expand All @@ -28,6 +28,12 @@
<repository type="tarball" name="ragel"
href="http://www.colm.net/files/ragel/"/>

<autotools id='readline' autogen-sh="configure">
<branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
version="7.0">
</branch>
</autotools>

<autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
<branch version="1.6.29" module="libpng/libpng-1.6.34.tar.xz"
repo="sourceforge" hash="sha256:2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"/>
Expand Down Expand Up @@ -70,7 +76,7 @@
</autotools>

<autotools id="libxslt" autogen-sh="configure">
<branch version="1.1.28" module="libxslt-1.1.28.tar.gz"
<branch version="1.1.29" module="libxslt-1.1.29.tar.gz"
repo="xmlsoft.org"/>
<dependencies>
<dep package="libxml2"/>
Expand All @@ -86,8 +92,8 @@
</autotools>

<autotools id="yelp-xsl">
<branch version="3.16.1" module="yelp-xsl/3.16/yelp-xsl-3.16.1.tar.xz"
hash="sha256:3295eecc4b03d2a239f7a1bdf4a1311d34c46c3055e6535c1f72bb5a49b4174a"/>
<branch version="3.20.1" module="yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz"
hash="sha256:dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"/>
<dependencies>
<dep package="libxml2"/>
<dep package="libxslt"/>
Expand All @@ -96,8 +102,8 @@
</autotools>

<autotools id="yelp-tools">
<branch version="3.16.1" module="yelp-tools/3.16/yelp-tools-3.16.1.tar.xz"
hash="sha256:b4f66c145af1c6448dc51037d305d6844da13dc31d07729b8e29005ee4fef89c"/>
<branch version="3.18.0" module="yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
hash="sha256:c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"/>
<dependencies>
<dep package="libxml2"/>
<dep package="libxslt"/>
Expand All @@ -108,8 +114,8 @@

<autotools id="gtk-doc" autogen-sh="configure"
autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/share/xml/catalog">
<branch version="1.21" module="gtk-doc/1.21/gtk-doc-1.21.tar.xz"
hash="sha256:5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e"/>
<branch version="1.25" module="gtk-doc/1.25/gtk-doc-1.25.tar.xz"
hash="sha256:1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42"/>
<dependencies>
<dep package="libxml2"/>
<dep package="itstool"/>
Expand All @@ -119,35 +125,39 @@

<autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
<branch repo="icu" version="55.1" checkoutdir="icu"
module="icu4c/55.1/icu4c-55_1-src.tgz"/>
<branch repo="icu" version="58.2" checkoutdir="icu"
module="icu4c/58.2/icu4c-58_2-src.tgz"/>
</autotools>


<autotools id="ragel" autogen-sh='autoreconf'>
<branch repo="ragel" module="ragel-6.9.tar.gz" version="6.9">
<branch repo="ragel" module="ragel-6.10.tar.gz" version="6.10">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/ragel-6.9-setiosflags.patch" strip="1"/>
</branch>
</autotools>

<autotools id="harfbuzz" autogen-sh="configure"
autogenargs="--with-coretext --with-freetype --with-icu">
<branch repo="harfbuzz" module="harfbuzz-0.9.40.tar.bz2" version="0.9.40">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch" strip="1"/>
<branch repo="harfbuzz" module="harfbuzz-1.4.5.tar.bz2" version="1..45">
<!--patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch" strip="1"/-->
</branch>
<dependencies>
<dep package="freetype-no-harfbuzz"/>
<dep package="ragel"/>
<dep package="glib"/>
<dep package="icu"/>
</dependencies>
<after>
<dep package="icu55"/>
</after>
</autotools>

<autotools id="freetype-no-harfbuzz" autogen-sh="configure"
skip-autogen="never"
autogenargs="--without-bzip2 --without-harfbuzz">
<branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
repo="sourceforge">
<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/freetype-2.5.3-ccexe_cflags.patch" strip="1"/>
<branch module="freetype/freetype-2.7.1.tar.gz" version="2.7.1"
repo="sourceforge">
<!--patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/freetype-2.5.3-ccexe_cflags.patch" strip="1"/-->
</branch>
<dependencies>
<dep package="zlib"/>
Expand All @@ -156,7 +166,7 @@

<autotools id="freetype" autogen-sh="configure" skip-autogen="never"
autogenargs="--without-bzip2">
<branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
<branch module="freetype/freetype-2.7.1.tar.gz" version="2.7.1"
repo="sourceforge">
</branch>
<dependencies>
Expand All @@ -166,9 +176,9 @@
</autotools>

<autotools id="fontconfig" autogen-sh="autoreconf"
autogenargs="--disable-docs">
<branch repo="fontconfig" version="2.11.1"
module="fontconfig-2.11.1.tar.bz2"/>
autogenargs="--disable-docs">
<branch repo="fontconfig" version="2.12.1"
module="fontconfig-2.12.1.tar.bz2"/>
<dependencies>
<dep package="freetype"/>
</dependencies>
Expand All @@ -186,12 +196,6 @@
module="gettext/gettext-0.19.8.tar.xz" version="0.19.8"/>
</autotools>

<autotools id='readline' autogen-sh="configure">
<branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
version="7.0">
</branch>
</autotools>

<metamodule id="meta-gtk-osx-bootstrap">
<dependencies>
<dep package="libpng"/>
Expand Down
Loading

0 comments on commit 1526621

Please sign in to comment.