GNOME.org
 

[gimp/gimp-2-8: 58/59] Cleanup JHBuild configuration for OS X build

commit 15b3fb4b1272a2434ef4243cc17498ef96763b96
Author: Sven Claussner <sclaussner src gnome org>
Date:   Tue Jul 22 17:27:55 2014 +0200

    Cleanup JHBuild configuration for OS X build
    
    Use the latest stable dependency versions for the GIMP 2.8 build.
    Unify patch file name pattern.
    Remove obsolete patches.
    Remove trailing whitespaces.

 build/osx/gimp.modules                             |   42 +++++++++-----------
 ...rnationalization-of-App-menu-and-other-s.patch} |  Bin 41273 -> 41273 bytes
 ...mi2-keep-separators-between-placeholders.patch} |    0
 ...sing-information-to-po-translation-files.patch} |   21 +++++-----
 ...wrong-variable-substitution-in-configure.patch} |    0
 ...cs.patch => libgcrypt-build-without-docs.patch} |    0
 6 files changed, 30 insertions(+), 33 deletions(-)
---
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
old mode 100644
new mode 100755
index d84b485..0e507c0
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -260,7 +260,7 @@
        <autotools id="gtk+-2.24" autogen-sh="configure"
                autogenargs="--with-gdktarget=quartz --enable-debug=yes --disable-gtk-doc 
--enable-quartz-relocation --without-x --with-xinput --enable-xinerama">
                <branch module="gtk+/2.24/gtk+-2.24.24.tar.xz" version="2.24.24">
-                       <patch file="0001-GTK-Add-missing-information-to-po-translation-files.patch"
+                       <patch file="gtk2-add-missing-information-to-po-translation-files.patch"
                                strip="1" />
                </branch>
                <dependencies>
@@ -340,9 +340,9 @@
                        version="2.0.5"
                        hash="sha256:6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f">
                        <patch
-                               file="0002-Improve-internationalization-of-App-menu-and-other-s.patch"
+                               file="gmi2-improve-internationalization-of-App-menu-and-other-s.patch"
                                strip="1" />
-                       <patch file="0003-Keep-separators-between-placeholders.patch"
+                       <patch file="gmi2-keep-separators-between-placeholders.patch"
                                strip="1" />
                </branch>
        </autotools>
@@ -370,7 +370,7 @@
        <autotools id="libffi" autogenargs="--disable-builddir">
                <branch module="libffi/libffi-3.1.tar.gz" repo="sourceware.org"
                        version="3.1" checkoutdir="libffi-3.1">
-                       <patch file="0004-Fix-wrong-variable-substitution-in-configure.patch"
+                       <patch file="libffi-fix-wrong-variable-substitution-in-configure.patch"
                                strip="1" />
                </branch>
        </autotools>
@@ -411,7 +411,7 @@
        </autotools>
 
        <autotools id="atk" autogen-sh="configure">
-               <branch module="atk/2.13/atk-2.13.3.tar.xz" version="2.13.3"/>
+               <branch module="atk/2.12/atk-2.12.0.tar.xz" version="2.12"/>
                <dependencies>
                        <dep package="glib" />
                        <dep package="shared-mime-info" />
@@ -492,10 +492,7 @@
 
        <autotools id="gvfs" autogen-sh="configure"
                autogenargs="--disable-avahi --disable-fuse --disable-hal --disable-cdda --disable-obexftp 
--disable-gphoto2 --enable-samba --disable-udev --disable-gdu --disable-udisks2 --disable-libsystemd-login 
--disable-gudev --disable-afc --disable-goa --disable-bluray --disable-libmtp --enable-http --enable-archive 
--enable-afp --disable-silent-rules">
-               <branch module="gvfs/1.21/gvfs-1.21.4.tar.xz" version="1.21.4">
-                       <!--<patch 
file="https://dl.dropboxusercontent.com/u/942685/files/gvfs/patch-gconf-gapplookupgconf.h.diff"; 
-                               strip="0"/> -->
-               </branch>
+               <branch module="gvfs/1.21/gvfs-1.21.4.tar.xz" version="1.21.4"/>
                <dependencies>
                        <dep package="gtk+-2.24" />
                        <dep package="glib" />
@@ -560,7 +557,7 @@
        </autotools>
 
        <autotools id="gnutls" autogen-sh="configure" autogenargs="--disable-cxx">
-               <branch module="gnutls/v3.3/gnutls-3.3.2.tar.xz" version="3.3.2"
+               <branch module="gnutls/v3.2/gnutls-3.2.15.tar.xz" version="3.2.15"
                        repo="gnutls" />
                <dependencies>
                        <dep package="nettle" />
@@ -578,7 +575,7 @@
        <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
                <branch module="gcrypt/libgcrypt/libgcrypt-1.6.1.tar.gz"
                        version="" repo="gnupg">
-                       <patch file="0001-libgcrypt-build-without-docs.patch" strip="1" />
+                       <patch file="libgcrypt-build-without-docs.patch" strip="1" />
                </branch>
                <dependencies>
                        <dep package="libgpg-error" />
@@ -744,9 +741,9 @@
        <autotools id="dbus-nolaunchd" autogen-sh="configure"
                autogenargs="--disable-doxygen-docs --disable-xml-docs --disable-selinux --without-x 
--disable-launchd --with-session-socket-dir=/var/tmp --disable-tests">
                <branch module="dbus/dbus-1.7.4.tar.gz" version="1.7.4" repo="dbus">
-                       <!--<patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/dbus-install.patch"/> 
-                               <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/dbus-msg-nosignal.patch"; 
-                               strip="1"/> <patch 
file="https://git.gnome.org/browse/gedit/plain/osx/jhbuild/patches/dbus-relocatable-services.patch"; 
+                       <!--<patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/dbus-install.patch"/>
+                               <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/dbus-msg-nosignal.patch";
+                               strip="1"/> <patch 
file="https://git.gnome.org/browse/gedit/plain/osx/jhbuild/patches/dbus-relocatable-services.patch";
                                strip="1"/> -->
                </branch>
                <dependencies>
@@ -1083,9 +1080,9 @@
                </dependencies>
        </autotools>
 
-       <!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation with 
-               later versions it installs as pygobject2 and PyGObject 3 installs as pygobject3. 
-               Introspection is disabled here, because gir-scanner isn't smart enough to 
+       <!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation with
+               later versions it installs as pygobject2 and PyGObject 3 installs as pygobject3.
+               Introspection is disabled here, because gir-scanner isn't smart enough to
                co-install them. -->
        <autotools id="pygobject" autogen-sh="configure"
                autogenargs=" --enable-introspection=no">
@@ -1123,9 +1120,9 @@
                        version="2.0.5"
                        hash="sha256:6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f">
                        <patch
-                               file="0002-Improve-internationalization-of-App-menu-and-other-s.patch"
+                               file="gmi2-improve-internationalization-of-App-menu-and-other-s.patch"
                                strip="1" />
-                        <patch file="0003-Keep-separators-between-placeholders.patch"
+                       <patch file="gmi2-keep-separators-between-placeholders.patch"
                                strip="1" />
                </branch>
                <dependencies>
@@ -1300,17 +1297,16 @@
        <autotools id="gettext-runtime-update" autogen-sh="configure"
                autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf 
--disable-csharp --disable-rpath --enable-nls">
                <branch repo="ftp.gnu.org" source-subdir="gettext-runtime"
-                       module="gettext/gettext-0.19.1.tar.gz" version="0.19.1">
-                       <!-- patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gettext-bug33999-stpncpy.patch"; 
-                               strip="1"/ -->
+                       module="gettext/gettext-0.19.2.tar.gz" version="0.19.2">
                </branch>
        </autotools>
 
        <autotools id="gettext-tools-update" autogen-sh="configure"
                autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf 
--disable-csharp --with-included-glib --enable-nls --disable-rpath">
                <branch repo="ftp.gnu.org" source-subdir="gettext-tools"
-                       module="gettext/gettext-0.19.1.tar.gz" version="0.19.1">
+                       module="gettext/gettext-0.19.2.tar.gz" version="0.19.2">
                </branch>
        </autotools>
 
 </moduleset>
+
diff --git a/build/osx/patches/0003-Keep-separators-between-placeholders.patch 
b/build/osx/patches/gmi2-keep-separators-between-placeholders.patch
similarity index 100%
rename from build/osx/patches/0003-Keep-separators-between-placeholders.patch
rename to build/osx/patches/gmi2-keep-separators-between-placeholders.patch
diff --git a/build/osx/patches/GTK-Add-missing-information-to-po-translation-files.patch 
b/build/osx/patches/gtk2-add-missing-information-to-po-translation-files.patch
similarity index 99%
rename from build/osx/patches/GTK-Add-missing-information-to-po-translation-files.patch
rename to build/osx/patches/gtk2-add-missing-information-to-po-translation-files.patch
index c1aaa7f..f027697 100644
--- a/build/osx/patches/GTK-Add-missing-information-to-po-translation-files.patch
+++ b/build/osx/patches/gtk2-add-missing-information-to-po-translation-files.patch
@@ -1,4 +1,4 @@
-From 5b1b3bd91db454247fd720a3eb769de526117f5e Mon Sep 17 00:00:00 2001
+From 8f68c0b138d0f00ad64b79a609cecaa2eb703de2 Mon Sep 17 00:00:00 2001
 From: Sven Claussner <sclaussner src gnome org>
 Date: Fri, 13 Jun 2014 18:20:21 +0200
 Subject: [PATCH] GTK+: Add missing information to po translation files.
@@ -330,14 +330,14 @@ index 4ab9cb9..0b94e44 100644
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 diff --git a/po-properties/be latin po b/po-properties/be latin po
-index 3fdaf6b..7472be9 100644
+index 3fdaf6b..8a3246d 100644
 --- a/po-properties/be latin po
 +++ b/po-properties/be latin po
 @@ -10,6 +10,7 @@ msgstr ""
  "PO-Revision-Date: 2007-12-09 14:44+0200\n"
  "Last-Translator: Alaksandar Navicki <zolak lacinka org>\n"
  "Language-Team: i18n mova org <i18n mova org>\n"
-+"Language: be-latin\n"
++"Language: be latin\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
@@ -414,14 +414,14 @@ index 8f5c2f7..4dd645e 100644
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 diff --git a/po-properties/ca valencia po b/po-properties/ca valencia po
-index c7901b0..abde1c1 100644
+index c7901b0..594cb03 100644
 --- a/po-properties/ca valencia po
 +++ b/po-properties/ca valencia po
 @@ -31,6 +31,7 @@ msgstr ""
  "PO-Revision-Date: 2010-03-29 20:27+0200\n"
  "Last-Translator: David Planella <david planella ubuntu com>\n"
  "Language-Team: Catalan <tradgnome softcatala org>\n"
-+"Language: ca-XV\n"
++"Language: ca valencia\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
@@ -1449,14 +1449,14 @@ index f189839..6dba620 100644
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 diff --git a/po/be latin po b/po/be latin po
-index 2540167..c905849 100644
+index 2540167..c1f4791 100644
 --- a/po/be latin po
 +++ b/po/be latin po
 @@ -11,6 +11,7 @@ msgstr ""
  "PO-Revision-Date: 2009-02-14 03:17+0200\n"
  "Last-Translator: Alaksandar Navicki <zolak lacinka org>\n"
  "Language-Team: Belarusian Latin <i18n mova org>\n"
-+"Language: be-latin\n"
++"Language: be latin\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=utf-8\n"
  "Content-Transfer-Encoding: 8bit\n"
@@ -1533,14 +1533,14 @@ index dd4f43a..14ab348 100644
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 diff --git a/po/ca valencia po b/po/ca valencia po
-index 1c2af04..9828858 100644
+index 1c2af04..5128fbc 100644
 --- a/po/ca valencia po
 +++ b/po/ca valencia po
 @@ -32,6 +32,7 @@ msgstr ""
  "PO-Revision-Date: 2010-04-02 18:26+0200\n"
  "Last-Translator: David Planella <david planella gmail com>\n"
  "Language-Team: Catalan <tradgnome softcatala org>\n"
-+"Language: ca-XV\n"
++"Language: ca valencia\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
@@ -2419,4 +2419,5 @@ index 1b7b65b..a0dcead 100644
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 -- 
-2.0.0
\ No newline at end of file
+2.0.0
+
diff --git a/build/osx/patches/0004-Fix-wrong-variable-substitution-in-configure.patch 
b/build/osx/patches/libffi-fix-wrong-variable-substitution-in-configure.patch
similarity index 100%
rename from build/osx/patches/0004-Fix-wrong-variable-substitution-in-configure.patch
rename to build/osx/patches/libffi-fix-wrong-variable-substitution-in-configure.patch
diff --git a/build/osx/patches/0001-libgcrypt-build-without-docs.patch 
b/build/osx/patches/libgcrypt-build-without-docs.patch
similarity index 100%
rename from build/osx/patches/0001-libgcrypt-build-without-docs.patch
rename to build/osx/patches/libgcrypt-build-without-docs.patch
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]