pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cairo: remove, used for updating graphics/cairo
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Tue Nov 14 14:59:22 2023 +0100
Changeset: c7a8b6f793f5c6b0a7924dd564aab6a79dd269e4
Modified Files:
Makefile
Removed Files:
cairo/DESCR
cairo/Makefile
cairo/PLIST
cairo/buildlink3.mk
cairo/distinfo
cairo/options.mk
cairo/patches/patch-meson.build
cairo/patches/patch-test_pdf-structure.c
cairo/patches/patch-util_cairo-missing_getline.c
cairo/patches/patch-util_meson.build
Log Message:
cairo: remove, used for updating graphics/cairo
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c7a8b6f793f5c6b0a7924dd564aab6a79dd269e4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
cairo/DESCR | 19 ----------
cairo/Makefile | 47 -----------------------
cairo/PLIST | 48 ------------------------
cairo/buildlink3.mk | 32 ----------------
cairo/distinfo | 9 -----
cairo/options.mk | 46 -----------------------
cairo/patches/patch-meson.build | 14 -------
cairo/patches/patch-test_pdf-structure.c | 14 -------
cairo/patches/patch-util_cairo-missing_getline.c | 13 -------
cairo/patches/patch-util_meson.build | 13 -------
11 files changed, 256 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 291052120a..41b8c1e672 100644
--- a/Makefile
+++ b/Makefile
@@ -365,7 +365,6 @@ SUBDIR+= cacti-plugin-rrdclean
SUBDIR+= cacti-plugin-settings
SUBDIR+= cacti-plugin-thold
SUBDIR+= cacti-plugin-weathermap
-SUBDIR+= cairo
SUBDIR+= cairo-dingbat-ttf
SUBDIR+= cairo-dock
SUBDIR+= cairo-dock-plugins
diff --git a/cairo/DESCR b/cairo/DESCR
deleted file mode 100644
index dc7da12d04..0000000000
--- a/cairo/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-Cairo is a 2D graphics library with support for multiple output
-devices. Currently supported output targets include the X Window
-System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file
-output.
-
-Cairo is designed to produce consistent output on all output media
-while taking advantage of display hardware acceleration when
-available (eg. through the X Render Extension).
-
-The cairo API provides operations similar to the drawing operators
-of PostScript and PDF. Operations in cairo including stroking and
-filling cubic Bezier splines, transforming and compositing
-translucent images, and antialiased text rendering. All drawing
-operations can be transformed by any affine transformation (scale,
-rotation, shear, etc.)
-
-Cairo is implemented as a library written in the C programming
-language, but bindings are available for several different programming
-languages.
diff --git a/cairo/Makefile b/cairo/Makefile
deleted file mode 100644
index fcb6c9456f..0000000000
--- a/cairo/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.154 2023/01/29 21:14:37 ryoon Exp $
-
-DISTNAME= cairo-1.18.0
-CATEGORIES= graphics
-MASTER_SITES= https://cairographics.org/releases/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://cairographics.org/
-COMMENT= Vector graphics library with cross-device output support
-LICENSE= gnu-lgpl-v2.1 AND mpl-1.1
-
-USE_CC_FEATURES= c99
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
-
-# For snprintf() and ctime_r()
-CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
-
-PKGCONFIG_OVERRIDE_STAGE= post-build
-PKGCONFIG_OVERRIDE+= output/meson-private/*.pc
-
-SUPERSEDES+= cairo-gobject-[0-9]*
-
-.include "options.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-# see meson.build for systems that support cairo-trace
-PLIST_VARS+= trace
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
-PLIST.trace= yes
-.endif
-
-.include "../../devel/meson/build.mk"
-.include "../../lang/python/tool.mk"
-.include "../../archivers/lzo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.14.0
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-# include?
-#.include "../../print/libspectre/buildlink3.mk"
-BUILDLINK_API_DEPENDS.pixman+= pixman>=0.36.0
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cairo/PLIST b/cairo/PLIST
deleted file mode 100644
index 0c124ba827..0000000000
--- a/cairo/PLIST
+++ /dev/null
@@ -1,48 +0,0 @@
-@comment $NetBSD$
-${PLIST.trace}bin/cairo-trace
-include/cairo/cairo-deprecated.h
-include/cairo/cairo-features.h
-${PLIST.x11}include/cairo/cairo-ft.h
-include/cairo/cairo-gobject.h
-include/cairo/cairo-pdf.h
-include/cairo/cairo-ps.h
-${PLIST.quartz}include/cairo/cairo-quartz-image.h
-${PLIST.quartz}include/cairo/cairo-quartz.h
-include/cairo/cairo-script-interpreter.h
-include/cairo/cairo-script.h
-include/cairo/cairo-svg.h
-include/cairo/cairo-tee.h
-include/cairo/cairo-version.h
-${PLIST.xcb}include/cairo/cairo-xcb.h
-${PLIST.x11}include/cairo/cairo-xlib-xrender.h
-${PLIST.x11}include/cairo/cairo-xlib.h
-include/cairo/cairo.h
-${PLIST.trace}lib/cairo/libcairo-fdr.so
-${PLIST.trace}lib/cairo/libcairo-trace.so
-lib/libcairo-gobject.so
-lib/libcairo-gobject.so.2
-lib/libcairo-gobject.so.2.11800.0
-lib/libcairo-script-interpreter.so
-lib/libcairo-script-interpreter.so.2
-lib/libcairo-script-interpreter.so.2.11800.0
-lib/libcairo.so
-lib/libcairo.so.2
-lib/libcairo.so.2.11800.0
-${PLIST.x11}lib/pkgconfig/cairo-fc.pc
-${PLIST.x11}lib/pkgconfig/cairo-ft.pc
-lib/pkgconfig/cairo-gobject.pc
-lib/pkgconfig/cairo-pdf.pc
-lib/pkgconfig/cairo-png.pc
-lib/pkgconfig/cairo-ps.pc
-${PLIST.quartz}lib/pkgconfig/cairo-quartz-font.pc
-${PLIST.quartz}lib/pkgconfig/cairo-quartz-image.pc
-${PLIST.quartz}lib/pkgconfig/cairo-quartz.pc
-lib/pkgconfig/cairo-script-interpreter.pc
-lib/pkgconfig/cairo-script.pc
-lib/pkgconfig/cairo-svg.pc
-lib/pkgconfig/cairo-tee.pc
-${PLIST.xcb}lib/pkgconfig/cairo-xcb-shm.pc
-${PLIST.xcb}lib/pkgconfig/cairo-xcb.pc
-${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
-${PLIST.x11}lib/pkgconfig/cairo-xlib.pc
-lib/pkgconfig/cairo.pc
diff --git a/cairo/buildlink3.mk b/cairo/buildlink3.mk
deleted file mode 100644
index e9f677ae6d..0000000000
--- a/cairo/buildlink3.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.63 2023/01/29 21:14:37 ryoon Exp $
-
-BUILDLINK_TREE+= cairo
-
-.if !defined(CAIRO_BUILDLINK3_MK)
-CAIRO_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2
-BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.16.0nb9
-BUILDLINK_PKGSRCDIR.cairo?= ../../wip/cairo
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-pkgbase := cairo
-.include "../../mk/pkg-build-options.mk"
-
-.if ${PKG_BUILD_OPTIONS.cairo:Mxcb}
-.include "../../x11/libxcb/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.cairo:Mx11} || ${PKG_BUILD_OPTIONS.cairo:Mxcb}
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.endif
-
-.include "../../archivers/lzo/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.endif # CAIRO_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -cairo
diff --git a/cairo/distinfo b/cairo/distinfo
deleted file mode 100644
index 6b061f73da..0000000000
--- a/cairo/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.97 2023/01/24 10:16:33 wiz Exp $
-
-BLAKE2s (cairo-1.18.0.tar.xz) = d17e3d7a1b32769f02500ff3edaf8a7e18974873a128c61e607f05e5216e8a63
-SHA512 (cairo-1.18.0.tar.xz) = 6366c7d5e3fd3e12df2edc43aa4ed4c3a517de2ef0b1b3b30dfa8b69a7cae1dd55765801228cec308d2e9792037d0704ae49d95b7b12c06f20df092fa0534e1c
-Size (cairo-1.18.0.tar.xz) = 33761148 bytes
-SHA1 (patch-meson.build) = 3187c754af123be69e1b5651165f6310c8786558
-SHA1 (patch-test_pdf-structure.c) = dd3e5ee2cdbc19e77c2d5a60dab98195ecbe82bb
-SHA1 (patch-util_cairo-missing_getline.c) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530
-SHA1 (patch-util_meson.build) = 344d29f84114b441bbfede8b77d7a2d02d756ce4
diff --git a/cairo/options.mk b/cairo/options.mk
deleted file mode 100644
index 3b0bd5e78c..0000000000
--- a/cairo/options.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: options.mk,v 1.23 2022/10/04 07:13:52 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cairo
-PKG_SUPPORTED_OPTIONS= x11 xcb
-.if exists(/System/Library/Frameworks/Quartz.framework)
-PKG_SUPPORTED_OPTIONS+= quartz
-PKG_SUGGESTED_OPTIONS+= quartz
-.else
-PKG_SUGGESTED_OPTIONS= x11 xcb
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= x11 xcb quartz
-
-###
-### X11 and XCB support (XCB implies X11)
-###
-.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb)
-PLIST.x11= yes
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-
-. if !empty(PKG_OPTIONS:Mxcb)
-PLIST.xcb= yes
-. include "../../x11/libxcb/buildlink3.mk"
-. endif
-.endif
-
-###
-### Quartz backend
-###
-# Quartz backend interacts badly with our library stack. The most
-# notable issue is that when quartz-font is enabled, cairo will never
-# use fontconfig but instead uses CoreGraphics API to find fonts in
-# system-default font paths; as a result, any fonts installed with
-# pkgsrc will never be found. OTOH fontconfig by default searches for
-# fonts in MacOS X system-default paths too so sticking with it will
-# not be a problem.
-.if !empty(PKG_OPTIONS:Mquartz)
-PLIST.quartz= yes
-WARNINGS+= "You have enabled Quartz backend. No fonts installed with pkgsrc will be found."
-.endif
diff --git a/cairo/patches/patch-meson.build b/cairo/patches/patch-meson.build
deleted file mode 100644
index e55dadd8bb..0000000000
--- a/cairo/patches/patch-meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Look for library providing backtrace_symbols()
-
---- meson.build.orig 2023-09-23 14:18:32.000000000 +0000
-+++ meson.build
-@@ -167,6 +167,7 @@ check_thread_flags = [
- ]
-
- m_dep = cc.find_library('m', required: false)
-+backtrace_dep = cc.find_library('execinfo', required: false)
- # Used in util
- gtk_dep = dependency('gtk+-2.0', required: get_option('gtk2-utils'))
-
diff --git a/cairo/patches/patch-test_pdf-structure.c b/cairo/patches/patch-test_pdf-structure.c
deleted file mode 100644
index 6e26770a6d..0000000000
--- a/cairo/patches/patch-test_pdf-structure.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Add header for WIFEXITED and WAITSTATUS.
-
---- test/pdf-structure.c.orig 2023-09-23 14:18:32.000000000 +0000
-+++ test/pdf-structure.c
-@@ -29,6 +29,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/wait.h>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h> /* __unix__ */
diff --git a/cairo/patches/patch-util_cairo-missing_getline.c b/cairo/patches/patch-util_cairo-missing_getline.c
deleted file mode 100644
index 0b0f5135b8..0000000000
--- a/cairo/patches/patch-util_cairo-missing_getline.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2012/09/13 15:50:08 jperkin Exp $
-
-The variable name is self-explanatory :)
-
---- util/cairo-missing/getline.c.orig Thu Sep 13 15:45:55 2012
-+++ util/cairo-missing/getline.c Thu Sep 13 15:46:18 2012
-@@ -87,4 +87,6 @@
- return ret;
- }
- #undef GETLINE_BUFFER_SIZE
-+#else
-+int solaris_ld_requires_at_least_one_symbol = 0;
- #endif
diff --git a/cairo/patches/patch-util_meson.build b/cairo/patches/patch-util_meson.build
deleted file mode 100644
index 86f7523f45..0000000000
--- a/cairo/patches/patch-util_meson.build
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Use library providing backtrace_symbols()
-
---- util/meson.build.orig 2023-09-23 14:18:32.000000000 +0000
-+++ util/meson.build
-@@ -43,5 +43,5 @@ foreach util : cairo_utils
- endforeach
-
- if conf.get('CAIRO_HAS_DLSYM', 0) == 1 and cc.has_header('execinfo.h')
-- libmallocstats = library('malloc-stats', 'malloc-stats.c', dependencies : dl_dep)
-+ libmallocstats = library('malloc-stats', 'malloc-stats.c', dependencies : [dl_dep, backtrace_dep])
- endif
Home |
Main Index |
Thread Index |
Old Index