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

Collapse All | Expand All

(-)./wxwidgets.eclass (-23 / +40 lines)
Lines 24-53 Link Here
24
need-wxwidgets() {
24
need-wxwidgets() {
25
	debug-print-function $FUNCNAME $*
25
	debug-print-function $FUNCNAME $*
26
	#If you want to use wxGTK-2.6* export WX_GTK_VER in your ebuild:
26
	#If you want to use wxGTK-2.6* export WX_GTK_VER in your ebuild:
27
	if [ "${WX_GTK_VER}" = "2.6" ]; then
28
		case $1 in
29
			gtk)		set-wxconfig gtk-ansi;;
30
			gtk2)		set-wxconfig gtk2-ansi;;
31
			unicode)	set-wxconfig gtk2-unicode;;
32
			base)		set-wxconfig base-ansi;;
33
			base-unicode)	set-wxconfig base-unicode;;
34
			mac)		set-wxconfig mac-ansi;;
35
			mac-unicode)	set-wxconfig mac-unicode;;
36
			*)		echo "!!! $FUNCNAME: Error: wxGTK was not comipled with $1."
37
					echo "!!! Adjust your USE flags or re-emerge wxGTK with version you want."
38
			exit 1;;
39
		esac
40
27
28
	if [ "${WX_GTK_VER}" = "2.8" ]; then
29
                case $1 in
30
                        gtk)            wx-config gtk-ansi;;
31
                        gtk2)           wx-config gtk2-ansi;;
32
                        unicode)        wx-config gtk2-unicode;;
33
                        base)           wx-config base-ansi;;
34
                        base-unicode)   wx-config base-unicode;;
35
                        mac)            wx-config mac-ansi;;
36
                        mac-unicode)    wx-config mac-unicode;;
37
                        *)              echo "!!! $FUNCNAME: Error: wxGTK was not comipled with $1."
38
                                        echo "!!! Adjust your USE flags or re-emerge wxGTK with version you want."
39
                        exit 1;;
40
                esac
41
	
41
	else
42
	else
42
		WX_GTK_VER="2.4"
43
		if [ "${WX_GTK_VER}" = "2.6" ]; then
43
		case $1 in
44
			case $1 in
44
			gtk)		set-wxconfig wxgtk;;
45
				gtk)		set-wxconfig gtk-ansi;;
45
			gtk2)		set-wxconfig wxgtk2;;
46
				gtk2)		set-wxconfig gtk2-ansi;;
46
			unicode)	set-wxconfig wxgtk2u;;
47
				unicode)	set-wxconfig gtk2-unicode;;
47
			*)		echo "!!! $FUNCNAME: Error: wxGTK was not compiled with $1."
48
				base)		set-wxconfig base-ansi;;
48
					echo "!!! Adjust your USE flags or re-emerge wxGTK with the version you want."
49
				base-unicode)	set-wxconfig base-unicode;;
49
			exit 1;;
50
				mac)		set-wxconfig mac-ansi;;
50
		esac
51
				mac-unicode)	set-wxconfig mac-unicode;;
52
				*)		echo "!!! $FUNCNAME: Error: wxGTK was not comipled with $1."
53
						echo "!!! Adjust your USE flags or re-emerge wxGTK with version you want."
54
				exit 1;;
55
			esac
56
57
		else
58
			WX_GTK_VER="2.4"
59
			case $1 in
60
				gtk)		set-wxconfig wxgtk;;
61
				gtk2)		set-wxconfig wxgtk2;;
62
				unicode)	set-wxconfig wxgtk2u;;
63
				*)		echo "!!! $FUNCNAME: Error: wxGTK was not compiled with $1."
64
						echo "!!! Adjust your USE flags or re-emerge wxGTK with the version you want."
65
				exit 1;;
66
			esac
67
		fi
51
	fi
68
	fi
52
}
69
}
53
70
Lines 56-62 Link Here
56
73
57
	debug-print-function $FUNCNAME $*
74
	debug-print-function $FUNCNAME $*
58
75
59
	if [ "${WX_GTK_VER}" = "2.6" ] ; then
76
	if [ "${WX_GTK_VER}" = "2.6" || "${WX_GTK_VER}" = "2.8" ] ; then
60
		wxconfig_prefix="/usr/$(get_libdir)/wx/config"
77
		wxconfig_prefix="/usr/$(get_libdir)/wx/config"
61
		wxconfig_name="${1}-release-${WX_GTK_VER}"
78
		wxconfig_name="${1}-release-${WX_GTK_VER}"
62
		wxconfig="${wxconfig_prefix}/${wxconfig_name}"
79
		wxconfig="${wxconfig_prefix}/${wxconfig_name}"

Return to bug 178176