From 7dd663c363769ecf11e29a127c5819ab67d478ea Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 24 Mar 2024 19:42:30 +0900 Subject: app-admin/grub-customizer: prevent -fPIE being added Closes: https://bugs.gentoo.org/927479 Signed-off-by: Takuya Wakazono --- .../files/grub-customizer-5.2.4-fix-flags.patch | 10 ++++++ .../grub-customizer-5.2.4-r1.ebuild | 36 ++++++++++++++++++++++ .../grub-customizer/grub-customizer-5.2.4.ebuild | 31 ------------------- 3 files changed, 46 insertions(+), 31 deletions(-) create mode 100644 app-admin/grub-customizer/files/grub-customizer-5.2.4-fix-flags.patch create mode 100644 app-admin/grub-customizer/grub-customizer-5.2.4-r1.ebuild delete mode 100644 app-admin/grub-customizer/grub-customizer-5.2.4.ebuild diff --git a/app-admin/grub-customizer/files/grub-customizer-5.2.4-fix-flags.patch b/app-admin/grub-customizer/files/grub-customizer-5.2.4-fix-flags.patch new file mode 100644 index 000000000..a21134ab1 --- /dev/null +++ b/app-admin/grub-customizer/files/grub-customizer-5.2.4-fix-flags.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.6.2) # may be lower + + ADD_DEFINITIONS(-std=c++11) + +-set(CMAKE_POSITION_INDEPENDENT_CODE ON) + + find_package(PkgConfig) + diff --git a/app-admin/grub-customizer/grub-customizer-5.2.4-r1.ebuild b/app-admin/grub-customizer/grub-customizer-5.2.4-r1.ebuild new file mode 100644 index 000000000..44ed375cd --- /dev/null +++ b/app-admin/grub-customizer/grub-customizer-5.2.4-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="A graphical grub2 settings manager" +HOMEPAGE="https://launchpad.net/grub-customizer" +SRC_URI="https://launchpad.net/grub-customizer/$(ver_cut 1-2)/${PV}/+download/grub-customizer_${PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + app-arch/libarchive:= + dev-cpp/gtkmm:3.0 + dev-libs/openssl:= +" +RDEPEND=" + ${DEPEND} + sys-apps/hwinfo +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # prevent -fPIE being added + "${FILESDIR}/${P}-fix-flags.patch" +) + +src_prepare() { + cmake_src_prepare + gunzip misc/manpage.gz || die + sed -i -e 's/manpage.gz/manpage/' -e 's/\(grub-customizer.1\).gz/\1/' CMakeLists.txt || die +} diff --git a/app-admin/grub-customizer/grub-customizer-5.2.4.ebuild b/app-admin/grub-customizer/grub-customizer-5.2.4.ebuild deleted file mode 100644 index 597552105..000000000 --- a/app-admin/grub-customizer/grub-customizer-5.2.4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -DESCRIPTION="A graphical grub2 settings manager" -HOMEPAGE="https://launchpad.net/grub-customizer" -SRC_URI="https://launchpad.net/grub-customizer/$(ver_cut 1-2)/${PV}/+download/grub-customizer_${PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - app-arch/libarchive:= - dev-cpp/gtkmm:3.0 - dev-libs/openssl:= -" -RDEPEND=" - ${DEPEND} - sys-apps/hwinfo -" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - cmake_src_prepare - gunzip misc/manpage.gz || die - sed -i -e 's/manpage.gz/manpage/' -e 's/\(grub-customizer.1\).gz/\1/' CMakeLists.txt || die -} -- cgit v1.2.3-65-gdbad