Commit 9bf83a78 authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'libremone-sloppy' into 'pureos/sloppy'

Add librem.one support

See merge request !1
parents e736cd34 53883df6
Pipeline #51604 passed with stages
in 11 minutes and 7 seconds
include:
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
stages:
- package
- test-package
package:deb-debian-buster:
extends: .l5-build-debian-package
package:deb-debian-buster:arm64:
tags:
- librem5:arm64
extends: .l5-build-debian-package
autopkgtest-debian-buster-package:
dependencies:
- package:deb-debian-buster
extends: .l5-autopkgtest-debian-package
lintian-debian-buster-package:
dependencies:
- package:deb-debian-buster
extends: .l5-lintian-debian-package
......@@ -247,6 +247,16 @@ if test "$enable_imap_smtp" != "no"; then
AC_DEFINE(GOA_IMAP_SMTP_ENABLED, 1, [Enable IMAP/SMTP data provider])
fi
# librem.one
AC_DEFINE(GOA_LIBREM_ONE_NAME, ["librem_one"], [ProviderType and extension point name])
AC_ARG_ENABLE([imap-smtp],
[AS_HELP_STRING([--enable-librem-one], [Enable librem.one provider])],
[],
[enable_librem_one=yes])
if test "$enable_librem_one" != "no"; then
AC_DEFINE(GOA_LIBREM_ONE_ENABLED, 1, [Enable librem.one data provider])
fi
# Media Server
AC_DEFINE(GOA_MEDIA_SERVER_NAME, ["media-server"], [ProviderType and extension point name])
AC_ARG_ENABLE([media-server],
......@@ -546,6 +556,7 @@ echo "
Windows Live provider: ${enable_windows_live} (OAuth 2.0, id:${with_windows_live_client_id})
Pocket provider: ${enable_pocket} (id:${with_pocket_client_id})
Last.fm provider: ${enable_lastfm} (id:${with_lastfm_client_id} secret:${with_lastfm_client_secret})
Librem.one provider: ${enable_libremone}
Maintainer mode: ${USE_MAINTAINER_MODE}
Building api docs: ${enable_gtk_doc}
......
......@@ -9,6 +9,7 @@ icon_DATA = \
goa-account-owncloud.svg \
goa-account-pocket.svg \
goa-account-foursquare.svg \
goa-account-librem-one.svg \
$(NULL)
EXTRA_DIST = \
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 128 128"
style="display:inline;enable-background:new"
version="1.0"
id="svg11300"
height="128"
width="128">
<title
id="title4162">Adwaita Icon Template</title>
<defs
id="defs3">
<clipPath
id="clipPath16-6"
clipPathUnits="userSpaceOnUse">
<path
id="path18-8"
d="M 0,500 H 500 V 0 H 0 Z" />
</clipPath>
</defs>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>GNOME Design Team</dc:title>
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
<dc:title>Adwaita Icon Template</dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
<dc:date />
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:publisher>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:publisher>
<dc:identifier />
<dc:relation />
<dc:language />
<dc:coverage />
<dc:description />
<dc:contributor>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:contributor>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
transform="translate(0,-172)"
style="display:inline"
id="layer1">
<g
style="display:inline"
id="layer9">
<g
id="g4274"
style="display:inline;enable-background:new"
transform="translate(-300.00003,1.1925304e-4)">
<g
transform="translate(668.00003,-2.3925304e-4)"
id="g4266"
style="display:inline;enable-background:new">
<rect
style="display:inline;opacity:1;vector-effect:none;fill:#3d3846;fill-opacity:1;stroke:none;stroke-width:0.24999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
id="rect4264"
width="104"
height="104.00024"
x="-356"
y="184"
rx="7.9999986"
ry="8" />
</g>
<g
id="g4272"
transform="translate(0,-25.49826)">
<path
transform="scale(1,-1)"
d="m 399.00011,-275.49826 a 35.000107,35.000107 0 0 1 -17.50006,30.31098 35.000107,35.000107 0 0 1 -35.0001,0 35.000107,35.000107 0 0 1 -17.50006,-30.31098"
id="path4268"
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:12;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:12;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path4270"
d="m 382.00169,-275.49826 a 17.999739,17.999739 0 0 1 -8.99987,15.58823 17.999739,17.999739 0 0 1 -17.99974,0 17.999739,17.999739 0 0 1 -8.99987,-15.58823"
transform="scale(1,-1)" />
</g>
</g>
</g>
</g>
</svg>
......@@ -9,6 +9,7 @@ icon_DATA = \
goa-account-owncloud-symbolic.svg \
goa-account-pocket-symbolic.svg \
goa-account-foursquare-symbolic.svg \
goa-account-librem-one-symbolic.svg \
$(NULL)
EXTRA_DIST = \
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="15.999999"
height="16"
viewBox="0 0 15.999999 16"
version="1.1"
id="svg4043">
<defs
id="defs4037" />
<metadata
id="metadata4040">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="g4272-0"
transform="matrix(0.12766909,0,0,0.12766909,-38.47158,-25.82483)"
style="display:inline;stroke:#241f31;stroke-opacity:1;enable-background:new">
<path
transform="scale(1,-1)"
d="m 403.16367,-280.60785 a 39.163673,40.251621 0 0 1 -19.58183,34.85893 39.163673,40.251621 0 0 1 -39.16368,0 39.163673,40.251621 0 0 1 -19.58183,-34.85893"
id="path4268-6"
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#241f31;stroke-width:15.66549873;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="scale(1,-1)"
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#241f31;stroke-width:15.66549873;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path4270-2"
d="m 379.66551,-280.60785 a 15.663678,16.499037 0 0 1 -7.83184,14.28859 15.663678,16.499037 0 0 1 -15.66368,0 15.663678,16.499037 0 0 1 -7.83184,-14.28859" />
</g>
</svg>
......@@ -122,6 +122,7 @@ libgoa-backend-1.0.so.1 libgoa-backend-1.0-1 #MINVER#
goa_imap_smtp_provider_get_type@Base 3.10.0
goa_kerberos_provider_get_type@Base 3.10.0
goa_lastfm_provider_get_type@Base 3.17.92
goa_librem_one_provider_get_type@Base 3.32.0
goa_mail_auth_get_input@Base 3.10.0
goa_mail_auth_get_output@Base 3.10.0
goa_mail_auth_get_type@Base 3.10.0
......
......@@ -13,6 +13,7 @@ override_dh_auto_configure:
dh_auto_configure -- \
--libexecdir=\$${prefix}/lib/gnome-online-accounts \
--enable-documentation \
--enable-compile-warnings=yes \
--enable-gtk-doc \
--enable-kerberos \
--disable-media-server \
......@@ -24,6 +25,7 @@ override_dh_auto_configure:
--enable-pocket \
--enable-imap-smtp \
--enable-exchange \
--enable-librem-one \
--enable-foursquare
override_dh_install:
......
......@@ -91,6 +91,7 @@ libgoa_backend_1_0_la_SOURCES = \
goaowncloudprovider.h goaowncloudprovider.c \
goaflickrprovider.h goaflickrprovider.c \
goafoursquareprovider.h goafoursquareprovider.c \
goalibremonprovider.h goalibremoneprovider.c \
goawindowsliveprovider.h goawindowsliveprovider.c \
goapocketprovider.h goapocketprovider.c \
goalastfmprovider.h goalastfmprovider.c \
......
This diff is collapsed.
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/*
* Copyright © 2019 Purism SPC
* Copyright © 2011 – 2017 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION)
#error "Only <goabackend/goabackend.h> can be included directly."
#endif
#ifndef __GOA_LIBREM_ONE_PROVIDER_H__
#define __GOA_LIBREM_ONE_PROVIDER_H__
#include <glib-object.h>
#include "goaprovider-priv.h"
G_BEGIN_DECLS
#define GOA_TYPE_LIBREM_ONE_PROVIDER (goa_librem_one_provider_get_type ())
G_DECLARE_FINAL_TYPE (GoaLibremOneProvider, goa_librem_one_provider, GOA, LIBREM_ONE_PROVIDER, GoaProvider);
G_END_DECLS
#endif /* __GOA_LIBREM_ONE_PROVIDER_H__ */
......@@ -33,6 +33,7 @@
#include "goapocketprovider.h"
#include "goamediaserverprovider.h"
#include "goalastfmprovider.h"
#include "goalibremoneprovider.h"
#ifdef GOA_KERBEROS_ENABLED
#include "goakerberosprovider.h"
......@@ -932,6 +933,9 @@ static struct
* important because it affects the order in which they are
* returned by goa_provider_get_all.
*/
#ifdef GOA_LIBREM_ONE_ENABLED
{ GOA_LIBREM_ONE_NAME, goa_librem_one_provider_get_type },
#endif
#ifdef GOA_GOOGLE_ENABLED
{ GOA_GOOGLE_NAME, goa_google_provider_get_type },
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment