Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gtk2hs-buildtools for
openSUSE:Factory checked in at 2025-03-25 22:12:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gtk2hs-buildtools (Old)
and /work/SRC/openSUSE:Factory/.gtk2hs-buildtools.new.2696 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk2hs-buildtools"
Tue Mar 25 22:12:15 2025 rev:7 rq:1255903 version:0.13.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gtk2hs-buildtools/gtk2hs-buildtools.changes
2024-12-17 19:24:02.423116760 +0100
+++
/work/SRC/openSUSE:Factory/.gtk2hs-buildtools.new.2696/gtk2hs-buildtools.changes
2025-03-25 22:21:28.033128146 +0100
@@ -1,0 +2,6 @@
+Thu Mar 20 08:42:52 UTC 2025 - Peter Simons <[email protected]>
+
+- Update gtk2hs-buildtools to version 0.13.12.0.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
gtk2hs-buildtools-0.13.11.0.tar.gz
New:
----
gtk2hs-buildtools-0.13.12.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtk2hs-buildtools.spec ++++++
--- /var/tmp/diff_new_pack.9vdKB1/_old 2025-03-25 22:21:28.805160189 +0100
+++ /var/tmp/diff_new_pack.9vdKB1/_new 2025-03-25 22:21:28.805160189 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gtk2hs-buildtools
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name gtk2hs-buildtools
%global pkgver %{pkg_name}-%{version}
Name: %{pkg_name}
-Version: 0.13.11.0
+Version: 0.13.12.0
Release: 0
Summary: Tools to build the Gtk2Hs suite of User Interface libraries
License: GPL-2.0-only
++++++ gtk2hs-buildtools-0.13.11.0.tar.gz -> gtk2hs-buildtools-0.13.12.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gtk2hs-buildtools-0.13.11.0/c2hs/base/state/StateBase.hs
new/gtk2hs-buildtools-0.13.12.0/c2hs/base/state/StateBase.hs
--- old/gtk2hs-buildtools-0.13.11.0/c2hs/base/state/StateBase.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/gtk2hs-buildtools-0.13.12.0/c2hs/base/state/StateBase.hs
2001-09-09 03:46:40.000000000 +0200
@@ -103,13 +103,14 @@
fmap = liftM
instance Applicative (PreCST e s) where
- pure = return
+ pure = yield
(<*>) = ap
+ (*>) = (+>)
instance Monad (PreCST e s) where
- return = yield
+ return = pure
(>>=) = (+>=)
- (>>) = (+>)
+ (>>) = (*>)
instance MonadFail (PreCST e s) where
fail = error
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gtk2hs-buildtools-0.13.11.0/c2hs/base/state/StateTrans.hs
new/gtk2hs-buildtools-0.13.12.0/c2hs/base/state/StateTrans.hs
--- old/gtk2hs-buildtools-0.13.11.0/c2hs/base/state/StateTrans.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/gtk2hs-buildtools-0.13.12.0/c2hs/base/state/StateTrans.hs
2001-09-09 03:46:40.000000000 +0200
@@ -120,13 +120,14 @@
fmap = liftM
instance Applicative (STB bs gs) where
- pure = return
+ pure = yield
(<*>) = ap
+ (*>) = (+>)
instance Monad (STB bs gs) where
- return = yield
+ return = pure
(>>=) = (+>=)
- (>>) = (+>)
+ (>>) = (*>)
-- the monad's unit
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtk2hs-buildtools-0.13.11.0/c2hs/c/CParserMonad.hs
new/gtk2hs-buildtools-0.13.12.0/c2hs/c/CParserMonad.hs
--- old/gtk2hs-buildtools-0.13.11.0/c2hs/c/CParserMonad.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/gtk2hs-buildtools-0.13.12.0/c2hs/c/CParserMonad.hs 2001-09-09
03:46:40.000000000 +0200
@@ -92,11 +92,11 @@
fmap = liftM
instance Applicative P where
- pure = return
+ pure = returnP
(<*>) = ap
instance Monad P where
- return = returnP
+ return = pure
(>>=) = thenP
#if !MIN_VERSION_base(4,13,0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtk2hs-buildtools-0.13.11.0/gtk2hs-buildtools.cabal
new/gtk2hs-buildtools-0.13.12.0/gtk2hs-buildtools.cabal
--- old/gtk2hs-buildtools-0.13.11.0/gtk2hs-buildtools.cabal 2001-09-09
03:46:40.000000000 +0200
+++ new/gtk2hs-buildtools-0.13.12.0/gtk2hs-buildtools.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
cabal-version: 3.0
Name: gtk2hs-buildtools
-Version: 0.13.11.0
+Version: 0.13.12.0
License: GPL-2.0-only
License-file: COPYING
Copyright: (c) 2001-2010 The Gtk2Hs Team
@@ -20,7 +20,7 @@
to call back from C to Haskell. These tools are not needed
to actually run Gtk2Hs programs.
Category: Development
-Tested-With: GHC == 9.10.1, GHC == 9.8.2, GHC == 9.6.6, GHC == 9.4.8, GHC
== 9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4,
GHC==8.2.2, GHC==8.0.2
+Tested-With: GHC == 9.12.2, GHC == 9.10.1, GHC == 9.8.4, GHC == 9.6.6, GHC
== 9.4.8, GHC == 9.2.8, GHC==9.0.2, GHC==8.10.7
Data-Files: callbackGen/Signal.chs.template
hierarchyGen/hierarchy.list
hierarchyGen/Hierarchy.chs.template
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtk2hs-buildtools-0.13.11.0/src/Gtk2HsSetup.hs
new/gtk2hs-buildtools-0.13.12.0/src/Gtk2HsSetup.hs
--- old/gtk2hs-buildtools-0.13.11.0/src/Gtk2HsSetup.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/gtk2hs-buildtools-0.13.12.0/src/Gtk2HsSetup.hs 2001-09-09
03:46:40.000000000 +0200
@@ -10,8 +10,11 @@
c2hsLocal
) where
-import Data.String (fromString)
+import Data.String(fromString)
import Data.Maybe (mapMaybe)
+#if MIN_VERSION_Cabal(3,14,0)
+import Data.Bifunctor (bimap)
+#endif
#if MIN_VERSION_Cabal(2,4,0)
import Distribution.Pretty (prettyShow)
#else
@@ -53,14 +56,25 @@
#endif
import Distribution.ModuleName ( ModuleName, components, toFilePath )
import Distribution.Simple.Utils hiding (die)
+#if MIN_VERSION_Cabal(3,14,0)
+import Distribution.Simple.Setup (CommonSetupFlags(..), CopyFlags(..),
InstallFlags(..),
+ CopyDest(..), defaultCommonSetupFlags,
defaultCopyFlags,
+ ConfigFlags(configVerbosity), fromFlag,
toFlag,
+ RegisterFlags(..), flagToMaybe,
fromFlagOrDefault,
+ defaultRegisterFlags)
+#else
import Distribution.Simple.Setup (CopyFlags(..), InstallFlags(..),
CopyDest(..),
defaultCopyFlags,
ConfigFlags(configVerbosity),
fromFlag, toFlag, RegisterFlags(..),
flagToMaybe,
fromFlagOrDefault, defaultRegisterFlags)
+#endif
#if MIN_VERSION_Cabal(2,0,0)
import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
#endif
import Distribution.Simple.Install ( install )
+#if MIN_VERSION_Cabal(3,14,0)
+import Distribution.Utils.Path (getSymbolicPath, makeRelativePathEx)
+#endif
import Distribution.Simple.Register ( generateRegistrationInfo,
registerPackage )
import Distribution.Text ( simpleParse, display )
import System.FilePath
@@ -177,18 +191,39 @@
installHook :: PackageDescription -> LocalBuildInfo
-> UserHooks -> InstallFlags -> IO ()
installHook pkg_descr localbuildinfo _ flags = do
+# if MIN_VERSION_Cabal(3,14,0)
+ let copyFlags = defaultCopyFlags {
+ copyCommonFlags = defaultCommonSetupFlags {
+ setupDistPref = installDistPref flags,
+ setupVerbosity = installVerbosity flags
+ },
+ copyDest = toFlag NoCopyDest
+ }
+#else
let copyFlags = defaultCopyFlags {
copyDistPref = installDistPref flags,
copyDest = toFlag NoCopyDest,
copyVerbosity = installVerbosity flags
}
+#endif
install pkg_descr localbuildinfo copyFlags
+#if MIN_VERSION_Cabal(3,14,0)
let registerFlags = defaultRegisterFlags {
- regDistPref = installDistPref flags,
+ registerCommonFlags = defaultCommonSetupFlags {
+ setupDistPref = installDistPref flags,
+ setupVerbosity = installVerbosity flags
+ },
+ regInPlace = installInPlace flags,
+ regPackageDB = installPackageDB flags
+ }
+#else
+ let registerFlags = defaultRegisterFlags {
+ regDistPref = installDistPref flags,
regInPlace = installInPlace flags,
regPackageDB = installPackageDB flags,
regVerbosity = installVerbosity flags
}
+#endif
when (hasLibs pkg_descr) $ register pkg_descr localbuildinfo registerFlags
registerHook :: PackageDescription -> LocalBuildInfo
@@ -198,8 +233,11 @@
then register pkg_descr localbuildinfo flags
else setupMessage verbosity
"Package contains no library to register:" (packageId pkg_descr)
+#if MIN_VERSION_Cabal(3,14,0)
+ where verbosity = fromFlag (setupVerbosity . registerCommonFlags $ flags)
+#else
where verbosity = fromFlag (regVerbosity flags)
-
+#endif
#if MIN_VERSION_Cabal(2,4,0)
getComponentLocalBuildInfo :: LocalBuildInfo -> LBI.ComponentName ->
ComponentLocalBuildInfo
getComponentLocalBuildInfo lbi cname =
@@ -226,7 +264,11 @@
LBI.CLibName
#endif
+#if MIN_VERSION_Cabal(3,14,0)
+ absPackageDBs <- absolutePackageDBPaths Nothing packageDbs
+#else
absPackageDBs <- absolutePackageDBPaths packageDbs
+#endif
installedPkgInfoRaw <- generateRegistrationInfo
verbosity pkg lib lbi clbi inplace reloc distPref
(registrationPackageDB absPackageDBs)
@@ -245,7 +287,11 @@
| modeGenerateRegScript -> die "Generate Reg Script not supported"
| otherwise -> do
setupMessage verbosity "Registering" (packageId pkg)
+#if MIN_VERSION_Cabal(3,14,0)
+ registerPackage verbosity (compiler lbi) (withPrograms lbi) Nothing
+#else
registerPackage verbosity (compiler lbi) (withPrograms lbi)
+#endif
#if MIN_VERSION_Cabal(2,0,0)
packageDbs installedPkgInfo defaultRegisterOptions
#else
@@ -254,24 +300,36 @@
where
modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags))
+#if MIN_VERSION_Cabal(3,14,0)
+ regFile = fromMaybe (display (packageId pkg) <.> "conf")
+ (getSymbolicPath <$> fromFlag
(regGenPkgConf regFlags))
+#else
regFile = fromMaybe (display (packageId pkg) <.> "conf")
(fromFlag (regGenPkgConf regFlags))
+#endif
modeGenerateRegScript = fromFlag (regGenScript regFlags)
inplace = fromFlag (regInPlace regFlags)
reloc = relocatable lbi
packageDbs = nub $ withPackageDB lbi
++ maybeToList (flagToMaybe (regPackageDB regFlags))
+#if MIN_VERSION_Cabal(3,14,0)
+ distPref = fromFlag (setupDistPref . registerCommonFlags $ regFlags)
+ verbosity = fromFlag (setupVerbosity . registerCommonFlags $ regFlags)
+#else
distPref = fromFlag (regDistPref regFlags)
verbosity = fromFlag (regVerbosity regFlags)
-
+#endif
writeRegistrationFile installedPkgInfo = do
notice verbosity ("Creating package registration file: " ++ regFile)
writeUTF8File regFile (showInstalledPackageInfo installedPkgInfo)
register _ _ regFlags = notice verbosity "No package to register"
where
+#if MIN_VERSION_Cabal(3,14,0)
+ verbosity = fromFlag (setupVerbosity . registerCommonFlags $ regFlags)
+#else
verbosity = fromFlag (regVerbosity regFlags)
-
+#endif
------------------------------------------------------------------------------
-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
@@ -333,14 +391,22 @@
++ ["--cppopts=" ++ opt | opt <- getCppOptions bi lbi]
++ ["--output-dir=" ++ newOutDir,
"--output=" ++ newOutFile,
+#if MIN_VERSION_Cabal(3,14,0)
+ "--precomp=" ++ (getSymbolicPath . buildDir $ lbi) </> precompFile,
+#else
"--precomp=" ++ buildDir lbi </> precompFile,
+#endif
header, inDir </> inFile]
return ()
getCppOptions :: BuildInfo -> LocalBuildInfo -> [String]
getCppOptions bi lbi
= nub $
+#if MIN_VERSION_Cabal(3,14,0)
+ ["-I" ++ getSymbolicPath dir | dir <- PD.includeDirs bi]
+#else
["-I" ++ dir | dir <- PD.includeDirs bi]
+#endif
++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem`
"DIU"]
installCHI :: PackageDescription -- ^information from the .cabal file
@@ -351,13 +417,21 @@
let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest
-- cannot use the recommended 'findModuleFiles' since it fails if there
exists
-- a modules that does not have a .chi file
+#if MIN_VERSION_Cabal(3,14,0)
+ mFiles <- mapM (findFileWithExtension' [fromString "chi"] [buildDir lbi] .
makeRelativePathEx . toFilePath)
+ (PD.explicitLibModules lib)
+#else
mFiles <- mapM (findFileWithExtension' [fromString "chi"] [buildDir lbi] .
toFilePath)
(PD.explicitLibModules lib)
+#endif
+#if MIN_VERSION_Cabal(3,14,0)
+ let files = [ bimap getSymbolicPath getSymbolicPath $ f | Just f <- mFiles ]
+#else
let files = [ f | Just f <- mFiles ]
+#endif
installOrdinaryFiles verbosity libPref files
-
installCHI _ _ _ _ = return ()
------------------------------------------------------------------------------
@@ -479,15 +553,25 @@
#else
id
#endif
+#if MIN_VERSION_Cabal(3,14,0)
+ let findModule m = findFileWithExtension [fromString ".chs.pp", fromString
".chs"] srcDirs
+ (makeRelativePathEx . toFilePath $ m)
+#else
let findModule m = findFileWithExtension [fromString ".chs.pp", fromString
".chs"] (map toPath srcDirs)
(joinPath (components m))
+#endif
mExpFiles <- mapM findModule expMods
mOthFiles <- mapM findModule othMods
-- tag all exposed files with True so we throw an error if we need to build
-- an exposed module before an internal modules (we cannot express this)
- let modDeps = zipWith (ModDep True []) expMods mExpFiles++
+#if MIN_VERSION_Cabal(3,14,0)
+ let modDeps = zipWith (ModDep True []) expMods (map (getSymbolicPath <$>)
mExpFiles) ++
+ zipWith (ModDep False []) othMods (map (getSymbolicPath <$>)
mOthFiles)
+#else
+ let modDeps = zipWith (ModDep True []) expMods mExpFiles ++
zipWith (ModDep False []) othMods mOthFiles
+#endif
modDeps <- mapM extractDeps modDeps
let (othMods, expMods) = span (not . mdExposed) $ reverse $ sortTopological
modDeps
return pd { PD.library = Just lib {
@@ -512,7 +596,7 @@
-- Extract the dependencies of this file. This is intentionally rather naive
as it
-- ignores CPP conditionals. We just require everything which means that the
--- existence of a .chs module may not depend on some CPP condition.
+-- existance of a .chs module may not depend on some CPP condition.
extractDeps :: ModDep -> IO ModDep
extractDeps md@ModDep { mdLocation = Nothing } = return md
extractDeps md@ModDep { mdLocation = Just f } = withUTF8FileContents f $ \con
-> do
