Hello community, here is the log from the commit of package dia for openSUSE:Factory checked in at 2012-10-03 10:24:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dia (Old) and /work/SRC/openSUSE:Factory/.dia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dia", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/dia/dia.changes 2012-08-23 16:02:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2012-10-03 10:24:12.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 25 17:35:23 CEST 2012 - [email protected] + +- Add dia-libemf-64bit.patch: Fix 64-bit build with libEMF, which + is now available on all platforms (bgo#675495). + +------------------------------------------------------------------- New: ---- dia-libemf-64bit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.tWNxOW/_old 2012-10-03 10:24:13.000000000 +0200 +++ /var/tmp/diff_new_pack.tWNxOW/_new 2012-10-03 10:24:13.000000000 +0200 @@ -21,10 +21,14 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: intltool +%if 0%{?suse_version} > 1210 +BuildRequires: libEMF-devel +%else %ifarch %ix86 -# libEMF is not on x86_64 +# libEMF was not on x86_64 before 12.2 BuildRequires: libEMF-devel %endif +%endif BuildRequires: libgnomeui-devel BuildRequires: libtool BuildRequires: libxslt-devel @@ -58,6 +62,8 @@ Patch18: dia-swig-2x.patch # PATCH-FIX-UPSTREAM dia-glib-2.31.patch bgo#655335 [email protected] -- Fix build with glib 2.31. Patch19: dia-glib-2.31.patch +# PATCH-FIX-UPSTREAM dia-libemf-64bit.patch bgo#675495 [email protected] -- Fix build with libEMF on 64-bit platforms. +Patch20: dia-libemf-64bit.patch Url: http://live.gnome.org/Dia BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang @@ -83,6 +89,7 @@ %patch17 -p1 %patch18 %patch19 -p1 +%patch20 -p1 cp $RPM_SOURCE_DIR/font-test*dia . %build ++++++ dia-libemf-64bit.patch ++++++ >From 222d8f1b5c47408900638955b094b6a6e28dcc20 Mon Sep 17 00:00:00 2001 From: Hans Breuer <[email protected]> Date: Sun, 20 May 2012 17:35:26 +0000 Subject: Bug 675495 - Compile error with libEMF on 64bit We have to define STRICT to make libemf/64 work. Otherwise there is wmf.cpp:1383:40: error: cast from 'void*' to 'W32::HDC' loses precision --- Index: dia-0.97.2/plug-ins/wmf/wmf.cpp =================================================================== --- dia-0.97.2.orig/plug-ins/wmf/wmf.cpp +++ dia-0.97.2/plug-ins/wmf/wmf.cpp @@ -53,9 +53,14 @@ typedef W32::LOGFONTW LOGFONTW; #include <pango/pangowin32.h> #elif HAVE_LIBEMF +/* We have to define STRICT to make libemf/64 work. Otherwise there is +wmf.cpp:1383:40: error: cast from 'void*' to 'W32::HDC' loses precision + */ +#define STRICT namespace W32 { # include <emf.h> } +#undef STRICT #else # include "wmf_gdi.h" # define SAVE_EMF -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
