From 42af3d338dd11840987c65b35df061dfb1cce092 Mon Sep 17 00:00:00 2001 From: Oliver Braun Date: Fri, 23 Feb 2007 22:03:30 +0000 Subject: [PATCH] Upgrade to 0.9.10.6. --- x11-toolkits/hs-gtk2hs/Makefile | 12 ++-- x11-toolkits/hs-gtk2hs/distinfo | 6 +- .../files/patch-glib-System-Glib-GValue.chs | 11 ---- x11-toolkits/hs-gtk2hs/pkg-descr | 26 +++++---- x11-toolkits/hs-gtk2hs/pkg-plist | 55 ++++++++++++++----- 5 files changed, 64 insertions(+), 46 deletions(-) delete mode 100644 x11-toolkits/hs-gtk2hs/files/patch-glib-System-Glib-GValue.chs diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile index 107c6f8a9f33..5df0f705c9a9 100644 --- a/x11-toolkits/hs-gtk2hs/Makefile +++ b/x11-toolkits/hs-gtk2hs/Makefile @@ -6,12 +6,10 @@ # PORTNAME= gtk2hs -PORTVERSION= 0.9.10 -PORTREVISION= 4 +PORTVERSION= 0.9.10.6 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= http://haskell.org/gtk2hs/ PKGNAMEPREFIX= hs- MAINTAINER= haskell@FreeBSD.org @@ -24,8 +22,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_GNOME= gtk20 libglade2 gtksourceview gconf2 GNU_CONFIGURE= yes USE_GMAKE= yes -SUB_FILES= pkg-install -PKGDEINSTALL= ${PKGINSTALL} +SUB_FILES= pkg-install +PKGDEINSTALL= ${PKGINSTALL} GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version` PLIST_SUB+= GHC_VERSION="${GHC_VERSION}" @@ -33,6 +31,6 @@ SUB_LIST+= GHC_VERSION="${GHC_VERSION}" \ PORTVERSION=${PORTVERSION} \ PKGS="${PKGS}" -PKGS= cairo glib gtk mogul glade gconf sourceview mozembed +PKGS= cairo glib gtk glade gconf sourceview mozembed soegtk svgcairo .include diff --git a/x11-toolkits/hs-gtk2hs/distinfo b/x11-toolkits/hs-gtk2hs/distinfo index 994cab9567bc..67b6f34db04d 100644 --- a/x11-toolkits/hs-gtk2hs/distinfo +++ b/x11-toolkits/hs-gtk2hs/distinfo @@ -1,3 +1,3 @@ -MD5 (gtk2hs-0.9.10.tar.gz) = 13d300e07153f37ba5893ac336b078bc -SHA256 (gtk2hs-0.9.10.tar.gz) = da99b248f3674acba43bd636d1c67813851290ed11860f7f99a44a882cdea924 -SIZE (gtk2hs-0.9.10.tar.gz) = 830866 +MD5 (gtk2hs-0.9.10.6.tar.gz) = 8842898cb1f6b595b5a3a057e66a810b +SHA256 (gtk2hs-0.9.10.6.tar.gz) = c1319393f023b568055305724c1878b2d5c5499a3e612d1b488cf8ff99ad9efa +SIZE (gtk2hs-0.9.10.6.tar.gz) = 981107 diff --git a/x11-toolkits/hs-gtk2hs/files/patch-glib-System-Glib-GValue.chs b/x11-toolkits/hs-gtk2hs/files/patch-glib-System-Glib-GValue.chs deleted file mode 100644 index b41da090718d..000000000000 --- a/x11-toolkits/hs-gtk2hs/files/patch-glib-System-Glib-GValue.chs +++ /dev/null @@ -1,11 +0,0 @@ ---- glib/System/Glib/GValue.chs.orig 2005-04-18 22:04:08.000000000 -0400 -+++ glib/System/Glib/GValue.chs 2006-03-05 14:53:20.000000000 -0400 -@@ -68,7 +68,7 @@ valueGetType (GValue gvPtr) = {# get GVa - -- - allocaGValue :: (GValue -> IO b) -> IO b - allocaGValue body = -- allocaBytes {# sizeof GValue #} $ \gvPtr -> do -+ allocaBytes ({# sizeof GType #}+ 2* {# sizeof guint64 #}) $ \gvPtr -> do - -- The g_type field of the value must be zero or g_value_init will fail. - {# set GValue->g_type #} gvPtr (0 :: GType) - result <- body (GValue gvPtr) diff --git a/x11-toolkits/hs-gtk2hs/pkg-descr b/x11-toolkits/hs-gtk2hs/pkg-descr index b096f6e4f207..2374ea3a9f3f 100644 --- a/x11-toolkits/hs-gtk2hs/pkg-descr +++ b/x11-toolkits/hs-gtk2hs/pkg-descr @@ -1,14 +1,18 @@ -Gtk2Hs is a GTK2 binding for Haskell. It is a rewrite of gtk+hs with a couple -of improvements: +Gtk2Hs is a GUI library for Haskell based on Gtk. Gtk is an extensive and +mature multi-platform toolkit for creating graphical user interfaces. - * Automatic memory management. - * Nearly complete coverage of widget functions and their signals, including - the new text and list widgets. - * The convenience wrapper MoGuL (Monad Gui Library) makes it possible to - create and lookup named widgets in a type safe way. - * Unicode support. +Gtk2Hs features: + + * Automatic memory management. + * Nearly complete coverage of the Gtk+ API. + * Unicode support. + * Extensive reference documentation. + * Support for several related GtK+ and Gnome modules: + o the cairo vector graphics library. + o rendering of SVG images using cairo (via librsvg) + o the Gtk+ OpenGL extension. + o GConf for storing application preferences. + o SourceView, an editor widget with syntax highlighting. + o the Mozilla browser rendering engine in a Gtk+ widget WWW: http://haskell.org/gtk2hs/ - --- Oliver Braun -obraun@FreeBSD.org diff --git a/x11-toolkits/hs-gtk2hs/pkg-plist b/x11-toolkits/hs-gtk2hs/pkg-plist index 491ce5764221..08559c992af6 100644 --- a/x11-toolkits/hs-gtk2hs/pkg-plist +++ b/x11-toolkits/hs-gtk2hs/pkg-plist @@ -3,17 +3,19 @@ lib/gtk2hs/HSgconf.o lib/gtk2hs/HSglade.o lib/gtk2hs/HSglib.o lib/gtk2hs/HSgtk.o -lib/gtk2hs/HSmogul.o lib/gtk2hs/HSmozembed.o +lib/gtk2hs/HSsoegtk.o lib/gtk2hs/HSsourceview.o +lib/gtk2hs/HSsvgcairo.o lib/gtk2hs/cairo.package.conf lib/gtk2hs/gconf.package.conf lib/gtk2hs/glade.package.conf lib/gtk2hs/glib.package.conf lib/gtk2hs/gtk.package.conf -lib/gtk2hs/mogul.package.conf lib/gtk2hs/mozembed.package.conf +lib/gtk2hs/soegtk.package.conf lib/gtk2hs/sourceview.package.conf +lib/gtk2hs/svgcairo.package.conf lib/gtk2hs/imports/cairo/Graphics/Rendering/Cairo.hi lib/gtk2hs/imports/cairo/Graphics/Rendering/Cairo/Internal.hi lib/gtk2hs/imports/cairo/Graphics/Rendering/Cairo/Internal/Drawing/Cairo.hi @@ -150,12 +152,36 @@ lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/HandleBox.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/SizeGroup.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/Tooltips.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/Viewport.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CellLayout.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CellRenderer.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CellRendererCombo.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CellRendererPixbuf.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CellRendererProgress.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CellRendererText.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CellRendererToggle.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CellView.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/ComboBox.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/ComboBoxEntry.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/CustomStore.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/EntryCompletion.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/IconView.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/ListStore.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/Sequence.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/TreeModel.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/TreeModelSort.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/TreeSelection.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/TreeStore.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/TreeView.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView/Types.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextBuffer.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextIter.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextMark.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextTag.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextTagTable.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextView.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/Types.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Ornaments/Frame.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Ornaments/HSeparator.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Ornaments/VSeparator.hi @@ -204,14 +230,9 @@ lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeViewColumn.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Types.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/AboutDialog.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/Dialog.hi +lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/MessageDialog.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/Window.hi lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/WindowGroup.hi -lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul.hi -lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul/GetWidget.hi -lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul/MDialog.hi -lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul/NewWidget.hi -lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul/TreeList.hi -lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hi lib/gtk2hs/imports/mozembed/Graphics/UI/Gtk/MozEmbed.hi lib/gtk2hs/imports/mozembed/Graphics/UI/Gtk/MozEmbed/Types.hi lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView.hi @@ -226,15 +247,25 @@ lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceTagStyle.hi lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceTagTable.hi lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceView.hi lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/Types.hi +lib/gtk2hs/imports/svgcairo/Graphics/Rendering/Cairo/SVG.hi +lib/gtk2hs/imports/soegtk/Graphics/SOE/Gtk.hi lib/gtk2hs/include/gtk2hs-config.h lib/gtk2hs/libHScairo.a lib/gtk2hs/libHSgconf.a lib/gtk2hs/libHSglade.a lib/gtk2hs/libHSglib.a lib/gtk2hs/libHSgtk.a -lib/gtk2hs/libHSmogul.a lib/gtk2hs/libHSmozembed.a +lib/gtk2hs/libHSsoegtk.a lib/gtk2hs/libHSsourceview.a +lib/gtk2hs/libHSsvgcairo.a +@dirrm lib/gtk2hs/imports/svgcairo/Graphics/Rendering/Cairo +@dirrm lib/gtk2hs/imports/svgcairo/Graphics/Rendering +@dirrm lib/gtk2hs/imports/svgcairo/Graphics +@dirrm lib/gtk2hs/imports/svgcairo +@dirrm lib/gtk2hs/imports/soegtk/Graphics/SOE +@dirrm lib/gtk2hs/imports/soegtk/Graphics +@dirrm lib/gtk2hs/imports/soegtk @dirrm lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView @dirrm lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk @dirrm lib/gtk2hs/imports/sourceview/Graphics/UI @@ -245,11 +276,6 @@ lib/gtk2hs/libHSsourceview.a @dirrm lib/gtk2hs/imports/mozembed/Graphics/UI @dirrm lib/gtk2hs/imports/mozembed/Graphics @dirrm lib/gtk2hs/imports/mozembed -@dirrm lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul -@dirrm lib/gtk2hs/imports/mogul/Graphics/UI/Gtk -@dirrm lib/gtk2hs/imports/mogul/Graphics/UI -@dirrm lib/gtk2hs/imports/mogul/Graphics -@dirrm lib/gtk2hs/imports/mogul @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors @@ -257,6 +283,7 @@ lib/gtk2hs/libHSsourceview.a @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Ornaments @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline +@dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ModelView @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Layout