diff --git a/gui-apps/wdisplays/Manifest b/gui-apps/wdisplays/Manifest index ac9120b..140e29f 100644 --- a/gui-apps/wdisplays/Manifest +++ b/gui-apps/wdisplays/Manifest @@ -1,2 +1,5 @@ -EBUILD wdisplays-9999.ebuild 551 BLAKE2B 0aafd84c907cb074710f6ddc6b19aa2cb984d8143e0d3f17d9f8e7c18a0f46d21414c54acb5ed50094ff0b6bb6906958ccf1da8d430377bb626715cf51c613fb SHA512 db2048fdf6090a008249df5838ac1f361dfd1e3a8756e620ac20e5fca66fb3b749c196e99733cb225c0a0a450c44847adc29f38d4c86f93185449e9d9ac4a141 +AUX wdisplays-1.0-fix-global-version.patch 1512 BLAKE2B c0726348b8c28a9779ad0a402f0e9f155fb9189f39270dfc637c8251d28754165b7e3ca5c64701c1d3981652aed2d420943e775299d51ad99e3d83fe736b89b7 SHA512 ddef7d494d3ffce4580aed449db17ae79e9daabae8a97317c4064fbf650332bc8562adc3124474923553c5044ba20e8a17e58dc54deca5bb6a35c0a67125a1ec +DIST wdisplays-1.0.tar.gz 106819 BLAKE2B d8a34ea82b88f99e27b5c42dc2e8bfed2bf69db719617d81d5f2c994e9020d206937e940f57452c99b534ceda241cea570899c7bdc74377009f7aa013e78b638 SHA512 876e883747331cf67d351b7afec963d6d52b6fa3870a57ed147acf898a662fb41407b3e835acc167d32de969d4001dbe8429340849ad09a7f7b8bfdabee61e3e +EBUILD wdisplays-1.0.ebuild 686 BLAKE2B f39aefd714120a614bf224553e67092e64c56b2802c3f756c3bfe9cb32f2f8287861131a0f16f200657b9d6ff455d3b7d375bc494697fad6e5074949d8c724c0 SHA512 1d9ef753c5f355a9d23f19bb1befff7d67ccec7a5cfd6435dee72df08b5cad1e197678db236c07b9e05cac4e6c50a65778091738d0b8c61754a98e92188351e7 +EBUILD wdisplays-9999.ebuild 617 BLAKE2B 5a0acf9c633892ed23b6c1fe814369318f00b142226497c4ce978df83f7ab44af14c6b864507fd783066c36c8315fce4b58c27c58583cb36dd631ac951619785 SHA512 1e46a18618da04dbb240fb380d589675346db39efb4326b571aa0b71c7fa4d8c9b6ea42a7417c1aa51b7bc0bfcba2caf1fd8c82f87d4a0ccaa260bb348b28b53 MISC metadata.xml 216 BLAKE2B 98b55d77f4255ca20a41fef0a66299cf6baec1df788810e210ecad6a6352c642ca652c2d404e24ff181f3c34cee7ef750d7985d7826e9c6ee7765dd657dc765c SHA512 6eacf7815e19e9e770cad73069181bdd082df3996c1cba2c1eead43fff8d001390152049f0f50d8bab7b3554873918f2ffeb972bbd2698243e5a0ffd33a6af1b diff --git a/gui-apps/wdisplays/files/wdisplays-1.0-fix-global-version.patch b/gui-apps/wdisplays/files/wdisplays-1.0-fix-global-version.patch new file mode 100644 index 0000000..180b858 --- /dev/null +++ b/gui-apps/wdisplays/files/wdisplays-1.0-fix-global-version.patch @@ -0,0 +1,30 @@ +diff --git a/src/outputs.c b/src/outputs.c +index 9ebf7e5..a5007e8 100644 +--- a/src/outputs.c ++++ b/src/outputs.c +@@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry, + + if (strcmp(interface, zwlr_output_manager_v1_interface.name) == 0) { + state->output_manager = wl_registry_bind(registry, name, +- &zwlr_output_manager_v1_interface, version); ++ &zwlr_output_manager_v1_interface, 1); + zwlr_output_manager_v1_add_listener(state->output_manager, + &output_manager_listener, state); + } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) { + state->xdg_output_manager = wl_registry_bind(registry, name, +- &zxdg_output_manager_v1_interface, version); ++ &zxdg_output_manager_v1_interface, 2); + } else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) { + state->copy_manager = wl_registry_bind(registry, name, +- &zwlr_screencopy_manager_v1_interface, version); ++ &zwlr_screencopy_manager_v1_interface, 1); + } else if(strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { + state->layer_shell = wl_registry_bind(registry, name, +- &zwlr_layer_shell_v1_interface, version); ++ &zwlr_layer_shell_v1_interface, 1); + } else if(strcmp(interface, wl_shm_interface.name) == 0) { +- state->shm = wl_registry_bind(registry, name, &wl_shm_interface, version); ++ state->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); + } + } + diff --git a/gui-apps/wdisplays/wdisplays-1.0.ebuild b/gui-apps/wdisplays/wdisplays-1.0.ebuild new file mode 100644 index 0000000..ad97668 --- /dev/null +++ b/gui-apps/wdisplays/wdisplays-1.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://github.com/cyclopsian/wdisplays" +SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-util/ninja + media-libs/libepoxy + dev-libs/wayland + x11-libs/gtk+:3 +" +RDEPEND=" + ${DEPEND} + >=gui-libs/wlroots-0.7.0 +" +BDEPEND="" + +PATCHES=( + "${FILESDIR}/${P}-fix-global-version.patch" +) + +src_configure() { + meson_src_configure +} diff --git a/gui-apps/wdisplays/wdisplays-9999.ebuild b/gui-apps/wdisplays/wdisplays-9999.ebuild index 706d60b..677bab2 100644 --- a/gui-apps/wdisplays/wdisplays-9999.ebuild +++ b/gui-apps/wdisplays/wdisplays-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson git-r3 +inherit meson xdg git-r3 DESCRIPTION="GUI display configurator for wlroots compositors" HOMEPAGE="https://github.com/cyclopsian/wdisplays" @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="" IUSE="" DEPEND=" @@ -27,6 +27,10 @@ RDEPEND=" " BDEPEND="" +PATCHES=( + "${FILESDIR}/${PN}-1.0-fix-global-version.patch" +) + src_configure() { meson_src_configure }