From 0f8cd4f33547942349050970f4434908243b8a11 Mon Sep 17 00:00:00 2001
From: Tobias Knopp <tobias@knoppweb.de>
Date: Thu, 28 Nov 2019 23:40:29 +0100
Subject: [PATCH] some cleanup after JLL merge

---
 .travis.yml  |  3 +--
 Project.toml | 23 +++++++++++++++++++----
 appveyor.yml |  1 -
 deps/ext.jl  | 37 -------------------------------------
 src/Gtk.jl   |  1 -
 5 files changed, 20 insertions(+), 45 deletions(-)
 delete mode 100644 deps/ext.jl

diff --git a/.travis.yml b/.travis.yml
index 38ab97c5..a76b2b4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,14 +40,13 @@ addons:
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
   - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
-  - $TESTCMD -e 'using Pkg; pkg"add https://github.com/staticfloat/Cairo.jl#sf/jll_packages"'
   - travis_wait 30 $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
 
 ## uncomment following lines to deploy documentation
 jobs:
    include:
      - stage: Documentation
-       julia: 1.2
+       julia: 1.3
        os: linux
        script:
          - julia --project=docs -e 'using Pkg; Pkg.instantiate(); Pkg.add(PackageSpec(path=pwd()))'
diff --git a/Project.toml b/Project.toml
index 4c591905..fb1e54dd 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,6 +1,6 @@
 name = "Gtk"
 uuid = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
-version = "0.18.0"
+version = "1.0.0"
 
 [deps]
 Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
@@ -19,6 +19,21 @@ gdk_pixbuf_jll = "da03df04-f53b-5353-a52f-6a8b0620ced0"
 hicolor_icon_theme_jll = "059c91fe-1bad-52ad-bddd-f7b78713c282"
 
 [compat]
-Cairo = "≥ 0.7"
-Graphics = "≥ 0.1.0"
-julia = "≥ 1.3"
+julia = "1.3"
+Cairo = "1.0.0"
+Cairo_jll = "1.16.0"
+GTK3_jll = "3.24.11"
+Glib_jll = "2.59.0"
+Graphics = "0.4.0"
+Reexport = "0.2"
+adwaita_icon_theme_jll = "3.33.92"
+gdk_pixbuf_jll = "2.38.2"
+hicolor_icon_theme_jll = "0.17.0"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]
+
+
diff --git a/appveyor.yml b/appveyor.yml
index 9f311fe0..9c2e691b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,6 @@ install:
 
 build_script:
   - echo "%JL_BUILD_SCRIPT%"
-  - C:\julia\bin\julia -e "using Pkg; pkg\"add https://github.com/staticfloat/Cairo.jl#sf/jll_packages\""
   - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
diff --git a/deps/ext.jl b/deps/ext.jl
deleted file mode 100644
index 6d7f1cd3..00000000
--- a/deps/ext.jl
+++ /dev/null
@@ -1,37 +0,0 @@
-const _depspath = joinpath(dirname(@__FILE__), "deps.jl")
-
-if isfile(_depspath)
-    include(_depspath)
-end
-
-const KERNEL = Base.Sys.KERNEL
-
-if !isdefined(@__MODULE__, :libgtk)
-    if KERNEL == :Windows || KERNEL == :NT
-        const libgtk = "libgtk-3-0"
-    else
-        const libgtk = "libgtk-3"
-    end
-end
-if !isdefined(@__MODULE__, :libgdk)
-    if KERNEL == :Windows || KERNEL == :NT
-        const libgdk = "libgdk-3-0"
-    else
-        const libgdk = "libgdk-3"
-    end
-end
-
-if !isdefined(@__MODULE__, :libgdk_pixbuf)
-    if KERNEL == :Windows || KERNEL == :NT
-        const libgdk_pixbuf = "libgdk_pixbuf-2.0-0"
-    else
-        const libgdk_pixbuf = "libgdk_pixbuf-2.0"
-    end
-end
-if !isdefined(@__MODULE__, :libgio)
-    if KERNEL == :Windows || KERNEL == :NT
-        const libgio = "libgio-2.0-0"
-    else
-        const libgio = "libgio-2.0"
-    end
-end
diff --git a/src/Gtk.jl b/src/Gtk.jl
index d3512134..7788b2c1 100644
--- a/src/Gtk.jl
+++ b/src/Gtk.jl
@@ -40,7 +40,6 @@ export GAccessor
 include("basic_exports.jl")
 include("long_exports.jl")
 include("long_leaf_exports.jl")
-include(joinpath("..", "deps", "ext.jl"))
 
 global const libgtk_version = VersionNumber(
       ccall((:gtk_get_major_version, libgtk), Cint, ()),