cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with GLib >=2.68 (first batch).

Browse Source
This commit is contained in:
ajacoutot 2021-05-09 08:55:41 +00:00
parent f7ec3f9da3
commit d78cd41d6a
22 changed files with 607 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
comms/sigrok/pulseview/patches/patch-pv_data_decode_annotation_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-pv_data_decode_annotation_cpp,v 1.1 2021/05/09 08:55:42 ajacoutot Exp $
Fix build with GLib >=2.68
Index: pv/data/decode/annotation.cpp
--- pv/data/decode/annotation.cpp.orig
+++ pv/data/decode/annotation.cpp
@@ -17,9 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
-}
#include <cassert>
#include <vector>

17
comms/sigrok/pulseview/patches/patch-pv_views_trace_decodetrace_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-pv_views_trace_decodetrace_cpp,v 1.1 2021/05/09 08:55:42 ajacoutot Exp $
Fix build with GLib >=2.68
Index: pv/views/trace/decodetrace.cpp
--- pv/views/trace/decodetrace.cpp.orig
+++ pv/views/trace/decodetrace.cpp
@@ -17,9 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
-}
#include <limits>
#include <mutex>

4
devel/vte3/patches/patch-src_app_app_cc
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_app_app_cc,v 1.6 2020/11/02 16:00:57 jasper Exp $
$OpenBSD: patch-src_app_app_cc,v 1.7 2021/05/09 08:55:41 ajacoutot Exp $
Fix build on !clang:
app.cc:309:39: error: cannot convert 'const GdkRGBA {aka const _GdkRGBA} to 'gdouble {aka double}' in initialization
@ -8,7 +8,7 @@ cf https://blog.quasardb.net/cpp-braced-initialization/
Index: src/app/app.cc
--- src/app/app.cc.orig
+++ src/app/app.cc
@@ -454,7 +454,7 @@ class Options { (public)
@@ -465,7 +465,7 @@ class Options { (public)
GdkRGBA get_color_bg() const
{

39
devel/vte3/patches/patch-src_vtetypebuiltins_cc_template Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-src_vtetypebuiltins_cc_template,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From 89e9230dc1a27b89cca16de32e903918a27b8e42 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Mon, 16 Nov 2020 20:27:48 +0100
Subject: [PATCH] lib: Drop wrong use of volatile
Index: src/vtetypebuiltins.cc.template
--- src/vtetypebuiltins.cc.template.orig
+++ src/vtetypebuiltins.cc.template
@@ -11,9 +11,9 @@
GType
@enum_name@_get_type (void)
{
- static volatile gsize g_define_type_id__volatile = 0;
+ static gsize g_define_type_id = 0;
- if (g_once_init_enter (&g_define_type_id__volatile)) {
+ if (g_once_init_enter (&g_define_type_id)) {
static const G@Type@Value values[] = {
/*** END value-header ***/
@@ -24,13 +24,13 @@ GType
/*** BEGIN value-tail ***/
{ 0, NULL, NULL }
};
- GType g_define_type_id = \
+ GType type_id = \
g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+ g_once_init_leave (&g_define_type_id, type_id);
}
- return g_define_type_id__volatile;
+ return g_define_type_id;
}
/*** END value-tail ***/

26
editors/scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-gtk_ScintillaGTKAccessible_cxx,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
Fix build with GLib >=2.68
https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747eb5e0bc4d627a101298207a8421e/tree/gtk/ScintillaGTKAccessible.cxx?diff=bf180d712ff771fe40a2d5dc178fa0a15cf14b2d
Index: gtk/ScintillaGTKAccessible.cxx
--- gtk/ScintillaGTKAccessible.cxx.orig
+++ gtk/ScintillaGTKAccessible.cxx
@@ -1015,7 +1015,7 @@ static gpointer scintilla_object_accessible_parent_cla
// @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call
static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
- static volatile gsize type_id_result = 0;
+ static gsize type_id_result = 0;
if (g_once_init_enter(&type_id_result)) {
GTypeInfo tinfo = {
@@ -1106,7 +1106,7 @@ AtkObject *ScintillaGTKAccessible::WidgetGetAccessible
#if HAVE_GTK_A11Y_H // just instantiate the accessible
*cache = scintilla_object_accessible_new(0, G_OBJECT(widget));
#elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate
- static volatile gsize registered = 0;
+ static gsize registered = 0;
if (g_once_init_enter(&registered)) {
// Figure out whether accessibility is enabled by looking at the type of the accessible

18
graphics/fyre/patches/patch-src_exr_cpp Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_exr_cpp,v 1.1 2021/05/09 08:55:42 ajacoutot Exp $
Fix build with GLib >=2.68
Index: src/exr.cpp
--- src/exr.cpp.orig
+++ src/exr.cpp
@@ -22,8 +22,9 @@
*
*/
-extern "C" {
#include "histogram-imager.h"
+
+extern "C" {
#include "config.h"
}

30
graphics/inkscape/patches/patch-src_3rdparty_autotrace_autotrace_h Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_3rdparty_autotrace_autotrace_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
From: Harald van Dijk <harald@gigawatt.nl>
Date: Wed, 17 Feb 2021 09:13:49 +0000
Subject: [PATCH] Fix build with glib 2.67.3.
Index: src/3rdparty/autotrace/autotrace.h
--- src/3rdparty/autotrace/autotrace.h.orig
+++ src/3rdparty/autotrace/autotrace.h
@@ -23,6 +23,9 @@
#include <stdio.h>
+#include "types.h"
+#include "color.h"
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -34,9 +37,6 @@ extern "C" {
/* ===================================================================== *
* Typedefs
* ===================================================================== */
-
-#include "types.h"
-#include "color.h"
/* Third degree is the highest we deal with. */
enum _at_polynomial_degree {

29
graphics/inkscape/patches/patch-src_3rdparty_autotrace_color_h Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_3rdparty_autotrace_color_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
From: Harald van Dijk <harald@gigawatt.nl>
Date: Wed, 17 Feb 2021 09:13:49 +0000
Subject: [PATCH] Fix build with glib 2.67.3.
Index: src/3rdparty/autotrace/color.h
--- src/3rdparty/autotrace/color.h.orig
+++ src/3rdparty/autotrace/color.h
@@ -24,6 +24,10 @@
#include <glib.h>
#include <glib-object.h>
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
typedef struct _at_color at_color;
struct _at_color {
guint8 r;
@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
GType at_color_get_type(void);
#define AT_TYPE_COLOR (at_color_get_type ())
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
#endif /* not AT_COLOR_H */

24
graphics/libvips/patches/patch-libvips_include_vips_dispatch_h Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-libvips_include_vips_dispatch_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From cfe50903dffd576f6c25b0f24882b38a38085644 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 9 Feb 2021 16:07:51 +0000
Subject: [PATCH] don't put glib includes inside extern "C" blocks
Index: libvips/include/vips/dispatch.h
--- libvips/include/vips/dispatch.h.orig
+++ libvips/include/vips/dispatch.h
@@ -33,11 +33,12 @@
#ifndef IM_DISPATCH_H
#define IM_DISPATCH_H
+#include <glib-object.h>
+
#ifdef __cplusplus
extern "C" {
#endif /*__cplusplus*/
-#include <glib-object.h>
#include <vips/vips.h>
#include <vips/util.h>

29
graphics/libvips/patches/patch-libvips_include_vips_vips_h Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-libvips_include_vips_vips_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From cfe50903dffd576f6c25b0f24882b38a38085644 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 9 Feb 2021 16:07:51 +0000
Subject: [PATCH] don't put glib includes inside extern "C" blocks
Index: libvips/include/vips/vips.h
--- libvips/include/vips/vips.h.orig
+++ libvips/include/vips/vips.h
@@ -80,14 +80,14 @@
#ifndef VIPS_VIPS_H
#define VIPS_VIPS_H
-#ifdef __cplusplus
-extern "C" {
-#endif /*__cplusplus*/
-
#include <glib.h>
#include <glib/gstdio.h>
#include <gmodule.h>
#include <glib-object.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /*__cplusplus*/
/* If we're being parsed by SWIG, remove gcc attributes.
*/

4
graphics/ufraw/Makefile
View File

@ -1,4 +1,6 @@
# $OpenBSD: Makefile,v 1.52 2020/05/14 19:16:25 rsadowski Exp $
# $OpenBSD: Makefile,v 1.53 2021/05/09 08:55:41 ajacoutot Exp $
# XXX there's a maintained fork at https://github.com/sergiomb2/ufraw
COMMENT= read and manipulate raw images from digital cameras

26
graphics/ufraw/patches/patch-uf_glib_h Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-uf_glib_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From c56f8be3caf1cf3d9a5c80597bdbaf1325faacc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 13 Apr 2021 23:45:39 +0100
Subject: [PATCH] Fix build against glib-2.68 fixes #10
Index: uf_glib.h
--- uf_glib.h.orig
+++ uf_glib.h
@@ -13,12 +13,12 @@
#ifndef _UF_GLIB_H
#define _UF_GLIB_H
+#include <glib.h>
+#include <glib/gstdio.h>
+
#ifdef __cplusplus
extern "C" {
#endif
-
-#include <glib.h>
-#include <glib/gstdio.h>
// g_win32_locale_filename_from_utf8 is needed only on win32
#ifdef _WIN32

16
multimedia/gstreamer1/mm/patches/patch-gstreamer_gstreamermm_register_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-gstreamer_gstreamermm_register_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
Fix build with GLib >=2.68
Index: gstreamer/gstreamermm/register.h
--- gstreamer/gstreamermm/register.h.orig
+++ gstreamer/gstreamermm/register.h
@@ -110,7 +110,7 @@ register_mm_type(const gchar * type_name)
/* The typedef for GType may be gulong or gsize, depending on the
* system and whether the compiler is c++ or not. The g_once_init_*
* functions always take a gsize * though ... */
- static volatile gsize gonce_data = 0;
+ static gsize gonce_data = 0;
if (g_once_init_enter (&gonce_data)) {
GTypeInfo info;

28
print/poppler/patches/patch-glib_poppler-action_cc Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-glib_poppler-action_cc,v 1.3 2021/05/09 08:55:41 ajacoutot Exp $
From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Fri, 26 Mar 2021 18:17:25 +0100
Subject: [PATCH] glib: Use stock glib macro to define boxed type
Index: glib/poppler-action.cc
--- glib/poppler-action.cc.orig
+++ glib/poppler-action.cc
@@ -25,7 +25,7 @@
* @title: PopplerAction
*/
-POPPLER_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free)
+G_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free)
/**
* poppler_dest_copy:
@@ -88,7 +88,7 @@ static PopplerActionLayer *poppler_action_layer_copy(P
return retval;
}
-POPPLER_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, poppler_action_copy, poppler_action_free)
+G_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, poppler_action_copy, poppler_action_free)
/**
* poppler_action_free:

19
print/poppler/patches/patch-glib_poppler-annot_cc Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-glib_poppler-annot_cc,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Fri, 26 Mar 2021 18:17:25 +0100
Subject: [PATCH] glib: Use stock glib macro to define boxed type
Index: glib/poppler-annot.cc
--- glib/poppler-annot.cc.orig
+++ glib/poppler-annot.cc
@@ -1693,7 +1693,7 @@ gchar *poppler_annot_file_attachment_get_name(PopplerA
}
/* PopplerAnnotCalloutLine */
-POPPLER_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, poppler_annot_callout_line, poppler_annot_callout_line_copy, poppler_annot_callout_line_free)
+G_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, poppler_annot_callout_line, poppler_annot_callout_line_copy, poppler_annot_callout_line_free)
/**
* poppler_annot_callout_line_new:

37
print/poppler/patches/patch-glib_poppler-document_cc Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-glib_poppler-document_cc,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Fri, 26 Mar 2021 18:17:25 +0100
Subject: [PATCH] glib: Use stock glib macro to define boxed type
Index: glib/poppler-document.cc
--- glib/poppler-document.cc.orig
+++ glib/poppler-document.cc
@@ -2360,7 +2360,7 @@ struct _PopplerIndexIter
int index;
};
-POPPLER_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, poppler_index_iter_copy, poppler_index_iter_free)
+G_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, poppler_index_iter_copy, poppler_index_iter_free)
/**
* poppler_index_iter_copy:
@@ -2579,7 +2579,7 @@ struct _PopplerFontsIter
int index;
};
-POPPLER_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, poppler_fonts_iter_copy, poppler_fonts_iter_free)
+G_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, poppler_fonts_iter_copy, poppler_fonts_iter_free)
/**
* poppler_fonts_iter_get_full_name:
@@ -3111,7 +3111,7 @@ struct _PopplerLayersIter
int index;
};
-POPPLER_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, poppler_layers_iter_copy, poppler_layers_iter_free)
+G_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, poppler_layers_iter_copy, poppler_layers_iter_free)
/**
* poppler_layers_iter_copy:

100
print/poppler/patches/patch-glib_poppler-page_cc Normal file
View File

@ -0,0 +1,100 @@
$OpenBSD: patch-glib_poppler-page_cc,v 1.2 2021/05/09 08:55:41 ajacoutot Exp $
From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Fri, 26 Mar 2021 18:17:25 +0100
Subject: [PATCH] glib: Use stock glib macro to define boxed type
Index: glib/poppler-page.cc
--- glib/poppler-page.cc.orig
+++ glib/poppler-page.cc
@@ -1566,7 +1566,7 @@ void poppler_page_remove_annot(PopplerPage *page, Popp
/* PopplerRectangle type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, poppler_rectangle_copy, poppler_rectangle_free)
+G_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, poppler_rectangle_copy, poppler_rectangle_free)
/**
* poppler_rectangle_new:
@@ -1608,7 +1608,7 @@ void poppler_rectangle_free(PopplerRectangle *rectangl
/* PopplerPoint type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, poppler_point_free)
+G_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, poppler_point_free)
/**
* poppler_point_new:
@@ -1657,7 +1657,7 @@ void poppler_point_free(PopplerPoint *point)
/* PopplerQuadrilateral type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, poppler_quadrilateral_copy, poppler_quadrilateral_free)
+G_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, poppler_quadrilateral_copy, poppler_quadrilateral_free)
/**
* poppler_quadrilateral_new:
@@ -1705,7 +1705,7 @@ void poppler_quadrilateral_free(PopplerQuadrilateral *
/* PopplerTextAttributes type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, poppler_text_attributes_copy, poppler_text_attributes_free)
+G_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, poppler_text_attributes_copy, poppler_text_attributes_free)
/**
* poppler_text_attributes_new:
@@ -1804,7 +1804,7 @@ void poppler_text_attributes_free(PopplerTextAttribute
*/
/* PopplerColor type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, poppler_color_free)
+G_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, poppler_color_free)
/**
* poppler_color_new:
@@ -1848,7 +1848,7 @@ void poppler_color_free(PopplerColor *color)
}
/* PopplerLinkMapping type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, poppler_link_mapping_copy, poppler_link_mapping_free)
+G_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, poppler_link_mapping_copy, poppler_link_mapping_free)
/**
* poppler_link_mapping_new:
@@ -1900,7 +1900,7 @@ void poppler_link_mapping_free(PopplerLinkMapping *map
}
/* Poppler Image mapping type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, poppler_image_mapping_copy, poppler_image_mapping_free)
+G_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, poppler_image_mapping_copy, poppler_image_mapping_free)
/**
* poppler_image_mapping_new:
@@ -1939,7 +1939,7 @@ void poppler_image_mapping_free(PopplerImageMapping *m
}
/* Page Transition */
-POPPLER_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, poppler_page_transition_copy, poppler_page_transition_free)
+G_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, poppler_page_transition_copy, poppler_page_transition_free)
/**
* poppler_page_transition_new:
@@ -1983,7 +1983,7 @@ void poppler_page_transition_free(PopplerPageTransitio
}
/* Form Field Mapping Type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, poppler_form_field_mapping, poppler_form_field_mapping_copy, poppler_form_field_mapping_free)
+G_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, poppler_form_field_mapping, poppler_form_field_mapping_copy, poppler_form_field_mapping_free)
/**
* poppler_form_field_mapping_new:
@@ -2035,7 +2035,7 @@ void poppler_form_field_mapping_free(PopplerFormFieldM
}
/* PopplerAnnot Mapping Type */
-POPPLER_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, poppler_annot_mapping_copy, poppler_annot_mapping_free)
+G_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, poppler_annot_mapping_copy, poppler_annot_mapping_free)
/**
* poppler_annot_mapping_new:

32
print/poppler/patches/patch-glib_poppler-private_h Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-glib_poppler-private_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Fri, 26 Mar 2021 18:17:25 +0100
Subject: [PATCH] glib: Use stock glib macro to define boxed type
Index: glib/poppler-private.h
--- glib/poppler-private.h.orig
+++ glib/poppler-private.h
@@ -143,21 +143,6 @@ gboolean _poppler_convert_pdf_date_to_gtime(const GooS
GDateTime *_poppler_convert_pdf_date_to_date_time(const GooString *date);
GooString *_poppler_convert_date_time_to_pdf_date(GDateTime *datetime);
-/*
- * A convenience macro for boxed type implementations, which defines a
- * type_name_get_type() function registering the boxed type.
- */
-#define POPPLER_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) \
- GType type_name##_get_type(void) \
- { \
- static volatile gsize g_define_type_id__volatile = 0; \
- if (g_once_init_enter(&g_define_type_id__volatile)) { \
- GType g_define_type_id = g_boxed_type_register_static(g_intern_static_string(#TypeName), (GBoxedCopyFunc)copy_func, (GBoxedFreeFunc)free_func); \
- g_once_init_leave(&g_define_type_id__volatile, g_define_type_id); \
- } \
- return g_define_type_id__volatile; \
- }
-
void _poppler_error_cb(ErrorCategory category, Goffset pos, const char *message);
#endif

28
print/poppler/patches/patch-glib_poppler-structure-element_cc Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-glib_poppler-structure-element_cc,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Fri, 26 Mar 2021 18:17:25 +0100
Subject: [PATCH] glib: Use stock glib macro to define boxed type
Index: glib/poppler-structure-element.cc
--- glib/poppler-structure-element.cc.orig
+++ glib/poppler-structure-element.cc
@@ -581,7 +581,7 @@ struct _PopplerStructureElementIter
unsigned index;
};
-POPPLER_DEFINE_BOXED_TYPE(PopplerStructureElementIter, poppler_structure_element_iter, poppler_structure_element_iter_copy, poppler_structure_element_iter_free)
+G_DEFINE_BOXED_TYPE(PopplerStructureElementIter, poppler_structure_element_iter, poppler_structure_element_iter_copy, poppler_structure_element_iter_free)
/**
* poppler_structure_element_iter_copy:
@@ -763,7 +763,7 @@ struct _PopplerTextSpan
PopplerColor color;
};
-POPPLER_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, poppler_text_span_copy, poppler_text_span_free)
+G_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, poppler_text_span_copy, poppler_text_span_free)
enum
{

48
x11/gnome/gjs/patches/patch-gjs_error-types_cpp Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-gjs_error-types_cpp,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From f02eaf3a9d3465915eb849428c2d9615e2184a4c Mon Sep 17 00:00:00 2001
From: Philip Chimento <philip.chimento@gmail.com>
Date: Sun, 14 Feb 2021 12:20:09 -0800
Subject: [PATCH] maint: Avoid g_once_init_enter error in GCC 11
Index: gjs/error-types.cpp
--- gjs/error-types.cpp.orig
+++ gjs/error-types.cpp
@@ -31,24 +31,18 @@ G_DEFINE_QUARK(gjs-js-error-quark, gjs_js_error)
// clang-format on
GType gjs_js_error_get_type(void) {
- static volatile GType g_type_id;
-
- if (g_once_init_enter(&g_type_id)) {
- static GEnumValue errors[] = {
- { GJS_JS_ERROR_ERROR, "Error", "error" },
- { GJS_JS_ERROR_EVAL_ERROR, "EvalError", "eval-error" },
- { GJS_JS_ERROR_INTERNAL_ERROR, "InternalError", "internal-error" },
- { GJS_JS_ERROR_RANGE_ERROR, "RangeError", "range-error" },
- { GJS_JS_ERROR_REFERENCE_ERROR, "ReferenceError", "reference-error" },
- { GJS_JS_ERROR_STOP_ITERATION, "StopIteration", "stop-iteration" },
- { GJS_JS_ERROR_SYNTAX_ERROR, "SyntaxError", "syntax-error" },
- { GJS_JS_ERROR_TYPE_ERROR, "TypeError", "type-error" },
- { GJS_JS_ERROR_URI_ERROR, "URIError", "uri-error" },
- { 0, nullptr, nullptr }
- };
-
- g_type_id = g_enum_register_static("GjsJSError", errors);
- }
-
+ static const GEnumValue errors[] = {
+ {GJS_JS_ERROR_ERROR, "Error", "error"},
+ {GJS_JS_ERROR_EVAL_ERROR, "EvalError", "eval-error"},
+ {GJS_JS_ERROR_INTERNAL_ERROR, "InternalError", "internal-error"},
+ {GJS_JS_ERROR_RANGE_ERROR, "RangeError", "range-error"},
+ {GJS_JS_ERROR_REFERENCE_ERROR, "ReferenceError", "reference-error"},
+ {GJS_JS_ERROR_STOP_ITERATION, "StopIteration", "stop-iteration"},
+ {GJS_JS_ERROR_SYNTAX_ERROR, "SyntaxError", "syntax-error"},
+ {GJS_JS_ERROR_TYPE_ERROR, "TypeError", "type-error"},
+ {GJS_JS_ERROR_URI_ERROR, "URIError", "uri-error"},
+ {0, nullptr, nullptr}};
+ // Initialization of static local variable guaranteed only once in C++11
+ static GType g_type_id = g_enum_register_static("GjsJSError", errors);
return g_type_id;
}

19
x11/gnome/nautilus/patches/patch-src_nautilus-enum-types_c_template Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_nautilus-enum-types_c_template,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From 9b733dd9df9d6d9805c56749d05ada15a7560ef4 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 13 Jan 2021 13:22:58 +0100
Subject: [PATCH] Drop use of volatile
Index: src/nautilus-enum-types.c.template
--- src/nautilus-enum-types.c.template.orig
+++ src/nautilus-enum-types.c.template
@@ -13,7 +13,7 @@
GType
@enum_name@_get_type (void)
{
- static volatile GType type_once = 0;
+ static GType type_once = 0;
if (g_once_init_enter (&type_once))
{

20
x11/qt5/qtwebkit/patches/patch-Source_WTF_wtf_glib_GRefPtr_h Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-Source_WTF_wtf_glib_GRefPtr_h,v 1.1 2021/05/09 08:55:41 ajacoutot Exp $
From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Wed, 7 Apr 2021 13:38:09 +0200
Subject: [PATCH] Remove invalid g_object declarations to fix build with glib >= 2.68
Index: Source/WTF/wtf/glib/GRefPtr.h
--- Source/WTF/wtf/glib/GRefPtr.h.orig
+++ Source/WTF/wtf/glib/GRefPtr.h
@@ -29,9 +29,6 @@
#include <wtf/RefPtr.h>
#include <algorithm>
-extern "C" void g_object_unref(gpointer);
-extern "C" gpointer g_object_ref_sink(gpointer);
-
namespace WTF {
enum GRefPtrAdoptType { GRefPtrAdopt };