You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(68) |
Aug
(4) |
Sep
|
Oct
(23) |
Nov
(95) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
(51) |
May
(81) |
Jun
(2) |
Jul
(86) |
Aug
(143) |
Sep
(3) |
Oct
(31) |
Nov
(63) |
Dec
(90) |
| 2005 |
Jan
(277) |
Feb
(157) |
Mar
(99) |
Apr
(195) |
May
(151) |
Jun
(148) |
Jul
(98) |
Aug
(123) |
Sep
(20) |
Oct
(174) |
Nov
(155) |
Dec
(26) |
| 2006 |
Jan
(51) |
Feb
(19) |
Mar
(16) |
Apr
(12) |
May
(5) |
Jun
|
Jul
(11) |
Aug
(7) |
Sep
(10) |
Oct
(31) |
Nov
(174) |
Dec
(56) |
| 2007 |
Jan
(45) |
Feb
(52) |
Mar
(10) |
Apr
(5) |
May
(47) |
Jun
(16) |
Jul
(80) |
Aug
(29) |
Sep
(14) |
Oct
(59) |
Nov
(46) |
Dec
(16) |
| 2008 |
Jan
(10) |
Feb
(1) |
Mar
|
Apr
|
May
(49) |
Jun
(26) |
Jul
(8) |
Aug
(4) |
Sep
(25) |
Oct
(53) |
Nov
(9) |
Dec
(1) |
| 2009 |
Jan
(66) |
Feb
(11) |
Mar
(1) |
Apr
(14) |
May
(8) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(23) |
Nov
(35) |
Dec
|
| 2010 |
Jan
(7) |
Feb
(2) |
Mar
(39) |
Apr
(19) |
May
(161) |
Jun
(19) |
Jul
(32) |
Aug
(65) |
Sep
(113) |
Oct
(120) |
Nov
(2) |
Dec
|
| 2012 |
Jan
|
Feb
(5) |
Mar
(4) |
Apr
(7) |
May
(9) |
Jun
(14) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(12) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
(17) |
Mar
(4) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:18
|
Wed Apr 28 06:04:33 EDT 2010 Andy Stewart <laz...@gm...>
* glade Cabal package.
Ignore-this: c152a8f7de7a4622d2f8f5e6aa30b835
addfile ./glade/COPYING
hunk ./glade/COPYING 1
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+[_^L_][_$_]
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+[_^L_][_$_]
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+ [_$_]
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+[_^L_][_$_]
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+[_^L_][_$_]
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+[_^L_][_$_]
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+[_^L_][_$_]
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+[_^L_][_$_]
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+[_^L_][_$_]
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+[_^L_][_$_]
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
hunk ./glade/Graphics/UI/Gtk/Glade.chs 1
+{-# LANGUAGE CPP #-}
hunk ./glade/Graphics/UI/Gtk/Glade.chs 65
-{#import Graphics.UI.Gtk.Types#}
addfile ./glade/Setup.hs
hunk ./glade/Setup.hs 1
+{-# LANGUAGE CPP #-}
+
+#define CABAL_VERSION_ENCODE(major, minor, micro) ( \
+ ((major) * 10000) \
+ + ((minor) * 100) \
+ + ((micro) * 1))
+
+#define CABAL_VERSION_CHECK(major,minor,micro) \
+ (CABAL_VERSION >= CABAL_VERSION_ENCODE(major,minor,micro))
+
+-- now, this is bad, but Cabal doesn't seem to actually pass any information about
+-- its version to CPP, so guess the version depending on the version of GHC
+#ifdef CABAL_VERSION_MINOR
+#ifndef CABAL_VERSION_MAJOR
+#define CABAL_VERSION_MAJOR 1
+#endif
+#ifndef CABAL_VERSION_MICRO
+#define CABAL_VERSION_MICRO 0
+#endif
+#define CABAL_VERSION CABAL_VERSION_ENCODE( \
+ CABAL_VERSION_MAJOR, \
+ CABAL_VERSION_MINOR, \
+ CABAL_VERSION_MICRO)
+#else
+#warning Setup.hs is guessing the version of Cabal. If compilation of Setup.hs fails use -DCABAL_VERSION_MINOR=x for Cabal version 1.x.0 when building (prefixed by --ghc-option= when using the 'cabal' command)
+#if (__GLASGOW_HASKELL__ >= 612)
+#define CABAL_VERSION CABAL_VERSION_ENCODE(1,8,0)
+#else
+#define CABAL_VERSION CABAL_VERSION_ENCODE(1,6,0)
+#endif
+#endif
+
+-- | Build a Gtk2hs package.
+--
+import Distribution.Simple
+import Distribution.Simple.PreProcess
+import Distribution.InstalledPackageInfo ( importDirs )
+import Distribution.Simple.PackageIndex (
+#if CABAL_VERSION_CHECK(1,8,0)
+ lookupInstalledPackageId
+#else
+ lookupPackageId
+#endif
+ )
+import Distribution.PackageDescription as PD ( PackageDescription(..),
+ updatePackageDescription,
+ BuildInfo(..),
+ emptyBuildInfo, allBuildInfo,
+ Library(..),
+ libModules)
+import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
+ InstallDirs(..),
+#if CABAL_VERSION_CHECK(1,8,0)
+ componentPackageDeps,
+#else
+ packageDeps,
+#endif
+ absoluteInstallDirs)
+import Distribution.Simple.Compiler ( Compiler(..) )
+import Distribution.Simple.Program (
+ Program(..), ConfiguredProgram(..),
+ rawSystemProgramConf, rawSystemProgramStdoutConf,
+ c2hsProgram, pkgConfigProgram,
+ simpleProgram, lookupProgram, rawSystemProgramStdout, ProgArg)
+import Distribution.ModuleName ( ModuleName, components, toFilePath )
+import Distribution.Simple.Utils
+import Distribution.Simple.Setup (CopyFlags(..), InstallFlags(..), CopyDest(..),
+ defaultCopyFlags, ConfigFlags(configVerbosity),
+ fromFlag, toFlag)
+import Distribution.Simple.BuildPaths ( autogenModulesDir )
+import Distribution.Text ( simpleParse, display )
+import System.FilePath
+import System.Directory ( doesFileExist )
+import Distribution.Version (Version(..))
+import Distribution.Verbosity
+import Control.Monad (unless)
+import Data.Maybe (fromMaybe)
+import Data.List (isPrefixOf, nub)
+import Data.Char (isAlpha)
+import qualified Data.Map as M
+import qualified Data.Set as S
+
+
+-- the name of the c2hs pre-compiled header file
+precompFile = "precompchs.bin"
+
+main = defaultMainWithHooks simpleUserHooks {
+ hookedPrograms = [typeGenProgram, signalGenProgram, c2hsLocal],
+ hookedPreProcessors = [("chs", ourC2hs)],
+ confHook = \pd cf ->
+ confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ postConf = \args cf pd lbi -> do
+ genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
+ postConf simpleUserHooks args cf pd lbi,
+ buildHook = \pd lbi uh bf -> fixDeps pd >>= \pd ->
+ (buildHook simpleUserHooks) pd lbi uh bf,
+ copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+ installCHI pd lbi (fromFlag (copyVerbosity flags)) (fromFlag (copyDest flags)),
+ instHook = \pd lbi uh flags -> (instHook simpleUserHooks) pd lbi uh flags >>
+ installCHI pd lbi (fromFlag (installVerbosity flags)) NoCopyDest
+ }
+
+-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
+adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
+adjustLocalBuildInfo lbi =
+ let extra = (Just libBi, [])
+ libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
+ , buildDir lbi ] }
+ in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
+
+ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
+ourC2hs bi lbi = PreProcessor {
+ platformIndependent = False,
+ runPreProcessor = runC2HS bi lbi
+}
+
+runC2HS :: BuildInfo -> LocalBuildInfo ->
+ (FilePath, FilePath) -> (FilePath, FilePath) -> Verbosity -> IO ()
+runC2HS bi lbi (inDir, inFile) (outDir, outFile) verbosity = do
+ -- have the header file name if we don't have the precompiled header yet
+ header <- case lookup "x-c2hs-header" (customFieldsBI bi) of
+ Just h -> return h
+ Nothing -> die ("Need x-c2hs-Header definition in the .cabal Library section "++
+ "that sets the C header file to process .chs.pp files.")
+
+ -- c2hs will output files in out dir, removing any leading path of the input file.
+ -- Thus, append the dir of the input file to the output dir.
+ let (outFileDir, newOutFile) = splitFileName outFile
+ let newOutDir = outDir </> outFileDir
+ -- additional .chi files might be needed that other packages have installed;
+ -- we assume that these are installed in the same place as .hi files
+ let chiDirs = [ dir |
+#if CABAL_VERSION_CHECK(1,8,0)
+ ipi <- maybe [] (map fst . componentPackageDeps) (libraryConfig lbi),
+ dir <- maybe [] importDirs (lookupInstalledPackageId (installedPkgs lbi) ipi) ]
+#else
+ ipi <- packageDeps lbi,
+ dir <- maybe [] importDirs (lookupPackageId (installedPkgs lbi) ipi) ]
+#endif
+ rawSystemProgramConf verbosity c2hsLocal (withPrograms lbi) $
+ map ("--include=" ++) (outDir:chiDirs)
+ ++ ["--cppopts=" ++ opt | opt <- getCppOptions bi lbi]
+ ++ ["--output-dir=" ++ newOutDir,
+ "--output=" ++ newOutFile,
+ "--precomp=" ++ buildDir lbi </> precompFile,
+ header, inDir </> inFile]
+
+getCppOptions :: BuildInfo -> LocalBuildInfo -> [String]
+getCppOptions bi lbi
+ = nub $
+ ["-I" ++ dir | dir <- PD.includeDirs bi]
+ ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+
+installCHI :: PackageDescription -- ^information from the .cabal file
+ -> LocalBuildInfo -- ^information from the configure step
+ -> Verbosity -> CopyDest -- ^flags sent to copy or install
+ -> IO ()
+installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copydest = do
+ let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest
+ -- cannot use the recommended 'findModuleFiles' since it fails if there exists
+ -- a modules that does not have a .chi file
+ mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
+ (map toFilePath
+#if CABAL_VERSION_CHECK(1,8,0)
+ (PD.libModules lib)
+#else
+ (PD.libModules pkg)
+#endif
+ )
+ let files = [ f | Just f <- mFiles ]
+#if CABAL_VERSION_CHECK(1,8,0)
+ installOrdinaryFiles verbosity libPref files
+#else
+ copyFiles verbosity libPref files
+#endif
+
+ [_$_]
+installCHI _ _ _ _ = return ()
+
+------------------------------------------------------------------------------
+-- Generating the type hierarchy and signal callback .hs files.
+------------------------------------------------------------------------------
+
+typeGenProgram :: Program
+typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+
+signalGenProgram :: Program
+signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+
+c2hsLocal :: Program
+c2hsLocal = (simpleProgram "gtk2hsC2hs")
+
+genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
+genSynthezisedFiles verb pd lbi = do
+
+ cPkgs <- getPkgConfigPackages verb lbi pd
+
+ let xList = maybe [] (customFieldsBI . libBuildInfo) (library pd)
+ ++customFieldsPD pd
+ typeOpts :: [ProgArg]
+ typeOpts = concat [ map (\val -> '-':'-':drop 8 field++'=':val) (words content)
+ | (field,content) <- xList,
+ "x-types-" `isPrefixOf` field,
+ field /= "x-types-file"]
+ ++ [ "--tag=" ++ tag
+ | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
+ , let name' = filter isAlpha (display name)
+ , tag <- name'
+ : [ name' ++ "-" ++ show major ++ "." ++ show digit
+ | digit <- [0,2..minor] ]
+ ]
+
+ genFile :: Program -> [ProgArg] -> FilePath -> IO ()
+ genFile prog args outFile = do
+ res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
+ rewriteFile outFile res
+
+ case lookup "x-types-file" xList of
+ Nothing -> return ()
+ Just f -> do
+ info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
+ genFile typeGenProgram typeOpts f
+
+ case (lookup "x-signals-file" xList,
+ lookup "x-signals-modname" xList) of
+ (Just _, Nothing) -> die "You need to specify the module name (X-Signals-ModName) \
+ \to generate a signal file."
+ (Just f, Just mod) -> do
+ info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
+ genFile signalGenProgram [mod] f
+ (_,_) -> return ()
+
+--FIXME: Cabal should tell us the selected pkg-config package versions in the
+-- LocalBuildInfo or equivalent.
+-- In the mean time, ask pkg-config again.
+
+getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
+getPkgConfigPackages verbosity lbi pkg =
+ sequence
+ [ do version <- pkgconfig ["--modversion", display pkgname]
+ case simpleParse version of
+ Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Just v -> return (PackageIdentifier pkgname v)
+ | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
+ where
+ pkgconfig = rawSystemProgramStdoutConf verbosity
+ pkgConfigProgram (withPrograms lbi)
+
+------------------------------------------------------------------------------
+-- Dependency calculation amongst .chs files.
+------------------------------------------------------------------------------
+
+-- Given all files of the package, find those that end in .chs and extract the
+-- .chs files they depend upon. Then return the PackageDescription with these
+-- files rearranged so that they are built in a sequence that files that are
+-- needed by other files are built first.
+fixDeps :: PackageDescription -> IO PackageDescription
+fixDeps pd@PD.PackageDescription {
+ PD.library = Just li...@PD... {
+ PD.exposedModules = expMods,
+ PD.libBuildInfo = bi...@PD... {
+ PD.hsSourceDirs = srcDirs,
+ PD.otherModules = othMods
+ }}} = do
+ let findModule m = findFileWithExtension [".chs.pp",".chs"] srcDirs
+ (joinPath (components m))
+ mExpFiles <- mapM findModule expMods
+ mOthFiles <- mapM findModule othMods
+
+ -- tag all exposed files with True so we throw an error if we need to build
+ -- an exposed module before an internal modules (we cannot express this)
+ let modDeps = zipWith (ModDep True []) expMods mExpFiles++
+ zipWith (ModDep False []) othMods mOthFiles
+ modDeps <- mapM extractDeps modDeps
+ let (expMods, othMods) = span mdExposed $ sortTopological modDeps
+ badOther = map (fromMaybe "<no file>" . mdLocation) $
+ filter (not . mdExposed) expMods
+ unless (null badOther) $
+ die ("internal chs modules "++intercalate "," badOther++
+ " depend on exposed chs modules; cabal needs to build internal modules first")
+ return pd { PD.library = Just lib {
+ PD.exposedModules = map mdOriginal expMods,
+ PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods }
+ }}
+
+data ModDep = ModDep {
+ mdExposed :: Bool,
+ mdRequires :: [ModuleName],
+ mdOriginal :: ModuleName,
+ mdLocation :: Maybe FilePath
+}
+
+instance Show ModDep where
+ show x = show (mdLocation x)
+
+instance Eq ModDep where
+ ModDep { mdOriginal = m1 } == ModDep { mdOriginal = m2 } = m1==m2
+instance Ord ModDep where
+ compare ModDep { mdOriginal = m1 } ModDep { mdOriginal = m2 } = compare m1 m2
+
+-- Extract the dependencies of this file. This is intentionally rather naive as it
+-- ignores CPP conditionals. We just require everything which means that the
+-- existance of a .chs module may not depend on some CPP condition. [_$_]
+extractDeps :: ModDep -> IO ModDep
+extractDeps md@ModDep { mdLocation = Nothing } = return md
+extractDeps md@ModDep { mdLocation = Just f } = withFileContents f $ \con -> do
+ let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+ ('i':'m':'p':'o':'r':'t':' ':ys) ->
+ case simpleParse (takeWhile ((/=) '#') ys) of
+ Just m -> findImports (m:acc) xxs [_$_]
+ Nothing -> die ("cannot parse chs import in "++f++":\n"++
+ "offending line is {#"++xs)
+ -- no more imports after the first non-import hook
+ _ -> return acc
+ findImports acc (_:xxs) = findImports acc xxs
+ findImports acc [] = return acc
+ mods <- findImports [] (lines con)
+ return md { mdRequires = mods }
+
+-- Find a total order of the set of modules that are partially sorted by their
+-- dependencies on each other. The function returns the sorted list of modules
+-- together with a list of modules that are required but not supplied by this
+-- in the input set of modules.
+sortTopological :: [ModDep] -> [ModDep]
+sortTopological ms = reverse $ fst $ foldl visit ([], S.empty) (map mdOriginal ms)
+ where
+ set = M.fromList (map (\m -> (mdOriginal m, m)) ms)
+ visit (out,visited) m
+ | m `S.member` visited = (out,visited)
+ | otherwise = case m `M.lookup` set of
+ Nothing -> (out, m `S.insert` visited)
+ Just md -> (md:out', visited')
+ where
+ (out',visited') = foldl visit (out, m `S.insert` visited) (mdRequires md)
addfile ./glade/glade.cabal
hunk ./glade/glade.cabal 1
+Name: glade
+Version: 0.10.5
+License: GPL
+License-file: COPYING
+Copyright: (c) 2001-2010 The Gtk2Hs Team
+Author: Manuel M T Chakravarty
+Maintainer: gtk...@so...
+Build-Type: Custom
+Cabal-Version: >= 1.6.0
+Stability: provisional
+homepage: http://www.haskell.org/gtk2hs/
+bug-reports: http://hackage.haskell.org/trac/gtk2hs/
+Synopsis: Binding to the glade library.
+Description: This library allows to load externally stored user interfaces into
+ programs. This allows alteration of the interface without recompilation
+ of the program.
+
+Category: Graphics
+Tested-With: GHC == 6.12.1
+x-Types-File: Graphics/UI/Gtk/Glade/Types.chs
+x-Types-ModName: Graphics.UI.Gtk.Glade.Types
+x-Types-Forward: *Graphics.UI.GtkInternals
+x-Types-Destructor: objectUnrefFromMainloop
+
+Source-Repository head
+ type: darcs
+ location: http://code.haskell.org/gtk2hs/
+ subdir: glade
+
+Library
+ build-depends: base >= 4, array, containers, haskell98, mtl,
+ glib >= 0.10.5 && < 0.11, [_$_]
+ pango >= 0.10.5 && < 0.11, [_$_]
+ cairo >= 0.10.5 && < 0.11,
+ gtk >= 0.10.5 && < 0.11
+[_^I_][_^I_][_^I_][_^I_][_^I_][_^I_][_$_]
+ build-tools: gtk2hsC2hs, gtk2hsHookGenerator, gtk2hsTypeGen
+[_^I_][_^I_][_^I_][_^I_][_^I_][_^I_][_$_]
+ exposed-modules:
+ Graphics.UI.Gtk.Glade
+ other-modules:
+ Graphics.UI.Gtk.Glade.Types[_^I_][_^I_] [_$_]
+
+ extensions: ForeignFunctionInterface
+[_^I_][_^I_][_$_]
+ x-c2hs-Header: glade/glade.h
+ x-Types-Tag: libglade
+ pkgconfig-depends: libglade-2.0 >= 2.0.0
hunk ./glade/glade.cabal.in 1
-name: glade
-version: @PACKAGE_VERSION@
-license: LGPL
-license-file: COPYING.LIB
-maintainer: gtk...@li...
-stability: provisional
-homepage: http://haskell.org/gtk2hs/
-category: Graphics
-build-depends: base-@PKG_BASE_VERSION@ gtk==@PACKAGE_VERSION@
-exposed-modules: ${modules}
rmfile ./glade/glade.cabal.in
hunk ./glade/glade.package.conf.in 1
-name: glade
-version: @PACKAGE_VERSION@
-id: glade-@PACKAGE_VERSION@
-license: LGPL
-license-file: COPYING.LIB
-maintainer: gtk...@li...
-stability: provisional
-homepage: http://haskell.org/gtk2hs/
-exposed: True
-exposed-modules: ${modules}
-import-dirs: "${pkglibdir}/imports/glade"
-library-dirs: @LIBGLADE_LIBDIR_CQ@
-hs-libraries: HSglade
-extra-libraries: @LIBGLADE_LIBS_CQ@
-include-dirs: @LIBGLADE_CFLAGS_CQ@
-includes: glade/glade.h
-depends: @PKG_BASE_ID@ gtk-@PACKAGE_VERSION@
-ld-options: @LIBGLADE_LIBEXTRA_CQ@
rmfile ./glade/glade.package.conf.in
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:14
|
Sat May 1 09:31:56 EDT 2010 Axe...@in...
* Seperate the standard setup functionality from that necessary for specific packages.
Ignore-this: 326634d72596f48f1e76ffd688c0f79f
move ./gtk/Setup.hs ./gtk/Gtk2HsSetup.hs
addfile ./cairo/Gtk2HsSetup.hs
hunk ./cairo/Gtk2HsSetup.hs 1
+{-# LANGUAGE CPP #-}
+
+#define CABAL_VERSION_ENCODE(major, minor, micro) ( \
+ ((major) * 10000) \
+ + ((minor) * 100) \
+ + ((micro) * 1))
+
+#define CABAL_VERSION_CHECK(major,minor,micro) \
+ (CABAL_VERSION >= CABAL_VERSION_ENCODE(major,minor,micro))
+
+-- now, this is bad, but Cabal doesn't seem to actually pass any information about
+-- its version to CPP, so guess the version depending on the version of GHC
+#ifdef CABAL_VERSION_MINOR
+#ifndef CABAL_VERSION_MAJOR
+#define CABAL_VERSION_MAJOR 1
+#endif
+#ifndef CABAL_VERSION_MICRO
+#define CABAL_VERSION_MICRO 0
+#endif
+#define CABAL_VERSION CABAL_VERSION_ENCODE( \
+ CABAL_VERSION_MAJOR, \
+ CABAL_VERSION_MINOR, \
+ CABAL_VERSION_MICRO)
+#else
+#warning Setup.hs is guessing the version of Cabal. If compilation of Setup.hs fails use -DCABAL_VERSION_MINOR=x for Cabal version 1.x.0 when building (prefixed by --ghc-option= when using the 'cabal' command)
+#if (__GLASGOW_HASKELL__ >= 612)
+#define CABAL_VERSION CABAL_VERSION_ENCODE(1,8,0)
+#else
+#define CABAL_VERSION CABAL_VERSION_ENCODE(1,6,0)
+#endif
+#endif
+
+-- | Build a Gtk2hs package.
+--
+module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
+
+import Distribution.Simple
+import Distribution.Simple.PreProcess
+import Distribution.InstalledPackageInfo ( importDirs )
+import Distribution.Simple.PackageIndex (
+#if CABAL_VERSION_CHECK(1,8,0)
+ lookupInstalledPackageId
+#else
+ lookupPackageId
+#endif
+ )
+import Distribution.PackageDescription as PD ( PackageDescription(..),
+ updatePackageDescription,
+ BuildInfo(..),
+ emptyBuildInfo, allBuildInfo,
+ Library(..),
+ libModules)
+import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
+ InstallDirs(..),
+#if CABAL_VERSION_CHECK(1,8,0)
+ componentPackageDeps,
+#else
+ packageDeps,
+#endif
+ absoluteInstallDirs)
+import Distribution.Simple.Compiler ( Compiler(..) )
+import Distribution.Simple.Program (
+ Program(..), ConfiguredProgram(..),
+ rawSystemProgramConf, rawSystemProgramStdoutConf,
+ c2hsProgram, pkgConfigProgram,
+ simpleProgram, lookupProgram, rawSystemProgramStdout, ProgArg)
+import Distribution.ModuleName ( ModuleName, components, toFilePath )
+import Distribution.Simple.Utils
+import Distribution.Simple.Setup (CopyFlags(..), InstallFlags(..), CopyDest(..),
+ defaultCopyFlags, ConfigFlags(configVerbosity),
+ fromFlag, toFlag)
+import Distribution.Simple.BuildPaths ( autogenModulesDir )
+import Distribution.Text ( simpleParse, display )
+import System.FilePath
+import System.Directory ( doesFileExist )
+import Distribution.Version (Version(..))
+import Distribution.Verbosity
+import Control.Monad (unless)
+import Data.Maybe (fromMaybe)
+import Data.List (isPrefixOf, nub)
+import Data.Char (isAlpha)
+import qualified Data.Map as M
+import qualified Data.Set as S
+
+
+-- the name of the c2hs pre-compiled header file
+precompFile = "precompchs.bin"
+
+gtk2hsUserHooks = simpleUserHooks {
+ hookedPrograms = [typeGenProgram, signalGenProgram, c2hsLocal],
+ hookedPreProcessors = [("chs", ourC2hs)],
+ confHook = \pd cf ->
+ confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ postConf = \args cf pd lbi -> do
+ genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
+ postConf simpleUserHooks args cf pd lbi,
+ buildHook = \pd lbi uh bf -> fixDeps pd >>= \pd ->
+ (buildHook simpleUserHooks) pd lbi uh bf,
+ copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+ installCHI pd lbi (fromFlag (copyVerbosity flags)) (fromFlag (copyDest flags)),
+ instHook = \pd lbi uh flags -> (instHook simpleUserHooks) pd lbi uh flags >>
+ installCHI pd lbi (fromFlag (installVerbosity flags)) NoCopyDest
+ }
+
+-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
+adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
+adjustLocalBuildInfo lbi =
+ let extra = (Just libBi, [])
+ libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
+ , buildDir lbi ] }
+ in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
+
+ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
+ourC2hs bi lbi = PreProcessor {
+ platformIndependent = False,
+ runPreProcessor = runC2HS bi lbi
+}
+
+runC2HS :: BuildInfo -> LocalBuildInfo ->
+ (FilePath, FilePath) -> (FilePath, FilePath) -> Verbosity -> IO ()
+runC2HS bi lbi (inDir, inFile) (outDir, outFile) verbosity = do
+ -- have the header file name if we don't have the precompiled header yet
+ header <- case lookup "x-c2hs-header" (customFieldsBI bi) of
+ Just h -> return h
+ Nothing -> die ("Need x-c2hs-Header definition in the .cabal Library section "++
+ "that sets the C header file to process .chs.pp files.")
+
+ -- c2hs will output files in out dir, removing any leading path of the input file.
+ -- Thus, append the dir of the input file to the output dir.
+ let (outFileDir, newOutFile) = splitFileName outFile
+ let newOutDir = outDir </> outFileDir
+ -- additional .chi files might be needed that other packages have installed;
+ -- we assume that these are installed in the same place as .hi files
+ let chiDirs = [ dir |
+#if CABAL_VERSION_CHECK(1,8,0)
+ ipi <- maybe [] (map fst . componentPackageDeps) (libraryConfig lbi),
+ dir <- maybe [] importDirs (lookupInstalledPackageId (installedPkgs lbi) ipi) ]
+#else
+ ipi <- packageDeps lbi,
+ dir <- maybe [] importDirs (lookupPackageId (installedPkgs lbi) ipi) ]
+#endif
+ rawSystemProgramConf verbosity c2hsLocal (withPrograms lbi) $
+ map ("--include=" ++) (outDir:chiDirs)
+ ++ ["--cppopts=" ++ opt | opt <- getCppOptions bi lbi]
+ ++ ["--output-dir=" ++ newOutDir,
+ "--output=" ++ newOutFile,
+ "--precomp=" ++ buildDir lbi </> precompFile,
+ header, inDir </> inFile]
+
+getCppOptions :: BuildInfo -> LocalBuildInfo -> [String]
+getCppOptions bi lbi
+ = nub $
+ ["-I" ++ dir | dir <- PD.includeDirs bi]
+ ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+
+installCHI :: PackageDescription -- ^information from the .cabal file
+ -> LocalBuildInfo -- ^information from the configure step
+ -> Verbosity -> CopyDest -- ^flags sent to copy or install
+ -> IO ()
+installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copydest = do
+ let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest
+ -- cannot use the recommended 'findModuleFiles' since it fails if there exists
+ -- a modules that does not have a .chi file
+ mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
+ (map toFilePath
+#if CABAL_VERSION_CHECK(1,8,0)
+ (PD.libModules lib)
+#else
+ (PD.libModules pkg)
+#endif
+ )
+ let files = [ f | Just f <- mFiles ]
+#if CABAL_VERSION_CHECK(1,8,0)
+ installOrdinaryFiles verbosity libPref files
+#else
+ copyFiles verbosity libPref files
+#endif
+
+ [_$_]
+installCHI _ _ _ _ = return ()
+
+------------------------------------------------------------------------------
+-- Generating the type hierarchy and signal callback .hs files.
+------------------------------------------------------------------------------
+
+typeGenProgram :: Program
+typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+
+signalGenProgram :: Program
+signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+
+c2hsLocal :: Program
+c2hsLocal = (simpleProgram "gtk2hsC2hs")
+
+genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
+genSynthezisedFiles verb pd lbi = do
+
+ cPkgs <- getPkgConfigPackages verb lbi pd
+
+ let xList = maybe [] (customFieldsBI . libBuildInfo) (library pd)
+ ++customFieldsPD pd
+ typeOpts :: [ProgArg]
+ typeOpts = concat [ map (\val -> '-':'-':drop 8 field++'=':val) (words content)
+ | (field,content) <- xList,
+ "x-types-" `isPrefixOf` field,
+ field /= "x-types-file"]
+ ++ [ "--tag=" ++ tag
+ | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
+ , let name' = filter isAlpha (display name)
+ , tag <- name'
+ : [ name' ++ "-" ++ show major ++ "." ++ show digit
+ | digit <- [0,2..minor] ]
+ ]
+
+ signalsOpts :: [ProgArg]
+ signalsOpts = concat [ map (\val -> '-':'-':drop 10 field++'=':val) (words content)
+ | (field,content) <- xList,
+ "x-signals-" `isPrefixOf` field,
+ field /= "x-signals-file"]
+
+ genFile :: Program -> [ProgArg] -> FilePath -> IO ()
+ genFile prog args outFile = do
+ res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
+ rewriteFile outFile res
+
+ case lookup "x-types-file" xList of
+ Nothing -> return ()
+ Just f -> do
+ info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
+ genFile typeGenProgram typeOpts f
+
+ case lookup "x-signals-file" xList of
+ Nothing -> return ()
+ Just f -> do
+ info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
+ genFile signalGenProgram signalsOpts f
+
+--FIXME: Cabal should tell us the selected pkg-config package versions in the
+-- LocalBuildInfo or equivalent.
+-- In the mean time, ask pkg-config again.
+
+getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
+getPkgConfigPackages verbosity lbi pkg =
+ sequence
+ [ do version <- pkgconfig ["--modversion", display pkgname]
+ case simpleParse version of
+ Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Just v -> return (PackageIdentifier pkgname v)
+ | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
+ where
+ pkgconfig = rawSystemProgramStdoutConf verbosity
+ pkgConfigProgram (withPrograms lbi)
+
+------------------------------------------------------------------------------
+-- Dependency calculation amongst .chs files.
+------------------------------------------------------------------------------
+
+-- Given all files of the package, find those that end in .chs and extract the
+-- .chs files they depend upon. Then return the PackageDescription with these
+-- files rearranged so that they are built in a sequence that files that are
+-- needed by other files are built first.
+fixDeps :: PackageDescription -> IO PackageDescription
+fixDeps pd@PD.PackageDescription {
+ PD.library = Just li...@PD... {
+ PD.exposedModules = expMods,
+ PD.libBuildInfo = bi...@PD... {
+ PD.hsSourceDirs = srcDirs,
+ PD.otherModules = othMods
+ }}} = do
+ let findModule m = findFileWithExtension [".chs.pp",".chs"] srcDirs
+ (joinPath (components m))
+ mExpFiles <- mapM findModule expMods
+ mOthFiles <- mapM findModule othMods
+
+ -- tag all exposed files with True so we throw an error if we need to build
+ -- an exposed module before an internal modules (we cannot express this)
+ let modDeps = zipWith (ModDep True []) expMods mExpFiles++
+ zipWith (ModDep False []) othMods mOthFiles
+ modDeps <- mapM extractDeps modDeps
+ let (expMods, othMods) = span mdExposed $ sortTopological modDeps
+ badOther = map (fromMaybe "<no file>" . mdLocation) $
+ filter (not . mdExposed) expMods
+ unless (null badOther) $
+ die ("internal chs modules "++intercalate "," badOther++
+ " depend on exposed chs modules; cabal needs to build internal modules first")
+ return pd { PD.library = Just lib {
+ PD.exposedModules = map mdOriginal expMods,
+ PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods }
+ }}
+
+data ModDep = ModDep {
+ mdExposed :: Bool,
+ mdRequires :: [ModuleName],
+ mdOriginal :: ModuleName,
+ mdLocation :: Maybe FilePath
+}
+
+instance Show ModDep where
+ show x = show (mdLocation x)
+
+instance Eq ModDep where
+ ModDep { mdOriginal = m1 } == ModDep { mdOriginal = m2 } = m1==m2
+instance Ord ModDep where
+ compare ModDep { mdOriginal = m1 } ModDep { mdOriginal = m2 } = compare m1 m2
+
+-- Extract the dependencies of this file. This is intentionally rather naive as it
+-- ignores CPP conditionals. We just require everything which means that the
+-- existance of a .chs module may not depend on some CPP condition. [_$_]
+extractDeps :: ModDep -> IO ModDep
+extractDeps md@ModDep { mdLocation = Nothing } = return md
+extractDeps md@ModDep { mdLocation = Just f } = withFileContents f $ \con -> do
+ let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+ ('i':'m':'p':'o':'r':'t':' ':ys) ->
+ case simpleParse (takeWhile ((/=) '#') ys) of
+ Just m -> findImports (m:acc) xxs [_$_]
+ Nothing -> die ("cannot parse chs import in "++f++":\n"++
+ "offending line is {#"++xs)
+ -- no more imports after the first non-import hook
+ _ -> return acc
+ findImports acc (_:xxs) = findImports acc xxs
+ findImports acc [] = return acc
+ mods <- findImports [] (lines con)
+ return md { mdRequires = mods }
+
+-- Find a total order of the set of modules that are partially sorted by their
+-- dependencies on each other. The function returns the sorted list of modules
+-- together with a list of modules that are required but not supplied by this
+-- in the input set of modules.
+sortTopological :: [ModDep] -> [ModDep]
+sortTopological ms = reverse $ fst $ foldl visit ([], S.empty) (map mdOriginal ms)
+ where
+ set = M.fromList (map (\m -> (mdOriginal m, m)) ms)
+ visit (out,visited) m
+ | m `S.member` visited = (out,visited)
+ | otherwise = case m `M.lookup` set of
+ Nothing -> (out, m `S.insert` visited)
+ Just md -> (md:out', visited')
+ where
+ (out',visited') = foldl visit (out, m `S.insert` visited) (mdRequires md)
hunk ./cairo/Setup.hs 1
-{-# LANGUAGE CPP #-}
+-- Setup file for a Gtk2Hs module. Contains only adjustments specific to this module,
+-- all Gtk2Hs-specific boilerplate is stored in Gtk2HsSetup.hs which should be kept
+-- identical across all modules.
+import Gtk2HsSetup ( gtk2hsUserHooks )
+import Distribution.Simple ( defaultMainWithHooks )
hunk ./cairo/Setup.hs 7
-#define CABAL_VERSION_ENCODE(major, minor, micro) ( \
- ((major) * 10000) \
- + ((minor) * 100) \
- + ((micro) * 1))
-
-#define CABAL_VERSION_CHECK(major,minor,micro) \
- (CABAL_VERSION >= CABAL_VERSION_ENCODE(major,minor,micro))
-
--- now, this is bad, but Cabal doesn't seem to actually pass any information about
--- its version to CPP, so guess the version depending on the version of GHC
-#ifdef CABAL_VERSION_MINOR
-#ifndef CABAL_VERSION_MAJOR
-#define CABAL_VERSION_MAJOR 1
-#endif
-#ifndef CABAL_VERSION_MICRO
-#define CABAL_VERSION_MICRO 0
-#endif
-#define CABAL_VERSION CABAL_VERSION_ENCODE( \
- CABAL_VERSION_MAJOR, \
- CABAL_VERSION_MINOR, \
- CABAL_VERSION_MICRO)
-#else
-#warning Setup.hs is guessing the version of Cabal. If compilation of Setup.hs fails use -DCABAL_VERSION_MINOR=x for Cabal version 1.x.0 when building (prefixed by --ghc-option= when using the 'cabal' command)
-#if (__GLASGOW_HASKELL__ >= 612)
-#define CABAL_VERSION CABAL_VERSION_ENCODE(1,8,0)
-#else
-#define CABAL_VERSION CABAL_VERSION_ENCODE(1,6,0)
-#endif
-#endif
-
--- | Build a Gtk2hs package.
---
-import Distribution.Simple
-import Distribution.Simple.PreProcess
-import Distribution.InstalledPackageInfo ( importDirs )
-import Distribution.Simple.PackageIndex (
-#if CABAL_VERSION_CHECK(1,8,0)
- lookupInstalledPackageId
-#else
- lookupPackageId
-#endif
- )
-import Distribution.PackageDescription as PD ( PackageDescription(..),
- updatePackageDescription,
- BuildInfo(..),
- emptyBuildInfo, allBuildInfo,
- Library(..),
- libModules)
-import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
- InstallDirs(..),
-#if CABAL_VERSION_CHECK(1,8,0)
- componentPackageDeps,
-#else
- packageDeps,
-#endif
- absoluteInstallDirs)
-import Distribution.Simple.Compiler ( Compiler(..) )
-import Distribution.Simple.Program (
- Program(..), ConfiguredProgram(..),
- rawSystemProgramConf, rawSystemProgramStdoutConf,
- c2hsProgram, pkgConfigProgram,
- simpleProgram, lookupProgram, rawSystemProgramStdout, ProgArg)
-import Distribution.ModuleName ( ModuleName, components, toFilePath )
-import Distribution.Simple.Utils
-import Distribution.Simple.Setup (CopyFlags(..), InstallFlags(..), CopyDest(..),
- defaultCopyFlags, ConfigFlags(configVerbosity),
- fromFlag, toFlag)
-import Distribution.Simple.BuildPaths ( autogenModulesDir )
-import Distribution.Text ( simpleParse, display )
-import System.FilePath
-import System.Directory ( doesFileExist )
-import Distribution.Version (Version(..))
-import Distribution.Verbosity
-import Control.Monad (unless)
-import Data.Maybe (fromMaybe)
-import Data.List (isPrefixOf, nub)
-import Data.Char (isAlpha)
-import qualified Data.Map as M
-import qualified Data.Set as S
-
-
--- the name of the c2hs pre-compiled header file
-precompFile = "precompchs.bin"
-
-main = defaultMainWithHooks simpleUserHooks {
- hookedPrograms = [typeGenProgram, signalGenProgram, c2hsLocal],
- hookedPreProcessors = [("chs", ourC2hs)],
- confHook = \pd cf ->
- confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
- postConf = \args cf pd lbi -> do
- genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
- postConf simpleUserHooks args cf pd lbi,
- buildHook = \pd lbi uh bf -> fixDeps pd >>= \pd ->
- (buildHook simpleUserHooks) pd lbi uh bf,
- copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
- installCHI pd lbi (fromFlag (copyVerbosity flags)) (fromFlag (copyDest flags)),
- instHook = \pd lbi uh flags -> (instHook simpleUserHooks) pd lbi uh flags >>
- installCHI pd lbi (fromFlag (installVerbosity flags)) NoCopyDest
- }
-
--- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
-adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
-adjustLocalBuildInfo lbi =
- let extra = (Just libBi, [])
- libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
- , buildDir lbi ] }
- in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
-
-ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
-ourC2hs bi lbi = PreProcessor {
- platformIndependent = False,
- runPreProcessor = runC2HS bi lbi
-}
-
-runC2HS :: BuildInfo -> LocalBuildInfo ->
- (FilePath, FilePath) -> (FilePath, FilePath) -> Verbosity -> IO ()
-runC2HS bi lbi (inDir, inFile) (outDir, outFile) verbosity = do
- -- have the header file name if we don't have the precompiled header yet
- header <- case lookup "x-c2hs-header" (customFieldsBI bi) of
- Just h -> return h
- Nothing -> die ("Need x-c2hs-Header definition in the .cabal Library section "++
- "that sets the C header file to process .chs.pp files.")
-
- -- c2hs will output files in out dir, removing any leading path of the input file.
- -- Thus, append the dir of the input file to the output dir.
- let (outFileDir, newOutFile) = splitFileName outFile
- let newOutDir = outDir </> outFileDir
- -- additional .chi files might be needed that other packages have installed;
- -- we assume that these are installed in the same place as .hi files
- let chiDirs = [ dir |
-#if CABAL_VERSION_CHECK(1,8,0)
- ipi <- maybe [] (map fst . componentPackageDeps) (libraryConfig lbi),
- dir <- maybe [] importDirs (lookupInstalledPackageId (installedPkgs lbi) ipi) ]
-#else
- ipi <- packageDeps lbi,
- dir <- maybe [] importDirs (lookupPackageId (installedPkgs lbi) ipi) ]
-#endif
- rawSystemProgramConf verbosity c2hsLocal (withPrograms lbi) $
- map ("--include=" ++) (outDir:chiDirs)
- ++ ["--cppopts=" ++ opt | opt <- getCppOptions bi lbi]
- ++ ["--output-dir=" ++ newOutDir,
- "--output=" ++ newOutFile,
- "--precomp=" ++ buildDir lbi </> precompFile,
- header, inDir </> inFile]
-
-getCppOptions :: BuildInfo -> LocalBuildInfo -> [String]
-getCppOptions bi lbi
- = nub $
- ["-I" ++ dir | dir <- PD.includeDirs bi]
- ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
-
-installCHI :: PackageDescription -- ^information from the .cabal file
- -> LocalBuildInfo -- ^information from the configure step
- -> Verbosity -> CopyDest -- ^flags sent to copy or install
- -> IO ()
-installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copydest = do
- let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest
- -- cannot use the recommended 'findModuleFiles' since it fails if there exists
- -- a modules that does not have a .chi file
- mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
- (map toFilePath
-#if CABAL_VERSION_CHECK(1,8,0)
- (PD.libModules lib)
-#else
- (PD.libModules pkg)
-#endif
- )
- let files = [ f | Just f <- mFiles ]
-#if CABAL_VERSION_CHECK(1,8,0)
- installOrdinaryFiles verbosity libPref files
-#else
- copyFiles verbosity libPref files
-#endif
-
- [_$_]
-installCHI _ _ _ _ = return ()
-
-------------------------------------------------------------------------------
--- Generating the type hierarchy and signal callback .hs files.
-------------------------------------------------------------------------------
-
-typeGenProgram :: Program
-typeGenProgram = (simpleProgram "gtk2hsTypeGen")
-
-signalGenProgram :: Program
-signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
-
-c2hsLocal :: Program
-c2hsLocal = (simpleProgram "gtk2hsC2hs")
-
-genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
-genSynthezisedFiles verb pd lbi = do
-
- cPkgs <- getPkgConfigPackages verb lbi pd
-
- let xList = maybe [] (customFieldsBI . libBuildInfo) (library pd)
- ++customFieldsPD pd
- typeOpts :: [ProgArg]
- typeOpts = concat [ map (\val -> '-':'-':drop 8 field++'=':val) (words content)
- | (field,content) <- xList,
- "x-types-" `isPrefixOf` field,
- field /= "x-types-file"]
- ++ [ "--tag=" ++ tag
- | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
- , let name' = filter isAlpha (display name)
- , tag <- name'
- : [ name' ++ "-" ++ show major ++ "." ++ show digit
- | digit <- [0,2..minor] ]
- ]
-
- genFile :: Program -> [ProgArg] -> FilePath -> IO ()
- genFile prog args outFile = do
- res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
- rewriteFile outFile res
-
- case lookup "x-types-file" xList of
- Nothing -> return ()
- Just f -> do
- info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
- genFile typeGenProgram typeOpts f
-
- case (lookup "x-signals-file" xList,
- lookup "x-signals-modname" xList) of
- (Just _, Nothing) -> die "You need to specify the module name (X-Signals-ModName) \
- \to generate a signal file."
- (Just f, Just mod) -> do
- info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
- genFile signalGenProgram [mod] f
- (_,_) -> return ()
-
---FIXME: Cabal should tell us the selected pkg-config package versions in the
--- LocalBuildInfo or equivalent.
--- In the mean time, ask pkg-config again.
-
-getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
-getPkgConfigPackages verbosity lbi pkg =
- sequence
- [ do version <- pkgconfig ["--modversion", display pkgname]
- case simpleParse version of
- Nothing -> die $ "parsing output of pkg-config --modversion failed"
- Just v -> return (PackageIdentifier pkgname v)
- | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
- where
- pkgconfig = rawSystemProgramStdoutConf verbosity
- pkgConfigProgram (withPrograms lbi)
-
-------------------------------------------------------------------------------
--- Dependency calculation amongst .chs files.
-------------------------------------------------------------------------------
-
--- Given all files of the package, find those that end in .chs and extract the
--- .chs files they depend upon. Then return the PackageDescription with these
--- files rearranged so that they are built in a sequence that files that are
--- needed by other files are built first.
-fixDeps :: PackageDescription -> IO PackageDescription
-fixDeps pd@PD.PackageDescription {
- PD.library = Just li...@PD... {
- PD.exposedModules = expMods,
- PD.libBuildInfo = bi...@PD... {
- PD.hsSourceDirs = srcDirs,
- PD.otherModules = othMods
- }}} = do
- let findModule m = findFileWithExtension [".chs.pp",".chs"] srcDirs
- (joinPath (components m))
- mExpFiles <- mapM findModule expMods
- mOthFiles <- mapM findModule othMods
-
- -- tag all exposed files with True so we throw an error if we need to build
- -- an exposed module before an internal modules (we cannot express this)
- let modDeps = zipWith (ModDep True []) expMods mExpFiles++
- zipWith (ModDep False []) othMods mOthFiles
- modDeps <- mapM extractDeps modDeps
- let (expMods, othMods) = span mdExposed $ sortTopological modDeps
- badOther = map (fromMaybe "<no file>" . mdLocation) $
- filter (not . mdExposed) expMods
- unless (null badOther) $
- die ("internal chs modules "++intercalate "," badOther++
- " depend on exposed chs modules; cabal needs to build internal modules first")
- return pd { PD.library = Just lib {
- PD.exposedModules = map mdOriginal expMods,
- PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods }
- }}
-
-data ModDep = ModDep {
- mdExposed :: Bool,
- mdRequires :: [ModuleName],
- mdOriginal :: ModuleName,
- mdLocation :: Maybe FilePath
-}
-
-instance Show ModDep where
- show x = show (mdLocation x)
-
-instance Eq ModDep where
- ModDep { mdOriginal = m1 } == ModDep { mdOriginal = m2 } = m1==m2
-instance Ord ModDep where
- compare ModDep { mdOriginal = m1 } ModDep { mdOriginal = m2 } = compare m1 m2
-
--- Extract the dependencies of this file. This is intentionally rather naive as it
--- ignores CPP conditionals. We just require everything which means that the
--- existance of a .chs module may not depend on some CPP condition. [_$_]
-extractDeps :: ModDep -> IO ModDep
-extractDeps md@ModDep { mdLocation = Nothing } = return md
-extractDeps md@ModDep { mdLocation = Just f } = withFileContents f $ \con -> do
- let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
- ('i':'m':'p':'o':'r':'t':' ':ys) ->
- case simpleParse (takeWhile ((/=) '#') ys) of
- Just m -> findImports (m:acc) xxs [_$_]
- Nothing -> die ("cannot parse chs import in "++f++":\n"++
- "offending line is {#"++xs)
- -- no more imports after the first non-import hook
- _ -> return acc
- findImports acc (_:xxs) = findImports acc xxs
- findImports acc [] = return acc
- mods <- findImports [] (lines con)
- return md { mdRequires = mods }
-
--- Find a total order of the set of modules that are partially sorted by their
--- dependencies on each other. The function returns the sorted list of modules
--- together with a list of modules that are required but not supplied by this
--- in the input set of modules.
-sortTopological :: [ModDep] -> [ModDep]
-sortTopological ms = reverse $ fst $ foldl visit ([], S.empty) (map mdOriginal ms)
- where
- set = M.fromList (map (\m -> (mdOriginal m, m)) ms)
- visit (out,visited) m
- | m `S.member` visited = (out,visited)
- | otherwise = case m `M.lookup` set of
- Nothing -> (out, m `S.insert` visited)
- Just md -> (md:out', visited')
- where
- (out',visited') = foldl visit (out, m `S.insert` visited) (mdRequires md)
+main = defaultMainWithHooks gtk2hsUserHooks
addfile ./glib/Gtk2HsSetup.hs
hunk ./glib/Gtk2HsSetup.hs 1
+{-# LANGUAGE CPP #-}
+
+#define CABAL_VERSION_ENCODE(major, minor, micro) ( \
+ ((major) * 10000) \
+ + ((minor) * 100) \
+ + ((micro) * 1))
+
+#define CABAL_VERSION_CHECK(major,minor,micro) \
+ (CABAL_VERSION >= CABAL_VERSION_ENCODE(major,minor,micro))
+
+-- now, this is bad, but Cabal doesn't seem to actually pass any information about
+-- its version to CPP, so guess the version depending on the version of GHC
+#ifdef CABAL_VERSION_MINOR
+#ifndef CABAL_VERSION_MAJOR
+#define CABAL_VERSION_MAJOR 1
+#endif
+#ifndef CABAL_VERSION_MICRO
+#define CABAL_VERSION_MICRO 0
+#endif
+#define CABAL_VERSION CABAL_VERSION_ENCODE( \
+ CABAL_VERSION_MAJOR, \
+ CABAL_VERSION_MINOR, \
+ CABAL_VERSION_MICRO)
+#else
+#warning Setup.hs is guessing the version of Cabal. If compilation of Setup.hs fails use -DCABAL_VERSION_MINOR=x for Cabal version 1.x.0 when building (prefixed by --ghc-option= when using the 'cabal' command)
+#if (__GLASGOW_HASKELL__ >= 612)
+#define CABAL_VERSION CABAL_VERSION_ENCODE(1,8,0)
+#else
+#define CABAL_VERSION CABAL_VERSION_ENCODE(1,6,0)
+#endif
+#endif
+
+-- | Build a Gtk2hs package.
+--
+module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
+
+import Distribution.Simple
+import Distribution.Simple.PreProcess
+import Distribution.InstalledPackageInfo ( importDirs )
+import Distribution.Simple.PackageIndex (
+#if CABAL_VERSION_CHECK(1,8,0)
+ lookupInstalledPackageId
+#else
+ lookupPackageId
+#endif
+ )
+import Distribution.PackageDescription as PD ( PackageDescription(..),
+ updatePackageDescription,
+ BuildInfo(..),
+ emptyBuildInfo, allBuildInfo,
+ Library(..),
+ libModules)
+import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
+ InstallDirs(..),
+#if CABAL_VERSION_CHECK(1,8,0)
+ componentPackageDeps,
+#else
+ packageDeps,
+#endif
+ absoluteInstallDirs)
+import Distribution.Simple.Compiler ( Compiler(..) )
+import Distribution.Simple.Program (
+ Program(..), ConfiguredProgram(..),
+ rawSystemProgramConf, rawSystemProgramStdoutConf,
+ c2hsProgram, pkgConfigProgram,
+ simpleProgram, lookupProgram, rawSystemProgramStdout, ProgArg)
+import Distribution.ModuleName ( ModuleName, components, toFilePath )
+import Distribution.Simple.Utils
+import Distribution.Simple.Setup (CopyFlags(..), InstallFlags(..), CopyDest(..),
+ defaultCopyFlags, ConfigFlags(configVerbosity),
+ fromFlag, toFlag)
+import Distribution.Simple.BuildPaths ( autogenModulesDir )
+import Distribution.Text ( simpleParse, display )
+import System.FilePath
+import System.Directory ( doesFileExist )
+import Distribution.Version (Version(..))
+import Distribution.Verbosity
+import Control.Monad (unless)
+import Data.Maybe (fromMaybe)
+import Data.List (isPrefixOf, nub)
+import Data.Char (isAlpha)
+import qualified Data.Map as M
+import qualified Data.Set as S
+
+
+-- the name of the c2hs pre-compiled header file
+precompFile = "precompchs.bin"
+
+gtk2hsUserHooks = simpleUserHooks {
+ hookedPrograms = [typeGenProgram, signalGenProgram, c2hsLocal],
+ hookedPreProcessors = [("chs", ourC2hs)],
+ confHook = \pd cf ->
+ confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ postConf = \args cf pd lbi -> do
+ genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
+ postConf simpleUserHooks args cf pd lbi,
+ buildHook = \pd lbi uh bf -> fixDeps pd >>= \pd ->
+ (buildHook simpleUserHooks) pd lbi uh bf,
+ copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
+ installCHI pd lbi (fromFlag (copyVerbosity flags)) (fromFlag (copyDest flags)),
+ instHook = \pd lbi uh flags -> (instHook simpleUserHooks) pd lbi uh flags >>
+ installCHI pd lbi (fromFlag (installVerbosity flags)) NoCopyDest
+ }
+
+-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
+adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
+adjustLocalBuildInfo lbi =
+ let extra = (Just libBi, [])
+ libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
+ , buildDir lbi ] }
+ in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
+
+ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
+ourC2hs bi lbi = PreProcessor {
+ platformIndependent = False,
+ runPreProcessor = runC2HS bi lbi
+}
+
+runC2HS :: BuildInfo -> LocalBuildInfo ->
+ (FilePath, FilePath) -> (FilePath, FilePath) -> Verbosity -> IO ()
+runC2HS bi lbi (inDir, inFile) (outDir, outFile) verbosity = do
+ -- have the header file name if we don't have the precompiled header yet
+ header <- case lookup "x-c2hs-header" (customFieldsBI bi) of
+ Just h -> return h
+ Nothing -> die ("Need x-c2hs-Header definition in the .cabal Library section "++
+ "that sets the C header file to process .chs.pp files.")
+
+ -- c2hs will output files in out dir, removing any leading path of the input file.
+ -- Thus, append the dir of the input file to the output dir.
+ let (outFileDir, newOutFile) = splitFileName outFile
+ let newOutDir = outDir </> outFileDir
+ -- additional .chi files might be needed that other packages have installed;
+ -- we assume that these are installed in the same place as .hi files
+ let chiDirs = [ dir |
+#if CABAL_VERSION_CHECK(1,8,0)
+ ipi <- maybe [] (map fst . componentPackageDeps) (libraryConfig lbi),
+ dir <- maybe [] importDirs (lookupInstalledPackageId (installedPkgs lbi) ipi) ]
+#else
+ ipi <- packageDeps lbi,
+ dir <- maybe [] importDirs (lookupPackageId (installedPkgs lbi) ipi) ]
+#endif
+ rawSystemProgramConf verbosity c2hsLocal (withPrograms lbi) $
+ map ("--include=" ++) (outDir:chiDirs)
+ ++ ["--cppopts=" ++ opt | opt <- getCppOptions bi lbi]
+ ++ ["--output-dir=" ++ newOutDir,
+ "--output=" ++ newOutFile,
+ "--precomp=" ++ buildDir lbi </> precompFile,
+ header, inDir </> inFile]
+
+getCppOptions :: BuildInfo -> LocalBuildInfo -> [String]
+getCppOptions bi lbi
+ = nub $
+ ["-I" ++ dir | dir <- PD.includeDirs bi]
+ ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
+
+installCHI :: PackageDescription -- ^information from the .cabal file
+ -> LocalBuildInfo -- ^information from the configure step
+ -> Verbosity -> CopyDest -- ^flags sent to copy or install
+ -> IO ()
+installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copydest = do
+ let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest
+ -- cannot use the recommended 'findModuleFiles' since it fails if there exists
+ -- a modules that does not have a .chi file
+ mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
+ (map toFilePath
+#if CABAL_VERSION_CHECK(1,8,0)
+ (PD.libModules lib)
+#else
+ (PD.libModules pkg)
+#endif
+ )
+ let files = [ f | Just f <- mFiles ]
+#if CABAL_VERSION_CHECK(1,8,0)
+ installOrdinaryFiles verbosity libPref files
+#else
+ copyFiles verbosity libPref files
+#endif
+
+ [_$_]
+installCHI _ _ _ _ = return ()
+
+------------------------------------------------------------------------------
+-- Generating the type hierarchy and signal callback .hs files.
+------------------------------------------------------------------------------
+
+typeGenProgram :: Program
+typeGenProgram = (simpleProgram "gtk2hsTypeGen")
+
+signalGenProgram :: Program
+signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
+
+c2hsLocal :: Program
+c2hsLocal = (simpleProgram "gtk2hsC2hs")
+
+genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
+genSynthezisedFiles verb pd lbi = do
+
+ cPkgs <- getPkgConfigPackages verb lbi pd
+
+ let xList = maybe [] (customFieldsBI . libBuildInfo) (library pd)
+ ++customFieldsPD pd
+ typeOpts :: [ProgArg]
+ typeOpts = concat [ map (\val -> '-':'-':drop 8 field++'=':val) (words content)
+ | (field,content) <- xList,
+ "x-types-" `isPrefixOf` field,
+ field /= "x-types-file"]
+ ++ [ "--tag=" ++ tag
+ | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
+ , let name' = filter isAlpha (display name)
+ , tag <- name'
+ : [ name' ++ "-" ++ show major ++ "." ++ show digit
+ | digit <- [0,2..minor] ]
+ ]
+
+ signalsOpts :: [ProgArg]
+ signalsOpts = concat [ map (\val -> '-':'-':drop 10 field++'=':val) (words content)
+ | (field,content) <- xList,
+ "x-signals-" `isPrefixOf` field,
+ field /= "x-signals-file"]
+
+ genFile :: Program -> [ProgArg] -> FilePath -> IO ()
+ genFile prog args outFile = do
+ res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
+ rewriteFile outFile res
+
+ case lookup "x-types-file" xList of
+ Nothing -> return ()
+ Just f -> do
+ info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
+ genFile typeGenProgram typeOpts f
+
+ case lookup "x-signals-file" xList of
+ Nothing -> return ()
+ Just f -> do
+ info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
+ genFile signalGenProgram signalsOpts f
+
+--FIXME: Cabal should tell us the selected pkg-config package versions in the
+-- LocalBuildInfo or equivalent.
+-- In the mean time, ask pkg-config again.
+
+getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
+getPkgConfigPackages verbosity lbi pkg =
+ sequence
+ [ do version <- pkgconfig ["--modversion", display pkgname]
+ case simpleParse version of
+ Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Just v -> return (PackageIdentifier pkgname v)
+ | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
+ where
+ pkgconfig = rawSystemProgramStdoutConf verbosity
+ pkgConfigProgram (withPrograms lbi)
+
+------------------------------------------------------------------------------
+-- Dependency calculation amongst .chs files.
+------------------------------------------------------------------------------
+
+-- Given all files of the package, find those that end in .chs and extract the
+-- .chs files they depend upon. Then return the PackageDescription with these
+-- files rearranged so that they are built in a sequence that files that are
+-- needed by other files are built first.
+fixDeps :: PackageDescription -> IO PackageDescription
+fixDeps pd@PD.PackageDescription {
+ PD.library = Just li...@PD... {
+ PD.exposedModules = expMods,
+ PD.libBuildInfo = bi...@PD... {
+ PD.hsSourceDirs = srcDirs,
+ PD.otherModules = othMods
+ }}} = do
+ let findModule m = findFileWithExtension [".chs.pp",".chs"] srcDirs
+ (joinPath (components m))
+ mExpFiles <- mapM findModule expMods
+ mOthFiles <- mapM findModule othMods
+
+ -- tag all exposed files with True so we throw an error if we need to build
+ -- an exposed module before an internal modules (we cannot express this)
+ let modDeps = zipWith (ModDep True []) expMods mExpFiles++
+ zipWith (ModDep False []) othMods mOthFiles
+ modDeps <- mapM extractDeps modDeps
+ let (expMods, othMods) = span mdExposed $ sortTopological modDeps
+ badOther = map (fromMaybe "<no file>" . mdLocation) $
+ filter (not . mdExposed) expMods
+ unless (null badOther) $
+ die ("internal chs modules "++intercalate "," badOther++
+ " depend on exposed chs modules; cabal needs to build internal modules first")
+ return pd { PD.library = Just lib {
+ PD.exposedModules = map mdOriginal expMods,
+ PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods }
+ }}
+
+data ModDep = ModDep {
+ mdExposed :: Bool,
+ mdRequires :: [ModuleName],
+ mdOriginal :: ModuleName,
+ mdLocation :: Maybe FilePath
+}
+
+instance Show ModDep where
+ show x = show (mdLocation x)
+
+instance Eq ModDep where
+ ModDep { mdOriginal = m1 } == ModDep { mdOriginal = m2 } = m1==m2
+instance Ord ModDep where
+ compare ModDep { mdOriginal = m1 } ModDep { mdOriginal = m2 } = compare m1 m2
+
+-- Extract the dependencies of this file. This is intentionally rather naive as it
+-- ignores CPP conditionals. We just require everything which means that the
+-- existance of a .chs module may not depend on some CPP condition. [_$_]
+extractDeps :: ModDep -> IO ModDep
+extractDeps md@ModDep { mdLocation = Nothing } = return md
+extractDeps md@ModDep { mdLocation = Just f } = withFileContents f $ \con -> do
+ let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
+ ('i':'m':'p':'o':'r':'t':' ':ys) ->
+ case simpleParse (takeWhile ((/=) '#') ys) of
+ Just m -> findImports (m:acc) xxs [_$_]
+ Nothing -> die ("cannot parse chs import in "++f++":\n"++
+ "offending line is {#"++xs)
+ -- no more imports after the first non-import hook
+ _ -> return acc
+ findImports acc (_:xxs) = findImports acc xxs
+ findImports acc [] = return acc
+ mods <- findImports [] (lines con)
+ return md { mdRequires = mods }
+
+-- Find a total order of the set of modules that are partially sorted by their
+-- dependencies on each other. The function returns the sorted list of modules
+-- together with a list of modules that are required but not supplied by this
+-- in the input set of modules.
+sortTopological :: [ModDep] -> [ModDep]
+sortTopological ms = reverse $ fst $ foldl visit ([], S.empty) (map mdOriginal ms)
+ where
+ set = M.fromList (map (\m -> (mdOriginal m, m)) ms)
+ visit (out,visited) m
+ | m `S.member` visited = (out,visited)
+ | otherwise = case m `M.lookup` set of
+ Nothing -> (out, m `S.insert` visited)
+ Just md -> (md:out', visited')
+ where
+ (out',visited') = foldl visit (out, m `S.insert` visited) (mdRequires md)
hunk ./glib/Setup.hs 1
-{-# LANGUAGE CPP #-}
+-- Setup file for a Gtk2Hs module. Contains only adjustments specific to this module,
+-- all Gtk2Hs-specific boilerplate is stored in Gtk2HsSetup.hs which should be kept
+-- identical across all modules.
+import Gtk2HsSetup ( gtk2hsUserHooks )
+import Distribution.Simple ( defaultMainWithHooks )
hunk ./glib/Setup.hs 7
-#define CABAL_VERSION_ENCODE(major, minor, micro) ( \
- ((major) * 10000) \
- + ((minor) * 100) \
- + ((micro) * 1))
-
-#define CABAL_VERSION_CHECK(major,minor,micro) \
- (CABAL_VERSION >= CABAL_VERSION_ENCODE(major,minor,micro))
-
--- now, this is bad, but Cabal doesn't seem to actually pass any information about
--- its version to CPP, so guess the version depending on the version of GHC
-#ifdef CABAL_VERSION_MINOR
-#ifndef CABAL_VERSION_MAJOR
-#define CABAL_VERSION_MAJOR 1
-#endif
-#ifndef CABAL_VERSION_MICRO
-#define CABAL_VERSION_MICRO 0
-#endif
-#define CABAL_VERSION CABAL_VERSION_ENCODE( \
- CABAL_VERSION_MAJOR, \
- CABAL_VERSION_MINOR, \
- CABAL_VERSION_MICRO)
-#else
-#warning Setup.hs is guessing the version of Cabal. If compilation of Setup.hs fails use -DCABAL_VERSION_MINOR=x for Cabal version 1.x.0 when building (prefixed by --ghc-option= when using the 'cabal' command)
-#if (__GLASGOW_HASKELL__ >= 612)
-#define CABAL_VERSION CABAL_VERSION_ENCODE(1,8,0)
-#else
-#define CABAL_VERSION CABAL_VERSION_ENCODE(1,6,0)
-#endif
-#endif
-
--- | Build a Gtk2hs package.
---
-import Distribution.Simple
-import Distribution.Simple.PreProcess
-import Distribution.InstalledPackageInfo ( importDirs )
-import Distribution.Simple.PackageIndex (
-#if CABAL_VERSION_CHECK(1,8,0)
- lookupInstalledPackageId
-#else
- lookupPackageId
-#endif
- )
-import Distribution.PackageDescription as PD ( PackageDescription(..),
- updatePackageDescription,
- BuildInfo(..),
- emptyBuildInfo, allBuildInfo,
- Library(..),
- libModules)
-import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
- InstallDirs(..),
-#if CABAL_VERSION_CHECK(1,8,0)
- componentPackageDeps,
-#else
- packageDeps,
-#endif
- absoluteInstallDirs)
-import Distribution.Simple.Compiler ( Compiler(..) )
-import Distribution.Simple.Program (
- Program(..), ConfiguredProgram(..),
- rawSystemProgramConf, rawSystemProgramStdoutConf,
- c2hsProgram, pkgConfigProgram,
- simpleProgram, lookupProgram, rawSystemProgramStdout, ProgArg)
-import Distribution.ModuleName ( ModuleName, components, toFilePath )
-import Distribution.Simple.Utils
-import Distribution.Simple.Setup (CopyFlags(..), InstallFlags(..), CopyDest(..),
- defaultCopyFlags, ConfigFlags(configVerbosity),
- fromFlag, toFlag)
-import Distribution.Simple.BuildPaths ( autogenModulesDir )
-import Distribution.Text ( simpleParse, display )
-import System.FilePath
-import System.Directory ( doesFileExist )
-import Distribution.Version (Version(..))
-import Distribution.Verbosity
-import Control.Monad (unless)
-import Data.Maybe (fromMaybe)
-import Data.List (isPrefixOf, nub)
-import Data.Char (isAlpha)
-import qualified Data.Map as M
-import qualified Data.Set as S
-
-
--- the name of the c2hs pre-compiled header file
-precompFile = "precompchs.bin"
-
-main = defaultMainWithHooks simpleUserHooks {
- hookedPrograms = [typeGenProgram, signalGenProgram, c2hsLocal],
- hookedPreProcessors = [("chs", ourC2hs)],
- confHook = \pd cf ->
- confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
- postConf = \args cf pd lbi -> do
- genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
- postConf simpleUserHooks args cf pd lbi,
- buildHook = \pd lbi uh bf -> fixDeps pd >>= \pd ->
- (buildHook simpleUserHooks) pd lbi uh bf,
- copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
- installCHI pd lbi (fromFlag (copyVerbosity flags)) (fromFlag (copyDest flags)),
- instHook = \pd lbi uh flags -> (instHook simpleUserHooks) pd lbi uh flags >>
- installCHI pd lbi (fromFlag (installVerbosity flags)) NoCopyDest
- }
-
--- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
-adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
-adjustLocalBuildInfo lbi =
- let extra = (Just libBi, [])
- libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
- , buildDir lbi ] }
- in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
-
-ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
-ourC2hs bi lbi = PreProcessor {
- platformIndependent = False,
- runPreProcessor = runC2HS bi lbi
-}
-
-runC2HS :: BuildInfo -> LocalBuildInfo ->
- (FilePath, FilePath) -> (FilePath, FilePath) -> Verbosity -> IO ()
-runC2HS bi lbi (inDir, inFile) (outDir, outFile) verbosity = do
- -- have the header file name if we don't have the precompiled header yet
- header <- case lookup "x-c2hs-header" (customFieldsBI bi) of
- Just h -> return h
- Nothing -> die ("Need x-c2hs-Header definition in the .cabal Library section "++
- "that sets the C header file to process .chs.pp files.")
-
- -- c2hs will output files in out dir, removing any leading path of the input file.
- -- Thus, append the dir of the input file to the output dir.
- let (outFileDir, newOutFile) = splitFileName outFile
- let newOutDir = outDir </> outFileDir
- -- additional .chi files might be needed that other packages have installed;
- -- we assume that these are installed in the same place as .hi files
- let chiDirs = [ dir |
-#if CABAL_VERSION_CHECK(1,8,0)
- ipi <- maybe [] (map fst . componentPackageDeps) (libraryConfig lbi),
- dir <- maybe [] importDirs (lookupInstalledPackageId (installedPkgs lbi) ipi) ]
-#else
- ipi <- packageDeps lbi,
- dir <- maybe [] importDirs (lookupPackageId (installedPkgs lbi) ipi) ]
-#endif
- rawSystemProgramConf verbosity c2hsLocal (withPrograms lbi) $
- map ("--include=" ++) (outDir:chiDirs)
- ++ ["--cppopts=" ++ opt | opt <- getCppOptions bi lbi]
- ++ ["--output-dir=" ++ newOutDir,
- "--output=" ++ newOutFile,
- "--precomp=" ++ buildDir lbi </> precompFile,
- header, inDir </> inFile]
-
-getCppOptions :: BuildInfo -> LocalBuildInfo -> [String]
-getCppOptions bi lbi
- = nub $
- ["-I" ++ dir | dir <- PD.includeDirs bi]
- ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
-
-installCHI :: PackageDescription -- ^information from the .cabal file
- -> LocalBuildInfo -- ^information from the configure step
- -> Verbosity -> CopyDest -- ^flags sent to copy or install
- -> IO ()
-installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copydest = do
- let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest
- -- cannot use the recommended 'findModuleFiles' since it fails if there exists
- -- a modules that does not have a .chi file
- mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
- (map toFilePath
-#if CABAL_VERSION_CHECK(1,8,0)
- (PD.libModules lib)
-#else
- (PD.libModules pkg)
-#endif
- )
- let files = [ f | Just f <- mFiles ]
-#if CABAL_VERSION_CHECK(1,8,0)
- installOrdinaryFiles verbosity libPref files
-#else
- copyFiles verbosity libPref files
-#endif
-
- [_$_]
-installCHI _ _ _ _ = return ()
-
-------------------------------------------------------------------------------
--- Generating the type hierarchy and signal callback .hs files.
-------------------------------------------------------------------------------
-
-typeGenProgram :: Program
-typeGenProgram = (simpleProgram "gtk2hsTypeGen")
-
-signalGenProgram :: Program
-signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
-
-c2hsLocal :: Program
-c2hsLocal = (simpleProgram "gtk2hsC2hs")
-
-genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
-genSynthezisedFiles verb pd lbi = do
-
- cPkgs <- getPkgConfigPackages verb lbi pd
-
- let xList = maybe [] (customFieldsBI . libBuildInfo) (library pd)
- ++customFieldsPD pd
- typeOpts :: [ProgArg]
- typeOpts = concat [ map (\val -> '-':'-':drop 8 field++'=':val) (words content)
- | (field,content) <- xList,
- "x-types-" `isPrefixOf` field,
- field /= "x-types-file"]
- ++ [ "--tag=" ++ tag
- | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
- , let name' = filter isAlpha (display name)
- , tag <- name'
- : [ name' ++ "-" ++ show major ++ "." ++ show digit
- | digit <- [0,2..minor] ]
- ]
-
- genFile :: Program -> [ProgArg] -> FilePath -> IO ()
- genFile prog args outFile = do
- res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
- rewriteFile outFile res
-
- case lookup "x-types-file" xList of
- Nothing -> return ()
- Just f -> do
- info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
- genFile typeGenProgram typeOpts f
-
- case (lookup "x-signals-file" xList,
- lookup "x-signals-modname" xList) of
- (Just _, Nothing) -> die "You need to specify the module name (X-Signals-ModName) \
- \to generate a signal file."
- (Just f, Just mod) -> do
- info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
- g...
[truncated message content] |
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:14
|
Sat May 1 09:36:11 EDT 2010 Axe...@in...
* Always build Plug and Socket, even on Windows.
Ignore-this: 3d318997a29c769d415238ad7bed881b
hunk ./gtk/gtk.cabal 242
- x-Types-Tag: default
- if !os(windows)
- x-Types-Tag: plugNsocket
+ x-Types-Tag: default plugNsocket
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:10
|
Sat May 1 09:30:50 EDT 2010 Axe...@in...
* Let the default Signal template import GtkInternals.
Ignore-this: 2f2e8944aa1cc5a5831cabd8c86f119c
addfile ./gtk/Graphics/UI/Gtk/Signals.chs.template
hunk ./gtk/Graphics/UI/Gtk/Signals.chs.template 1
+{-# OPTIONS_HADDOCK hide #-}
+-- -*-haskell-*-
+-- -------------------- automatically generated file - do not edit ------------
+-- Callback installers for the GIMP Toolkit (GTK) Binding for Haskell
+--
+-- Author : Axel Simon
+--
+-- Created: 1 July 2000
+--
+-- Copyright (C) 2000-2005 Axel Simon
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public
+-- License as published by the Free Software Foundation; either
+-- version 2.1 of the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- #hide
+
+-- These functions are used to connect signals to widgets. They are auto-
+-- matically created through HookGenerator.hs which takes a list of possible
+-- function signatures that are included in the GTK sources (gtkmarshal.list).
+--
+-- The object system in the second version of GTK is based on GObject from
+-- GLIB. This base class is rather primitive in that it only implements
+-- ref and unref methods (and others that are not interesting to us). If
+-- the marshall list mentions OBJECT it refers to an instance of this [_$_]
+-- GObject which is automatically wrapped with a ref and unref call.
+-- Structures which are not derived from GObject have to be passed as
+-- BOXED which gives the signal connect function a possibility to do the
+-- conversion into a proper ForeignPtr type. In special cases the signal
+-- connect function use a PTR type which will then be mangled in the
+-- user function directly. The latter is needed if a signal delivers a
+-- pointer to a string and its length in a separate integer.
+--
+module @MODULE_NAME@ (
+ module System.Glib.Signals,
+
+ @MODULE_EXPORTS@
+ ) where
+
+import Control.Monad (liftM)
+
+import System.Glib.FFI
+import System.Glib.UTFString (peekUTFString)
+import System.Glib.GError (failOnGError)
+{#import System.Glib.Signals#}
+{#import System.Glib.GObject#} [_$_]
+import Graphics.UI.Gtk.General.Threading
+
+{#context lib="gtk" prefix="gtk" #}
+
+
+-- Here are the generators that turn a Haskell function into
+-- a C function pointer. The fist Argument is always the widget,
+-- the last one is the user g_pointer. Both are ignored.
+
+@MODULE_BODY@
hunk ./gtk/gtk.cabal 27
+ Graphics/UI/Gtk/Signals.chs.template
hunk ./gtk/gtk.cabal 208
- Graphics.UI.Gtk.General.Threading
hunk ./gtk/gtk.cabal 217
+ Graphics.UI.Gtk.General.Threading
hunk ./gtk/gtk.cabal 227
+ -- the following field is only needed because the gtk package needs a slightly different
+ -- Signals.chs template file to avoid circular imports with GtkInternals
+ x-Signals-Template: Graphics/UI/Gtk/Signals.chs.template
hunk ./tools/callbackGen/HookGenerator.hs 8
-import Data.List (nub)
+import Data.List (nub, isPrefixOf)
hunk ./tools/callbackGen/HookGenerator.hs 442
- "Program to generate callback hook for Gtk signals. Usage:\n"++
- "HookGenerator <moduleName>\n"++
+ "Program to generate callback hook for Gtk signals. Usage:\n\n"++
+ "HookGenerator [--template=<template-file>] [--types=<types-file>]--modname=<moduleName> > <outFile>\n"++
hunk ./tools/callbackGen/HookGenerator.hs 445
- " <moduleName> the module name for <outFile>\n"
+ " <moduleName> the module name for <outFile>\n"++
+ " <template-file> a path to the Signal.chs.template file\n"++
+ " <types-file> a path to a gtkmarshal.list file\n"
hunk ./tools/callbackGen/HookGenerator.hs 452
- if (length args /= 1) then usage else do
- typesFile <- getDataFileName "callbackGen/gtkmarshal.list"
- templateFile <- getDataFileName "callbackGen/Signal.chs.template"
- let [outModuleName] = args
+ let showHelp = not (null (filter ("-h" `isPrefixOf`) args++
+ filter ("--help" `isPrefixOf`) args)) || null args
+ if showHelp then usage else do
+ let outModuleName = case map (drop 10) (filter ("--modname=" `isPrefixOf`) args) of
+ (modName:_) -> modName
+ templateFile <- case map (drop 11) (filter ("--template=" `isPrefixOf`) args) of
+ [tplName] -> return tplName
+ _ -> getDataFileName "callbackGen/Signal.chs.template"
+ typesFile <- case map (drop 11) (filter ("--types=" `isPrefixOf`) args) of
+ [typName] -> return typName
+ _ -> getDataFileName "callbackGen/gtkmarshal.list"
hunk ./tools/callbackGen/Signal.chs.template 53
-import Graphics.UI.Gtk.General.Threading
+import Graphics.UI.GtkInternals
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:08
|
Sat May 1 09:27:26 EDT 2010 Axe...@in...
* Pick the right function to load a Pixbuf on Windows.
Ignore-this: 3e114b00529c96bedea2cb1214dd27b2
hunk ./gtk/Graphics/UI/Gtk/Gdk/PixbufAnimation.chs 112
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,5)
+ {#call unsafe pixbuf_animation_new_from_file_utf8#} strPtr errPtrPtr
+#else
hunk ./gtk/Graphics/UI/Gtk/Gdk/PixbufAnimation.chs 116
-
+#endif
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:07
|
Fri Apr 30 14:04:26 EDT 2010 Andy Stewart <laz...@gm...>
* Add `Emblem` and `EmblemedIcon` in hierarchy.list to support gio.
Ignore-this: 9bb1953f8b0a82e895c7f723acf78def
hunk ./tools/hierarchyGen/hierarchy.list 266
+ GEmblem as Emblem, g_emblem_get_type if gio
+ GEmblemedIcon as EmblemedIcon, g_emblemed_icon_get_type if gio
hunk ./tools/hierarchyGen/hierarchy.list 338
+
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:06
|
Fri Apr 30 03:13:18 EDT 2010 Andy Stewart <laz...@gm...>
* Add new functions `readUTFStringArray0` for gio binding.
Ignore-this: d8d756fca5e216862594e9957a178875
hunk ./glib/System/Glib/UTFString.hs 41
+ readUTFStringArray0,
hunk ./glib/System/Glib/UTFString.hs 141
+-- Like peekUTFStringArray0 but then free the string array using g_strfreev
+readUTFStringArray0 :: Ptr CString -> IO [String]
+readUTFStringArray0 cStrArr = do
+ cStrs <- peekArray0 nullPtr cStrArr
+ g_strfreev cStrArr
+ mapM peekUTFString cStrs
+
+foreign import ccall unsafe "g_strfreev"
+ g_strfreev :: Ptr a -> IO ()
+
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:05
|
Thu Apr 29 23:54:45 EDT 2010 Andy Stewart <laz...@gm...>
* Add callback `NONE:OBJECT,OBJECT,ENUM` for gio.
Ignore-this: e594257b6d014dd1c92132e7c6ef399c
hunk ./tools/callbackGen/gtkmarshal.list 166
+NONE:OBJECT,OBJECT,ENUM
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:03
|
Thu Apr 29 16:12:43 EDT 2010 Andy Stewart <laz...@gm...>
* Add callback `NONE:STRING,STRING,STRING,ENUM` to support gio.
Ignore-this: 9b38ae786b5b2866764a276ec5e40b00
hunk ./tools/callbackGen/gtkmarshal.list 164
+# for gio
+NONE:STRING,STRING,STRING,ENUM
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:02
|
Wed Apr 28 11:13:04 EDT 2010 Andy Stewart <laz...@gm...>
* Add function `widgetGetAllocation` and fix version tag.
Ignore-this: 74e831fd17d3f1bbd2761e2e778e4e4e
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 192
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 195
+ widgetGetAllocation,
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2013
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2028
+-- | Retrieves the widget's allocation.
+--
+-- * Available since Gtk+ version 2.18
+--
+widgetGetAllocation :: WidgetClass self => self -> IO Allocation
+widgetGetAllocation widget =
+ alloca $ \ allocationPtr -> do [_$_]
+ {#call widget_get_allocation#} (toWidget widget) (castPtr allocationPtr)
+ peek allocationPtr
+#endif
+
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:01
|
Wed Apr 28 11:11:39 EDT 2010 Andy Stewart <laz...@gm...>
* re-export `toNativeWindowId` and `fromNativeWindowId` to fix Embedded demos.
Ignore-this: 6e49f7548a461e1da10c5e2a1ff385e6
hunk ./demo/embedded/Embedded.hs 17
-import Graphics.UI.Gtk.General.Structs
+import Graphics.UI.Gtk.Gdk.DrawWindow
hunk ./demo/embedded/Uzbl.hs 13
-import Graphics.UI.Gtk.General.Structs
+import Graphics.UI.Gtk.Gdk.DrawWindow
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 52
+ toNativeWindowId,
+ fromNativeWindowId,
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:19:00
|
Wed Apr 28 10:51:00 EDT 2010 Andy Stewart <laz...@gm...>
* Fix cycle import problem, and expose `Threading` modules for use in Signals.chs
Ignore-this: 5c350d915116b87c728b69942b461bd1
* Signal.chs.template : restore to "import Graphics.UI.Gtk.General.Threading".
* GtkInternals.chs : remove Graphics.UI.Gtk.General.Threading, otherwise cycle import when compile gtk.
* Threading.hs : Add nots that don't use this module in application.
* gtk.cabal : expose Graphics.UI.Gtk.General.Threading
hunk ./gtk/Graphics/UI/Gtk/General/Threading.hs 27
+-- This file contains functions that are needed by other library wrappers that build
+-- on Gtk2Hs. An application should not need this function nor include this file.
+--
hunk ./gtk/Graphics/UI/GtkInternals.chs 33
- module Graphics.UI.Gtk.General.Threading
hunk ./gtk/Graphics/UI/GtkInternals.chs 38
-import Graphics.UI.Gtk.General.Threading
+
hunk ./gtk/gtk.cabal 207
+ Graphics.UI.Gtk.General.Threading
hunk ./gtk/gtk.cabal 217
- Graphics.UI.Gtk.General.Threading
hunk ./tools/callbackGen/Signal.chs.template 53
-import Graphics.UI.GtkInternals
-
+import Graphics.UI.Gtk.General.Threading
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:58
|
Wed Apr 28 05:44:53 EDT 2010 Andy Stewart <laz...@gm...>
* Adjust GtkInternal.chs and Signal.chs.template to support non-core packages.
Ignore-this: bf2cfe48234ea434dbb108e780dad346
Becuase Signal.chs in non-core packages need import `Graphics.UI.Gtk.General.Threading`,
so i add it in GtkInternal and change Signa.chs template.
hunk ./gtk/Graphics/UI/GtkInternals.chs 32
- module Graphics.UI.Gtk.Multiline.Types
+ module Graphics.UI.Gtk.Multiline.Types,
+ module Graphics.UI.Gtk.General.Threading
hunk ./gtk/Graphics/UI/GtkInternals.chs 39
+import Graphics.UI.Gtk.General.Threading
hunk ./tools/callbackGen/Signal.chs.template 53
-import Graphics.UI.Gtk.General.Threading
+import Graphics.UI.GtkInternals
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:57
|
Sat Apr 24 22:59:13 EDT 2010 Andy Stewart <laz...@gm...>
* Add new callback for gconf.
Ignore-this: dd81d8a5dff016895855bd947114b893
hunk ./tools/callbackGen/gtkmarshal.list 162
-
+# for gconf
+NONE:STRING,POINTER
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:56
|
Fri Apr 23 10:55:24 EDT 2010 Axe...@in...
* Explicitly link in gthread which is required to find g_thread_init.
Ignore-this: 11729966fdc935ccc3605dc51102d1f4
hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.c 26
+#include "hsgthread.h"
hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.c 38
-void gtk2hs_threads_initialise () {
+void gtk2hs_threads_initialise (void) {
hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.h 7
-int gtk2hs_threads_initialise (void);
+void gtk2hs_threads_initialise (void);
hunk ./gtk/gtk.cabal 242
- pkgconfig-depends: gtk+-2.0
+ pkgconfig-depends: gthread-2.0, gtk+-2.0
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:56
|
Fri Apr 23 11:25:01 EDT 2010 Axe...@in...
* Call c2hs with the bare filename as its output.
Ignore-this: c9be4c390228577708614efa892a24b7
hunk ./cairo/Setup.hs 128
- let newOutDir = outDir </> takeDirectory outFile
+ let (outFileDir, newOutFile) = splitFileName outFile
+ let newOutDir = outDir </> outFileDir
hunk ./cairo/Setup.hs 144
- "--output=" ++ outFile,
+ "--output=" ++ newOutFile,
hunk ./glib/Setup.hs 128
- let newOutDir = outDir </> takeDirectory outFile
+ let (outFileDir, newOutFile) = splitFileName outFile
+ let newOutDir = outDir </> outFileDir
hunk ./glib/Setup.hs 144
- "--output=" ++ outFile,
+ "--output=" ++ newOutFile,
hunk ./gtk/Setup.hs 128
- let newOutDir = outDir </> takeDirectory outFile
+ let (outFileDir, newOutFile) = splitFileName outFile
+ let newOutDir = outDir </> outFileDir
hunk ./gtk/Setup.hs 144
- "--output=" ++ outFile,
+ "--output=" ++ newOutFile,
hunk ./pango/Setup.hs 129
- let newOutDir = outDir </> takeDirectory outFile
+ let (outFileDir, newOutFile) = splitFileName outFile
+ let newOutDir = outDir </> outFileDir
hunk ./pango/Setup.hs 145
- "--output=" ++ outFile,
+ "--output=" ++ newOutFile,
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:53
|
Thu Apr 22 11:30:08 EDT 2010 Axe...@in...
* Move modules back to the not-exposed section and add them to the Internals module instead.
Ignore-this: 255f909810a01cc250790b1423643551
hunk ./gtk/Graphics/UI/GtkInternals.chs 31
- module Graphics.UI.Gtk.General.DNDTypes
+ module Graphics.UI.Gtk.General.DNDTypes,
+ module Graphics.UI.Gtk.Multiline.Types
hunk ./gtk/Graphics/UI/GtkInternals.chs 37
+{#import Graphics.UI.Gtk.Multiline.Types#} [_$_]
hunk ./gtk/gtk.cabal 49
+ Graphics.UI.GtkInternals
hunk ./gtk/gtk.cabal 206
- Graphics.UI.Gtk.General.Threading
hunk ./gtk/gtk.cabal 207
- Graphics.UI.Gtk.General.DNDTypes
- Graphics.UI.Gtk.Multiline.Types
hunk ./gtk/gtk.cabal 213
+ Graphics.UI.Gtk.Multiline.Types
hunk ./gtk/gtk.cabal 215
+ Graphics.UI.Gtk.General.DNDTypes
+ Graphics.UI.Gtk.General.Threading
+ Graphics.UI.Gtk.Types
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:51
|
Thu Apr 22 10:12:22 EDT 2010 Axe...@in...
* Ensure all end-user types names are exposed through Gtk.hs and make low-level type names available through a new module.
Ignore-this: c8f2000df7eb6ceb0f67bfebd3286d9c
hunk ./glib/System/Glib/GObject.chs 45
+ gTypeGObject,
hunk ./glib/System/Glib/GObject.chs 103
+-- | The type constant to check if an instance is of 'GObject' type.
+gTypeGObject :: GType
+gTypeGObject =
+ {# call fun unsafe g_object_get_type #}
+
hunk ./gtk/Graphics/UI/Gtk.chs 401
+ gTypeObject,
hunk ./gtk/Graphics/UI/Gtk.chs 430
- castToGObject,
+ castToGObject, gTypeGObject,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Bin.chs 62
- castToBin,
+ castToBin, gTypeBin,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 103
- castToBox,
+ castToBox, gTypeBox,
hunk ./gtk/Graphics/UI/Gtk/Abstract/ButtonBox.chs 69
- castToButtonBox,
+ castToButtonBox, gTypeButtonBox,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Container.chs 147
- castToContainer,
+ castToContainer, gTypeContainer,
hunk ./gtk/Graphics/UI/Gtk/Abstract/IMContext.chs 43
- castToIMContext,
+ castToIMContext, gTypeIMContext,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Misc.chs 57
- castToMisc,
+ castToMisc, gTypeMisc,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 58
- castToObject,
+ castToObject, gTypeObject,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Paned.chs 71
- castToPaned,
+ castToPaned, gTypePaned,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 48
- castToRange,
+ castToRange, gTypeRange,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Scale.chs 58
- castToScale,
+ castToScale, gTypeScale,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Scrollbar.hs 60
- castToScrollbar,
+ castToScrollbar, gTypeScrollbar,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Scrollbar.hs 64
-import Graphics.UI.Gtk.Types (Scrollbar, ScrollbarClass,
- castToScrollbar, toScrollbar)
+import Graphics.UI.Gtk.Types
hunk ./gtk/Graphics/UI/Gtk/Abstract/Separator.hs 49
- castToSeparator,
+ castToSeparator, gTypeSeparator,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Separator.hs 53
-import Graphics.UI.Gtk.Types (Separator, SeparatorClass,
- castToSeparator, toSeparator)
-
--- well this widget is very abstract!
+import Graphics.UI.Gtk.Types
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 63
- castToWidget,
+ castToWidget, gTypeWidget,
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 81
- castToAction,
+ castToAction, gTypeAction,
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/ActionGroup.chs 63
- castToActionGroup,
+ castToActionGroup, gTypeActionGroup,
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/RadioAction.chs 55
- castToRadioAction,
+ castToRadioAction, gTypeRadioAction,
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/ToggleAction.chs 49
- castToToggleAction,
+ castToToggleAction, gTypeToggleAction,
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs 204
- castToUIManager,
+ castToUIManager, gTypeUIManager,
hunk ./gtk/Graphics/UI/Gtk/Builder.chs 77
+ , gTypeBuilder
hunk ./gtk/Graphics/UI/Gtk/Buttons/Button.chs 57
- castToButton,
+ castToButton, gTypeButton,
hunk ./gtk/Graphics/UI/Gtk/Buttons/Button.chs 650
+
hunk ./gtk/Graphics/UI/Gtk/Buttons/CheckButton.chs 53
- castToCheckButton,
+ castToCheckButton, gTypeCheckButton,
hunk ./gtk/Graphics/UI/Gtk/Buttons/RadioButton.chs 106
- castToRadioButton,
+ castToRadioButton, gTypeRadioButton,
hunk ./gtk/Graphics/UI/Gtk/Buttons/ToggleButton.chs 61
- castToToggleButton,
+ castToToggleButton, gTypeToggleButton,
hunk ./gtk/Graphics/UI/Gtk/Display/AccelLabel.chs 71
- castToAccelLabel,
+ castToAccelLabel, gTypeAccelLabel,
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 92
- castToImage,
+ castToImage, gTypeImage,
hunk ./gtk/Graphics/UI/Gtk/Display/Label.chs 117
- castToLabel,
+ castToLabel, gTypeLabel,
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 66
- castToProgressBar,
+ castToProgressBar, gTypeProgressBar,
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 68
- castToStatusIcon,
+ castToStatusIcon, gTypeStatusIcon,
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 72
- castToStatusbar,
+ castToStatusbar, gTypeStatusbar,
hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 55
- castToPlug,
+ castToPlug, gTypePlug,
hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 89
- castToSocket,
+ castToSocket, gTypeSocket,
hunk ./gtk/Graphics/UI/Gtk/Entry/Editable.chs 49
- castToEditable,
+ castToEditable, gTypeEditable,
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 56
- castToEntry,
+ castToEntry, gTypeEntry,
hunk ./gtk/Graphics/UI/Gtk/Entry/EntryCompletion.chs 73
- castToEntryCompletion,
+ castToEntryCompletion, gTypeEntryCompletion,
hunk ./gtk/Graphics/UI/Gtk/Entry/HScale.chs 50
- castToHScale,
+ castToHScale, gTypeHScale,
hunk ./gtk/Graphics/UI/Gtk/Entry/SpinButton.chs 52
- castToSpinButton,
+ castToSpinButton, gTypeSpinButton,
hunk ./gtk/Graphics/UI/Gtk/Entry/VScale.chs 50
- castToVScale,
+ castToVScale, gTypeVScale,
hunk ./gtk/Graphics/UI/Gtk/Gdk/Display.chs 59
- castToDisplay,
+ castToDisplay, gTypeDisplay,
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 49
- castToDrawWindow,
+ castToDrawWindow, gTypeDrawWindow,
hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 40
- castToDrawable,
+ castToDrawable, gTypeDrawable,
hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 44
- castToGC,
+ castToGC, gTypeGC,
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 65
- castToPixbuf,
+ castToPixbuf, gTypePixbuf,
hunk ./gtk/Graphics/UI/Gtk/Gdk/PixbufAnimation.chs 38
- castToPixbufAnimation,
+ castToPixbufAnimation, gTypePixbufAnimation,
hunk ./gtk/Graphics/UI/Gtk/Gdk/PixbufAnimation.chs 43
- castToPixbufAnimationIter,
+ castToPixbufAnimationIter, gTypePixbufAnimationIter,
hunk ./gtk/Graphics/UI/Gtk/Gdk/PixbufAnimation.chs 48
- castToPixbufSimpleAnim,
+ castToPixbufSimpleAnim, gTypePixbufSimpleAnim,
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 55
- castToScreen,
+ castToScreen, gTypeScreen,
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs 97
- castToClipboard,
+ castToClipboard, gTypeClipboard,
hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 69
- castToDragContext,
+ castToDragContext, gTypeDragContext,
hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs 71
- castToIconFactory,
+ castToIconFactory, gTypeIconFactory,
hunk ./gtk/Graphics/UI/Gtk/General/RcStyle.chs 435
- castToRcStyle,
+ castToRcStyle, gTypeRcStyle,
hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 50
- castToStyle,
+ castToStyle, gTypeStyle,
hunk ./gtk/Graphics/UI/Gtk/Layout/Alignment.chs 58
- castToAlignment,
+ castToAlignment, gTypeAlignment,
hunk ./gtk/Graphics/UI/Gtk/Layout/AspectFrame.chs 51
- castToAspectFrame,
+ castToAspectFrame, gTypeAspectFrame,
hunk ./gtk/Graphics/UI/Gtk/Layout/Expander.chs 57
- castToExpander,
+ castToExpander, gTypeExpander,
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 77
- castToFixed,
+ castToFixed, gTypeFixed,
hunk ./gtk/Graphics/UI/Gtk/Layout/HBox.chs 54
- castToHBox,
+ castToHBox, gTypeHBox,
hunk ./gtk/Graphics/UI/Gtk/Layout/HButtonBox.chs 68
- castToHButtonBox,
+ castToHButtonBox, gTypeHButtonBox,
hunk ./gtk/Graphics/UI/Gtk/Layout/HPaned.chs 48
- castToHPaned,
+ castToHPaned, gTypeHPaned,
hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 50
- castToLayout,
+ castToLayout, gTypeLayout,
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 71
- castToNotebook,
+ castToNotebook, gTypeNotebook,
hunk ./gtk/Graphics/UI/Gtk/Layout/Table.chs 62
- castToTable,
+ castToTable, gTypeTable,
hunk ./gtk/Graphics/UI/Gtk/Layout/VBox.chs 54
- castToVBox,
+ castToVBox, gTypeVBox,
hunk ./gtk/Graphics/UI/Gtk/Layout/VButtonBox.chs 68
- castToVButtonBox,
+ castToVButtonBox, gTypeVButtonBox,
hunk ./gtk/Graphics/UI/Gtk/Layout/VPaned.chs 48
- castToVPaned,
+ castToVPaned, gTypeVPaned,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/CheckMenuItem.chs 55
- castToCheckMenuItem,
+ castToCheckMenuItem, gTypeCheckMenuItem,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 70
- castToCombo,
+ castToCombo, gTypeCombo,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 69
- castToComboBox,
+ castToComboBox, gTypeComboBox,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 69
- castToComboBoxEntry,
+ castToComboBoxEntry, gTypeComboBoxEntry,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ImageMenuItem.chs 56
- castToImageMenuItem,
+ castToImageMenuItem, gTypeImageMenuItem,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs 68
- castToMenu,
+ castToMenu, gTypeMenu,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuBar.chs 49
- castToMenuBar,
+ castToMenuBar, gTypeMenuBar,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 69
- castToMenuItem,
+ castToMenuItem, gTypeMenuItem,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuShell.chs 54
- castToMenuShell,
+ castToMenuShell, gTypeMenuShell,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 58
- castToMenuToolButton,
+ castToMenuToolButton, gTypeMenuToolButton,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 65
- castToOptionMenu,
+ castToOptionMenu, gTypeOptionMenu,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/RadioMenuItem.chs 54
- castToRadioMenuItem,
+ castToRadioMenuItem, gTypeRadioMenuItem,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/RadioToolButton.chs 61
- castToRadioToolButton,
+ castToRadioToolButton, gTypeRadioToolButton,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/SeparatorMenuItem.chs 51
- castToSeparatorMenuItem,
+ castToSeparatorMenuItem, gTypeSeparatorMenuItem,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/SeparatorToolItem.chs 59
- castToSeparatorToolItem,
+ castToSeparatorToolItem, gTypeSeparatorToolItem,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/TearoffMenuItem.chs 58
- castToTearoffMenuItem,
+ castToTearoffMenuItem, gTypeTearoffMenuItem,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToggleToolButton.chs 57
- castToToggleToolButton,
+ castToToggleToolButton, gTypeToggleToolButton,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolButton.chs 71
- castToToolButton,
+ castToToolButton, gTypeToolButton,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 57
- castToToolItem,
+ castToToolItem, gTypeToolItem,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 85
- castToToolbar,
+ castToToolbar, gTypeToolbar,
hunk ./gtk/Graphics/UI/Gtk/Misc/Adjustment.chs 56
- castToAdjustment,
+ castToAdjustment, gTypeAdjustment,
hunk ./gtk/Graphics/UI/Gtk/Misc/Arrow.chs 56
- castToArrow,
+ castToArrow, gTypeArrow,
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 60
- castToCalendar,
+ castToCalendar, gTypeCalendar,
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 75
- castToDrawingArea,
+ castToDrawingArea, gTypeDrawingArea,
hunk ./gtk/Graphics/UI/Gtk/Misc/EventBox.chs 50
- castToEventBox,
+ castToEventBox, gTypeEventBox,
hunk ./gtk/Graphics/UI/Gtk/Misc/HandleBox.chs 64
- castToHandleBox,
+ castToHandleBox, gTypeHandleBox,
hunk ./gtk/Graphics/UI/Gtk/Misc/IMMulticontext.chs 42
- castToIMMulticontext,
+ castToIMMulticontext, gTypeIMMulticontext,
hunk ./gtk/Graphics/UI/Gtk/Misc/SizeGroup.chs 66
- castToSizeGroup,
+ castToSizeGroup, gTypeSizeGroup,
hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 68
- castToTooltips,
+ castToTooltips, gTypeTooltips,
hunk ./gtk/Graphics/UI/Gtk/Misc/Viewport.chs 56
- castToViewport,
+ castToViewport, gTypeViewport,
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 66
- castToCellRenderer,
+ castToCellRenderer, gTypeCellRenderer,
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererCombo.chs 61
- castToCellRendererCombo,
+ castToCellRendererCombo, gTypeCellRendererCombo,
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererPixbuf.chs 56
- castToCellRendererPixbuf,
+ castToCellRendererPixbuf, gTypeCellRendererPixbuf,
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererProgress.chs 50
- castToCellRendererProgress,
+ castToCellRendererProgress, gTypeCellRendererProgress,
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererText.chs 51
- castToCellRendererText,
+ castToCellRendererText, gTypeCellRendererText,
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererToggle.chs 47
- castToCellRendererToggle,
+ castToCellRendererToggle, gTypeCellRendererToggle,
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 50
- castToCellView,
+ castToCellView, gTypeCellView,
hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 55
- castToIconView,
+ castToIconView, gTypeIconView,
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 102
- castToTreeModel,
+ castToTreeModel, gTypeTreeModel,
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 59
- castToTreeModelFilter,
+ castToTreeModelFilter, gTypeTreeModelFilter,
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeModelSort.chs 48
- castToTreeModelSort,
+ castToTreeModelSort, gTypeTreeModelSort,
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 64
- castToTreeSelection,
+ castToTreeSelection, gTypeTreeSelection,
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeSortable.chs 72
- castToTreeSortable,
+ castToTreeSortable, gTypeTreeSortable,
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 82
- castToTreeView,
+ castToTreeView, gTypeTreeView,
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 48
- castToTreeViewColumn,
+ castToTreeViewColumn, gTypeTreeViewColumn,
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs 71
- castToTextBuffer,
+ castToTextBuffer, gTypeTextBuffer,
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs 65
- castToTextMark,
+ castToTextMark, gTypeTextMark,
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 59
- castToTextTag,
+ castToTextTag, gTypeTextTag,
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 779
+
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTagTable.chs 44
- castToTextTagTable,
+ castToTextTagTable, gTypeTextTagTable,
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextView.chs 72
- castToTextView,
+ castToTextView, gTypeTextView,
hunk ./gtk/Graphics/UI/Gtk/Ornaments/Frame.chs 50
- castToFrame,
+ castToFrame, gTypeFrame,
hunk ./gtk/Graphics/UI/Gtk/Ornaments/HSeparator.chs 47
- castToHSeparator,
+ castToHSeparator, gTypeHSeparator,
hunk ./gtk/Graphics/UI/Gtk/Ornaments/VSeparator.chs 47
- castToVSeparator,
+ castToVSeparator, gTypeVSeparator,
hunk ./gtk/Graphics/UI/Gtk/Scrolling/HScrollbar.chs 52
- castToHScrollbar,
+ castToHScrollbar, gTypeHScrollbar,
hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs 79
- castToScrolledWindow,
+ castToScrolledWindow, gTypeScrolledWindow,
hunk ./gtk/Graphics/UI/Gtk/Scrolling/VScrollbar.chs 52
- castToVScrollbar,
+ castToVScrollbar, gTypeVScrollbar,
hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorButton.chs 53
- castToColorButton,
+ castToColorButton, gTypeColorButton,
hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelection.chs 50
- castToColorSelection,
+ castToColorSelection, gTypeColorSelection,
hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 50
- castToColorSelectionDialog,
+ castToColorSelectionDialog, gTypeColorSelectionDialog,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 130
- castToFileChooser,
+ castToFileChooser, gTypeFileChooser,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 58
- castToFileChooserButton,
+ castToFileChooserButton, gTypeFileChooserButton,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserDialog.chs 67
- castToFileChooserDialog,
+ castToFileChooserDialog, gTypeFileChooserDialog,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 57
- castToFileChooserWidget,
+ castToFileChooserWidget, gTypeFileChooserWidget,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileFilter.chs 59
- castToFileFilter,
+ castToFileFilter, gTypeFileFilter,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 75
- castToFileSelection,
+ castToFileSelection, gTypeFileSelection,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FontButton.chs 53
- castToFontButton,
+ castToFontButton, gTypeFontButton,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FontSelection.chs 57
- castToFontSelection,
+ castToFontSelection, gTypeFontSelection,
hunk ./gtk/Graphics/UI/Gtk/Selectors/FontSelectionDialog.chs 56
- castToFontSelectionDialog,
+ castToFontSelectionDialog, gTypeFontSelectionDialog,
hunk ./gtk/Graphics/UI/Gtk/TreeList/CellRenderer.hs 73
- castToCellRenderer,
+ castToCellRenderer, gTypeCellRenderer,
hunk ./gtk/Graphics/UI/Gtk/TreeList/CellRendererPixbuf.chs 56
- castToCellRendererPixbuf,
+ castToCellRendererPixbuf, gTypeCellRendererPixbuf,
hunk ./gtk/Graphics/UI/Gtk/TreeList/CellRendererText.chs 51
- castToCellRendererText,
+ castToCellRendererText, gTypeCellRendererText,
hunk ./gtk/Graphics/UI/Gtk/TreeList/CellRendererToggle.chs 49
- castToCellRendererToggle,
+ castToCellRendererToggle, gTypeCellRendererToggle,
hunk ./gtk/Graphics/UI/Gtk/TreeList/CellView.chs 53
- castToCellView,
+ castToCellView, gTypeCellView,
hunk ./gtk/Graphics/UI/Gtk/TreeList/IconView.chs 57
- castToIconView,
+ castToIconView, gTypeIconView,
hunk ./gtk/Graphics/UI/Gtk/TreeList/ListStore.chs 60
- castToListStore,
+ castToListStore, gTypeListStore,
hunk ./gtk/Graphics/UI/Gtk/TreeList/TreeModel.chs 98
- castToTreeModel,
+ castToTreeModel, gTypeTreeModel,
hunk ./gtk/Graphics/UI/Gtk/TreeList/TreeModelSort.chs 51
- castToTreeModelSort,
+ castToTreeModelSort, gTypeTreeModelSort,
hunk ./gtk/Graphics/UI/Gtk/TreeList/TreeSelection.chs 67
- castToTreeSelection,
+ castToTreeSelection, gTypeTreeSelection,
hunk ./gtk/Graphics/UI/Gtk/TreeList/TreeStore.chs 50
- castToTreeStore,
+ castToTreeStore, gTypeTreeStore,
hunk ./gtk/Graphics/UI/Gtk/TreeList/TreeView.chs 84
- castToTreeView,
+ castToTreeView, gTypeTreeView,
hunk ./gtk/Graphics/UI/Gtk/TreeList/TreeViewColumn.chs 71
- castToTreeViewColumn,
+ castToTreeViewColumn, gTypeTreeViewColumn,
hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 76
- castToAboutDialog,
+ castToAboutDialog, gTypeAboutDialog,
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 100
- castToDialog,
+ castToDialog, gTypeDialog,
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 420
+
hunk ./gtk/Graphics/UI/Gtk/Windows/MessageDialog.chs 58
- castToMessageDialog,
+ castToMessageDialog, gTypeMessageDialog,
hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 47
- castToWindow,
+ castToWindow, gTypeWindow,
hunk ./gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs 40
- castToWindowGroup,
+ castToWindowGroup, gTypeWindowGroup,
addfile ./gtk/Graphics/UI/GtkInternals.chs
hunk ./gtk/Graphics/UI/GtkInternals.chs 1
-
+{-# OPTIONS_HADDOCK hide #-}
+-- -*-haskell-*-
+-- Internal functions for the GIMP Toolkit (GTK) Binding for Haskell
+--
+-- Author : Axel Simon
+--
+-- Copyright (C) 2010 Axel Simon
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public
+-- License as published by the Free Software Foundation; either
+-- version 2.1 of the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- #hide
+
+-- |
+-- Maintainer : gtk...@li...
+-- Stability : provisional
+-- Portability : portable (depends on GHC)
+--
+-- This file contains functions that are needed by other library wrappers that build
+-- on Gtk2Hs. An application should not need this function nor include this file.
+--
+module Graphics.UI.GtkInternals (
+ module Graphics.UI.Gtk.Types,
+ module Graphics.UI.Gtk.General.DNDTypes
+ ) where
+
+{#import Graphics.UI.Gtk.Types#}
+{#import Graphics.UI.Gtk.General.DNDTypes#} (mkTargetList)
merger 0.0 (
hunk ./gtk/gtk.cabal 49
+ Graphics.UI.Gtk.Types
hunk ./gtk/gtk.cabal 49
+ Graphics.UI.GtkInternals
)
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:49
|
Wed Apr 21 20:12:40 EDT 2010 Duncan Coutts <du...@ha...>
* Move the pango C lib version stuff into the Setup.hs
Ignore-this: 795b62cbd00a5a29c6e2373174f0f757
Rather than using flags in the .cabal file.
Generate a .h file with the pango version number and
include that in the local hspango.h.
hunk ./pango/Setup.hs 45
+import Distribution.Package ( PackageId(..) )
hunk ./pango/Setup.hs 233
+ let [pangoVersion] = [ v | PackageIdentifier (PackageName "pango") v <- cPkgs ]
+ writePangoVersionHeaderFile verb lbi pangoVersion
+
hunk ./pango/Setup.hs 252
+------------------------------------------------------------------------------
+-- Generate CPP defines for version of C libs.
+------------------------------------------------------------------------------
+
+writePangoVersionHeaderFile :: Verbosity -> LocalBuildInfo -> Version -> IO ()
+writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = do
+ createDirectoryIfMissingVerbose verbosity True targetDir
+ rewriteFile targetFile $ unlines
+ [ "#define PANGO_VERSION_MAJOR " ++ show major
+ , "#define PANGO_VERSION_MINOR " ++ show minor
+ , "#define PANGO_VERSION_MICRO " ++ show micro
+ ]
+ where
+ targetDir = autogenModulesDir lbi
+ targetFile = targetDir </> "hspangoversion.h"
+
+writeVersionHeaderFile _ _ version =
+ die $ "unexpected pango version number: " ++ display version
+
hunk ./pango/hspango.h 12
-#error "This header file of Pango does not define the version of Pango. In this case it is necessary to define these macros in the cabal file."
+#include "hspangoversion.h"
hunk ./pango/pango.cabal 76
- if flag(pango_1_6)
- pkgconfig-depends: pango>=1.6.0
- else
- if flag(pango_1_4)
- pkgconfig-depends: pango>=1.4.0
- cpp-options: -DPANGO_VERSION_MAJOR=1
- -DPANGO_VERSION_MINOR=4
- -DPANGO_VERSION_MICRO=0
- else
- if flag(pango_1_2)
- pkgconfig-depends: pango>=1.2.0
- cpp-options: -DPANGO_VERSION_MAJOR=1
- -DPANGO_VERSION_MINOR=2
- -DPANGO_VERSION_MICRO=0
- else
- pkgconfig-depends: pango>=1.0.0
- cpp-options: -DPANGO_VERSION_MAJOR=1
- -DPANGO_VERSION_MINOR=0
- -DPANGO_VERSION_MICRO=0
+ pkgconfig-depends: pango >= 1.0
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:48
|
Wed Apr 21 20:07:51 EDT 2010 Duncan Coutts <du...@ha...>
* Hack in Setup.hs for include dirs, avoiding worse hack in .cabal files
Ignore-this: 1017665f67f060f7ad1a1dd663a9386d
Ought to be fixed in Cabal lib
hunk ./cairo/Setup.hs 46
+ updatePackageDescription,
hunk ./cairo/Setup.hs 48
- allBuildInfo,
+ emptyBuildInfo, allBuildInfo,
hunk ./cairo/Setup.hs 70
+import Distribution.Simple.BuildPaths ( autogenModulesDir )
hunk ./cairo/Setup.hs 90
- postConf = \args cf pd lbi -> [_$_]
- (postConf simpleUserHooks) args cf pd lbi >>
- genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi,
+ confHook = \pd cf ->
+ confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ postConf = \args cf pd lbi -> do
+ genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
+ postConf simpleUserHooks args cf pd lbi,
hunk ./cairo/Setup.hs 103
+-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
+adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
+adjustLocalBuildInfo lbi =
+ let extra = (Just libBi, [])
+ libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
+ , buildDir lbi ] }
+ in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
+
hunk ./glib/Setup.hs 46
+ updatePackageDescription,
hunk ./glib/Setup.hs 48
- allBuildInfo,
+ emptyBuildInfo, allBuildInfo,
hunk ./glib/Setup.hs 70
+import Distribution.Simple.BuildPaths ( autogenModulesDir )
hunk ./glib/Setup.hs 90
- postConf = \args cf pd lbi -> [_$_]
- (postConf simpleUserHooks) args cf pd lbi >>
- genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi,
+ confHook = \pd cf ->
+ confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ postConf = \args cf pd lbi -> do
+ genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
+ postConf simpleUserHooks args cf pd lbi,
hunk ./glib/Setup.hs 103
+-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
+adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
+adjustLocalBuildInfo lbi =
+ let extra = (Just libBi, [])
+ libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
+ , buildDir lbi ] }
+ in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
+
hunk ./gtk/Setup.hs 46
+ updatePackageDescription,
hunk ./gtk/Setup.hs 48
- allBuildInfo,
+ emptyBuildInfo, allBuildInfo,
hunk ./gtk/Setup.hs 70
+import Distribution.Simple.BuildPaths ( autogenModulesDir )
hunk ./gtk/Setup.hs 90
- postConf = \args cf pd lbi -> [_$_]
- (postConf simpleUserHooks) args cf pd lbi >>
- genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi,
+ confHook = \pd cf ->
+ confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ postConf = \args cf pd lbi -> do
+ genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
+ postConf simpleUserHooks args cf pd lbi,
hunk ./gtk/Setup.hs 103
+-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
+adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
+adjustLocalBuildInfo lbi =
+ let extra = (Just libBi, [])
+ libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
+ , buildDir lbi ] }
+ in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
+
hunk ./gtk/gtk.cabal 226
- -- this is a bit weird: we need to tell Cabal where it finds the .h files
- -- that are generated by GHC. We need to include CustomStore_stub.h.
- include-dirs: dist/build
hunk ./pango/Setup.hs 46
+ updatePackageDescription,
hunk ./pango/Setup.hs 48
- allBuildInfo,
+ emptyBuildInfo, allBuildInfo,
hunk ./pango/Setup.hs 70
+import Distribution.Simple.BuildPaths ( autogenModulesDir )
hunk ./pango/Setup.hs 90
- postConf = \args cf pd lbi -> [_$_]
- (postConf simpleUserHooks) args cf pd lbi >>
- genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi,
+ confHook = \pd cf ->
+ confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
+ postConf = \args cf pd lbi -> do
+ genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi
+ postConf simpleUserHooks args cf pd lbi,
hunk ./pango/Setup.hs 103
+-- This is a hack for Cabal-1.8, It is not needed in Cabal-1.9.1 or later
+adjustLocalBuildInfo :: LocalBuildInfo -> LocalBuildInfo
+adjustLocalBuildInfo lbi =
+ let extra = (Just libBi, [])
+ libBi = emptyBuildInfo { includeDirs = [ autogenModulesDir lbi
+ , buildDir lbi ] }
+ in lbi { localPkgDescr = updatePackageDescription extra (localPkgDescr lbi) }
+
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:47
|
Wed Apr 21 19:35:54 EDT 2010 Duncan Coutts <du...@ha...>
* Minor tweaks to Setup.hs scripts
Ignore-this: 5de7745bd7fc5d49d470f5a38ac8e5a9
hunk ./cairo/Setup.hs 202
- case lookupProgram prog (withPrograms lbi) of
- Just confProg -> do
- res <- rawSystemProgramStdout verb confProg args
- rewriteFile outFile res
- Nothing ->
- warn verb ("Cannot find Gtk2Hs utility program "++programName prog)
+ res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
+ rewriteFile outFile res
hunk ./cairo/Setup.hs 208
- notice verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
+ info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
hunk ./cairo/Setup.hs 210
+
hunk ./cairo/Setup.hs 216
- notice verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
+ info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
hunk ./glib/Setup.hs 202
- case lookupProgram prog (withPrograms lbi) of
- Just confProg -> do
- res <- rawSystemProgramStdout verb confProg args
- rewriteFile outFile res
- Nothing ->
- warn verb ("Cannot find Gtk2Hs utility program "++programName prog)
+ res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
+ rewriteFile outFile res
hunk ./glib/Setup.hs 208
- notice verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
+ info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
hunk ./glib/Setup.hs 210
+
hunk ./glib/Setup.hs 216
- notice verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
+ info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
hunk ./gtk/Setup.hs 202
- case lookupProgram prog (withPrograms lbi) of
- Just confProg -> do
- res <- rawSystemProgramStdout verb confProg args
- rewriteFile outFile res
- Nothing ->
- warn verb ("Cannot find Gtk2Hs utility program "++programName prog)
+ res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
+ rewriteFile outFile res
hunk ./gtk/Setup.hs 208
- notice verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
+ info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
hunk ./gtk/Setup.hs 210
+
hunk ./gtk/Setup.hs 216
- notice verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
+ info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
hunk ./pango/Setup.hs 202
- case lookupProgram prog (withPrograms lbi) of
- Just confProg -> do
- res <- rawSystemProgramStdout verb confProg args
- rewriteFile outFile res
- Nothing ->
- warn verb ("Cannot find Gtk2Hs utility program "++programName prog)
+ res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args
+ rewriteFile outFile res
hunk ./pango/Setup.hs 208
- notice verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
+ info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.")
hunk ./pango/Setup.hs 210
+
hunk ./pango/Setup.hs 216
- notice verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
+ info verb ("Ensuring that callback hooks in "++f++" are up-to-date.")
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:46
|
Wed Apr 21 19:30:16 EDT 2010 Duncan Coutts <du...@ha...>
* Add build-tools dependencies to .cabal files
Ignore-this: 2ca87ca412766d96c688de06e93a29dd
hunk ./cairo/cairo.cabal 38
- exposed: True
+ build-tools: gtk2hsC2hs
hunk ./glib/glib.cabal 36
+ build-tools: gtk2hsC2hs
hunk ./gtk/gtk.cabal 44
+
+ build-tools: gtk2hsC2hs, gtk2hsHookGenerator, gtk2hsTypeGen
+
hunk ./pango/pango.cabal 56
+ build-tools: gtk2hsC2hs, gtk2hsTypeGen
+
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:45
|
Wed Apr 21 17:16:16 EDT 2010 Duncan Coutts <du...@ha...>
* Change the way the type tags are handled in the .cabal and Setup.hs files
Ignore-this: bcbc507af8fb3a6103e505bc6361bd38
In particular it eliminates the need for users to specify -fgtk_x_y flags.
hunk ./cairo/Setup.hs 47
+ allBuildInfo,
hunk ./cairo/Setup.hs 60
- Program(..), ConfiguredProgram(..), rawSystemProgramConf, c2hsProgram,
+ Program(..), ConfiguredProgram(..),
+ rawSystemProgramConf, rawSystemProgramStdoutConf,
+ c2hsProgram, pkgConfigProgram,
hunk ./cairo/Setup.hs 69
-import Distribution.Text ( simpleParse )
+import Distribution.Text ( simpleParse, display )
hunk ./cairo/Setup.hs 77
+import Data.Char (isAlpha)
hunk ./cairo/Setup.hs 182
+
+ cPkgs <- getPkgConfigPackages verb lbi pd
+
hunk ./cairo/Setup.hs 192
+ ++ [ "--tag=" ++ tag
+ | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
+ , let name' = filter isAlpha (display name)
+ , tag <- name'
+ : [ name' ++ "-" ++ show major ++ "." ++ show digit
+ | digit <- [0,2..minor] ]
+ ]
+
hunk ./cairo/Setup.hs 208
+
hunk ./cairo/Setup.hs 223
+--FIXME: Cabal should tell us the selected pkg-config package versions in the
+-- LocalBuildInfo or equivalent.
+-- In the mean time, ask pkg-config again.
+
+getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
+getPkgConfigPackages verbosity lbi pkg =
+ sequence
+ [ do version <- pkgconfig ["--modversion", display pkgname]
+ case simpleParse version of
+ Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Just v -> return (PackageIdentifier pkgname v)
+ | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
+ where
+ pkgconfig = rawSystemProgramStdoutConf verbosity
+ pkgConfigProgram (withPrograms lbi)
+
hunk ./glib/Setup.hs 47
+ allBuildInfo,
hunk ./glib/Setup.hs 60
- Program(..), ConfiguredProgram(..), rawSystemProgramConf, c2hsProgram,
+ Program(..), ConfiguredProgram(..),
+ rawSystemProgramConf, rawSystemProgramStdoutConf,
+ c2hsProgram, pkgConfigProgram,
hunk ./glib/Setup.hs 69
-import Distribution.Text ( simpleParse )
+import Distribution.Text ( simpleParse, display )
hunk ./glib/Setup.hs 77
+import Data.Char (isAlpha)
hunk ./glib/Setup.hs 182
+
+ cPkgs <- getPkgConfigPackages verb lbi pd
+
hunk ./glib/Setup.hs 192
+ ++ [ "--tag=" ++ tag
+ | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
+ , let name' = filter isAlpha (display name)
+ , tag <- name'
+ : [ name' ++ "-" ++ show major ++ "." ++ show digit
+ | digit <- [0,2..minor] ]
+ ]
+
hunk ./glib/Setup.hs 208
+
hunk ./glib/Setup.hs 223
+--FIXME: Cabal should tell us the selected pkg-config package versions in the
+-- LocalBuildInfo or equivalent.
+-- In the mean time, ask pkg-config again.
+
+getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
+getPkgConfigPackages verbosity lbi pkg =
+ sequence
+ [ do version <- pkgconfig ["--modversion", display pkgname]
+ case simpleParse version of
+ Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Just v -> return (PackageIdentifier pkgname v)
+ | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
+ where
+ pkgconfig = rawSystemProgramStdoutConf verbosity
+ pkgConfigProgram (withPrograms lbi)
+
hunk ./gtk/Setup.hs 47
+ allBuildInfo,
hunk ./gtk/Setup.hs 60
- Program(..), ConfiguredProgram(..), rawSystemProgramConf, c2hsProgram,
+ Program(..), ConfiguredProgram(..),
+ rawSystemProgramConf, rawSystemProgramStdoutConf,
+ c2hsProgram, pkgConfigProgram,
hunk ./gtk/Setup.hs 69
-import Distribution.Text ( simpleParse )
+import Distribution.Text ( simpleParse, display )
hunk ./gtk/Setup.hs 77
+import Data.Char (isAlpha)
hunk ./gtk/Setup.hs 182
+
+ cPkgs <- getPkgConfigPackages verb lbi pd
+
hunk ./gtk/Setup.hs 192
+ ++ [ "--tag=" ++ tag
+ | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
+ , let name' = filter isAlpha (display name)
+ , tag <- name'
+ : [ name' ++ "-" ++ show major ++ "." ++ show digit
+ | digit <- [0,2..minor] ]
+ ]
+
hunk ./gtk/Setup.hs 208
+
hunk ./gtk/Setup.hs 223
+--FIXME: Cabal should tell us the selected pkg-config package versions in the
+-- LocalBuildInfo or equivalent.
+-- In the mean time, ask pkg-config again.
+
+getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
+getPkgConfigPackages verbosity lbi pkg =
+ sequence
+ [ do version <- pkgconfig ["--modversion", display pkgname]
+ case simpleParse version of
+ Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Just v -> return (PackageIdentifier pkgname v)
+ | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
+ where
+ pkgconfig = rawSystemProgramStdoutConf verbosity
+ pkgConfigProgram (withPrograms lbi)
+
hunk ./gtk/gtk.cabal 33
-Flag gtk_2_8
- Description: Build objects for Gtk+ version 2.8.
-
-Flag gtk_2_10
- Description: Build objects for Gtk+ version 2.10.
-
-Flag gtk_2_12
- Description: Build objects for Gtk+ version 2.12.
-
-Flag gtk_2_14
- Description: Build objects for Gtk+ version 2.14.
-
-Flag gtk_2_16
- Description: Build objects for Gtk+ version 2.16.
-
-Flag gtk_2_18
- Description: Build objects for Gtk+ version 2.18.
-
-Flag gtk_2_20
- Description: Build objects for Gtk+ version 2.20.
-
hunk ./gtk/gtk.cabal 236
- x-Types-Tag: default gtk-2.2 gtk-2.4 gtk-2.6 gtk-2.8
+
+ x-Types-Tag: default
hunk ./gtk/gtk.cabal 240
- pkgconfig-depends: glib-2.0, gthread-2.0, gobject-2.0
- if flag(gtk_2_20)
- x-Types-Tag: gtk-2.10 gtk-2.12 gtk-2.14 gtk-2.16 gtk-2.18 gtk-2.20
- pkgconfig-depends: gtk+-2.0 >= 2.20.0
- else
- if flag(gtk_2_18)
- x-Types-Tag: gtk-2.10 gtk-2.12 gtk-2.14 gtk-2.16 gtk-2.18
- pkgconfig-depends: gtk+-2.0 >= 2.18.0
- else
- if flag(gtk_2_16)
- x-Types-Tag: gtk-2.10 gtk-2.12 gtk-2.14 gtk-2.16
- pkgconfig-depends: gtk+-2.0 >= 2.16.0
- else
- if flag(gtk_2_14)
- x-Types-Tag: gtk-2.10 gtk-2.12 gtk-2.14
- pkgconfig-depends: gtk+-2.0 >= 2.14.0
- else
- if flag(gtk_2_12)
- x-Types-Tag: gtk-2.10 gtk-2.12
- pkgconfig-depends: gtk+-2.0 >= 2.12.0
- else
- if flag(gtk_2_10)
- x-Types-Tag: gtk-2.10
- pkgconfig-depends: gtk+-2.0 >= 2.10.0
- else
- pkgconfig-depends: gtk+-2.0 >= 2.8.0
+
+ pkgconfig-depends: gtk+-2.0
hunk ./pango/Setup.hs 47
+ allBuildInfo,
hunk ./pango/Setup.hs 60
- Program(..), ConfiguredProgram(..), rawSystemProgramConf, c2hsProgram,
+ Program(..), ConfiguredProgram(..),
+ rawSystemProgramConf, rawSystemProgramStdoutConf,
+ c2hsProgram, pkgConfigProgram,
hunk ./pango/Setup.hs 69
-import Distribution.Text ( simpleParse )
+import Distribution.Text ( simpleParse, display )
hunk ./pango/Setup.hs 77
+import Data.Char (isAlpha)
hunk ./pango/Setup.hs 182
+
+ cPkgs <- getPkgConfigPackages verb lbi pd
+
hunk ./pango/Setup.hs 192
+ ++ [ "--tag=" ++ tag
+ | PackageIdentifier name (Version (major:minor:_) _) <- cPkgs
+ , let name' = filter isAlpha (display name)
+ , tag <- name'
+ : [ name' ++ "-" ++ show major ++ "." ++ show digit
+ | digit <- [0,2..minor] ]
+ ]
+
hunk ./pango/Setup.hs 208
+
hunk ./pango/Setup.hs 223
+--FIXME: Cabal should tell us the selected pkg-config package versions in the
+-- LocalBuildInfo or equivalent.
+-- In the mean time, ask pkg-config again.
+
+getPkgConfigPackages :: Verbosity -> LocalBuildInfo -> PackageDescription -> IO [PackageId]
+getPkgConfigPackages verbosity lbi pkg =
+ sequence
+ [ do version <- pkgconfig ["--modversion", display pkgname]
+ case simpleParse version of
+ Nothing -> die $ "parsing output of pkg-config --modversion failed"
+ Just v -> return (PackageIdentifier pkgname v)
+ | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ]
+ where
+ pkgconfig = rawSystemProgramStdoutConf verbosity
+ pkgConfigProgram (withPrograms lbi)
+
hunk ./pango/pango.cabal 75
- x-Types-Tag: pango pango-1.2 pango-1.4
hunk ./pango/pango.cabal 78
- x-Types-Tag: pango pango-1.2 pango-1.4
hunk ./pango/pango.cabal 84
- x-Types-Tag: pango pango-1.2
hunk ./pango/pango.cabal 89
- x-Types-Tag: pango
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:42
|
Wed Apr 21 11:48:05 EDT 2010 Duncan Coutts <du...@ha...>
* Add upper bounds on deps within gtk2hs packages
Ignore-this: ddc073c270f471583edfcd7f5063dc83
This is only approximate, they may need to be tighter still.
hunk ./gtk/gtk.cabal 62
- glib >= 0.10.5, pango >= 0.10.5, cairo >= 0.10.5
+ glib >= 0.10.5 && < 0.11,
+ pango >= 0.10.5 && < 0.11,
+ cairo >= 0.10.5 && < 0.11
hunk ./pango/pango.cabal 47
- glib >= 0.10.5, cairo >= 0.10.5
+ glib >= 0.10.5 && < 0.11,
+ cairo >= 0.10.5 && < 0.11
|
|
From: Axel S. <si...@co...> - 2010-05-01 15:18:40
|
Wed Apr 21 11:47:42 EDT 2010 Duncan Coutts <du...@ha...>
* Add upper bound on base version in .cabal files
Ignore-this: 940b0938c956685b9996aa01b5a4e362
hunk ./cairo/cairo.cabal 36
- build-depends: base >= 4, bytestring, mtl, haskell98, array
+ build-depends: base >= 4 && < 5,
+ bytestring, mtl, haskell98, array
hunk ./glib/glib.cabal 34
- build-depends: base >= 4, containers, haskell98
+ build-depends: base >= 4 && < 5,
+ containers, haskell98
hunk ./gtk/gtk.cabal 60
- build-depends: base >= 4, array, containers, haskell98, mtl,
+ build-depends: base >= 4 && < 5,
+ array, containers, haskell98, mtl,
hunk ./pango/pango.cabal 45
+ build-depends: base >= 3 && < 5,
+ process, directory, array, containers, pretty, haskell98,
+ glib >= 0.10.5, cairo >= 0.10.5
+
hunk ./pango/pango.cabal 50
- build-depends: base >= 4, process, directory, array, containers,
- pretty, haskell98, glib >= 0.10.5, cairo >= 0.10.5
+ build-depends: base >= 4
hunk ./pango/pango.cabal 53
- build-depends: base < 4, process, directory, array, containers,
- pretty, haskell98, glib >= 0.10.5, cairo >= 0.10.5
+ build-depends: base < 4
+
hunk ./tools/gtk2hs-buildtools.cabal 54
- build-depends: base >= 4, process, directory, array, containers, pretty, haskell98
+ build-depends: base >= 4 && < 5,
+ process, directory, array, containers, pretty, haskell98
|