Hello community, here is the log from the commit of package xmobar for openSUSE:Factory checked in at 2018-12-21 08:21:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmobar (Old) and /work/SRC/openSUSE:Factory/.xmobar.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmobar" Fri Dec 21 08:21:15 2018 rev:6 rq:658078 version:0.29.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xmobar/xmobar.changes 2018-12-10 12:30:05.098422208 +0100 +++ /work/SRC/openSUSE:Factory/.xmobar.new.28833/xmobar.changes 2018-12-21 08:21:29.997565462 +0100 @@ -1,0 +2,21 @@ +Tue Dec 11 03:01:47 UTC 2018 - psim...@suse.com + +- Update xmobar to version 0.29.3. + ## Version 0.29.3 (December, 2018) + + _Bug fixes_ + + - Upper bound for alsa_mixer (see [issue #372]) + + [issue #372]: https://github.com/jaor/xmobar/issues/372 + +------------------------------------------------------------------- +Sun Dec 9 03:01:29 UTC 2018 - psim...@suse.com + +- Update xmobar to version 0.29.2. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/xmobar-0.29.2/src/changelog.md + +------------------------------------------------------------------- Old: ---- xmobar-0.29.1.tar.gz New: ---- xmobar-0.29.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmobar.spec ++++++ --- /var/tmp/diff_new_pack.2ZXgKl/_old 2018-12-21 08:21:30.541564952 +0100 +++ /var/tmp/diff_new_pack.2ZXgKl/_new 2018-12-21 08:21:30.541564952 +0100 @@ -19,7 +19,7 @@ %global pkg_name xmobar %bcond_with tests Name: %{pkg_name} -Version: 0.29.1 +Version: 0.29.3 Release: 0 Summary: A Minimalistic Text Based Status Bar License: BSD-3-Clause ++++++ xmobar-0.29.1.tar.gz -> xmobar-0.29.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmobar-0.29.1/changelog.md new/xmobar-0.29.3/changelog.md --- old/xmobar-0.29.1/changelog.md 1970-01-01 01:00:00.000000000 +0100 +++ new/xmobar-0.29.3/changelog.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +1,25 @@ +## Version 0.29.3 (December, 2018) + +_Bug fixes_ + + - Upper bound for alsa_mixer (see [issue #372]) + +[issue #372]: https://github.com/jaor/xmobar/issues/372 + +## Version 0.29.2 (December, 2018) + +_Bug fixes_ + + - Work as usual with .xmobarrc (see [issue #371]). + +[issue #371]: https://github.com/jaor/xmobar/issues/371 + ## Version 0.29.1 (December, 2018) _Bug fixes_ - - Honour command line flags (fixes [issue #370]) - - Expose Cmd and CmdX in Xmobar interface + - Honour command line flags (fixes [issue #370]). + - Expose Cmd and CmdX in Xmobar interface. [issue #370]: https://github.com/jaor/xmobar/issues/370 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmobar-0.29.1/examples/xmobar.hs new/xmobar-0.29.3/examples/xmobar.hs --- old/xmobar-0.29.1/examples/xmobar.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/xmobar-0.29.3/examples/xmobar.hs 1970-01-01 01:00:00.000000000 +0100 @@ -16,7 +16,6 @@ -- and xmobar will compile and launch it for you and ------------------------------------------------------------------------------ - import Xmobar -- Example user-defined plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmobar-0.29.1/readme.md new/xmobar-0.29.3/readme.md --- old/xmobar-0.29.1/readme.md 1970-01-01 01:00:00.000000000 +0100 +++ new/xmobar-0.29.3/readme.md 1970-01-01 01:00:00.000000000 +0100 @@ -321,7 +321,6 @@ - `template` The output template. - - `wmClass` The value for the window's X11 WM_CLASS property. Defaults to "xmobar". @@ -400,7 +399,7 @@ processes will run without further problems, yet have no dbus interface. -[src/Signal.hs]: https://github.com/jaor/xmobar/raw/master/src/Signal.hs +[src/Signal.hs]: https://github.com/jaor/xmobar/blob/master/src/Xmobar/System/Signal.hs - Bus Name: `org.Xmobar.Control` - Object Path: `/org/Xmobar/Control` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmobar-0.29.1/src/Xmobar/App/Compile.hs new/xmobar-0.29.3/src/Xmobar/App/Compile.hs --- old/xmobar-0.29.1/src/Xmobar/App/Compile.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/xmobar-0.29.3/src/Xmobar/App/Compile.hs 1970-01-01 01:00:00.000000000 +0100 @@ -17,7 +17,7 @@ ------------------------------------------------------------------------------ -module Xmobar.App.Compile(recompile, xmessage) where +module Xmobar.App.Compile(recompile, trace, xmessage) where import Control.Monad.IO.Class import Control.Monad.Fix (fix) @@ -70,12 +70,12 @@ binT <- getModTime bin if any (binT <) (srcT : libTs) then do - trace verb "Xmobar doing recompile because some files have changed." + trace verb "Xmobar recompiling because some files have changed." return True else do trace verb $ "Xmobar skipping recompile because it is not forced " ++ "(e.g. via --recompile), and not any *.hs / *.lhs / *.hsc" - ++ "files in lib/ have been changed." + ++ " files in lib/ have been changed." return False where isSource = flip elem [".hs",".lhs",".hsc"] . takeExtension allFiles t = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmobar-0.29.1/src/Xmobar/App/Main.hs new/xmobar-0.29.3/src/Xmobar/App/Main.hs --- old/xmobar-0.29.1/src/Xmobar/App/Main.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/xmobar-0.29.3/src/Xmobar/App/Main.hs 1970-01-01 01:00:00.000000000 +0100 @@ -15,7 +15,7 @@ ------------------------------------------------------------------------------ -module Xmobar.App.Main (xmobar, xmobarMain) where +module Xmobar.App.Main (xmobar, xmobarMain, configFromArgs) where import Control.Concurrent.Async (Async, cancel) import Control.Exception (bracket) @@ -28,6 +28,7 @@ import System.Environment (getArgs) import System.FilePath import System.FilePath.Posix (takeBaseName, takeDirectory) +import Text.Parsec.Error (ParseError) import Graphics.X11.Xlib @@ -38,9 +39,9 @@ import Xmobar.X11.Types import Xmobar.X11.Text import Xmobar.X11.Window -import Xmobar.App.Opts +import Xmobar.App.Opts (recompileFlag, verboseFlag, getOpts, doOpts) import Xmobar.App.EventLoop (startLoop, startCommand) -import Xmobar.App.Compile (recompile) +import Xmobar.App.Compile (recompile, trace) import Xmobar.App.Config xmobar :: Config -> IO () @@ -61,17 +62,25 @@ ts = textOffsets conf ++ replicate (length fl) (-1) startLoop (XConf d r w (fs:fl) (to:ts) ic conf) sig vars +configFromArgs :: Config -> IO Config +configFromArgs cfg = getArgs >>= getOpts >>= doOpts cfg . fst + cleanupThreads :: [[([Async ()], a)]] -> IO () cleanupThreads vars = for_ (concat vars) $ \(asyncs, _) -> for_ asyncs cancel -buildLaunch :: Bool -> Bool -> FilePath -> IO () -buildLaunch verb force p = do +buildLaunch :: Bool -> Bool -> FilePath -> ParseError -> IO () +buildLaunch verb force p e = do let exec = takeBaseName p dir = takeDirectory p - recompile dir exec force verb - executeFile (dir </> exec) False [] Nothing + ext = takeExtension p + if ext `elem` [".hs", ".hsc", ".lhs"] + then recompile dir exec force verb >> + executeFile (dir </> exec) False [] Nothing + else trace True ("Invalid configuration file: " ++ show e) >> + trace True "\n(No compilation attempted: \ + \only .hs, .hsc or .lhs files are compiled)" xmobar' :: [String] -> Config -> IO () xmobar' defs cfg = do @@ -93,6 +102,6 @@ _ -> xmobar defaultConfig Just p -> do r <- readConfig defaultConfig p case r of - Left _ -> - buildLaunch (verboseFlag flags) (recompileFlag flags) p + Left e -> + buildLaunch (verboseFlag flags) (recompileFlag flags) p e Right (c, defs) -> doOpts c flags >>= xmobar' defs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmobar-0.29.1/src/Xmobar/App/Opts.hs new/xmobar-0.29.3/src/Xmobar/App/Opts.hs --- old/xmobar-0.29.1/src/Xmobar/App/Opts.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/xmobar-0.29.3/src/Xmobar/App/Opts.hs 1970-01-01 01:00:00.000000000 +0100 @@ -14,7 +14,7 @@ -- ------------------------------------------------------------------------------ -module Xmobar.App.Opts where +module Xmobar.App.Opts (recompileFlag, verboseFlag, getOpts, doOpts) where import Control.Monad (when) import System.Console.GetOpt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmobar-0.29.1/src/Xmobar.hs new/xmobar-0.29.3/src/Xmobar.hs --- old/xmobar-0.29.1/src/Xmobar.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/xmobar-0.29.3/src/Xmobar.hs 1970-01-01 01:00:00.000000000 +0100 @@ -18,6 +18,7 @@ module Xmobar (xmobar , xmobarMain , defaultConfig + , configFromArgs , Runnable (..) , Exec (..) , Command (..) @@ -65,5 +66,5 @@ import Xmobar.Plugins.StdinReader import Xmobar.Plugins.XMonadLog -import Xmobar.App.Main(xmobar, xmobarMain) +import Xmobar.App.Main(xmobar, xmobarMain, configFromArgs) import Xmobar.App.Config(defaultConfig) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmobar-0.29.1/xmobar.cabal new/xmobar-0.29.3/xmobar.cabal --- old/xmobar-0.29.1/xmobar.cabal 1970-01-01 01:00:00.000000000 +0100 +++ new/xmobar-0.29.3/xmobar.cabal 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +1,5 @@ name: xmobar -version: 0.29.1 +version: 0.29.3 homepage: http://xmobar.org synopsis: A Minimalistic Text Based Status Bar description: Xmobar is a minimalistic text based status bar. @@ -223,7 +223,7 @@ cpp-options: -DLIBMPD if flag(with_alsa) || flag(all_extensions) - build-depends: alsa-mixer > 0.2.0.2 + build-depends: alsa-mixer > 0.2.0.2 && < 0.3 build-depends: alsa-core == 0.5.*, process >= 1.4.3.0 exposed-modules: Xmobar.Plugins.Monitors.Volume @@ -325,7 +325,7 @@ Xmobar.System.Signal if flag(with_alsa) || flag(all_extensions) - build-depends: alsa-mixer > 0.2.0.2, + build-depends: alsa-mixer > 0.2.0.2 && < 0.3, alsa-core == 0.5.*, process >= 1.4.3.0 other-modules: Xmobar.Plugins.Monitors.Volume
