diff options
| author |   Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2008-09-25 14:37:44 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2008-09-25 14:37:44 +0530 |
| commit | b7b4aa73b2b2d766058effa60b80e27396a0037f (patch) | |
| tree | 155ec362df72b5477dab5e614009f44f2af40423 | |
| parent | Add x11-libs/gtk+-9999 (diff) | |
| download | gnome-live-b7b4aa73b2b2d766058effa60b80e27396a0037f.tar.gz gnome-live-b7b4aa73b2b2d766058effa60b80e27396a0037f.tar.bz2 gnome-live-b7b4aa73b2b2d766058effa60b80e27396a0037f.zip | |
Merge dev-libs/gtk+ changes from gnome overlay
Also, move gtk+-9999 to gtk+-2.9999 to satisfy the extra-lame
=dev-libs/gtk+-2* deps.
| -rw-r--r-- | x11-libs/gtk+/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.9999.ebuild (renamed from x11-libs/gtk+/gtk+-9999.ebuild) | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 0410679..673b530 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1 +1 @@ -EBUILD gtk+-9999.ebuild 4084 RMD160 e624e458fab5fb22bbf78e8c8c74cc3d2743085d SHA1 192d8c1159f781fb4308f74de5b7ea5a0c2d3336 SHA256 e84c1a10ffdf92fe42d7d610ac379f9e2422cbe8415f4c49e0a70a1e8bf644ae +EBUILD gtk+-2.9999.ebuild 4366 RMD160 e45a1304ce867c001b78acb34107015906e76842 SHA1 0673aac2b3415a8c50289ec106979b59e4094a92 SHA256 677c6fda06901c513cd1e198b108512f9fbda8fb35feb155b715cb668dc964b8 diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-2.9999.ebuild index 9027ff6..d9fac8c 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-2.9999.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.gtk.org/" LICENSE="LGPL-2" SLOT="2" KEYWORDS="~amd64 ~x86" -IUSE="X cups debug doc jpeg tiff vim-syntax xinerama jasper" +IUSE="X cups debug doc jpeg jpeg2k tiff vim-syntax xinerama jasper" RDEPEND=">=dev-libs/glib-2.17.6 >=x11-libs/pango-1.20 @@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.17.6 x11-libs/libXi x11-libs/libXt x11-libs/libXext - x11-libs/libXrandr + >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite @@ -34,7 +34,8 @@ RDEPEND=">=dev-libs/glib-2.17.6 ) !X? ( dev-libs/DirectFB ) cups? ( net-print/cups ) - jpeg? ( >=media-libs/jpeg-6b-r2 media-libs/jasper ) + jpeg? ( >=media-libs/jpeg-6b-r2 ) + jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !<gnome-base/gail-1000" DEPEND="${RDEPEND} @@ -52,6 +53,8 @@ DEPEND="${RDEPEND} )" PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" +PATCHES="${PN}-2.12.0-flash-workaround.patch" + pkg_setup() { if use X ; then if ! built_with_use x11-libs/cairo X; then @@ -64,6 +67,13 @@ pkg_setup() { die "cairo needs the directfb flag set" fi fi + + if has_multilib_profile ; then + # use an arch-specific config directory so that 32bit and 64bit versions + # dont clash on multilib systems + PATCHES="${PATCHES} + ${PN}-2.8.0-multilib.patch" + fi } set_gtk2_confdir() { @@ -73,7 +83,7 @@ set_gtk2_confdir() { } src_unpack() { - gnome2_src_unpack + gnome2-live_src_unpack # -O3 and company cause random crashes in applications. Bug #133469 replace-flags -O3 -O2 |