+From: Laurent Bercot <ska-skaware@skarnet.org>

+Date: Mon, 24 Jan 2022 11:44:29 +0000

+Subject: [PATCH] Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during

+ autodetection

+

+Upstream-commit: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")

+See-also: http://skarnet.org/lists/skaware/1656.html

+---

+diff --git a/configure b/configure

+index 1aa8fc7..430e57e 100755

+--- a/configure

++++ b/configure

+@@ -99,7 +99,7 @@ stripdir () {

+ tryflag () {

+ echo "Checking whether compiler accepts $2 ..."

+ echo "typedef int x;" > "$tmpc"

+- if $CC_AUTO "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then

++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then

+ echo " ... yes"

+ eval "$1=\"\${$1} \$2\""

+ eval "$1=\${$1# }"

+@@ -113,7 +113,7 @@ tryflag () {

+ tryldflag () {

+ echo "Checking whether linker accepts $2 ..."

+ echo "typedef int x;" > "$tmpc"

+- if $CC_AUTO -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then

++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then

+ echo " ... yes"

+ eval "$1=\"\${$1} \$2\""

+ eval "$1=\${$1# }"

+--

+2.34.1

+

+From: Laurent Bercot <ska-skaware@skarnet.org>

+Date: Mon, 24 Jan 2022 11:44:29 +0000

+Subject: [PATCH] Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during

+ autodetection

+

+Backported-from: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")

+See-also: http://skarnet.org/lists/skaware/1656.html

+---

+diff --git a/configure b/configure

+index 55f34f8..49b3678 100755

+--- a/configure

++++ b/configure

+@@ -99,7 +99,7 @@ stripdir () {

+ tryflag () {

+ echo "Checking whether compiler accepts $2 ..."

+ echo "typedef int x;" > "$tmpc"

+- if $CC_AUTO "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then

++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then

+ echo " ... yes"

+ eval "$1=\"\${$1} \$2\""

+ eval "$1=\${$1# }"

+@@ -113,7 +113,7 @@ tryflag () {

+ tryldflag () {

+ echo "Checking whether linker accepts $2 ..."

+ echo "typedef int x;" > "$tmpc"

+- if $CC_AUTO -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then

++ if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then

+ echo " ... yes"

+ eval "$1=\"\${$1} \$2\""

+ eval "$1=\${$1# }"

+--

+2.34.1

+

+PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )

+

+PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )

+

+DIST diffoscope-202.tar.gz 2706185 BLAKE2B 11d77445d9cd4a8b2bba5f8a31a3b9e08862937af3ce3aea993603026483758d1742254629fb7541c751ab1c5213dff892b102bc625ead78fc56ce01e25aefd8 SHA512 f42ea35a492ef62740188986b25f629d4a0d62d1ee1e6d284c4251577170720ca731a7f11f387f64b68f82817f47019b3aaf236d0bb19f4c0a65d4048c5a0266

+DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9

+# Copyright 1999-2021 Gentoo Authors

+# Distributed under the terms of the GNU General Public License v2

+

+EAPI=8

+

+PYTHON_COMPAT=( python3_{8..10} )

+DISTUTILS_SINGLE_IMPL=true

+DISTUTILS_USE_SETUPTOOLS=no

+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils

+

+DESCRIPTION="The highly caffeinated git GUI"

+HOMEPAGE="https://git-cola.github.io/"

+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

+

+LICENSE="GPL-2"

+SLOT="0"

+KEYWORDS="~amd64 ~x86"

+IUSE="doc test"

+

+RESTRICT="!test? ( test )"

+

+RDEPEND="

+ $(python_gen_cond_dep '

+ dev-python/numpy[${PYTHON_USEDEP}]

+ dev-python/pygments[${PYTHON_USEDEP}]

+ dev-python/QtPy[gui,network,${PYTHON_USEDEP}]

+ dev-python/send2trash[${PYTHON_USEDEP}]

+ ')

+ dev-vcs/git

+"

+BDEPEND="sys-devel/gettext

+ $(python_gen_cond_dep "

+ doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )

+ test? (

+ ${VIRTUALX_DEPEND}

+ dev-python/pytest[\${PYTHON_USEDEP}]

+ dev-python/mock[\${PYTHON_USEDEP}]

+ dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]

+ )

+ ")

+"

+

+python_prepare_all() {

+ # make sure that tests also use the system provided QtPy

+ rm -r qtpy || die

+

+ rm share/git-cola/bin/*askpass* || die

+

+ # don't install docs into wrong location

+ sed -i -e '/doc/d' setup.py || die

+

+ # fix doc directory reference

+ sed -i \

+ -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \

+ cola/resources.py || die

+

+ # fix ssh-askpass directory reference

+ sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die

+

+ # disable flake8 testing, it's not useful for ebuilds

+ sed -i -e 's:--flake8::' pytest.ini || die

+

+ distutils-r1_python_prepare_all

+}

+

+python_configure_all() {

+ DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )

+}

+

+python_compile_all() {

+ cd share/doc/${PN}/ || die

+ if use doc ; then

+ emake all

+ else

+ sed \

+ -e '/^install:/s:install-html::g' \

+ -e '/^install:/s:install-man::g' \

+ -i Makefile || die

+ fi

+}

+

+python_test() {

+ GIT_CONFIG_NOSYSTEM=true \

+ PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \

+ virtx epytest cola test

+}

+

+python_install_all() {

+ cd share/doc/${PN}/ || die

+ emake \

+ DESTDIR="${D}" \

+ docdir="${EPREFIX}/usr/share/doc/${PF}" \

+ prefix="${EPREFIX}/usr" \

+ install

+

+ # remove empty bin folder

+ rm -R "${ED}"/usr/share/git-cola/bin || die

+

+ use doc || HTML_DOCS=( "${FILESDIR}"/index.html )

+

+ distutils-r1_python_install_all

+ readme.gentoo_create_doc

+}

+

+pkg_postinst() {

+ xdg_desktop_database_update

+}

+

+pkg_postrm() {

+ xdg_desktop_database_update

+}

+DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42

+--- a/lib/init/variables.html

++++ b/lib/init/variables.html

+@@ -234,12 +234,7 @@ PERMANENT

+ <dt>GRASS_PERL</dt>

+ <dd>[used during install process for generating man pages]<br>

+ set Perl with path.</dd>

+-

+- <dt>GRASS_PROXY</dt>

+- <dd>[used during addon install/reinstall process for generating man

+- pages (download commit from GitHub API server and remote modules.xml file)]<br>

+- set the proxy with: <tt>GRASS_PROXY="http=&lt;value&gt;,ftp=&lt;value&gt;"</tt>.</dd>

+-

++

+ <dt>GRASS_SKIP_MAPSET_OWNER_CHECK</dt>

+ <dd>By default it is not possible to work with MAPSETs that are

+ not owned by current user. Setting this variable to any non-empty value

+--- a/scripts/g.extension/g.extension.py

++++ b/scripts/g.extension/g.extension.py

+@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, *args, **kwargs):

+ ),

+ )

+ return response

++

+ except HTTPError as err:

+ if err.code == 403 and err.msg == "rate limit exceeded":

+ gscript.warning(

+@@ -2588,8 +2589,6 @@ def main():

+ proxy = urlrequest.ProxyHandler(PROXIES)

+ opener = urlrequest.build_opener(proxy)

+ urlrequest.install_opener(opener)

+- # Required for mkhtml.py script (get addon git commit from GitHub API server)

+- os.environ["GRASS_PROXY"] = options["proxy"]

+

+ # define path

+ options["prefix"] = resolve_install_prefix(

+--- a/utils/mkhtml.py

++++ b/utils/mkhtml.py

+@@ -16,7 +16,6 @@

+ #

+ #############################################################################

+

+-import http

+ import sys

+ import os

+ import string

+@@ -25,9 +24,6 @@ from datetime import datetime

+ import locale

+ import json

+ import pathlib

+-import shutil

+-import subprocess

+-import time

+

+ try:

+ # Python 2 import

+@@ -35,26 +31,11 @@ try:

+ except ImportError:

+ # Python 3 import

+ from html.parser import HTMLParser

+-

+-from six.moves.urllib import request as urlrequest

+-from six.moves.urllib.error import HTTPError, URLError

+-

+ try:

+ import urlparse

+ except ImportError:

+ import urllib.parse as urlparse

+

+-try:

+- import grass.script as gs

+-except ImportError:

+- # During compilation GRASS GIS

+- gs = None

+-

+-HEADERS = {

+- "User-Agent": "Mozilla/5.0",

+-}

+-HTTP_STATUS_CODES = list(http.HTTPStatus)

+-

+ if sys.version_info[0] == 2:

+ PY2 = True

+ else:

+@@ -65,24 +46,6 @@ if not PY2:

+ unicode = str

+

+

+-grass_version = os.getenv("VERSION_NUMBER", "unknown")

+-trunk_url = ""

+-addons_url = ""

+-if grass_version != "unknown":

+- major, minor, patch = grass_version.split(".")

+- grass_git_branch = "releasebranch_{major}_{minor}".format(

+- major=major,

+- minor=minor,

+- )

+- base_url = "https://github.com/OSGeo"

+- trunk_url = "{base_url}/grass/tree/{branch}/".format(

+- base_url=base_url, branch=grass_git_branch

+- )

+- addons_url = "{base_url}/grass-addons/tree/grass{major}/".format(

+- base_url=base_url, major=major

+- )

+-

+-

+ def _get_encoding():

+ encoding = locale.getdefaultlocale()[1]

+ if not encoding:

+@@ -105,151 +68,6 @@ def decode(bytes_):

+ return unicode(bytes_)

+

+

+-def urlopen(url, *args, **kwargs):

+- """Wrapper around urlopen. Same function as 'urlopen', but with the

+- ability to define headers.

+- """

+- request = urlrequest.Request(url, headers=HEADERS)

+- return urlrequest.urlopen(request, *args, **kwargs)

+-

+-

+-def set_proxy():

+- """Set proxy"""

+- proxy = os.getenv("GRASS_PROXY")

+- if proxy:

+- proxies = {}

+- for ptype, purl in (p.split("=") for p in proxy.split(",")):

+- proxies[ptype] = purl

+- urlrequest.install_opener(

+- urlrequest.build_opener(urlrequest.ProxyHandler(proxies))

+- )

+-

+-

+-set_proxy()

+-

+-

+-def download_git_commit(url, response_format, *args, **kwargs):

+- """Download module/addon last commit from GitHub API

+-

+- :param str url: url address

+- :param str response_format: content type

+-

+- :return urllib.request.urlopen or None response: response object or

+- None

+- """

+- try:

+- response = urlopen(url, *args, **kwargs)

+- if not response.code == 200:

+- index = HTTP_STATUS_CODES.index(response.code)

+- desc = HTTP_STATUS_CODES[index].description

+- gs.fatal(

+- _(

+- "Download commit from <{url}>, return status code "

+- "{code}, {desc}".format(

+- url=url,

+- code=response.code,

+- desc=desc,

+- ),

+- ),

+- )

+- if response_format not in response.getheader("Content-Type"):

+- gs.fatal(

+- _(

+- "Wrong downloaded commit file format. "

+- "Check url <{url}>. Allowed file format is "

+- "{response_format}.".format(

+- url=url,

+- response_format=response_format,

+- ),

+- ),

+- )

+- return response

+- except HTTPError as err:

+- gs.warning(

+- _(

+- "The download of the commit from the GitHub API "

+- "server wasn't successful, <{}>. Commit and commit "

+- "date will not be included in the <{}> addon html manual "

+- "page.".format(err.msg, pgm)

+- ),

+- )

+- except URLError:

+- gs.warning(

+- _(

+- "Download file from <{url}>, failed. Check internet "

+- "connection. Commit and commit date will not be included "

+- "in the <{pgm}> addon manual page.".format(url=url, pgm=pgm)

+- ),

+- )

+-

+-

+-def get_last_git_commit(src_dir, is_addon, addon_path):

+- """Get last module/addon git commit

+-

+- :param str src_dir: module/addon source dir

+- :param bool is_addon: True if it is addon

+- :param str addon_path: addon path

+-

+- :return dict git_log: dict with key commit and date, if not

+- possible download commit from GitHub API server

+- values of keys have "unknown" string

+- """

+- unknown = "unknown"

+- git_log = {"commit": unknown, "date": unknown}

+- datetime_format = "%A %b %d %H:%M:%S %Y" # e.g. Sun Jan 16 23:09:35 2022

+- if is_addon:

+- grass_addons_url = (

+- "https://api.github.com/repos/osgeo/grass-addons/commits?path={path}"

+- "&page=1&per_page=1&sha=grass{major}".format(

+- path=addon_path,

+- major=major,

+- )

+- ) # sha=git_branch_name

+- else:

+- core_module_path = os.path.join(

+- *(set(src_dir.split(os.path.sep)) ^ set(topdir.split(os.path.sep)))

+- )

+- grass_modules_url = (

+- "https://api.github.com/repos/osgeo/grass/commits?path={path}"

+- "&page=1&per_page=1&sha={branch}".format(

+- branch=grass_git_branch,

+- path=core_module_path,

+- )

+- ) # sha=git_branch_name

+-

+- if shutil.which("git"):

+- if os.path.exists(src_dir):

+- git_log["date"] = time.ctime(os.path.getmtime(src_dir))

+- stdout, stderr = subprocess.Popen(

+- args=["git", "log", "-1", src_dir],

+- stdout=subprocess.PIPE,

+- stderr=subprocess.PIPE,

+- ).communicate()

+- stdout = decode(stdout)

+- stderr = decode(stderr)

+-

+- if stderr and "fatal: not a git repository" in stderr:

+- response = download_git_commit(

+- url=grass_addons_url if is_addon else grass_modules_url,

+- response_format="application/json",

+- )

+- if response:

+- commit = json.loads(response.read())

+- if commit:

+- git_log["commit"] = commit[0]["sha"]

+- git_log["date"] = datetime.strptime(

+- commit[0]["commit"]["author"]["date"],

+- "%Y-%m-%dT%H:%M:%SZ",

+- ).strftime(datetime_format)

+- else:

+- if stdout:

+- commit = stdout.splitlines()

+- git_log["commit"] = commit[0].split(" ")[-1]

+- commit_date = commit[2].lstrip("Date:").strip()

+- git_log["date"] = commit_date.rsplit(" ", 1)[0]

+- return git_log

+-

+-

+ html_page_footer_pages_path = (

+ os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")

+ if os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")

+@@ -261,6 +79,14 @@ pgm = sys.argv[1]

+ src_file = "%s.html" % pgm

+ tmp_file = "%s.tmp.html" % pgm

+

++grass_version = os.getenv("VERSION_NUMBER", "unknown")

++trunk_url = ""

++addons_url = ""

++if grass_version != "unknown":

++ major, minor, patch = grass_version.split(".")

++ trunk_url = f"https://github.com/OSGeo/grass/tree/releasebranch_{major}_{minor}/"

++ addons_url = f"https://github.com/OSGeo/grass-addons/tree/grass{major}/"

++

+ header_base = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

+ <html>

+ <head>

+@@ -295,9 +121,6 @@ sourcecode = string.Template(

+ <a href="${URL_SOURCE}">${PGM} source code</a>

+ (<a href="${URL_LOG}">history</a>)

+ </p>

+-<p>

+- ${DATE_TAG}

+-</p>

+ """

+ )

+

+@@ -624,7 +447,6 @@ else:

+ source_url = addons_url

+ pgmdir = os.path.sep.join(curdir.split(os.path.sep)[-3:])

+ url_source = ""

+-addon_path = None

+ if os.getenv("SOURCE_URL", ""):

+ addon_path = get_addon_path()

+ if addon_path:

+@@ -655,23 +477,11 @@ if index_name:

+ else:

+ url_log = url_source.replace(tree, commits)

+

+- git_commit = get_last_git_commit(

+- src_dir=curdir,

+- addon_path=addon_path if addon_path else None,

+- is_addon=True if addon_path else False,

+- )

+- if git_commit["commit"] == "unknown":

+- date_tag = "Accessed: {date}".format(date=git_commit["date"])

+- else:

+- date_tag = "Latest change: {date} in commit: {commit}".format(

+- date=git_commit["date"], commit=git_commit["commit"]

+- )

+ sys.stdout.write(

+ sourcecode.substitute(

+ URL_SOURCE=url_source,

+ PGM=pgm,

+ URL_LOG=url_log,

+- DATE_TAG=date_tag,

+ )

+ )

+ sys.stdout.write(

+ "${FILESDIR}/${PN}-${PV}-mkhtml.patch"