[ghc-ltk] patch ViewFrame to build with gtk2

Jens Petersen petersen at fedoraproject.org
Fri Feb 6 15:58:41 UTC 2015


commit 5162c6fe3cef1d12a945ee78607789a1f50784eb
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Feb 6 16:57:00 2015 +0100

    patch ViewFrame to build with gtk2

 ghc-ltk.spec                      |    2 ++
 ltk-0.14.3.0-ViewFrame-gtk2.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/ghc-ltk.spec b/ghc-ltk.spec
index 923cddb..d008431 100644
--- a/ghc-ltk.spec
+++ b/ghc-ltk.spec
@@ -12,6 +12,7 @@ Summary:        Leksah IDE's UI toolkit library
 License:        GPL+
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Patch0:         ltk-0.14.3.0-ViewFrame-gtk2.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -46,6 +47,7 @@ This package provides the Haskell %{pkg_name} library development files.
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+%patch0 -p1 -b .orig
 cabal-tweak-flag gtk3 False
 
 
diff --git a/ltk-0.14.3.0-ViewFrame-gtk2.patch b/ltk-0.14.3.0-ViewFrame-gtk2.patch
new file mode 100644
index 0000000..174f07c
--- /dev/null
+++ b/ltk-0.14.3.0-ViewFrame-gtk2.patch
@@ -0,0 +1,29 @@
+--- ltk-0.14.3.0/src/Graphics/UI/Frame/ViewFrame.hs~	2014-12-07 17:23:48.000000000 +0100
++++ ltk-0.14.3.0/src/Graphics/UI/Frame/ViewFrame.hs	2015-02-06 16:55:07.315530746 +0100
+@@ -104,7 +104,7 @@
+         widgetGetToplevel, deleteEvent, widgetGetAllocation,
+         windowSetDefaultSize, widgetName, windowNew, Widget,
+         dialogResponse, dialogGetActionArea, castToHBox,
+-        dialogGetContentArea, windowTitle, windowTransientFor, dialogNew,
++        dialogGetUpper, windowTitle, windowTransientFor, dialogNew,
+         Window, widgetDestroy, dialogRun, messageDialogNew, castToWidget,
+         switchPage, widgetGrabFocus, castToVBox, boxReorderChild,
+         castToBox, notebookSetMenuLabel, notebookSetTabLabel,
+@@ -117,7 +117,7 @@
+         buttonActivated, selectionDataSetText, dragDataGet,
+         dragSourceSetTargetList, targetListAddTextTargets, targetListNew,
+         dragSourceSet, boxPackStart, containerAdd, containerSetBorderWidth,
+-        widgetSetVAlign, widgetGetStyleContext, stockClose,
++        {-widgetSetVAlign, widgetGetStyleContext,-} stockClose,
+         imageNewFromStock, imageNewFromPixbuf, iconThemeLoadIcon,
+         iconThemeGetDefault, buttonSetAlignment, buttonSetRelief,
+         buttonSetFocusOnClick, buttonNew, hBoxNew,
+@@ -182,7 +182,7 @@
+ #ifdef MIN_VERSION_gtk3
+ initGtkRc = return ()
+ #else
+-initGtkRc = rcParseString ("style \"leksah-close-button-style\"\n" ++
++initGtkRc = rcParseString (("style \"leksah-close-button-style\"\n" :: String) ++
+     "{\n" ++
+     "  GtkButton::default-border = 0\n" ++
+     "  GtkButton::default-outside-border = 0\n" ++


More information about the scm-commits mailing list