Skip to content

Port to libgirepository-2.0 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sc0w merged 4 commits into from
Nov 11, 2025
Merged

Port to libgirepository-2.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bd434d
Build with a libbean that uses libgirepository-2.0
sc0w Nov 10, 2025
6ec1290
ci: add libgirepository-2.0-dev
sc0w Nov 10, 2025
036ca46
ci: add gir1.2-girepository-3.0-dev
sc0w Nov 10, 2025
93a5792
ci: install glib 2.85 for stable
sc0w Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ requires:
- gtk-doc-tools
- iso-codes
- libenchant-2-dev
- libgirepository1.0-dev
- libgirepository-2.0-dev
- libglib2.0-dev
- libsm-dev
- libx11-dev
Expand Down Expand Up @@ -48,13 +48,16 @@ requires:
- xvfb

# required for libbean
- libgirepository1.0-doc
- gir1.2-girepository-3.0-dev
- python-gi-dev
- python3-gi

before_scripts:
- ./html-cppcheck
- ./debrepo-install 'libctk-3-dev gir1.2-ctk-3.0 libctk-3-common libctk-3-0 libctk-3-doc'
- if [ ${DISTRO_VERSION} == "stable" ];then
- ./install-from-git https://gitlab.gnome.org/GNOME/glib 2.85.4 meson '--libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu -Dtests=false'
- fi
- ./install-from-git https://github.com/cafe-desktop/cafe-common master
- ./install-from-git https://github.com/cafe-desktop/cafe-desktop master #required for make check
- ./install-from-git https://github.com/cafe-desktop/ctksourceview master meson '--libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu'
Expand Down
8 changes: 4 additions & 4 deletions lapiz/lapiz-plugins-engine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <string.h>

#include <glib/gi18n.h>
#include <girepository.h>
#include <girepository/girepository.h>

#include "lapiz-plugins-engine.h"
#include "lapiz-debug.h"
Expand Down Expand Up @@ -67,15 +67,15 @@ lapiz_plugins_engine_init (LapizPluginsEngine *engine)
engine->priv->plugin_settings = g_settings_new (LAPIZ_SCHEMA);

/* This should be moved to libbean */
if (!g_irepository_require (g_irepository_get_default (),
if (!gi_repository_require (gi_repository_dup_default (),
"Bean", "2.0", 0, &error))
{
g_warning ("Could not load Bean repository: %s", error->message);
g_error_free (error);
error = NULL;
}

if (!g_irepository_require (g_irepository_get_default (),
if (!gi_repository_require (gi_repository_dup_default (),
"BeanCtk", "2.0", 0, &error))
{
g_warning ("Could not load BeanCtk repository: %s", error->message);
Expand All @@ -85,7 +85,7 @@ lapiz_plugins_engine_init (LapizPluginsEngine *engine)

private_path = g_build_filename (LIBDIR, "girepository-1.0", NULL);

if (!g_irepository_require_private (g_irepository_get_default (),
if (!gi_repository_require_private (gi_repository_dup_default (),
private_path, "Lapiz", "1.0", 0, &error))
{
g_warning ("Could not load Lapiz repository: %s", error->message);
Expand Down
4 changes: 2 additions & 2 deletions lapiz/lapiz.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <cdk/cdkx.h>

#ifdef HAVE_INTROSPECTION
#include <girepository.h>
#include <girepository/girepository.h>
#endif

#include "lapiz-app.h"
Expand Down Expand Up @@ -527,7 +527,7 @@ main (int argc, char *argv[])
g_option_context_add_group (context, egg_sm_client_get_option_group ());

#ifdef HAVE_INTROSPECTION
g_option_context_add_group (context, g_irepository_get_option_group ());
g_option_context_add_group (context, gi_repository_get_option_group ());
#endif

if (!g_option_context_parse (context, &argc, &argv, &error))
Expand Down