* [gentoo-commits] repo/gentoo:master commit in: x11-misc/projecteur/files/, x11-misc/projecteur/
@ 2020-05-10 19:37 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2020-05-10 19:37 UTC (permalink / raw
To: gentoo-commits
commit: b765ce788b530468552559b7c0273b420ca7dec4
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 19:36:29 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun May 10 19:36:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b765ce78
x11-misc/projecteur: fix compilation without git
Closes: https://bugs.gentoo.org/719398
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/projecteur-0.7-fix-git-detection.patch | 33 +++++++++++++++
x11-misc/projecteur/projecteur-0.7-r2.ebuild | 47 ++++++++++++++++++++++
2 files changed, 80 insertions(+)
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 00000000000..84100596812
--- /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-r2.ebuild b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
new file mode 100644
index 00000000000..196ecb704c2
--- /dev/null
+++ b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/p/P}"
+
+inherit cmake udev xdg-utils
+
+DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device"
+HOMEPAGE="https://github.com/jahnf/Projecteur"
+SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ || (
+ dev-qt/qtgui:5[X(-)]
+ dev-qt/qtgui:5[xcb(-)]
+ )
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ virtual/udev
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/${P}-fix-git-detection.patch"
+
+pkg_postinst() {
+ udev_reload
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ udev_reload
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/projecteur/files/, x11-misc/projecteur/
@ 2022-05-04 20:43 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2022-05-04 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 24dfe44cdb6cb470aeade11acf1e2404f0fc6a8c
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 20:42:05 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed May 4 20:42:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24dfe44c
x11-misc/projecteur: fix compilation with gcc12
Closes: https://bugs.gentoo.org/842207
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../projecteur/files/projecteur-0.9.2-gcc12.patch | 21 +++++++++++++++++++++
x11-misc/projecteur/projecteur-0.9.2.ebuild | 7 +++++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch b/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch
new file mode 100644
index 000000000000..7c7ff0f4105b
--- /dev/null
+++ b/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch
@@ -0,0 +1,21 @@
+From 2e989dabcf853da5ab82ab67e3eca8619cb6669a Mon Sep 17 00:00:00 2001
+From: Jahn F <jahnf@users.noreply.github.com>
+Date: Tue, 3 May 2022 09:02:05 +0200
+Subject: [PATCH] Add missing <array> include
+
+---
+ src/device.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/device.h b/src/device.h
+index 1c51585..1ce24fe 100644
+--- a/src/device.h
++++ b/src/device.h
+@@ -7,6 +7,7 @@
+
+ #include "devicescan.h"
+
++#include <array>
+ #include <memory>
+ #include <vector>
+
diff --git a/x11-misc/projecteur/projecteur-0.9.2.ebuild b/x11-misc/projecteur/projecteur-0.9.2.ebuild
index a98d6fdab612..34852f249fa4 100644
--- a/x11-misc/projecteur/projecteur-0.9.2.ebuild
+++ b/x11-misc/projecteur/projecteur-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,7 +33,10 @@ DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/${PN}-0.9.1-dont-compress-manpage.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.1-dont-compress-manpage.patch"
+ "${FILESDIR}/${PN}-0.9.2-gcc12.patch"
+)
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-04 20:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-04 20:43 [gentoo-commits] repo/gentoo:master commit in: x11-misc/projecteur/files/, x11-misc/projecteur/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2020-05-10 19:37 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox