Skip to content

build: fix: Ubuntu 26.04 LTS #133

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

Draft
sergio-nsk wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

build: fix: Ubuntu 26.04 LTS #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions .github/workflows/ubuntu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ jobs:
gcov-exec: llvm-cov-15 gcov
codecov: ubuntu

- name: Build - Ubuntu 26 Clang
runs-on: ubuntu-26.04
compiler: clang
cxx-compiler: clang++
cmake-args: -G Ninja -D PROXYRES_CODE_COVERAGE=ON
packages: llvm-21 libjavascriptcoregtk-6.0-dev gsettings-desktop-schemas
gcov-exec: llvm-cov-21 gcov
codecov: ubuntu

- name: Build - Ubuntu Clang (curl)
runs-on: ubuntu-latest
compiler: clang
Expand All @@ -50,6 +59,15 @@ jobs:
gcov-exec: llvm-cov-15 gcov
codecov: ubuntu_curl

- name: Build - Ubuntu 26 Clang (curl)
runs-on: ubuntu-26.04
compiler: clang
cxx-compiler: clang++
cmake-args: -G Ninja -D PROXYRES_CODE_COVERAGE=ON -D PROXYRES_CURL=ON
packages: llvm-21 libjavascriptcoregtk-6.0-dev gsettings-desktop-schemas
gcov-exec: llvm-cov-21 gcov
codecov: ubuntu_curl

- name: Build - Ubuntu Clang (duktape)
runs-on: ubuntu-latest
compiler: clang
Expand All @@ -59,6 +77,15 @@ jobs:
gcov-exec: llvm-cov-15 gcov
codecov: ubuntu_duktape

- name: Build - Ubuntu 26 Clang (duktape)
runs-on: ubuntu-26.04
compiler: clang
cxx-compiler: clang++
cmake-args: -G Ninja -D PROXYRES_CODE_COVERAGE=ON -D PROXYRES_DUKTAPE=ON
packages: llvm-21 libglib2.0-dev gsettings-desktop-schemas
gcov-exec: llvm-cov-21 gcov
codecov: ubuntu_duktape

steps:
- name: Install dependencies
run: |
Expand Down
29 changes: 25 additions & 4 deletions config_gnome3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,27 @@ typedef struct g_proxy_config_gnome3_s {
// Glib module handle
void *glib_module;
// Glib memory functions
#if G_GNUC_CHECK_VERSION(4, 1) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_78 && defined(G_HAVE_FREE_SIZED)
void (*g_free_sized)(gpointer mem, size_t size);
#endif
void (*g_free)(gpointer mem);
void (*g_strfreev)(gchar **str_array);
} g_proxy_config_gnome3_s;

g_proxy_config_gnome3_s g_proxy_config_gnome3;

#ifdef g_free
# undef g_free
# if G_GNUC_CHECK_VERSION(4, 1) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_78 && defined(G_HAVE_FREE_SIZED)
# define g_free(mem) \
(__builtin_object_size((mem), 0) != ((size_t)-1)) \
? g_proxy_config_gnome3.g_free_sized(mem, __builtin_object_size((mem), 0)) \
: (g_proxy_config_gnome3.g_free)(mem)
# else
# define gfree(mem) (g_proxy_config_gnome3.g_free)(mem)
# endif
#endif

static bool proxy_config_gnome3_is_mode(const char *mode) {
bool equal = false;

Expand All @@ -41,7 +56,7 @@ static bool proxy_config_gnome3_is_mode(const char *mode) {
char *system_mode = g_proxy_config_gnome3.g_settings_get_string(settings, "mode");
if (system_mode) {
equal = strcmp(system_mode, mode) == 0;
g_proxy_config_gnome3.g_free(system_mode);
g_free(system_mode);
}
g_proxy_config_gnome3.g_object_unref(settings);
return equal;
Expand All @@ -63,7 +78,7 @@ char *proxy_config_gnome3_get_auto_config_url(void) {
if (url) {
if (*url)
auto_config_url = strdup(url);
g_proxy_config_gnome3.g_free(url);
g_free(url);
}
g_proxy_config_gnome3.g_object_unref(settings);
return auto_config_url;
Expand Down Expand Up @@ -108,7 +123,7 @@ char *proxy_config_gnome3_get_proxy(const char *scheme) {
snprintf(proxy, max_proxy, "%s:%" PRIu32 "", host, port);
}

g_proxy_config_gnome3.g_free(host);
g_free(host);
}
g_proxy_config_gnome3.g_object_unref(settings);
return proxy;
Expand Down Expand Up @@ -162,9 +177,15 @@ bool proxy_config_gnome3_global_init(void) {
goto gnome3_init_error;

// Glib functions
g_proxy_config_gnome3.g_free = (void (*)(gpointer))dlsym(g_proxy_config_gnome3.glib_module, "g_free");
(g_proxy_config_gnome3.g_free) = (void (*)(gpointer))dlsym(g_proxy_config_gnome3.glib_module, "g_free");
if (!g_proxy_config_gnome3.g_free)
goto gnome3_init_error;
#if G_GNUC_CHECK_VERSION(4, 1) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_78 && defined(G_HAVE_FREE_SIZED)
g_proxy_config_gnome3.g_free_sized =
(void (*)(gpointer, size_t))dlsym(g_proxy_config_gnome3.glib_module, "g_free_sized");
if (!g_proxy_config_gnome3.g_free_sized)
goto gnome3_init_error;
#endif
g_proxy_config_gnome3.g_strfreev = (void (*)(gchar **))dlsym(g_proxy_config_gnome3.glib_module, "g_strfreev");
if (!g_proxy_config_gnome3.g_strfreev)
goto gnome3_init_error;
Expand Down
Loading