Menu
▾
▴
[Gtk2hs-commit] (main branch): use versioned dependencies everywhere (make ghc-6.10 happy)
|
From: Peter g. <pg...@co...> - 2008-10-08 17:22:22
|
Wed Oct 8 13:13:09 EDT 2008 Peter Gavin <pg...@gm...>
* use versioned dependencies everywhere (make ghc-6.10 happy)
hunk ./Makefile.am 99
-tools_hierarchyGen_TypeGenerator_EXTERNALDEPS = base
+tools_hierarchyGen_TypeGenerator_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 114
-tools_hierarchyGenGst_TypeGenerator_EXTERNALDEPS = base
+tools_hierarchyGenGst_TypeGenerator_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 134
-tools_callbackGen_HookGenerator_EXTERNALDEPS = base
+tools_callbackGen_HookGenerator_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 153
-tools_c2hs_c2hsLocal_EXTERNALDEPS = base haskell98
+tools_c2hs_c2hsLocal_EXTERNALDEPS = base-$(PKG_BASE_VERSION) haskell98-$(PKG_HASKELL98_VERSION)
hunk ./Makefile.am 155
-tools_c2hs_c2hsLocal_EXTERNALDEPS += pretty containers array
+tools_c2hs_c2hsLocal_EXTERNALDEPS += pretty-$(PKG_PRETTY_VERSION) containers-$(PKG_CONTAINERS_VERSION) array-$(PKG_ARRAY_VERSION)
hunk ./Makefile.am 258
-libHSglib_a_EXTERNALDEPS = base
+libHSglib_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 389
-libHSgtk_a_EXTERNALDEPS = base mtl-$(PKG_MTL_VERSION)
+libHSgtk_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION) mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 776
-libHSglade_a_EXTERNALDEPS = base
+libHSglade_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 891
-libHSgconf_a_EXTERNALDEPS = base
+libHSgconf_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 1027
-libHSsourceview_a_EXTERNALDEPS = base
+libHSsourceview_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 1153
-libHSmozembed_a_EXTERNALDEPS = base
+libHSmozembed_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 1267
-libHScairo_a_EXTERNALDEPS = base mtl-$(PKG_MTL_VERSION)
+libHScairo_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION) mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1401
-libHSsvgcairo_a_EXTERNALDEPS = base mtl-$(PKG_MTL_VERSION)
+libHSsvgcairo_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION) mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1497
-libHSgtkglext_a_EXTERNALDEPS = base
+libHSgtkglext_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 1617
-libHSsoegtk_a_EXTERNALDEPS = base
+libHSsoegtk_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION)
hunk ./Makefile.am 1701
-libHSgnomevfs_a_EXTERNALDEPS = base haskell98 mtl-$(PKG_MTL_VERSION)
+libHSgnomevfs_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION) mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1876
-libHSgstreamer_a_EXTERNALDEPS = base haskell98 mtl-$(PKG_MTL_VERSION)
+libHSgstreamer_a_EXTERNALDEPS = base-$(PKG_BASE_VERSION) mtl-$(PKG_MTL_VERSION)
hunk ./acinclude.m4 95
+C="$(${GHCPKG} list --simple-output --global $1)"
hunk ./acinclude.m4 97
- C=$(${GHCPKG} list $1 | sed -e '/package.conf:/d')
-else
- C=$(${GHCPKG} list $1 | sed -e '1d;/package.conf:/,$d')
+ C="${C} $(${GHCPKG} list --simple-output --user $1)"
hunk ./acinclude.m4 101
- $2=$(echo "${C}" | sed -e 's/,/\n/g' -e 's/[[(), ]]//g' | grep -v '^$' | sed -e 's/[[A-Za-z-]]*//' | sort -r -n | head -n1)
+ $2=$(for pkg in ${C} ; do echo "${pkg}" | sed -e 's/^[[A-Za-z0-9-]]*-\([[0-9.]]*\)$/\1/' ; done | sort -r -n | head -n1)
hunk ./cairo/cairo.cabal.in 11
-build-depends: base mtl glib==@PACKAGE_VERSION@
+build-depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ glib==@PACKAGE_VERSION@
hunk ./cairo/cairo.package.conf.in 18
-depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @CAIRO_SPLITBASE_DEPENDS@
+depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @CAIRO_SPLITBASE_DEPENDS@
hunk ./configure.ac 215
+GHC_PKG_CHECK(base,PKG_BASE_VERSION)
+GTKHS_PROG_CHECK_VERSION($PKG_BASE_VERSION, -ge, 4.0,
+GHC_PKG_CHECK(haskell98,PKG_HASKELL98_VERSION)
hunk ./configure.ac 219
+AC_SUBST(PKG_BASE_VERSION)
+AC_SUBST(PKG_HASKELL98_VERSION)
hunk ./configure.ac 228
+ GHC_PKG_CHECK(pretty, [PKG_PRETTY_VERSION])
hunk ./configure.ac 238
+AC_SUBST(PKG_PRETTY_VERSION)
hunk ./configure.ac 850
-HADDOCK_PACKAGES="base mtl"
+HADDOCK_PACKAGES="base-$PKG_BASE_VERSION mtl-$PKG_MTL_VERSION"
hunk ./gconf/gconf.cabal.in 9
-build-depends: base glib==@PACKAGE_VERSION@
+build-depends: base-@PKG_BASE_VERSION@ glib==@PACKAGE_VERSION@
hunk ./gconf/gconf.package.conf.in 16
-depends: base glib-@PACKAGE_VERSION@
+depends: base-@PKG_BASE_VERSION@ glib-@PACKAGE_VERSION@
hunk ./glade/glade.cabal.in 9
-build-depends: base gtk==@PACKAGE_VERSION@
+build-depends: base-@PKG_BASE_VERSION@ gtk==@PACKAGE_VERSION@
hunk ./glade/glade.package.conf.in 16
-depends: base gtk-@PACKAGE_VERSION@
+depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@
hunk ./glib/glib.cabal.in 9
-build-depends: base
+build-depends: base-@PKG_BASE_VERSION@
hunk ./glib/glib.package.conf.in 16
-depends: base
+depends: base-@PKG_BASE_VERSION@
hunk ./gnomevfs/gnomevfs.package.conf.in 16
-depends: glib-@PACKAGE_VERSION@ mtl @GNOMEVFS_SPLITBASE_DEPENDS@
+depends: glib-@PACKAGE_VERSION@ mtl-@PKG_MTL_VERSION@ @GNOMEVFS_SPLITBASE_DEPENDS@
hunk ./gstreamer/gstreamer.cabal.in 9
-build-depends: glib==@PACKAGE_VERSION@, mtl
+build-depends: glib==@PACKAGE_VERSION@ base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@
hunk ./gtk/gtk.cabal.in 9
-build-depends: base glib==@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+build-depends: base-@PKG_BASE_VERSION@ glib==@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
hunk ./gtk/gtk.package.conf.in 16
-depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @GTK_SPLITBASE_DEPENDS@
+depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @GTK_SPLITBASE_DEPENDS@
hunk ./gtkglext/gtkglext.cabal.in 9
-build-depends: base gtk==@PACKAGE_VERSION@
+build-depends: base-@PKG_BASE_VERSION@ gtk==@PACKAGE_VERSION@
hunk ./gtkglext/gtkglext.package.conf.in 16
-depends: base gtk-@PACKAGE_VERSION@
+depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@
hunk ./mozembed/mozembed.cabal.in 9
-build-depends: base gtk==@PACKAGE_VERSION@
+build-depends: base-@PKG_BASE_VERSION@ gtk==@PACKAGE_VERSION@
hunk ./mozembed/mozembed.package.conf.in 16
-depends: base gtk-@PACKAGE_VERSION@
+depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@
hunk ./soegtk/soegtk.cabal.in 9
-build-depends: base gtk==@PACKAGE_VERSION@, cairo==@PACKAGE_VERSION@
+build-depends: base-@PKG_BASE_VERSION@ gtk==@PACKAGE_VERSION@, cairo==@PACKAGE_VERSION@
hunk ./soegtk/soegtk.package.conf.in 13
-depends: base mtl-@PKG_MTL_VERSION@ gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @SOEGTK_SPLITBASE_DEPENDS@
+depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @SOEGTK_SPLITBASE_DEPENDS@
hunk ./sourceview/sourceview.cabal.in 9
-build-depends: base gtk==@PACKAGE_VERSION@
+build-depends: base-@PKG_BASE_VERSION@ gtk==@PACKAGE_VERSION@
hunk ./sourceview/sourceview.package.conf.in 19
-depends: base gtk-@PACKAGE_VERSION@
+depends: base-@PKG_BASE_VERSION@ gtk-@PACKAGE_VERSION@
hunk ./svgcairo/svgcairo.cabal.in 11
-build-depends: base mtl glib==@PACKAGE_VERSION@ cairo==@PACKAGE_VERSION@
+build-depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ glib==@PACKAGE_VERSION@ cairo==@PACKAGE_VERSION@
hunk ./svgcairo/svgcairo.package.conf.in 18
-depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
+depends: base-@PKG_BASE_VERSION@ mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
|
