merge these diverged branches together
--- a/.hgignore Mon May 07 20:55:46 2018 -0500
+++ b/.hgignore Mon May 07 21:06:06 2018 -0500
@@ -6,6 +6,7 @@
^packaging\/debian\/tmp\/
^packaging\/debian\/(.+\.)?(substvars|debhelper\.log)$
--- a/ChangeLog Mon May 07 20:55:46 2018 -0500
+++ b/ChangeLog Mon May 07 21:06:06 2018 -0500
@@ -4,6 +4,7 @@
* Changed the build system to meson. See INSTALL for instructions.
* Added gplugin_plugin_get_dependent_plugins. (fixes #8)
* Remove ability to disable unit testing.
+ * Bumped the glib requirement to 2.40.0 * Bumped the glib requirement to 2.34.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/convey.yml Mon May 07 21:06:06 2018 -0500
@@ -0,0 +1,306 @@
+ image: rwgrim/package-cloud:latest + command: push --verbose ${REPOSITORY}/${DISTRIBUTION} artifacts/${FILES} + ############################################################################# + ############################################################################# + build-alpine-edge-amd64: + image: gplugin/builders:alpine-edge-amd64 + export-alpine-edge-amd64: + files: alpine-edge-amd64:artifacts/ + ############################################################################# + ############################################################################# + image: gplugin/builders:coverity + files: coverity:artifacts/coverity + ############################################################################# + ############################################################################# + build-debian-oldstable-amd64: + image: gplugin/builders:debian-jessie-amd64 + export-debian-oldstable-amd64: + files: debian-oldstable-amd64:artifacts/ + build-debian-stable-amd64: + image: gplugin/builders:debian-stretch-amd64 + export-debian-stable-amd64: + files: debian-stable-amd64:artifacts/ + package-cloud-debian-stable-amd64: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=debian/stretch + - FILES=debian-stable-amd64/debs/*.deb + package-cloud-debian-stable-source: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=debian/stretch + - FILES=debian-stretch-amd64/debs/*.dsc + build-debian-testing-amd64: + image: gplugin/builders:debian-buster-amd64 + export-debian-testing-amd64: + files: debian-testing-amd64:artifacts/ + package-cloud-debian-testing-amd64: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=debian/buster + - FILES=debian-testing-amd64/debs/*.deb + package-cloud-debian-testing-source: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=debian/buster + - FILES=debian-testing-amd64/debs/*.dsc + ############################################################################# + ############################################################################# + image: gplugin/builders:fedora-25-amd64 + export-fedora-25-amd64: + files: fedora-25-amd64:artifacts/ + package-cloud-fedora-25-amd64: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=fedora/25 + - FILES=fedora-25-amd64/x86_64/*.rpm + image: gplugin/builders:fedora-26-amd64 + export-fedora-26-amd64: + files: fedora-26-amd64:artifacts/ + package-cloud-fedora-26-amd64: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=fedora/26 + - FILES=fedora-26-amd64/x86_64/*.rpm + ############################################################################# + ############################################################################# + build-opensuse-tumbleweed-amd64: + image: gplugin/builders:opensuse-tumbleweed-amd64 + export-opensuse-tumbleweed-amd64: + files: opensuse-tumbleweed-amd64:artifacts/ + package-cloud-opensuse-tumbleweed-amd64: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=opensuse/tumbleweed + - FILES=opensuse-tumbleweed-amd64/x86_64/*.rpm + ############################################################################# + ############################################################################# + image: gplugin/builders:scanbuild + files: scanbuild:artifacts/ + ############################################################################# + ############################################################################# + build-ubuntu-xenial-amd64: + image: gplugin/builders:ubuntu-xenial-amd64 + export-ubuntu-xenial-amd64: + files: debian-xenial-amd64:artifacts/ + package-cloud-ubuntu-xenial-amd64: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=ubuntu/xenial + - FILES=ubuntu-xenial-amd64/debs/*.deb + package-cloud-ubuntu-xenial-source: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=ubuntu/xenial + - FILES=ubuntu-xenial-amd64/debs/*.dsc + build-ubuntu-zesty-amd64: + image: gplugin/builders:ubuntu-zesty-amd64 + export-ubuntu-zesty-amd64: + files: debian-zesty-amd64:artifacts/ + package-cloud-ubuntu-zesty-amd64: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=ubuntu/zesty + - FILES=ubuntu-zesty-amd64/debs/*.deb + package-cloud-ubuntu-zesty-source: + - REPOSITORY=pidgin/experimental + - DISTRIBUTION=ubuntu/zesty + - FILES=ubuntu-zesty-amd64/debs/*.dsc + - build-alpine-edge-amd64 + - export-alpine-edge-amd64 + debian-oldstable-amd64: + - build-debian-oldstable-amd64 + - export-debian-oldstable-amd64 + - build-debian-stable-amd64 + - export-debian-stable-amd64 + - build-debian-testing-amd64 + - export-debian-testing-amd64 + - name: import packages + tasks: import-artifacts + - name: upload packages + - package-cloud-debian-stable-amd64 + - package-cloud-debian-stable-source + - package-cloud-debian-testing-amd64 + - package-cloud-debian-testing-source + - build-fedora-25-amd64 + - export-fedora-25-amd64 + - build-fedora-26-amd64 + - export-fedora-26-amd64 + - name: import packages + tasks: import-artifacts + - name: upload packages + - package-cloud-fedora-25-amd64 + - package-cloud-fedora-26-amd64 + opensuse-tumbleweed-amd64: + - build-opensuse-tumbleweed-amd64 + - export-opensuse-tumbleweed-amd64 + opensuse-package-cloud: + - name: import packages + tasks: import-artifacts + - name: upload packages + - package-cloud-opensuse-tumbleweed-amd64 + - build-ubuntu-xenial-amd64 + - export-ubuntu-xenial-amd64 + - build-ubuntu-zesty-amd64 + - export-ubuntu-zesty-amd64 + # old stable has a bunch of issues with + # old meson that need to be sorted out. + # - debian-oldstable-amd64 --- a/gplugin-gtk/gplugin-gtk-plugin-info.c Mon May 07 20:55:46 2018 -0500
+++ b/gplugin-gtk/gplugin-gtk-plugin-info.c Mon May 07 21:06:06 2018 -0500
@@ -332,7 +332,7 @@
g_object_unref(G_OBJECT(priv->plugin));
if(GPLUGIN_IS_PLUGIN(plugin))
- priv->plugin = g_object_ref(G_OBJECT(plugin));
+ priv->plugin = GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(plugin))); @@ -356,6 +356,6 @@
priv = GPLUGIN_GTK_PLUGIN_INFO_GET_PRIVATE(info);
- return (priv->plugin) ? g_object_ref(G_OBJECT(priv->plugin)) : NULL;
+ return (priv->plugin) ? GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(priv->plugin))) : NULL; --- a/gplugin/gplugin-manager.c Mon May 07 20:55:46 2018 -0500
+++ b/gplugin/gplugin-manager.c Mon May 07 21:06:06 2018 -0500
@@ -648,7 +648,7 @@
for(m = matches; m; m = m->next) {
- GPluginPlugin *dplugin = g_object_ref(G_OBJECT(m->data));
+ GPluginPlugin *dplugin = GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(m->data))); @@ -1331,7 +1331,7 @@
- plugin = g_object_ref(G_OBJECT(plugins_list->data));
+ plugin = GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(plugins_list->data))); gplugin_manager_free_plugin_list(plugins_list);
--- a/gplugin/gplugin-plugin.c Mon May 07 20:55:46 2018 -0500
+++ b/gplugin/gplugin-plugin.c Mon May 07 21:06:06 2018 -0500
@@ -106,7 +106,7 @@
g_object_unref(G_OBJECT(priv->loader));
if(GPLUGIN_IS_LOADER(loader))
- priv->loader = g_object_ref(G_OBJECT(loader));
+ priv->loader = GPLUGIN_LOADER(g_object_ref(G_OBJECT(loader))); @@ -115,10 +115,14 @@
gplugin_plugin_set_info(GPluginPlugin *plugin, GPluginPluginInfo *info) {
GPluginPluginPrivate *priv = GPLUGIN_PLUGIN_GET_PRIVATE(plugin);
g_object_unref(G_OBJECT(priv->info));
- priv->info = (info) ? g_object_ref(G_OBJECT(info)) : NULL;
+ priv->info = GPLUGIN_PLUGIN_INFO(g_object_ref(G_OBJECT(info))); @@ -346,7 +350,7 @@
priv = GPLUGIN_PLUGIN_GET_PRIVATE(plugin);
- return (priv->info) ? g_object_ref(G_OBJECT(priv->loader)) : NULL;
+ return (priv->info) ? GPLUGIN_LOADER(g_object_ref(G_OBJECT(priv->loader))) : NULL; @@ -365,7 +369,7 @@
priv = GPLUGIN_PLUGIN_GET_PRIVATE(plugin);
- return (priv->info) ? g_object_ref(G_OBJECT(priv->info)) : NULL;
+ return (priv->info) ? GPLUGIN_PLUGIN_INFO(g_object_ref(G_OBJECT(priv->info))) : NULL; --- a/meson.build Mon May 07 20:55:46 2018 -0500
+++ b/meson.build Mon May 07 21:06:06 2018 -0500
@@ -1,7 +1,7 @@
###############################################################################
###############################################################################
-project('gplugin', 'c', version : '0.28.0-dev',
+project('gplugin', 'c', version : '0.28.0dev', meson_version : '>=0.37.0',
default_options : ['c_std=c99'])
@@ -35,7 +35,7 @@
help2man = find_program('help2man')
-GLIB = dependency('glib-2.0', version : '>=2.34.0')
+GLIB = dependency('glib-2.0', version : '>=2.40.0') GOBJECT = dependency('gobject-2.0')
# we separate gmodule out so our test aren't linked to it
--- a/packaging/gplugin.spec.in Mon May 07 20:55:46 2018 -0500
+++ b/packaging/gplugin.spec.in Mon May 07 21:06:06 2018 -0500
@@ -143,7 +143,6 @@
CFLAGS="%{optflags}" meson \
@@ -155,7 +154,7 @@
-ninja install DESTDIR=%{buildroot}
+DESTDIR=%{buildroot} ninja install rm -rf %{buildroot}%{_datadir}/doc/gplugin/