diff options
| -rw-r--r-- | metadata/md5-cache/net-misc/warpinator-1.8.3 (renamed from metadata/md5-cache/net-misc/warpinator-1.7.0-r2) | 6 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | net-misc/warpinator/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/warpinator/files/warpinator-dbus-fallback.patch | 69 | ||||
| -rw-r--r-- | net-misc/warpinator/warpinator-1.8.3.ebuild (renamed from net-misc/warpinator/warpinator-1.7.0-r2.ebuild) | 3 |
5 files changed, 76 insertions, 6 deletions
diff --git a/metadata/md5-cache/net-misc/warpinator-1.7.0-r2 b/metadata/md5-cache/net-misc/warpinator-1.8.3 index 16101235..df95030d 100644 --- a/metadata/md5-cache/net-misc/warpinator-1.7.0-r2 +++ b/metadata/md5-cache/net-misc/warpinator-1.8.3 @@ -1,4 +1,4 @@ -BDEPEND=>=dev-util/meson-0.45.0 >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array +BDEPEND=>=dev-build/meson-0.45.0 >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array DEFINED_PHASES=compile configure install postinst postrm preinst test DEPEND=dev-libs/gobject-introspection dev-python/cryptography dev-python/ifaddr dev-python/netaddr dev-python/netifaces dev-python/pynacl dev-python/setproctitle >=dev-python/python3-xapp-1.6.0 DESCRIPTION=Share files across the LAN @@ -10,6 +10,6 @@ KEYWORDS=~amd64 LICENSE=GPL-3 RDEPEND=dev-libs/gobject-introspection dev-python/cryptography dev-python/ifaddr dev-python/netaddr dev-python/netifaces dev-python/pynacl dev-python/setproctitle >=dev-python/python3-xapp-1.6.0 SLOT=0 -SRC_URI=https://github.com/linuxmint/warpinator/archive/refs/tags/master.lmde6.tar.gz -> warpinator-1.7.0.tar.gz +SRC_URI=https://github.com/linuxmint/warpinator/archive/refs/tags/master.lmde6.tar.gz -> warpinator-1.8.3.tar.gz _eclasses_=gnome2-utils b0183db3b2e07b18f3b77bffec72e116 meson 0e160eeba59c15ec333bd675cecdfdc9 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 python-utils-r1 042f4cc53680245bf99a84669b94155a toolchain-funcs e56c7649b804f051623c8bc1a1c44084 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3 -_md5_=42ce60ee42bac6cfb64e462d5614d721 +_md5_=2c02a57d107ed28e26b313326923a2c7 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index bb49698b..1013ebcb 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -39,7 +39,7 @@ media-sound/strawberry 1.0.23-r10: Modern music player and library organizer bas media-tv/sopcast 3.2.6-r4: SopCast free P2P Internet TV binary media-video/guvcview 2.0.6-r10: Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices net-dialup/rp-pppoe 4.0-r5: A user-mode PPPoE client and server suite for Linux -net-misc/warpinator 1.7.0-r2: Share files across the LAN +net-misc/warpinator 1.8.3: Share files across the LAN net-print/lexmark-upd-ppd 1.0.0.20210304-r1: Lexmark universal printer driver PPDs net-wireless/broadcom-sta 6.30.223.271-r5: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver sys-apps/baselayout 2.13-r6: Filesystem baselayout and init scripts diff --git a/net-misc/warpinator/Manifest b/net-misc/warpinator/Manifest index e23fe847..969e2214 100644 --- a/net-misc/warpinator/Manifest +++ b/net-misc/warpinator/Manifest @@ -1 +1 @@ -DIST warpinator-1.7.0.tar.gz 48138258 BLAKE2B 61009cbb71849831a8110b48de9e971ae59ae5cc573da658d6c8cd1deba11a23f0d5abaf05985e2699273e0c03dfe0cc19e69c4984935355370eeb4de0655484 SHA512 1fd43a6dc857253fb5c1f82b6f4fdf6a03ad38c18f679a628f7a97ed782779982abeb673c9163876f901e6e556d6309ce49502f07e72b7a1dcb6ef88e284b7fd +DIST warpinator-1.8.3.tar.gz 48156643 BLAKE2B 69020a866adb8b8da361cb7d2b6bf9a8b86913c1a1799078038d6340f18ed7eb490e0d920ddcf9c1f837cfe52c21156ec2fdadc3f24ce79ec416824672cb9943 SHA512 914194f02849c3a9169bc208cc4c50f287f93575a4bd25d8321a884036898a22d19063d6d5877e93241b2cf7ccb7c94ace685b27e915aa4b391a038e0e03e856 diff --git a/net-misc/warpinator/files/warpinator-dbus-fallback.patch b/net-misc/warpinator/files/warpinator-dbus-fallback.patch new file mode 100644 index 00000000..f4f4f094 --- /dev/null +++ b/net-misc/warpinator/files/warpinator-dbus-fallback.patch @@ -0,0 +1,69 @@ +diff -Nur a/src/util.py b/src/util.py +--- a/src/util.py 2024-01-04 17:03:52.000000000 +0000 ++++ b/src/util.py 2024-01-14 03:01:42.318649562 +0000 +@@ -304,7 +304,7 @@ + # file manager might answer, if more than one is installed: + # https://github.com/linuxmint/nemo/commit/c9cbba6a2f08be69bf02ffcaf9b0faf4a03ace8b + +- bus = Gio.Application.get_default().get_dbus_connection() ++ bus = Gio.Application.get_default().get_dbus_connection() # this is likely to fail + + if filename is not None: + method = "ShowItems" +@@ -316,30 +316,32 @@ + file = Gio.File.new_for_path(abs_path) + startup_id = str(os.getpid()) + +- try: +- bus.call_sync("org.freedesktop.FileManager1", +- "/org/freedesktop/FileManager1", +- "org.freedesktop.FileManager1", +- method, +- GLib.Variant("(ass)", +- ([file.get_uri()], startup_id)), +- None, +- Gio.DBusCallFlags.NONE, +- 1000, +- None) +- logging.debug("Opening save folder using dbus") +- return +- except GLib.Error as e: +- logging.debug("Could not use dbus interface to launch file manager: %s" % e.message) +- +- # If dbus doesn't work, use xdg mimetype handlers. +- app = Gio.AppInfo.get_default_for_type("inode/directory", True) +- +- try: +- logging.debug("Opening save folder using Gio (mimetype)") +- Gio.AppInfo.launch_default_for_uri(prefs.get_save_uri(), None) +- except GLib.Error as e: +- logging.critical("Could not open received files location: %s" % e.message) ++ if bus is not None: ++ try: ++ bus.call_sync("org.freedesktop.FileManager1", ++ "/org/freedesktop/FileManager1", ++ "org.freedesktop.FileManager1", ++ method, ++ GLib.Variant("(ass)", ++ ([file.get_uri()], startup_id)), ++ None, ++ Gio.DBusCallFlags.NONE, ++ 1000, ++ None) ++ logging.debug("Opening save folder using dbus") ++ return ++ except GLib.Error as e: ++ logging.debug("Could not use dbus interface to launch file manager: %s" % e.message) ++ ++ else: ++ # If dbus doesn't work, use xdg mimetype handlers. ++ app = Gio.AppInfo.get_default_for_type("inode/directory", True) ++ ++ try: ++ logging.debug("Opening save folder using Gio (mimetype)") ++ Gio.AppInfo.launch_default_for_uri(prefs.get_save_uri(), None) ++ except GLib.Error as e: ++ logging.critical("Could not open received files location: %s" % e.message) + + def verify_save_folder(): + # Forbidden locations for incoming files, relative to home. diff --git a/net-misc/warpinator/warpinator-1.7.0-r2.ebuild b/net-misc/warpinator/warpinator-1.8.3.ebuild index d84ecffa..23eeb6d6 100644 --- a/net-misc/warpinator/warpinator-1.7.0-r2.ebuild +++ b/net-misc/warpinator/warpinator-1.8.3.ebuild @@ -25,7 +25,7 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - >=dev-util/meson-0.45.0 + >=dev-build/meson-0.45.0 " S="${WORKDIR}/${PN}-master.lmde6" @@ -33,6 +33,7 @@ S="${WORKDIR}/${PN}-master.lmde6" PATCHES=( "${FILESDIR}/${PN}-bundled-grpcio-cython3.patch" "${FILESDIR}/${PN}-system-paths.patch" + "${FILESDIR}/${PN}-dbus-fallback.patch" ) src_configure() { |