Attachment 202677 Details for Bug 233023 – Rename option GOBJECT to INTROSPECTION; ensure patch applies against version 3.0.4

[patch] Rename option GOBJECT to INTROSPECTION; ensure patch applies against version 3.0.4

devel_libical.patch (text/plain), 6.69 KB, created by Peter Laursen on 2019-03-07 08:22:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Laursen

Created: 2019-03-07 08:22:23 UTC

Size: 6.69 KB

patch

obsolete

>diff -ruN /usr/ports/devel/libical/Makefile devel/libical/Makefile
>--- /usr/ports/devel/libical/Makefile	2019-02-25 08:04:49.000000000 +0100
>+++ devel/libical/Makefile	2019-03-06 22:42:23.864235000 +0100
>@@ -1,5 +1,5 @@
> # Created by: Joe Kelsey
>-# $FreeBSD: head/devel/libical/Makefile 493839 2019-02-25 07:04:49Z kwm $
>+# $FreeBSD$
> 
> PORTNAME=	libical
> PORTVERSION=	3.0.4
>@@ -14,21 +14,27 @@
> 
> LIB_DEPENDS=	libicuuc.so:devel/icu
> 
>-CFLAGS_amd64=	-fPIC
>-
> USES=		cmake compiler:c++11-lib gnome pathfix perl5 pkgconfig
> USE_PERL5=	build
> USE_LDCONFIG=	yes
> 
>-MAKE_JOBS_UNSAFE= yes
>+CMAKE_ARGS+=	-DICAL_BUILD_DOCS=false
>+CFLAGS_amd64=	-fPIC
> 
>-BUILD_DEPENDS=	valac:lang/vala \
>-		gtkdoc-scan:textproc/gtk-doc
>-USE_GNOME=	introspection:build glib20 libxml2
>-CMAKE_ARGS+=	-DGOBJECT_INTROSPECTION=true \
>-		-DICAL_GLIB_VAPI=true \
>-		-DICAL_BUILD_DOCS=false
>+OPTIONS_DEFINE=	GLIB INTROSPECTION VALA
>+OPTIONS_DEFAULT=	GLIB INTROSPECTION VALA
>+OPTIONS_SUB=yes
> 
>-PLIST_SUB+=	VERSION=${PORTVERSION}
>+VALA_DESC=	Build VALA bindings
>+VALA_BUILD_DEPENDS=	valac:lang/vala
>+VALA_CMAKE_BOOL=	ICAL_GLIB_VAPI
>+
>+INTROSPECTION_DESC=	Build GObject Introspection
>+INTROSPECTION_USE+=	gnome=introspection:build
>+INTROSPECTION_CMAKE_BOOL=	INTROSPECTION_INTROSPECTION
>+
>+GLIB_DESC=	Build GLib bindings
>+GLIB_USE=	GNOME=	glib20,libxml2
>+GLIB_CMAKE_BOOL=	ICAL_GLIB
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/devel/libical/distinfo devel/libical/distinfo
>--- /usr/ports/devel/libical/distinfo	2019-02-25 08:04:49.000000000 +0100
>+++ devel/libical/distinfo	2019-03-06 22:42:23.867476000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1544948919
>+TIMESTAMP = 1551160573
> SHA256 (libical-3.0.4.tar.gz) = 72b216e10233c3f60cb06062facf41f3b0f70615e5a60b47f9853341a0d5d145
> SIZE (libical-3.0.4.tar.gz) = 871853
>diff -ruN /usr/ports/devel/libical/pkg-plist devel/libical/pkg-plist
>--- /usr/ports/devel/libical/pkg-plist	2019-02-25 08:04:49.000000000 +0100
>+++ devel/libical/pkg-plist	2019-03-06 22:43:31.351088000 +0100
>@@ -1,39 +1,39 @@
>-include/libical-glib/i-cal-array.h
>-include/libical-glib/i-cal-attach.h
>-include/libical-glib/i-cal-comp-iter.h
>-include/libical-glib/i-cal-component.h
>-include/libical-glib/i-cal-datetimeperiod-type.h
>-include/libical-glib/i-cal-derived-parameter.h
>-include/libical-glib/i-cal-derived-property.h
>-include/libical-glib/i-cal-derived-value.h
>-include/libical-glib/i-cal-duration-type.h
>-include/libical-glib/i-cal-enums.h
>-include/libical-glib/i-cal-error.h
>-include/libical-glib/i-cal-forward-declarations.h
>-include/libical-glib/i-cal-geo-type.h
>-include/libical-glib/i-cal-langbind.h
>-include/libical-glib/i-cal-memory.h
>-include/libical-glib/i-cal-mime.h
>-include/libical-glib/i-cal-object.h
>-include/libical-glib/i-cal-parameter.h
>-include/libical-glib/i-cal-parser.h
>-include/libical-glib/i-cal-period-type.h
>-include/libical-glib/i-cal-property.h
>-include/libical-glib/i-cal-recur-iterator.h
>-include/libical-glib/i-cal-recur.h
>-include/libical-glib/i-cal-recurrence-type.h
>-include/libical-glib/i-cal-reqstat-type.h
>-include/libical-glib/i-cal-restriction.h
>-include/libical-glib/i-cal-time-span.h
>-include/libical-glib/i-cal-time.h
>-include/libical-glib/i-cal-timetype.h
>-include/libical-glib/i-cal-timezone-phase.h
>-include/libical-glib/i-cal-timezone.h
>-include/libical-glib/i-cal-timezonetype.h
>-include/libical-glib/i-cal-trigger-type.h
>-include/libical-glib/i-cal-unknowntokenhandling.h
>-include/libical-glib/i-cal-value.h
>-include/libical-glib/libical-glib.h
>+%%GLIB%%include/libical-glib/i-cal-array.h
>+%%GLIB%%include/libical-glib/i-cal-attach.h
>+%%GLIB%%include/libical-glib/i-cal-comp-iter.h
>+%%GLIB%%include/libical-glib/i-cal-component.h
>+%%GLIB%%include/libical-glib/i-cal-datetimeperiod-type.h
>+%%GLIB%%include/libical-glib/i-cal-derived-parameter.h
>+%%GLIB%%include/libical-glib/i-cal-derived-property.h
>+%%GLIB%%include/libical-glib/i-cal-derived-value.h
>+%%GLIB%%include/libical-glib/i-cal-duration-type.h
>+%%GLIB%%include/libical-glib/i-cal-enums.h
>+%%GLIB%%include/libical-glib/i-cal-error.h
>+%%GLIB%%include/libical-glib/i-cal-forward-declarations.h
>+%%GLIB%%include/libical-glib/i-cal-geo-type.h
>+%%GLIB%%include/libical-glib/i-cal-langbind.h
>+%%GLIB%%include/libical-glib/i-cal-memory.h
>+%%GLIB%%include/libical-glib/i-cal-mime.h
>+%%GLIB%%include/libical-glib/i-cal-object.h
>+%%GLIB%%include/libical-glib/i-cal-parameter.h
>+%%GLIB%%include/libical-glib/i-cal-parser.h
>+%%GLIB%%include/libical-glib/i-cal-period-type.h
>+%%GLIB%%include/libical-glib/i-cal-property.h
>+%%GLIB%%include/libical-glib/i-cal-recur-iterator.h
>+%%GLIB%%include/libical-glib/i-cal-recur.h
>+%%GLIB%%include/libical-glib/i-cal-recurrence-type.h
>+%%GLIB%%include/libical-glib/i-cal-reqstat-type.h
>+%%GLIB%%include/libical-glib/i-cal-restriction.h
>+%%GLIB%%include/libical-glib/i-cal-time-span.h
>+%%GLIB%%include/libical-glib/i-cal-time.h
>+%%GLIB%%include/libical-glib/i-cal-timetype.h
>+%%GLIB%%include/libical-glib/i-cal-timezone-phase.h
>+%%GLIB%%include/libical-glib/i-cal-timezone.h
>+%%GLIB%%include/libical-glib/i-cal-timezonetype.h
>+%%GLIB%%include/libical-glib/i-cal-trigger-type.h
>+%%GLIB%%include/libical-glib/i-cal-unknowntokenhandling.h
>+%%GLIB%%include/libical-glib/i-cal-value.h
>+%%GLIB%%include/libical-glib/libical-glib.h
> include/libical/ical.h
> include/libical/icalarray.h
> include/libical/icalattach.h
>@@ -91,34 +91,34 @@
> lib/cmake/LibIcal/LibIcalConfigVersion.cmake
> lib/cmake/LibIcal/LibIcalTargets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/LibIcal/LibIcalTargets.cmake
>-lib/girepository-1.0/ICalGLib-3.0.typelib
>-lib/girepository-1.0/libical-%%VERSION%%.typelib
>-lib/libical-glib.a
>-lib/libical-glib.so
>-lib/libical-glib.so.3
>-lib/libical-glib.so.%%VERSION%%
>+%%INTROSPECTION%%lib/girepository-1.0/ICalGLib-3.0.typelib
>+%%INTROSPECTION%%lib/girepository-1.0/libical-3.0.3.typelib
>+%%GLIB%%lib/libical-glib.a
>+%%GLIB%%lib/libical-glib.so
>+%%GLIB%%lib/libical-glib.so.3
>+%%GLIB%%lib/libical-glib.so.3.0.4
> lib/libical.a
> lib/libical.so
> lib/libical.so.3
>-lib/libical.so.%%VERSION%%
>+lib/libical.so.3.0.4
> lib/libical_cxx.a
> lib/libical_cxx.so
> lib/libical_cxx.so.3
>-lib/libical_cxx.so.%%VERSION%%
>+lib/libical_cxx.so.3.0.4
> lib/libicalss.a
> lib/libicalss.so
> lib/libicalss.so.3
>-lib/libicalss.so.%%VERSION%%
>+lib/libicalss.so.3.0.4
> lib/libicalss_cxx.a
> lib/libicalss_cxx.so
> lib/libicalss_cxx.so.3
>-lib/libicalss_cxx.so.%%VERSION%%
>+lib/libicalss_cxx.so.3.0.4
> lib/libicalvcal.a
> lib/libicalvcal.so
> lib/libicalvcal.so.3
>-lib/libicalvcal.so.%%VERSION%%
>-libdata/pkgconfig/libical-glib.pc
>+lib/libicalvcal.so.3.0.4
>+%%GLIB%%libdata/pkgconfig/libical-glib.pc
> libdata/pkgconfig/libical.pc
>-share/gir-1.0/ICalGLib-3.0.gir
>-share/gir-1.0/libical-%%VERSION%%.gir
>-share/vala/vapi/libical-glib.vapi
>+%%INTROSPECTION%%share/gir-1.0/ICalGLib-3.0.gir
>+%%INTROSPECTION%%share/gir-1.0/libical-3.0.3.gir
>+%%VALA%%share/vala/vapi/libical-glib.vapi

Actions: View | Diff

Attachments on bug 233023: 199011 | 199041 | 199073 | 201409 | 202677 | 202784 | 212191