[xdg-desktop-portal-gnome/gbsneto/revert-libadwaita] Drop libadwaita dependency for now
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [xdg-desktop-portal-gnome/gbsneto/revert-libadwaita] Drop libadwaita dependency for now
- Date: Fri, 13 Aug 2021 18:41:43 +0000 (UTC)
commit e3c09ccebd1826097f9b3ac3283a0839291d8e64
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Fri Aug 13 15:38:51 2021 -0300
Drop libadwaita dependency for now
Libadwaita sadly wasn't ready for its prime time for GNOME 41, so we'll
have to drop this dependency for now until it sees a stable release.
This reverts the following commits:
* daf1e3b3fdf6e433ce9ded0e8231ede5278af8b3.
* 75289e71a743bfab92a328292913feea4666eac1.
* c94eb2fa61c41f01f14b234f4af4e2e7e0231cec.
* e48e7dbd22989352c7aef5dc12baf9ec6835fc0c.
.gitignore | 2 --
.gitlab-ci.yml | 4 ++--
src/meson.build | 6 ------
src/xdg-desktop-portal-gnome.c | 4 +---
subprojects/libadwaita.wrap | 3 ---
5 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c104686..dec5a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,3 @@ src/views/.dirstamp
.gitlab
.flatpak-builder
**/*~
-/subprojects/*
-!/subprojects/libadwaita.wrap
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f6d397..f1852d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build-fedora:
image: fedora:latest
extends: .build-common
before_script:
- - dnf install -y 'dnf-command(builddep)' meson git gtk4-devel sassc
+ - dnf install -y 'dnf-command(builddep)' meson gtk4-devel
- dnf builddep -y xdg-desktop-portal-gtk
build-ubuntu:
@@ -23,5 +23,5 @@ build-ubuntu:
before_script:
- sed -i '/deb-src/s/^# //' /etc/apt/sources.list
- apt-get update
- - apt-get install -y meson git libgtk-4-dev sassc
+ - apt-get install -y meson libgtk-4-dev
- apt-get build-dep -y xdg-desktop-portal-gtk
diff --git a/src/meson.build b/src/meson.build
index e586a0f..6d2e476 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -56,11 +56,6 @@ config_h.set_quoted('PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), mes
built_sources += configure_file(output: 'config.h', configuration: config_h)
# Sources
-libadwaita_dep = dependency(
- 'libadwaita-1',
- fallback: ['libadwaita', 'libadwaita_dep'],
- default_options: ['examples=false', 'introspection=disabled', 'tests=false', 'vapi=false'],
-)
deps = [
declare_dependency(sources: built_sources),
meson.get_compiler('c').find_library('m'),
@@ -69,7 +64,6 @@ deps = [
dependency('gio-unix-2.0'),
dependency('gtk4', version: '>= 4.0'),
dependency('gsettings-desktop-schemas'),
- libadwaita_dep,
xdg_desktop_portal_dep,
]
diff --git a/src/xdg-desktop-portal-gnome.c b/src/xdg-desktop-portal-gnome.c
index a285c59..d704014 100644
--- a/src/xdg-desktop-portal-gnome.c
+++ b/src/xdg-desktop-portal-gnome.c
@@ -31,7 +31,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <adwaita.h>
+#include <gtk/gtk.h>
#include <gio/gio.h>
#include <gio/gdesktopappinfo.h>
@@ -241,8 +241,6 @@ main (int argc, char *argv[])
NULL,
NULL);
- adw_init ();
-
g_main_loop_run (loop);
g_bus_unown_name (owner_id);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]