[arch-commits] Commit in deja-dup/repos/community-x86_64 (3 files)
Balló György
bgyorgy at archlinux.org
Sun Mar 14 14:00:34 UTC 2021
Date: Sunday, March 14, 2021 @ 14:00:34
Author: bgyorgy
Revision: 891078
archrelease: copy trunk to community-x86_64
Added:
deja-dup/repos/community-x86_64/PKGBUILD
(from rev 891077, deja-dup/trunk/PKGBUILD)
Deleted:
deja-dup/repos/community-x86_64/PKGBUILD
deja-dup/repos/community-x86_64/libhandy1.patch
-----------------+
PKGBUILD | 61 ++++++++----------
libhandy1.patch | 175 ------------------------------------------------------
2 files changed, 27 insertions(+), 209 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-14 14:00:27 UTC (rev 891077)
+++ PKGBUILD 2021-03-14 14:00:34 UTC (rev 891078)
@@ -1,34 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=deja-dup
-pkgver=42.5
-pkgrel=1
-pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
-arch=(x86_64)
-url="https://wiki.gnome.org/Apps/DejaDup"
-license=(GPL)
-depends=(duplicity gvfs libhandy libsecret org.freedesktop.secrets python-gobject python-pydrive)
-makedepends=(appstream-glib itstool meson vala)
-source=(https://gitlab.gnome.org/World/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz
- libhandy1.patch)
-validpgpkeys=('A3A5C2FC56AE7341D308D8571B50ECA373F3F233') # Michael Terry
-sha256sums=('b06b95f9a4503143971332f304fde24b45a6b8000184f91a9648fadf9e561909'
- '66b3204425b9353e0f8cb97e7d4d50d58f00be753eb64096cae1d1932b0a31fa')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../libhandy1.patch
-}
-
-build() {
- arch-meson $pkgname-$pkgver build
- meson compile -C build
-}
-
-check() {
- meson test -C build
-}
-
-package() {
- DESTDIR="$pkgdir" meson install -C build
-}
Copied: deja-dup/repos/community-x86_64/PKGBUILD (from rev 891077, deja-dup/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-14 14:00:34 UTC (rev 891078)
@@ -0,0 +1,27 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=deja-dup
+pkgver=42.7
+pkgrel=1
+pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
+arch=(x86_64)
+url="https://wiki.gnome.org/Apps/DejaDup"
+license=(GPL)
+depends=(duplicity gvfs libhandy libsecret org.freedesktop.secrets python-gobject python-pydrive)
+makedepends=(appstream-glib itstool meson vala)
+source=(https://gitlab.gnome.org/World/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz)
+validpgpkeys=('A3A5C2FC56AE7341D308D8571B50ECA373F3F233') # Michael Terry
+sha256sums=('e4c4986644f829e72b242278eb4298a54c9264be480d854aac8fd72e492b5593')
+
+build() {
+ arch-meson $pkgname-$pkgver build
+ meson compile -C build
+}
+
+check() {
+ meson test -C build
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install -C build
+}
Deleted: libhandy1.patch
===================================================================
--- libhandy1.patch 2021-03-14 14:00:27 UTC (rev 891077)
+++ libhandy1.patch 2021-03-14 14:00:34 UTC (rev 891078)
@@ -1,175 +0,0 @@
-From 77bc3d5c24db442a5870960b1cc8e1c221175bae Mon Sep 17 00:00:00 2001
-From: Michael Terry <mike at mterry.name>
-Date: Thu, 10 Sep 2020 12:24:03 -0400
-Subject: [PATCH] Upgrade to libhandy1
-
----
- Makefile | 8 +-------
- data/ui/preferences.ui | 8 +++++---
- deja-dup/ConfigFolderList.vala | 18 +++++++++---------
- deja-dup/ConfigLocationRow.vala | 11 +----------
- deja-dup/main.vala | 3 +--
- flatpak/org.gnome.DejaDupDevel.yaml | 11 -----------
- meson.build | 3 +--
- 7 files changed, 18 insertions(+), 44 deletions(-)
-
-diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
-index 60fcf4a1..884ac7a0 100644
---- a/data/ui/preferences.ui
-+++ b/data/ui/preferences.ui
-@@ -14,6 +14,7 @@ SPDX-FileCopyrightText: Michael Terry
- <property name="default_width">500</property>
- <property name="default_height">500</property>
- <property name="destroy_with_parent">True</property>
-+ <property name="search_enabled">False</property>
- <child>
- <object class="HdyPreferencesPage">
- <property name="visible">True</property>
-@@ -29,10 +30,11 @@ SPDX-FileCopyrightText: Michael Terry
- <object class="HdyActionRow" id="location">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
-+ <property name="activatable_widget">storage_row_grid</property>
- <property name="title" translatable="yes">_Location</property>
- <property name="use_underline">True</property>
-- <child type="action">
-- <object class="GtkGrid">
-+ <child>
-+ <object class="GtkGrid" id="storage_row_grid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
-@@ -106,7 +108,7 @@ SPDX-FileCopyrightText: Michael Terry
- <property name="activatable_widget">auto_backup</property>
- <property name="title" translatable="yes">Back Up _Automatically</property>
- <property name="use_underline">True</property>
-- <child type="action">
-+ <child>
- <object class="GtkSwitch" id="auto_backup">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
-diff --git a/deja-dup/ConfigFolderList.vala b/deja-dup/ConfigFolderList.vala
-index d77d8b8a..82226bd4 100644
---- a/deja-dup/ConfigFolderList.vala
-+++ b/deja-dup/ConfigFolderList.vala
-@@ -50,6 +50,14 @@ public class ConfigFolderList : BuilderWidget
- row.visible = true;
- group.add(row);
-
-+ var install_env = DejaDup.InstallEnv.instance();
-+ if (check_availability && !install_env.is_file_available(file)) {
-+ var icon = new Gtk.Image.from_icon_name("dialog-warning", Gtk.IconSize.LARGE_TOOLBAR);
-+ icon.visible = true;
-+ icon.tooltip_text = _("This folder cannot be backed up because Backups does not have access to it.");
-+ row.add(icon);
-+ }
-+
- var button = new Gtk.Button.from_icon_name("list-remove-symbolic", Gtk.IconSize.BUTTON);
- button.get_accessible().set_name(_("Remove"));
- button.valign = Gtk.Align.CENTER;
-@@ -58,15 +66,7 @@ public class ConfigFolderList : BuilderWidget
- button.clicked.connect(() => {
- handle_remove(button.get_data("folder"));
- });
-- row.add_action(button);
--
-- var install_env = DejaDup.InstallEnv.instance();
-- if (check_availability && !install_env.is_file_available(file)) {
-- var icon = new Gtk.Image.from_icon_name("dialog-warning", Gtk.IconSize.LARGE_TOOLBAR);
-- icon.visible = true;
-- icon.tooltip_text = _("This folder cannot be backed up because Backups does not have access to it.");
-- row.add_action(icon);
-- }
-+ row.add(button);
- }
-
- // Now the "add item" row
-diff --git a/deja-dup/ConfigLocationRow.vala b/deja-dup/ConfigLocationRow.vala
-index b09a3cc6..23cb0b18 100644
---- a/deja-dup/ConfigLocationRow.vala
-+++ b/deja-dup/ConfigLocationRow.vala
-@@ -21,17 +21,8 @@ public class ConfigLocationRow : BuilderWidget
-
- update_text();
-
-- // TODO: libhandy 1.0 makes this easier with a direct ActionRow "activated" signal
-- var group = builder.get_object("storage_group") as Hdy.PreferencesGroup;
- var location = builder.get_object("location") as Hdy.ActionRow;
-- var listbox = location.get_ancestor(typeof(Gtk.ListBox)) as Gtk.ListBox;
-- if (listbox != null) {
-- listbox.row_activated.connect((row) => {
-- if (row == location) {
-- show_location_options();
-- }
-- });
-- }
-+ location.activated.connect(show_location_options);
-
- new ConfigLocationGrid(builder);
- }
-diff --git a/deja-dup/main.vala b/deja-dup/main.vala
-index 7d91641b..95962b7d 100644
---- a/deja-dup/main.vala
-+++ b/deja-dup/main.vala
-@@ -156,6 +156,7 @@ public class DejaDupApp : Gtk.Application
- {
- base.startup();
-
-+ Hdy.init();
- DejaDup.gui_initialize();
-
- add_action_entries(ACTIONS, this);
-@@ -372,7 +373,5 @@ int main(string[] args)
-
- resources_get_resource()._register();
-
-- Hdy.init(ref args);
--
- return DejaDupApp.get_instance().run(args);
- }
-diff --git a/flatpak/org.gnome.DejaDupDevel.yaml b/flatpak/org.gnome.DejaDupDevel.yaml
-index dfb55269..bb49a5f6 100644
---- a/flatpak/org.gnome.DejaDupDevel.yaml
-+++ b/flatpak/org.gnome.DejaDupDevel.yaml
-@@ -31,17 +31,6 @@ modules:
- - ./pydrive2.yaml
-
-
-- - name: libhandy
-- buildsystem: meson
-- config-opts:
-- - -Dexamples=false
-- - -Dtests=false
-- sources:
-- - type: git
-- url: https://gitlab.gnome.org/GNOME/libhandy.git
-- tag: v0.0.13
-- commit: 7a193d7692c9c76a1a94f17c4d30b585f77d177c
--
- - name: deja-dup
- buildsystem: meson
- builddir: true
-diff --git a/meson.build b/meson.build
-index 4689f82b..d3aa9a51 100644
---- a/meson.build
-+++ b/meson.build
-@@ -32,7 +32,7 @@ gdk_x11_dep = dependency('gdk-x11-3.0', required: false)
- gio_dep = dependency('gio-2.0', version: '>= 2.64')
- gio_unix_dep = dependency('gio-unix-2.0')
- gtk_dep = dependency('gtk+-3.0', version: '>= 3.22')
--handy_dep = dependency('libhandy-0.0', version: '>= 0.0.10')
-+handy_dep = dependency('libhandy-1')
- json_dep = dependency('json-glib-1.0', version: '>= 1.2')
- packagekit_dep = dependency('packagekit-glib2', version: '>=0.6.5', required: false)
- secret_dep = dependency('libsecret-1', version: '>= 0.18.6')
-@@ -65,7 +65,6 @@ common_vflags = [
- '--vapidir', vapidir,
- ]
- common_cflags = [
-- '-DHANDY_USE_UNSTABLE_API',
- '-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE',
- '-DDUPLICITY_COMMAND="@0@"'.format(get_option('duplicity_command')),
- '-DDUPLICITY_PACKAGES="@0@"'.format(get_option('duplicity_pkgs')),
---
-GitLab
-
More information about the arch-commits
mailing list