cairo: merge cairo-gobject into cairo

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: cairo: merge cairo-gobject into cairo
From: Thomas Klausner <wiz%gatalith.at@localhost>
Date: Tue, 14 Nov 2023 13:40:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Tue Nov 14 14:40:11 2023 +0100
Changeset:	2d45d90faf86e57a4eedeedbd26c3f717de1d51e

Modified Files:
	cairo/Makefile
	cairo/PLIST
Removed Files:
	cairo-gobject/DESCR
	cairo-gobject/Makefile
	cairo-gobject/PLIST
	cairo-gobject/TODO
	cairo-gobject/buildlink3.mk
	cairo/Makefile.common
	cairo/hacks.mk
	cairo/patches/patch-util_cairo-gobject_cairo-gobject.h

Log Message:
cairo: merge cairo-gobject into cairo

Per discussion on tech-pkg.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2d45d90faf86e57a4eedeedbd26c3f717de1d51e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cairo-gobject/DESCR                                | 17 ------
 cairo-gobject/Makefile                             | 28 ----------
 cairo-gobject/PLIST                                |  6 ---
 cairo-gobject/TODO                                 |  1 -
 cairo-gobject/buildlink3.mk                        | 16 ------
 cairo/Makefile                                     | 23 ++++++--
 cairo/Makefile.common                              | 29 ----------
 cairo/PLIST                                        |  5 ++
 cairo/hacks.mk                                     | 61 ----------------------
 .../patch-util_cairo-gobject_cairo-gobject.h       | 17 ------
 10 files changed, 25 insertions(+), 178 deletions(-)

diffs:
diff --git a/cairo-gobject/DESCR b/cairo-gobject/DESCR
deleted file mode 100644
index bf73cea7f7..0000000000
--- a/cairo-gobject/DESCR
+++ /dev/null
@@ -1,17 +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. Experimental backends
-include OpenGL (through glitz), XCB, BeOS, OS/2, and DirectFB.
-
-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-gobject/Makefile b/cairo-gobject/Makefile
deleted file mode 100644
index e43d424c44..0000000000
--- a/cairo-gobject/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2023/01/29 21:14:37 ryoon Exp $
-
-PKGNAME=	${DISTNAME:S/-/-gobject-/}
-
-INSTALLATION_DIRS+=	include/cairo lib/pkgconfig
-
-PKGCONFIG_OVERRIDE_STAGE=	post-build
-PKGCONFIG_OVERRIDE+=		output/meson-private/*.pc
-
-MESON_INSTALL=	no
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/util/cairo-gobject/cairo-gobject.h \
-		${DESTDIR}${PREFIX}/include/cairo
-	${INSTALL_DATA} ${WRKSRC}/output/util/cairo-gobject/libcairo-gobject.so \
-		${DESTDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/output/util/cairo-gobject/libcairo-gobject.so.2 \
-		${DESTDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/output/util/cairo-gobject/libcairo-gobject.so.2.*.0 \
-		${DESTDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/output/meson-private/cairo-gobject.pc \
-		${DESTDIR}${PREFIX}/lib/pkgconfig
-
-.include "../../wip/cairo/Makefile.common"
-.include "../../wip/cairo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.14.0
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cairo-gobject/PLIST b/cairo-gobject/PLIST
deleted file mode 100644
index efded0ea76..0000000000
--- a/cairo-gobject/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD$
-include/cairo/cairo-gobject.h
-lib/libcairo-gobject.so
-lib/libcairo-gobject.so.2
-lib/libcairo-gobject.so.2.11800.0
-lib/pkgconfig/cairo-gobject.pc
diff --git a/cairo-gobject/TODO b/cairo-gobject/TODO
deleted file mode 100644
index 32c23e7e27..0000000000
--- a/cairo-gobject/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- builds all of cairo again and installs too much.
diff --git a/cairo-gobject/buildlink3.mk b/cairo-gobject/buildlink3.mk
deleted file mode 100644
index 207a221bba..0000000000
--- a/cairo-gobject/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.23 2023/01/29 21:14:37 ryoon Exp $
-
-BUILDLINK_TREE+=	cairo-gobject
-
-.if !defined(CAIRO_GOBJECT_BUILDLINK3_MK)
-CAIRO_GOBJECT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.cairo-gobject+=	cairo-gobject>=1.10.2
-BUILDLINK_ABI_DEPENDS.cairo-gobject+=	cairo-gobject>=1.16.0nb7
-BUILDLINK_PKGSRCDIR.cairo-gobject?=	../../graphics/cairo-gobject
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.endif	# CAIRO_GOBJECT_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-cairo-gobject
diff --git a/cairo/Makefile b/cairo/Makefile
index 211421481e..fcb6c9456f 100644
--- a/cairo/Makefile
+++ b/cairo/Makefile
@@ -1,14 +1,27 @@
 # $NetBSD: Makefile,v 1.154 2023/01/29 21:14:37 ryoon Exp $
 
-.include "../../wip/cairo/Makefile.common"
+DISTNAME=	cairo-1.18.0
+CATEGORIES=	graphics
+MASTER_SITES=	https://cairographics.org/releases/
+EXTRACT_SUFX=	.tar.xz
 
-TEST_TARGET=	check
+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
 
-MESON_ARGS+=	-Dglib=disabled
+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"
@@ -19,7 +32,11 @@ PLIST_VARS+=	trace
 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?
diff --git a/cairo/Makefile.common b/cairo/Makefile.common
deleted file mode 100644
index 7699df0dbd..0000000000
--- a/cairo/Makefile.common
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile.common,v 1.17 2020/11/16 11:15:18 ryoon Exp $
-#
-# used by graphics/cairo/Makefile
-# used by graphics/cairo-gobject/Makefile
-
-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
-
-DISTINFO_FILE=	${.CURDIR}/../../wip/cairo/distinfo
-PATCHDIR=	${.CURDIR}/../../wip/cairo/patches
-
-USE_CC_FEATURES=	c99
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		pkg-config
-PKGCONFIG_OVERRIDE+=	src/cairo.pc.in
-PKGCONFIG_OVERRIDE+=	src/cairo-features.pc.in
-
-# For snprintf() and ctime_r()
-CPPFLAGS.SunOS+=	-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
-
-.include "../../devel/meson/build.mk"
-.include "../../lang/python/tool.mk"
diff --git a/cairo/PLIST b/cairo/PLIST
index 5b97070dd5..a9dd5648e1 100644
--- a/cairo/PLIST
+++ b/cairo/PLIST
@@ -3,6 +3,7 @@ ${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
@@ -17,6 +18,9 @@ ${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
+lib/libcairo-gobject.so
+lib/libcairo-gobject.so.2
+lib/libcairo-gobject.so.2.11800.0
 ${PLIST.trace}lib/cairo/libcairo-trace.so
 lib/libcairo-script-interpreter.so
 lib/libcairo-script-interpreter.so.2
@@ -26,6 +30,7 @@ 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
diff --git a/cairo/hacks.mk b/cairo/hacks.mk
deleted file mode 100644
index aead5905fe..0000000000
--- a/cairo/hacks.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# $NetBSD: hacks.mk,v 1.7 2016/02/25 13:37:47 jperkin Exp $
-
-.if !defined(CAIRO_HACKS_MK)
-CAIRO_HACKS_MK=	defined
-
-###
-### A workaround for MacPorts Ticket #31469
-### https://trac.macports.org/ticket/31469
-###
-.if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc)
-_BAD_GCC_BUILD!=	${CC} --version | (${GREP} -c 'i686-apple-darwin11-llvm-gcc-4\.2\ .*build\ 5658' || ${TRUE})
-.  if ${_BAD_GCC_BUILD} == "1"
-PKG_HACKS+=		llvm-lto-hack
-BUILDLINK_TRANSFORM+=	rm:-flto
-.  endif
-.endif
-
-# Workaround so that pthread is found on MirBSD
-OPSYSVARS+=		PTHREAD_CFLAGS
-PTHREAD_CFLAGS.MirBSD=	-fhonour-copts
-
-#
-# Workaround for "the pixman problem" with netbsd-5 native X. The
-# problem is that if the order of rpath options isn't right when
-# linking client programs (right being /usr/pkg before /usr/X11R7),
-# the native pixman library gets pulled in instead of the pkgsrc one,
-# and then the link fails with undefined symbols from cairo; these are
-# symbols that are present only in the newer pkgsrc pixman. The
-# problem with rpath options and ordering is complicated by there
-# being multiple ways of writing them (-R, -Wl,-rpath, etc.) and as
-# many packages just blat out flags from various sources they don't
-# necessarily match or come out in the right order.
-#
-# Some cases of "the pixman problem" were solved with one set of
-# changes a month ago or so, but other packages still fail for the
-# reasons cited. In the absence of a wrappers-based general solution
-# to keep the order correct, most or all remaining instances can be
-# solved by explicitly adding the necessary pixman lib to the link
-# line instead of pulling it in via cairo's dependency on it. Or at
-# least, this fixes the build. It should also make the right things
-# happen during library search (I think) but that's less clear. I hate
-# ELF.
-#
-# The best way to explicitly add pixman to the link line is to hack it
-# into cairo's .pc file. This is what we do here.
-#
-# Note that this hack is also required for 5.99 earlier than whatever
-# point the necessary updates to X were applied. I'm assuming this is
-# old enough that nobody's going to care.
-#
-.if ${MACHINE_PLATFORM:MNetBSD-5.*} && \
-    !${MACHINE_PLATFORM:MNetBSD-5.99.*} && \
-    ${X11_TYPE} == "native"
-SUBST_CLASSES+=		pixman
-SUBST_STAGE.pixman=	post-build
-SUBST_MESSAGE.pixman=	Hacking pixman into cairo.pc for the "pixman problem".
-SUBST_FILES.pixman=	src/cairo.pc
-SUBST_SED.pixman=	-e '/^Libs:/s/-lcairo/-lcairo -lpixman-1/'
-.endif
-
-.endif	# CAIRO_HACKS_MK
diff --git a/cairo/patches/patch-util_cairo-gobject_cairo-gobject.h b/cairo/patches/patch-util_cairo-gobject_cairo-gobject.h
deleted file mode 100644
index ca3ccd2011..0000000000
--- a/cairo/patches/patch-util_cairo-gobject_cairo-gobject.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.18 2012/11/04 23:48:54 wiz Exp $
-
-File is only installed by cairo-gobject, so manually
-define existence macro.
-
---- util/cairo-gobject/cairo-gobject.h.orig	2010-09-09 15:56:24.000000000 +0000
-+++ util/cairo-gobject/cairo-gobject.h
-@@ -39,6 +39,9 @@
- 
- #include <cairo.h>
- 
-+/* if this header is installed, cairo has gobject functions */
-+#define CAIRO_HAS_GOBJECT_FUNCTIONS 1
-+
- #if CAIRO_HAS_GOBJECT_FUNCTIONS
- 
- #include <glib-object.h>
Prev by Date: cairo: pkglint cleanup
Next by Date: cairo: remove, used for updating graphics/cairo
Previous by Thread: cairo: pkglint cleanup
Next by Thread: cairo: remove, used for updating graphics/cairo
Indexes:
Home | Main Index | Thread Index | Old Index