Hello community, here is the log from the commit of package gtk2hs-buildtools for openSUSE:Factory checked in at 2017-11-07 09:59:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk2hs-buildtools (Old) and /work/SRC/openSUSE:Factory/.gtk2hs-buildtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk2hs-buildtools" Tue Nov 7 09:59:49 2017 rev:7 rq:538993 version:0.13.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gtk2hs-buildtools/gtk2hs-buildtools.changes 2017-09-15 22:28:52.927997093 +0200 +++ /work/SRC/openSUSE:Factory/.gtk2hs-buildtools.new/gtk2hs-buildtools.changes 2017-11-07 10:00:00.237936220 +0100 @@ -1,0 +2,6 @@ +Wed Oct 11 03:02:42 UTC 2017 - [email protected] + +- Update to version 0.13.3.0 revision 1. + A more detailed change log is not available. + +------------------------------------------------------------------- Old: ---- gtk2hs-buildtools-0.13.2.2.tar.gz New: ---- gtk2hs-buildtools-0.13.3.0.tar.gz gtk2hs-buildtools.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2hs-buildtools.spec ++++++ --- /var/tmp/diff_new_pack.RVaYFD/_old 2017-11-07 10:00:01.377894863 +0100 +++ /var/tmp/diff_new_pack.RVaYFD/_new 2017-11-07 10:00:01.381894718 +0100 @@ -18,13 +18,14 @@ %global pkg_name gtk2hs-buildtools Name: %{pkg_name} -Version: 0.13.2.2 +Version: 0.13.3.0 Release: 0 Summary: Tools to build the Gtk2Hs suite of User Interface libraries License: GPL-2.0+ Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{name}.cabal BuildRequires: alex BuildRequires: chrpath BuildRequires: ghc-Cabal-devel @@ -68,6 +69,7 @@ %prep %setup -q +cp -p %{SOURCE1} %{name}.cabal %build %ghc_lib_build ++++++ gtk2hs-buildtools-0.13.2.2.tar.gz -> gtk2hs-buildtools-0.13.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CAST.hs new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CAST.hs --- old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CAST.hs 2017-01-14 10:17:54.000000000 +0100 +++ new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CAST.hs 2017-09-26 11:07:56.000000000 +0200 @@ -301,6 +301,7 @@ | CIntType Attrs | CLongType Attrs | CFloatType Attrs + | CFloat128Type Attrs | CDoubleType Attrs | CSignedType Attrs | CUnsigType Attrs @@ -324,6 +325,7 @@ posOf (CIntType at) = posOf at posOf (CLongType at) = posOf at posOf (CFloatType at) = posOf at + posOf (CFloat128Type at) = posOf at posOf (CDoubleType at) = posOf at posOf (CSignedType at) = posOf at posOf (CUnsigType at) = posOf at @@ -342,6 +344,7 @@ (CIntType at1) == (CIntType at2) = at1 == at2 (CLongType at1) == (CLongType at2) = at1 == at2 (CFloatType at1) == (CFloatType at2) = at1 == at2 + (CFloat128Type at1) == (CFloat128Type at2) = at1 == at2 (CDoubleType at1) == (CDoubleType at2) = at1 == at2 (CSignedType at1) == (CSignedType at2) = at1 == at2 (CUnsigType at1) == (CUnsigType at2) = at1 == at2 @@ -1058,6 +1061,9 @@ putByte bh 13 put_ bh ar put_ bh as + put_ bh (CFloat128Type at) = do + putByte bh 14 + put_ bh at get bh = do h <- getByte bh case h of @@ -1108,6 +1114,9 @@ ar <- get bh as <- get bh return (CTypeOfType ar as) + 14 -> do + at <- get bh + return (CFloat128Type at) instance Binary CStorageSpec where put_ bh (CAuto aa) = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CLexer.x new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CLexer.x --- old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CLexer.x 2017-01-14 10:17:54.000000000 +0100 +++ new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CLexer.x 2017-09-26 11:07:56.000000000 +0200 @@ -111,7 +111,7 @@ @fractpart = @digits @mantpart = @intpart?\.@fractpart|@intpart\. @exppart = [eE][\+\-]?@digits -@suffix = [fFlL] +@suffix = [fFlLqQwW] tokens :- @@ -259,6 +259,7 @@ idkwtok ('e':'l':'s':'e':[]) = tok CTokElse idkwtok ('e':'n':'u':'m':[]) = tok CTokEnum idkwtok ('e':'x':'t':'e':'r':'n':[]) = tok CTokExtern +idkwtok ('_':'_':'f':'l':'o':'a':'t':'1':'2':'8':[]) = tok CTokFloat128 idkwtok ('f':'l':'o':'a':'t':[]) = tok CTokFloat idkwtok ('f':'o':'r':[]) = tok CTokFor idkwtok ('g':'o':'t':'o':[]) = tok CTokGoto diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CParser.y new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CParser.y --- old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CParser.y 2017-01-14 10:17:54.000000000 +0100 +++ new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CParser.y 2017-09-26 11:07:56.000000000 +0200 @@ -191,6 +191,7 @@ enum { CTokEnum _ } extern { CTokExtern _ } float { CTokFloat _ } +"__float128" { CTokFloat128 _ } for { CTokFor _ } goto { CTokGoto _ } if { CTokIf _ } @@ -656,6 +657,7 @@ | int {% withAttrs $1 $ CIntType } | long {% withAttrs $1 $ CLongType } | float {% withAttrs $1 $ CFloatType } + | "__float128" {% withAttrs $1 $ CFloat128Type } | double {% withAttrs $1 $ CDoubleType } | signed {% withAttrs $1 $ CSignedType } | unsigned {% withAttrs $1 $ CUnsigType } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CPretty.hs new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CPretty.hs --- old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CPretty.hs 2017-01-14 10:17:54.000000000 +0100 +++ new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CPretty.hs 2017-09-26 11:07:56.000000000 +0200 @@ -83,6 +83,7 @@ pretty (CIntType _) = text "int" pretty (CLongType _) = text "long" pretty (CFloatType _) = text "float" + pretty (CFloat128Type _) = text "__float128" pretty (CDoubleType _) = text "double" pretty (CSignedType _) = text "signed" pretty (CUnsigType _) = text "unsigned" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CTokens.hs new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CTokens.hs --- old/gtk2hs-buildtools-0.13.2.2/c2hs/c/CTokens.hs 2017-01-14 10:17:54.000000000 +0100 +++ new/gtk2hs-buildtools-0.13.3.0/c2hs/c/CTokens.hs 2017-09-26 11:07:56.000000000 +0200 @@ -102,6 +102,7 @@ | CTokEnum !Position -- `enum' | CTokExtern !Position -- `extern' | CTokFloat !Position -- `float' + | CTokFloat128 !Position -- `__float128' | CTokFor !Position -- `for' | CTokGoto !Position -- `goto' | CTokIf !Position -- `if' @@ -217,6 +218,7 @@ posOf (CTokEnum pos ) = pos posOf (CTokExtern pos ) = pos posOf (CTokFloat pos ) = pos + posOf (CTokFloat128 pos ) = pos posOf (CTokFor pos ) = pos posOf (CTokGoto pos ) = pos posOf (CTokInt pos ) = pos @@ -311,6 +313,7 @@ showsPrec _ (CTokEnum _ ) = showString "enum" showsPrec _ (CTokExtern _ ) = showString "extern" showsPrec _ (CTokFloat _ ) = showString "float" + showsPrec _ (CTokFloat128 _ ) = showString "__float128" showsPrec _ (CTokFor _ ) = showString "for" showsPrec _ (CTokGoto _ ) = showString "goto" showsPrec _ (CTokIf _ ) = showString "if" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk2hs-buildtools-0.13.2.2/gtk2hs-buildtools.cabal new/gtk2hs-buildtools-0.13.3.0/gtk2hs-buildtools.cabal --- old/gtk2hs-buildtools-0.13.2.2/gtk2hs-buildtools.cabal 2017-01-14 10:17:54.000000000 +0100 +++ new/gtk2hs-buildtools-0.13.3.0/gtk2hs-buildtools.cabal 2017-09-26 11:07:56.000000000 +0200 @@ -1,5 +1,5 @@ Name: gtk2hs-buildtools -Version: 0.13.2.2 +Version: 0.13.3.0 License: GPL-2 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -40,7 +40,7 @@ build-depends: base >= 4 && < 5, process, array, pretty, filepath, random, - Cabal >= 1.24.0.0 && < 1.25, + Cabal >= 1.24.0.0 && < 2.2, filepath >= 1.3.0.0 && < 1.5, directory >= 1.2.0.0 && < 1.4, containers >= 0.5.5.1 && < 0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk2hs-buildtools-0.13.2.2/hierarchyGen/Hierarchy.chs.template new/gtk2hs-buildtools-0.13.3.0/hierarchyGen/Hierarchy.chs.template --- old/gtk2hs-buildtools-0.13.2.2/hierarchyGen/Hierarchy.chs.template 2017-01-14 10:17:54.000000000 +0100 +++ new/gtk2hs-buildtools-0.13.3.0/hierarchyGen/Hierarchy.chs.template 2017-09-26 11:07:56.000000000 +0200 @@ -39,11 +39,13 @@ ) where import Foreign.ForeignPtr (ForeignPtr, castForeignPtr) -#if __GLASGOW_HASKELL__ >= 707 +-- TODO work around cpphs https://ghc.haskell.org/trac/ghc/ticket/13553 +#if __GLASGOW_HASKELL__ >= 707 || __GLASGOW_HASKELL__ == 0 import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr) #else import Foreign.ForeignPtr (unsafeForeignPtrToPtr) #endif + import Foreign.C.Types (CULong(..), CUInt(..), CULLong(..)) import System.Glib.GType (GType, typeInstanceIsA) @MODULE_IMPORTS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtk2hs-buildtools-0.13.2.2/src/Gtk2HsSetup.hs new/gtk2hs-buildtools-0.13.3.0/src/Gtk2HsSetup.hs --- old/gtk2hs-buildtools-0.13.2.2/src/Gtk2HsSetup.hs 2017-01-14 10:17:54.000000000 +0100 +++ new/gtk2hs-buildtools-0.13.3.0/src/Gtk2HsSetup.hs 2017-09-26 11:07:56.000000000 +0200 @@ -26,6 +26,7 @@ libModules, hasLibs) import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms), InstallDirs(..), + ComponentLocalBuildInfo, componentPackageDeps, absoluteInstallDirs, relocatable, @@ -36,6 +37,12 @@ rawSystemProgramConf, rawSystemProgramStdoutConf, programName, programPath, c2hsProgram, pkgConfigProgram, gccProgram, requireProgram, ghcPkgProgram, simpleProgram, lookupProgram, rawSystemProgramStdout, ProgArg) +#if MIN_VERSION_Cabal(2,0,0) +import Distribution.Simple.Program.HcPkg ( defaultRegisterOptions ) +import Distribution.Types.PkgconfigDependency ( PkgconfigDependency(..) ) +import Distribution.Types.PkgconfigName +import qualified Distribution.Types.LocalBuildInfo as LBI (componentsConfigs) -- TODO will be removed in Cabal 2.2 +#endif import Distribution.ModuleName ( ModuleName, components, toFilePath ) import Distribution.Simple.Utils import Distribution.Simple.Setup (CopyFlags(..), InstallFlags(..), CopyDest(..), @@ -185,8 +192,12 @@ | modeGenerateRegScript -> die "Generate Reg Script not supported" | otherwise -> do setupMessage verbosity "Registering" (packageId pkg) - registerPackage verbosity (compiler lbi) (withPrograms lbi) False - packageDbs installedPkgInfo + registerPackage verbosity (compiler lbi) (withPrograms lbi) +#if MIN_VERSION_Cabal(2,0,0) + packageDbs installedPkgInfo defaultRegisterOptions +#else + False packageDbs installedPkgInfo +#endif where modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags)) @@ -224,8 +235,13 @@ -- Processing .chs files with our local c2hs. ------------------------------------------------------------------------------ +#if MIN_VERSION_Cabal(2,0,0) +ourC2hs :: BuildInfo -> LocalBuildInfo -> ComponentLocalBuildInfo -> PreProcessor +ourC2hs bi lbi _ = PreProcessor { +#else ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor ourC2hs bi lbi = PreProcessor { +#endif platformIndependent = False, runPreProcessor = runC2HS bi lbi } @@ -265,15 +281,6 @@ = nub $ ["-I" ++ dir | dir <- PD.includeDirs bi] ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"] - ++ ["-D__GLASGOW_HASKELL__="++show (ghcDefine . ghcVersion . compilerId $ LBI.compiler lbi)] - where - ghcDefine (v1:v2:_) = v1 * 100 + v2 - ghcDefine _ = __GLASGOW_HASKELL__ - - ghcVersion :: CompilerId -> [Int] - ghcVersion (CompilerId GHCJS v) = drop 3 $ versionBranch v - ghcVersion (CompilerId GHC v) = versionBranch v - ghcVersion _ = error "Not GHC" installCHI :: PackageDescription -- ^information from the .cabal file -> LocalBuildInfo -- ^information from the configure step @@ -308,7 +315,12 @@ tag `isPrefixOf` field, field /= (tag++"file")] ++ [ "--tag=" ++ tag +#if MIN_VERSION_Cabal(2,0,0) + | PackageIdentifier name version <- cPkgs + , let major:minor:_ = versionNumbers version +#else | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs +#endif , let name' = filter isAlpha (display name) , tag <- name' :[ name' ++ "-" ++ show maj ++ "." ++ show d2 @@ -339,6 +351,7 @@ info verb ("Ensuring that callback hooks in "++f++" are up-to-date.") genFile hookGen signalsOpts f +#if __GLASGOW_HASKELL__ < 800 writeFile "gtk2hs_macros.h" $ generateMacros cPkgs -- Based on Cabal/Distribution/Simple/Build/Macros.hs @@ -361,6 +374,7 @@ where fixchar '-' = '_' fixchar '.' = '_' fixchar c = c +#endif --FIXME: Cabal should tell us the selected pkg-config package versions in the -- LocalBuildInfo or equivalent. @@ -372,8 +386,14 @@ [ do version <- pkgconfig ["--modversion", display pkgname] case simpleParse version of Nothing -> die "parsing output of pkg-config --modversion failed" +#if MIN_VERSION_Cabal(2,0,0) + Just v -> return (PackageIdentifier (mkPackageName $ unPkgconfigName pkgname) v) + | PkgconfigDependency pkgname _ +#else Just v -> return (PackageIdentifier pkgname v) - | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ] + | Dependency pkgname _ +#endif + <- concatMap pkgconfigDepends (allBuildInfo pkg) ] where pkgconfig = rawSystemProgramStdoutConf verbosity pkgConfigProgram (withPrograms lbi) @@ -486,5 +506,10 @@ -- We are not going to use this, so reporting the version we will use c2hsLocal :: Program c2hsLocal = (simpleProgram "gtk2hsC2hs") { - programFindVersion = \_ _ -> return . Just $ Version [0,13,13] [] + programFindVersion = \_ _ -> return . Just $ +#if MIN_VERSION_Cabal(2,0,0) + mkVersion [0,13,13] +#else + Version [0,13,13] [] +#endif } ++++++ gtk2hs-buildtools.cabal ++++++ Name: gtk2hs-buildtools Version: 0.13.3.0 x-revision: 1 License: GPL-2 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team Author: Axel Simon, Duncan Coutts, Manuel Chakravaty Maintainer: [email protected] Build-Type: Simple Cabal-Version: >= 1.10 Stability: stable homepage: http://projects.haskell.org/gtk2hs/ bug-reports: https://github.com/gtk2hs/gtk2hs/issues Synopsis: Tools to build the Gtk2Hs suite of User Interface libraries. Description: This package provides a set of helper programs necessary to build the Gtk2Hs suite of libraries. These tools include a modified c2hs binding tool that is used to generate FFI declarations, a tool to build a type hierarchy that mirrors the C type hierarchy of GObjects found in glib, and a generator for signal declarations that are used to call back from C to Haskell. These tools are not needed to actually run Gtk2Hs programs. Category: Development Tested-With: GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.1 Data-Files: callbackGen/Signal.chs.template hierarchyGen/hierarchy.list hierarchyGen/Hierarchy.chs.template Extra-Source-Files: c2hs/toplevel/c2hs_config.h Source-Repository head type: git location: https://github.com/gtk2hs/gtk2hs subdir: tools Flag ClosureSignals Description: Use the the GClosure-based signals implementation. -- if ! (arch(sparc) || arch(x86_64) || impl(ghc >= 6.4.1)) -- Default: False Library build-depends: base >= 4 && < 5, process, array, pretty, filepath, random, Cabal >= 1.24.0.0 && < 2.1, filepath >= 1.3.0.0 && < 1.5, directory >= 1.2.0.0 && < 1.4, containers >= 0.5.5.1 && < 0.6 if impl(ghc >= 7.7) build-depends: hashtables build-tools: alex >= 3.0.1, happy >= 1.18.9 hs-source-dirs: src hierarchyGen callbackGen c2hs/toplevel c2hs/state c2hs/gen c2hs/chs c2hs/c c2hs/base/admin c2hs/base/general c2hs/base/state c2hs/base/errors c2hs/base/syms c2hs/base/syntax c-sources: c2hs/toplevel/c2hs_config.c exposed-modules: Gtk2HsSetup TypeGen HookGenerator Gtk2HsC2Hs other-modules: Paths_gtk2hs_buildtools -- gtk2hsC2hs Modules BaseVersion Config Errors Binary DLists FastMutInt FileOps FNameOps Map Position Set UNames CIO State StateBase StateTrans Attributes Idents NameSpaces Lexers C CAST CAttrs CBuiltin CLexer CNames CParser CParserMonad CPretty CTokens CTrav CHS CHSLexer CInfo GBMonad GenBind GenHeader C2HSState Switches C2HSConfig Version default-language: Haskell98 default-extensions: ForeignFunctionInterface BangPatterns if flag(ClosureSignals) cpp-options: -DUSE_GCLOSURE_SIGNALS_IMPL if os(darwin) cpp-options: -D_C2HS_CPP_IS_GCC else cpp-options: -D_C2HS_CPP_LANG_SINGLE Executable gtk2hsTypeGen main-is: gtk2hsTypeGenMain.hs hs-source-dirs: exe build-depends: base, gtk2hs-buildtools default-language: Haskell98 Executable gtk2hsHookGenerator main-is: gtk2hsHookGeneratorMain.hs hs-source-dirs: exe build-depends: base, gtk2hs-buildtools default-language: Haskell98 Executable gtk2hsC2hs main-is: gtk2hsC2hsMain.hs hs-source-dirs: exe build-depends: base, gtk2hs-buildtools default-language: Haskell98
