From 37b9fae8ab0f31f64761762cb1693807add68613 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Wed, 22 Mar 2023 16:44:31 -0700
Subject: janitorial: clean up tree in preparation for libpeas-2.0

This starts the process of working towards a new Libpeas 2.0 ABI. The
goals of this ABI break are:

 * Modernize and cleanup GObject usage within libpeas
 * Use GObject's in more places to allow for better GIO integration
 * Implement GListModel where it makes sense
 * Remove GTK 3 and GTK-based APIs as those are trivial to implement in
   applications with GTK 4 and newer.
 * Drop Python 2 support
 * Simplify support for new plugin loaders

# Conflicts:
#	NEWS
#	meson.build
---
 loaders/meson.build                        |  6 +---
 loaders/python/meson.build                 | 24 ++++++++--------
 loaders/python3/meson.build                | 46 ------------------------------
 loaders/python3/peas-python3.gresource.xml |  6 ----
 4 files changed, 13 insertions(+), 69 deletions(-)
 delete mode 100644 loaders/python3/meson.build
 delete mode 100644 loaders/python3/peas-python3.gresource.xml

(limited to 'loaders')

diff --git a/loaders/meson.build b/loaders/meson.build
index d86cbf9..6235ff9 100644
--- a/loaders/meson.build
+++ b/loaders/meson.build
@@ -2,10 +2,6 @@ if build_lua51_loader == true
   subdir('lua5.1')
 endif
 
-if build_python2_loader == true
-  subdir('python')
-endif
-
 if build_python3_loader == true
-  subdir('python3')
+  subdir('python')
 endif
diff --git a/loaders/python/meson.build b/loaders/python/meson.build
index 9ca733a..458781e 100644
--- a/loaders/python/meson.build
+++ b/loaders/python/meson.build
@@ -1,29 +1,29 @@
-python2_loader_name = 'pythonloader'
+python3_loader_name = 'pythonloader'
 
 pygobject_version = pygobject_dep.version()
 pygobject_version_arr = pygobject_version.split('.')
 pygobject_version_major = pygobject_version_arr[0].to_int()
 pygobject_version_minor = pygobject_version_arr[1].to_int()
-pygobject_version_micro = pygobject_version_arr[2].to_int()
+pygobject_version_micro = pygobject_version_arr[3].to_int()
 
-python2_loader_c = files(
+python3_loader_c = files(
   'peas-plugin-loader-python.c',
   'peas-python-internal.c',
 )
 
-python2_loader_res = gnome.compile_resources(
+python3_loader_res = gnome.compile_resources(
   'peas-python-resources',
   'peas-python.gresource.xml',
   export: true,
 )
 
-python2_loader_deps = [
+python3_loader_deps = [
   libpeas_dep,
-  python2_dep,
+  python3_dep,
   pygobject_dep,
 ]
 
-python2_loader_c_args = [
+python3_loader_c_args = [
   '-DHAVE_CONFIG_H',
   '-DPEAS_LOCALEDIR="@0@"'.format(localedir),
   '-DPYGOBJECT_MAJOR_VERSION=@0@'.format(pygobject_version_major),
@@ -31,12 +31,12 @@ python2_loader_c_args = [
   '-DPYGOBJECT_MICRO_VERSION=@0@'.format(pygobject_version_micro),
 ]
 
-python2_loader_sha = shared_module(
-  python2_loader_name,
-  python2_loader_c + python2_loader_res,
+python3_loader_sha = shared_module(
+  python3_loader_name,
+  python3_loader_c + python3_loader_res,
   include_directories: rootdir,
-  dependencies: python2_loader_deps,
-  c_args: project_c_args + python2_loader_c_args,
+  dependencies: python3_loader_deps,
+  c_args: project_c_args + python3_loader_c_args,
   install: true,
   install_dir: join_paths(
     pkglibdir,
diff --git a/loaders/python3/meson.build b/loaders/python3/meson.build
deleted file mode 100644
index d6f9eba..0000000
--- a/loaders/python3/meson.build
+++ /dev/null
@@ -1,46 +0,0 @@
-python3_loader_name = 'python3loader'
-
-pygobject_version = pygobject_dep.version()
-pygobject_version_arr = pygobject_version.split('.')
-pygobject_version_major = pygobject_version_arr[0].to_int()
-pygobject_version_minor = pygobject_version_arr[1].to_int()
-pygobject_version_micro = pygobject_version_arr[2].to_int()
-
-python3_loader_c = files(
-  '../python/peas-plugin-loader-python.c',
-  '../python/peas-python-internal.c',
-)
-
-python3_loader_res = gnome.compile_resources(
-  'peas-python2-resources',
-  'peas-python3.gresource.xml',
-  export: true,
-)
-
-python3_loader_deps = [
-  libpeas_dep,
-  python3_dep,
-  pygobject_dep,
-]
-
-python3_loader_c_args = [
-  '-DHAVE_CONFIG_H',
-  '-DPEAS_LOCALEDIR="@0@"'.format(localedir),
-  '-DPYGOBJECT_MAJOR_VERSION=@0@'.format(pygobject_version_major),
-  '-DPYGOBJECT_MINOR_VERSION=@0@'.format(pygobject_version_minor),
-  '-DPYGOBJECT_MICRO_VERSION=@0@'.format(pygobject_version_micro),
-]
-
-python3_loader_sha = shared_module(
-  python3_loader_name,
-  python3_loader_c + python3_loader_res,
-  include_directories: rootdir,
-  dependencies: python3_loader_deps,
-  c_args: project_c_args + python3_loader_c_args,
-  install: true,
-  install_dir: join_paths(
-    pkglibdir,
-    'loaders',
-  ),
-  name_suffix: module_suffix
-)
diff --git a/loaders/python3/peas-python3.gresource.xml b/loaders/python3/peas-python3.gresource.xml
deleted file mode 100644
index af79914..0000000
--- a/loaders/python3/peas-python3.gresource.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/libpeas/loaders/python3">
-    <file alias="internal.py">../python/peas-python-internal.py</file>
-  </gresource>
-</gresources>
-- 
cgit v1.2.1