#1575: reduce our diff against upstream

git-svn-id: https://xpra.org/svn/Xpra/trunk@17848 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Jan 3, 2018 · 1cf9716 · 1cf9716
1 parent 1526621
commit 1cf9716
Showing 1 changed file with 27 additions and 54 deletions.
diff --git a/osx/jhbuild/modulesets-stable/gtk-osx.modules b/osx/jhbuild/modulesets-stable/gtk-osx.modules
@@ -7,7 +7,7 @@
   <repository type="tarball" name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="cairographics"
-              href="https://cairographics.org/releases/"/>
+              href="http://cairographics.org/releases/"/>
   <repository type="tarball" name="ftp.gnu.org"
               href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="sourceware.org"
@@ -53,8 +53,8 @@
   <include href="gtk-osx-random.modules"/>
   <include href="gtk-osx-themes.modules"/>
   <include href="gtk-osx-unsupported.modules"/>
-  <include href="gtk-osx-universal.modules"/>
   <include href="http://xpra.org/svn/Xpra/trunk/osx/jhbuild/xpra.modules"/> <!--include for simplicity-->
+
   <metamodule id="meta-gtk-osx-core">
     <dependencies>
       <dep package="gtk+"/>
@@ -101,44 +101,27 @@
             version="3.2.1"/>
   </autotools>
 
-  <autotools id="xorg-util-macros">
-    <branch repo="freedesktop" version="1.19.0"
-            module="xorg/individual/util/util-macros-1.19.0.tar.bz2"/>
-  </autotools>
-
-  <autotools id="libepoxy" autogen-sh="configure">
-    <branch repo="github-tarball" module="anholt/libepoxy/releases/download/1.4.2/libepoxy-1.4.2.tar.xz"
-    	version="1.4.2"
-    	hash="sha256:bea6fdec3d10939954495da898d872ee836b75c35699074cbf02a64fcb80d5b3"/>
-    <dependencies>
-      <dep package="xorg-util-macros"/>
-    </dependencies>
-  </autotools>
 
   <autotools id="gobject-introspection" autogen-sh="configure">
-    <branch module="gobject-introspection/1.48/gobject-introspection-1.48.0.tar.xz"
-            version="1.48.0"
-            hash="sha256:fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877">
+    <branch module="gobject-introspection/1.52/gobject-introspection-1.52.1.tar.xz"
+            version="1.52.1"
+            hash="sha256:2ed0c38d52fe1aa6fc4def0c868fe481cb87b532fc694756b26d6cfab29faff4">
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/girscanner-objc.patch" strip="1"/>
             <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gi_cairo_library_path.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <if condition-set='64-bit'>
-        <dep package='python'/>
-      </if>
     </dependencies>
-    <if condition-unset='64-bit'>
       <after>
         <dep package='python'/>
+        <dep package='python3'/>
       </after>
-    </if>
   </autotools>
 
  <autotools id="pango"  autogen-sh="autoreconf">
-    <branch version="1.38.1" module="pango/1.38/pango-1.38.1.tar.xz"
-            hash="sha256:1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7">
+    <branch version="1.40.12" module="pango/1.40/pango-1.40.12.tar.xz"
+            hash="sha256:75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc">
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -152,8 +135,8 @@
   </autotools>
 
  <autotools id="atk" autogen-sh="configure">
-    <branch module="atk/2.20/atk-2.20.0.tar.xz" version="2.20.0"
-            hash="sha256:493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0"/>
+    <branch module="atk/2.24/atk-2.24.0.tar.xz" version="2.24.0"
+            hash="sha256:bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49"/>
     <dependencies>
     </dependencies>
     <after>
@@ -164,8 +147,8 @@
   </autotools>
 
   <autotools id="gdk-pixbuf" autogen-sh="configure">
-    <branch module="gdk-pixbuf/2.34/gdk-pixbuf-2.34.0.tar.xz" version="2.34.0"
-            hash="sha256:d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879"/>
+    <branch module="gdk-pixbuf/2.36/gdk-pixbuf-2.36.6.tar.xz" version="2.36.6"
+            hash="sha256:455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c"/>
     <after>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
@@ -174,13 +157,12 @@
 
   <autotools id="gtk+" autogen-sh="autoreconf"
              autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection">
-    <branch module="gtk+/2.24/gtk+-2.24.30.tar.xz" version="2.24.30"
-            hash="sha256:0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50">
+    <branch module="gtk+/2.24/gtk+-2.24.31.tar.xz" version="2.24.31"
+            hash="sha256:68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658">
       <!--patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch" strip="1"/-->
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch" strip="1"/>
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch" strip="1"/>
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gtk+-2-m4-creation.patch" strip="1"/>
-      <patch file="http://xpra.org/svn/Xpra/trunk/osx/jhbuild/patches/gtk-fullscreenfix-quartz.patch" strip="1"/>
    </branch>
     <dependencies>
       <dep package="glib"/>
@@ -194,31 +176,23 @@
     </after>
   </autotools>
 
-  <autotools id="gtk+-3.14" autogen-sh="autogen.sh"
-             autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.14/gtk+-3.14.15.tar.xz" version="3.14.15"
-            hash="sha256:3ac87659112ced9e5ee5bd55d055faa881aafd040f26ca40b0d8ba0fa6509c83">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-707945-GTK2-Quartz-typeahead-find-in-GtkTreeView.patch" strip="1"/>
-      <!-- https://bugzilla.gnome.org/show_bug.cgi?id=763779 -->
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gtk-quartz-fix-pixelated-image-surfaces-in-retina-hidpi-.patch" strip="1"/>
-    </branch>
+  <autotools id="xorg-util-macros">
+    <branch repo="freedesktop" version="1.19.1"
+            module="xorg/individual/util/util-macros-1.19.1.tar.bz2"/>
+  </autotools>
+
+  <autotools id="libepoxy" autogen-sh="configure">
+    <branch repo="github-tarball" version="1.4.1"
+            module="anholt/libepoxy/releases/download/1.4.2/libepoxy-1.4.2.tar.xz"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection"/>
+      <dep package="xorg-util-macros"/>
     </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-    </after>
   </autotools>
 
   <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.20/gtk+-3.20.9.tar.xz" version="3.20.9"
-            hash="sha256:83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17">
+    <branch module="gtk+/3.22/gtk+-3.22.20.tar.xz" version="3.22.20"
+            hash="sha256:70c90998a7809f60dc0a7439a68c34e59077dadb631657a6f9cab6a5539c02d9">
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -249,9 +223,9 @@
        dependency. -->
   <autotools id="cairo"  autogen-sh="configure"
              autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
-    <branch module="cairo-1.14.6.tar.xz"  version="1.14.6"
+    <branch module="cairo-1.14.8.tar.xz"  version="1.14.8"
             repo="cairographics"
-            hash="sha1:0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5">
+            hash="sha1:c6f7b99986f93c9df78653c3e6a3b5043f65145e">
     </branch>
     <dependencies>
       <dep package="pixman"/>
@@ -267,7 +241,6 @@
     <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.8.tar.xz"
             version="2.0.8"
             hash="sha256:74fce9dbc5efe4e3d07a20b24796be1b1d6c3ac10a0ee6b1f1d685c809071b79">
-		<patch file="http://xpra.org/svn/Xpra/trunk/osx/jhbuild/patches/gtk-mac-integration-quit-is-disconnect.patch" strip="1" />
     </branch>
     <dependencies>
     </dependencies>