Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 488998 | Differences between
and this patch

Collapse All | Expand All

(-)gdk-pixbuf-2.28.2.ebuild.orig (-11 / +37 lines)
Lines 4-10 Link Here
4
4
5
EAPI="5"
5
EAPI="5"
6
6
7
inherit gnome.org gnome2-utils multilib libtool
7
inherit gnome.org gnome2-utils multilib libtool multilib-minimal
8
8
9
DESCRIPTION="Image loading library for GTK+"
9
DESCRIPTION="Image loading library for GTK+"
10
HOMEPAGE="http://www.gtk.org/"
10
HOMEPAGE="http://www.gtk.org/"
Lines 15-27 Link Here
15
IUSE="+X debug +introspection jpeg jpeg2k tiff test"
15
IUSE="+X debug +introspection jpeg jpeg2k tiff test"
16
16
17
COMMON_DEPEND="
17
COMMON_DEPEND="
18
	>=dev-libs/glib-2.34.0:2
18
	>=dev-libs/glib-2.34.0:2[${MULTILIB_USEDEP}]
19
	>=media-libs/libpng-1.4:0=
19
	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
20
	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
20
	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
21
	jpeg? ( virtual/jpeg:0= )
21
	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
22
	jpeg2k? ( media-libs/jasper:= )
22
	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
23
	tiff? ( >=media-libs/tiff-3.9.2:0= )
23
	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
24
	X? ( x11-libs/libX11 )
24
	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
25
"
25
"
26
DEPEND="${COMMON_DEPEND}
26
DEPEND="${COMMON_DEPEND}
27
	>=dev-util/gtk-doc-am-1.11
27
	>=dev-util/gtk-doc-am-1.11
Lines 36-41 Link Here
36
	!<x11-libs/gtk+-2.90.4:3
36
	!<x11-libs/gtk+-2.90.4:3
37
"
37
"
38
38
39
MULTILIB_CHOST_TOOLS=(
40
	/usr/bin/gdk-pixbuf-query-loaders
41
)
42
39
src_prepare() {
43
src_prepare() {
40
	# This will avoid polluting the pkg-config file with versioned libpng,
44
	# This will avoid polluting the pkg-config file with versioned libpng,
41
	# which is causing problems with libpng14 -> libpng15 upgrade
45
	# which is causing problems with libpng14 -> libpng15 upgrade
Lines 48-67 Link Here
48
	elibtoolize # for Darwin modules, bug #????
52
	elibtoolize # for Darwin modules, bug #????
49
}
53
}
50
54
51
src_configure() {
55
multilib_src_configure() {
56
	local program_prefix=""
57
	if multilib_build_binaries && ! multilib_is_native_abi; then
58
		program_prefix="--program-prefix=${CHOST}-"
59
	fi
52
	# png always on to display icons
60
	# png always on to display icons
61
	ECONF_SOURCE="${S}" \
53
	econf \
62
	econf \
63
		${program_prefix} \
54
		$(usex debug --enable-debug=yes "") \
64
		$(usex debug --enable-debug=yes "") \
55
		$(use_with jpeg libjpeg) \
65
		$(use_with jpeg libjpeg) \
56
		$(use_with jpeg2k libjasper) \
66
		$(use_with jpeg2k libjasper) \
57
		$(use_with tiff libtiff) \
67
		$(use_with tiff libtiff) \
58
		$(use_enable introspection) \
68
		$(multilib_is_native_abi \
69
			&& use_enable introspection \
70
			|| echo --disable-introspection) \
59
		$(use_with X x11) \
71
		$(use_with X x11) \
60
		--with-libpng
72
		--with-libpng
61
}
73
}
62
74
63
src_install() {
75
multilib_src_install_all() {
64
	default
65
	prune_libtool_files --modules
76
	prune_libtool_files --modules
66
}
77
}
67
78
Lines 75-80 Link Here
75
86
76
	gnome2_gdk_pixbuf_update
87
	gnome2_gdk_pixbuf_update
77
88
89
	if has x86 $(multilib_get_enabled_abis) && has amd64 $(multilib_get_enabled_abis); then
90
		local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
91
		if [ -z "${tmp_file}" ]; then
92
			ewarn "Cannot create temporary file"
93
			return 1
94
		fi
95
96
		if i686-pc-linux-gnu-gdk-pixbuf-query-loaders > "${tmp_file}"; then
97
			cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
98
		else
99
			ewarn "Warning, i686-pc-linux-gnu-gdk-pixbuf-query-loaders failed."
100
		fi
101
		rm "${tmp_file}"
102
	fi
103
78
	# Migration snippet for when this was handled by gtk+
104
	# Migration snippet for when this was handled by gtk+
79
	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
105
	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
80
		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
106
		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders

Return to bug 488998