Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnome-user-share for
openSUSE:Factory checked in at 2022-09-21 14:40:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-user-share (Old)
and /work/SRC/openSUSE:Factory/.gnome-user-share.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-user-share"
Wed Sep 21 14:40:42 2022 rev:63 rq:1004809 version:43.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-user-share/gnome-user-share.changes
2022-02-06 23:54:50.246597055 +0100
+++
/work/SRC/openSUSE:Factory/.gnome-user-share.new.2083/gnome-user-share.changes
2022-09-21 14:41:18.837568841 +0200
@@ -1,0 +2,19 @@
+Fri Sep 16 08:58:41 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- Update to version 43.0:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Sat Aug 6 18:27:22 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- Update to version 43.alpha:
+ + Remove Nautilus extension.
+ + Fix build with meson 0.61 and newer.
+ + Updated translations.
+- Drop gnome-user-share-fix-meson-0_61_0.patch fixed upstream.
+- Drop pkgconfig(libnautilus-extension) and pkgconfig(gtk+-3.0)
+ BuildRequires: No longer needed as nautilus extension was removed
+ upstream.
+- Drop obsolete glib2_gsettings_schema_requires macro.
+
+-------------------------------------------------------------------
Old:
----
gnome-user-share-3.34.0+25.obscpio
gnome-user-share-fix-meson-0_61_0.patch
New:
----
gnome-user-share-43.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-user-share.spec ++++++
--- /var/tmp/diff_new_pack.b1ZgLj/_old 2022-09-21 14:41:19.365570306 +0200
+++ /var/tmp/diff_new_pack.b1ZgLj/_new 2022-09-21 14:41:19.369570317 +0200
@@ -17,7 +17,7 @@
Name: gnome-user-share
-Version: 3.34.0+25
+Version: 43.0
Release: 0
Summary: GNOME user file sharing
License: GPL-2.0-or-later
@@ -26,23 +26,18 @@
# Disable Source URL, use git checkout via service
# Source0:
https://download.gnome.org/sources/gnome-user-share/3.34/%%{name}-%%{version}.tar.xz
Source0: %{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM gnome-user-share-fix-meson-0_61_0.patch
[email protected] -- Fix build with meson 0.61.0 and newer
-Patch0: gnome-user-share-fix-meson-0_61_0.patch
BuildRequires: fdupes
BuildRequires: meson >= 0.50.0
BuildRequires: pkgconfig
BuildRequires: yelp-tools
BuildRequires: pkgconfig(glib-2.0) >= 2.58
-BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libcanberra-gtk3)
-BuildRequires: pkgconfig(libnautilus-extension) >= 3.27.90
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(systemd)
Suggests: apache2-mod_dnssd
Suggests: apache2-prefork
Suggests: apache2-worker
-%glib2_gsettings_schema_requires
%description
gnome-user-share is a small package that binds together various free
@@ -83,7 +78,8 @@
%{_libexecdir}/gnome-user-share
%{_datadir}/gnome-user-share
%{_datadir}/applications/gnome-user-share-webdav.desktop
-%{_libdir}/nautilus/extensions-3.0/libnautilus-share-extension.so
+%dir %{_datadir}/GConf
+%dir %{_datadir}/GConf/gsettings
%{_datadir}/GConf/gsettings/gnome-user-share.convert
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.file-sharing.gschema.xml
%{_userunitdir}/gnome-user-share-webdav.service
++++++ _service ++++++
--- /var/tmp/diff_new_pack.b1ZgLj/_old 2022-09-21 14:41:19.401570405 +0200
+++ /var/tmp/diff_new_pack.b1ZgLj/_new 2022-09-21 14:41:19.405570417 +0200
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<services>
- <service name="obs_scm" mode="disabled">
+ <service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param
name="url">https://gitlab.gnome.org/GNOME/gnome-user-share.git</param>
- <param name="revision">a89c973d</param>
- <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+ <param name="revision">refs/tags/43.0</param>
+ <param name="versionformat">@PARENT_TAG@</param>
<param
name="versionrewrite-pattern">GNOME_USER_SHARE_(\d+)_(\d+)_(\d+)</param>
<param name="versionrewrite-replacement">\1.\2.\3</param>
<!--
@@ -16,7 +16,7 @@
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
- <service name="set_version" mode="disabled"/>
+ <service name="set_version" mode="manual"/>
</services>
++++++ gnome-user-share-3.34.0+25.obscpio -> gnome-user-share-43.0.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/.gitlab-ci.yml
new/gnome-user-share-43.0/.gitlab-ci.yml
--- old/gnome-user-share-3.34.0+25/.gitlab-ci.yml 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/.gitlab-ci.yml 2022-09-16 10:38:18.000000000
+0200
@@ -1,9 +1,17 @@
image: fedora:rawhide
variables:
- DEPENDENCIES: gcc meson glibc-devel glib-devel gtk3-devel
- libselinux-devel nautilus-devel systemd-devel
- httpd mod_dnssd gettext
+ DEPENDENCIES:
+ gcc
+ git
+ meson
+ glibc-devel
+ glib2-devel
+ libselinux-devel
+ systemd-devel
+ httpd
+ mod_dnssd
+ gettext
build_stable:
before_script:
@@ -11,4 +19,10 @@
- dnf install -y --nogpgcheck $DEPENDENCIES
script:
- meson . _build
- - ninja -C _build
\ No newline at end of file
+ - ninja -C _build
+ - ninja -C _build dist
+ artifacts:
+ when: always
+ paths:
+ - "${CI_PROJECT_DIR}/_build/meson-logs/"
+ - "${CI_PROJECT_DIR}/_build/meson-dist"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/NEWS
new/gnome-user-share-43.0/NEWS
--- old/gnome-user-share-3.34.0+25/NEWS 2021-12-23 05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/NEWS 2022-09-16 10:38:18.000000000 +0200
@@ -1,4 +1,11 @@
-This is gnome-user-share 3.34.0, a system for easy sharing of user files.
+This is gnome-user-share 43.0, a system for easy sharing of user files.
+
+Major changes since 43.alpha:
+- Translation updates
+
+Major changes since 3.34.0:
+- Remove Nautilus extension
+- Translation updates
Major changes since 3.33.1:
- Fix installation location of systemd unit file on Fedora 64-bit systems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/data/meson.build
new/gnome-user-share-43.0/data/meson.build
--- old/gnome-user-share-3.34.0+25/data/meson.build 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/data/meson.build 2022-09-16 10:38:18.000000000
+0200
@@ -7,7 +7,6 @@
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: '@BASENAME@',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/meson.build
new/gnome-user-share-43.0/meson.build
--- old/gnome-user-share-3.34.0+25/meson.build 2021-12-23 05:35:03.000000000
+0100
+++ new/gnome-user-share-43.0/meson.build 2022-09-16 10:38:18.000000000
+0200
@@ -1,9 +1,9 @@
project(
'gnome-user-share', 'c',
- version: '3.34.0',
+ version: '43.0',
license: 'GPL2',
default_options: 'buildtype=debugoptimized',
- meson_version: '>= 0.50.0',
+ meson_version: '>= 0.57.0',
)
user_share_name = meson.project_name()
@@ -55,26 +55,24 @@
add_project_arguments(common_flags, language: 'c')
-gio_dep = dependency('gio-2.0', version: '>= 2.26')
+gio_dep = dependency('gio-2.0', version: '>= 2.71.3')
gio_unix_dep = dependency('gio-unix-2.0')
-glib_dep = dependency('glib-2.0', version: '>= 2.58')
-gtk_dep = dependency('gtk+-3.0')
+glib_dep = dependency('glib-2.0', version: '>= 2.71.3')
# GIO schemas
-gio_schemasdir = gio_dep.get_pkgconfig_variable(
- 'schemasdir',
- define_variable: ['datadir', user_share_prefix / user_share_datadir],
- default: user_share_prefix / user_share_datadir / 'glib-2.0/schemas',
+gio_schemasdir = gio_dep.get_variable(
+ pkgconfig: 'schemasdir',
+ pkgconfig_define: ['datadir', user_share_prefix / user_share_datadir]
)
# systemd user unit directory
systemd_systemduserunitdir = get_option('systemduserunitdir')
if systemd_systemduserunitdir == ''
- systemd_systemduserunitdir =
dependency('systemd').get_pkgconfig_variable('systemduserunitdir')
+ systemd_systemduserunitdir = dependency('systemd').get_variable(pkgconfig:
'systemduserunitdir')
endif
httpd = find_program(get_option('httpd'), required: false)
-httpd_path = (httpd.found() ? httpd.path() : '')
+httpd_path = (httpd.found() ? httpd.full_path() : '')
sockets_deps = []
if not cc.has_function('socket')
@@ -101,11 +99,6 @@
# Check for the HTTPD modules path
modules_path = get_option('modules_path')
-# Check for nautilus for the share bar
-libnautilus_extension_dep = dependency('libnautilus-extension', version: '>=
3.27.90')
-libnautilus_extension_extensiondir =
libnautilus_extension_dep.get_pkgconfig_variable('extensiondir',
define_variable: ['libdir', user_share_prefix / user_share_libdir])
-message('installing nautilus plugin in: ' + libnautilus_extension_extensiondir)
-
subdir('data')
subdir('po')
subdir('src')
@@ -115,14 +108,12 @@
configuration: config_h,
)
-meson.add_install_script(
- 'meson_post_install.py',
- gio_schemasdir,
+gnome.post_install(
+ glib_compile_schemas: true,
)
output = user_share_name + ' was configured with the following options:\n'
output += '** httpd location: ' + httpd_path + '\n'
output += '** httpd modules_path: ' + modules_path + '\n'
-output += '** nautilus extension path: ' + libnautilus_extension_extensiondir
+ '\n\n'
output += 'Do note Apache 2.2 and mod_dnssd 0.6 are required to use ' +
user_share_name + '.'
message(output)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/meson_options.txt
new/gnome-user-share-43.0/meson_options.txt
--- old/gnome-user-share-3.34.0+25/meson_options.txt 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/meson_options.txt 2022-09-16 10:38:18.000000000
+0200
@@ -1,6 +1,4 @@
option('systemduserunitdir', type: 'string', value: '', description: 'custom
directory for systemd user units')
-option('nautilus_extension', type: 'boolean', value: false, description:
'Enable nautilus extension')
-
option('httpd', type: 'array', value: ['httpd', '/usr/sbin/httpd', 'apache2',
'/usr/sbin/apache2', 'httpd2', '/usr/sbin/httpd2'], description: 'Specify the
binary used for the Apache httpd binary (default: httpd)')
option('modules_path', type: 'string', value: '/etc/httpd/modules/',
description: 'Path where the httpd modules are located (default:
/etc/httpd/modules/')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/meson_post_install.py
new/gnome-user-share-43.0/meson_post_install.py
--- old/gnome-user-share-3.34.0+25/meson_post_install.py 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/meson_post_install.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-if not os.environ.get('DESTDIR'):
- print('Compiling gsettings schemas...')
- subprocess.call(['glib-compile-schemas', sys.argv[1]])
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/po/LINGUAS
new/gnome-user-share-43.0/po/LINGUAS
--- old/gnome-user-share-3.34.0+25/po/LINGUAS 2021-12-23 05:35:03.000000000
+0100
+++ new/gnome-user-share-43.0/po/LINGUAS 2022-09-16 10:38:18.000000000
+0200
@@ -1,4 +1,5 @@
# please keep this list sorted alphabetically
+ab
af
an
ar
@@ -41,6 +42,7 @@
is
it
ja
+ka
kk
km
kn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/po/POTFILES.in
new/gnome-user-share-43.0/po/POTFILES.in
--- old/gnome-user-share-3.34.0+25/po/POTFILES.in 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/po/POTFILES.in 2022-09-16 10:38:18.000000000
+0200
@@ -2,7 +2,5 @@
# Please keep this file sorted alphabetically.
data/org.gnome.desktop.file-sharing.gschema.xml
data/gnome-user-share-webdav.desktop.in.in
-src/nautilus-share-bar.c
-src/share-extension.c
src/http.c
src/user_share-webdav.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/po/ab.po
new/gnome-user-share-43.0/po/ab.po
--- old/gnome-user-share-3.34.0+25/po/ab.po 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-user-share-43.0/po/ab.po 2022-09-16 10:38:18.000000000 +0200
@@ -0,0 +1,70 @@
+msgid ""
+msgstr ""
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-user-share/";
+"issues\n"
+"POT-Creation-Date: 2022-07-15 10:25+0000\n"
+"Last-Translator: ?????????? ?????????? <[email protected]>\n"
+"Language-Team: Abkhazian <[email protected]>\n"
+"Language: ab\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: data/org.gnome.desktop.file-sharing.gschema.xml:5
+msgid "When to require passwords"
+msgstr "???????????????? ?????????????????? ?????? ????????????
??????????????????????"
+
+#: data/org.gnome.desktop.file-sharing.gschema.xml:6
+msgid ""
+"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
+"\"always\"."
+msgstr ""
+"???????????????? ?????????????????????? ???????????? ??????????????????????.
??????????????: \"????????????????\", \"????????????\", "
+"???????????? \"????????????\"."
+
+#: data/gnome-user-share-webdav.desktop.in.in:3
+msgid "File Sharing"
+msgstr ""
+
+#: data/gnome-user-share-webdav.desktop.in.in:4
+msgid "Launch File Sharing if enabled"
+msgstr ""
+
+#. Translators: Search terms to find this application. Do NOT translate or
localize the semicolons! The list MUST also end with a semicolon!
+#: data/gnome-user-share-webdav.desktop.in.in:6
+msgid "share;files;http;network;copy;send;"
+msgstr ""
+
+#. Translators: The %s will get filled in with the user name
+#. of the user, to form a genitive. If this is difficult to
+#. translate correctly so that it will work correctly in your
+#. language, you may use something equivalent to
+#. "Public files of %s", or leave out the %s altogether.
+#. In the latter case, please put "%.0s" somewhere in the string,
+#. which will match the user name string passed by the C code,
+#. but not put the user name in the final string. This is to
+#. avoid the warning that msgfmt might otherwise generate.
+#: src/http.c:124
+#, c-format
+msgid "%s's public files"
+msgstr "???????????? ?????????????? ???????????????? %s ????????"
+
+#. Translators: This is similar to the string before, only it
+#. has the hostname in it too.
+#: src/http.c:128
+#, c-format
+msgid "%s's public files on %s"
+msgstr "???????????? ?????????????? ????????????????%s ???????? %s ???????? "
+
+msgid "Sharing"
+msgstr "???????????? ????????????"
+
+msgid "Sharing Settings"
+msgstr "?????????????? ??????????????????????"
+
+msgid ""
+"Turn on File Sharing to share the contents of this folder over the network."
+msgstr ""
+"?????????????? ???????????? ????????????,???????????????? ??????????????
?????? ?????????????????? ?????? ?????????????? "
+"???????????????????????? ??????."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/po/ka.po
new/gnome-user-share-43.0/po/ka.po
--- old/gnome-user-share-3.34.0+25/po/ka.po 1970-01-01 01:00:00.000000000
+0100
+++ new/gnome-user-share-43.0/po/ka.po 2022-09-16 10:38:18.000000000 +0200
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-user-share/";
+"issues\n"
+"POT-Creation-Date: 2022-02-23 20:35+0000\n"
+"PO-Revision-Date: 2022-07-10 23:23+0200\n"
+"Last-Translator: Temuri Doghonadze <[email protected]>\n"
+"Language-Team: \n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.1.1\n"
+
+#: data/org.gnome.desktop.file-sharing.gschema.xml:5
+msgid "When to require passwords"
+msgstr "??????????????? ??????????????????????????? ?????????????????????
?????????????????????"
+
+#: data/org.gnome.desktop.file-sharing.gschema.xml:6
+msgid ""
+"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
+"\"always\"."
+msgstr ""
+"??????????????? ??????????????????????????? ?????????????????????
?????????????????????. ?????????????????????
?????????????????????????????????????????? \"never\", "
+"\"on_write\" ?????? \"always\"."
+
+#: data/gnome-user-share-webdav.desktop.in.in:3
+msgid "File Sharing"
+msgstr "???????????????????????? ???????????????????????????"
+
+#: data/gnome-user-share-webdav.desktop.in.in:4
+msgid "Launch File Sharing if enabled"
+msgstr "?????? ????????????????????????, ????????????????????????
?????????????????????????????? ?????????????????????"
+
+#. Translators: Search terms to find this application. Do NOT translate or
localize the semicolons! The list MUST also end with a semicolon!
+#: data/gnome-user-share-webdav.desktop.in.in:6
+msgid "share;files;http;network;copy;send;"
+msgstr "share;files;http;network;copy;send;"
+
+#. translators: This is the label for the "Sharing" panel in the Settings
+#: src/nautilus-share-bar.c:99
+msgid "Sharing"
+msgstr "???????????????????????????"
+
+#: src/nautilus-share-bar.c:113
+msgid "Sharing Settings"
+msgstr "?????????????????????????????? ?????????????????????"
+
+#: src/share-extension.c:117
+msgid ""
+"Turn on File Sharing to share the contents of this folder over the network."
+msgstr "???????????????????????? ??????????????????
??????????????????????????????????????? ?????????????????????
?????????????????????????????? ??????????????????."
+
+#. Translators: The %s will get filled in with the user name
+#. of the user, to form a genitive. If this is difficult to
+#. translate correctly so that it will work correctly in your
+#. language, you may use something equivalent to
+#. "Public files of %s", or leave out the %s altogether.
+#. In the latter case, please put "%.0s" somewhere in the string,
+#. which will match the user name string passed by the C code,
+#. but not put the user name in the final string. This is to
+#. avoid the warning that msgfmt might otherwise generate.
+#: src/http.c:124
+#, c-format
+msgid "%s's public files"
+msgstr "%s-?????? ?????????????????? ?????????????????????"
+
+#. Translators: This is similar to the string before, only it
+#. has the hostname in it too.
+#: src/http.c:128
+#, c-format
+msgid "%s's public files on %s"
+msgstr "%s-?????? ?????????????????? ????????????????????? %s-??????"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/src/meson.build
new/gnome-user-share-43.0/src/meson.build
--- old/gnome-user-share-3.34.0+25/src/meson.build 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/src/meson.build 2022-09-16 10:38:18.000000000
+0200
@@ -1,5 +1,7 @@
common_c_flags = ['-DGNOMELOCALEDIR="@0@"'.format(user_share_prefix /
user_share_localedir)]
+gnome = import('gnome')
+
deps = [
gio_dep,
glib_dep,
@@ -19,7 +21,6 @@
sources = files(
'http.c',
- 'user_share-private.c',
'user_share-webdav.c',
)
@@ -47,24 +48,7 @@
install_dir: user_share_libexecdir,
)
-sources = files(
- 'nautilus-share-bar.c',
- 'share-extension.c',
-)
-
deps = [
- gtk_dep,
gio_unix_dep,
- libnautilus_extension_dep,
libuser_share_common_dep,
]
-
-shared_module(
- 'nautilus-share-extension',
- sources: sources,
- include_directories: top_inc,
- dependencies: deps,
- c_args: common_c_flags,
- install: true,
- install_dir: libnautilus_extension_extensiondir,
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/src/nautilus-share-bar.c
new/gnome-user-share-43.0/src/nautilus-share-bar.c
--- old/gnome-user-share-3.34.0+25/src/nautilus-share-bar.c 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/src/nautilus-share-bar.c 1970-01-01
01:00:00.000000000 +0100
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2005 William Jon McCann <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: William Jon McCann <[email protected]>
- *
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include "nautilus-share-bar.h"
-
-#define NAUTILUS_SHARE_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarPrivate))
-
-struct NautilusShareBarPrivate
-{
- GtkWidget *label;
-};
-
-enum {
- PROP_0,
- PROP_LABEL
-};
-
-G_DEFINE_TYPE_WITH_CODE (NautilusShareBar, nautilus_share_bar,
GTK_TYPE_INFO_BAR, G_ADD_PRIVATE(NautilusShareBar))
-
-static void
-nautilus_share_bar_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- NautilusShareBar *self;
-
- self = NAUTILUS_SHARE_BAR (object);
-
- switch (prop_id) {
- case PROP_LABEL: {
- gtk_label_set_text (GTK_LABEL (self->priv->label),
g_value_get_string (value));
- break;
- }
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-nautilus_share_bar_class_init (NautilusShareBarClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->set_property = nautilus_share_bar_set_property;
-
- g_object_class_install_property (G_OBJECT_CLASS(klass), PROP_LABEL,
- g_param_spec_string ("label",
"label",
- "The widget's
main label",
- NULL,
-
G_PARAM_WRITABLE));
-}
-
-static void
-nautilus_share_bar_init (NautilusShareBar *bar)
-{
- GtkWidget *content_area;
- GtkWidget *action_area;
- GtkWidget *label;
- GtkWidget *vbox;
- PangoAttrList *attrs;
-
- bar->priv = nautilus_share_bar_get_instance_private (bar);
-
- content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar));
- action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (bar));
- gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area),
GTK_BUTTONBOX_CENTER);
-
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_container_add (GTK_CONTAINER (content_area), vbox);
-
- attrs = pango_attr_list_new ();
- pango_attr_list_insert (attrs, pango_attr_weight_new
(PANGO_WEIGHT_BOLD));
- /* translators: This is the label for the "Sharing" panel in the
Settings */
- label = gtk_label_new (_("Sharing"));
- gtk_label_set_attributes (GTK_LABEL (label), attrs);
- pango_attr_list_unref (attrs);
-
- gtk_widget_set_halign (label, GTK_ALIGN_START);
- gtk_widget_show (label);
- gtk_container_add (GTK_CONTAINER (vbox), label);
-
- bar->priv->label = gtk_label_new (NULL);
- gtk_widget_set_halign (bar->priv->label, GTK_ALIGN_START);
- gtk_widget_show (bar->priv->label);
- gtk_container_add (GTK_CONTAINER (vbox), bar->priv->label);
-
- gtk_info_bar_add_button (GTK_INFO_BAR (bar),
- _("Sharing Settings"),
- NAUTILUS_SHARE_BAR_RESPONSE_PREFERENCES);
-
- gtk_widget_show_all (vbox);
-}
-
-GtkWidget *
-nautilus_share_bar_new (const char *label)
-{
- return g_object_new (NAUTILUS_TYPE_SHARE_BAR,
- "message-type", GTK_MESSAGE_QUESTION,
- "label", label,
- NULL);
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/src/nautilus-share-bar.h
new/gnome-user-share-43.0/src/nautilus-share-bar.h
--- old/gnome-user-share-3.34.0+25/src/nautilus-share-bar.h 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/src/nautilus-share-bar.h 1970-01-01
01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2005 William Jon McCann <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: William Jon McCann <[email protected]>
- *
- */
-
-#ifndef __NAUTILUS_SHARE_BAR_H
-#define __NAUTILUS_SHARE_BAR_H
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define NAUTILUS_TYPE_SHARE_BAR (nautilus_share_bar_get_type ())
-#define NAUTILUS_SHARE_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
NAUTILUS_TYPE_SHARE_BAR, NautilusShareBar))
-#define NAUTILUS_SHARE_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k),
NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarClass))
-#define NAUTILUS_IS_SHARE_BAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o),
NAUTILUS_TYPE_SHARE_BAR))
-#define NAUTILUS_IS_SHARE_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k),
NAUTILUS_TYPE_SHARE_BAR))
-#define NAUTILUS_SHARE_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o),
NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarClass))
-
-#define NAUTILUS_SHARE_BAR_RESPONSE_PREFERENCES 1
-
-typedef struct NautilusShareBarPrivate NautilusShareBarPrivate;
-
-typedef struct
-{
- GtkInfoBar parent;
-
- NautilusShareBarPrivate *priv;
-} NautilusShareBar;
-
-typedef struct
-{
- GtkInfoBarClass parent_class;
-
- void (* activate) (NautilusShareBar *bar);
-
-} NautilusShareBarClass;
-
-GType nautilus_share_bar_get_type (void);
-GtkWidget *nautilus_share_bar_new (const char *label);
-
-G_END_DECLS
-
-#endif /* __GS_SHARE_BAR_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/src/share-extension.c
new/gnome-user-share-43.0/src/share-extension.c
--- old/gnome-user-share-3.34.0+25/src/share-extension.c 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/src/share-extension.c 1970-01-01
01:00:00.000000000 +0100
@@ -1,209 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
- *
- * Copyright (C) 2003 Novell, Inc.
- * Copyright (C) 2003-2004 Red Hat, Inc.
- * Copyright (C) 2005 William Jon McCann <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <glib/gi18n-lib.h>
-#include <gio/gdesktopappinfo.h>
-#include <gtk/gtk.h>
-#include <nautilus-extension.h>
-
-#include "nautilus-share-bar.h"
-#include "user_share-common.h"
-
-#define NAUTILUS_TYPE_USER_SHARE (nautilus_user_share_get_type ())
-#define NAUTILUS_USER_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
NAUTILUS_TYPE_USER_SHARE, NautilusUserShare))
-#define NAUTILUS_IS_USER_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o),
NAUTILUS_TYPE_USER_SHARE))
-
-typedef struct
-{
- GObject parent_slot;
-} NautilusUserShare;
-
-typedef struct
-{
- GObjectClass parent_slot;
-} NautilusUserShareClass;
-
-static GType nautilus_user_share_get_type (void);
-static void nautilus_user_share_register_type (GTypeModule *module);
-
-static void
-launch_prefs_on_window (void)
-{
- GDesktopAppInfo *app_info;
- GError *error = NULL;
- GdkAppLaunchContext *launch_context;
-
- app_info = g_desktop_app_info_new ("gnome-sharing-panel.desktop");
- if (app_info == NULL) {
- g_warning ("Could not launch Sharing settings:
gnome-sharing-panel.desktop missing");
- return;
- }
-
- /* setup the launch context so the startup notification is correct */
- launch_context = gdk_display_get_app_launch_context
(gdk_display_get_default ());
- gdk_app_launch_context_set_timestamp (launch_context, GDK_CURRENT_TIME);
-
- if (!g_app_info_launch (G_APP_INFO (app_info), NULL,
G_APP_LAUNCH_CONTEXT (launch_context), &error)) {
- g_warning ("Could not launch '%s': %s",
- g_app_info_get_commandline (G_APP_INFO (app_info)),
- error->message);
- g_error_free (error);
- }
-
- g_object_unref (launch_context);
- g_object_unref (app_info);
-}
-
-static void
-bar_response_cb (NautilusShareBar *bar,
- gint response,
- gpointer data)
-{
- if (response == NAUTILUS_SHARE_BAR_RESPONSE_PREFERENCES)
- launch_prefs_on_window ();
-}
-
-static GtkWidget *
-nautilus_user_share_get_location_widget (NautilusLocationWidgetProvider *iface,
- const char *uri,
- GtkWidget
*window)
-{
- GFile *file;
- GtkWidget *bar;
- gboolean enable = FALSE;
- GFile *home, *dir;
-
- file = g_file_new_for_uri (uri);
- home = g_file_new_for_path (g_get_home_dir ());
-
- /* We don't show anything in $HOME */
- if (g_file_equal (home, file)) {
- g_object_unref (home);
- g_object_unref (file);
- return NULL;
- }
- g_object_unref (home);
-
- dir = lookup_dir_with_fallback (G_USER_DIRECTORY_PUBLIC_SHARE);
- enable = g_file_equal (dir, file);
- g_object_unref (dir);
- g_object_unref (file);
-
- if (enable == FALSE)
- return NULL;
-
- bar = nautilus_share_bar_new (_("Turn on File Sharing to share the
contents of this folder over the network."));
-
- g_signal_connect (bar, "response",
- G_CALLBACK (bar_response_cb), window);
-
- gtk_widget_show_all (bar);
-
-
- return bar;
-}
-
-static void
-nautilus_user_share_location_widget_provider_iface_init
(NautilusLocationWidgetProviderIface *iface)
-{
- iface->get_widget = nautilus_user_share_get_location_widget;
-}
-
-static void
-nautilus_user_share_instance_init (NautilusUserShare *share)
-{
-
-}
-
-static void
-nautilus_user_share_class_init (NautilusUserShareClass *klass)
-{
-
-}
-
-static GType share_type = 0;
-
-static GType
-nautilus_user_share_get_type (void)
-{
- return share_type;
-}
-
-static void
-nautilus_user_share_register_type (GTypeModule *module)
-{
- static const GTypeInfo info = {
- sizeof (NautilusUserShareClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) nautilus_user_share_class_init,
- NULL,
- NULL,
- sizeof (NautilusUserShare),
- 0,
- (GInstanceInitFunc) nautilus_user_share_instance_init,
- };
-
- static const GInterfaceInfo location_widget_provider_iface_info = {
- (GInterfaceInitFunc)
nautilus_user_share_location_widget_provider_iface_init,
- NULL,
- NULL
- };
-
- share_type = g_type_module_register_type (module,
- G_TYPE_OBJECT,
- "NautilusUserShare",
- &info, 0);
-
- g_type_module_add_interface (module,
- share_type,
- NAUTILUS_TYPE_LOCATION_WIDGET_PROVIDER,
- &location_widget_provider_iface_info);
-}
-
-void
-nautilus_module_initialize (GTypeModule *module)
-{
- nautilus_user_share_register_type (module);
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-}
-
-void
-nautilus_module_shutdown (void)
-{
-}
-
-void
-nautilus_module_list_types (const GType **types,
- int *num_types)
-{
- static GType type_list [1];
-
- type_list[0] = NAUTILUS_TYPE_USER_SHARE;
-
- *types = type_list;
- *num_types = 1;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/src/user_share-common.c
new/gnome-user-share-43.0/src/user_share-common.c
--- old/gnome-user-share-3.34.0+25/src/user_share-common.c 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/src/user_share-common.c 2022-09-16
10:38:18.000000000 +0200
@@ -54,30 +54,3 @@
"Public",
TRUE);
}
-
-GFile *
-lookup_dir_with_fallback (GUserDirectory directory)
-{
- GFile *file;
- char *path;
- const char *name;
-
- if (directory == G_USER_DIRECTORY_PUBLIC_SHARE)
- name = "Public";
- else if (directory == G_USER_DIRECTORY_DOWNLOAD)
- name = "Downloads";
- else
- g_assert_not_reached ();
-
- path = lookup_special_dir (directory,
- name,
- FALSE);
-
- if (path == NULL)
- return NULL;
-
- file = g_file_new_for_path (path);
- g_free (path);
-
- return file;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/src/user_share-common.h
new/gnome-user-share-43.0/src/user_share-common.h
--- old/gnome-user-share-3.34.0+25/src/user_share-common.h 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/src/user_share-common.h 2022-09-16
10:38:18.000000000 +0200
@@ -26,4 +26,3 @@
#include <gio/gio.h>
char *lookup_public_dir (void);
-GFile *lookup_dir_with_fallback (GUserDirectory directory);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/src/user_share-private.c
new/gnome-user-share-43.0/src/user_share-private.c
--- old/gnome-user-share-3.34.0+25/src/user_share-private.c 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/src/user_share-private.c 1970-01-01
01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-
-/*
- * Copyright (C) 2004-2008 Red Hat, Inc.
- *
- * Nautilus is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Nautilus 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors: Alexander Larsson <[email protected]>
- * Bastien Nocera <[email protected]>
- *
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include "user_share-private.h"
-
-static char *password_setting_strings[] = {
- "never",
- "on_write",
- "always"
-};
-
-const char *
-password_string_from_setting (PasswordSetting setting)
-{
-
- if (setting >= 0 && setting <= PASSWORD_ALWAYS)
- return password_setting_strings[setting];
-
- /* Fallback on secure pref */
- return password_setting_strings[PASSWORD_ALWAYS];
-}
-
-PasswordSetting
-password_setting_from_string (const char *str)
-{
- if (str != NULL) {
- if (strcmp (str, "never") == 0) {
- return PASSWORD_NEVER;
- }
- if (strcmp (str, "always") == 0) {
- return PASSWORD_ALWAYS;
- }
- if (strcmp (str, "on_write") == 0) {
- return PASSWORD_ON_WRITE;
- }
- }
-
- /* Fallback on secure pref */
- return PASSWORD_ALWAYS;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-user-share-3.34.0+25/src/user_share-private.h
new/gnome-user-share-43.0/src/user_share-private.h
--- old/gnome-user-share-3.34.0+25/src/user_share-private.h 2021-12-23
05:35:03.000000000 +0100
+++ new/gnome-user-share-43.0/src/user_share-private.h 2022-09-16
10:38:18.000000000 +0200
@@ -28,13 +28,4 @@
#define GNOME_USER_SHARE_SCHEMAS "org.gnome.desktop.file-sharing"
#define FILE_SHARING_REQUIRE_PASSWORD "require-password"
-typedef enum {
- PASSWORD_NEVER,
- PASSWORD_ON_WRITE,
- PASSWORD_ALWAYS
-} PasswordSetting;
-
-const char *password_string_from_setting (PasswordSetting setting);
-PasswordSetting password_setting_from_string (const char *str);
-
#endif /* _USER_SHARE_PRIVATE_H_ */
++++++ gnome-user-share.obsinfo ++++++
--- /var/tmp/diff_new_pack.b1ZgLj/_old 2022-09-21 14:41:19.565570860 +0200
+++ /var/tmp/diff_new_pack.b1ZgLj/_new 2022-09-21 14:41:19.569570871 +0200
@@ -1,5 +1,5 @@
name: gnome-user-share
-version: 3.34.0+25
-mtime: 1640234103
-commit: a89c973d7db36938542325f77d81b73c32968e49
+version: 43.0
+mtime: 1663317498
+commit: a0e790aa9494db9d1b1f48b4fc0d2f78e112044d
