diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
| commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
| tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /x11-misc/projecteur | |
| parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) | |
gentoo resync : 14.05.2020
Diffstat (limited to 'x11-misc/projecteur')
| -rw-r--r-- | x11-misc/projecteur/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch | 33 | ||||
| -rw-r--r-- | x11-misc/projecteur/projecteur-0.7-r2.ebuild (renamed from x11-misc/projecteur/projecteur-0.7.ebuild) | 2 |
3 files changed, 37 insertions, 1 deletions
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest index a38c61be2970..2d89911155b7 100644 --- a/x11-misc/projecteur/Manifest +++ b/x11-misc/projecteur/Manifest @@ -1,3 +1,4 @@ +AUX projecteur-0.7-fix-git-detection.patch 1740 BLAKE2B 18087fca44642910cc7b16902d10f295b55e00965d1104a5a293728d2ef5514cd2da0f0e1535662ce5385c604111d6b8ba56835b28a5e11811d59c51a76c0ff7 SHA512 f45928c0787e107c49364d2a9bf207f39f55f16278888baee5335a50ec6ec98e7c49f4734da65cf729482396b2d4297acdcef72ee101ac4113f0870bb9357918 DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0 -EBUILD projecteur-0.7.ebuild 805 BLAKE2B 1ba5091382d294db067f0e4eb6c8e728d29a4d885e6db4d4ccd9aab31dbec9844edded5d0a4beadcb7c219b441a27aae52fd876a79bbfc33c0cbc720d44bd82a SHA512 4cd17f53e08c7caf60ae5a82d3f669dc4c52e8d20caf69b9ab16954ad071de646dc71c5911ff5a799561d8b0f2decb2f4049a3fc5aaa2b8654e79e64188dd0e5 +EBUILD projecteur-0.7-r2.ebuild 857 BLAKE2B 470cd4868b3f706f0d13cbb705463bb8acb9e02d3b780ef276c7799b042a36dfe2b9028f25ee3f671f0914175e38f1b59bdefa149d2a52fd66e792686e5fd50f SHA512 1da45091da76c22343e3bf2caed66ab2f6f7d7eb03d7489b2c53e402f7ad376de1666eaade8ace6c7d948200a8ed74679012c849a479774359a96c040d8dc079 MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c diff --git a/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch b/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch new file mode 100644 index 000000000000..841005968123 --- /dev/null +++ b/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch @@ -0,0 +1,33 @@ +From 259be1617f1b0b92e53440d95fa88aa4bf3fe25b Mon Sep 17 00:00:00 2001 +From: Jahn <jahnf@users.noreply.github.com> +Date: Sun, 10 May 2020 19:34:19 +0200 +Subject: [PATCH] Make sure version_distance is always valid, fixes build with + not git available. #73 + +--- + cmake/modules/GitVersion.cmake | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/GitVersion.cmake b/cmake/modules/GitVersion.cmake +index 1cbbd09..fcb77bc 100644 +--- a/cmake/modules/GitVersion.cmake ++++ b/cmake/modules/GitVersion.cmake +@@ -282,6 +282,7 @@ function(get_version_info prefix directory) + set(${prefix}_VERSION_MAJOR ${${prefix}_VERSION_MAJOR} PARENT_SCOPE) + set(${prefix}_VERSION_MINOR ${${prefix}_VERSION_MINOR} PARENT_SCOPE) + set(${prefix}_VERSION_PATCH ${${prefix}_VERSION_PATCH} PARENT_SCOPE) ++ set(${prefix}_VERSION_DISTANCE ${${prefix}_VERSION_DISTANCE} PARENT_SCOPE) + + # Build version string... + set(VERSION_STRING "${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR}") +@@ -412,8 +413,8 @@ function(add_version_info_custom_prefix target prefix directory) + + get_target_property(type ${target} TYPE) + if(type STREQUAL "SHARED_LIBRARY") +- set_target_properties(${target} PROPERTIES SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}") +- set_property(TARGET ${target} PROPERTY VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") ++ set_target_properties(${target} PROPERTIES SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}") ++ set_property(TARGET ${target} PROPERTY VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") + endif() + set_property(TARGET ${target} APPEND PROPERTY SOURCES ${output_files}) + target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${output_dir}>) diff --git a/x11-misc/projecteur/projecteur-0.7.ebuild b/x11-misc/projecteur/projecteur-0.7-r2.ebuild index d727e882f0f2..196ecb704c20 100644 --- a/x11-misc/projecteur/projecteur-0.7.ebuild +++ b/x11-misc/projecteur/projecteur-0.7-r2.ebuild @@ -34,6 +34,8 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES="${FILESDIR}/${P}-fix-git-detection.patch" + pkg_postinst() { udev_reload xdg_icon_cache_update |