From 0993d496f280182e027b48da3fa42612a0c42200 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Wed, 11 Oct 2023 10:13:14 +0200 Subject: [PATCH 01/12] media-sound/spot: respect cargo release target Closes: https://bugs.gentoo.org/915570 Signed-off-by: Konstantin Tutsch --- media-sound/spot/spot-0.4.0.ebuild | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/media-sound/spot/spot-0.4.0.ebuild b/media-sound/spot/spot-0.4.0.ebuild index 008440bb03..b61f0e8d6f 100644 --- a/media-sound/spot/spot-0.4.0.ebuild +++ b/media-sound/spot/spot-0.4.0.ebuild @@ -442,9 +442,15 @@ src_compile() { cargo_src_compile # meson_src_install won't find spot binary otherwise because cargo.sh isn't used for compiling - mv "${WORKDIR}/${P}/target/release/spot" \ - "${WORKDIR}/${P}-build/src/spot" \ - || die + if use debug; then + mv "${WORKDIR}/${P}/target/debug/spot" \ + "${WORKDIR}/${P}-build/src/spot" \ + || die + else + mv "${WORKDIR}/${P}/target/release/spot" \ + "${WORKDIR}/${P}-build/src/spot" \ + || die + fi } src_install() { From 4ff61553ace74522dfed1aa0bb812a440e922676 Mon Sep 17 00:00:00 2001 From: Henri Gasc Date: Wed, 11 Oct 2023 10:24:36 +0200 Subject: [PATCH 02/12] app-editors/imhex: add patches Closes: https://bugs.gentoo.org/915572 Signed-off-by: Henri Gasc --- app-editors/imhex/files/remove-Werror.patch | 44 +++++++++++++++++++ .../{llvm-16.patch => require-llvm-16.patch} | 8 +++- app-editors/imhex/imhex-1.31.0.ebuild | 3 +- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 app-editors/imhex/files/remove-Werror.patch rename app-editors/imhex/files/{llvm-16.patch => require-llvm-16.patch} (66%) diff --git a/app-editors/imhex/files/remove-Werror.patch b/app-editors/imhex/files/remove-Werror.patch new file mode 100644 index 0000000000..e00aad7371 --- /dev/null +++ b/app-editors/imhex/files/remove-Werror.patch @@ -0,0 +1,44 @@ +From 94126d5ff7e5a6d6cdd7f515097383619725953b Mon Sep 17 00:00:00 2001 +From: Leoriem-code +Subject: [PATCH] remove -Werror + +diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake +index da078878..3848fbeb 100644 +--- a/cmake/build_helpers.cmake ++++ b/cmake/build_helpers.cmake +@@ -435,7 +435,7 @@ endfunction() + macro(setupCompilerFlags target) + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + if (IMHEX_STRICT_WARNINGS) +- set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror") ++ set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic") + endif() + + set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-array-bounds") + +diff --git a/lib/external/pattern_language/cli/CMakeLists.txt b/lib/external/pattern_language/cli/CMakeLists.txt +index 39e6f90..01b5e87 100644 +--- a/lib/external/pattern_language/cli/CMakeLists.txt ++++ b/lib/external/pattern_language/cli/CMakeLists.txt +@@ -28,7 +28,7 @@ if(NOT CLI11_FOUND) + set(CLI11_LIBRARIES CLI11::CLI11) + endif() + +-target_compile_options(plcli PRIVATE -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-array-bounds) ++target_compile_options(plcli PRIVATE -Wall -Wextra -Wno-unknown-pragmas -Wno-array-bounds) + target_include_directories(plcli PUBLIC include) + target_link_libraries(plcli PUBLIC ${CLI11_LIBRARIES} libpl libpl-gen fmt::fmt-header-only) + +diff --git a/lib/external/pattern_language/lib/CMakeLists.txt b/lib/external/pattern_language/lib/CMakeLists.txt +index dab1499..0bfac35 100644 +--- a/lib/external/pattern_language/lib/CMakeLists.txt ++++ b/lib/external/pattern_language/lib/CMakeLists.txt +@@ -71,7 +71,7 @@ add_library(libpl ${LIBRARY_TYPE} + ) + + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") +- target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds) ++ target_compile_options(libpl PRIVATE -Wall -Wextra -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds) + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + target_compile_options(libpl PRIVATE -Wno-stringop-overflow) + endif() diff --git a/app-editors/imhex/files/llvm-16.patch b/app-editors/imhex/files/require-llvm-16.patch similarity index 66% rename from app-editors/imhex/files/llvm-16.patch rename to app-editors/imhex/files/require-llvm-16.patch index 5c7efa5faa..7642e7654d 100644 --- a/app-editors/imhex/files/llvm-16.patch +++ b/app-editors/imhex/files/require-llvm-16.patch @@ -1,8 +1,12 @@ +From 8d86cd22a743c39a04d34d4cf1a104952cf7fbac Mon Sep 17 00:00:00 2001 +From: xiaoming +Subject: [PATCH] require llvm 16 + diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake -index 624e401..cfd30c3 100644 +index 0d4839e7..da078878 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake -@@ -503,7 +503,7 @@ macro(addBundledLibraries) +@@ -525,7 +525,7 @@ macro(addBundledLibraries) add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL) set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON) else() diff --git a/app-editors/imhex/imhex-1.31.0.ebuild b/app-editors/imhex/imhex-1.31.0.ebuild index ccbb9ef59a..3d29199d1f 100644 --- a/app-editors/imhex/imhex-1.31.0.ebuild +++ b/app-editors/imhex/imhex-1.31.0.ebuild @@ -23,7 +23,8 @@ KEYWORDS="~amd64" IUSE="+system-llvm" PATCHES=( - "${FILESDIR}/llvm-16.patch" + "${FILESDIR}/require-llvm-16.patch" + "${FILESDIR}/remove-Werror.patch" ) DEPEND=" From bb81c03aea01f4996151f4642659055991b0dccd Mon Sep 17 00:00:00 2001 From: brettalcox Date: Wed, 11 Oct 2023 07:57:23 -0500 Subject: [PATCH 03/12] sys-apps/mission-center: cleaning up ebuild Signed-off-by: brettalcox --- .../mission-center-0.3.2.ebuild | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/sys-apps/mission-center/mission-center-0.3.2.ebuild b/sys-apps/mission-center/mission-center-0.3.2.ebuild index ddddd1ce40..ea6802fe04 100644 --- a/sys-apps/mission-center/mission-center-0.3.2.ebuild +++ b/sys-apps/mission-center/mission-center-0.3.2.ebuild @@ -275,7 +275,7 @@ declare -A GIT_CRATES=( [pathfinder_resources]="https://github.com/servo/pathfinder;${PATHFINDER_COMMIT};pathfinder-${PATHFINDER_COMMIT}/resources/" ) -inherit cargo gnome2-utils meson python-any-r1 +inherit cargo meson python-any-r1 xdg DESCRIPTION="Monitor your CPU, Memory, Disk, Network and GPU usage." HOMEPAGE="https://missioncenter.io/" @@ -318,14 +318,14 @@ BDEPEND=" src_unpack() { unpack ${P}.tar.bz2 unpack nvtop-${NVTOP_COMMIT}.tar.gz - mv nvtop-${NVTOP_COMMIT} "${S}/subprojects" + mv nvtop-${NVTOP_COMMIT} "${S}/subprojects" || die cargo_src_unpack } src_prepare() { eapply_user - cd "${S}/subprojects/nvtop-${NVTOP_COMMIT}" - find ../packagefiles -type f -name 'nvtop-*' -exec sh -c 'patch -p1 < {}' \; + cd "${S}/subprojects/nvtop-${NVTOP_COMMIT}" || die + find ../packagefiles -type f -name 'nvtop-*' -exec sh -c 'patch -p1 < {}' \; || die } src_configure() { @@ -334,27 +334,15 @@ src_configure() { --prefix=/usr ) meson_src_configure - cp -r "${ECARGO_HOME}" "${BUILD_DIR}/src/sys_info_v2/gatherer/cargo-home" + cp -r "${ECARGO_HOME}" "${BUILD_DIR}/src/sys_info_v2/gatherer/cargo-home" || die } src_test() { # patch the appstream-util validate command to use --nonet when validating the urls - sed -i "s/args: \['validate',/args: \['validate', '--nonet',/g" "${S}/data/meson.build" + sed -i "s/args: \['validate',/args: \['validate', '--nonet',/g" "${S}"/data/meson.build || die meson_src_test } -pkg_postinst() { - gnome2_schemas_update - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_schemas_update - xdg_icon_cache_update - xdg_desktop_database_update -} - # rust does not use *FLAGS from make.conf, silence portage warning # update with proper path to binaries this crate installs, omit leading / QA_FLAGS_IGNORED="usr/bin/${PN}" From 482dc3358ca90dec7d44ffcb799aaa22cebf9173 Mon Sep 17 00:00:00 2001 From: Mia Neufeld Date: Wed, 11 Oct 2023 15:43:59 +0200 Subject: [PATCH 04/12] gui-libs/xdg-desktop-portal-hyprland: Add 1.2.2, drop 1.2.0 and 1.2.1 Signed-off-by: Mia Neufeld --- gui-libs/xdg-desktop-portal-hyprland/Manifest | 3 +- .../xdg-desktop-portal-hyprland-1.2.1.ebuild | 77 ------------------- ... xdg-desktop-portal-hyprland-1.2.2.ebuild} | 0 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.1.ebuild rename gui-libs/xdg-desktop-portal-hyprland/{xdg-desktop-portal-hyprland-1.2.0.ebuild => xdg-desktop-portal-hyprland-1.2.2.ebuild} (100%) diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest index c87015958d..ddf233d144 100644 --- a/gui-libs/xdg-desktop-portal-hyprland/Manifest +++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest @@ -1,3 +1,2 @@ DIST xdg-desktop-hyprland-1.1.0.tar.gz 42732 BLAKE2B aa78b9f3a5812988e8324b71cc265c4b2ca23d0b12239c3ac13d068a46200504685da0fb57093f0689101fc2235cb7825646a4669bfe1894928d57a3259df9e3 SHA512 e02fa5bb19ca20cdee9a2e6ad0beb507d96118e095b1e5a1836cc16a35492a9ba5db36b06e5be561adcbf16d8716c38cbb1ed373965416696c69448fbd020c10 -DIST xdg-desktop-hyprland-1.2.0.tar.gz 43068 BLAKE2B 7fcd9cc962d50ade64a97af3bb34a0bfff5c72cb4458ed2dd17122b3ee53364b319d8fbf0db5827bdd94e778a8ddaaba55963fe67fe6d2fe7a7d6265e327c56a SHA512 41201a773756f3b5f49b8a9e39b98fc8939fab60bda24f99d2c3b76a34f159b69fce17af88b6eff2a475e6b097f0d7912b51a8862c2b8cd7cdd9af4e237d17da -DIST xdg-desktop-hyprland-1.2.1.tar.gz 43054 BLAKE2B 700c96b3fcfb6c3987b1e48ffa27e75ed9b84262140de824ee029249030e7aad68e54ecabc026baed28d79344ffa69a820ca1b27d5c3b4760450252bdd603c2b SHA512 a27bc7d3c2ed32005b6787517550b89fee8661644f68b4689912894073a1971a7cf2dec4e7df60275b8fa6cac2bbc6fea244e5da1877bc7ffb71225e7bb44c3d +DIST xdg-desktop-hyprland-1.2.2.tar.gz 43233 BLAKE2B 3d3d955596051da3a3384dab75a516a47627175ac584e6c8967ffe83607a99d99b8c8365b04f57976b8fe41917354217ca0bf3cb07f5e64cc099a1fb6fc3ef8a SHA512 10c8a0eb23a65535dcb16c30d42e2a71268d5a05b88f14ff4c1bedc127241e4da6c516217287b3499677c92f06034f8ebc0f743c181d4dd3bf7a35423128e141 diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.1.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.1.ebuild deleted file mode 100644 index 1758dc43b4..0000000000 --- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson toolchain-funcs - -DESCRIPTION="xdg-desktop-portal backend for hyprland" -HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/hyprwm/xdg-desktop-portal-hyprland.git" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/hyprwm/xdg-desktop-portal-hyprland/archive/refs/tags/v${PV}.tar.gz \ - -> xdg-desktop-hyprland-${PV}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0/9999" -IUSE="elogind systemd" -REQUIRED_USE="?? ( elogind systemd )" - -DEPEND=" - >=media-video/pipewire-0.3.41:= - dev-cpp/sdbus-c++ - dev-libs/inih - dev-libs/wayland - dev-qt/qtbase - dev-qt/qtcore - dev-qt/qtgui - dev-qt/qtwayland:6 - dev-qt/qtwidgets - media-libs/mesa - sys-apps/util-linux - x11-libs/libdrm - || ( - systemd? ( >=sys-apps/systemd-237 ) - elogind? ( >=sys-auth/elogind-237 ) - sys-libs/basu - ) -" -RDEPEND=" - ${DEPEND} - sys-apps/xdg-desktop-portal -" -BDEPEND=" - >=dev-libs/wayland-protocols-1.24 - dev-libs/hyprland-protocols - virtual/pkgconfig - || ( >=sys-devel/gcc-13:* >=sys-devel/clang-17:* ) -" - -pkg_setup() { - [[ ${MERGE_TYPE} == binary ]] && return - - if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then - eerror "XDPH needs >=gcc-13 or >=clang-17 to compile." - eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" - die "GCC version is too old to compile XDPH!" - elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then - eerror "XDPH needs >=gcc-13 or >=clang-17 to compile." - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" - die "Clang version is too old to compile XDPH!" - fi -} - -src_compile() { - meson_src_compile - emake -C hyprland-share-picker all -} - -src_install() { - meson_src_install - dobin "${S}/hyprland-share-picker/build/hyprland-share-picker" -} diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.0.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.2.ebuild similarity index 100% rename from gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.0.ebuild rename to gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.2.2.ebuild From b4665cc8487af54852bdeec7729d463b24b80ad8 Mon Sep 17 00:00:00 2001 From: Vitaly Zdanevich Date: Wed, 11 Oct 2023 18:34:16 +0400 Subject: [PATCH 05/12] gui-apps/1password: version bump Signed-off-by: Vitaly Zdanevich --- .../{1password-8.10.7.ebuild => 1password-8.10.16.ebuild} | 0 gui-apps/1password/Manifest | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename gui-apps/1password/{1password-8.10.7.ebuild => 1password-8.10.16.ebuild} (100%) diff --git a/gui-apps/1password/1password-8.10.7.ebuild b/gui-apps/1password/1password-8.10.16.ebuild similarity index 100% rename from gui-apps/1password/1password-8.10.7.ebuild rename to gui-apps/1password/1password-8.10.16.ebuild diff --git a/gui-apps/1password/Manifest b/gui-apps/1password/Manifest index 1da385bd8f..da5c8bbbb4 100644 --- a/gui-apps/1password/Manifest +++ b/gui-apps/1password/Manifest @@ -1 +1 @@ -DIST 1password-8.10.7.x86_64.rpm 97601632 BLAKE2B dd7639149e9d0412754889e12c79cd6e48b42ac9c4247e465d037abc3671daf95a7d63ce8bb76f47de726aecc5b4b5b0918216fe28af4042d803ed049c955905 SHA512 4b4de329c41212275c6301269c6bf2a455d04e38fd01cc3c918e8b775aa0509143ce83150cd1fb7b7fdc2230caa30f36b3b5aaa83b2988c5f4f2b86c86c2ab23 +DIST 1password-8.10.16.x86_64.rpm 101643244 BLAKE2B 8ac9c3ebf515347297addf5fa3ca3183a5e4a97160276cdd1ec968970b2878ad2111a1bc8ecc8bf2e82b287b3ec53c6e51753b5aed101b890ac63290da7dd6fd SHA512 5670318cf0f4745d62e49b932edd98f721a3c1c9fd0b6b86791d0da244f1718bf86485602787373a33f8e496eb533fb475a93ae67244b45ec08d6eb857d75e86 From bb40d304d282f68749c19db18cf57e141a6e9740 Mon Sep 17 00:00:00 2001 From: Adam Pimentel Date: Wed, 11 Oct 2023 12:32:23 -0400 Subject: [PATCH 06/12] net-p2p/feather: version bump to 2.5.0 and qt6 support Signed-off-by: Adam Pimentel --- net-p2p/feather/feather-2.5.0.ebuild | 154 +++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 net-p2p/feather/feather-2.5.0.ebuild diff --git a/net-p2p/feather/feather-2.5.0.ebuild b/net-p2p/feather/feather-2.5.0.ebuild new file mode 100644 index 0000000000..a6a3ccc05d --- /dev/null +++ b/net-p2p/feather/feather-2.5.0.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop xdg + +SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b" +MONERO_DIST_COMIT="1f068d1ee84849b3b1758b0a46844834019de1bc" + MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0" + RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c" + RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c" + SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9" + TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0" + +DESCRIPTION="A free, open-source Monero wallet" +HOMEPAGE="https://featherwallet.org" +SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \ +${PF}.tar.gz + https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \ +${PF}-singleapplication.tar.gz + https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \ +${PF}-monero.tar.gz + https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \ +${PF}-monero-miniupnp.tar.gz + https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \ +${PF}-monero-randomx.tar.gz + https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \ +${PF}-monero-rapidjson.tar.gz + https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \ +${PF}-monero-supercop.tar.gz + https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \ +${PF}-monero-trezorcommon.tar.gz +" + +# Feather is released under the terms of the BSD license, but it vendors +# code from Monero and Tor too. +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="qrcode xmrig localmonero qt6 qt5" +REQUIRED_USE="|| ( qt5 qt6 )" + +DEPEND=" + dev-libs/libsodium:= + media-gfx/qrencode:= + media-gfx/zbar:=[v4l] + =dev-libs/polyseed-1.0.0 + dev-libs/libzip:= + dev-libs/boost:=[nls] + qt5? ( + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtnetwork-5.15:5 + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtxml-5.15:5 + >=dev-qt/qtwebsockets-5.15:5 + >=dev-qt/qtmultimedia-5.15:5[widgets] + >=dev-qt/qtconcurrent-5.15:5 + ) + qt6? ( + >=dev-qt/qtbase-6.5.2:6 + >=dev-qt/qtsvg-6.5.2:6 + >=dev-qt/qtmultimedia-6.5.2:6 + >=dev-qt/qtwebsockets-6.5.2:6 + ) + dev-libs/libgcrypt:= + sys-libs/zlib + dev-libs/openssl:= + net-dns/unbound:=[threads] + net-libs/czmq:= +" +RDEPEND=" + ${DEPEND} + net-vpn/tor + xmrig? ( net-misc/xmrig ) +" +BDEPEND="virtual/pkgconfig" + +src_unpack() { + unpack ${PF}.tar.gz \ + ${PF}-singleapplication.tar.gz \ + ${PF}-monero.tar.gz \ + ${PF}-monero-miniupnp.tar.gz \ + ${PF}-monero-randomx.tar.gz \ + ${PF}-monero-rapidjson.tar.gz \ + ${PF}-monero-supercop.tar.gz \ + ${PF}-monero-trezorcommon.tar.gz + mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \ + "${WORKDIR}"/${P}/src/third-party/singleapplication || die + mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \ + "${WORKDIR}"/${P}/monero || die + mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \ + "${WORKDIR}"/${P}/monero/external/miniupnp || die + mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \ + "${WORKDIR}"/${P}/monero/external/randomx || die + mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \ + "${WORKDIR}"/${P}/monero/external/rapidjson || die + mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \ + "${WORKDIR}"/${P}/monero/external/supercop || die + mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \ + "${WORKDIR}"/${P}/monero/external/trezor-common || die +} + +src_prepare() { + default + echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die + echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${P}/src/config-feather.h || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -DBUILD_SHARED_LIBS=OFF + -DARCH=x86-64 + -DBUILD_TAG="linux-x64" + -DBUILD_64=ON + -DSELF_CONTAINED=OFF + -DLOCALMONERO=$(usex localmonero) + -DXMRIG=$(usex xmrig) + -DCHECK_UPDATES=OFF + -DPLATFORM_INSTALLER=OFF + -DUSE_DEVICE_TREZOR=OFF + -DDONATE_BEG=OFF + -DWITH_SCANNER=$(usex qrcode) + ) + + cmake_src_configure +} + +src_compile() { + cmake_build feather +} + +src_install() { + dobin "${BUILD_DIR}/bin/feather" + + newicon -s 256 "${WORKDIR}"/${P}/src/assets/images/appicons/256x256.png feather.png + newicon -s 128 "${WORKDIR}"/${P}/src/assets/images/appicons/128x128.png feather.png + newicon -s 96 "${WORKDIR}"/${P}/src/assets/images/appicons/96x96.png feather.png + newicon -s 64 "${WORKDIR}"/${P}/src/assets/images/appicons/64x64.png feather.png + newicon -s 48 "${WORKDIR}"/${P}/src/assets/images/appicons/48x48.png feather.png + newicon -s 32 "${WORKDIR}"/${P}/src/assets/images/appicons/32x32.png feather.png + domenu "${WORKDIR}"/${P}/src/assets/feather.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + + einfo "Ensure that Tor is running with 'rc-service tor start' before" + einfo "using Feather." +} From b1f13448f805454577392a34b6af4ac501a60bc9 Mon Sep 17 00:00:00 2001 From: Adam Pimentel Date: Wed, 11 Oct 2023 14:28:57 -0400 Subject: [PATCH 07/12] net-p2p/feather: update manifest Signed-off-by: Adam Pimentel --- net-p2p/feather/Manifest | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest index 5acbf7863e..63fca25bf8 100644 --- a/net-p2p/feather/Manifest +++ b/net-p2p/feather/Manifest @@ -22,3 +22,11 @@ DIST feather-2.4.9-r1-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c59174 DIST feather-2.4.9-r1.tar.gz 1241941 BLAKE2B 725c949525970fb8368fdcc3443b5fde7ffbdb12b82608c6fa590e5104bd3fe4c42a5dca299e83acbd2b74d9bd2f7bf11a885c1cbdbafaed1eac3e7a825addc6 SHA512 71637871fead4d607c4a4536be1737c8640672921da5807dc17956e11ba95d5ae71467163dc01075df8c7b7c56ffe63ffbcdab433e4882215d542fcb89dac9a0 DIST feather-2.4.9-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4 DIST feather-2.4.9.tar.gz 1241941 BLAKE2B 725c949525970fb8368fdcc3443b5fde7ffbdb12b82608c6fa590e5104bd3fe4c42a5dca299e83acbd2b74d9bd2f7bf11a885c1cbdbafaed1eac3e7a825addc6 SHA512 71637871fead4d607c4a4536be1737c8640672921da5807dc17956e11ba95d5ae71467163dc01075df8c7b7c56ffe63ffbcdab433e4882215d542fcb89dac9a0 +DIST feather-2.5.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5 +DIST feather-2.5.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad +DIST feather-2.5.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7 +DIST feather-2.5.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 +DIST feather-2.5.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf +DIST feather-2.5.0-monero.tar.gz 14014516 BLAKE2B 0f5f74b1e9c72e0671d010910730e21b0990be09f5fffc472e7493004c2d3583b60f4eab90ba396be359cf22771b5d21c66e6d7a46b2094d94f0b81f4375260e SHA512 ab9466d9d93632fea476d9aa9de5fb4298a8b74a340d144c061ce438e36f2bee056a30d66d37c1cc3128576539f45b135e8d336c66c6961651e1846370f205e2 +DIST feather-2.5.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4 +DIST feather-2.5.0.tar.gz 1318133 BLAKE2B 06569bc2458a94e3f30668162d3f8f0f8372f0778b997b50c787a2afbcdff2fcb9804b666443661029871257d4f61ef5be6642bedbbe3efad817926f42452fb2 SHA512 c8cc4967187f4f8b31b8e722daeda6e9ce1d04bdc748f7e4eac56915a9f3a041f3c0b72fc7205832fc04ea4a3d0e2fe514e4ff73d025374df0b0b710dbc9dccc From 7cbfa02d635bad13ddf034e93399e056a56e5267 Mon Sep 17 00:00:00 2001 From: Victor Kustov Date: Wed, 11 Oct 2023 20:01:05 +0300 Subject: [PATCH 08/12] games-engines/fheroes2: new package, add 1.0.9 Closes: https://github.com/gentoo/guru/pull/114 Signed-off-by: Victor Kustov Signed-off-by: David Roman --- games-engines/fheroes2/Manifest | 1 + games-engines/fheroes2/fheroes2-1.0.9.ebuild | 23 ++++++++++++++++++++ games-engines/fheroes2/metadata.xml | 12 ++++++++++ 3 files changed, 36 insertions(+) create mode 100644 games-engines/fheroes2/Manifest create mode 100644 games-engines/fheroes2/fheroes2-1.0.9.ebuild create mode 100644 games-engines/fheroes2/metadata.xml diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest new file mode 100644 index 0000000000..82ab0843ec --- /dev/null +++ b/games-engines/fheroes2/Manifest @@ -0,0 +1 @@ +DIST fheroes2-1.0.9.tar.gz 11784935 BLAKE2B 0c85725f791615eb1f823f38cfc03a98a73d71d1c0dedeac2146f62099c25ed37bbd44c9d121099934f99850ad408c13c1ea1b51f531a2cc37a56d01a0beb826 SHA512 eeb575345a6250d60ed8c37ec66deec4f5383557d8259a6422ace84520321316016494d0cd6e8d5b57123f946f3841fc215183c297c9acefe17caa3e94123ea7 diff --git a/games-engines/fheroes2/fheroes2-1.0.9.ebuild b/games-engines/fheroes2/fheroes2-1.0.9.ebuild new file mode 100644 index 0000000000..09b7db5eaa --- /dev/null +++ b/games-engines/fheroes2/fheroes2-1.0.9.ebuild @@ -0,0 +1,23 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Recreation of the Heroes of Might and Magic II game engine" +HOMEPAGE="https://ihhub.github.io/fheroes2/" +SRC_URI="https://github.com/ihhub/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +inherit cmake + +DEPEND="media-libs/libpng + media-libs/libsdl2 + media-libs/sdl2-image + media-libs/sdl2-mixer + sys-libs/zlib +" + +RDEPEND="${DEPEND}" diff --git a/games-engines/fheroes2/metadata.xml b/games-engines/fheroes2/metadata.xml new file mode 100644 index 0000000000..4f28af6e3e --- /dev/null +++ b/games-engines/fheroes2/metadata.xml @@ -0,0 +1,12 @@ + + + + + ktrace@yandex.ru + Victor Kustov + + Opensource Heroes of Might and Magic II game engine. Playable with original resources. + + ihhub/fheroes2 + + From 72c2f5df3e123f1c809b56ad2ab2ed6052573a9e Mon Sep 17 00:00:00 2001 From: David Roman Date: Wed, 11 Oct 2023 21:41:32 +0200 Subject: [PATCH 09/12] Revert "games-engines/fheroes2: new package, add 1.0.9" Was already on :.gentoo This reverts commit 7cbfa02d635bad13ddf034e93399e056a56e5267. Signed-off-by: David Roman --- games-engines/fheroes2/Manifest | 1 - games-engines/fheroes2/fheroes2-1.0.9.ebuild | 23 -------------------- games-engines/fheroes2/metadata.xml | 12 ---------- 3 files changed, 36 deletions(-) delete mode 100644 games-engines/fheroes2/Manifest delete mode 100644 games-engines/fheroes2/fheroes2-1.0.9.ebuild delete mode 100644 games-engines/fheroes2/metadata.xml diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest deleted file mode 100644 index 82ab0843ec..0000000000 --- a/games-engines/fheroes2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fheroes2-1.0.9.tar.gz 11784935 BLAKE2B 0c85725f791615eb1f823f38cfc03a98a73d71d1c0dedeac2146f62099c25ed37bbd44c9d121099934f99850ad408c13c1ea1b51f531a2cc37a56d01a0beb826 SHA512 eeb575345a6250d60ed8c37ec66deec4f5383557d8259a6422ace84520321316016494d0cd6e8d5b57123f946f3841fc215183c297c9acefe17caa3e94123ea7 diff --git a/games-engines/fheroes2/fheroes2-1.0.9.ebuild b/games-engines/fheroes2/fheroes2-1.0.9.ebuild deleted file mode 100644 index 09b7db5eaa..0000000000 --- a/games-engines/fheroes2/fheroes2-1.0.9.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Recreation of the Heroes of Might and Magic II game engine" -HOMEPAGE="https://ihhub.github.io/fheroes2/" -SRC_URI="https://github.com/ihhub/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -inherit cmake - -DEPEND="media-libs/libpng - media-libs/libsdl2 - media-libs/sdl2-image - media-libs/sdl2-mixer - sys-libs/zlib -" - -RDEPEND="${DEPEND}" diff --git a/games-engines/fheroes2/metadata.xml b/games-engines/fheroes2/metadata.xml deleted file mode 100644 index 4f28af6e3e..0000000000 --- a/games-engines/fheroes2/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - ktrace@yandex.ru - Victor Kustov - - Opensource Heroes of Might and Magic II game engine. Playable with original resources. - - ihhub/fheroes2 - - From ad0022603bfad3436fc6618f6605bf857a6d63cc Mon Sep 17 00:00:00 2001 From: Christopher Byrne Date: Wed, 11 Oct 2023 15:19:56 -0500 Subject: [PATCH 10/12] app-misc/oddjob: new package, add 0.34.7 Signed-off-by: Christopher Byrne --- app-misc/oddjob/Manifest | 1 + ...x-broken-AC_ARG_ENABLE-install-logic.patch | 59 +++++++ ...AM-mkhomedir-parts-when-PAM-support-.patch | 39 +++++ ...emove-with-systemd-and-with-sysvinit.patch | 144 ++++++++++++++++++ ...ld-Restore-conditional-with-pam-flag.patch | 66 ++++++++ ...-src-oddjobd.c-Fix-non-selinux-build.patch | 35 +++++ app-misc/oddjob/files/oddjob.init.d | 21 +++ app-misc/oddjob/metadata.xml | 9 ++ app-misc/oddjob/oddjob-0.34.7.ebuild | 65 ++++++++ 9 files changed, 439 insertions(+) create mode 100644 app-misc/oddjob/Manifest create mode 100644 app-misc/oddjob/files/oddjob-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch create mode 100644 app-misc/oddjob/files/oddjob-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch create mode 100644 app-misc/oddjob/files/oddjob-0.34.7-build-Remove-with-systemd-and-with-sysvinit.patch create mode 100644 app-misc/oddjob/files/oddjob-0.34.7-build-Restore-conditional-with-pam-flag.patch create mode 100644 app-misc/oddjob/files/oddjob-0.34.7-src-oddjobd.c-Fix-non-selinux-build.patch create mode 100644 app-misc/oddjob/files/oddjob.init.d create mode 100644 app-misc/oddjob/metadata.xml create mode 100644 app-misc/oddjob/oddjob-0.34.7.ebuild diff --git a/app-misc/oddjob/Manifest b/app-misc/oddjob/Manifest new file mode 100644 index 0000000000..1fba06727b --- /dev/null +++ b/app-misc/oddjob/Manifest @@ -0,0 +1 @@ +DIST oddjob-0.34.7.tar.gz 459131 BLAKE2B 197083e0799897b1b9f753b0b6c9fa3db669305eb386475d9e18f0a6b2cce2c3cbc8bb220df465dfc0ac7374c7544bcf9cefd666e5c3667f4647ae85eab04a2b SHA512 df98f3d2ce18de5d2db6d638995c01c80aec51f7ad979b879b2e8d8f7d6c2e464cbff3c70ed9b528399337f8fba31744f955ca17fdad1d4e9193fb0f10ea391a diff --git a/app-misc/oddjob/files/oddjob-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch b/app-misc/oddjob/files/oddjob-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch new file mode 100644 index 0000000000..5cfae2c9a6 --- /dev/null +++ b/app-misc/oddjob/files/oddjob-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch @@ -0,0 +1,59 @@ +From 1112006e8de56fae69e2418b155622f96e2b9fea Mon Sep 17 00:00:00 2001 +From: Christopher Byrne +Date: Thu, 21 Sep 2023 19:35:24 -0500 +Subject: [PATCH 2/3] build: Fix broken AC_ARG_ENABLE install logic + +The arguments for AC_ARG_ENABLE were wrong. The 3rd argument is +"if specified" and the 4th argument is "if not specified". So +--disable-X did not work. + +Signed-off-by: Christopher Byrne +--- + configure.ac | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0f6b497..632f47c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,9 +91,9 @@ AC_SUBST(SYSTEMDSYSTEMUNITDIR) + + AC_ARG_ENABLE(sample, + AS_HELP_STRING(--enable-sample,[Build and install a sample service.]), +-sample=$withval, +-sample=no) +-AM_CONDITIONAL(INSTALL_SAMPLE,test x$sample = xyes) ++, ++[enables_sample=no]) ++AM_CONDITIONAL(INSTALL_SAMPLE,test x$enable_sample = xyes) + + AC_ARG_ENABLE(experimental, + AS_HELP_STRING(--enable-experimental,[Build experimental helpers.]), +@@ -330,18 +330,18 @@ AC_DEFINE_UNQUOTED(DBUS_PACKAGE,"$DBUS_PACKAGE",[Define to the package name for + + AC_ARG_ENABLE(xml-docs, + AS_HELP_STRING(--enable-xml-docs,[Reformat XML documentation.]), +-xml_docs=$withval, +-xml_docs=no) +-AM_CONDITIONAL(REFORMAT_XML_DOCS,test x$xml_docs = xyes) ++, ++[enable_xml_docs=no]) ++AM_CONDITIONAL(REFORMAT_XML_DOCS,test x$enable_xml_docs = xyes) + AC_PATH_PROGS(PATH_XMLTO,xmlto,:) + AC_SUBST(PATH_XMLTO) + + AC_ARG_ENABLE(compat-dtd, + AS_HELP_STRING(--enable-compat-dtd,[Use DocBook 4.3 instead of DocBook 4.4.]), +-compat_dtd=$withval, +-compat_dtd=no) ++, ++[enable_xml_dtd=no]) + AC_MSG_CHECKING([which version of the DocBook DTD to use]) +-if test x$compat_dtd = xyes ; then ++if test x$enable_compat_dtd = xyes ; then + DOCBOOK_PACKAGE_START= + DOCBOOK_PACKAGE_END= + DOCBOOK_VERSION=4.3 +-- +2.41.0 + diff --git a/app-misc/oddjob/files/oddjob-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch b/app-misc/oddjob/files/oddjob-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch new file mode 100644 index 0000000000..c6ec183fa0 --- /dev/null +++ b/app-misc/oddjob/files/oddjob-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch @@ -0,0 +1,39 @@ +From da68ec0acc6cfdd40ccd0ad23971b66e4517811e Mon Sep 17 00:00:00 2001 +From: Christopher Byrne +Date: Wed, 4 Oct 2023 20:21:20 -0500 +Subject: [PATCH] build: Keep non-PAM mkhomedir parts when PAM support is + disabled + +Signed-off-by: Christopher Byrne +--- + src/Makefile.am | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index e3af35d..5360168 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -25,9 +25,7 @@ endif + + confddir = $(sysconfdir)/$(PACKAGE)d.conf.d + confd_DATA = oddjobd-introspection.conf +-if BUILD_PAM + confd_DATA += oddjobd-mkhomedir.conf +-endif + + CLEANFILES = $(confd_DATA) + +@@ -40,10 +38,8 @@ install-data-hook: + pkgsysconfdir = $(sysconfdir)/$(PACKAGE) + systemdbusdir = $(sysconfdir)/@DBUS_PACKAGE@/system.d + systemdbus_DATA = oddjob.conf +-if BUILD_PAM + systemdbus_DATA += oddjob-mkhomedir.conf + pkglibexec_PROGRAMS = mkhomedir +-endif + + pkglibexecdir = $(libexecdir)/$(PACKAGE) + pkglibexec_SCRIPTS = sanity.sh +-- +2.41.0 + diff --git a/app-misc/oddjob/files/oddjob-0.34.7-build-Remove-with-systemd-and-with-sysvinit.patch b/app-misc/oddjob/files/oddjob-0.34.7-build-Remove-with-systemd-and-with-sysvinit.patch new file mode 100644 index 0000000000..253111efb4 --- /dev/null +++ b/app-misc/oddjob/files/oddjob-0.34.7-build-Remove-with-systemd-and-with-sysvinit.patch @@ -0,0 +1,144 @@ +From f63287a35107385dcb6e04a4c742077c9d1eab86 Mon Sep 17 00:00:00 2001 +From: Christopher Byrne +Date: Tue, 19 Sep 2023 08:39:15 -0500 +Subject: [PATCH 3/3] build: Remove --with-systemd and --with-sysvinit + +There no need a configure option for just a single file that doesn't require +any compilation. Install it unconditionally, and just delete unwanted file + +Fixes: https://pagure.io/oddjob/pull-request/16 + +Signed-off-by: Christopher Byrne +--- + configure.ac | 62 +++++---------------------------------------- + oddjob.spec | 10 ++++---- + scripts/Makefile.am | 8 ++---- + 3 files changed, 14 insertions(+), 66 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 632f47c..13a28af 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,20 +74,13 @@ DEFAULT_RECONNECT_TIMEOUT=30 + AC_DEFINE_UNQUOTED(DEFAULT_RECONNECT_TIMEOUT,$DEFAULT_RECONNECT_TIMEOUT,[Define to the default amount of time which oddjobd will pause between attempts to reconnect to the system message bus after being disconnected for any reason.]) + AC_SUBST(DEFAULT_RECONNECT_TIMEOUT) + +-AC_ARG_ENABLE(systemd, +-AS_HELP_STRING([--enable-systemd],[install unit file for systemd]), +-SYSTEMD=$enableval, +-SYSTEMD=no) +- +-AC_SUBST(SYSTEMD) +-AM_CONDITIONAL(SYSTEMD,test x$SYSTEMD != xno) +-if test x$SYSTEMD = xyes ; then +- SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd 2> /dev/null` +- AC_MSG_RESULT(will install systemd unit file) +-else +- AC_MSG_RESULT(will install sysv init script) +-fi +-AC_SUBST(SYSTEMDSYSTEMUNITDIR) ++AC_ARG_WITH([systemdsystemunitdir], ++ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], ++ [Directory for systemd service files])],, ++ [PKG_CHECK_VAR([with_systemdsystemunitdir],[systemd], ++ [systemdsystemunitdir],, ++ [with_systemdsystemunitdir=${libdir}/systemd/system])]) ++AC_SUBST([systemdsystemunitdir],[$with_systemdsystemunitdir]) + + AC_ARG_ENABLE(sample, + AS_HELP_STRING(--enable-sample,[Build and install a sample service.]), +@@ -365,47 +358,6 @@ currentgid=`id -g` + AC_SUBST(currentgid) + AC_PATH_PROGS(PATH_PWD,pwd,pwd) + +-AC_ARG_ENABLE(systemd, +-AS_HELP_STRING(--enable-systemd,[Install systemd unit files]), +-systemd=$enableval +-if test x$systemd = xyes ; then +- SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd` +-fi +-, +-if pkg-config systemd 2> /dev/null ; then +- SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd 2> /dev/null` +- systemd=yes +-else +- systemd=no +-fi +-) +- +-AC_ARG_ENABLE(sysvinit, +-AS_HELP_STRING(--enable-sysvinit,[Install sysvinit unit files]), +-sysvinit=$enableval, +-if test x$systemd = xno ; then +- sysvinit=yes +-else +- sysvinit=no +-fi +-) +-if test x$systemd = xyes ; then +- AC_MSG_RESULT([installing systemd unit file]) +- if test "x$SYSTEMDSYSTEMUNITDIR" = x ; then +- AC_MSG_ERROR([error locating systemd system unit directory]) +- fi +- AC_SUBST(SYSTEMDSYSTEMUNITDIR) +-else +- AC_MSG_RESULT([not installing systemd unit file]) +-fi +-AM_CONDITIONAL(SYSTEMD,test x$systemd = xyes) +-if test x$sysvinit = xyes ; then +- AC_MSG_RESULT([installing sysv init script]) +-else +- AC_MSG_RESULT([not installing sysv init script]) +-fi +-AM_CONDITIONAL(SYSVINIT,test x$sysvinit = xyes) +- + AC_ARG_ENABLE(pie, + AS_HELP_STRING(--enable-pie,[Build position-independent executables.]), + pie=$enableval, +diff --git a/oddjob.spec b/oddjob.spec +index f4943a1..c5a09dd 100644 +--- a/oddjob.spec ++++ b/oddjob.spec +@@ -100,11 +100,6 @@ sample_flag=--enable-sample + --with-selinux-labels \ + --without-python --enable-xml-docs --enable-compat-dtd \ + --disable-dependency-tracking \ +-%if %{systemd} +- --enable-systemd --disable-sysvinit \ +-%else +- --enable-sysvinit --disable-systemd \ +-%endif + $sample_flag + make %{_smp_mflags} + +@@ -119,6 +114,11 @@ if ! test -d "$RPM_BUILD_ROOT"/%{_lib}/security ; then + mv "$RPM_BUILD_ROOT"/%{_libdir}/security/*.so "$RPM_BUILD_ROOT"/%{_lib}/security/ + fi + %endif ++%if %{systemd} ++rm -f "$RPM_BUILD_ROOT"%{_initrddir}/oddjobd ++%else ++rm -f "$RPM_BUILD_ROOT"%{_unitdir}/oddjobd.service ++%endif + # Recommended, though I disagree. + rm -f "$RPM_BUILD_ROOT"/%{_libdir}/*.la + +diff --git a/scripts/Makefile.am b/scripts/Makefile.am +index 86d50be..a5a89b7 100644 +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -1,9 +1,5 @@ + EXTRA_DIST = oddjobd.in oddjobd.service.in +-if SYSVINIT ++systemdsystemunit_DATA = oddjobd.service + initdir = $(sysconfdir)/rc.d/init.d + init_SCRIPTS = oddjobd +-endif +-if SYSTEMD +-unitdir = @SYSTEMDSYSTEMUNITDIR@ +-unit_DATA = oddjobd.service +-endif ++ +-- +2.41.0 + diff --git a/app-misc/oddjob/files/oddjob-0.34.7-build-Restore-conditional-with-pam-flag.patch b/app-misc/oddjob/files/oddjob-0.34.7-build-Restore-conditional-with-pam-flag.patch new file mode 100644 index 0000000000..80a4de6eb5 --- /dev/null +++ b/app-misc/oddjob/files/oddjob-0.34.7-build-Restore-conditional-with-pam-flag.patch @@ -0,0 +1,66 @@ +From f5cf1c6556baf7108a6e3a3f34ee5e3f7ae849c5 Mon Sep 17 00:00:00 2001 +From: Christopher Byrne +Date: Wed, 20 Sep 2023 20:01:57 -0500 +Subject: [PATCH 1/2] build: Restore conditional --with-pam flag + +THis also fixed the spec to add --with-pam. Distrobutions like Gentoo need this + +Signed-off-by: Christopher Byrne +--- + configure.ac | 27 +++++++++++++++------------ + oddjob.spec | 1 + + 2 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 13a28af..bca6307 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,18 +43,21 @@ DBUS_INTROSPECTION_METHOD=Introspect + AC_SUBST(DBUS_INTROSPECTION_INTERFACE) + AC_SUBST(DBUS_INTROSPECTION_METHOD) + +-pam=yes +-AC_CHECK_HEADERS(security/pam_modules.h) +-savedLDFLAGS="$LDFLAGS" +-LDFLAGS= +-savedLIBS="$LIBS" +-LIBS= +-AC_CHECK_FUNCS([pam_get_user pam_get_item],,[AC_CHECK_LIB(pam,pam_get_user,,pam=no)]) +-PAM_LIBS="$LIBS" +-LIBS="$savedLIBS" +-LDFLAGS="$savedLDFLAGS" +-AC_SUBST(PAM_LIBS) +-AM_CONDITIONAL(BUILD_PAM,test x$pam = xyes) ++AC_ARG_WITH([pam], ++ [AS_HELP_STRING([--with-pam],[Build and install pam_oddjob_mkhomedir])] ++ ,,[with_pam=yes]) ++AS_IF([test "x$with_pam" != "xno"], ++ [AC_CHECK_HEADERS(security/pam_modules.h) ++ savedLDFLAGS="$LDFLAGS" ++ LDFLAGS= ++ savedLIBS="$LIBS" ++ LIBS= ++ AC_CHECK_FUNCS([pam_get_user pam_get_item],,[AC_CHECK_LIB(pam,pam_get_user,,pam=no)]) ++ PAM_LIBS="$LIBS" ++ LIBS="$savedLIBS" ++ LDFLAGS="$savedLDFLAGS" ++ AC_SUBST(PAM_LIBS)]) ++AM_CONDITIONAL(BUILD_PAM,[test "x$with_pam" != "xno"]) + + dnl Oh, for the clear management of OID arcs.... + NAMESPACE=com.redhat +diff --git a/oddjob.spec b/oddjob.spec +index c5a09dd..6e62f2b 100644 +--- a/oddjob.spec ++++ b/oddjob.spec +@@ -96,6 +96,7 @@ sample_flag=--enable-sample + %configure \ + --disable-static \ + --enable-pie --enable-now \ ++ --with-pam \ + --with-selinux-acls \ + --with-selinux-labels \ + --without-python --enable-xml-docs --enable-compat-dtd \ +-- +2.41.0 + diff --git a/app-misc/oddjob/files/oddjob-0.34.7-src-oddjobd.c-Fix-non-selinux-build.patch b/app-misc/oddjob/files/oddjob-0.34.7-src-oddjobd.c-Fix-non-selinux-build.patch new file mode 100644 index 0000000000..7cee66b647 --- /dev/null +++ b/app-misc/oddjob/files/oddjob-0.34.7-src-oddjobd.c-Fix-non-selinux-build.patch @@ -0,0 +1,35 @@ +From 6e0328ab88daed53ffbaca9a7212cf57ff70de69 Mon Sep 17 00:00:00 2001 +From: Christopher Byrne +Date: Tue, 19 Sep 2023 09:44:59 -0500 +Subject: [PATCH 1/3] src/oddjobd.c: Fix non-selinux build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes a oddjobd.c:2988:61: error: ‘struct ’ has no member +named ‘selinux_enabled’ + +Signed-off-by: Christopher Byrne +--- + src/oddjobd.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/oddjobd.c b/src/oddjobd.c +index ca78550..44de748 100644 +--- a/src/oddjobd.c ++++ b/src/oddjobd.c +@@ -2985,7 +2985,11 @@ main(int argc, char **argv) + + /* Open a connection to the message bus. */ + check_selinux_applicable(); ++#if SELINUX_ACLS + ctx = oddjob_dbus_listeners_new(options.bus, globals.selinux_enabled); ++#else ++ ctx = oddjob_dbus_listeners_new(options.bus, 0); ++#endif + if (ctx == NULL) { + fprintf(stderr, "Error connecting to D-Bus!\n"); + return 2; +-- +2.41.0 + diff --git a/app-misc/oddjob/files/oddjob.init.d b/app-misc/oddjob/files/oddjob.init.d new file mode 100644 index 0000000000..732ad5b632 --- /dev/null +++ b/app-misc/oddjob/files/oddjob.init.d @@ -0,0 +1,21 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + after netmount localmount + need dbus +} + +start() { + ebegin "Starting oddjobd" + start-stop-daemon -p /run/lock/oddjobd.pid \ + --exec /usr/sbin/oddjobd --start -- -p /run/lock/oddjobd.pid + eend $? +} + +stop() { + ebegin "Stopping oddjobd" + start-stop-daemon -p /run/lock/oddjobd.pid --stop + eend $? +} diff --git a/app-misc/oddjob/metadata.xml b/app-misc/oddjob/metadata.xml new file mode 100644 index 0000000000..a9cb1a3afe --- /dev/null +++ b/app-misc/oddjob/metadata.xml @@ -0,0 +1,9 @@ + + + + + salah.coronya@gmail.com + Christopher Byrne + + + diff --git a/app-misc/oddjob/oddjob-0.34.7.ebuild b/app-misc/oddjob/oddjob-0.34.7.ebuild new file mode 100644 index 0000000000..7610d7dd59 --- /dev/null +++ b/app-misc/oddjob/oddjob-0.34.7.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="A D-Bus service which runs odd jobs on behalf of client applications" + +HOMEPAGE="https://pagure.io/oddjob" +SRC_URI="https://releases.pagure.org/oddjob/${P}.tar.gz" +LICENSE="BSD" + +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc examples pam selinux" + +RESTRICT="test" + +RDEPEND="sys-apps/dbus[selinux?] + pam? ( sys-libs/pam ) + selinux? ( + sec-policy/selinux-oddjob + sys-libs/libselinux + )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + doc? ( app-text/docbook-xml-dtd:4.3 + app-text/xmlto + )" + +PATCHES=( + "${FILESDIR}/${PN}-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch" + "${FILESDIR}/${PN}-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch" + "${FILESDIR}/${PN}-0.34.7-build-Remove-with-systemd-and-with-sysvinit.patch" + "${FILESDIR}/${PN}-0.34.7-build-Restore-conditional-with-pam-flag.patch" + "${FILESDIR}/${PN}-0.34.7-src-oddjobd.c-Fix-non-selinux-build.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --libdir=/$(get_libdir) + $(use_with pam) + $(use_with selinux selinux-labels) + $(use_with selinux selinux-acls) + $(use_enable examples sample) + $(use_enable doc xml-docs) + $(use_enable doc compat-dtd) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + rm -f "${ED}/etc/rc.d/init.d/oddjobd" + newinitd "${FILESDIR}/oddjob.init.d" "oddjobd" + + find "${ED}" -iname \*.la -type f -delete +} From 9194154b78376f6daf0039446d64ec0b9a50b53d Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Wed, 11 Oct 2023 23:12:55 +0200 Subject: [PATCH 11/12] x11-misc/gromit-mpx: add 1.5.0 Signed-off-by: Oliver Freyermuth --- x11-misc/gromit-mpx/Manifest | 1 + x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild | 40 +++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild diff --git a/x11-misc/gromit-mpx/Manifest b/x11-misc/gromit-mpx/Manifest index 6a32e2d3ae..d46527b207 100644 --- a/x11-misc/gromit-mpx/Manifest +++ b/x11-misc/gromit-mpx/Manifest @@ -1 +1,2 @@ DIST gromit-mpx-1.4.3.tar.gz 1861824 BLAKE2B f8337adf400b40e10dd32dfc702be73039e2cc3da9430b4d911794b6e0a9f16b6862948c9573d189445f47ec23a6bde2126765cf8df61af0a46b7dcb94c951d4 SHA512 9da94c3aed4d9c52c62317373ae1ca6dd6ece1adf3c48b95126b6f40ebe6ae8ede45c7c8c93732bcaafbb7ba85b66677b100cb0115fa989661e1e9c8f489ae25 +DIST gromit-mpx-1.5.0.tar.gz 1878498 BLAKE2B db4e7ef12dd9abad7968d412b221d6a48348a1eb5bcd791787cb99bdb400674126bb9902b77825d260ddd26731bd9b674bf806d7a856ece2bd5f417ad45323f7 SHA512 5da359c1d25dcb8797096a905072c59f1fc7aafd60b3624908e90a5388bdd928f81bde615c46acfe2d51c0b869ee70c271c561396cd992d3a18e389ba6b281a7 diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild new file mode 100644 index 0000000000..95600ede05 --- /dev/null +++ b/x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool" +HOMEPAGE="https://github.com/bk138/gromit-mpx" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bk138/${PN}.git" +else + SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +SLOT="0" +LICENSE="GPL-2" + +RDEPEND=" + x11-libs/gtk+:3 + dev-libs/libappindicator:3 + x11-libs/libX11 + >=x11-apps/xinput-1.3 +" +DEPEND="${RDEPEND}" + +src_prepare () { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc + ) + + cmake_src_configure +} From 87af1012ad0c3b9d24b5ec3d17530052a99ca880 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 12 Oct 2023 11:23:30 +0800 Subject: [PATCH 12/12] sys-apps/bat-extras: bump to 2023.09.19, remove sys-apps/exa - sys-apps/exa removed in ::gentoo, and changed to sys-apps/eza [1] - bat-extras-2023.09.19 changed to use sys-apps/eza [2] [1] https://github.com/gentoo/gentoo/commit/64cad5f333e281d5044a35943cb2ca62452d1150 [2] https://github.com/eth-p/bat-extras/commit/d96fc92165069159a977e3d36c50beed88647417 Signed-off-by: Huang Rui --- sys-apps/bat-extras/Manifest | 2 +- ...2.07.27.ebuild => bat-extras-2023.09.19.ebuild} | 14 +++++++------- sys-apps/bat-extras/bat-extras-9999.ebuild | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) rename sys-apps/bat-extras/{bat-extras-2022.07.27.ebuild => bat-extras-2023.09.19.ebuild} (97%) diff --git a/sys-apps/bat-extras/Manifest b/sys-apps/bat-extras/Manifest index 27c2a072cb..9b72f8f155 100644 --- a/sys-apps/bat-extras/Manifest +++ b/sys-apps/bat-extras/Manifest @@ -1 +1 @@ -DIST bat-extras-2022.07.27.tar.gz 41647 BLAKE2B aa481520c49675c249b47b9b6a1f06c24928ccf6eb96a0b1b17d87364f43063d718cea61a8edaebca097a27c239e528bf8c10f93b7d09d92b374cbf720fc6481 SHA512 352edf8f5879239894a8defbac466e908f6235bf4a9c7a64622418f2bdbae9b364343fca54769f792025d2a87aeca52a356ee36c5733eee7fd641d8d5c8d995b +DIST bat-extras-2023.09.19.tar.gz 49416 BLAKE2B f67cee8793951921b92b802b57fb96e50ac8bf6db3ebdf852d56dbaf818a3fc3d3439481f5fa9cbe834334119b368bb90f1020cd708a5b1540de2c6007fae6d2 SHA512 021dd25c77476d2059ee80659a870db214da25cd2683ac7a15748f356dd416c257a98595188df9c76aea37233c5b67cef82d8d829f5ecc185ecad0dc47105ddd diff --git a/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild similarity index 97% rename from sys-apps/bat-extras/bat-extras-2022.07.27.ebuild rename to sys-apps/bat-extras/bat-extras-2023.09.19.ebuild index 682f571b79..f0c500214b 100644 --- a/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild +++ b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,15 +26,15 @@ DEPEND=" " RDEPEND=" ${DEPEND} - dev-vcs/git - sys-apps/ripgrep app-admin/entr - dev-util/git-delta - sys-devel/clang - sys-apps/exa app-shells/fzf - sys-libs/ncurses dev-python/black + dev-util/git-delta + dev-vcs/git + sys-apps/eza + sys-apps/ripgrep + sys-devel/clang + sys-libs/ncurses virtual/rust[rustfmt(+)] " diff --git a/sys-apps/bat-extras/bat-extras-9999.ebuild b/sys-apps/bat-extras/bat-extras-9999.ebuild index 682f571b79..f0c500214b 100644 --- a/sys-apps/bat-extras/bat-extras-9999.ebuild +++ b/sys-apps/bat-extras/bat-extras-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,15 +26,15 @@ DEPEND=" " RDEPEND=" ${DEPEND} - dev-vcs/git - sys-apps/ripgrep app-admin/entr - dev-util/git-delta - sys-devel/clang - sys-apps/exa app-shells/fzf - sys-libs/ncurses dev-python/black + dev-util/git-delta + dev-vcs/git + sys-apps/eza + sys-apps/ripgrep + sys-devel/clang + sys-libs/ncurses virtual/rust[rustfmt(+)] "