diff --git a/ChangeLog.md b/ChangeLog.md new file mode 100644 --- /dev/null +++ b/ChangeLog.md @@ -0,0 +1,8 @@ +### 3.0.2 + ++ Bump base lower bound + +3.0.1 +===== + ++ Initial version. diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,13 @@ -The gi-soup2 library and included works are provided under the terms of the +The gi-soup library and included works are provided under the terms of the GNU Library General Public License (LGPL) version 2.1 with the following exception: -Static linking of applications or any other source to the gi-soup2 library +Static linking of applications or any other source to the gi-soup library does not constitute a modified or derivative work and does not require the author(s) to provide source code for said work, to link against the -shared gi-soup2 libraries, or to link their applications against a -user-supplied version of gi-soup2. If you link applications to a modified -version of gi-soup2, then the changes to gi-soup2 must be provided under the +shared gi-soup libraries, or to link their applications against a +user-supplied version of gi-soup. If you link applications to a modified +version of gi-soup, then the changes to gi-soup must be provided under the terms of the LGPL. ---------------------------------------------------------------------------- diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ -# Information -This is a compatibility package. For newer projects we recommend that you use [gi-soup2](/package/gi-soup2) instead. +# Documentation +Autogenerated documentation for this package can be found at + +[https://hackage.haskell.org/package/gi-soup-3.0.2/docs/GI-Soup.html](https://hackage.haskell.org/package/gi-soup-3.0.2/docs/GI-Soup.html) + +For general documentation on using [haskell-gi](https://github.com/haskell-gi/haskell-gi) based bindings, see [the project page](https://github.com/haskell-gi/haskell-gi) or [the Wiki](https://github.com/haskell-gi/haskell-gi/wiki). diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,5 +1,19 @@ -import Data.GI.CodeGen.CabalHooks (setupCompatWrapper) -import qualified GI.Soup.Config as Cfg +{-# LANGUAGE OverloadedStrings #-} +import Data.GI.CodeGen.CabalHooks (setupBinding, TaggedOverride(..)) + +import qualified GI.GLib.Config as GLib +import qualified GI.GObject.Config as GObject +import qualified GI.Gio.Config as Gio + + main :: IO () -main = setupCompatWrapper "gi-soup2" Cfg.modules +main = setupBinding name version pkgName pkgVersion verbose overridesFile inheritedOverrides outputDir + where name = "Soup" + version = "3.0" + pkgName = "gi-soup" + pkgVersion = "3.0.2" + overridesFile = Nothing + verbose = False + outputDir = Nothing + inheritedOverrides = [TaggedOverride "inherited:GLib" GLib.overrides, TaggedOverride "inherited:GObject" GObject.overrides, TaggedOverride "inherited:Gio" Gio.overrides] diff --git a/gi-soup.cabal b/gi-soup.cabal --- a/gi-soup.cabal +++ b/gi-soup.cabal @@ -1,29 +1,146 @@ -name: gi-soup -version: 2.4.30 -synopsis: Libsoup 2.4.x bindings (compatibility layer) -description: This package re-exports (for backward compatibility) - the haskell-gi generated bindings in the gi-soup2 package. -homepage: https://github.com/haskell-gi/haskell-gi -license: LGPL-2.1 -license-file: LICENSE -author: Iñaki García Etxebarria -maintainer: Iñaki García Etxebarria -category: Bindings -build-type: Custom -cabal-version: 2.0 +name: gi-soup +version: 3.0.2 +synopsis: Libsoup bindings +description: Bindings for Libsoup, autogenerated by haskell-gi. +homepage: https://github.com/haskell-gi/haskell-gi +license: LGPL-2.1 +license-file: LICENSE +author: Iñaki García Etxebarria +maintainer: Iñaki García Etxebarria +category: Bindings +build-type: Custom +cabal-version: 2.0 -extra-source-files: README.md +extra-source-files: README.md ChangeLog.md stack.yaml custom-setup - setup-depends: - base >= 4.11 && <5, - haskell-gi ^>= 0.26.14, - gi-soup2 ^>= 2.4.30 + setup-depends: base >= 4.11 && < 5, + Cabal >= 1.24 && < 4, + haskell-gi >= 0.26 && < 0.27, + gi-gio == 2.0.*, + gi-gobject == 2.0.*, + gi-glib == 2.0.* library - ghc-options: -Wall + default-language: Haskell2010 + default-extensions: NoImplicitPrelude, ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts, UndecidableSuperClasses, TypeOperators + other-extensions: PatternSynonyms, ViewPatterns, TypeApplications + ghc-options: -fno-warn-unused-imports -fno-warn-warnings-deprecations - build-depends: base >= 4.11 && <5, - gi-soup2 ^>= 2.4.30 + pkgconfig-depends: libsoup-3.0 + build-depends: base >= 4.7 && <5, + haskell-gi-base >= 0.26 && < 0.27, + haskell-gi >= 0.26 && < 0.27, + haskell-gi-overloading < 1.1, + gi-gio == 2.0.*, + gi-gobject == 2.0.*, + gi-glib == 2.0.*, + bytestring >= 0.10 && < 1, + containers >= 0.5 && < 1, + text >= 1.0 && < 3, + transformers >= 0.4 && < 1 - default-language: Haskell2010 + -- Disable overloading when compiling under GHC 8.2.x + -- see https://ghc.haskell.org/trac/ghc/ticket/14382 + if impl(ghc == 8.2.*) + build-depends: haskell-gi-overloading == 0.0 + + -- Note that the following list of exposed modules and autogen + -- modules is for documentation purposes only, so that some + -- documentation appears in hackage. The actual list of modules + -- to be built will be built at configure time, based on the + -- available introspection data. + + exposed-modules: GI.Soup.Config, + GI.Soup, + GI.Soup.Callbacks, + GI.Soup.Constants, + GI.Soup.Enums, + GI.Soup.Flags, + GI.Soup.Functions, + GI.Soup.Interfaces, + GI.Soup.Interfaces.SessionFeature, + GI.Soup.Objects, + GI.Soup.Objects.Auth, + GI.Soup.Objects.AuthBasic, + GI.Soup.Objects.AuthDigest, + GI.Soup.Objects.AuthDomain, + GI.Soup.Objects.AuthDomainBasic, + GI.Soup.Objects.AuthDomainDigest, + GI.Soup.Objects.AuthManager, + GI.Soup.Objects.AuthNTLM, + GI.Soup.Objects.AuthNegotiate, + GI.Soup.Objects.Cache, + GI.Soup.Objects.ContentDecoder, + GI.Soup.Objects.ContentSniffer, + GI.Soup.Objects.CookieJar, + GI.Soup.Objects.CookieJarDB, + GI.Soup.Objects.CookieJarText, + GI.Soup.Objects.HSTSEnforcer, + GI.Soup.Objects.HSTSEnforcerDB, + GI.Soup.Objects.Logger, + GI.Soup.Objects.Message, + GI.Soup.Objects.MultipartInputStream, + GI.Soup.Objects.Server, + GI.Soup.Objects.ServerMessage, + GI.Soup.Objects.Session, + GI.Soup.Objects.WebsocketConnection, + GI.Soup.Objects.WebsocketExtension, + GI.Soup.Objects.WebsocketExtensionDeflate, + GI.Soup.Objects.WebsocketExtensionManager, + GI.Soup.Structs, + GI.Soup.Structs.Cookie, + GI.Soup.Structs.HSTSPolicy, + GI.Soup.Structs.MessageBody, + GI.Soup.Structs.MessageHeaders, + GI.Soup.Structs.MessageHeadersIter, + GI.Soup.Structs.MessageMetrics, + GI.Soup.Structs.Multipart, + GI.Soup.Structs.Range + + autogen-modules: GI.Soup.Config, + GI.Soup, + GI.Soup.Callbacks, + GI.Soup.Constants, + GI.Soup.Enums, + GI.Soup.Flags, + GI.Soup.Functions, + GI.Soup.Interfaces, + GI.Soup.Interfaces.SessionFeature, + GI.Soup.Objects, + GI.Soup.Objects.Auth, + GI.Soup.Objects.AuthBasic, + GI.Soup.Objects.AuthDigest, + GI.Soup.Objects.AuthDomain, + GI.Soup.Objects.AuthDomainBasic, + GI.Soup.Objects.AuthDomainDigest, + GI.Soup.Objects.AuthManager, + GI.Soup.Objects.AuthNTLM, + GI.Soup.Objects.AuthNegotiate, + GI.Soup.Objects.Cache, + GI.Soup.Objects.ContentDecoder, + GI.Soup.Objects.ContentSniffer, + GI.Soup.Objects.CookieJar, + GI.Soup.Objects.CookieJarDB, + GI.Soup.Objects.CookieJarText, + GI.Soup.Objects.HSTSEnforcer, + GI.Soup.Objects.HSTSEnforcerDB, + GI.Soup.Objects.Logger, + GI.Soup.Objects.Message, + GI.Soup.Objects.MultipartInputStream, + GI.Soup.Objects.Server, + GI.Soup.Objects.ServerMessage, + GI.Soup.Objects.Session, + GI.Soup.Objects.WebsocketConnection, + GI.Soup.Objects.WebsocketExtension, + GI.Soup.Objects.WebsocketExtensionDeflate, + GI.Soup.Objects.WebsocketExtensionManager, + GI.Soup.Structs, + GI.Soup.Structs.Cookie, + GI.Soup.Structs.HSTSPolicy, + GI.Soup.Structs.MessageBody, + GI.Soup.Structs.MessageHeaders, + GI.Soup.Structs.MessageHeadersIter, + GI.Soup.Structs.MessageMetrics, + GI.Soup.Structs.Multipart, + GI.Soup.Structs.Range diff --git a/stack.yaml b/stack.yaml new file mode 100644 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,3 @@ +packages: +- '.' +resolver: lts-13.7