Commit a38ae774 authored by Guido Gunther's avatar Guido Gunther

Merge branch 'pureos/byzantium' into 'pureos/byzantium'

Update for pureos byzantium

Closes #10

See merge request !3
parents a917b939 69fdbfcc
Pipeline #64706 passed with stages
in 12 minutes and 18 seconds
gnome-online-accounts (3.38.0-3pureos1) byzantium; urgency=medium
* Add librem.one and adaptiveness patches
* debian: Update symbols
* debian: Build librem.one provider
* Add gitlab-ci
* Enable compile warnings.
This makes compile warnings non-fatal
-- Guido Günther <agx@sigxcpu.org> Tue, 23 Feb 2021 12:05:14 +0100
gnome-online-accounts (3.38.0-3) unstable; urgency=medium
* Split the dep8 tests for libgoa-1.0-dev and libgoa-backend-1.0-dev
......
......@@ -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
......
include:
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
variables:
L5_DOCKER_IMAGE: "debian:bullseye"
L5_ADD_SCRATCH_CI: "false"
stages:
- package
- test-package
package:deb-debian-bullseye:
extends: .l5-build-debian-package
package:deb-debian-bullseye:arm64:
tags:
- librem5:arm64
extends: .l5-build-debian-package
autopkgtest-debian-bullseye-package:
dependencies:
- package:deb-debian-bullseye
extends: .l5-autopkgtest-debian-package
lintian-debian-bullseye-package:
dependencies:
- package:deb-debian-bullseye
extends: .l5-lintian-debian-package
check-tarball:
extends: .l5-check-tarball
only:
changes:
- "debian/changelog"
From: Tobias Bernard <tbernard@gnome.org>
Date: Thu, 9 May 2019 11:27:13 +0200
Subject: Add Icons for Librem One
---
data/icons/scalable/Makefile.am | 2 +
data/icons/scalable/goa-account-librem-one.svg | 127 +++++++++++++++++++++
.../symbolic/goa-account-librem-one-symbolic.svg | 42 +++++++
3 files changed, 171 insertions(+)
create mode 100644 data/icons/scalable/goa-account-librem-one.svg
create mode 100644 data/icons/symbolic/goa-account-librem-one-symbolic.svg
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 5721dd5..f31c867 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -12,6 +12,8 @@ icon_DATA = \
goa-account-msn.svg \
goa-account-owncloud.svg \
goa-account-foursquare.svg \
+ goa-account-librem-one.svg \
+ goa-account-librem-one-symbolic.svg \
$(NULL)
EXTRA_DIST = \
diff --git a/data/icons/scalable/goa-account-librem-one.svg b/data/icons/scalable/goa-account-librem-one.svg
new file mode 100644
index 0000000..cb05914
--- /dev/null
+++ b/data/icons/scalable/goa-account-librem-one.svg
@@ -0,0 +1,127 @@
+<?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>
diff --git a/data/icons/symbolic/goa-account-librem-one-symbolic.svg b/data/icons/symbolic/goa-account-librem-one-symbolic.svg
new file mode 100644
index 0000000..aaf2369
--- /dev/null
+++ b/data/icons/symbolic/goa-account-librem-one-symbolic.svg
@@ -0,0 +1,42 @@
+<?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>
This diff is collapsed.
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Tue, 13 Oct 2020 15:41:30 +0500
Subject: goabackend: Make dialogs resizable
Allow them to be maximized.
---
src/goabackend/goaexchangeprovider.c | 1 -
src/goabackend/goaimapsmtpprovider.c | 1 -
src/goabackend/goalastfmprovider.c | 1 -
src/goabackend/goalibremoneprovider.c | 1 -
src/goabackend/goaoauth2provider.c | 1 -
src/goabackend/goaoauthprovider.c | 1 -
src/goabackend/goaowncloudprovider.c | 1 -
7 files changed, 7 deletions(-)
diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
index 46d4314..885f25a 100644
--- a/src/goabackend/goaexchangeprovider.c
+++ b/src/goabackend/goaexchangeprovider.c
@@ -698,7 +698,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c
index d85d482..b6f47c8 100644
--- a/src/goabackend/goaimapsmtpprovider.c
+++ b/src/goabackend/goaimapsmtpprovider.c
@@ -1188,7 +1188,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
diff --git a/src/goabackend/goalastfmprovider.c b/src/goabackend/goalastfmprovider.c
index cb9a6f2..47e96f4 100644
--- a/src/goabackend/goalastfmprovider.c
+++ b/src/goabackend/goalastfmprovider.c
@@ -784,7 +784,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
diff --git a/src/goabackend/goalibremoneprovider.c b/src/goabackend/goalibremoneprovider.c
index ec9b2ba..3e26904 100644
--- a/src/goabackend/goalibremoneprovider.c
+++ b/src/goabackend/goalibremoneprovider.c
@@ -669,7 +669,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
diff --git a/src/goabackend/goaoauth2provider.c b/src/goabackend/goaoauth2provider.c
index 3715431..d8d02c5 100644
--- a/src/goabackend/goaoauth2provider.c
+++ b/src/goabackend/goaoauth2provider.c
@@ -1200,7 +1200,6 @@ goa_oauth2_provider_refresh_account (GoaProvider *provider,
NULL,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_widget_show_all (dialog);
account = goa_object_peek_account (object);
diff --git a/src/goabackend/goaoauthprovider.c b/src/goabackend/goaoauthprovider.c
index 0bfab6b..8d61e58 100644
--- a/src/goabackend/goaoauthprovider.c
+++ b/src/goabackend/goaoauthprovider.c
@@ -1129,7 +1129,6 @@ goa_oauth_provider_refresh_account (GoaProvider *_provider,
NULL,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_widget_show_all (dialog);
account = goa_object_peek_account (object);
diff --git a/src/goabackend/goaowncloudprovider.c b/src/goabackend/goaowncloudprovider.c
index 29d461a..a164d47 100644
--- a/src/goabackend/goaowncloudprovider.c
+++ b/src/goabackend/goaowncloudprovider.c
@@ -836,7 +836,6 @@ refresh_account (GoaProvider *provider,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_spacing (GTK_BOX (vbox), 12);
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Tue, 13 Oct 2020 15:18:33 +0500
Subject: goabackend: Reduce margin around the UI
It was very large and didn't fit into 360px screen.
---
src/goabackend/goaimapsmtpprovider.c | 4 ++--
src/goabackend/goaprovider.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c
index 811d48c..d85d482 100644
--- a/src/goabackend/goaimapsmtpprovider.c
+++ b/src/goabackend/goaimapsmtpprovider.c
@@ -1461,8 +1461,8 @@ show_account (GoaProvider *provider,
grid = gtk_grid_new ();
gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
gtk_widget_set_hexpand (grid, TRUE);
- gtk_widget_set_margin_end (grid, 72);
- gtk_widget_set_margin_start (grid, 72);
+ gtk_widget_set_margin_end (grid, 24);
+ gtk_widget_set_margin_start (grid, 24);
gtk_widget_set_margin_top (grid, 24);
gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 8e4d688..d58e430 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -556,8 +556,8 @@ goa_provider_show_account_real (GoaProvider *provider,
grid = gtk_grid_new ();
gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
gtk_widget_set_hexpand (grid, TRUE);
- gtk_widget_set_margin_end (grid, 72);
- gtk_widget_set_margin_start (grid, 72);
+ gtk_widget_set_margin_end (grid, 24);
+ gtk_widget_set_margin_start (grid, 24);
gtk_widget_set_margin_top (grid, 24);
gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
From: Alexander Mikhaylenko <alexander.mikhaylenko@puri.sm>
Date: Tue, 13 Oct 2020 16:05:01 +0500
Subject: libremoneprovider: Shorten Librem One Address to Address
Make it fit on the phone.
---
src/goabackend/goalibremoneprovider.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/goabackend/goalibremoneprovider.c b/src/goabackend/goalibremoneprovider.c
index 3e26904..b81dba6 100644
--- a/src/goabackend/goalibremoneprovider.c
+++ b/src/goabackend/goalibremoneprovider.c
@@ -394,7 +394,7 @@ create_account_details_ui (GoaProvider *provider,
gtk_container_add (GTK_CONTAINER (grid0), grid1);
row = 0;
- add_email_entry (grid1, row++, _("_Librem One Address"), &data->username);
+ add_email_entry (grid1, row++, _("_Address"), &data->username);
add_entry (grid1, row++, _("_Password"), &data->password);
gtk_entry_set_visibility (GTK_ENTRY (data->password), FALSE);
Add-Icons-for-Librem-One.patch
Add-initial-Librem-One-provider.patch
goabackend-Reduce-margin-around-the-UI.patch
goabackend-Make-dialogs-resizable.patch
libremoneprovider-Shorten-Librem-One-Address-to-Address.patch
......@@ -22,6 +22,7 @@ override_dh_autoreconf:
override_dh_auto_configure:
dh_auto_configure -- \
--enable-documentation \
--enable-compile-warnings=yes \
--enable-gtk-doc \
--enable-kerberos \
--disable-media-server \
......@@ -34,6 +35,7 @@ override_dh_auto_configure:
--enable-imap-smtp \
--enable-exchange \
--enable-foursquare \
--enable-librem-one \
$(DISABLE_BACKEND)
override_dh_install:
......
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