Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Apr 2022 04:25:34 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 193550c2afde - main - deskutils/conkyforecast: Fix build with setuptools 61.0.0+
Message-ID:  <202204160425.23G4PYoJ008945@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=193550c2afde726e71f0835f589b435986ec8f97

commit 193550c2afde726e71f0835f589b435986ec8f97
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-04-16 04:15:47 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-04-16 04:19:54 +0000

    deskutils/conkyforecast: Fix build with setuptools 61.0.0+
    
    With hat:       python
---
 deskutils/conkyforecast/files/patch-setup.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/deskutils/conkyforecast/files/patch-setup.py b/deskutils/conkyforecast/files/patch-setup.py
index 32a0c3ff412a..2adc1b4676a0 100644
--- a/deskutils/conkyforecast/files/patch-setup.py
+++ b/deskutils/conkyforecast/files/patch-setup.py
@@ -1,10 +1,18 @@
---- setup.py.orig	2010-01-07 05:02:45.000000000 +0700
-+++ setup.py	2010-05-07 23:16:08.000000000 +0800
-@@ -46,7 +46,6 @@
- 			('/usr/share/conkyforecast/', [ 'conkyForecast.pot' ] ),
+--- setup.py.orig	2011-04-29 09:12:29 UTC
++++ setup.py
+@@ -46,7 +46,6 @@ setup(
  			('/usr/share/conkyforecast/', [ 'conkyForecast.config' ] ),
+ 			('/usr/share/conkyforecast/', [ 'conkyForecast-SunsetSunriseCountdown.py' ] ),
  			('/usr/share/conkyforecast/example', listfiles( 'example', '*' ) ),
 -			('/usr/share/fonts/truetype/conkyforecast', listfiles( 'fonts', '*' ) ),
  			('/usr/share/conkyforecast/images/bearingicons', listfiles( 'images/bearingicons', '*' ) ),
  			('/usr/share/conkyforecast/images/moonicons', listfiles( 'images/moonicons', '*' ) ),
  			('/usr/share/conkyforecast/images/weathericons', listfiles( 'images/weathericons', '*' ) ),
+@@ -68,5 +67,7 @@ setup(
+ 			('/usr/share/conkyforecast/locale/zh/LC_MESSAGES', listfiles( 'locale/zh/LC_MESSAGES', '*' ) ),
+ 			('/usr/share/conkyforecast/test', listfiles( 'test', '*' ) )
+ 		],
++        # Declare packages explicitly so that setuptools does not attempt auto discovery
++        packages=[],
+ 	)
+ 



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