From 474eb1d0778d876dd5d96976d6c6623975867d66 Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sun, 5 Jan 2020 19:15:08 +0100 Subject: [PATCH] x11-misc/desktopfolder: Bump to 1.1.2, Port to EAPI 7, Drop old 1.1.1 --- x11-misc/desktopfolder/Manifest | 7 ++-- ....1.1.ebuild => desktopfolder-1.1.2.ebuild} | 35 ++++++++++++++----- ...folder-1.1.2-Port-to-GtkSourceView-4.patch | 12 +++++++ x11-misc/desktopfolder/metadata.xml | 2 +- 4 files changed, 44 insertions(+), 12 deletions(-) rename x11-misc/desktopfolder/{desktopfolder-1.1.1.ebuild => desktopfolder-1.1.2.ebuild} (52%) create mode 100644 x11-misc/desktopfolder/files/desktopfolder-1.1.2-Port-to-GtkSourceView-4.patch diff --git a/x11-misc/desktopfolder/Manifest b/x11-misc/desktopfolder/Manifest index 6bae260..1cceae1 100644 --- a/x11-misc/desktopfolder/Manifest +++ b/x11-misc/desktopfolder/Manifest @@ -1,3 +1,4 @@ -DIST desktopfolder-1.1.1.tar.gz 10775341 BLAKE2B 7a8086a5553e0d1d33d0606549d30ef6b73c44c9a6741ac831a1bc71952071e5ca2121d3db6b80395cbca4e1857659bf6210106444134a3cfcfc5792308291a2 SHA512 126374f23f714f97e8e42831b857b3d7079f1f5e197ead33848e82d157d2adea9045199c5bd761e6f75e18ffbd562394194b2e684d9816505612f5aee2cb9e93 -EBUILD desktopfolder-1.1.1.ebuild 683 BLAKE2B 3e179e2ecc426fac38f2eaa6008ae3654be477ee18fcdc362471a35da8cedd626cfa62cac928c92c1f3b1295bb95c8874fd9d17d9f6c690985256e86a70c70f8 SHA512 adec3ea4eee9a14a1742860b34d25cad803e35b9cf11f57c176e9326e65a65c2e227ebc6d432e1afdccd2d28ac60082c7512e13d542240997c500ff6a0eb828f -MISC metadata.xml 342 BLAKE2B 8267eafecf7f85f0930a7950137ccfb33449ef93f57d298fd9b5bfe615a7305be4cdb4294d6c45359dcbe9e6f24c8a27aa39b4033366cf8e10b40393fdd01544 SHA512 286ae4ba615b5ee79f2c2c8a7d9878813fa5a2b513dae743b86653766e3702ea2c79ebbc51b315ef2af2263a1e4b9f6941ef2ac9ab945b4e6e52a6115e46f88e +AUX desktopfolder-1.1.2-Port-to-GtkSourceView-4.patch 403 BLAKE2B 0e2e35cd5e730021e2264dd429b2b39a1cec0cd0befae5595d4e65063d5cc53059ff5832b4d6f8f3c2f6360cbfffc4b586d53ad3a7449bffbe37a150b4bb1195 SHA512 d6ebfce3676bacb51ceb4268828fc09224c917b78f4772415a0a4441a6e20aeac3bf14c84d37df49277858dada0b53b5928ad90186585f725382202447b68c99 +DIST desktopfolder-1.1.2.tar.gz 10785764 BLAKE2B 051446427c775bd29706ea7214afa889b2d39389be5b8ef57cc2192417d81d9a7ee378063c0fc3518f1bde9f3174688ea5071a1fae34697dbf3b6140868f0473 SHA512 625b94b4dfefb8bf231969afb8b0244028d06ad6e81e978f303867126742a2f525e43725f6508810022d083212b07e3da0fb40c00d962e97fafabb5e74beadf4 +EBUILD desktopfolder-1.1.2.ebuild 915 BLAKE2B 86a73fdb9c8d8551fc9dac30bc489a7c64cba0732bed57e32a1feccb7fce7541732e67b89a79e5230dc5f5032fdd9031807da8c56eb544db0e9dde7f62d089be SHA512 44b29acd3da043513a49c5a011617f5a1ec6c11e762df6d055b24f8f54f8ea5e43e975e577b57cff57ad37307afa62d09fe622e9aa9e1575e00cb3c71ea87eb9 +MISC metadata.xml 342 BLAKE2B c1deb85332484882b97677db8ae5b7bbbeb9928e4be049417cce16a6d538a91159b8cc3671a4ad5ec37ef105f75f721bd282777c3edb3a29f794ccc21b82f62c SHA512 477075e44b7df03a1b69fa9871013006ffb2e7ab8e5acd0afe5400fc6cd77c20edc98a2063ad5cfec477873e7b5d11ba5ef6af6ed58db0670b3aeefa3c4c3df5 diff --git a/x11-misc/desktopfolder/desktopfolder-1.1.1.ebuild b/x11-misc/desktopfolder/desktopfolder-1.1.2.ebuild similarity index 52% rename from x11-misc/desktopfolder/desktopfolder-1.1.1.ebuild rename to x11-misc/desktopfolder/desktopfolder-1.1.2.ebuild index 0351f74..c28f259 100644 --- a/x11-misc/desktopfolder/desktopfolder-1.1.1.ebuild +++ b/x11-misc/desktopfolder/desktopfolder-1.1.2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 VALA_MIN_API_VERSION=0.34 -inherit gnome2 meson vala vcs-snapshot +inherit gnome2-utils meson vala xdg-utils DESCRIPTION="Organize your desktop with panels that hold your things" HOMEPAGE="https://github.com/spheras/desktopfolder" @@ -16,17 +16,36 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-libs/libgee:0.8 +RDEPEND=" + dev-libs/libgee:0.8 x11-libs/cairo[X] dev-libs/json-glib x11-libs/gdk-pixbuf x11-libs/libwnck:3 - x11-libs/gtksourceview:3 - x11-libs/cairo[X]" -DEPEND="${RDEPEND} - $(vala_depend)" + x11-libs/gtksourceview:3.0 +" +DEPEND=" + ${RDEPEND} + $(vala_depend) +" + +PATCHES=( + "${FILESDIR}/${P}-Port-to-GtkSourceView-4.patch" +) src_prepare() { default vala_src_prepare } + +pkg_postinst() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/desktopfolder/files/desktopfolder-1.1.2-Port-to-GtkSourceView-4.patch b/x11-misc/desktopfolder/files/desktopfolder-1.1.2-Port-to-GtkSourceView-4.patch new file mode 100644 index 0000000..d194cf2 --- /dev/null +++ b/x11-misc/desktopfolder/files/desktopfolder-1.1.2-Port-to-GtkSourceView-4.patch @@ -0,0 +1,12 @@ +diff -dNur a/meson.build b/meson.build +--- a/meson.build 2020-01-02 12:08:47.000000000 +0100 ++++ b/meson.build 2020-01-05 18:51:57.029831519 +0100 +@@ -92,7 +92,7 @@ + dependency('json-glib-1.0'), + dependency('gdk-pixbuf-2.0'), + dependency('libwnck-3.0'), +- dependency('gtksourceview-3.0'), ++ dependency('gtksourceview-4'), + m_dep + ], + install : true diff --git a/x11-misc/desktopfolder/metadata.xml b/x11-misc/desktopfolder/metadata.xml index a06798a..42e586d 100644 --- a/x11-misc/desktopfolder/metadata.xml +++ b/x11-misc/desktopfolder/metadata.xml @@ -3,7 +3,7 @@ david.guglielmi@gmail.com - David Guglielmi + David GUGLIELMI spheras/desktopfolder