diff --git a/ChangeLog.md b/ChangeLog.md deleted file mode 100644 --- a/ChangeLog.md +++ /dev/null @@ -1,60 +0,0 @@ -### 3.0.29 - -+ Depend on haskell-gi >= 0.26.9 (see [issue 439](https://github.com/haskell-gi/haskell-gi/issues/439)) - -### 3.0.28 - -+ Bump base lower bound - -### 3.0.27 - -+ Bump base lower bound - -### 3.0.26 - -+ Relax constraint on text - -### 3.0.25 - -+ Update to haskell-gi(-base)-0.26 - -### 3.0.24 - -+ Update to haskell-gi(-base)-0.25 - -### 3.0.23 - -+ Upgrade to haskell-gi-base-0.24 - -### 3.0.22 - -+ Update for haskell-gi(-base)-0.23 - -### 3.0.21 - -+ Add support for inherited dependencies - -### 3.0.20 - -+ Tighten bounds in haskell-gi(-base) - -### 3.0.19 - -+ List autogenerated modules in .cabal file - -### 3.0.18 - -+ Update to haskell-gi(-base) 0.22 - -### 3.0.17 - -+ Update stack version to 12.10 - -### 3.0.16 - -+ Enable override for cairo/FontOptions, due to wrong cairo-1.0.gir file - -### 3.0.15 - -+ Remove enable-overloading flags, and use instead explicit CPP checks for 'haskell-gi-overloading-1.0', see [how to disable overloading](https://github.com/haskell-gi/haskell-gi/wiki/Overloading\#disabling-overloading). - diff --git a/Gdk.overrides b/Gdk.overrides deleted file mode 100644 --- a/Gdk.overrides +++ /dev/null @@ -1,129 +0,0 @@ -namespace Gdk - -# In most APIs these are used as guint, but they are declared as gint. -# See https://github.com/haskell-gi/haskell-gi/issues/58 -set-attr Gdk/~KEY_.*@constant/@type name guint - -# Generated from gdk 3.20.3 with xsltproc Nullable.xslt Gdk-3.0.gir -set-attr Gdk/AppLaunchContext/set_icon/@parameters/icon nullable 1 -set-attr Gdk/AppLaunchContext/set_icon_name/@parameters/icon_name nullable 1 -set-attr Gdk/Cursor/new_for_display/@return-value nullable 1 -set-attr Gdk/Cursor/new_from_name/@return-value nullable 1 -set-attr Gdk/Cursor/get_image/@return-value nullable 1 -set-attr Gdk/Cursor/get_surface/@return-value nullable 1 -set-attr Gdk/Device/get_associated_device/@return-value nullable 1 -set-attr Gdk/Device/get_last_event_window/@return-value nullable 1 -set-attr Gdk/Device/get_product_id/@return-value nullable 1 -set-attr Gdk/Device/get_state/@parameters/axes nullable 1 -set-attr Gdk/Device/get_vendor_id/@return-value nullable 1 -set-attr Gdk/Device/get_window_at_position/@return-value nullable 1 -set-attr Gdk/Device/get_window_at_position_double/@return-value nullable 1 -set-attr Gdk/Device/grab/@parameters/cursor nullable 1 -set-attr Gdk/Device/list_slave_devices/@return-value nullable 1 -set-attr Gdk/DeviceManager/get_display/@return-value nullable 1 -set-attr Gdk/Display/get_default/@return-value nullable 1 -set-attr Gdk/Display/open/@return-value nullable 1 -set-attr Gdk/Display/open_default_libgtk_only/@return-value nullable 1 -set-attr Gdk/Display/get_device_manager/@return-value nullable 1 -set-attr Gdk/Display/get_event/@return-value nullable 1 -set-attr Gdk/Display/get_monitor/@return-value nullable 1 -set-attr Gdk/Display/get_primary_monitor/@return-value nullable 1 -set-attr Gdk/Display/get_window_at_pointer/@return-value nullable 1 -set-attr Gdk/Display/peek_event/@return-value nullable 1 -set-attr Gdk/Display/store_clipboard/@parameters/targets nullable 1 -set-attr Gdk/DisplayManager/get_default_display/@return-value nullable 1 -set-attr Gdk/DisplayManager/open_display/@return-value nullable 1 -set-attr Gdk/DragContext/get_drag_window/@return-value nullable 1 -set-attr Gdk/DrawingContext/get_clip/@return-value nullable 1 -set-attr Gdk/Event/get_device/@return-value nullable 1 -set-attr Gdk/Event/get_source_device/@return-value nullable 1 -set-attr Gdk/Event/get_state/@parameters/event nullable 1 -set-attr Gdk/Event/set_device_tool/@parameters/tool nullable 1 -set-attr Gdk/Event/get/@return-value nullable 1 -set-attr Gdk/Event/handler_set/@parameters/data nullable 1 -set-attr Gdk/Event/peek/@return-value nullable 1 -set-attr Gdk/EventFunc/@parameters/data nullable 1 -set-attr Gdk/FilterFunc/@parameters/data nullable 1 -set-attr Gdk/FrameClock/get_current_timings/@return-value nullable 1 -set-attr Gdk/FrameClock/get_timings/@return-value nullable 1 -set-attr Gdk/GLContext/get_current/@return-value nullable 1 -set-attr Gdk/GLContext/get_display/@return-value nullable 1 -set-attr Gdk/GLContext/get_required_version/@parameters/major nullable 1 -set-attr Gdk/GLContext/get_required_version/@parameters/minor nullable 1 -set-attr Gdk/GLContext/get_shared_context/@return-value nullable 1 -set-attr Gdk/GLContext/get_window/@return-value nullable 1 -set-attr Gdk/Monitor/get_manufacturer/@return-value nullable 1 -set-attr Gdk/Monitor/get_model/@return-value nullable 1 -set-attr Gdk/Screen/get_default/@return-value nullable 1 -set-attr Gdk/Screen/get_active_window/@return-value nullable 1 -set-attr Gdk/Screen/get_font_options/@return-value nullable 1 -set-attr Gdk/Screen/get_monitor_plug_name/@return-value nullable 1 -set-attr Gdk/Screen/get_rgba_visual/@return-value nullable 1 -set-attr Gdk/Screen/get_window_stack/@return-value nullable 1 -set-attr Gdk/Screen/set_font_options/@parameters/options nullable 1 -set-attr Gdk/Seat/get_keyboard/@return-value nullable 1 -set-attr Gdk/Seat/get_pointer/@return-value nullable 1 -set-attr Gdk/Seat/grab/@parameters/cursor nullable 1 -set-attr Gdk/Seat/grab/@parameters/event nullable 1 -set-attr Gdk/Seat/grab/@parameters/prepare_func nullable 1 -set-attr Gdk/Seat/grab/@parameters/prepare_func_data nullable 1 -set-attr Gdk/SeatGrabPrepareFunc/@parameters/user_data nullable 1 -set-attr Gdk/Visual/get_best_with_both/@return-value nullable 1 -set-attr Gdk/Window/new/@parameters/parent nullable 1 -set-attr Gdk/Window/add_filter/@parameters/window nullable 1 -set-attr Gdk/Window/add_filter/@parameters/data nullable 1 -set-attr Gdk/Window/create_similar_image_surface/@parameters/window nullable 1 -set-attr Gdk/Window/get_background_pattern/@return-value nullable 1 -set-attr Gdk/Window/get_children_with_user_data/@parameters/user_data nullable 1 -set-attr Gdk/Window/get_cursor/@return-value nullable 1 -set-attr Gdk/Window/get_device_cursor/@return-value nullable 1 -set-attr Gdk/Window/get_device_position/@return-value nullable 1 -set-attr Gdk/Window/get_device_position_double/@return-value nullable 1 -set-attr Gdk/Window/get_pointer/@return-value nullable 1 -set-attr Gdk/Window/get_user_data/@parameters/data nullable 1 -set-attr Gdk/Window/invalidate_maybe_recurse/@parameters/child_func nullable 1 -set-attr Gdk/Window/invalidate_maybe_recurse/@parameters/user_data nullable 1 -set-attr Gdk/Window/invalidate_rect/@parameters/rect nullable 1 -set-attr Gdk/Window/remove_filter/@parameters/data nullable 1 -set-attr Gdk/Window/restack/@parameters/sibling nullable 1 -set-attr Gdk/Window/set_background_pattern/@parameters/pattern nullable 1 -set-attr Gdk/Window/set_cursor/@parameters/cursor nullable 1 -set-attr Gdk/Window/set_group/@parameters/leader nullable 1 -set-attr Gdk/Window/set_icon_name/@parameters/name nullable 1 -set-attr Gdk/Window/set_opaque_region/@parameters/region nullable 1 -set-attr Gdk/Window/set_user_data/@parameters/user_data nullable 1 -set-attr Gdk/Window/shape_combine_region/@parameters/shape_region nullable 1 -set-attr Gdk/Window/moved-to-rect/@parameters/flipped_rect nullable 1 -set-attr Gdk/Window/moved-to-rect/@parameters/final_rect nullable 1 -set-attr Gdk/Window/pick-embedded-child/@return-value nullable 1 -set-attr Gdk/WindowChildFunc/@parameters/user_data nullable 1 -set-attr Gdk/cairo_get_drawing_context/@return-value nullable 1 -set-attr Gdk/cairo_surface_create_from_pixbuf/@parameters/for_window nullable 1 -set-attr Gdk/event_get/@return-value nullable 1 -set-attr Gdk/event_handler_set/@parameters/data nullable 1 -set-attr Gdk/event_peek/@return-value nullable 1 -set-attr Gdk/get_display_arg_name/@return-value nullable 1 -set-attr Gdk/keyval_name/@return-value nullable 1 -set-attr Gdk/offscreen_window_get_embedder/@return-value nullable 1 -set-attr Gdk/offscreen_window_get_surface/@return-value nullable 1 -set-attr Gdk/pixbuf_get_from_surface/@return-value nullable 1 -set-attr Gdk/pixbuf_get_from_window/@return-value nullable 1 -set-attr Gdk/pointer_grab/@parameters/confine_to nullable 1 -set-attr Gdk/pointer_grab/@parameters/cursor nullable 1 -set-attr Gdk/selection_owner_get/@return-value nullable 1 -set-attr Gdk/selection_owner_get_for_display/@return-value nullable 1 -set-attr Gdk/selection_owner_set/@parameters/owner nullable 1 -set-attr Gdk/selection_owner_set_for_display/@parameters/owner nullable 1 -set-attr Gdk/threads_add_idle/@parameters/data nullable 1 -set-attr Gdk/threads_add_idle_full/@parameters/data nullable 1 -set-attr Gdk/threads_add_idle_full/@parameters/notify nullable 1 -set-attr Gdk/threads_add_timeout/@parameters/data nullable 1 -set-attr Gdk/threads_add_timeout_full/@parameters/data nullable 1 -set-attr Gdk/threads_add_timeout_full/@parameters/notify nullable 1 -set-attr Gdk/threads_add_timeout_seconds/@parameters/data nullable 1 -set-attr Gdk/threads_add_timeout_seconds_full/@parameters/data nullable 1 -set-attr Gdk/threads_add_timeout_seconds_full/@parameters/notify nullable 1 -set-attr Gdk/utf8_to_string_target/@return-value nullable 1 - -set-attr cairo/FontOptions glib:get-type cairo_gobject_font_options_get_type - diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,13 @@ -The gi-gdk library and included works are provided under the terms of the +The gi-gdk3 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-gdk library +Static linking of applications or any other source to the gi-gdk3 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-gdk libraries, or to link their applications against a -user-supplied version of gi-gdk. If you link applications to a modified -version of gi-gdk, then the changes to gi-gdk must be provided under the +shared gi-gdk3 libraries, or to link their applications against a +user-supplied version of gi-gdk3. If you link applications to a modified +version of gi-gdk3, then the changes to gi-gdk3 must be provided under the terms of the LGPL. ---------------------------------------------------------------------------- diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,6 +1,2 @@ -# Documentation -Autogenerated documentation for this package can be found at - -[https://hackage.haskell.org/package/gi-gdk-3.0.29/docs/GI-Gdk.html](https://hackage.haskell.org/package/gi-gdk-3.0.29/docs/GI-Gdk.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). +# Information +This is a compatibility package. For newer projects we recommend that you use [gi-gdk3](/package/gi-gdk3) instead. diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,22 +1,5 @@ -{-# 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.GdkPixbuf.Config as GdkPixbuf -import qualified GI.Gio.Config as Gio -import qualified GI.Pango.Config as Pango -import qualified GI.Cairo.Config as Cairo - +import Data.GI.CodeGen.CabalHooks (setupCompatWrapper) +import qualified GI.Gdk.Config as Cfg main :: IO () -main = setupBinding name version pkgName pkgVersion verbose overridesFile inheritedOverrides outputDir - where name = "Gdk" - version = "3.0" - pkgName = "gi-gdk" - pkgVersion = "3.0.29" - overridesFile = Just "Gdk.overrides" - verbose = False - outputDir = Nothing - inheritedOverrides = [TaggedOverride "inherited:GLib" GLib.overrides, TaggedOverride "inherited:GObject" GObject.overrides, TaggedOverride "inherited:GdkPixbuf" GdkPixbuf.overrides, TaggedOverride "inherited:Gio" Gio.overrides, TaggedOverride "inherited:Pango" Pango.overrides, TaggedOverride "inherited:Cairo" Cairo.overrides] +main = setupCompatWrapper "gi-gdk3" Cfg.modules diff --git a/gi-gdk.cabal b/gi-gdk.cabal --- a/gi-gdk.cabal +++ b/gi-gdk.cabal @@ -1,192 +1,29 @@ -name: gi-gdk -version: 3.0.29 -synopsis: Gdk bindings -description: Bindings for Gdk, 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 +name: gi-gdk +version: 3.0.30 +synopsis: Gdk 3.x bindings (compatibility layer) +description: This package re-exports (for backward compatibility) + the haskell-gi generated bindings in the gi-gdk3 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 -extra-source-files: README.md ChangeLog.md stack.yaml Gdk.overrides +extra-source-files: README.md custom-setup - setup-depends: base >= 4.11 && < 5, - Cabal >= 1.24 && < 4, - haskell-gi >= 0.26.9 && < 0.27, - gi-cairo == 1.0.*, - gi-pango == 1.0.*, - gi-gio == 2.0.*, - gi-gdkpixbuf == 2.0.*, - gi-gobject == 2.0.*, - gi-glib == 2.0.* + setup-depends: + base >= 4.11 && <5, + haskell-gi ^>= 0.26.14, + gi-gdk3 ^>= 3.0.30 library - 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 - - pkgconfig-depends: gdk-3.0 - build-depends: base >= 4.7 && <5, - haskell-gi-base >= 0.26 && < 0.27, - haskell-gi >= 0.26.9 && < 0.27, - haskell-gi-overloading < 1.1, - gi-cairo == 1.0.*, - gi-pango == 1.0.*, - gi-gio == 2.0.*, - gi-gdkpixbuf == 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 - - -- 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. + ghc-options: -Wall - exposed-modules: GI.Gdk.Config, - GI.Gdk, - GI.Gdk.Callbacks, - GI.Gdk.Constants, - GI.Gdk.Enums, - GI.Gdk.Flags, - GI.Gdk.Functions, - GI.Gdk.Interfaces, - GI.Gdk.Interfaces.DevicePad, - GI.Gdk.Objects, - GI.Gdk.Objects.AppLaunchContext, - GI.Gdk.Objects.Cursor, - GI.Gdk.Objects.Device, - GI.Gdk.Objects.DeviceManager, - GI.Gdk.Objects.DeviceTool, - GI.Gdk.Objects.Display, - GI.Gdk.Objects.DisplayManager, - GI.Gdk.Objects.DragContext, - GI.Gdk.Objects.DrawingContext, - GI.Gdk.Objects.FrameClock, - GI.Gdk.Objects.GLContext, - GI.Gdk.Objects.Keymap, - GI.Gdk.Objects.Monitor, - GI.Gdk.Objects.Screen, - GI.Gdk.Objects.Seat, - GI.Gdk.Objects.Visual, - GI.Gdk.Objects.Window, - GI.Gdk.Structs, - GI.Gdk.Structs.Atom, - GI.Gdk.Structs.Color, - GI.Gdk.Structs.EventAny, - GI.Gdk.Structs.EventButton, - GI.Gdk.Structs.EventConfigure, - GI.Gdk.Structs.EventCrossing, - GI.Gdk.Structs.EventDND, - GI.Gdk.Structs.EventExpose, - GI.Gdk.Structs.EventFocus, - GI.Gdk.Structs.EventGrabBroken, - GI.Gdk.Structs.EventKey, - GI.Gdk.Structs.EventMotion, - GI.Gdk.Structs.EventOwnerChange, - GI.Gdk.Structs.EventPadAxis, - GI.Gdk.Structs.EventPadButton, - GI.Gdk.Structs.EventPadGroupMode, - GI.Gdk.Structs.EventProperty, - GI.Gdk.Structs.EventProximity, - GI.Gdk.Structs.EventScroll, - GI.Gdk.Structs.EventSelection, - GI.Gdk.Structs.EventSequence, - GI.Gdk.Structs.EventSetting, - GI.Gdk.Structs.EventTouch, - GI.Gdk.Structs.EventTouchpadPinch, - GI.Gdk.Structs.EventTouchpadSwipe, - GI.Gdk.Structs.EventVisibility, - GI.Gdk.Structs.EventWindowState, - GI.Gdk.Structs.FrameTimings, - GI.Gdk.Structs.Geometry, - GI.Gdk.Structs.KeymapKey, - GI.Gdk.Structs.Point, - GI.Gdk.Structs.RGBA, - GI.Gdk.Structs.Rectangle, - GI.Gdk.Structs.TimeCoord, - GI.Gdk.Structs.WindowAttr, - GI.Gdk.Structs.WindowRedirect, - GI.Gdk.Unions, - GI.Gdk.Unions.Event + build-depends: base >= 4.11 && <5, + gi-gdk3 ^>= 3.0.30 - autogen-modules: GI.Gdk.Config, - GI.Gdk, - GI.Gdk.Callbacks, - GI.Gdk.Constants, - GI.Gdk.Enums, - GI.Gdk.Flags, - GI.Gdk.Functions, - GI.Gdk.Interfaces, - GI.Gdk.Interfaces.DevicePad, - GI.Gdk.Objects, - GI.Gdk.Objects.AppLaunchContext, - GI.Gdk.Objects.Cursor, - GI.Gdk.Objects.Device, - GI.Gdk.Objects.DeviceManager, - GI.Gdk.Objects.DeviceTool, - GI.Gdk.Objects.Display, - GI.Gdk.Objects.DisplayManager, - GI.Gdk.Objects.DragContext, - GI.Gdk.Objects.DrawingContext, - GI.Gdk.Objects.FrameClock, - GI.Gdk.Objects.GLContext, - GI.Gdk.Objects.Keymap, - GI.Gdk.Objects.Monitor, - GI.Gdk.Objects.Screen, - GI.Gdk.Objects.Seat, - GI.Gdk.Objects.Visual, - GI.Gdk.Objects.Window, - GI.Gdk.Structs, - GI.Gdk.Structs.Atom, - GI.Gdk.Structs.Color, - GI.Gdk.Structs.EventAny, - GI.Gdk.Structs.EventButton, - GI.Gdk.Structs.EventConfigure, - GI.Gdk.Structs.EventCrossing, - GI.Gdk.Structs.EventDND, - GI.Gdk.Structs.EventExpose, - GI.Gdk.Structs.EventFocus, - GI.Gdk.Structs.EventGrabBroken, - GI.Gdk.Structs.EventKey, - GI.Gdk.Structs.EventMotion, - GI.Gdk.Structs.EventOwnerChange, - GI.Gdk.Structs.EventPadAxis, - GI.Gdk.Structs.EventPadButton, - GI.Gdk.Structs.EventPadGroupMode, - GI.Gdk.Structs.EventProperty, - GI.Gdk.Structs.EventProximity, - GI.Gdk.Structs.EventScroll, - GI.Gdk.Structs.EventSelection, - GI.Gdk.Structs.EventSequence, - GI.Gdk.Structs.EventSetting, - GI.Gdk.Structs.EventTouch, - GI.Gdk.Structs.EventTouchpadPinch, - GI.Gdk.Structs.EventTouchpadSwipe, - GI.Gdk.Structs.EventVisibility, - GI.Gdk.Structs.EventWindowState, - GI.Gdk.Structs.FrameTimings, - GI.Gdk.Structs.Geometry, - GI.Gdk.Structs.KeymapKey, - GI.Gdk.Structs.Point, - GI.Gdk.Structs.RGBA, - GI.Gdk.Structs.Rectangle, - GI.Gdk.Structs.TimeCoord, - GI.Gdk.Structs.WindowAttr, - GI.Gdk.Structs.WindowRedirect, - GI.Gdk.Unions, - GI.Gdk.Unions.Event + default-language: Haskell2010 diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 --- a/stack.yaml +++ /dev/null @@ -1,3 +0,0 @@ -packages: -- '.' -resolver: lts-13.7