diff --git a/ghc-gtk.spec b/ghc-gtk.spec index 146d875..aa49b72 100644 --- a/ghc-gtk.spec +++ b/ghc-gtk.spec @@ -10,6 +10,7 @@ Summary: Binding to the Gtk+ graphical user interface library License: LGPLv2+ Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Patch0: gtk-Debian-ppc64-work-around-pixel-define.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -57,6 +58,9 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +%ifarch ppc64 ppc64le +%patch0 -p1 -b .orig +%endif %build @@ -91,6 +95,7 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version} %changelog * Tue Jun 21 2016 Jens Petersen - 0.14.2-1 - update to 0.14.2 +- Debian patch for ppc64 pixel (#1291500) * Sat Mar 5 2016 Jens Petersen - 0.13.9-3 - rebuild diff --git a/gtk-Debian-ppc64-work-around-pixel-define.patch b/gtk-Debian-ppc64-work-around-pixel-define.patch new file mode 100644 index 0000000..443e606 --- /dev/null +++ b/gtk-Debian-ppc64-work-around-pixel-define.patch @@ -0,0 +1,17 @@ +Description: Work around predefined "pixel" on some architectures + "pixel" is predefined on some Ubuntu architectures, confusing gtk2hsC2hs. + Explicitly undefine it to work around this. +Author: Colin Watson +Forwarded: no +Last-Update: 2014-06-05 + +Index: b/gtk.cabal +=================================================================== +--- a/gtk.cabal ++++ b/gtk.cabal +@@ -399,3 +399,5 @@ + cc-options: -DGTK2HS_SET_FMODE_BINARY + + pkgconfig-depends: gthread-2.0, gtk+-2.0 ++ ++ cpp-options: -Upixel