From 442c0be11652fbd3d454cf8445ad322c069527eb Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 26 Apr 2018 09:29:56 +0200 Subject: [PATCH] common: Move flatpak-portal-error.[ch] back to common code A symbol from this (flatpak_portal_error_quark) was leaked to libflatpak due to being marked FLATPAK_EXTERN, so to keep ABI we move it back. Fixes https://github.com/flatpak/flatpak/issues/1613 Closes: #1616 Approved by: alexlarsson --- common/Makefile.am.inc | 2 ++ {portal => common}/flatpak-portal-error.c | 0 {portal => common}/flatpak-portal-error.h | 0 portal/Makefile.am.inc | 4 ++-- 4 files changed, 4 insertions(+), 2 deletions(-) rename {portal => common}/flatpak-portal-error.c (100%) rename {portal => common}/flatpak-portal-error.h (100%) diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc index 42bdb25b..70fa6784 100644 --- a/common/Makefile.am.inc +++ b/common/Makefile.am.inc @@ -60,6 +60,8 @@ libflatpak_common_la_SOURCES = \ common/flatpak-table-printer.h \ common/flatpak-chain-input-stream.c \ common/flatpak-chain-input-stream.h \ + common/flatpak-portal-error.c \ + common/flatpak-portal-error.h \ common/flatpak-json.c \ common/flatpak-json.h \ common/flatpak-json-oci.c \ diff --git a/portal/flatpak-portal-error.c b/common/flatpak-portal-error.c similarity index 100% rename from portal/flatpak-portal-error.c rename to common/flatpak-portal-error.c diff --git a/portal/flatpak-portal-error.h b/common/flatpak-portal-error.h similarity index 100% rename from portal/flatpak-portal-error.h rename to common/flatpak-portal-error.h diff --git a/portal/Makefile.am.inc b/portal/Makefile.am.inc index adea910f..38a56bb1 100644 --- a/portal/Makefile.am.inc +++ b/portal/Makefile.am.inc @@ -28,8 +28,8 @@ flatpak_portal_SOURCES = \ portal/flatpak-portal.h \ portal/flatpak-portal-app-info.c \ portal/flatpak-portal-app-info.h \ - portal/flatpak-portal-error.c \ - portal/flatpak-portal-error.h \ + common/flatpak-portal-error.c \ + common/flatpak-portal-error.h \ $(NULL) BUILT_SOURCES += $(portal_built_sources)