Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Mar 2025 11:22:47 GMT
From:      Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9dac67069c0f - main - sysutils/conky: Fix build on ARCH != amd64
Message-ID:  <202503261122.52QBMlhP066124@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9dac67069c0f0ce5d8cb12b492ed0b61232230b7

commit 9dac67069c0f0ce5d8cb12b492ed0b61232230b7
Author:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
AuthorDate: 2025-03-26 07:46:30 +0000
Commit:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
CommitDate: 2025-03-26 11:22:34 +0000

    sysutils/conky: Fix build on ARCH != amd64
    
    Regenerate the extra patch.
    
    Reported by:    pkg fallout
---
 sysutils/conky/files/extra-patch-src_CMakeLists.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sysutils/conky/files/extra-patch-src_CMakeLists.txt b/sysutils/conky/files/extra-patch-src_CMakeLists.txt
index f059640294b9..163458f3f1c7 100644
--- a/sysutils/conky/files/extra-patch-src_CMakeLists.txt
+++ b/sysutils/conky/files/extra-patch-src_CMakeLists.txt
@@ -1,11 +1,11 @@
---- src/CMakeLists.txt.orig	2019-02-23 02:12:15 UTC
-+++ src/CMakeLists.txt
-@@ -124,7 +124,7 @@ if(OS_LINUX)
- endif(OS_LINUX)
- 
- if(OS_FREEBSD)
--  set(freebsd freebsd.cc freebsd.h bsdapm.cc bsdapm.h)
-+  set(freebsd freebsd.cc freebsd.h)
-   set(optional_sources ${optional_sources} ${freebsd})
+--- src/CMakeLists.txt.orig	2025-03-16 13:37:37.000000000 +0100
++++ src/CMakeLists.txt	2025-03-26 08:43:07.729405000 +0100
+@@ -165,8 +165,6 @@
+   set(freebsd_sources
+     data/os/freebsd.cc
+     data/os/freebsd.h
+-    data/hardware/bsdapm.cc
+-    data/hardware/bsdapm.h
+   )
+   set(optional_sources ${optional_sources} ${freebsd_sources})
  endif(OS_FREEBSD)
- 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202503261122.52QBMlhP066124>