| 1 |
commit: 65e2cf4a1700d7291b8a90eeebaf513ac9f127dc |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 20 13:08:24 2017 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 20 13:08:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e2cf4a |
| 7 |
|
| 8 |
x11-libs/gtk+: bump to 3.22.17 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
x11-libs/gtk+/Manifest | 1 + |
| 13 |
x11-libs/gtk+/gtk+-3.22.17.ebuild | 226 ++++++++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 227 insertions(+) |
| 15 |
|
| 16 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
| 17 |
index 6aa3aa59220..3dc44f717b0 100644 |
| 18 |
--- a/x11-libs/gtk+/Manifest |
| 19 |
+++ b/x11-libs/gtk+/Manifest |
| 20 |
@@ -1,3 +1,4 @@ |
| 21 |
DIST gtk+-2.24.31.tar.xz 12805344 SHA256 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 WHIRLPOOL 6f59d444b28910b0f4cd7d0d0bf04f8e442acd945205679c19e5adf7ca3f8e7406d4095e9ff9ca597882eb937a7551e19af63b6597e7b57c0babe5b061f9110e |
| 22 |
DIST gtk+-3.22.15.tar.xz 18662944 SHA256 c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb SHA512 c99c4a52bc447a21be20546bdc7808081abde076af9603424c1de20af031ac3f9bd121709d4c18705db8ba2f66ace0aae9b32741347788a8d81afa358d67e758 WHIRLPOOL f0eae97db9ef7e1a3ecedc0d98fb35c4a671774f473c1b6f5a17424e2f6ca3d25e98efd74312bb481addfacbc44b6d2d6a549658d202ed6a7215743678de1d00 |
| 23 |
DIST gtk+-3.22.16.tar.xz 18655144 SHA256 3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612 WHIRLPOOL 364cec780093ba60832a85769b4b6994adce43efbb408bc291fc059a6c804c50da169af4f0bbe152ed3072d02b02417bf0d700f52b50d9e41bea9bdf67784f71 |
| 24 |
+DIST gtk+-3.22.17.tar.xz 18702864 SHA256 a6c1fb8f229c626a3d9c0e1ce6ea138de7f64a5a6bc799d45fa286fe461c3437 SHA512 9503baa73f6e199a1fe807bec739df2bb8bc2e586e9c316184d37e874191eb5938c962d1eb83e58841579b16cde8b85d80e058a3577c0033de12fc3fce066dfa WHIRLPOOL 5e444e705d8888ede2ae8e9fcfd5ee6e7f205cd127285816a612217c5446ce27d52fa6733248d9119a66c54849aace81f620d98a593ce683771f0017ce42be56 |
| 25 |
|
| 26 |
diff --git a/x11-libs/gtk+/gtk+-3.22.17.ebuild b/x11-libs/gtk+/gtk+-3.22.17.ebuild |
| 27 |
new file mode 100644 |
| 28 |
index 00000000000..3d73ad57215 |
| 29 |
--- /dev/null |
| 30 |
+++ b/x11-libs/gtk+/gtk+-3.22.17.ebuild |
| 31 |
@@ -0,0 +1,226 @@ |
| 32 |
+# Copyright 1999-2017 Gentoo Foundation |
| 33 |
+# Distributed under the terms of the GNU General Public License v2 |
| 34 |
+ |
| 35 |
+EAPI=6 |
| 36 |
+GNOME2_LA_PUNT="yes" |
| 37 |
+ |
| 38 |
+inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal |
| 39 |
+ |
| 40 |
+DESCRIPTION="Gimp ToolKit +" |
| 41 |
+HOMEPAGE="http://www.gtk.org/" |
| 42 |
+ |
| 43 |
+LICENSE="LGPL-2+" |
| 44 |
+SLOT="3" |
| 45 |
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama" |
| 46 |
+REQUIRED_USE=" |
| 47 |
+ || ( aqua wayland X ) |
| 48 |
+ xinerama? ( X ) |
| 49 |
+" |
| 50 |
+ |
| 51 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 52 |
+ |
| 53 |
+# Upstream wants us to do their job: |
| 54 |
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 |
| 55 |
+RESTRICT="test" |
| 56 |
+ |
| 57 |
+# FIXME: introspection data is built against system installation of gtk+:3, |
| 58 |
+# bug #???? |
| 59 |
+COMMON_DEPEND=" |
| 60 |
+ >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
| 61 |
+ >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] |
| 62 |
+ media-libs/fontconfig[${MULTILIB_USEDEP}] |
| 63 |
+ >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] |
| 64 |
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
| 65 |
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] |
| 66 |
+ >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
| 67 |
+ x11-misc/shared-mime-info |
| 68 |
+ |
| 69 |
+ cloudprint? ( |
| 70 |
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
| 71 |
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
| 72 |
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
| 73 |
+ cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
| 74 |
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
| 75 |
+ wayland? ( |
| 76 |
+ >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
| 77 |
+ >=dev-libs/wayland-protocols-1.7 |
| 78 |
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
| 79 |
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
| 80 |
+ ) |
| 81 |
+ X? ( |
| 82 |
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
| 83 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
| 84 |
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
| 85 |
+ x11-libs/libXext[${MULTILIB_USEDEP}] |
| 86 |
+ >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
| 87 |
+ x11-libs/libXcursor[${MULTILIB_USEDEP}] |
| 88 |
+ x11-libs/libXfixes[${MULTILIB_USEDEP}] |
| 89 |
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
| 90 |
+ x11-libs/libXdamage[${MULTILIB_USEDEP}] |
| 91 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 92 |
+ ) |
| 93 |
+" |
| 94 |
+DEPEND="${COMMON_DEPEND} |
| 95 |
+ app-text/docbook-xsl-stylesheets |
| 96 |
+ app-text/docbook-xml-dtd:4.1.2 |
| 97 |
+ dev-libs/libxslt |
| 98 |
+ dev-libs/gobject-introspection-common |
| 99 |
+ >=dev-util/gdbus-codegen-2.48 |
| 100 |
+ >=dev-util/gtk-doc-am-1.20 |
| 101 |
+ >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] |
| 102 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 103 |
+ X? ( |
| 104 |
+ x11-proto/xextproto[${MULTILIB_USEDEP}] |
| 105 |
+ x11-proto/xproto[${MULTILIB_USEDEP}] |
| 106 |
+ x11-proto/inputproto[${MULTILIB_USEDEP}] |
| 107 |
+ x11-proto/damageproto[${MULTILIB_USEDEP}] |
| 108 |
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) |
| 109 |
+ ) |
| 110 |
+ test? ( |
| 111 |
+ media-fonts/font-misc-misc |
| 112 |
+ media-fonts/font-cursor-misc ) |
| 113 |
+" |
| 114 |
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
| 115 |
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
| 116 |
+RDEPEND="${COMMON_DEPEND} |
| 117 |
+ >=dev-util/gtk-update-icon-cache-3 |
| 118 |
+ !<gnome-base/gail-1000 |
| 119 |
+ !<x11-libs/vte-0.31.0:2.90 |
| 120 |
+ >=x11-themes/adwaita-icon-theme-3.14 |
| 121 |
+" |
| 122 |
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
| 123 |
+PDEPEND=" |
| 124 |
+ gnome-base/librsvg[${MULTILIB_USEDEP}] |
| 125 |
+ vim-syntax? ( app-vim/gtk-syntax ) |
| 126 |
+" |
| 127 |
+ |
| 128 |
+MULTILIB_CHOST_TOOLS=( |
| 129 |
+ /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
| 130 |
+) |
| 131 |
+ |
| 132 |
+strip_builddir() { |
| 133 |
+ local rule=$1 |
| 134 |
+ shift |
| 135 |
+ local directory=$1 |
| 136 |
+ shift |
| 137 |
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
| 138 |
+ || die "Could not strip director ${directory} from build." |
| 139 |
+} |
| 140 |
+ |
| 141 |
+src_prepare() { |
| 142 |
+ if ! use test ; then |
| 143 |
+ # don't waste time building tests |
| 144 |
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
| 145 |
+ |
| 146 |
+ # the tests dir needs to be build now because since commit |
| 147 |
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
| 148 |
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
| 149 |
+ fi |
| 150 |
+ |
| 151 |
+ if ! use examples; then |
| 152 |
+ # don't waste time building demos |
| 153 |
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
| 154 |
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
| 155 |
+ fi |
| 156 |
+ |
| 157 |
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
| 158 |
+ eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch |
| 159 |
+ |
| 160 |
+ eautoreconf |
| 161 |
+ gnome2_src_prepare |
| 162 |
+} |
| 163 |
+ |
| 164 |
+multilib_src_configure() { |
| 165 |
+ # need libdir here to avoid a double slash in a path that libtool doesn't |
| 166 |
+ # grok so well during install (// between $EPREFIX and usr ...) |
| 167 |
+ ECONF_SOURCE=${S} \ |
| 168 |
+ gnome2_src_configure \ |
| 169 |
+ $(use_enable aqua quartz-backend) \ |
| 170 |
+ $(use_enable broadway broadway-backend) \ |
| 171 |
+ $(use_enable cloudprint) \ |
| 172 |
+ $(use_enable colord) \ |
| 173 |
+ $(use_enable cups cups auto) \ |
| 174 |
+ $(multilib_native_use_enable introspection) \ |
| 175 |
+ $(use_enable wayland wayland-backend) \ |
| 176 |
+ $(use_enable X x11-backend) \ |
| 177 |
+ $(use_enable X xcomposite) \ |
| 178 |
+ $(use_enable X xdamage) \ |
| 179 |
+ $(use_enable X xfixes) \ |
| 180 |
+ $(use_enable X xkb) \ |
| 181 |
+ $(use_enable X xrandr) \ |
| 182 |
+ $(use_enable xinerama) \ |
| 183 |
+ --disable-papi \ |
| 184 |
+ --disable-mir-backend \ |
| 185 |
+ --enable-man \ |
| 186 |
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
| 187 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
| 188 |
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
| 189 |
+ |
| 190 |
+ # work-around gtk-doc out-of-source brokedness |
| 191 |
+ if multilib_is_native_abi; then |
| 192 |
+ local d |
| 193 |
+ for d in gdk gtk libgail-util; do |
| 194 |
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
| 195 |
+ done |
| 196 |
+ fi |
| 197 |
+} |
| 198 |
+ |
| 199 |
+multilib_src_test() { |
| 200 |
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
| 201 |
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
| 202 |
+} |
| 203 |
+ |
| 204 |
+multilib_src_install() { |
| 205 |
+ gnome2_src_install |
| 206 |
+} |
| 207 |
+ |
| 208 |
+multilib_src_install_all() { |
| 209 |
+ insinto /etc/gtk-3.0 |
| 210 |
+ doins "${FILESDIR}"/settings.ini |
| 211 |
+ # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default |
| 212 |
+ DOCS=( AUTHORS NEWS README ) |
| 213 |
+ einstalldocs |
| 214 |
+} |
| 215 |
+ |
| 216 |
+pkg_preinst() { |
| 217 |
+ gnome2_pkg_preinst |
| 218 |
+ |
| 219 |
+ multilib_pkg_preinst() { |
| 220 |
+ # Make immodules.cache belongs to gtk+ alone |
| 221 |
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
| 222 |
+ |
| 223 |
+ if [[ -e ${EROOT}${cache} ]]; then |
| 224 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
| 225 |
+ else |
| 226 |
+ touch "${ED}"/${cache} || die |
| 227 |
+ fi |
| 228 |
+ } |
| 229 |
+ multilib_parallel_foreach_abi multilib_pkg_preinst |
| 230 |
+} |
| 231 |
+ |
| 232 |
+pkg_postinst() { |
| 233 |
+ gnome2_pkg_postinst |
| 234 |
+ |
| 235 |
+ multilib_pkg_postinst() { |
| 236 |
+ gnome2_query_immodules_gtk3 \ |
| 237 |
+ || die "Update immodules cache failed (for ${ABI})" |
| 238 |
+ } |
| 239 |
+ multilib_parallel_foreach_abi multilib_pkg_postinst |
| 240 |
+ |
| 241 |
+ if ! has_version "app-text/evince"; then |
| 242 |
+ elog "Please install app-text/evince for print preview functionality." |
| 243 |
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
| 244 |
+ elog "add it to your settings.ini file." |
| 245 |
+ fi |
| 246 |
+} |
| 247 |
+ |
| 248 |
+pkg_postrm() { |
| 249 |
+ gnome2_pkg_postrm |
| 250 |
+ |
| 251 |
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then |
| 252 |
+ multilib_pkg_postrm() { |
| 253 |
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
| 254 |
+ } |
| 255 |
+ multilib_foreach_abi multilib_pkg_postrm |
| 256 |
+ fi |
| 257 |
+} |
Archives