Hello community, here is the log from the commit of package ghc-cairo for openSUSE:Factory checked in at 2015-12-23 08:49:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cairo (Old) and /work/SRC/openSUSE:Factory/.ghc-cairo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-cairo" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cairo/ghc-cairo.changes 2015-09-08 17:57:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-cairo.new/ghc-cairo.changes 2015-12-23 08:49:09.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Dec 13 13:51:22 UTC 2015 - [email protected] + +- update to 0.13.1.1 + +------------------------------------------------------------------- Old: ---- cairo-0.13.1.0.tar.gz New: ---- cairo-0.13.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cairo.spec ++++++ --- /var/tmp/diff_new_pack.C0Pe4Y/_old 2015-12-23 08:49:10.000000000 +0100 +++ /var/tmp/diff_new_pack.C0Pe4Y/_new 2015-12-23 08:49:10.000000000 +0100 @@ -15,15 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name cairo Name: ghc-cairo -Version: 0.13.1.0 +Version: 0.13.1.1 Release: 0 Summary: Binding to the Cairo library +License: BSD-3-Clause Group: System/Libraries -License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,6 +32,7 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: +BuildRequires: fdupes BuildRequires: ghc-array-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-mtl-devel @@ -41,7 +43,6 @@ BuildRequires: pkgconfig(cairo-pdf) BuildRequires: pkgconfig(cairo-ps) BuildRequires: pkgconfig(cairo-svg) -BuildRequires: fdupes # End cabal-rpm deps %description @@ -71,11 +72,9 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install rm -Rf %{buildroot}%{_datadir}/%{pkg_name}-%{version} @@ -84,18 +83,14 @@ %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc COPYRIGHT - %files devel -f %{name}-devel.files %defattr(-,root,root,-) - %changelog ++++++ cairo-0.13.1.0.tar.gz -> cairo-0.13.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairo-0.13.1.0/Graphics/Rendering/Cairo.hs new/cairo-0.13.1.1/Graphics/Rendering/Cairo.hs --- old/cairo-0.13.1.0/Graphics/Rendering/Cairo.hs 2015-03-01 04:45:14.000000000 +0100 +++ new/cairo-0.13.1.1/Graphics/Rendering/Cairo.hs 2015-12-13 07:45:17.000000000 +0100 @@ -325,12 +325,12 @@ -- internal module of GHC import Data.Array.Base ( MArray, newArray, newArray_, unsafeRead, unsafeWrite, #if __GLASGOW_HASKELL__ < 605 - HasBounds, bounds + HasBounds, bounds #else - getBounds + getBounds #endif #if __GLASGOW_HASKELL__ >= 608 - ,getNumElements + ,getNumElements #endif ) import Graphics.Rendering.Cairo.Internal (imageSurfaceCreateFromPNG) @@ -990,8 +990,8 @@ -- to moveTo (x + @dx@) (y + @dy@) -- relMoveTo :: - Double -- ^ @dx@ - the X offset - -> Double -- ^ @dy@ - the Y offset + Double -- ^ @dx@ - the X offset + -> Double -- ^ @dy@ - the Y offset -> Render () relMoveTo = liftRender2 Internal.relMoveTo @@ -1381,7 +1381,7 @@ -- setFontOptions :: FontOptions -> Render () setFontOptions = liftRender1 Internal.setFontOptions - + -- | A drawing operator that generates the shape from a string of Unicode -- characters, rendered according to the current font face, font size (font -- matrix), and font options. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairo-0.13.1.0/Gtk2HsSetup.hs new/cairo-0.13.1.1/Gtk2HsSetup.hs --- old/cairo-0.13.1.0/Gtk2HsSetup.hs 2015-03-01 04:45:14.000000000 +0100 +++ new/cairo-0.13.1.1/Gtk2HsSetup.hs 2015-12-13 07:45:17.000000000 +0100 @@ -429,15 +429,10 @@ let modDeps = zipWith (ModDep True []) expMods mExpFiles++ zipWith (ModDep False []) othMods mOthFiles modDeps <- mapM extractDeps modDeps - let (expMods, othMods) = span mdExposed $ sortTopological modDeps - badOther = map (fromMaybe "<no file>" . mdLocation) $ - filter (not . mdExposed) expMods - unless (null badOther) $ - die ("internal chs modules "++intercalate "," badOther++ - " depend on exposed chs modules; cabal needs to build internal modules first") + let (othMods, expMods) = span (not . mdExposed) $ reverse $ sortTopological modDeps return pd { PD.library = Just lib { - PD.exposedModules = map mdOriginal expMods, - PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods } + PD.exposedModules = map mdOriginal (reverse expMods), + PD.libBuildInfo = bi { PD.otherModules = map mdOriginal (reverse othMods) } }} data ModDep = ModDep { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairo-0.13.1.0/SetupWrapper.hs new/cairo-0.13.1.1/SetupWrapper.hs --- old/cairo-0.13.1.0/SetupWrapper.hs 2015-03-01 04:45:14.000000000 +0100 +++ new/cairo-0.13.1.1/SetupWrapper.hs 2015-12-13 07:45:17.000000000 +0100 @@ -20,7 +20,7 @@ import System.Process import System.Exit (ExitCode(..), exitWith) import System.FilePath -import System.Directory +import System.Directory (doesFileExist, getModificationTime) import qualified Control.Exception as Exception import System.IO.Error (isDoesNotExistError) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairo-0.13.1.0/cairo.cabal new/cairo-0.13.1.1/cairo.cabal --- old/cairo-0.13.1.0/cairo.cabal 2015-03-01 04:45:14.000000000 +0100 +++ new/cairo-0.13.1.1/cairo.cabal 2015-12-13 07:45:17.000000000 +0100 @@ -1,5 +1,5 @@ Name: cairo -Version: 0.13.1.0 +Version: 0.13.1.1 License: BSD3 License-file: COPYRIGHT Copyright: (c) 2001-2010 The Gtk2Hs Team, (c) Paolo Martini 2005, (c) Abraham Egnor 2003, 2004, (c) Aetion Technologies LLC 2004 @@ -49,7 +49,7 @@ utf8-string >= 0.2 && < 1.1, text >= 1.0.0.0 && < 1.3, bytestring, mtl, array - build-tools: gtk2hsC2hs >= 0.13.12 + build-tools: gtk2hsC2hs >= 0.13.13 exposed-modules: Graphics.Rendering.Cairo Graphics.Rendering.Cairo.Matrix Graphics.Rendering.Cairo.Types
