Mercurial > mxe-octave

diff src/glib-1-fixes.patch @ 1219:ffb6a86b8f9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved patch layout Use "git format-patch" instead of "git log -p --reverse" to generate patches which can be imported with with "git am". Also set author/from to "mingw-cross-env" since attribution is done in the mingw-cross-env repository.
author Mark Brand <mabrand@mabrand.nl>
date Wed, 29 Sep 2010 19:42:33 +0200
parents 1f5a3eb3bacf
children 190d15e709cf
line wrap: on
line diff
--- a/src/glib-1-fixes.patch	Wed Sep 29 17:33:43 2010 +0200
+++ b/src/glib-1-fixes.patch	Wed Sep 29 19:42:33 2010 +0200
@@ -3,11 +3,11 @@
 
 Contains ad hoc patches for cross building.
 
-commit 637620b33c175676972419ae674806825a390734
-Author: Mark Brand <mabrand@mabrand.nl>
-Date:   Thu Sep 23 21:36:04 2010 +0200
+From 637620b33c175676972419ae674806825a390734 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 23 Sep 2010 21:36:04 +0200
+Subject: [PATCH 1/5] no gtk doc check
 
-    no gtk doc check
 
 diff --git a/configure.ac b/configure.ac
 index a821267..2e541d2 100644
@@ -22,12 +22,15 @@
  AC_ARG_ENABLE(man,
                [AC_HELP_STRING([--enable-man],
                                [regenerate man pages from Docbook [default=no]])],enable_man=yes,
+-- 
+1.7.1
 
-commit 8f4fde8f0ab605720ef0baf7ef8080479b34af63
-Author: Mark Brand <mabrand@mabrand.nl>
-Date:   Thu Sep 23 21:41:51 2010 +0200
 
-    optional gettext
+From 8f4fde8f0ab605720ef0baf7ef8080479b34af63 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 23 Sep 2010 21:41:51 +0200
+Subject: [PATCH 2/5] optional gettext
+
 
 diff --git a/configure.ac b/configure.ac
 index 2e541d2..18c2dea 100644
@@ -61,12 +64,15 @@
  #include <string.h>
  
  #define  _(String) gettext (String)
+-- 
+1.7.1
 
-commit 0a998b24fdb3ae5397ff5ad498260165300a4393
-Author: Mark Brand <mabrand@mabrand.nl>
-Date:   Thu Sep 23 21:42:46 2010 +0200
 
-    fix tool paths
+From 0a998b24fdb3ae5397ff5ad498260165300a4393 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 23 Sep 2010 21:42:46 +0200
+Subject: [PATCH 3/5] fix tool paths
+
 
 diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
 index 3d1ac12..58e1ecf 100644
@@ -85,12 +91,15 @@
  
  Name: GLib
  Description: C Utility Library
+-- 
+1.7.1
 
-commit 7ddbe18ccce7aede0cef972c6035058151c3ce10
-Author: Mark Brand <mabrand@mabrand.nl>
-Date:   Thu Sep 23 21:45:50 2010 +0200
 
-    fix dependency libs
+From 7ddbe18ccce7aede0cef972c6035058151c3ce10 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 23 Sep 2010 21:45:50 +0200
+Subject: [PATCH 4/5] fix dependency libs
+
 
 diff --git a/configure.ac b/configure.ac
 index 18c2dea..e472768 100644
@@ -116,12 +125,15 @@
 -Libs.private: @ICONV_LIBS@
 +Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
  Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
+-- 
+1.7.1
 
-commit 83ef7aba98793b7502370971c6de0b115c55e49c
-Author: Mark Brand <mabrand@mabrand.nl>
-Date:   Sat Sep 25 00:07:33 2010 +0200
 
-    add -ldnsapi to gio-2.0.pc
+From 83ef7aba98793b7502370971c6de0b115c55e49c Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Sat, 25 Sep 2010 00:07:33 +0200
+Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
+
 
 diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
 index 92cda85..7a4e224 100644
@@ -135,3 +147,6 @@
 +Libs: -L${libdir} -lgio-2.0 -ldnsapi
  Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@
  Cflags: 
+-- 
+1.7.1
+