| 1 |
pacho 15/02/26 20:15:19 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog |
| 4 |
Added: gtk+-3.14.9.ebuild |
| 5 |
Log: |
| 6 |
Version bump, add broadway support (#452376 by Olaf Leidinger) |
| 7 |
|
| 8 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.13 x11-libs/gtk+/metadata.xml |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/metadata.xml?rev=1.13&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/metadata.xml?rev=1.13&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/metadata.xml?r1=1.12&r2=1.13 |
| 16 |
|
| 17 |
Index: metadata.xml |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/metadata.xml,v |
| 20 |
retrieving revision 1.12 |
| 21 |
retrieving revision 1.13 |
| 22 |
diff -u -r1.12 -r1.13 |
| 23 |
--- metadata.xml 5 Jan 2015 14:16:28 -0000 1.12 |
| 24 |
+++ metadata.xml 26 Feb 2015 20:15:19 -0000 1.13 |
| 25 |
@@ -9,6 +9,7 @@ |
| 26 |
application suites. |
| 27 |
</longdescription> |
| 28 |
<use> |
| 29 |
+ <flag name="broadway">Enable the GDK Broadway backend.</flag> |
| 30 |
<flag name="cloudprint">Enable printing via Google Cloud Print.</flag> |
| 31 |
<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management |
| 32 |
in printing</flag> |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.764 x11-libs/gtk+/ChangeLog |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.764&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.764&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.763&r2=1.764 |
| 41 |
|
| 42 |
Index: ChangeLog |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v |
| 45 |
retrieving revision 1.763 |
| 46 |
retrieving revision 1.764 |
| 47 |
diff -u -r1.763 -r1.764 |
| 48 |
--- ChangeLog 22 Feb 2015 00:22:31 -0000 1.763 |
| 49 |
+++ ChangeLog 26 Feb 2015 20:15:19 -0000 1.764 |
| 50 |
@@ -1,6 +1,11 @@ |
| 51 |
# ChangeLog for x11-libs/gtk+ |
| 52 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.763 2015/02/22 00:22:31 remi Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.764 2015/02/26 20:15:19 pacho Exp $ |
| 55 |
+ |
| 56 |
+*gtk+-3.14.9 (26 Feb 2015) |
| 57 |
+ |
| 58 |
+ 26 Feb 2015; Pacho Ramos <pacho@g.o> +gtk+-3.14.9.ebuild, metadata.xml: |
| 59 |
+ Version bump, add broadway support (#452376 by Olaf Leidinger) |
| 60 |
|
| 61 |
22 Feb 2015; Rémi Cardona <remi@g.o> |
| 62 |
files/gtk+-non-bash-support.patch: |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.1 x11-libs/gtk+/gtk+-3.14.9.ebuild |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.14.9.ebuild?rev=1.1&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.14.9.ebuild?rev=1.1&content-type=text/plain |
| 70 |
|
| 71 |
Index: gtk+-3.14.9.ebuild |
| 72 |
=================================================================== |
| 73 |
# Copyright 1999-2015 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.9.ebuild,v 1.1 2015/02/26 20:15:19 pacho Exp $ |
| 76 |
|
| 77 |
EAPI="5" |
| 78 |
GCONF_DEBUG="yes" |
| 79 |
GNOME2_LA_PUNT="yes" |
| 80 |
|
| 81 |
inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal |
| 82 |
|
| 83 |
DESCRIPTION="Gimp ToolKit +" |
| 84 |
HOMEPAGE="http://www.gtk.org/" |
| 85 |
|
| 86 |
LICENSE="LGPL-2+" |
| 87 |
SLOT="3" |
| 88 |
IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" |
| 89 |
REQUIRED_USE=" |
| 90 |
|| ( aqua wayland X ) |
| 91 |
xinerama? ( X ) |
| 92 |
" |
| 93 |
|
| 94 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 95 |
|
| 96 |
# FIXME: introspection data is built against system installation of gtk+:3 |
| 97 |
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
| 98 |
# Use gtk+:2 for gtk-update-icon-cache |
| 99 |
COMMON_DEPEND=" |
| 100 |
>=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}] |
| 101 |
>=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}] |
| 102 |
media-libs/fontconfig[${MULTILIB_USEDEP}] |
| 103 |
>=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
| 104 |
>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] |
| 105 |
>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}] |
| 106 |
>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}] |
| 107 |
x11-misc/shared-mime-info |
| 108 |
|
| 109 |
cloudprint? ( |
| 110 |
>=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
| 111 |
>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
| 112 |
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
| 113 |
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
| 114 |
introspection? ( >=dev-libs/gobject-introspection-1.39 ) |
| 115 |
wayland? ( |
| 116 |
>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}] |
| 117 |
media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
| 118 |
>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
| 119 |
) |
| 120 |
X? ( |
| 121 |
>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
| 122 |
x11-libs/libXrender[${MULTILIB_USEDEP}] |
| 123 |
x11-libs/libX11[${MULTILIB_USEDEP}] |
| 124 |
>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
| 125 |
x11-libs/libXext[${MULTILIB_USEDEP}] |
| 126 |
>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}] |
| 127 |
x11-libs/libXcursor[${MULTILIB_USEDEP}] |
| 128 |
x11-libs/libXfixes[${MULTILIB_USEDEP}] |
| 129 |
x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
| 130 |
x11-libs/libXdamage[${MULTILIB_USEDEP}] |
| 131 |
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 132 |
) |
| 133 |
" |
| 134 |
DEPEND="${COMMON_DEPEND} |
| 135 |
app-text/docbook-xsl-stylesheets |
| 136 |
app-text/docbook-xml-dtd:4.1.2 |
| 137 |
dev-libs/libxslt |
| 138 |
dev-libs/gobject-introspection-common |
| 139 |
>=dev-util/gdbus-codegen-2.38.2 |
| 140 |
>=dev-util/gtk-doc-am-1.20 |
| 141 |
sys-devel/gettext |
| 142 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 143 |
X? ( |
| 144 |
x11-proto/xextproto[${MULTILIB_USEDEP}] |
| 145 |
x11-proto/xproto[${MULTILIB_USEDEP}] |
| 146 |
x11-proto/inputproto[${MULTILIB_USEDEP}] |
| 147 |
x11-proto/damageproto[${MULTILIB_USEDEP}] |
| 148 |
xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) |
| 149 |
) |
| 150 |
test? ( |
| 151 |
media-fonts/font-misc-misc |
| 152 |
media-fonts/font-cursor-misc ) |
| 153 |
" |
| 154 |
# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
| 155 |
# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
| 156 |
# >=xorg-server-1.11.4 needed for |
| 157 |
# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html |
| 158 |
RDEPEND="${COMMON_DEPEND} |
| 159 |
!<gnome-base/gail-1000 |
| 160 |
!<x11-libs/vte-0.31.0:2.90 |
| 161 |
>=x11-themes/adwaita-icon-theme-3.14 |
| 162 |
X? ( !<x11-base/xorg-server-1.11.4 ) |
| 163 |
abi_x86_32? ( |
| 164 |
!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 |
| 165 |
!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] |
| 166 |
) |
| 167 |
" |
| 168 |
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |
| 169 |
|
| 170 |
MULTILIB_CHOST_TOOLS=( |
| 171 |
/usr/bin/gtk-query-immodules-3.0 |
| 172 |
) |
| 173 |
|
| 174 |
strip_builddir() { |
| 175 |
local rule=$1 |
| 176 |
shift |
| 177 |
local directory=$1 |
| 178 |
shift |
| 179 |
sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
| 180 |
|| die "Could not strip director ${directory} from build." |
| 181 |
} |
| 182 |
|
| 183 |
src_prepare() { |
| 184 |
# https://bugzilla.gnome.org/show_bug.cgi?id=738835 |
| 185 |
epatch "${FILESDIR}"/${PN}-non-bash-support.patch |
| 186 |
|
| 187 |
# -O3 and company cause random crashes in applications. Bug #133469 |
| 188 |
replace-flags -O3 -O2 |
| 189 |
strip-flags |
| 190 |
|
| 191 |
if ! use test ; then |
| 192 |
# don't waste time building tests |
| 193 |
strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
| 194 |
strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
| 195 |
fi |
| 196 |
|
| 197 |
if ! use examples; then |
| 198 |
# don't waste time building demos |
| 199 |
strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
| 200 |
strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
| 201 |
fi |
| 202 |
|
| 203 |
epatch_user |
| 204 |
|
| 205 |
eautoreconf |
| 206 |
gnome2_src_prepare |
| 207 |
} |
| 208 |
|
| 209 |
multilib_src_configure() { |
| 210 |
# need libdir here to avoid a double slash in a path that libtool doesn't |
| 211 |
# grok so well during install (// between $EPREFIX and usr ...) |
| 212 |
ECONF_SOURCE=${S} \ |
| 213 |
gnome2_src_configure \ |
| 214 |
$(use_enable aqua quartz-backend) \ |
| 215 |
$(use_enable broadway broadway-backend) \ |
| 216 |
$(use_enable cloudprint) \ |
| 217 |
$(use_enable colord) \ |
| 218 |
$(use_enable cups cups auto) \ |
| 219 |
$(multilib_native_use_enable introspection) \ |
| 220 |
$(use_enable wayland wayland-backend) \ |
| 221 |
$(use_enable X x11-backend) \ |
| 222 |
$(use_enable X xcomposite) \ |
| 223 |
$(use_enable X xdamage) \ |
| 224 |
$(use_enable X xfixes) \ |
| 225 |
$(use_enable X xkb) \ |
| 226 |
$(use_enable X xrandr) \ |
| 227 |
$(use_enable xinerama) \ |
| 228 |
--disable-papi \ |
| 229 |
--enable-man \ |
| 230 |
--enable-gtk2-dependency \ |
| 231 |
--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
| 232 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
| 233 |
CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
| 234 |
|
| 235 |
# work-around gtk-doc out-of-source brokedness |
| 236 |
if multilib_is_native_abi; then |
| 237 |
local d |
| 238 |
for d in gdk gtk libgail-util; do |
| 239 |
ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
| 240 |
done |
| 241 |
fi |
| 242 |
} |
| 243 |
|
| 244 |
multilib_src_test() { |
| 245 |
# FIXME: this should be handled at eclass level |
| 246 |
"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
| 247 |
|
| 248 |
unset DBUS_SESSION_BUS_ADDRESS |
| 249 |
unset DISPLAY #527682 |
| 250 |
GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check |
| 251 |
} |
| 252 |
|
| 253 |
multilib_src_install() { |
| 254 |
gnome2_src_install |
| 255 |
|
| 256 |
# add -framework Carbon to the .pc files, bug #???? |
| 257 |
if use aqua ; then |
| 258 |
for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do |
| 259 |
sed -e "s:Libs\: :Libs\: -framework Carbon :" \ |
| 260 |
-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed" |
| 261 |
done |
| 262 |
fi |
| 263 |
} |
| 264 |
|
| 265 |
multilib_src_install_all() { |
| 266 |
insinto /etc/gtk-3.0 |
| 267 |
doins "${FILESDIR}"/settings.ini |
| 268 |
|
| 269 |
dodoc AUTHORS ChangeLog* HACKING NEWS* README* |
| 270 |
} |
| 271 |
|
| 272 |
pkg_preinst() { |
| 273 |
gnome2_pkg_preinst |
| 274 |
|
| 275 |
multilib_pkg_preinst() { |
| 276 |
# Make immodules.cache belongs to gtk+ alone |
| 277 |
local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
| 278 |
|
| 279 |
if [[ -e ${EROOT}${cache} ]]; then |
| 280 |
cp "${EROOT}"${cache} "${ED}"/${cache} || die |
| 281 |
else |
| 282 |
touch "${ED}"/${cache} || die |
| 283 |
fi |
| 284 |
} |
| 285 |
multilib_parallel_foreach_abi multilib_pkg_preinst |
| 286 |
} |
| 287 |
|
| 288 |
pkg_postinst() { |
| 289 |
gnome2_pkg_postinst |
| 290 |
|
| 291 |
multilib_pkg_postinst() { |
| 292 |
gnome2_query_immodules_gtk3 \ |
| 293 |
|| die "Update immodules cache failed (for ${ABI})" |
| 294 |
} |
| 295 |
multilib_parallel_foreach_abi multilib_pkg_postinst |
| 296 |
|
| 297 |
if ! has_version "app-text/evince"; then |
| 298 |
elog "Please install app-text/evince for print preview functionality." |
| 299 |
elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
| 300 |
elog "add it to your settings.ini file." |
| 301 |
fi |
| 302 |
} |
| 303 |
|
| 304 |
pkg_postrm() { |
| 305 |
gnome2_pkg_postrm |
| 306 |
|
| 307 |
if [[ -z ${REPLACED_BY_VERSIONS} ]]; then |
| 308 |
multilib_pkg_postrm() { |
| 309 |
rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
| 310 |
} |
| 311 |
multilib_foreach_abi multilib_pkg_postrm |
| 312 |
fi |
| 313 |
} |
Archives