FreeBSD/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2026-06-02 11:08:52 +00:00
Code Issues Projects Releases Wiki Activity

graphics/entangle: try to unbreak the build after recent changes

Browse Source 
Starting with version 1.80, girepository was moved from gobject-
introspection into glib itself.  Replace the old dependency with
fairly straightforward accommodations for new API.

Fixes:	064dc8f4dd
This commit is contained in:
Alexey Dokuchaev
2026-05-21 16:22:56 +00:00
parent c2346ced41
commit 9fbf550615
4 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/entangle/Makefile
+1 -3
View File
@@ -8,8 +8,6 @@ MAINTAINER= danfe@FreeBSD.org
COMMENT= Digital camera tethered control and capture program
WWW= https://www.entangle-photo.org/
BROKEN= Fails to build, ld: error: undefined symbol: g_irepository_require
LICENSE= GPLv3
BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc \
@@ -22,7 +20,7 @@ LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 \
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas1>0:devel/py-libpeas1@${PY_FLAVOR}
USES= compiler:c++11-lang gnome gstreamer meson pkgconfig python tar:xz xorg
USE_GNOME= cairo gtk30 intltool introspection
USE_GNOME= cairo gtk30 intltool
USE_GSTREAMER= core
USE_XORG= xext
GLIB_SCHEMAS= org.entangle-photo.manager.gschema.xml
graphics/entangle/files/patch-meson.build
+5 -4
View File
@@ -1,19 +1,20 @@
--- meson.build.orig 2017-10-10 21:07:59 UTC
+++ meson.build
@@ -18,7 +18,6 @@ glib_min_version = '>= 2.36.0'
@@ -18,8 +18,6 @@ glib_min_version = '>= 2.36.0'
gdk_pixbuf_min_version = '>= 2.12.0'
gtk_min_version = '>= 3.12.0'
gphoto2_min_version = '>= 2.5.0'
-gudev_min_version = '>= 145'
gobject_introspection_min_version = '>= 0.9.3'
-gobject_introspection_min_version = '>= 0.9.3'
lcms2_min_version = '>= 2.0'
libpeas_min_version = '>= 1.2.0'
@@ -34,15 +33,13 @@ gmodule_dep = dependency('gmodule-2.0', version: glib_
gexiv2_min_version = '>= 0.10'
@@ -34,15 +32,12 @@ gmodule_dep = dependency('gmodule-2.0', version: glib_
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_min_version)
gtk_dep = dependency('gtk+-3.0', version: gtk_min_version)
gphoto2_dep = dependency('libgphoto2', version: gphoto2_min_version)
-gudev_dep = dependency('gudev-1.0', version: gudev_min_version)
gobject_introspection_dep = dependency('gobject-introspection-1.0', version: gobject_introspection_min_version)
-gobject_introspection_dep = dependency('gobject-introspection-1.0', version: gobject_introspection_min_version)
lcms2_dep = dependency('lcms2', version: lcms2_min_version)
libpeas_dep = dependency('libpeas-1.0', version: libpeas_min_version)
libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: libpeas_min_version)
graphics/entangle/files/patch-src_entangle-main.c
+24
View File
@@ -0,0 +1,24 @@
--- src/entangle-main.c.orig 2017-10-10 21:07:59 UTC
+++ src/entangle-main.c
@@ -23,7 +23,7 @@
#include <gst/gst.h>
#include <gtk/gtk.h>
-#include <girepository.h>
+#include <girepository/girepository.h>
#include <glib/gi18n.h>
#include "entangle-debug.h"
@@ -76,8 +76,10 @@ int main(int argc, char **argv)
gst_init(NULL, NULL);
- if (ins) {
- g_irepository_dump(ins, NULL);
+ char **args;
+ if (ins && (args = g_strsplit(ins, ",", 2))) {
+ gi_repository_dump(args[0], args[1], NULL);
+ g_strfreev(args);
return 0;
}
graphics/entangle/files/patch-src_frontend_entangle-application.c
+11
View File
@@ -0,0 +1,11 @@
--- src/frontend/entangle-application.c.orig 2017-10-10 21:07:59 UTC
+++ src/frontend/entangle-application.c
@@ -517,7 +517,7 @@ static void entangle_application_init(EntangleApplicat
priv->activeCameras = entangle_camera_list_new_active();
priv->supportedCameras = entangle_camera_list_new_supported();
- g_irepository_require(g_irepository_get_default(),
+ gi_repository_require(gi_repository_dup_default(),
"Peas", "1.0", 0, NULL);
userdir = g_build_filename(g_get_user_config_dir(), "entangle/plugins", NULL);