FreeBSD Bugzilla – Attachment 256082 Details for
Bug 283531
graphics/cairo: Update to 1.18.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
0001-graphics-cairo-Update-to-1.18.2.patch (text/plain), 11.42 KB, created by
Tijl Coosemans
on 2024-12-23 23:02:42 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Tijl Coosemans
Created:
2024-12-23 23:02:42 UTC
Size:
11.42 KB
patch
obsolete
>From 5596dba638c13e3353fd3842bd262d9c3d326ad5 Mon Sep 17 00:00:00 2001 >From: Tijl Coosemans <tijl@FreeBSD.org> >Date: Fri, 21 Jun 2024 16:45:30 +0200 >Subject: [PATCH] graphics/cairo: Update to 1.18.2 > >PR: ? >Exp-run by: antoine >--- > graphics/cairo/Makefile | 83 ++++++------------- > graphics/cairo/distinfo | 8 +- > graphics/cairo/files/patch-Makefile.am | 10 --- > .../files/patch-build_configure.ac.system | 17 ---- > graphics/cairo/files/patch-configure.ac | 11 --- > graphics/cairo/pkg-plist | 43 +++++----- > 6 files changed, 49 insertions(+), 123 deletions(-) > delete mode 100644 graphics/cairo/files/patch-Makefile.am > delete mode 100644 graphics/cairo/files/patch-build_configure.ac.system > delete mode 100644 graphics/cairo/files/patch-configure.ac > >diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile >index ee7a75ff276b..def12eb9f3e4 100644 >--- a/graphics/cairo/Makefile >+++ b/graphics/cairo/Makefile >@@ -1,14 +1,10 @@ > PORTNAME= cairo >-DISTVERSION= 1.17.4 >-PORTREVISION= 2 >+DISTVERSION= 1.18.2 > PORTEPOCH= 3 > CATEGORIES= graphics > MASTER_SITES= https://cairographics.org/releases/ \ > https://cairographics.org/snapshots/ > >-PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/ >-PATCHFILES= ebbaebdec12878836fc84d31c59ee324e67abc05.patch:-p1 # cairo-script-interpreter.pc >- > MAINTAINER= desktop@FreeBSD.org > COMMENT= Vector graphics library with cross-device output support > WWW= https://www.cairographics.org/ >@@ -18,69 +14,44 @@ LICENSE_COMB= dual > LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING-LGPL-2.1 > LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1 > >-LIB_DEPENDS= libfreetype.so:print/freetype2 \ >- libpng.so:graphics/png \ >- libfontconfig.so:x11-fonts/fontconfig >- >-PORTSCOUT= skipv:5c-1.1,5c-1.2,5c-1.5 >+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ >+ libfreetype.so:print/freetype2 \ >+ liblzo2.so:archivers/lzo2 \ >+ libpng.so:graphics/png > >-USES= autoreconf cpe gnome libtool pkgconfig tar:xz xorg >+USES= cpe gnome localbase:ldflags meson pkgconfig python:build \ >+ shebangfix tar:xz xorg > CPE_VENDOR= cairographics >-USE_XORG= pixman > USE_LDCONFIG= yes >-INSTALL_TARGET= install-strip >- >-GNU_CONFIGURE= yes >-CONFIGURE_ARGS= --disable-directfb \ >- --disable-gallium \ >- --disable-wgl \ >- --enable-tee >+USE_XORG= pixman > >-OPTIONS_RADIO= GL >-OPTIONS_RADIO_GL= OPENGL GLESV2 >-OPTIONS_DEFINE= XCB GLIB X11 DOCS >-OPTIONS_DEFAULT=OPENGL XCB GLIB X11 >-OPTIONS_SLAVE= ${ARCH:tu} >-OPTIONS_SUB= yes >+SHEBANG_FILES= version.py > >-DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc >-DOCS_CONFIGURE_ON= --with-html-dir=${DOCSDIR} >-DOCSDIR= ${PREFIX}/share/gtk-doc/html >+# spectre only used by tests; symbol-lookup because binutils devs expect us >+# to jump through hoops (https://sourceware.org/bugzilla/show_bug.cgi?id=14243); >+# tests has circular dependencies >+MESON_ARGS= -Dspectre=disabled \ >+ -Dsymbol-lookup=disabled \ >+ -Dtests=disabled > >-X11_USES= xorg >-X11_USE= xorg=x11,xext,xorgproto,xrender >-X11_CONFIGURE_ENABLE=xlib >-X11_CONFIGURE_OFF=--disable-glx >+DOCSDIR= ${PREFIX}/share/gtk-doc/html >+PORTSCOUT= skipv:5c-1.1,5c-1.2,5c-1.5 > >-OPENGL_USES= gl >-OPENGL_USE= gl=egl >-OPENGL_CONFIGURE_ENABLE=gl egl >+PLIST_SUB= LIBVER=2.11802.2 > >-GLESV2_USES= gl >-GLESV2_USE= gl=glesv2 >-GLESV2_DESC= Enable GLESv2 rendering >-GLESV2_CONFIGURE_ENABLE=glesv2 >+OPTIONS_DEFINE= DOCS GLIB X11 >+OPTIONS_DEFAULT=DOCS GLIB X11 >+OPTIONS_SUB= yes > > GLIB_DESC= Enable GObject Functions Feature >-GLIB_USES= gettext-runtime >-GLIB_USE= gnome=glib20 >-GLIB_CONFIGURE_ENABLE= gobject >- >-XCB_DESC= Enable XCB (X C-language Binding) Support >-XCB_USES= xorg >-XCB_USE= xorg=xcb >-XCB_CONFIGURE_ENABLE= xcb > >-# this has another option --enable-xlib-xcb=auto but it is buggy. >-MIPS_BUILD_DEPENDS= ${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops >-MIPS_USES= localbase >-MIPS_CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops" >+DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc >+DOCS_MESON_TRUE= gtk_doc > >-PLIST_SUB+= LIBVER=2.11704.0 >+GLIB_USE= GNOME=glib20 >+GLIB_MESON_ENABLED= glib > >-post-patch-DOCS-off: >- @${REINPLACE_CMD} '/^SUBDIRS/s/doc//' ${WRKSRC}/Makefile.am >- @${REINPLACE_CMD} -e '/^GTK_DOC_CHECK/d' -e '/doc\/.*Makefile/d' \ >- ${WRKSRC}/configure.ac >+X11_USE= XORG=x11,xcb,xext,xorgproto,xrender >+X11_MESON_ENABLED= xcb xlib > > .include <bsd.port.mk> >diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo >index d5c1b5bfc06e..eac92083a742 100644 >--- a/graphics/cairo/distinfo >+++ b/graphics/cairo/distinfo >@@ -1,5 +1,3 @@ >-TIMESTAMP = 1618524411 >-SHA256 (cairo-1.17.4.tar.xz) = 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 >-SIZE (cairo-1.17.4.tar.xz) = 41834076 >-SHA256 (ebbaebdec12878836fc84d31c59ee324e67abc05.patch) = 8b8f19ed74def2d663942fe596206ae21e4186fddf5c51097cb31ab6941cc6c8 >-SIZE (ebbaebdec12878836fc84d31c59ee324e67abc05.patch) = 4272 >+TIMESTAMP = 1734968096 >+SHA256 (cairo-1.18.2.tar.xz) = a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a >+SIZE (cairo-1.18.2.tar.xz) = 32574256 >diff --git a/graphics/cairo/files/patch-Makefile.am b/graphics/cairo/files/patch-Makefile.am >deleted file mode 100644 >index ce92235ec815..000000000000 >--- a/graphics/cairo/files/patch-Makefile.am >+++ /dev/null >@@ -1,10 +0,0 @@ >---- Makefile.am.orig 2020-11-26 23:20:59 UTC >-+++ Makefile.am >-@@ -20,7 +20,6 @@ if CAIRO_HAS_PNG_FUNCTIONS >- SUBDIRS = src doc util >- # libpng is required for our test programs >- if CAIRO_HAS_PNG_FUNCTIONS >--SUBDIRS += boilerplate test perf >- endif >- >- doc: >diff --git a/graphics/cairo/files/patch-build_configure.ac.system b/graphics/cairo/files/patch-build_configure.ac.system >deleted file mode 100644 >index fbef9e951e1e..000000000000 >--- a/graphics/cairo/files/patch-build_configure.ac.system >+++ /dev/null >@@ -1,17 +0,0 @@ >---- build/configure.ac.system.orig 2020-11-26 23:20:59 UTC >-+++ build/configure.ac.system >-@@ -53,11 +53,11 @@ LIBS="$LIBS $LIBM" >- AC_CHECK_LIBM >- LIBS="$LIBS $LIBM" >- >--AC_CHECK_LIB(rt, sched_yield) >-+AC_CHECK_LIB(c, sched_yield) >- >- has_shm_open= >--AC_CHECK_LIB(rt, shm_open, [ >-- SHM_LIBS=-lrt >-+AC_CHECK_LIB(c, shm_open, [ >-+ SHM_LIBS= >- has_shm_open=yes >- ], [SHM_LIBS=]) >- AM_CONDITIONAL(HAVE_SHM, test "x$has_shm_open" = "xyes") >diff --git a/graphics/cairo/files/patch-configure.ac b/graphics/cairo/files/patch-configure.ac >deleted file mode 100644 >index 43fdaa49a871..000000000000 >--- a/graphics/cairo/files/patch-configure.ac >+++ /dev/null >@@ -1,11 +0,0 @@ >---- configure.ac.orig 2020-11-26 23:20:59 UTC >-+++ configure.ac >-@@ -842,7 +842,7 @@ save_LIBS="$LIBS" >- AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes" -a "x$have_windows" = "xno" -a "x$have_png" = "xyes") >- >- save_LIBS="$LIBS" >--AC_CHECK_LIB(rt, shm_open, shm_LIBS="-lrt") >-+AC_CHECK_LIB(c, shm_open, shm_LIBS="") >- AC_SUBST(shm_LIBS) >- LIBS="$save_LIBS" >- >diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist >index be6b3fb8e1d8..f219fb07d913 100644 >--- a/graphics/cairo/pkg-plist >+++ b/graphics/cairo/pkg-plist >@@ -2,7 +2,6 @@ bin/cairo-trace > include/cairo/cairo-deprecated.h > include/cairo/cairo-features.h > include/cairo/cairo-ft.h >-%%OPENGL%%include/cairo/cairo-gl.h > %%GLIB%%include/cairo/cairo-gobject.h > include/cairo/cairo-pdf.h > include/cairo/cairo-ps.h >@@ -11,32 +10,23 @@ include/cairo/cairo-script.h > include/cairo/cairo-svg.h > include/cairo/cairo-tee.h > include/cairo/cairo-version.h >-%%XCB%%include/cairo/cairo-xcb.h >+%%X11%%include/cairo/cairo-xcb.h > %%X11%%include/cairo/cairo-xlib-xrender.h > %%X11%%include/cairo/cairo-xlib.h > include/cairo/cairo.h >-lib/cairo/cairo-fdr.a >-lib/cairo/cairo-fdr.so >-lib/cairo/libcairo-trace.a >+lib/cairo/libcairo-fdr.so > lib/cairo/libcairo-trace.so >-%%GLIB%%lib/libcairo-gobject.a > %%GLIB%%lib/libcairo-gobject.so > %%GLIB%%lib/libcairo-gobject.so.2 > %%GLIB%%lib/libcairo-gobject.so.%%LIBVER%% >-lib/libcairo-script-interpreter.a > lib/libcairo-script-interpreter.so > lib/libcairo-script-interpreter.so.2 > lib/libcairo-script-interpreter.so.%%LIBVER%% >-lib/libcairo.a > lib/libcairo.so > lib/libcairo.so.2 > lib/libcairo.so.%%LIBVER%% >-%%OPENGL%%libdata/pkgconfig/cairo-egl.pc > libdata/pkgconfig/cairo-fc.pc > libdata/pkgconfig/cairo-ft.pc >-%%OPENGL%%libdata/pkgconfig/cairo-gl.pc >-%%GLESV2%%libdata/pkgconfig/cairo-glesv2.pc >-%%OPENGL%%%%X11%%libdata/pkgconfig/cairo-glx.pc > %%GLIB%%libdata/pkgconfig/cairo-gobject.pc > libdata/pkgconfig/cairo-pdf.pc > libdata/pkgconfig/cairo-png.pc >@@ -45,11 +35,22 @@ libdata/pkgconfig/cairo-script.pc > libdata/pkgconfig/cairo-script-interpreter.pc > libdata/pkgconfig/cairo-svg.pc > libdata/pkgconfig/cairo-tee.pc >-%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc >-%%XCB%%libdata/pkgconfig/cairo-xcb.pc >+%%X11%%libdata/pkgconfig/cairo-xcb-shm.pc >+%%X11%%libdata/pkgconfig/cairo-xcb.pc > %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc > %%X11%%libdata/pkgconfig/cairo-xlib.pc > libdata/pkgconfig/cairo.pc >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-0.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-10.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-12.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-14.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-16.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-18.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-2.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-4.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-6.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-1-8.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/api-index-all.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-errors.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-fonts.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-memory.html >@@ -59,6 +60,7 @@ libdata/pkgconfig/cairo.pc > %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-return-values.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-streams.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-surfaces.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-DWrite-Fonts.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Error-handling.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-FreeType-Fonts.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Image-Surfaces.html >@@ -73,12 +75,14 @@ libdata/pkgconfig/cairo.pc > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Regions.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-SVG-Surfaces.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Script-Surfaces.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Surface-Observer.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Tags-and-Links.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Tee-surface.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Transformations.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Types.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-User-Fonts.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Version-Information.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-Fonts.html >+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-GDI-Fonts.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-Surfaces.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XCB-Surfaces.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XLib-Surfaces.html >@@ -98,15 +102,6 @@ libdata/pkgconfig/cairo.pc > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-text.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/cairo.devhelp2 > %%PORTDOCS%%%%DOCSDIR%%/cairo/home.png >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.10.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.12.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.14.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.16.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.2.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.4.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.6.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.8.html >-%%PORTDOCS%%%%DOCSDIR%%/cairo/index-all.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/index.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/language-bindings.html > %%PORTDOCS%%%%DOCSDIR%%/cairo/left-insensitive.png >-- >2.47.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 283531
:
256082
|
256329
Working