poppler 0.13.1 → 0.14

raw patch · 4 files changed

+14/−14 lines, 4 filesdep ~cairodep ~glibdep ~gtk

Dependency ranges changed: cairo, glib, gtk, gtk3

Files

• Graphics/UI/Gtk/Poppler/Enums.chs +0/−2
• Graphics/UI/Gtk/Poppler/Structs.hsc +8/−7
• poppler.cabal +5/−5
• template-hsc-gtk2hs.h +1/−0

@@ -30,7 +30,6 @@ module Graphics.UI.Gtk.Poppler.Enums ( -- * Enums     Error(..),-    Orientation(..),     SelectionStyle(..),     PageTransitionType(..),     PageTransitionAlignment(..),@@ -60,7 +59,6 @@ {# context lib="poppler" prefix="poppler" #}  {# enum PopplerError as Error {underscoreToCase} with prefix = "Poppler" deriving (Eq, Ord, Bounded, Show, Typeable) #}-{# enum PopplerOrientation as Orientation {underscoreToCase} with prefix = "Poppler" deriving (Eq, Ord, Bounded, Show, Typeable) #} {# enum PopplerSelectionStyle as SelectionStyle {underscoreToCase} with prefix = "Poppler" deriving (Eq, Ord, Bounded, Show, Typeable) #} {# enum PopplerPageTransitionType as PageTransitionType {underscoreToCase} with prefix = "Poppler" deriving (Eq, Ord, Bounded, Show, Typeable) #} {# enum PopplerPageTransitionAlignment as PageTransitionAlignment {underscoreToCase} with prefix = "Poppler" deriving (Eq, Ord, Bounded, Show, Typeable) #}

@@ -37,7 +37,7 @@     peekPopplerColor,                     ) where     -import Control.Monad		(liftM)+import Control.Monad            (liftM) import Data.IORef import Control.Exception @@ -51,7 +51,7 @@ -- * Specifies x, y, width and height -- data PopplerRectangle = PopplerRectangle Double Double Double Double-		      deriving Show+                      deriving Show  instance Storable PopplerRectangle where   sizeOf _ = #{const sizeof(PopplerRectangle)}@@ -68,10 +68,10 @@  peekPopplerRectangle :: Ptr PopplerRectangle -> IO PopplerRectangle peekPopplerRectangle ptr = do-    (x1_ ::#gtk2hs_type gdouble)	<- #{peek PopplerRectangle, x1} ptr-    (y1_ ::#gtk2hs_type gdouble)	<- #{peek PopplerRectangle, y1} ptr-    (x2_ ::#gtk2hs_type gdouble)	<- #{peek PopplerRectangle, x2} ptr-    (y2_ ::#gtk2hs_type gdouble)	<- #{peek PopplerRectangle, y2} ptr+    (x1_ ::#gtk2hs_type gdouble)        <- #{peek PopplerRectangle, x1} ptr+    (y1_ ::#gtk2hs_type gdouble)        <- #{peek PopplerRectangle, y1} ptr+    (x2_ ::#gtk2hs_type gdouble)        <- #{peek PopplerRectangle, x2} ptr+    (y2_ ::#gtk2hs_type gdouble)        <- #{peek PopplerRectangle, y2} ptr     return (PopplerRectangle (realToFrac x1_) (realToFrac y1_)                              (realToFrac x2_) (realToFrac y2_))       @@ -89,7 +89,8 @@       peekPopplerColor :: Ptr PopplerColor -> IO PopplerColor peekPopplerColor ptr = do-    red	   <- #{peek PopplerColor, red} ptr+    red    <- #{peek PopplerColor, red} ptr     green  <- #{peek PopplerColor, green} ptr     blue   <- #{peek PopplerColor, blue} ptr     return $ PopplerColor red green blue+

@@ -1,5 +1,5 @@ Name:           poppler-Version:        0.13.1+Version:        0.14 License:        GPL-2 License-file:   COPYING Copyright:      (c) 2001-2012, 2014 The Gtk2Hs Team@@ -45,12 +45,12 @@ Library         build-depends:  base >= 4 && < 5, array, containers,                          mtl, bytestring,-                        glib >= 0.13 && < 0.14,-                        cairo >= 0.13 && < 0.14+                        glib >= 0.13 && < 0.15,+                        cairo >= 0.13 && < 0.15         if flag(gtk3)-          build-depends: gtk3 >= 0.13 && < 0.14+          build-depends: gtk3 >= 0.13 && < 0.15         else-          build-depends: gtk >= 0.13 && < 0.14+          build-depends: gtk >= 0.13 && < 0.15         build-tools:    gtk2hsC2hs, gtk2hsHookGenerator, gtk2hsTypeGen 						         exposed-modules:

@@ -1,6 +1,7 @@ #ifndef _TEMPLATE_HSC_GTK2HS_H_ #define _TEMPLATE_HSC_GTK2HS_H_ +#include <stdio.h> #include <glib.h>  #define hsc_gtk2hs_type(t)                        \