From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- media-libs/libchamplain/Manifest | 3 - .../files/0.12.19-gdk-meson-fixes.patch | 123 --------------------- .../libchamplain/libchamplain-0.12.19-r1.ebuild | 66 ----------- 3 files changed, 192 deletions(-) delete mode 100644 media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch delete mode 100644 media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild (limited to 'media-libs/libchamplain') diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest index 7674ee745153..93698d89a0a8 100644 --- a/media-libs/libchamplain/Manifest +++ b/media-libs/libchamplain/Manifest @@ -1,6 +1,3 @@ -AUX 0.12.19-gdk-meson-fixes.patch 4022 BLAKE2B 55d1c2710ae8fca1e0befeedc87fc49c5776cfd2eaf34f6a544ac668ead2475eae4761b2c28caa513f26e92401c89f0c9464d928710b5612516d935b847eb8f9 SHA512 e67cdfef9025d00e5be8786cce71f4fd4caac06c48cc117a40827d70e759c5150ff8965dc395f7165f3ae705c36e8075f714fb571d4d9fc2dd54aaaa0982e358 -DIST libchamplain-0.12.19.tar.xz 233084 BLAKE2B b46ef4b1ceaef3d3b7d52652e825de30a11d7b8f5a68b5a08abcec7111c58443ba76b9aea6b350007ccd91bfc86a4062079c51416fc4e63795318269045ce509 SHA512 3fc03c123859b078f1c4f5062706c95446146a7ed2352306cea3f72f3fbf95099afd2a99f61182e3cb7c47e546de6501ff3ed6ff17614f23dc2e4139ba5e4902 DIST libchamplain-0.12.20.tar.xz 222168 BLAKE2B 72093eecffca24a5f255269472216f24d0804b7c8daf7cf9dc1273df9afc3fe5664dd2ca7d351bf94065f61bf4a419b3babcf3e9b2ed9a0f67c9947190aaa476 SHA512 514e4bd2803ace0d87a95a318a03bc2f2ccc454129146d76590d1b1f5666c95a4fb7013e2ad0cfafc5844d7d8b732c81a44cd0e7d51c505adcfe55c55abb4f6f -EBUILD libchamplain-0.12.19-r1.ebuild 1821 BLAKE2B f7345e702f341b09e9b82ac44e5e425a8a74bc8528909877b3468a460db0954d481c92b356ea587d23e839c84b5e6e02c3ccb5c23ec8e7902d1599ac7818765f SHA512 8481da660a53cfcbddd047cbe6b9497da2694e16234375a1f8a045d4afd9efab1923085beca6fd8b86e09d9d93196bb8c78089760d10d912645a8fe020927ca6 EBUILD libchamplain-0.12.20.ebuild 1434 BLAKE2B 61c3b610f095e62706ac8543a62e97def387c4d78ed0151507d08686bc0cd526ac09f80ef0d5d4c47ef6df3cfa7db73cd0082e25e15bc55dd72b3ec3da028fbc SHA512 acb7611dc58af60da9a59069f8c278ef9ef3f136725648a17c1020cc2e80d40495d7278611b468e30ec83424368fe15df85f48a546a0249a9cfefd72d197c9eb MISC metadata.xml 621 BLAKE2B ff31085e2b6cee6e64d64161505ae026d3d6896964a0e5aa055b6052b6bc242396db2bc1bb603cfdd3b66300d65e39fa57a8556ac3cea2454ac52048eedea61e SHA512 6d2214f5f62f6deace80db56fee500efed4713be2087b6a9159594a36c503b534b8f50e728ceccfe13f17ce79614ec97baf5b56342680b9283e03096df644a64 diff --git a/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch b/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch deleted file mode 100644 index 41c7484e2a43..000000000000 --- a/media-libs/libchamplain/files/0.12.19-gdk-meson-fixes.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 17348668f16857296ac2caf32c4a503f1946e1a5 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Mon, 22 Apr 2019 15:03:06 +0300 -Subject: [PATCH 1/2] meson: Add missing gdk required dependency for champlain - -gdk/gdk.h header is included and gdk_cairo_set_source_pixbuf symbol -is used from gdk, thus we need its header include path and link to it. -If clutter is built with gtk support, this is implicitly included via -clutter-1.0 dep, but it can also be built without gtk support, in -which case the build of libchamplain fails due to no gdk/gdk.h header -found. ---- - champlain/meson.build | 1 + - meson.build | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/champlain/meson.build b/champlain/meson.build -index 3285c65..0bf8ba5 100644 ---- a/champlain/meson.build -+++ b/champlain/meson.build -@@ -95,6 +95,7 @@ libchamplain_requires = [ - libchamplain_deps = libchamplain_requires + [ - libm_dep, - gio_dep, -+ gdk_dep, - sqlite_dep, - libsoup_dep, - ] -diff --git a/meson.build b/meson.build -index 43e72e5..1e571c5 100644 ---- a/meson.build -+++ b/meson.build -@@ -66,6 +66,7 @@ gtk_doc_req = '>= 1.15' - glib_dep = dependency('glib-2.0', version: glib_req) - gobject_dep = dependency('gobject-2.0', version: glib_req) - gio_dep = dependency('gio-2.0', version: glib_req) -+gdk_dep = dependency('gdk-3.0', version: gtk_req) - clutter_dep = dependency('clutter-1.0', version: clutter_req) - cairo_dep = dependency('cairo', version: cairo_req) - sqlite_dep = dependency('sqlite3', version: sqlite_req) --- -2.17.0 - - -From d938cb13fb13f28d18856e343ad3ee269e3cc0d9 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Mon, 22 Apr 2019 15:09:24 +0300 -Subject: [PATCH 2/2] Clean up gdk.h vs gdk-pixbuf.h includes - -Some source files included gdk.h without any use; others included it -instead of gdk-pixbuf/gdk-pixbuf.h ---- - champlain/champlain-error-tile-renderer.c | 1 - - champlain/champlain-image-renderer.c | 1 + - champlain/champlain-memphis-renderer.c | 2 +- - champlain/champlain-network-tile-source.c | 1 - - champlain/champlain-tile.c | 1 - - 5 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/champlain/champlain-error-tile-renderer.c b/champlain/champlain-error-tile-renderer.c -index 2b74730..f2dc67f 100644 ---- a/champlain/champlain-error-tile-renderer.c -+++ b/champlain/champlain-error-tile-renderer.c -@@ -25,7 +25,6 @@ - */ - - #include "champlain-error-tile-renderer.h" --#include - - struct _ChamplainErrorTileRendererPrivate - { -diff --git a/champlain/champlain-image-renderer.c b/champlain/champlain-image-renderer.c -index e0d9f65..ad21971 100644 ---- a/champlain/champlain-image-renderer.c -+++ b/champlain/champlain-image-renderer.c -@@ -26,6 +26,7 @@ - */ - - #include "champlain-image-renderer.h" -+#include - #include - - struct _ChamplainImageRendererPrivate -diff --git a/champlain/champlain-memphis-renderer.c b/champlain/champlain-memphis-renderer.c -index e62d82d..5244889 100644 ---- a/champlain/champlain-memphis-renderer.c -+++ b/champlain/champlain-memphis-renderer.c -@@ -44,7 +44,7 @@ - #include "champlain-memphis-renderer.h" - #include "champlain-bounding-box.h" - --#include -+#include - - #include - #include -diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c -index 873a39d..281f000 100644 ---- a/champlain/champlain-network-tile-source.c -+++ b/champlain/champlain-network-tile-source.c -@@ -45,7 +45,6 @@ - #include "champlain-private.h" - - #include --#include - #include - #include - #include -diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c -index a218857..ea70c3f 100644 ---- a/champlain/champlain-tile.c -+++ b/champlain/champlain-tile.c -@@ -30,7 +30,6 @@ - - #include - #include --#include - #include - #include - #include --- -2.17.0 - diff --git a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild deleted file mode 100644 index 2b8d17c1846d..000000000000 --- a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome.org meson vala xdg - -DESCRIPTION="Clutter based world map renderer" -HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain" - -SLOT="0.12" -LICENSE="LGPL-2.1+" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" - -IUSE="+gtk gtk-doc +introspection vala" -REQUIRED_USE=" - vala? ( introspection ) - gtk-doc? ( gtk ) -" # gtk-doc build gets disabled in meson if gtk widgetry is disabled (no separate libchamplain-gtk gtk-docs anymore) - -RDEPEND=" - >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.0:3 - >=media-libs/clutter-1.24:1.0[introspection?] - gtk? ( - x11-libs/gtk+:3[introspection?] - media-libs/clutter-gtk:1.0 ) - >=x11-libs/cairo-1.4 - dev-db/sqlite:3 - >=net-libs/libsoup-2.42:2.4 - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - media-libs/cogl:= -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - >=dev-util/meson-0.49.0 - virtual/pkgconfig - gtk-doc? ( >=dev-util/gtk-doc-1.15 ) - vala? ( $(vala_depend) ) -" - -PATCHES=( - # Fix compilation against clutter[-gtk] - "${FILESDIR}"/${PV}-gdk-meson-fixes.patch # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/8 -) - -src_prepare() { - xdg_src_prepare - use vala && vala_src_prepare - # Fix showing inside devhelp (gtkdocdir subdir and name of the module need to match) - sed -i -e 's:package_name:package_string:' docs/reference/meson.build || die # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/7 -} - -src_configure() { - local emesonargs=( - -Dmemphis=false # TODO: What's the state of this vector renderer? - $(meson_use introspection) - $(meson_use vala vapi) - $(meson_use gtk widgetry) - $(meson_use gtk-doc gtk_doc) - -Ddemos=false # only built, not installed - ) - meson_src_configure -} -- cgit v1.2.3