Skip to Content.
Sympa Menu

sm-commit - Re: [[SM-Commit] ] [sm-commit] GIT changes to master grimoire by Treeve Jelbert (e03b9b423563ff086d377980f4866cabe072f69b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: public AT sourcemage.org
  • To: sm-commit AT lists.sourcemage.org, sm-commit AT lists.ibiblio.org
  • Subject: Re: [[SM-Commit] ] [sm-commit] GIT changes to master grimoire by Treeve Jelbert (e03b9b423563ff086d377980f4866cabe072f69b)
  • Date: Wed, 9 Oct 2024 13:05:39 -0400

No SOURCE_HASH update?

On Wed, Oct 09, 2024 at 02:57:47PM +0000, Treeve Jelbert wrote:
> GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
>
> x11-libs/cairo/DETAILS | 2
> x11-libs/cairo/HISTORY | 4 +
> x11-libs/cairo/PRE_BUILD | 10
> ---
> x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch | 29
> ----------
> 4 files changed, 5 insertions(+), 40 deletions(-)
>
> New commits:
> commit e03b9b423563ff086d377980f4866cabe072f69b
> Author: Treeve Jelbert <treeve AT sourcemage.org>
> Commit: Treeve Jelbert <treeve AT sourcemage.org>
>
> cairo: => 1.18.2
>
> diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
> index f6e8bb2..60b3b94 100755
> --- a/x11-libs/cairo/DETAILS
> +++ b/x11-libs/cairo/DETAILS
> @@ -9,7 +9,7 @@ if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
> FORCE_DOWNLOAD=1
> SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
> else
> - VERSION=1.18.1
> + VERSION=1.18.2
>
> SOURCE_HASH="sha256:a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a:UPSTREAM_HASH"
> SOURCE=$SPELL-$VERSION.tar.xz
> SOURCE_URL[0]="https://cairographics.org/releases/${SOURCE}";
> diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
> index 660631b..3442160 100644
> --- a/x11-libs/cairo/HISTORY
> +++ b/x11-libs/cairo/HISTORY
> @@ -1,3 +1,7 @@
> +2024-10-08 Treeve Jelbert <treeve AT sourcemage.org>
> + * DETAILS: version 1.18.2
> + * patchs/* PRE_BUILD: deleted
> +
> 2024-09-01 Pavel Vinogradov <public AT sourcemage.org>
> * DETAILS: version 1.18.2
>
> diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
> deleted file mode 100755
> index d2b7e8c..0000000
> --- a/x11-libs/cairo/PRE_BUILD
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -default_pre_build &&
> -cd ${SOURCE_DIRECTORY} &&
> -
> -apply_patch_dir patches &&
> -
> -if [[ "$CAIRO_BRANCH" != "scm" ]]; then
> - apply_patch_dir patches-stable
> -else
> - apply_patch_dir patches-scm
> -fi
> diff --git
> a/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
> b/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
> deleted file mode 100644
> index 45ba675..0000000
> --- a/x11-libs/cairo/patches/0001-Fix-build-against-binutils-2.39.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -diff --git a/meson.build b/meson.build
> -index 970f49a52..14736e12e 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -720,7 +720,9 @@ endif
> - bfd_dep = cc.find_library('bfd', has_headers: ['bfd.h'], required:
> get_option('symbol-lookup'))
> - if bfd_dep.found() and \
> - cc.has_function('bfd_openr', dependencies: [bfd_dep]) and \
> -- cc.links(files('meson-cc-tests/bfd-section-flags.c'), name:
> 'bfd_section_flags', dependencies: bfd_dep)
> -+ cc.links(files('meson-cc-tests/bfd-section-flags.c'),
> -+ args: ['-DPACKAGE=cairo
> -DPACKAGE_VERSION="@0@"'.format(meson.project_version()),],
> -+ name: 'bfd_section_flags', dependencies: bfd_dep)
> - conf.set('HAVE_BFD', 1)
> - deps += [bfd_dep]
> - elif get_option('symbol-lookup').enabled()
> -diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
> -index 8d4ac131b..cf05352c5 100644
> ---- a/util/cairo-trace/meson.build
> -+++ b/util/cairo-trace/meson.build
> -@@ -11,7 +11,8 @@ shared_lib_ext = libcairo.full_path().split('.')[-1]
> - libcairotrace = library('cairo-trace', cairo_trace_sources,
> - include_directories: [incbase, incsrc],
> - dependencies: deps,
> -- c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] +
> pthread_c_args,
> -+ c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),
> -+ '-DPACKAGE=cairo
> -DPACKAGE_VERSION="@0@"'.format(meson.project_version()),] + pthread_c_args,
> - link_args: extra_link_args,
> - gnu_symbol_visibility: 'hidden',
> - install: true,
>



Archive powered by MHonArc 2.6.24.

Top of Page