Attachment 1156933 Details for Bug 1335683 – Patch: fix static libraries

Patch: fix static libraries

0001-Fix-static-library.patch (text/plain), 1.99 KB, created by Sandro Mani on 2016-05-12 22:20:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2016-05-12 22:20:42 UTC

Size: 1.99 KB

patch

obsolete

>From b4cff8be00e1868500ef25ecdfa9a3809509c927 Mon Sep 17 00:00:00 2001
>From: Sandro Mani <manisandro@gmail.com>
>Date: Wed, 10 Feb 2016 02:29:24 +0100
>Subject: [PATCH 1/2] Fix static library
>
>---
> cairo_dllmain.patch | 12 ++++++++++++
> mingw-cairo.spec    |  7 ++++++-
> 2 files changed, 18 insertions(+), 1 deletion(-)
> create mode 100644 cairo_dllmain.patch
>
>diff --git a/cairo_dllmain.patch b/cairo_dllmain.patch
>new file mode 100644
>index 0000000..b6a9b54
>--- /dev/null
>+++ b/cairo_dllmain.patch
>@@ -0,0 +1,12 @@
>+diff -rupN cairo-1.14.4/src/win32/cairo-win32-system.c cairo-1.14.4-new/src/win32/cairo-win32-system.c
>+--- cairo-1.14.4/src/win32/cairo-win32-system.c	2015-10-27 22:04:21.000000000 +0100
>++++ cairo-1.14.4-new/src/win32/cairo-win32-system.c	2016-02-10 02:18:36.677423319 +0100
>+@@ -48,7 +48,7 @@
>+ #include "cairoint.h"
>+ 
>+ #if CAIRO_MUTEX_IMPL_WIN32
>+-#if !CAIRO_WIN32_STATIC_BUILD
>++#if !defined(CAIRO_WIN32_STATIC_BUILD) && !defined(DLL_EXPORT)
>+ 
>+ #define WIN32_LEAN_AND_MEAN
>+ /* We require Windows 2000 features such as ETO_PDY */
>diff --git a/mingw-cairo.spec b/mingw-cairo.spec
>index 6ed86c9..53e7186 100644
>--- a/mingw-cairo.spec
>+++ b/mingw-cairo.spec
>@@ -2,7 +2,7 @@
> 
> Name:           mingw-cairo
> Version:        1.14.6
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        MinGW Windows Cairo library
> 
> License:        LGPLv2 or MPLv1.1
>@@ -13,6 +13,8 @@ Group:          Development/Libraries
> # Backported upstream patches to add API required by gtk3
> Patch0:         0001-win32-Add-cairo-API-to-set-up-a-Win32-surface-for-an.patch
> Patch1:         0002-win32-Add-a-win32-boilerplate-that-uses-a-real-windo.patch
>+# Fix DllMain in static library
>+Patch2:         cairo_dllmain.patch
> 
> BuildArch:      noarch
> 
>@@ -216,6 +218,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
> 
> 
> %changelog
>+* Thu May 12 2016 Sandro Mani <manisandro@gmail.com> - 1.14.6-2
>+- Fix DllMain in static library
>+
> * Thu Apr 21 2016 Kalev Lember <klember@redhat.com> - 1.14.6-1
> - Update to 1.14.6
> 
>-- 
>2.8.2
>

Actions: View

Attachments on bug 1335683: 1156933 | 1156934