Attachment 844339 Details for Bug 1047727 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-widl-default-includedir.patch (text/plain), 3.40 KB, created by Yaakov Selkowitz on 2014-01-02 02:52:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-01-02 02:52:24 UTC

Size: 3.40 KB

patch

obsolete

>From d8b4ea8cd9b79da38710c9384d68646c646d12a5 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Wed, 1 Jan 2014 20:29:38 -0600
>Subject: [PATCH] Fix widl default includedir.
>
>---
> mingw-w64-tools-2.0.999-widl-includedir.patch | 22 ++++++++++++++++++++++
> mingw-w64-tools.spec                          |  7 ++++++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
> create mode 100644 mingw-w64-tools-2.0.999-widl-includedir.patch
>
>diff --git a/mingw-w64-tools-2.0.999-widl-includedir.patch b/mingw-w64-tools-2.0.999-widl-includedir.patch
>new file mode 100644
>index 0000000..d84811b
>--- /dev/null
>+++ b/mingw-w64-tools-2.0.999-widl-includedir.patch
>@@ -0,0 +1,22 @@
>+--- a/mingw-w64-tools/widl/Makefile.am	2012-11-14 03:19:32.000000000 -0600
>++++ b/mingw-w64-tools/widl/Makefile.am	2014-01-01 19:23:41.000000000 -0600
>+@@ -56,7 +56,7 @@ widl_SOURCES = src/widl.h \
>+   include/winnls.h \
>+   include/winnt.rh
>+ 
>+-widl_CPPFLAGS = -I$(top_srcdir)/include -DDEFAULT_INCLUDE_DIR=\"$(includedir)/../$(target)/include\"
>++widl_CPPFLAGS = -I$(top_srcdir)/include -DDEFAULT_INCLUDE_DIR=\"$(prefix)/$(target)/sys-root/mingw/include\"
>+ widl_CFLAGS = -O3 -g -Wall -Wformat -Wpacked -Wmissing-declarations -Wimplicit-function-declaration -Wmissing-prototypes -Wstrict-aliasing=2
>+ 
>+ DISTCHECK_CONFIGURE_FLAGS = --host=$(host) --target=$(target)
>+--- a/mingw-w64-tools/widl/Makefile.in	2012-11-14 03:19:32.000000000 -0600
>++++ b/mingw-w64-tools/widl/Makefile.in	2014-01-01 19:24:08.137423600 -0600
>+@@ -282,7 +282,7 @@ widl_SOURCES = src/widl.h \
>+   include/winnls.h \
>+   include/winnt.rh
>+ 
>+-widl_CPPFLAGS = -I$(top_srcdir)/include -DDEFAULT_INCLUDE_DIR=\"$(includedir)/../$(target)/include\"
>++widl_CPPFLAGS = -I$(top_srcdir)/include -DDEFAULT_INCLUDE_DIR=\"$(prefix)/$(target)/sys-root/mingw/include\"
>+ widl_CFLAGS = -O3 -g -Wall -Wformat -Wpacked -Wmissing-declarations -Wimplicit-function-declaration -Wmissing-prototypes -Wstrict-aliasing=2
>+ DISTCHECK_CONFIGURE_FLAGS = --host=$(host) --target=$(target)
>+ all: all-am
>diff --git a/mingw-w64-tools.spec b/mingw-w64-tools.spec
>index b1daa32..438fca7 100644
>--- a/mingw-w64-tools.spec
>+++ b/mingw-w64-tools.spec
>@@ -4,7 +4,7 @@
> 
> Name:           mingw-w64-tools
> Version:        2.0.999
>-Release:        0.9.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
>+Release:        0.10.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
> Summary:        Supplementary tools which are part of the mingw-w64 toolchain
> 
> # http://sourceforge.net/mailarchive/forum.php?thread_name=5157C0FC.1010309%40users.sourceforge.net&forum_name=mingw-w64-public
>@@ -25,6 +25,7 @@ Source0:        http://downloads.sourceforge.net/project/mingw-w64/mingw-w64/min
> %endif
> # just to make widl to build on s390
> Patch0:         %{name}-2.0.999-s390.patch
>+Patch1:         %{name}-2.0.999-widl-includedir.patch
> 
> BuildRequires:  mingw32-filesystem >= 95
> BuildRequires:  mingw64-filesystem >= 95
>@@ -46,6 +47,7 @@ unzip %{S:0}
> %setup -q -n mingw-w64-v%{version}
> %endif
> %patch0 -p2 -b .s390
>+%patch1 -p1 -b .widl-includedir
> 
> 
> %build
>@@ -97,6 +99,9 @@ popd
> 
> 
> %changelog
>+* Wed Jan  1 2014 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> 2.0.999-0.10.trunk.r6228.20130907
>+- Fix widl default includedir.
>+
> * Sat Sep  7 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.0.999-0.9.trunk.r6228.20130907
> - Update to r6228 (20130907 snapshot)
> - Updated instructions to regenerate snapshots
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1047727: 844339