March 2022 - crux-commits

ports/core (3.7): Merge remote-tracking branch 'origin/3.6' into 3.7
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 9e1d2b67b245a816654daf13f5d3343ec735878d Merge: 32c37e5e 87b5d96a Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Mar 19 13:33:23 2022 +0100 Merge remote-tracking branch 'origin/3.6' into 3.7

1 0

ports/core (3.7): libtool: update to 2.4.7
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 87b5d96ac6af9801aba719dcc92de14985f6b10e Author: Juergen Daubert <jue(a)jue.li> Date: Fri Mar 18 14:42:19 2022 +0100 libtool: update to 2.4.7 diff --git a/libtool/.footprint b/libtool/.footprint index 6899efa9..f334759b 100644 --- a/libtool/.footprint +++ b/libtool/.footprint @@ -11,9 +11,9 @@ drwxr-xr-x root/root usr/include/libltdl/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libltdl.a -rwxr-xr-x root/root usr/lib/libltdl.la -lrwxrwxrwx root/root usr/lib/libltdl.so -> libltdl.so.7.3.1 -lrwxrwxrwx root/root usr/lib/libltdl.so.7 -> libltdl.so.7.3.1 --rwxr-xr-x root/root usr/lib/libltdl.so.7.3.1 +lrwxrwxrwx root/root usr/lib/libltdl.so -> libltdl.so.7.3.2 +lrwxrwxrwx root/root usr/lib/libltdl.so.7 -> libltdl.so.7.3.2 +-rwxr-xr-x root/root usr/lib/libltdl.so.7.3.2 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/libtool.m4 diff --git a/libtool/.signature b/libtool/.signature index 90fec6f1..2f26db80 100644 --- a/libtool/.signature +++ b/libtool/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqjtreS25tMc3WBpAqxdnImH27dw1PXzDIqR1dcb0501FusOPYQONxY7ncRLPGMd7q/NAj4baNlXrj7nBEFdObQg= -SHA256 (Pkgfile) = 39b8eadc68c625ebeaf03788fa8ab5ba282976245f55a8a13301c460963363c1 -SHA256 (.footprint) = 5963d5621fbbc3e2a2ec26617728a002b0f6bc60578295f329e8f363ced0f3cb -SHA256 (libtool-2.4.6.tar.xz) = 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f +RWRJc1FUaeVeqi807pImlNatGW3KFLn0XKg95PS39Mluj7SWbBZLqAIQEiLEKMThAi73Q0K32/xoadm5gmeZyDjWB8tSn4EpPgs= +SHA256 (Pkgfile) = 60147c5a3dddb89f0abb9fc7dbcfea7ff1a281dfcdff6b6881871a7a12692ea4 +SHA256 (.footprint) = 0bf0fab010648b4c6d2e1f547beb5f9aa7e9c3d0847c10b6c4832364d0eac940 +SHA256 (libtool-2.4.7.tar.xz) = 4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d diff --git a/libtool/Pkgfile b/libtool/Pkgfile index e7e2733a..950a5f14 100644 --- a/libtool/Pkgfile +++ b/libtool/Pkgfile @@ -1,16 +1,16 @@ # Description: A generic library support script -# URL: http://www.gnu.org/software/libtool/ -# Maintainer: CRUX System Team, core-ports at crux dot nu +# URL: http://www.gnu.org/software/libtool/ +# Maintainer: CRUX System Team, core-ports at crux dot nu name=libtool -version=2.4.6 -release=2 +version=2.4.7 +release=1 source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz) build() { - cd $name-$version - ./configure --prefix=/usr - make - make DESTDIR=$PKG install - rm -r $PKG/usr/share/info + cd $name-$version + ./configure --prefix=/usr + make + make DESTDIR=$PKG install + rm -r $PKG/usr/share/info }

1 0

ports/core (3.7): ca-certificates: update to 20220318
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 238b5c093749934ba9007c3359de7cd9e8e29a85 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Mar 18 14:29:22 2022 +0100 ca-certificates: update to 20220318 diff --git a/ca-certificates/.signature b/ca-certificates/.signature index b0b23674..7332e736 100644 --- a/ca-certificates/.signature +++ b/ca-certificates/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVequy8/wf8xfIytlBV6sgx3O9X3ADTMX9hPfMwCzpEcY0tHujZ/LvPlcCuh/fi8C4hxVFCe772gAROvYR9mOePKQ0= -SHA256 (Pkgfile) = 2c08897017e4fe8d0ff8583681a8fc9666e1a26784399faca70b0a8ea0c81dad +RWRJc1FUaeVeqhKw9kOuN2gQft4WYWRScEWK5ZKRfVaVZEfpbhEomcWLA4tRBmqwqFXnWyxz7nh+0+C9eUiskHWnPY2YF8v5vgk= +SHA256 (Pkgfile) = 7b3e86aeffedce4ed3c8dc2e16d164b8abb7ddafe5b3dbeaf57967476438cdca SHA256 (.footprint) = 92930b2d9b1d5da08760f16fa80c1ff0c13e811e50cb4414f98265cef748bf40 -SHA256 (cacert.pem) = 1d9195b76d2ea25c2b5ae9bee52d05075244d78fcd9c58ee0b6fac47d395a5eb +SHA256 (cacert.pem) = 2d0575e481482551a6a4f9152e7d2ab4bafaeaee5f2606edb829c2fdb3713336 diff --git a/ca-certificates/Pkgfile b/ca-certificates/Pkgfile index e7bb5ef1..9b07013d 100644 --- a/ca-certificates/Pkgfile +++ b/ca-certificates/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=ca-certificates -version=20220201 -# Mon, 31 Jan 2022 19:53:47 +0000 +version=20220318 +# Thu, 17 Mar 2022 08:14:03 +0000 release=1 source=(cacert.pem) diff --git a/ca-certificates/cacert.pem b/ca-certificates/cacert.pem index 632fc248..e91e25fa 100644 --- a/ca-certificates/cacert.pem +++ b/ca-certificates/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Tue Feb 1 04:12:05 2022 GMT +## Certificate data from Mozilla as of: Fri Mar 18 12:29:51 2022 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -13,7 +13,7 @@ ## an Apache+mod_ssl webserver for SSL client authentication. ## Just configure this file as the SSLCACertificateFile. ## -## Conversion done with mk-ca-bundle.pl version 1.28. +## Conversion done with mk-ca-bundle.pl version 1.29. ## SHA256: 187ef9dc231135324fe78830cf4462f1ecdeab3e6c9d5e38d623391e88dc5d3c ## @@ -993,36 +993,6 @@ tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29 mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03 -----END CERTIFICATE----- -EC-ACC -====== ------BEGIN CERTIFICATE----- -MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE -BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w -ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD -VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE -CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT -BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7 -MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt -SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl -Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh -cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK -w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT -ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4 -HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a -E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw -0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E -BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD -VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0 -Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l -dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ -lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa -Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe -l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2 -E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D -5EI= ------END CERTIFICATE----- - Hellenic Academic and Research Institutions RootCA 2011 ======================================================= -----BEGIN CERTIFICATE-----

1 0

ports/core (3.7): python3: fixed signature
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit fbf33cd5232944746e3a04265e837f1b4d38380d Author: Tim Biermann <tbier(a)posteo.de> Date: Thu Mar 17 08:44:08 2022 +0100 python3: fixed signature diff --git a/python3/.signature b/python3/.signature index 74707ca4..b25d7dfe 100644 --- a/python3/.signature +++ b/python3/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqoSomX7vvnKKWMDnCO6wjl8aZQpcgc7hOAobIeKJOwVivRNWZ6aCg02BM/rosnMz1R4neg0VvIR8J/xDK/keEgM= +RWRJc1FUaeVeqohNJV6lVRoTFxA4RsLjCviR631sIR30+F0hL3G7TejZXJNUxmDNtDa76xSK8qS6ja63Wf2CzgyX9GGf/n/tnQM= SHA256 (Pkgfile) = 050749a5b0d375f7a35a26644529c94f7190d138e1c19da24bb7b3b4cf2e29e1 SHA256 (.footprint) = 1199909c8ee9bc3962f479486991198182e4b5f029e372d440180965f9a96a08 -SHA256 (Python-3.9.11.tar.xz) = e4f1ba61c0a513337ff1b85540e9ce8f53de06fe8c487653e39d30fe2fdb6ebd +SHA256 (Python-3.9.11.tar.xz) = 66767a35309d724f370df9e503c172b4ee444f49d62b98bc4eca725123e26c49 SHA256 (mpdecimal-2.5.1.patch) = 8eb389be1babe03a0231001dc16dd2d69a3ea0fbf6b8c976a580787e7ff1594c

1 0

ports/contrib (3.6): xdg-desktop-portal-gtk: 1.12.0 -> 1.14.0
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 6d4befb143b7b48ccc06259bf450b834d56ff26f Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Mar 19 13:32:46 2022 +0100 xdg-desktop-portal-gtk: 1.12.0 -> 1.14.0 diff --git a/xdg-desktop-portal-gtk/.signature b/xdg-desktop-portal-gtk/.signature index 2b44d5eb8..d101af535 100644 --- a/xdg-desktop-portal-gtk/.signature +++ b/xdg-desktop-portal-gtk/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3ywm3k7afQLjo2annjhVtqYvQ++OPrROCNOI1Xry+mEaf6DWsxMD+KDvY75gXgtt/xdhz+bB/leqMPWmu9l5Rgg= -SHA256 (Pkgfile) = fc4bb475c7b2b6928c5a994261cdc9bebffda0028853a98f0bbbfb505cd12a6a +RWSagIOpLGJF33IUdLpHGVv2CV9H5uO2VBTCZ6v3fqN8nJOgxe/ZlOHXCYMqs850ap/j2/z2/4gCg2zsLGxxB4qsHIzoWEPVYgI= +SHA256 (Pkgfile) = bba03c08d93f2f6f5ab2c13fa9c582a78c0aa617ea43499eb34f31e24b83ee31 SHA256 (.footprint) = 73702410a781593cf9b1cb3587ca0f8968d7cf64af6490c1c2a29b9886d2c889 -SHA256 (xdg-desktop-portal-gtk-1.12.0.tar.gz) = 97683507a5af9eb8a3db1d660dab7fb1fd605e31fe31c543572e4b31adc59a92 +SHA256 (xdg-desktop-portal-gtk-1.14.0.tar.gz) = 067717acad549e9ef8ad3cb1ee278a8eb34c0f27e07488a2f7cb9104a1461736 diff --git a/xdg-desktop-portal-gtk/Pkgfile b/xdg-desktop-portal-gtk/Pkgfile index c3c78d8e5..758eaa5b6 100644 --- a/xdg-desktop-portal-gtk/Pkgfile +++ b/xdg-desktop-portal-gtk/Pkgfile @@ -5,7 +5,7 @@ # Optional: dconf gnome-desktop gnome-shell name=xdg-desktop-portal-gtk -version=1.12.0 +version=1.14.0 release=1 source=(https://github.com/flatpak/xdg-desktop-portal-gtk/archive/$version/… diff --git a/xdg-desktop-portal-gtk/build.diff b/xdg-desktop-portal-gtk/build.diff deleted file mode 100644 index 9be341cae..000000000 --- a/xdg-desktop-portal-gtk/build.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git i/po/hi.po w/po/hi.po -index 14d97bf..5795e0e 100644 ---- i/po/hi.po -+++ w/po/hi.po -@@ -309,14 +309,14 @@ msgstr "गतिविधियां" - #~ "Select an application to open “%s”. More applications are available in <a " - #~ "href='software'>Software.</a>" - #~ msgstr "" --#~ "खोलने के लिए एक आवेदन का चयन करें "%s". अधिक एप्लिकेशन उपलब्ध हैं <a " -+#~ "खोलने के लिए एक आवेदन का चयन करें \"%s\". अधिक एप्लिकेशन उपलब्ध हैं <a " - #~ "href='software'>सॉफ्टवेयर।</a>" - - #~ msgid "" - #~ "Select an application. More applications are available in <a " - #~ "href='software'>Software.</a>" - #~ msgstr "" --#~ "एक आवेदन का चयन करें। <a "में अधिक एप्लिकेशन उपलब्ध हैं" -+#~ "एक आवेदन का चयन करें। <a \"में अधिक एप्लिकेशन उपलब्ध हैं" - #~ "href=href='software'>सॉफ्टवेयर।</a>" - - #~ msgid "Unable to find a suitable application." diff --git a/xdg-desktop-portal-gtk/gnome-free-portals.patch b/xdg-desktop-portal-gtk/gnome-free-portals.patch deleted file mode 100644 index ae9a6aeab..000000000 --- a/xdg-desktop-portal-gtk/gnome-free-portals.patch +++ /dev/null @@ -1,1225 +0,0 @@ -From 9bfb0e70dd42dc0f5e5dfd8af1ce924a661305a6 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen(a)redhat.com> -Date: Sun, 6 Jun 2021 16:00:28 -0400 -Subject: [PATCH 1/7] Build the wallpaper portal backend conditionally - -This is a first step towards moving gnome-specific panels -to their own backend. ---- - configure.ac | 11 ++++++++++- - data/Makefile.am.inc | 12 +++++++++++- - data/{gtk.portal => gtk.portal.in} | 2 +- - src/Makefile.am.inc | 15 ++++++++++++--- - src/xdg-desktop-portal-gtk.c | 5 +++++ - 5 files changed, 39 insertions(+), 6 deletions(-) - rename data/{gtk.portal => gtk.portal.in} (89%) - -diff --git a/configure.ac b/configure.ac -index e1723e2..32e46db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,7 +57,16 @@ AC_SUBST([DBUS_INTERFACES_DIR], [`$PKG_CONFIG --variable=interfaces_dir dbus-1`] - AC_SUBST([GDBUS_CODEGEN], [`$PKG_CONFIG --variable gdbus_codegen gio-2.0`]) - AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`]) - --PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0 fontconfig gnome-desktop-3.0 gsettings-desktop-schemas]) -+AC_ARG_ENABLE(wallpaper, -+ [AS_HELP_STRING([--enable-wallpaper],[Build wallpaper portal. Needs gnome-desktop])], -+ enable_wallpaper=$enableval, enable_wallpaper=yes) -+if test x$enable_wallpaper = xyes; then -+ PKG_CHECK_MODULES(WALLPAPER, [gnome-desktop-3.0]) -+ AC_DEFINE([BUILD_WALLPAPER], [1], [Define to enable wallpaper portal]) -+fi -+AM_CONDITIONAL([BUILD_WALLPAPER],[test "$enable_wallpaper" = "yes"]) -+ -+PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0 fontconfig gsettings-desktop-schemas]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - -diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc -index 21b134e..25f5571 100644 ---- a/data/Makefile.am.inc -+++ b/data/Makefile.am.inc -@@ -1,5 +1,13 @@ -+if BUILD_WALLPAPER -+wallpaper_iface = org.freedesktop.impl.portal.Wallpaper; -+endif -+ -+%.portal: data/%.portal.in config.log -+ $(AM_V_GEN) $(SED) -e "s|\@wallpaper_iface\@|$(wallpaper_iface)|" $< > $@ -+ - portaldir = $(datadir)/xdg-desktop-portal/portals --dist_portal_DATA = data/gtk.portal -+portal_in_files = data/gtk.portal.in -+portal_DATA = gtk.portal - - %.service: data/%.service.in config.log - $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -@@ -27,11 +35,13 @@ desktop_in_files = xdg-desktop-portal-gtk.desktop.in - desktop_DATA = xdg-desktop-portal-gtk.desktop - - CLEANFILES += \ -+ $(portal_DATA) \ - $(desktop_in_files) \ - $(desktop_DATA) \ - $(NULL) - - EXTRA_DIST += \ -+ $(portal_in_files) \ - $(dbus_service_in_files) \ - $(systemduserunit_in_files) \ - $(desktop_in_in_files) \ -diff --git a/data/gtk.portal b/data/gtk.portal.in -similarity index 89% -rename from data/gtk.portal -rename to data/gtk.portal.in -index d890619..52dde2c 100644 ---- a/data/gtk.portal -+++ b/data/gtk.portal.in -@@ -1,4 +1,4 @@ - [portal] - DBusName=org.freedesktop.impl.portal.desktop.gtk --Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;org.freedesktop.impl.portal.Screenshot;org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;org.freedesktop.impl.portal.ScreenCast;org.freedesktop.impl.portal.RemoteDesktop;org.freedesktop.impl.portal.Lockdown;org.freedesktop.impl.portal.Background;org.freedesktop.impl.portal.Settings;org.freedesktop.impl.portal.Wallpaper; -+Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;org.freedesktop.impl.portal.Screenshot;org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;org.freedesktop.impl.portal.ScreenCast;org.freedesktop.impl.portal.RemoteDesktop;org.freedesktop.impl.portal.Lockdown;org.freedesktop.impl.portal.Background;org.freedesktop.impl.portal.Settings;@wallpaper_iface@ - UseIn=gnome -diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc -index 4c212d2..c349d20 100644 ---- a/src/Makefile.am.inc -+++ b/src/Makefile.am.inc -@@ -2,6 +2,10 @@ dbus_built_sources = src/xdg-desktop-portal-dbus.c src/xdg-desktop-portal-dbus.h - BUILT_SOURCES += $(dbus_built_sources) - CLEANFILES += $(dbus_built_sources) - -+if BUILD_WALLPAPER -+ WALLPAPER_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Wallpaper.xml -+endif -+ - $(dbus_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.freedesktop.impl.portal. \ -@@ -24,7 +28,7 @@ $(dbus_built_sources): src/Makefile.am.inc - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Lockdown.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Background.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Settings.xml \ -- $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Wallpaper.xml \ -+ $(WALLPAPER_IFACE) \ - $(NULL) - - shell_built_sources = src/shell-dbus.c src/shell-dbus.h -@@ -137,6 +141,10 @@ xdg_desktop_portal_gtk_SOURCES = \ - src/fc-monitor.h \ - src/settings.c \ - src/settings.h \ -+ $(NULL) -+ -+if BUILD_WALLPAPER -+xdg_desktop_portal_gtk_SOURCES += \ - src/wallpaperdialog.c \ - src/wallpaperdialog.h \ - src/wallpaperpreview.c \ -@@ -144,6 +152,7 @@ xdg_desktop_portal_gtk_SOURCES = \ - src/wallpaper.c \ - src/wallpaper.h \ - $(NULL) -+endif - - nodist_xdg_desktop_portal_gtk_SOURCES = \ - src/resources.c \ -@@ -165,8 +174,8 @@ xdg_desktop_portal_gtk_SOURCES += \ - $(NULL) - endif - --xdg_desktop_portal_gtk_LDADD = $(BASE_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) --xdg_desktop_portal_gtk_CFLAGS = $(BASE_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) -+xdg_desktop_portal_gtk_LDADD = $(BASE_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(WALLPAPER_LIBS) -+xdg_desktop_portal_gtk_CFLAGS = $(BASE_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(WALLPAPER_CFLAGS) - xdg_desktop_portal_gtk_CPPFLAGS = \ - -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ - -DLOCALEDIR=\"$(localedir)\" \ -diff --git a/src/xdg-desktop-portal-gtk.c b/src/xdg-desktop-portal-gtk.c -index 8cad9f2..a5507bc 100644 ---- a/src/xdg-desktop-portal-gtk.c -+++ b/src/xdg-desktop-portal-gtk.c -@@ -55,7 +55,10 @@ - #include "lockdown.h" - #include "background.h" - #include "settings.h" -+ -+#ifdef BUILD_WALLPAPER - #include "wallpaper.h" -+#endif - - - static GMainLoop *loop = NULL; -@@ -190,11 +193,13 @@ on_bus_acquired (GDBusConnection *connection, - g_clear_error (&error); - } - -+#ifdef BUILD_WALLPAPER - if (!wallpaper_init (connection, &error)) - { - g_warning ("error: %s\n", error->message); - g_clear_error (&error); - } -+#endif - } - - static void - -From bbe5abe9379d2a9eae8f5e1fc1e62dc22414efe2 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen(a)redhat.com> -Date: Sun, 6 Jun 2021 16:13:31 -0400 -Subject: [PATCH 2/7] Build the screenshot portal backend conditionally - -Another step towards allowing to build a gnome-free -xdg-desktop-portal-gtk. ---- - configure.ac | 8 ++++++++ - data/Makefile.am.inc | 8 +++++++- - data/gtk.portal.in | 2 +- - src/Makefile.am.inc | 22 ++++++++++++++++------ - src/xdg-desktop-portal-gtk.c | 6 ++++++ - 5 files changed, 38 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 32e46db..a34f66b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -66,6 +66,14 @@ if test x$enable_wallpaper = xyes; then - fi - AM_CONDITIONAL([BUILD_WALLPAPER],[test "$enable_wallpaper" = "yes"]) - -+AC_ARG_ENABLE(screenshot, -+ [AS_HELP_STRING([--enable-screenshot],[Build screenshot portal. Needs gnome-shell])], -+ enable_screenshot=$enableval, enable_screenshot=yes) -+if test x$enable_screenshot = xyes; then -+ AC_DEFINE([BUILD_SCREENSHOT], [1], [Define to enable screenshot portal]) -+fi -+AM_CONDITIONAL([BUILD_SCREENSHOT],[test "$enable_screenshot" = "yes"]) -+ - PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0 fontconfig gsettings-desktop-schemas]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc -index 25f5571..87336bd 100644 ---- a/data/Makefile.am.inc -+++ b/data/Makefile.am.inc -@@ -2,8 +2,14 @@ if BUILD_WALLPAPER - wallpaper_iface = org.freedesktop.impl.portal.Wallpaper; - endif - -+if BUILD_SCREENSHOT -+screenshot_iface = org.freedesktop.impl.portal.Screenshot; -+endif -+ - %.portal: data/%.portal.in config.log -- $(AM_V_GEN) $(SED) -e "s|\@wallpaper_iface\@|$(wallpaper_iface)|" $< > $@ -+ $(AM_V_GEN) $(SED) -e "s|\@wallpaper_iface\@|$(wallpaper_iface)|" \ -+ -e "s|\@screenshot_iface\@|$(screenshot_iface)|" \ -+ $< > $@ - - portaldir = $(datadir)/xdg-desktop-portal/portals - portal_in_files = data/gtk.portal.in -diff --git a/data/gtk.portal.in b/data/gtk.portal.in -index 52dde2c..8190dc0 100644 ---- a/data/gtk.portal.in -+++ b/data/gtk.portal.in -@@ -1,4 +1,4 @@ - [portal] - DBusName=org.freedesktop.impl.portal.desktop.gtk --Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;org.freedesktop.impl.portal.Screenshot;org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;org.freedesktop.impl.portal.ScreenCast;org.freedesktop.impl.portal.RemoteDesktop;org.freedesktop.impl.portal.Lockdown;org.freedesktop.impl.portal.Background;org.freedesktop.impl.portal.Settings;@wallpaper_iface@ -+Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;org.freedesktop.impl.portal.ScreenCast;org.freedesktop.impl.portal.RemoteDesktop;org.freedesktop.impl.portal.Lockdown;org.freedesktop.impl.portal.Background;org.freedesktop.impl.portal.Settings;@wallpaper_iface@ - UseIn=gnome -diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc -index c349d20..75bd1ed 100644 ---- a/src/Makefile.am.inc -+++ b/src/Makefile.am.inc -@@ -6,6 +6,11 @@ if BUILD_WALLPAPER - WALLPAPER_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Wallpaper.xml - endif - -+if BUILD_SCREENSHOT -+ SCREENSHOT_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Screenshot.xml -+ SHELL_SCREENSHOT_IFACE=$(top_srcdir)/data/org.gnome.Shell.Screenshot.xml -+endif -+ - $(dbus_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.freedesktop.impl.portal. \ -@@ -17,7 +22,6 @@ $(dbus_built_sources): src/Makefile.am.inc - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.FileChooser.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.AppChooser.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Print.xml \ -- $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Screenshot.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Notification.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Inhibit.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Access.xml \ -@@ -29,6 +33,7 @@ $(dbus_built_sources): src/Makefile.am.inc - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Background.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Settings.xml \ - $(WALLPAPER_IFACE) \ -+ $(SCREENSHOT_IFACE) \ - $(NULL) - - shell_built_sources = src/shell-dbus.c src/shell-dbus.h -@@ -41,7 +46,6 @@ $(shell_built_sources): src/Makefile.am.inc - $(top_srcdir)/data/org.gnome.Mutter.DisplayConfig.xml \ - $(top_srcdir)/data/org.gnome.Mutter.ScreenCast.xml \ - $(top_srcdir)/data/org.gnome.Mutter.RemoteDesktop.xml \ -- $(top_srcdir)/data/org.gnome.Shell.Screenshot.xml \ - $(top_srcdir)/data/org.gnome.Shell.Introspect.xml \ - $(top_srcdir)/data/org.gtk.Notifications.xml \ - $(top_srcdir)/data/org.gnome.SessionManager.xml \ -@@ -49,6 +53,7 @@ $(shell_built_sources): src/Makefile.am.inc - $(top_srcdir)/data/org.freedesktop.ScreenSaver.xml \ - $(top_srcdir)/data/org.freedesktop.Accounts.xml \ - $(top_srcdir)/data/org.freedesktop.Accounts.User.xml \ -+ $(SHELL_SCREENSHOT_IFACE) \ - $(NULL) - - resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src --generate-dependencies $(top_srcdir)/src/xdg-desktop-portal-gtk.gresource.xml) -@@ -99,10 +104,6 @@ xdg_desktop_portal_gtk_SOURCES = \ - src/appchooserrow.c \ - src/appchooserdialog.h \ - src/appchooserdialog.c \ -- src/screenshot.h \ -- src/screenshot.c \ -- src/screenshotdialog.h \ -- src/screenshotdialog.c \ - src/print.h \ - src/print.c \ - src/access.h \ -@@ -154,6 +155,15 @@ xdg_desktop_portal_gtk_SOURCES += \ - $(NULL) - endif - -+if BUILD_SCREENSHOT -+xdg_desktop_portal_gtk_SOURCES += \ -+ src/screenshot.h \ -+ src/screenshot.c \ -+ src/screenshotdialog.h \ -+ src/screenshotdialog.c \ -+ $(NULL) -+endif -+ - nodist_xdg_desktop_portal_gtk_SOURCES = \ - src/resources.c \ - $(dbus_built_sources) \ -diff --git a/src/xdg-desktop-portal-gtk.c b/src/xdg-desktop-portal-gtk.c -index a5507bc..a109e58 100644 ---- a/src/xdg-desktop-portal-gtk.c -+++ b/src/xdg-desktop-portal-gtk.c -@@ -44,7 +44,11 @@ - #include "filechooser.h" - #include "appchooser.h" - #include "print.h" -+ -+#ifdef BUILD_SCREENSHOT - #include "screenshot.h" -+#endif -+ - #include "notification.h" - #include "inhibit.h" - #include "access.h" -@@ -127,11 +131,13 @@ on_bus_acquired (GDBusConnection *connection, - g_clear_error (&error); - } - -+#ifdef BUILD_SCREENSHOT - if (!screenshot_init (connection, &error)) - { - g_warning ("error: %s\n", error->message); - g_clear_error (&error); - } -+#endif - - if (!notification_init (connection, &error)) - { - -From b80392fc7bd1ad05d931ee72b87935dad85a9c2e Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen(a)redhat.com> -Date: Sun, 6 Jun 2021 16:29:04 -0400 -Subject: [PATCH 3/7] Build screencast and remote desktop portals conditionall - -Another step towards allowing to build a gnome-free -xdg-desktop-portal-gtk. ---- - configure.ac | 8 ++++++ - data/Makefile.am.inc | 7 +++++ - data/gtk.portal.in | 2 +- - src/Makefile.am.inc | 51 ++++++++++++++++++++++-------------- - src/xdg-desktop-portal-gtk.c | 6 +++++ - 5 files changed, 54 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a34f66b..aef8064 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,6 +74,14 @@ if test x$enable_screenshot = xyes; then - fi - AM_CONDITIONAL([BUILD_SCREENSHOT],[test "$enable_screenshot" = "yes"]) - -+AC_ARG_ENABLE(screencast, -+ [AS_HELP_STRING([--enable-screencast],[Build screencast and remote desktop portals. Needs mutter])], -+ enable_screencast=$enableval, enable_screencast=yes) -+if test x$enable_screencast = xyes; then -+ AC_DEFINE([BUILD_SCREENCAST], [1], [Define to enable screencast portal]) -+fi -+AM_CONDITIONAL([BUILD_SCREENCAST],[test "$enable_screencast" = "yes"]) -+ - PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0 fontconfig gsettings-desktop-schemas]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc -index 87336bd..7839eae 100644 ---- a/data/Makefile.am.inc -+++ b/data/Makefile.am.inc -@@ -6,9 +6,16 @@ if BUILD_SCREENSHOT - screenshot_iface = org.freedesktop.impl.portal.Screenshot; - endif - -+if BUILD_SCREENCAST -+screencast_iface = org.freedesktop.impl.portal.ScreenCast; -+remotedesktop_iface = org.freedesktop.impl.portal.RemoteDesktop; -+endif -+ - %.portal: data/%.portal.in config.log - $(AM_V_GEN) $(SED) -e "s|\@wallpaper_iface\@|$(wallpaper_iface)|" \ - -e "s|\@screenshot_iface\@|$(screenshot_iface)|" \ -+ -e "s|\@screencast_iface\@|$(screencast_iface)|" \ -+ -e "s|\@remotedesktop_iface\@|$(remotedesktop_iface)|" \ - $< > $@ - - portaldir = $(datadir)/xdg-desktop-portal/portals -diff --git a/data/gtk.portal.in b/data/gtk.portal.in -index 8190dc0..3581967 100644 ---- a/data/gtk.portal.in -+++ b/data/gtk.portal.in -@@ -1,4 +1,4 @@ - [portal] - DBusName=org.freedesktop.impl.portal.desktop.gtk --Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;org.freedesktop.impl.portal.ScreenCast;org.freedesktop.impl.portal.RemoteDesktop;org.freedesktop.impl.portal.Lockdown;org.freedesktop.impl.portal.Background;org.freedesktop.impl.portal.Settings;@wallpaper_iface@ -+Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@org.freedesktop.impl.portal.Lockdown;org.freedesktop.impl.portal.Background;org.freedesktop.impl.portal.Settings;@wallpaper_iface@ - UseIn=gnome -diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc -index 75bd1ed..94655ba 100644 ---- a/src/Makefile.am.inc -+++ b/src/Makefile.am.inc -@@ -11,6 +11,14 @@ if BUILD_SCREENSHOT - SHELL_SCREENSHOT_IFACE=$(top_srcdir)/data/org.gnome.Shell.Screenshot.xml - endif - -+if BUILD_SCREENCAST -+ SCREENCAST_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.ScreenCast.xml -+ REMOTE_DESKTOP_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.RemoteDesktop.xml -+ MUTTER_SCREENCAST_IFACE=$(top_srcdir)/data/org.gnome.Mutter.ScreenCast.xml -+ MUTTER_REMOTE_DESKTOP_IFACE=$(top_srcdir)/data/org.gnome.Mutter.RemoteDesktop.xml -+ MUTTER_DISPLAYCONFIG_IFACE=$(top_srcdir)/data/org.gnome.Mutter.DisplayConfig.xml -+endif -+ - $(dbus_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.freedesktop.impl.portal. \ -@@ -27,13 +35,13 @@ $(dbus_built_sources): src/Makefile.am.inc - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Access.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Account.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Email.xml \ -- $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.ScreenCast.xml \ -- $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.RemoteDesktop.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Lockdown.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Background.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Settings.xml \ - $(WALLPAPER_IFACE) \ - $(SCREENSHOT_IFACE) \ -+ $(SCREENCAST_IFACE) \ -+ $(REMOTE_DESKTOP_IFACE) \ - $(NULL) - - shell_built_sources = src/shell-dbus.c src/shell-dbus.h -@@ -43,9 +51,6 @@ CLEANFILES += $(shell_built_sources) - $(shell_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --generate-c-code src/shell-dbus \ -- $(top_srcdir)/data/org.gnome.Mutter.DisplayConfig.xml \ -- $(top_srcdir)/data/org.gnome.Mutter.ScreenCast.xml \ -- $(top_srcdir)/data/org.gnome.Mutter.RemoteDesktop.xml \ - $(top_srcdir)/data/org.gnome.Shell.Introspect.xml \ - $(top_srcdir)/data/org.gtk.Notifications.xml \ - $(top_srcdir)/data/org.gnome.SessionManager.xml \ -@@ -54,6 +59,9 @@ $(shell_built_sources): src/Makefile.am.inc - $(top_srcdir)/data/org.freedesktop.Accounts.xml \ - $(top_srcdir)/data/org.freedesktop.Accounts.User.xml \ - $(SHELL_SCREENSHOT_IFACE) \ -+ $(MUTTER_SCREENCAST_IFACE) \ -+ $(MUTTER_REMOTE_DESKTOP_IFACE) \ -+ $(MUTTER_DISPLAYCONFIG_IFACE) \ - $(NULL) - - resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src --generate-dependencies $(top_srcdir)/src/xdg-desktop-portal-gtk.gresource.xml) -@@ -118,20 +126,6 @@ xdg_desktop_portal_gtk_SOURCES = \ - src/gtkbackports.c \ - src/externalwindow.h \ - src/externalwindow.c \ -- src/screencast.c \ -- src/screencast.h \ -- src/screencastwidget.c \ -- src/screencastwidget.h \ -- src/screencastdialog.c \ -- src/screencastdialog.h \ -- src/gnomescreencast.c \ -- src/gnomescreencast.h \ -- src/remotedesktop.c \ -- src/remotedesktop.h \ -- src/remotedesktopdialog.c \ -- src/remotedesktopdialog.h \ -- src/displaystatetracker.c \ -- src/displaystatetracker.h \ - src/shellintrospect.c \ - src/shellintrospect.h \ - src/lockdown.c \ -@@ -164,6 +158,25 @@ xdg_desktop_portal_gtk_SOURCES += \ - $(NULL) - endif - -+if BUILD_SCREENCAST -+xdg_desktop_portal_gtk_SOURCES += \ -+ src/screencast.c \ -+ src/screencast.h \ -+ src/screencastwidget.c \ -+ src/screencastwidget.h \ -+ src/screencastdialog.c \ -+ src/screencastdialog.h \ -+ src/gnomescreencast.c \ -+ src/gnomescreencast.h \ -+ src/remotedesktop.c \ -+ src/remotedesktop.h \ -+ src/remotedesktopdialog.c \ -+ src/remotedesktopdialog.h \ -+ src/displaystatetracker.c \ -+ src/displaystatetracker.h \ -+ $(NULL) -+endif -+ - nodist_xdg_desktop_portal_gtk_SOURCES = \ - src/resources.c \ - $(dbus_built_sources) \ -diff --git a/src/xdg-desktop-portal-gtk.c b/src/xdg-desktop-portal-gtk.c -index a109e58..a26855b 100644 ---- a/src/xdg-desktop-portal-gtk.c -+++ b/src/xdg-desktop-portal-gtk.c -@@ -54,8 +54,12 @@ - #include "access.h" - #include "account.h" - #include "email.h" -+ -+#ifdef BUILD_SCREENCAST - #include "screencast.h" - #include "remotedesktop.h" -+#endif -+ - #include "lockdown.h" - #include "background.h" - #include "settings.h" -@@ -169,6 +173,7 @@ on_bus_acquired (GDBusConnection *connection, - g_clear_error (&error); - } - -+#ifdef BUILD_SCREENCAST - if (!screen_cast_init (connection, &error)) - { - g_warning ("error: %s\n", error->message); -@@ -180,6 +185,7 @@ on_bus_acquired (GDBusConnection *connection, - g_warning ("error: %s\n", error->message); - g_clear_error (&error); - } -+#endif - - if (!lockdown_init (connection, &error)) - { - -From 3811dd8b4067bac414037dc1c2b9fb2f2ea8e0a3 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen(a)redhat.com> -Date: Sun, 6 Jun 2021 16:55:22 -0400 -Subject: [PATCH 4/7] Build the background portal conditionally - -Another step towards allowing to build a gnome-free -xdg-desktop-portal-gtk. ---- - configure.ac | 8 ++++++++ - data/Makefile.am.inc | 5 +++++ - data/gtk.portal.in | 2 +- - src/Makefile.am.inc | 37 ++++++++++++++++++++++++++++++------ - src/xdg-desktop-portal-gtk.c | 6 ++++++ - 5 files changed, 51 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aef8064..9d470fa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -82,6 +82,14 @@ if test x$enable_screencast = xyes; then - fi - AM_CONDITIONAL([BUILD_SCREENCAST],[test "$enable_screencast" = "yes"]) - -+AC_ARG_ENABLE(background, -+ [AS_HELP_STRING([--enable-background],[Build background portal. Needs gnome-shell])], -+ enable_background=$enableval, enable_background=yes) -+if test x$enable_background = xyes; then -+ AC_DEFINE([BUILD_BACKGROUND], [1], [Define to enable background portal]) -+fi -+AM_CONDITIONAL([BUILD_BACKGROUND],[test "$enable_background" = "yes"]) -+ - PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0 fontconfig gsettings-desktop-schemas]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc -index 7839eae..5b7af7d 100644 ---- a/data/Makefile.am.inc -+++ b/data/Makefile.am.inc -@@ -11,11 +11,16 @@ screencast_iface = org.freedesktop.impl.portal.ScreenCast; - remotedesktop_iface = org.freedesktop.impl.portal.RemoteDesktop; - endif - -+if BUILD_BACKGROUND -+background_iface = org.freedesktop.impl.portal.Background; -+endif -+ - %.portal: data/%.portal.in config.log - $(AM_V_GEN) $(SED) -e "s|\@wallpaper_iface\@|$(wallpaper_iface)|" \ - -e "s|\@screenshot_iface\@|$(screenshot_iface)|" \ - -e "s|\@screencast_iface\@|$(screencast_iface)|" \ - -e "s|\@remotedesktop_iface\@|$(remotedesktop_iface)|" \ -+ -e "s|\@background_iface\@|$(background_iface)|" \ - $< > $@ - - portaldir = $(datadir)/xdg-desktop-portal/portals -diff --git a/data/gtk.portal.in b/data/gtk.portal.in -index 3581967..a73d783 100644 ---- a/data/gtk.portal.in -+++ b/data/gtk.portal.in -@@ -1,4 +1,4 @@ - [portal] - DBusName=org.freedesktop.impl.portal.desktop.gtk --Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@org.freedesktop.impl.portal.Lockdown;org.freedesktop.impl.portal.Background;org.freedesktop.impl.portal.Settings;@wallpaper_iface@ -+Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@org.freedesktop.impl.portal.Lockdown;@background_iface@org.freedesktop.impl.portal.Settings;@wallpaper_iface@ - UseIn=gnome -diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc -index 94655ba..0163383 100644 ---- a/src/Makefile.am.inc -+++ b/src/Makefile.am.inc -@@ -19,6 +19,16 @@ if BUILD_SCREENCAST - MUTTER_DISPLAYCONFIG_IFACE=$(top_srcdir)/data/org.gnome.Mutter.DisplayConfig.xml - endif - -+if BUILD_BACKGROUND -+ BACKGROUND_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Background.xml -+endif -+ -+if BUILD_BACKGROUND -+ SHELL_INTROSPECT_IFACE=$(top_srcdir)/data/org.gnome.Shell.Introspect.xml -+else -+ SHELL_INTROSPECT_IFACE=$(top_srcdir)/data/org.gnome.Shell.Introspect.xml -+endif -+ - $(dbus_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.freedesktop.impl.portal. \ -@@ -36,12 +46,12 @@ $(dbus_built_sources): src/Makefile.am.inc - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Account.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Email.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Lockdown.xml \ -- $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Background.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Settings.xml \ - $(WALLPAPER_IFACE) \ - $(SCREENSHOT_IFACE) \ - $(SCREENCAST_IFACE) \ - $(REMOTE_DESKTOP_IFACE) \ -+ $(BACKGROUND_IFACE) \ - $(NULL) - - shell_built_sources = src/shell-dbus.c src/shell-dbus.h -@@ -51,7 +61,6 @@ CLEANFILES += $(shell_built_sources) - $(shell_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --generate-c-code src/shell-dbus \ -- $(top_srcdir)/data/org.gnome.Shell.Introspect.xml \ - $(top_srcdir)/data/org.gtk.Notifications.xml \ - $(top_srcdir)/data/org.gnome.SessionManager.xml \ - $(top_srcdir)/data/org.gnome.ScreenSaver.xml \ -@@ -62,6 +71,7 @@ $(shell_built_sources): src/Makefile.am.inc - $(MUTTER_SCREENCAST_IFACE) \ - $(MUTTER_REMOTE_DESKTOP_IFACE) \ - $(MUTTER_DISPLAYCONFIG_IFACE) \ -+ $(SHELL_INTROSPECT_IFACE) \ - $(NULL) - - resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src --generate-dependencies $(top_srcdir)/src/xdg-desktop-portal-gtk.gresource.xml) -@@ -126,12 +136,8 @@ xdg_desktop_portal_gtk_SOURCES = \ - src/gtkbackports.c \ - src/externalwindow.h \ - src/externalwindow.c \ -- src/shellintrospect.c \ -- src/shellintrospect.h \ - src/lockdown.c \ - src/lockdown.h \ -- src/background.c \ -- src/background.h \ - src/fc-monitor.c \ - src/fc-monitor.h \ - src/settings.c \ -@@ -177,6 +183,25 @@ xdg_desktop_portal_gtk_SOURCES += \ - $(NULL) - endif - -+if BUILD_BACKGROUND -+xdg_desktop_portal_gtk_SOURCES += \ -+ src/background.c \ -+ src/background.h \ -+ $(NULL) -+endif -+ -+if BUILD_BACKGROUND -+xdg_desktop_portal_gtk_SOURCES += \ -+ src/shellintrospect.c \ -+ src/shellintrospect.h \ -+ $(NULL) -+else -+xdg_desktop_portal_gtk_SOURCES += \ -+ src/shellintrospect.c \ -+ src/shellintrospect.h \ -+ $(NULL) -+endif -+ - nodist_xdg_desktop_portal_gtk_SOURCES = \ - src/resources.c \ - $(dbus_built_sources) \ -diff --git a/src/xdg-desktop-portal-gtk.c b/src/xdg-desktop-portal-gtk.c -index a26855b..2f26583 100644 ---- a/src/xdg-desktop-portal-gtk.c -+++ b/src/xdg-desktop-portal-gtk.c -@@ -61,7 +61,11 @@ - #endif - - #include "lockdown.h" -+ -+#ifdef BUILD_BACKGROUND - #include "background.h" -+#endif -+ - #include "settings.h" - - #ifdef BUILD_WALLPAPER -@@ -193,11 +197,13 @@ on_bus_acquired (GDBusConnection *connection, - g_clear_error (&error); - } - -+#ifdef BUILD_BACKGROUND - if (!background_init (connection, &error)) - { - g_warning ("error: %s\n", error->message); - g_clear_error (&error); - } -+#endif - - if (!settings_init (connection, &error)) - { - -From 5dcc1f0eddc46f1ae6ce4573279174be900bef9c Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen(a)redhat.com> -Date: Sun, 6 Jun 2021 17:10:27 -0400 -Subject: [PATCH 5/7] Build the settings portal conditionally - -Another step towards allowing to build a gnome-free -xdg-desktop-portal-gtk. ---- - configure.ac | 11 ++++++++++- - data/Makefile.am.inc | 5 +++++ - data/gtk.portal.in | 2 +- - src/Makefile.am.inc | 27 ++++++++++++++++++++------- - src/xdg-desktop-portal-gtk.c | 4 ++++ - 5 files changed, 40 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9d470fa..96a600a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -90,7 +90,16 @@ if test x$enable_background = xyes; then - fi - AM_CONDITIONAL([BUILD_BACKGROUND],[test "$enable_background" = "yes"]) - --PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0 fontconfig gsettings-desktop-schemas]) -+AC_ARG_ENABLE(settings, -+ [AS_HELP_STRING([--enable-settings],[Build settings portal. Needs dconf])], -+ enable_settings=$enableval, enable_settings=yes) -+if test x$enable_settings = xyes; then -+ PKG_CHECK_MODULES(SETTINGS, [fontconfig gsettings-desktop-schemas]) -+ AC_DEFINE([BUILD_SETTINGS], [1], [Define to enable settings portal]) -+fi -+AM_CONDITIONAL([BUILD_SETTINGS],[test "$enable_settings" = "yes"]) -+ -+PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - -diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc -index 5b7af7d..56bde55 100644 ---- a/data/Makefile.am.inc -+++ b/data/Makefile.am.inc -@@ -15,12 +15,17 @@ if BUILD_BACKGROUND - background_iface = org.freedesktop.impl.portal.Background; - endif - -+if BUILD_SETTINGS -+settings_iface = org.freedesktop.impl.portal.Settings; -+endif -+ - %.portal: data/%.portal.in config.log - $(AM_V_GEN) $(SED) -e "s|\@wallpaper_iface\@|$(wallpaper_iface)|" \ - -e "s|\@screenshot_iface\@|$(screenshot_iface)|" \ - -e "s|\@screencast_iface\@|$(screencast_iface)|" \ - -e "s|\@remotedesktop_iface\@|$(remotedesktop_iface)|" \ - -e "s|\@background_iface\@|$(background_iface)|" \ -+ -e "s|\@settings_iface\@|$(settings_iface)|" \ - $< > $@ - - portaldir = $(datadir)/xdg-desktop-portal/portals -diff --git a/data/gtk.portal.in b/data/gtk.portal.in -index a73d783..a1c274b 100644 ---- a/data/gtk.portal.in -+++ b/data/gtk.portal.in -@@ -1,4 +1,4 @@ - [portal] - DBusName=org.freedesktop.impl.portal.desktop.gtk --Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@org.freedesktop.impl.portal.Lockdown;@background_iface@org.freedesktop.impl.portal.Settings;@wallpaper_iface@ -+Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@org.freedesktop.impl.portal.Lockdown;@background_iface@@settings_iface@@wallpaper_iface@ - UseIn=gnome -diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc -index 0163383..de98c50 100644 ---- a/src/Makefile.am.inc -+++ b/src/Makefile.am.inc -@@ -23,11 +23,17 @@ if BUILD_BACKGROUND - BACKGROUND_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Background.xml - endif - -+if BUILD_SETTINGS -+ SETTINGS_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Settings.xml -+endif -+ - if BUILD_BACKGROUND - SHELL_INTROSPECT_IFACE=$(top_srcdir)/data/org.gnome.Shell.Introspect.xml - else -+if BUILD_SETTINGS - SHELL_INTROSPECT_IFACE=$(top_srcdir)/data/org.gnome.Shell.Introspect.xml - endif -+endif - - $(dbus_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ -@@ -46,12 +52,12 @@ $(dbus_built_sources): src/Makefile.am.inc - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Account.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Email.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Lockdown.xml \ -- $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Settings.xml \ - $(WALLPAPER_IFACE) \ - $(SCREENSHOT_IFACE) \ - $(SCREENCAST_IFACE) \ - $(REMOTE_DESKTOP_IFACE) \ - $(BACKGROUND_IFACE) \ -+ $(SETTINGS_IFACE) \ - $(NULL) - - shell_built_sources = src/shell-dbus.c src/shell-dbus.h -@@ -138,10 +144,6 @@ xdg_desktop_portal_gtk_SOURCES = \ - src/externalwindow.c \ - src/lockdown.c \ - src/lockdown.h \ -- src/fc-monitor.c \ -- src/fc-monitor.h \ -- src/settings.c \ -- src/settings.h \ - $(NULL) - - if BUILD_WALLPAPER -@@ -190,17 +192,28 @@ xdg_desktop_portal_gtk_SOURCES += \ - $(NULL) - endif - -+if BUILD_SETTINGS -+xdg_desktop_portal_gtk_SOURCES += \ -+ src/fc-monitor.c \ -+ src/fc-monitor.h \ -+ src/settings.c \ -+ src/settings.h \ -+ $(NULL) -+endif -+ - if BUILD_BACKGROUND - xdg_desktop_portal_gtk_SOURCES += \ - src/shellintrospect.c \ - src/shellintrospect.h \ - $(NULL) - else -+if BUILD_SETTINGS - xdg_desktop_portal_gtk_SOURCES += \ - src/shellintrospect.c \ - src/shellintrospect.h \ - $(NULL) - endif -+endif - - nodist_xdg_desktop_portal_gtk_SOURCES = \ - src/resources.c \ -@@ -222,8 +235,8 @@ xdg_desktop_portal_gtk_SOURCES += \ - $(NULL) - endif - --xdg_desktop_portal_gtk_LDADD = $(BASE_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(WALLPAPER_LIBS) --xdg_desktop_portal_gtk_CFLAGS = $(BASE_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(WALLPAPER_CFLAGS) -+xdg_desktop_portal_gtk_LDADD = $(BASE_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(WALLPAPER_LIBS) $(SETTINGS_LIBS) -+xdg_desktop_portal_gtk_CFLAGS = $(BASE_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(WALLPAPER_CFLAGS) $(SETTINGS_CFLAGS) - xdg_desktop_portal_gtk_CPPFLAGS = \ - -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ - -DLOCALEDIR=\"$(localedir)\" \ -diff --git a/src/xdg-desktop-portal-gtk.c b/src/xdg-desktop-portal-gtk.c -index 2f26583..b2d0df2 100644 ---- a/src/xdg-desktop-portal-gtk.c -+++ b/src/xdg-desktop-portal-gtk.c -@@ -66,7 +66,9 @@ - #include "background.h" - #endif - -+#ifdef BUILD_SETTINGS - #include "settings.h" -+#endif - - #ifdef BUILD_WALLPAPER - #include "wallpaper.h" -@@ -205,11 +207,13 @@ on_bus_acquired (GDBusConnection *connection, - } - #endif - -+#ifdef BUILD_SETTINGS - if (!settings_init (connection, &error)) - { - g_warning ("error: %s\n", error->message); - g_clear_error (&error); - } -+#endif - - #ifdef BUILD_WALLPAPER - if (!wallpaper_init (connection, &error)) - -From 9ae5098887c48d70dfc3a004099900c716ebce16 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen(a)redhat.com> -Date: Sun, 6 Jun 2021 17:18:26 -0400 -Subject: [PATCH 6/7] Build the appchooser portal conditionally - -Another step towards allowing to build a gnome-free -xdg-desktop-portal-gtk. ---- - configure.ac | 8 ++++++++ - data/Makefile.am.inc | 5 +++++ - data/gtk.portal.in | 2 +- - src/Makefile.am.inc | 23 ++++++++++++++++------- - src/xdg-desktop-portal-gtk.c | 6 ++++++ - 5 files changed, 36 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 96a600a..82989ac 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,6 +99,14 @@ if test x$enable_settings = xyes; then - fi - AM_CONDITIONAL([BUILD_SETTINGS],[test "$enable_settings" = "yes"]) - -+AC_ARG_ENABLE(appchooser, -+ [AS_HELP_STRING([--enable-appchooser],[Build appchooser portal.])], -+ enable_appchooser=$enableval, enable_appchooser=yes) -+if test x$enable_appchooser = xyes; then -+ AC_DEFINE([BUILD_APPCHOOSER], [1], [Define to enable appchooser portal]) -+fi -+AM_CONDITIONAL([BUILD_APPCHOOSER],[test "$enable_appchooser" = "yes"]) -+ - PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc -index 56bde55..81e1715 100644 ---- a/data/Makefile.am.inc -+++ b/data/Makefile.am.inc -@@ -19,6 +19,10 @@ if BUILD_SETTINGS - settings_iface = org.freedesktop.impl.portal.Settings; - endif - -+if BUILD_APPCHOOSER -+appchooser_iface = org.freedesktop.impl.portal.AppChooser; -+endif -+ - %.portal: data/%.portal.in config.log - $(AM_V_GEN) $(SED) -e "s|\@wallpaper_iface\@|$(wallpaper_iface)|" \ - -e "s|\@screenshot_iface\@|$(screenshot_iface)|" \ -@@ -26,6 +30,7 @@ endif - -e "s|\@remotedesktop_iface\@|$(remotedesktop_iface)|" \ - -e "s|\@background_iface\@|$(background_iface)|" \ - -e "s|\@settings_iface\@|$(settings_iface)|" \ -+ -e "s|\@appchooser_iface\@|$(appchooser_iface)|" \ - $< > $@ - - portaldir = $(datadir)/xdg-desktop-portal/portals -diff --git a/data/gtk.portal.in b/data/gtk.portal.in -index a1c274b..4eb10ed 100644 ---- a/data/gtk.portal.in -+++ b/data/gtk.portal.in -@@ -1,4 +1,4 @@ - [portal] - DBusName=org.freedesktop.impl.portal.desktop.gtk --Interfaces=org.freedesktop.impl.portal.FileChooser;org.freedesktop.impl.portal.AppChooser;org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@org.freedesktop.impl.portal.Lockdown;@background_iface@@settings_iface@@wallpaper_iface@ -+Interfaces=org.freedesktop.impl.portal.FileChooser;@appchooser_iface@org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@org.freedesktop.impl.portal.Lockdown;@background_iface@@settings_iface@@wallpaper_iface@ - UseIn=gnome -diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc -index de98c50..408d81d 100644 ---- a/src/Makefile.am.inc -+++ b/src/Makefile.am.inc -@@ -35,6 +35,10 @@ if BUILD_SETTINGS - endif - endif - -+if BUILD_APPCHOOSER -+ APPCHOOSER_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.AppChooser.xml -+endif -+ - $(dbus_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.freedesktop.impl.portal. \ -@@ -44,7 +48,6 @@ $(dbus_built_sources): src/Makefile.am.inc - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Request.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Session.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.FileChooser.xml \ -- $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.AppChooser.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Print.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Notification.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Inhibit.xml \ -@@ -58,6 +61,7 @@ $(dbus_built_sources): src/Makefile.am.inc - $(REMOTE_DESKTOP_IFACE) \ - $(BACKGROUND_IFACE) \ - $(SETTINGS_IFACE) \ -+ $(APPCHOOSER_IFACE) \ - $(NULL) - - shell_built_sources = src/shell-dbus.c src/shell-dbus.h -@@ -116,18 +120,12 @@ xdg_desktop_portal_gtk_SOURCES = \ - src/session.h \ - src/filechooser.h \ - src/filechooser.c \ -- src/appchooser.h \ -- src/appchooser.c \ - src/notification.h \ - src/notification.c \ - src/fdonotification.h \ - src/fdonotification.c \ - src/inhibit.h \ - src/inhibit.c \ -- src/appchooserrow.h \ -- src/appchooserrow.c \ -- src/appchooserdialog.h \ -- src/appchooserdialog.c \ - src/print.h \ - src/print.c \ - src/access.h \ -@@ -215,6 +213,17 @@ xdg_desktop_portal_gtk_SOURCES += \ - endif - endif - -+if BUILD_APPCHOOSER -+xdg_desktop_portal_gtk_SOURCES += \ -+ src/appchooser.h \ -+ src/appchooser.c \ -+ src/appchooserrow.h \ -+ src/appchooserrow.c \ -+ src/appchooserdialog.h \ -+ src/appchooserdialog.c \ -+ $(NULL) -+endif -+ - nodist_xdg_desktop_portal_gtk_SOURCES = \ - src/resources.c \ - $(dbus_built_sources) \ -diff --git a/src/xdg-desktop-portal-gtk.c b/src/xdg-desktop-portal-gtk.c -index b2d0df2..4cc7c76 100644 ---- a/src/xdg-desktop-portal-gtk.c -+++ b/src/xdg-desktop-portal-gtk.c -@@ -42,7 +42,11 @@ - - #include "request.h" - #include "filechooser.h" -+ -+#ifdef BUILD_APPCHOOSER - #include "appchooser.h" -+#endif -+ - #include "print.h" - - #ifdef BUILD_SCREENSHOT -@@ -129,11 +133,13 @@ on_bus_acquired (GDBusConnection *connection, - g_clear_error (&error); - } - -+#ifdef BUILD_APPCHOOSER - if (!app_chooser_init (connection, &error)) - { - g_warning ("error: %s\n", error->message); - g_clear_error (&error); - } -+#endif - - if (!print_init (connection, &error)) - { - -From be1ce3f16f99dda957d60258f73ccbf1e9cbb683 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen(a)redhat.com> -Date: Sun, 6 Jun 2021 17:24:04 -0400 -Subject: [PATCH 7/7] Build lockdown portal conditionally - -Another step towards allowing to build a gnome-free -xdg-desktop-portal-gtk. ---- - configure.ac | 8 ++++++++ - data/Makefile.am.inc | 5 +++++ - data/gtk.portal.in | 2 +- - src/Makefile.am.inc | 15 ++++++++++++--- - src/xdg-desktop-portal-gtk.c | 4 ++++ - 5 files changed, 30 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 82989ac..24eb6a2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,6 +107,14 @@ if test x$enable_appchooser = xyes; then - fi - AM_CONDITIONAL([BUILD_APPCHOOSER],[test "$enable_appchooser" = "yes"]) - -+AC_ARG_ENABLE(lockdown, -+ [AS_HELP_STRING([--enable-lockdown],[Build lockdown portal.])], -+ enable_lockdown=$enableval, enable_lockdown=yes) -+if test x$enable_lockdown = xyes; then -+ AC_DEFINE([BUILD_LOCKDOWN], [1], [Define to enable lockdown portal]) -+fi -+AM_CONDITIONAL([BUILD_LOCKDOWN],[test "$enable_lockdown" = "yes"]) -+ - PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.5 glib-2.0 >= 2.44 gio-unix-2.0 gtk+-3.0 >= 3.14 gtk+-unix-print-3.0]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -diff --git a/data/Makefile.am.inc b/data/Makefile.am.inc -index 81e1715..a846e64 100644 ---- a/data/Makefile.am.inc -+++ b/data/Makefile.am.inc -@@ -23,6 +23,10 @@ if BUILD_APPCHOOSER - appchooser_iface = org.freedesktop.impl.portal.AppChooser; - endif - -+if BUILD_LOCKDOWN -+lockdown_iface = org.freedesktop.impl.portal.Lockdown; -+endif -+ - %.portal: data/%.portal.in config.log - $(AM_V_GEN) $(SED) -e "s|\@wallpaper_iface\@|$(wallpaper_iface)|" \ - -e "s|\@screenshot_iface\@|$(screenshot_iface)|" \ -@@ -31,6 +35,7 @@ endif - -e "s|\@background_iface\@|$(background_iface)|" \ - -e "s|\@settings_iface\@|$(settings_iface)|" \ - -e "s|\@appchooser_iface\@|$(appchooser_iface)|" \ -+ -e "s|\@lockdown_iface\@|$(lockdown_iface)|" \ - $< > $@ - - portaldir = $(datadir)/xdg-desktop-portal/portals -diff --git a/data/gtk.portal.in b/data/gtk.portal.in -index 4eb10ed..c235e52 100644 ---- a/data/gtk.portal.in -+++ b/data/gtk.portal.in -@@ -1,4 +1,4 @@ - [portal] - DBusName=org.freedesktop.impl.portal.desktop.gtk --Interfaces=org.freedesktop.impl.portal.FileChooser;@appchooser_iface@org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@org.freedesktop.impl.portal.Lockdown;@background_iface@@settings_iface@@wallpaper_iface@ -+Interfaces=org.freedesktop.impl.portal.FileChooser;@appchooser_iface@org.freedesktop.impl.portal.Print;@screenshot_iface@org.freedesktop.impl.portal.Notification;org.freedesktop.impl.portal.Inhibit;org.freedesktop.impl.portal.Access;org.freedesktop.impl.portal.Account;org.freedesktop.impl.portal.Email;@screencast_iface@@remotedesktop_iface@@lockdown_iface@@background_iface@@settings_iface@@wallpaper_iface@ - UseIn=gnome -diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc -index 408d81d..097ebe7 100644 ---- a/src/Makefile.am.inc -+++ b/src/Makefile.am.inc -@@ -39,6 +39,10 @@ if BUILD_APPCHOOSER - APPCHOOSER_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.AppChooser.xml - endif - -+if BUILD_LOCKDOWN -+ LOCKDOWN_IFACE=$(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Lockdown.xml -+endif -+ - $(dbus_built_sources): src/Makefile.am.inc - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.freedesktop.impl.portal. \ -@@ -54,7 +58,6 @@ $(dbus_built_sources): src/Makefile.am.inc - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Access.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Account.xml \ - $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Email.xml \ -- $(DESKTOP_PORTAL_INTERFACES_DIR)/org.freedesktop.impl.portal.Lockdown.xml \ - $(WALLPAPER_IFACE) \ - $(SCREENSHOT_IFACE) \ - $(SCREENCAST_IFACE) \ -@@ -62,6 +65,7 @@ $(dbus_built_sources): src/Makefile.am.inc - $(BACKGROUND_IFACE) \ - $(SETTINGS_IFACE) \ - $(APPCHOOSER_IFACE) \ -+ $(LOCKDOWN_IFACE) \ - $(NULL) - - shell_built_sources = src/shell-dbus.c src/shell-dbus.h -@@ -140,8 +144,6 @@ xdg_desktop_portal_gtk_SOURCES = \ - src/gtkbackports.c \ - src/externalwindow.h \ - src/externalwindow.c \ -- src/lockdown.c \ -- src/lockdown.h \ - $(NULL) - - if BUILD_WALLPAPER -@@ -224,6 +226,13 @@ xdg_desktop_portal_gtk_SOURCES += \ - $(NULL) - endif - -+if BUILD_LOCKDOWN -+xdg_desktop_portal_gtk_SOURCES += \ -+ src/lockdown.c \ -+ src/lockdown.h \ -+ $(NULL) -+endif -+ - nodist_xdg_desktop_portal_gtk_SOURCES = \ - src/resources.c \ - $(dbus_built_sources) \ -diff --git a/src/xdg-desktop-portal-gtk.c b/src/xdg-desktop-portal-gtk.c -index 4cc7c76..f8f6757 100644 ---- a/src/xdg-desktop-portal-gtk.c -+++ b/src/xdg-desktop-portal-gtk.c -@@ -64,7 +64,9 @@ - #include "remotedesktop.h" - #endif - -+#ifdef BUILD_LOCKDOWN - #include "lockdown.h" -+#endif - - #ifdef BUILD_BACKGROUND - #include "background.h" -@@ -199,11 +201,13 @@ on_bus_acquired (GDBusConnection *connection, - } - #endif - -+#ifdef BUILD_LOCKDOWN - if (!lockdown_init (connection, &error)) - { - g_warning ("error: %s\n", error->message); - g_clear_error (&error); - } -+#endif - - #ifdef BUILD_BACKGROUND - if (!background_init (connection, &error))

1 0

ports/contrib (3.6): xdg-desktop-portal: 1.14.0 -> 1.14.1
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 0dd575c1484055a9500b8accad941d853704e273 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Mar 19 13:31:24 2022 +0100 xdg-desktop-portal: 1.14.0 -> 1.14.1 diff --git a/xdg-desktop-portal/.signature b/xdg-desktop-portal/.signature index eabf7e3dc..5c66b1c23 100644 --- a/xdg-desktop-portal/.signature +++ b/xdg-desktop-portal/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33Zn8Gqj+lp73mR3KzitIeHqDsqeaNc0+Ou1FY/UWDw0V1b5Mj8UOE4UVxmh6RXdDEfz/jvU+QxGb8GRr0qBqQ0= -SHA256 (Pkgfile) = 9f2e0d1f97ad0f7dcb5faab6fa6a34662581b5dfd1443b71652c8e5103f99308 +RWSagIOpLGJF33NyKMBrIJfFV/ZeG2euSLRXwg7v0SL62zu6uKN5JjPoQshZpTb5KjMjMmarY7PsXyfJqOwu87pSCV2amp+1tQg= +SHA256 (Pkgfile) = ab4c106488aed8052fa0048a3c551556dd533031c5bc08afce1c399b83cf32e2 SHA256 (.footprint) = 43b629814da450243ca56fa70094f65c823a3256a5092715d740964469b117c3 -SHA256 (xdg-desktop-portal-1.14.0.tar.gz) = 864483be2ff0c8ff0eac04d6c4b9d6e8a6c711e5d1469e2baed9e4f17f11e68e -SHA256 (fix-build-without-systemd.patch) = ae0fa67a1a6f37f0b764f41684cfa6474d84a2be6fbae3033b4eaed55ab6bdbd +SHA256 (xdg-desktop-portal-1.14.1.tar.gz) = e7db0cfab023ccc6087cdc479dd1ffe29405feeca68d991c2c69c3bcc4893b32 diff --git a/xdg-desktop-portal/Pkgfile b/xdg-desktop-portal/Pkgfile index f98fc90b9..e20132d55 100644 --- a/xdg-desktop-portal/Pkgfile +++ b/xdg-desktop-portal/Pkgfile @@ -5,10 +5,9 @@ # Optional: geoclue pipewire name=xdg-desktop-portal -version=1.14.0 +version=1.14.1 release=1 -source=(https://github.com/flatpak/xdg-desktop-portal/archive/$version/$name-$version.tar.gz - fix-build-without-systemd.patch) +source=(https://github.com/flatpak/xdg-desktop-portal/archive/$version/$name-$version.tar.gz) build() { cd $name-$version @@ -16,8 +15,6 @@ build() { prt-get isinst pipewire && PKGMK_XDGDP+=' --enable-pipewire' || PKGMK_XDGDP+=' --disable-pipewire' prt-get isinst geoclue && PKGMK_XDGDP+=' --enable-geoclue' || PKGMK_XDGDP+=' --disable-geoclue' - patch -Np1 -i $SRC/fix-build-without-systemd.patch - NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr $PKGMK_XDGDP \ --libexecdir=/usr/lib \ diff --git a/xdg-desktop-portal/REPO b/xdg-desktop-portal/REPO deleted file mode 100644 index ae8a6a91d..000000000 --- a/xdg-desktop-portal/REPO +++ /dev/null @@ -1,3 +0,0 @@ -f:1b102c0ca6f2473406d087fb6d3a3cf8:.signature -f:e77bc0dab76408d219ed364e0e7f2308:.footprint -f:6b9c1cb79cc73b025c187999a3290a4f:Pkgfile diff --git a/xdg-desktop-portal/fix-build-without-systemd.patch b/xdg-desktop-portal/fix-build-without-systemd.patch deleted file mode 100644 index e073aeadb..000000000 --- a/xdg-desktop-portal/fix-build-without-systemd.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7deeb2f7f748afd62b7ed23f0ca623136a5c5b78 Mon Sep 17 00:00:00 2001 -From: Phaedrus Leeds <mwleeds(a)protonmail.com> -Date: Fri, 18 Mar 2022 09:20:13 -0700 -Subject: [PATCH] Fix building without libsystemd - ---- - src/xdp-utils.c | 2 ++ - src/xdp-utils.h | 2 ++ - tests/test-xdp-utils.c | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/src/xdp-utils.c b/src/xdp-utils.c -index 5017af92..1de5a4ff 100644 ---- a/src/xdp-utils.c -+++ b/src/xdp-utils.c -@@ -144,6 +144,7 @@ xdp_app_info_new (XdpAppInfoKind kind) - return app_info; - } - -+#ifdef HAVE_LIBSYSTEMD - char * - _xdp_parse_app_id_from_unit_name (const char *unit) - { -@@ -183,6 +184,7 @@ _xdp_parse_app_id_from_unit_name (const char *unit) - - return g_steal_pointer (&app_id); - } -+#endif /* HAVE_LIBSYSTEMD */ - - void - set_appid_from_pid (XdpAppInfo *app_info, pid_t pid) -diff --git a/src/xdp-utils.h b/src/xdp-utils.h -index b0968beb..9861e739 100644 ---- a/src/xdp-utils.h -+++ b/src/xdp-utils.h -@@ -199,7 +199,9 @@ gboolean xdp_has_path_prefix (const char *str, - /* exposed for the benefit of tests */ - int _xdp_parse_cgroup_file (FILE *f, - gboolean *is_snap); -+#ifdef HAVE_LIBSYSTEMD - char *_xdp_parse_app_id_from_unit_name (const char *unit); -+#endif - - #if !GLIB_CHECK_VERSION (2, 58, 0) - static inline gboolean -diff --git a/tests/test-xdp-utils.c b/tests/test-xdp-utils.c -index 8a30b515..d0bc363c 100644 ---- a/tests/test-xdp-utils.c -+++ b/tests/test-xdp-utils.c -@@ -127,6 +127,7 @@ test_alternate_doc_path (void) - xdp_set_documents_mountpoint (NULL); - } - -+#ifdef HAVE_LIBSYSTEMD - static void - test_app_id_via_systemd_unit (void) - { -@@ -166,6 +167,7 @@ test_app_id_via_systemd_unit (void) - g_assert_cmpstr (app_id, ==, "org.gnome.Terminal"); - g_clear_pointer (&app_id, g_free); - } -+#endif /* HAVE_LIBSYSTEMD */ - - int main (int argc, char **argv) - {

1 0

ports/contrib (3.6): dav1d: 0.9.2 -> 1.0.0
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 46bf3690ff449fe540fe5160766c2b63ab4e87de Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Mar 19 13:29:48 2022 +0100 dav1d: 0.9.2 -> 1.0.0 diff --git a/dav1d/.footprint b/dav1d/.footprint index ad723c86d..abd6761fe 100644 --- a/dav1d/.footprint +++ b/dav1d/.footprint @@ -10,8 +10,8 @@ drwxr-xr-x root/root usr/include/dav1d/ -rw-r--r-- root/root usr/include/dav1d/picture.h -rw-r--r-- root/root usr/include/dav1d/version.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libdav1d.so -> libdav1d.so.5 -lrwxrwxrwx root/root usr/lib/libdav1d.so.5 -> libdav1d.so.5.1.1 --rwxr-xr-x root/root usr/lib/libdav1d.so.5.1.1 +lrwxrwxrwx root/root usr/lib/libdav1d.so -> libdav1d.so.6 +lrwxrwxrwx root/root usr/lib/libdav1d.so.6 -> libdav1d.so.6.6.0 +-rwxr-xr-x root/root usr/lib/libdav1d.so.6.6.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dav1d.pc diff --git a/dav1d/.signature b/dav1d/.signature index fdee30a31..4ee19695d 100644 --- a/dav1d/.signature +++ b/dav1d/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF365etdmlPEzM6aYyAISrZXQLxFHciyS7e9H+rAfFdCjBer+FQw4Ir6LLSXQN1LZjzIwgfftnezvMvuCulcNHuw4= -SHA256 (Pkgfile) = b90b283c3136cf35226bb43789d5e3dcb5933ab8ae20f6c783bddb1dbdbca687 -SHA256 (.footprint) = 4e511dea4ac95e55c6f16fbd8c25315349e0e54342746b2c66e56d8521b213a4 -SHA256 (dav1d-0.9.2.tar.gz) = 59a5fc9cc5d8ea780ad71ede6d589ed33fb5179d87780dcf80a00ee854952935 +RWSagIOpLGJF34Y8w3QHQ+oQZYpU9GVqpamxfXzkyn0Qd05bp084emz3J3LMXfwUmFYEluOFt1vbkTY0ziDiN3CDGwtydhAyHAA= +SHA256 (Pkgfile) = 6e20830e236ea1e7c05051e9a1e73e6c83fe8a029ef84405a7af74ec4cae9b1b +SHA256 (.footprint) = fa2510d824b9e02af1cb8bbe2af491bf854bd3d8ef415ce7f071ce89d7c77430 +SHA256 (dav1d-1.0.0.tar.gz) = 047b8229511a82b5718a1d34c86c067b078efd02f602986d2ed09b23182ec136 diff --git a/dav1d/Pkgfile b/dav1d/Pkgfile index 8674d4000..610a41ca8 100644 --- a/dav1d/Pkgfile +++ b/dav1d/Pkgfile @@ -4,7 +4,7 @@ # Depends on: meson ninja vulkan-loader name=dav1d -version=0.9.2 +version=1.0.0 release=1 source=(https://code.videolan.org/videolan/dav1d/-/archive/$version/$name-$…

1 0

ports/contrib (3.6): gtk4: 4.6.1 -> 4.6.2
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 3055862214e607a558c362d0b68c7b71a1a46609 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Mar 19 13:29:42 2022 +0100 gtk4: 4.6.1 -> 4.6.2 diff --git a/gtk4/.footprint b/gtk4/.footprint index a6a5d978a..cf21c5bf9 100644 --- a/gtk4/.footprint +++ b/gtk4/.footprint @@ -386,8 +386,8 @@ drwxr-xr-x root/root usr/lib/gtk-4.0/4.0.0/printbackends/ -rwxr-xr-x root/root usr/lib/gtk-4.0/4.0.0/printbackends/libprintbackend-file.so -rwxr-xr-x root/root usr/lib/gtk-4.0/4.0.0/printbackends/libprintbackend-lpr.so lrwxrwxrwx root/root usr/lib/libgtk-4.so -> libgtk-4.so.1 -lrwxrwxrwx root/root usr/lib/libgtk-4.so.1 -> libgtk-4.so.1.600.1 --rwxr-xr-x root/root usr/lib/libgtk-4.so.1.600.1 +lrwxrwxrwx root/root usr/lib/libgtk-4.so.1 -> libgtk-4.so.1.600.2 +-rwxr-xr-x root/root usr/lib/libgtk-4.so.1.600.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gtk4-broadway.pc -rw-r--r-- root/root usr/lib/pkgconfig/gtk4-unix-print.pc @@ -411,9 +411,21 @@ drwxr-xr-x root/root usr/share/glib-2.0/schemas/ -rw-r--r-- root/root usr/share/glib-2.0/schemas/org.gtk.gtk4.Settings.FileChooser.gschema.xml drwxr-xr-x root/root usr/share/gtk-4.0/ drwxr-xr-x root/root usr/share/gtk-4.0/emoji/ +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/da.gresource -rw-r--r-- root/root usr/share/gtk-4.0/emoji/de.gresource -rw-r--r-- root/root usr/share/gtk-4.0/emoji/es.gresource -rw-r--r-- root/root usr/share/gtk-4.0/emoji/fr.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/hu.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/it.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/ko.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/lt.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/ms.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/nl.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/pl.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/pt.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/ru.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/sv.gresource +-rw-r--r-- root/root usr/share/gtk-4.0/emoji/uk.gresource -rw-r--r-- root/root usr/share/gtk-4.0/emoji/zh.gresource -rw-r--r-- root/root usr/share/gtk-4.0/gtk4builder.rng drwxr-xr-x root/root usr/share/gtk-4.0/valgrind/ diff --git a/gtk4/.signature b/gtk4/.signature index f2993fbd5..23e9fe99e 100644 --- a/gtk4/.signature +++ b/gtk4/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35drCFD0rGzS9Eo/3MD0LAGUlBy94BRTasHCZkSV8VKgTk3ftiDggOz/nWEDtpJLyyIWiTWE/oRVI2tpsnGE1wU= -SHA256 (Pkgfile) = 283ec3824366389f7d6297db268d84bcd18221b98f86a7517abc633ec13e2cff -SHA256 (.footprint) = 229f5619d6c1439af54ce9e64b60abd55684ed2e68e309210cd78f9babc3b037 -SHA256 (gtk-4.6.1.tar.bz2) = 6de3d177c6061e98f316af2e16c0d1031d12e9bc12b6f5cbba896d62644208fa +RWSagIOpLGJF39FAYKLvNxggxcAoZoxIBqwWWSulHz4bjctkmFbNTIu51Myv2e2gvLQyiRIbbROGC3rCD0+5lsXPp1IGkhVqYQM= +SHA256 (Pkgfile) = 4372df7de0c06ba72692d25ea0c08e0ac5c34d5a26964841e369e1e11ceac754 +SHA256 (.footprint) = 7020071d85456091c5e31848d279d58fcfd1cd9893d8cb75f54fb3912d60124d +SHA256 (gtk-4.6.2.tar.bz2) = fa2af70198687a71386aa21d29676e8c63453799f4a9c8f8d4c750cf496bca61 diff --git a/gtk4/Pkgfile b/gtk4/Pkgfile index ede90659b..edaabfd9e 100644 --- a/gtk4/Pkgfile +++ b/gtk4/Pkgfile @@ -5,7 +5,7 @@ # Optional: colord cups vulkan wayland name=gtk4 -version=4.6.1 +version=4.6.2 release=1 source=(https://gitlab.gnome.org/GNOME/gtk/-/archive/$version/gtk-$version.…

1 0

ports/contrib (3.6): libadwaita: 1.0.2 -> 1.1.0
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 61e710076527df40938da7bafd0a36c8c2e52e17 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Mar 19 13:10:39 2022 +0100 libadwaita: 1.0.2 -> 1.1.0 diff --git a/libadwaita/.signature b/libadwaita/.signature index fb2fb0566..a393383ee 100644 --- a/libadwaita/.signature +++ b/libadwaita/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30LyEiIt7vsfYdfSmKbU4t7uZ0p2XF3xmaWd7CAK1egaPAEF8RGBX0iAcfhccnfOQ6DVmkbRSSxE31DZuzXU1As= -SHA256 (Pkgfile) = 5258b65ef4d894c1fe30c324d08abb08b59156f35e130bb5f5e10973a501b10e +RWSagIOpLGJF3/oQ6QAMySpJQcLHLhN0dDfxma0jaekaYwd21U98ji/u1t1RCTMnri7Kx/BanCdc5jpW/O81B+NwooHrP9N4GQs= +SHA256 (Pkgfile) = 0f7a16344ccb89eb961cad1529ae981f4ae6f81c82f26e837a52247927546932 SHA256 (.footprint) = 1be18976ff917f81a1f14306d80b77f469d474de6a1b37eff30d46a17fecadd3 -SHA256 (libadwaita-1.0.2.tar.bz2) = dba6e995460c06de77d6c50224f6f9c4b629b316c105097f38e79982e39fbcef +SHA256 (libadwaita-1.1.0.tar.bz2) = 1fdd2d3ed7e738029f6f984e54b0ef21136633daa842f4caeeb60d4de56e0abe diff --git a/libadwaita/Pkgfile b/libadwaita/Pkgfile index 20e87e43c..05b8c4dd7 100644 --- a/libadwaita/Pkgfile +++ b/libadwaita/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk4 libsass sassc wayland-protocols name=libadwaita -version=1.0.2 +version=1.1.0 release=1 source=(https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$version/libadw…

1 0

ports/contrib (3.6): libhandy: 1.5.0 -> 1.6.1
by crux＠crux.nu 19 Mar '22

19 Mar '22

commit 1b3bfab47d4c2638e3c8eedf5530392f5b8a29ee Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Mar 19 12:06:35 2022 +0100 libhandy: 1.5.0 -> 1.6.1 diff --git a/libhandy/.footprint b/libhandy/.footprint index 3315194d1..47cdd6dce 100644 --- a/libhandy/.footprint +++ b/libhandy/.footprint @@ -6,14 +6,14 @@ drwxr-xr-x root/root usr/include/libhandy-1/ -rw-r--r-- root/root usr/include/libhandy-1/hdy-animation.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-application-window.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-avatar.h --rw-r--r-- root/root usr/include/libhandy-1/hdy-carousel.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-carousel-indicator-dots.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-carousel-indicator-lines.h +-rw-r--r-- root/root usr/include/libhandy-1/hdy-carousel.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-clamp.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-combo-row.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-deck.h --rw-r--r-- root/root usr/include/libhandy-1/hdy-enums.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-enum-value-object.h +-rw-r--r-- root/root usr/include/libhandy-1/hdy-enums.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-expander-row.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-flap.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-header-bar.h @@ -30,9 +30,9 @@ drwxr-xr-x root/root usr/include/libhandy-1/ -rw-r--r-- root/root usr/include/libhandy-1/hdy-squeezer.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-status-page.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-style-manager.h --rw-r--r-- root/root usr/include/libhandy-1/hdy-swipeable.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-swipe-group.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-swipe-tracker.h +-rw-r--r-- root/root usr/include/libhandy-1/hdy-swipeable.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-tab-bar.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-tab-view.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-title-bar.h @@ -40,15 +40,15 @@ drwxr-xr-x root/root usr/include/libhandy-1/ -rw-r--r-- root/root usr/include/libhandy-1/hdy-value-object.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-version.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-view-switcher-bar.h --rw-r--r-- root/root usr/include/libhandy-1/hdy-view-switcher.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-view-switcher-title.h --rw-r--r-- root/root usr/include/libhandy-1/hdy-window.h +-rw-r--r-- root/root usr/include/libhandy-1/hdy-view-switcher.h -rw-r--r-- root/root usr/include/libhandy-1/hdy-window-handle.h +-rw-r--r-- root/root usr/include/libhandy-1/hdy-window.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Handy-1.typelib --rwxr-xr-x root/root usr/lib/libhandy-1.so.0 lrwxrwxrwx root/root usr/lib/libhandy-1.so -> libhandy-1.so.0 +-rwxr-xr-x root/root usr/lib/libhandy-1.so.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libhandy-1.pc drwxr-xr-x root/root usr/share/ diff --git a/libhandy/.signature b/libhandy/.signature index 45216c9ff..9f85b39a5 100644 --- a/libhandy/.signature +++ b/libhandy/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35XY+FV84J8macbBTPyEdCyvviWWVMHRKZxI4eDRKyY3h8nCI1guWYqZKXcl+lPOjNor19SUeLDSoOAWbBS0Wws= -SHA256 (Pkgfile) = 46d7731ea184573601ab3572b0d03639de025c56bf76a4edf1f40a0b54c226e5 -SHA256 (.footprint) = 28e0ed1406b119600e99511aa1ede34237ab6f00c8dd1107ad01fa8ad23c02eb -SHA256 (libhandy-1.5.0.tar.bz2) = ca2e6fe95c214590f48b64db88d72526cefa23f67aacf5ebdc63dfbd25bff92b +RWSagIOpLGJF32o0qQhrglj5bXCHv8oB8ug5TGRH7xMoDYGUk0maZa1oLiWYodlDO04c7uzriZN38zau1cHr/kBwVs9fYwa0rAA= +SHA256 (Pkgfile) = 95dd50df6e36b2b08ec6ac42f2fa3236cf0b70422c3ec4d48f5c868ac66c2983 +SHA256 (.footprint) = 089f9a4fa02b1d195e660c5208fe3bc3169a07d978a60cddbccdc22f06107302 +SHA256 (libhandy-1.6.1.tar.bz2) = c514ba3f953065b44b37e971dc179b47735db97af48fecb94b2a7d5148dffa35 diff --git a/libhandy/Pkgfile b/libhandy/Pkgfile index b55cb21c7..bc778b0bd 100644 --- a/libhandy/Pkgfile +++ b/libhandy/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk3 vala name=libhandy -version=1.5.0 +version=1.6.1 release=1 source=(https://gitlab.gnome.org/GNOME/libhandy/-/archive/$version/$name-$v…

1 0