From 8ac2508eb094459c062d0c31b6367da393b4fa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 19 Mar 2022 18:05:05 +0100 Subject: New upstream version 42.0 --- NEWS | 18 +- build-aux/flatpak/org.gnome.SimpleScan.json | 42 +- build-aux/flatpak/polkit-autogen | 4 - ...build-Add-option-to-build-without-polkitd.patch | 132 --- build-aux/snap/snapcraft.yaml | 4 +- data/meson.build | 6 +- data/org.gnome.SimpleScan.gschema.xml | 20 + data/screenshots/simple-scan-1.png | Bin 493727 -> 110369 bytes data/simple-scan.appdata.xml.in | 16 +- data/ui/app-window.ui | 70 +- data/ui/preferences-dialog.ui | 106 ++- help/ca/ca.po | 38 +- help/da/da.po | 33 +- help/gl/gl.po | 154 +--- meson.build | 10 +- po/bg.po | 387 +++++---- po/ca.po | 584 +++++++------ po/cs.po | 388 +++++---- po/da.po | 423 ++++++---- po/de.po | 456 +++++----- po/es.po | 447 +++++----- po/eu.po | 429 ++++++---- po/fa.po | 464 +++++----- po/fi.po | 440 +++++----- po/fr.po | 452 +++++----- po/fur.po | 577 +++++++------ po/gl.po | 439 ++++++---- po/he.po | 470 ++++++----- po/hr.po | 477 ++++++----- po/hu.po | 437 +++++----- po/id.po | 424 ++++++---- po/is.po | 357 ++++---- po/ja.po | 931 +++++++++++---------- po/kk.po | 398 +++++---- po/ko.po | 440 +++++----- po/lt.po | 445 +++++----- po/nb.po | 472 ++++++----- po/oc.po | 453 +++++----- po/pl.po | 394 +++++---- po/pt.po | 508 +++++------ po/pt_BR.po | 454 +++++----- po/ru.po | 473 +++++------ po/sk.po | 435 ++++++---- po/sl.po | 443 +++++----- po/sr.po | 433 ++++++---- po/sv.po | 487 ++++++----- po/tr.po | 487 ++++++----- po/uk.po | 446 +++++----- po/zh_CN.po | 433 ++++++---- src/app-window.vala | 107 +-- src/autosave-manager.vala | 2 +- src/book-view.vala | 13 +- src/book.vala | 30 +- src/meson.build | 1 + src/page-icon.vala | 68 +- src/page-view.vala | 15 +- src/postprocessor.vala | 44 + src/preferences-dialog.vala | 35 + src/scanner.vala | 4 + src/simple-scan-postprocessing.sh | 83 ++ src/simple-scan.vala | 3 +- subprojects/libhandy.wrap | 2 +- 62 files changed, 9289 insertions(+), 7554 deletions(-) delete mode 100755 build-aux/flatpak/polkit-autogen delete mode 100644 build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch create mode 100644 src/postprocessor.vala create mode 100755 src/simple-scan-postprocessing.sh diff --git a/NEWS b/NEWS index d51b4dc..8d14782 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,17 @@ -Overview of changes in simple-scan 40.7 +Overview of changes in simple-scan 42.0 ~~~~~~~~~~~~~~ -Released: 2021-12-23 - - * Fix replacing underscore with space in scanner names. - * Delete autosave records after creating new document. +Released: 2022-03-18 + + * Skip virtual devices when detecting scanners. + * Add support for postprocessing scripts. + * Save Window state to user's .config folder instead of user's .cache folder. + * Updates 'About' dialog to match with other GNOME apps. + * Delete autosave records after creating new document [#278]. + * Fix replacing underscore with space. + * Fix autosave of Page Side property [#273]. * Add the device name to the label if there are several identical models. - * Fix autosave of Page Side property. + * Fix incorrect scan button tooltips. + * Updated translations. Overview of changes in simple-scan 40.6 ~~~~~~~~~~~~~~ diff --git a/build-aux/flatpak/org.gnome.SimpleScan.json b/build-aux/flatpak/org.gnome.SimpleScan.json index 0b453dc..1acdaa2 100644 --- a/build-aux/flatpak/org.gnome.SimpleScan.json +++ b/build-aux/flatpak/org.gnome.SimpleScan.json @@ -113,47 +113,6 @@ } ] }, - { - "name" : "polkit", - "buildsystem" : "autotools", - "config-opts" : [ - "--disable-polkitd", - "--disable-man-pages", - "--disable-introspection", - "--disable-examples", - "--disable-gtk-doc", - "--disable-libelogind", - "--disable-libsystemd-login", - "--with-systemdsystemunitdir=no", - "--with-authdb=dummy", - "--with-authfw=none" - ], - "rm-configure" : true, - "cleanup" : [ - "/bin/*", - "/etc/pam.d", - "/etc/dbus-1", - "/share/dbus-1/system-services/*", - "/share/polkit-1", - "/lib/polkit-1" - ], - "sources" : [ - { - "type" : "archive", - "url" : "https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz", - "sha256" : "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1" - }, - { - "type" : "patch", - "path" : "polkit-build-Add-option-to-build-without-polkitd.patch" - }, - { - "type" : "file", - "path" : "polkit-autogen", - "dest-filename" : "autogen.sh" - } - ] - }, { "name" : "sane-backends", "buildsystem" : "autotools", @@ -184,6 +143,7 @@ "sources" : [ { "type" : "git", + "branch" : "main", "url" : "https://github.com/hughsie/colord.git" } ] diff --git a/build-aux/flatpak/polkit-autogen b/build-aux/flatpak/polkit-autogen deleted file mode 100755 index 3ba457e..0000000 --- a/build-aux/flatpak/polkit-autogen +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -gtkdocize --flavour no-tmpl -autoreconf -if diff --git a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch b/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch deleted file mode 100644 index 651f53b..0000000 --- a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 1073a44277316348d40d86ecec908f1d4812f360 Mon Sep 17 00:00:00 2001 -From: Christian Hergert -Date: Mon, 27 May 2019 11:49:09 -0700 -Subject: [PATCH] flatpak: make polkit suitable for use within flatpak - -This is based on patches from Patrick Griffis with additional fixes -to allow us to disable use of PAM within Flaptak. ---- - configure.ac | 20 ++++++++++++++++---- - src/Makefile.am | 6 +++++- - src/polkitagent/Makefile.am | 5 +++++ - test/Makefile.am | 6 +++++- - 4 files changed, 31 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5cedb4e..729d78d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,11 +79,13 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0]) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - --PKG_CHECK_MODULES(LIBJS, [mozjs-60]) -+AS_IF([test x${enable_polkitd} = yes], [ -+ PKG_CHECK_MODULES(LIBJS, [mozjs-60]) - --AC_SUBST(LIBJS_CFLAGS) --AC_SUBST(LIBJS_CXXFLAGS) --AC_SUBST(LIBJS_LIBS) -+ AC_SUBST(LIBJS_CFLAGS) -+ AC_SUBST(LIBJS_CXXFLAGS) -+ AC_SUBST(LIBJS_LIBS) -+]) - - EXPAT_LIB="" - AC_ARG_WITH(expat, [ --with-expat= Use expat from here], -@@ -236,6 +238,15 @@ if test "x$with_systemdsystemunitdir" != "xno"; then - fi - AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"]) - -+dnl --------------------------------------------------------------------------- -+dnl - Disable polkitd when using library alone -+dnl --------------------------------------------------------------------------- -+ -+AC_ARG_ENABLE([polkitd], -+ [AS_HELP_STRING([--disable-polkitd], [Do not build polkitd])], -+ [enable_polkitd=$enableval], [enable_polkitd=yes]) -+AM_CONDITIONAL(BUILD_POLKITD, [test x${enable_polkitd} = yes]) -+ - dnl --------------------------------------------------------------------------- - dnl - User for running polkitd - dnl --------------------------------------------------------------------------- -@@ -579,6 +590,7 @@ echo " - Session tracking: ${SESSION_TRACKING} - PAM support: ${have_pam} - systemdsystemunitdir: ${systemdsystemunitdir} -+ polkitd: ${enable_polkitd} - polkitd user: ${POLKITD_USER}" - - if test "$have_pam" = yes ; then -diff --git a/src/Makefile.am b/src/Makefile.am -index 09fc7b3..c6fe91b 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,5 +1,9 @@ - --SUBDIRS = polkit polkitbackend polkitagent programs -+SUBDIRS = polkit polkitagent programs -+ -+if BUILD_POLKITD -+SUBDIRS += polkitbackend -+endif - - if BUILD_EXAMPLES - SUBDIRS += examples -diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am -index 49720db..633f9d4 100644 ---- a/src/polkitagent/Makefile.am -+++ b/src/polkitagent/Makefile.am -@@ -79,6 +79,7 @@ libpolkit_agent_1_la_LIBADD = \ - - libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' - -+if !POLKIT_AUTHFW_NONE - libprivdir = $(prefix)/lib/polkit-1 - libpriv_PROGRAMS = polkit-agent-helper-1 - -@@ -113,6 +114,8 @@ polkit_agent_helper_1_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(NULL) - -+endif # !POLKIT_AUTHFW_NONE -+ - if HAVE_INTROSPECTION - - girdir = $(INTROSPECTION_GIRDIR) -@@ -142,6 +145,7 @@ include $(INTROSPECTION_MAKEFILE) - - endif # HAVE_INTROSPECTION - -+if !POLKIT_AUTHFW_NONE - # polkit-agent-helper-1 need to be setuid root because it's used to - # authenticate not only the invoking user, but possibly also root - # and/or other users. -@@ -149,6 +153,7 @@ endif # HAVE_INTROSPECTION - install-data-hook: - -chown root $(DESTDIR)$(libprivdir)/polkit-agent-helper-1 - -chmod 4755 $(DESTDIR)$(libprivdir)/polkit-agent-helper-1 -+endif # !POLKIT_AUTHFW_NONE - - EXTRA_DIST = polkitagentmarshal.list polkitagentenumtypes.h.template polkitagentenumtypes.c.template - CLEANFILES = $(gir_DATA) $(typelibs_DATA) -diff --git a/test/Makefile.am b/test/Makefile.am -index 59d0680..d43b0fe 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -1,7 +1,11 @@ - --SUBDIRS = mocklibc . polkit polkitbackend -+SUBDIRS = mocklibc . polkit - AM_CFLAGS = $(GLIB_CFLAGS) - -+if BUILD_POLKITD -+SUBDIRS += polkitbackend -+endif -+ - noinst_LTLIBRARIES = libpolkit-test-helper.la - libpolkit_test_helper_la_SOURCES = polkittesthelper.c polkittesthelper.h - libpolkit_test_helper_la_LIBADD = $(GLIB_LIBS) --- -2.21.0 - diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml index a20c5b8..a2b5b20 100644 --- a/build-aux/snap/snapcraft.yaml +++ b/build-aux/snap/snapcraft.yaml @@ -37,7 +37,7 @@ parts: libsane: source: https://gitlab.com/sane-project/backends.git source-type: git - source-tag: release-1.0.33 + source-tag: 1.1.1 plugin: autotools autotools-configure-parameters: - --prefix=/snap/simple-scan/current/usr @@ -84,7 +84,7 @@ parts: - libgtk-3-dev - libgdk-pixbuf2.0-dev - libgusb-dev - - libgirepository1.0-dev + - libgirepository1.0-dev - libpackagekit-glib2-dev - libsane-dev - libwebp-dev diff --git a/data/meson.build b/data/meson.build index 2b5a0ee..cf6e4ae 100644 --- a/data/meson.build +++ b/data/meson.build @@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml', install_dir: join_paths (datadir, 'glib-2.0', 'schemas')) meson.add_install_script ('meson_compile_gschema.py') -i18n.merge_file ('desktop-file', - input: 'simple-scan.desktop.in', +i18n.merge_file (input: 'simple-scan.desktop.in', output: 'simple-scan.desktop', install: true, install_dir: join_paths (datadir, 'applications'), po_dir: '../po', type: 'desktop') -i18n.merge_file ('appdata-file', - input: 'simple-scan.appdata.xml.in', +i18n.merge_file (input: 'simple-scan.appdata.xml.in', output: 'simple-scan.appdata.xml', install: true, install_dir: join_paths (datadir, 'metainfo'), diff --git a/data/org.gnome.SimpleScan.gschema.xml b/data/org.gnome.SimpleScan.gschema.xml index 290add1..03f1922 100644 --- a/data/org.gnome.SimpleScan.gschema.xml +++ b/data/org.gnome.SimpleScan.gschema.xml @@ -77,5 +77,25 @@ Delay in millisecond between pages Delay in millisecond between pages. + + false + Whether or not postprocessing is enabled + Whether or not postprocessing is enabled. + + + '' + The path to the postprocessing script + The path to the postprocessing script. + + + '' + Additional arguments for the postprocessing script + Additional arguments for the postprocessing script. + + + false + Whether or not to keep the original, unprocessed file + Whether or not to keep the original, unprocessed file. The "_orig" filename will be added to the filename immediately before the file extension. + diff --git a/data/screenshots/simple-scan-1.png b/data/screenshots/simple-scan-1.png index 5468b25..b7828fb 100644 Binary files a/data/screenshots/simple-scan-1.png and b/data/screenshots/simple-scan-1.png differ diff --git a/data/simple-scan.appdata.xml.in b/data/simple-scan.appdata.xml.in index f5cec0f..f72fb34 100644 --- a/data/simple-scan.appdata.xml.in +++ b/data/simple-scan.appdata.xml.in @@ -17,7 +17,7 @@ - https://gitlab.gnome.org/GNOME/simple-scan/raw/master/data/screenshots/simple-scan-1.png + https://gitlab.gnome.org/GNOME/simple-scan/raw/HEAD/data/screenshots/simple-scan-1.png https://gitlab.gnome.org/GNOME/simple-scan @@ -25,13 +25,19 @@ https://www.gnome.org/friends/ The GNOME Project - +
    -
  • Fix replacing underscore with space in scanner names.
    • -
  • Delete autosave records after creating new document.
    • +
  • Skip virtual devices when detecting scanners.
    • +
  • Add support for postprocessing scripts.
    • +
  • Save Window state to user's .config folder instead of user's .cache folder.
    • +
  • Updates 'About' dialog to match with other GNOME apps.
    • +
  • Delete autosave records after creating new document [#278].
    • +
  • Fix replacing underscore with space.
    • +
  • Fix autosave of Page Side property [#273]
  • Add the device name to the label if there are several identical models.
    • -
  • Fix autosave of Page Side property.
    • +
  • Fix incorrect scan button tooltips.
    • +
  • Updated translations.
 diff --git a/data/ui/app-window.ui b/data/ui/app-window.ui index 5fd0a0a..744b8c2 100644 --- a/data/ui/app-window.ui +++ b/data/ui/app-window.ui @@ -4,11 +4,9 @@ True - False True - False Rotate _Left True @@ -18,7 +16,6 @@ True - False Rotate _Right True @@ -28,17 +25,14 @@ True - False _Crop True True - False True - False _None True True @@ -49,7 +43,6 @@ True - False A_4 True True @@ -60,7 +53,6 @@ True - False A_5 True True @@ -71,8 +63,6 @@ True - False - A_6 True True no_crop_menuitem @@ -82,7 +72,6 @@ True - False _Letter True True @@ -93,7 +82,6 @@ True - False Le_gal True True @@ -104,7 +92,6 @@ True - False 4×6 True True @@ -115,7 +102,6 @@ True - False A_3 True True @@ -126,7 +112,6 @@ True - False _Custom True True @@ -137,14 +122,12 @@ True - False True False - False _Rotate Crop True @@ -157,7 +140,6 @@ True - False Move Left @@ -166,7 +148,6 @@ True - False Move Right True @@ -178,7 +159,6 @@ gtk-copy True False - False True True @@ -189,7 +169,6 @@ gtk-delete True - False True True @@ -206,11 +185,9 @@ - False True - False 12 12 12 @@ -220,14 +197,12 @@ True - False False False True - False 12 12 6 @@ -236,7 +211,6 @@ True - False scanner-symbolic @@ -248,7 +222,6 @@ True - False _Single Page True @@ -270,7 +243,6 @@ True - False False False scan_single_radio @@ -278,7 +250,6 @@ True - False 12 12 6 @@ -287,7 +258,6 @@ True - False scan-type-adf-symbolic @@ -299,7 +269,6 @@ True - False All Pages From _Feeder True @@ -321,7 +290,6 @@ True - False False False scan_single_radio @@ -329,7 +297,6 @@ True - False 12 12 6 @@ -338,7 +305,6 @@ True - False scan-type-batch-symbolic @@ -350,7 +316,6 @@ True - False _Multiple Pages From Flatbed True @@ -372,7 +337,6 @@ True - False False 12 False @@ -380,7 +344,6 @@ True - False 12 12 6 @@ -389,7 +352,6 @@ True - False x-office-document-symbolic @@ -401,7 +363,6 @@ True - False _Text True @@ -423,7 +384,6 @@ True - False False False text_radio @@ -431,7 +391,6 @@ True - False 12 12 6 @@ -440,7 +399,6 @@ True - False image-x-generic-symbolic @@ -452,7 +410,6 @@ True - False _Image True @@ -494,28 +451,23 @@