Received: by mail.netbsd.org (Postfix, from userid 605) id 821F185152; Tue, 15 May 2018 22:25:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EC72984D21 for ; Tue, 15 May 2018 22:25:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id e9aohmZI7lAK for ; Tue, 15 May 2018 22:25:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6C0F085154 for ; Tue, 15 May 2018 22:25:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5EE5DFBEC; Tue, 15 May 2018 22:25:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1526423131153750" MIME-Version: 1.0 Date: Tue, 15 May 2018 22:25:31 +0000 From: "Youri Mouton" Subject: CVS commit: pkgsrc/sysutils/xfce4-thunar To: pkgsrc-changes@NetBSD.org Reply-To: youri@netbsd.org X-Mailer: log_accum Message-Id: <20180515222531.5EE5DFBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1526423131153750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: youri Date: Tue May 15 22:25:31 UTC 2018 Modified Files: pkgsrc/sysutils/xfce4-thunar: Makefile PLIST buildlink3.mk distinfo pkgsrc/sysutils/xfce4-thunar/patches: patch-ThunarBulkRename.in patch-ac patch-org.xfce.FileManager.service.in patch-org.xfce.Thunar.service.in patch-thunar_Makefile.in Log Message: Update: 1.7.2 ===== - Thunar confuses files (bug #12435) - Use display_name instead of basename to display filenames (bug #13532) - Avoid unexpected overshoot fade on icon view - Make it possible to assign accelerators to custom actions - Killing thunar as well kills all launched sub-processes (bug #14277) - Thunar User Configurable Actions do not work for remote locations (bug #7652), patch from (bug#7305) - replaced links to "http://thunar.xfce.org/" with "https://docs.xfce.org/xfce/thunar/start" - SIGSEGV when thumbnailer is under heavy load after opening many tabs (bug #13756) - bumped dependency to xfce4-panel to API v.2 / 4.12.0 - Fixed creation of .desktop file when dropping URL into folder (bug #14239) - Restoring non-empty folders leaves copy in Trash (bug #13535) - Fixed an uncritical "use after free" - Translation updates: Albanian, Catalan, Chinese (China), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, English (Australia),Finnish, French, Galician, German, Greek, Hebrew, Indonesian, Italian, Japanese, Kazakh, Latvian, Lithuanian, Malay, Norwegian Bokmål, Persian (Iran), Polish, Portuguese, Portuguese (Brazil), Russian, Serbian, Slovak, Spanish, Swedish, Turkish, Ukrainian 1.7.1 ===== - Do not translate "Trash" files and folders (Bug #14211) - Regression: Context menu misplaced (bug #14216) - Crash in thunar_file_is_gfile_ancestor (bug #14202) - Add a systemd user unit for the two D-Bus session services (bug #12236) - Add setting to show file sizes in bytes (bug #11690) fix for statusbar - Add setting to show file sizes in bytes (bug #11690) fix for overwrite confirmation dialog - Add setting to show file size in bytes in detailed view (Bug #11690) - Show exact size in bytes in directory properties dialog (bug #12858) - Thunar's "open with" custom command doesn't escape the path (bug #10883) - Fix potential buffer overflow (bug #12444) - Thunar fails to scan for file templates if the Templates directory is a symbolic link ( bug #12032 ) - missing codegen for "make dist" in thunar-tpa (bug #14190) - Ported thunar-tpa to gdbus (bug #14038) - fixed bug - no bool argument available for dbus signal "TrashChanged" - Bump gtk to 3.22 - Prevent crash after updating thunar if old thunar deamon is still running - Only show additional "real_name" of user in detailed_view if it is different from "name" (bug #13648) - Change inappropriate word "Sentence" in upper-/lowercase renamer (bug #9483) - Skip functions not meant to be introspectable (Bug #14045) - Fix for failing GObject introspection build. Followup of (Bug #14070) - thunarx-provider-module.h missing inside tar.bz2 file created by "make dist" (Bug #14070) - Fix crash on unavailable file move copy (Bug #14056) - Provide missing g-i annotations (Bug #14045) - Use e.g. instead of i.e. (Bug #14035) - Translation updates:Arabic, Bulgarian, Catalan, Chinese (China), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, English (United Kingdom), Esperanto, Finnish, French, Galician, German, Hebrew, Japanese, Kazakh, Korean, Lithuanian, Malay, Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Spanish, Thai, Turkish, Ukrainian 1.7.0 ===== - GTK3 Port - Replace dbus-glib with GDBus - Improved Pathbar style for Location Selector - Bump thunarx to version 3 and replace GtkAction with ThunarxMenu and ThunarxMenuItem - GObject-Introspection support for thunarx-3 - Update thunarx documentation and fix its generation - Same bugfixes from 1.6.13 - Translation updates: Albanian, Amharic, Arabic, Asturian, Bangla, Basque, Belarusian, Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, English (Australia), English (United Kingdom), Esperanto, Estonian, Finnish, French, Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean, Latvian, Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan, Persian (Iran), Polish, Portuguese, Portuguese (Brazil), Punjabi, Romanian, Russian, Serbian, Slovak, Spanish, Swedish, Telugu, Thai, Turkish, Ukrainian, Urdu, Urdu (Pakistan), Uyghur, Vietnamese 1.6.14 ====== - Do not translate "Trash" files and folders (Bug #14211) - Crash in thunar_file_is_gfile_ancestor (bug #14202) - Fix potential buffer overflow (Bug #12444) - Fix crash on unavailable file move copy (Bug #14056) - Translation updates: Arabic, Belarusian, Catalan, English (United Kingdom), Finnish, Galician, Malay, Romanian, Serbian, Slovak, Thai 1.6.13 ====== - Handle cases when file watch is not supported (Bug #13881) - Missing Trash Translation String (Bug #13409) - Delete Thunar symlink on uninstall (Bug #13533) - Handle g_mem_is_system_malloc deprecation - Prefer local (file://) URIs than native ones (e.g. smb://) (Bug #13845) - Translation updates: Amharic, Arabic, Asturian, Bangla, Basque, Belarusian, Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, English (Australia), English (United Kingdom), Esperanto, Estonian, Finnish, French, Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean, Latvian, Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan, Persian, Polish, Portuguese, Portuguese (Brazil), Punjabi, Romanian, Russian, Serbian, Slovak, Spanish, Swedish, Telugu, Thai, Turkish, Ukrainian, Urdu, Urdu (Pakistan), Uyghur, Vietnamese 1.6.12 ====== - Fix deadlock in mutex causing Thunar to hang (Bug #13481) - Add support for Exif:ImageDescription and Exif:UserComment - Do not pass NULL to g_file_test - Bump libxfce4panel version for TPA plugin to 4.9.0 - Switch from XfcePanelImage to GtkImage - Fixed a compilation error with the newest dev panel API - Translation updates: Catalan, Dutch (Flemish), Galician, Korean, Lithuanian, Spanish, Thai To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 pkgsrc/sysutils/xfce4-thunar/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/xfce4-thunar/PLIST cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/xfce4-thunar/buildlink3.mk cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/xfce4-thunar/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in \ pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in \ pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xfce4-thunar/patches/patch-ac cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1526423131153750 Content-Disposition: inline Content-Length: 13971 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/xfce4-thunar/Makefile diff -u pkgsrc/sysutils/xfce4-thunar/Makefile:1.52 pkgsrc/sysutils/xfce4-thunar/Makefile:1.53 --- pkgsrc/sysutils/xfce4-thunar/Makefile:1.52 Mon Apr 16 14:33:56 2018 +++ pkgsrc/sysutils/xfce4-thunar/Makefile Tue May 15 22:25:31 2018 @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.52 2018/04/16 14:33:56 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2018/05/15 22:25:31 youri Exp $ -PKGREVISION= 3 .include "../../meta-pkgs/xfce4/Makefile.common" -VERSION= 1.6.11 +VERSION= 1.7.2 DISTNAME= Thunar-${VERSION} PKGNAME= xfce4-thunar-${VERSION} CATEGORIES= sysutils -MASTER_SITES= http://archive.xfce.org/src/xfce/thunar/1.6/ +MASTER_SITES= http://archive.xfce.org/src/xfce/thunar/1.7/ HOMEPAGE= http://docs.xfce.org/xfce/thunar/start COMMENT= Xfce file manager Index: pkgsrc/sysutils/xfce4-thunar/PLIST diff -u pkgsrc/sysutils/xfce4-thunar/PLIST:1.9 pkgsrc/sysutils/xfce4-thunar/PLIST:1.10 --- pkgsrc/sysutils/xfce4-thunar/PLIST:1.9 Sun Jun 18 21:40:45 2017 +++ pkgsrc/sysutils/xfce4-thunar/PLIST Tue May 15 22:25:31 2018 @@ -1,25 +1,29 @@ -@comment $NetBSD: PLIST,v 1.9 2017/06/18 21:40:45 youri Exp $ +@comment $NetBSD: PLIST,v 1.10 2018/05/15 22:25:31 youri Exp $ bin/thunar bin/thunar-settings -include/thunarx-2/thunarx/thunarx-config.h -include/thunarx-2/thunarx/thunarx-file-info.h -include/thunarx-2/thunarx/thunarx-menu-provider.h -include/thunarx-2/thunarx/thunarx-preferences-provider.h -include/thunarx-2/thunarx/thunarx-property-page-provider.h -include/thunarx-2/thunarx/thunarx-property-page.h -include/thunarx-2/thunarx/thunarx-provider-factory.h -include/thunarx-2/thunarx/thunarx-provider-plugin.h -include/thunarx-2/thunarx/thunarx-renamer-provider.h -include/thunarx-2/thunarx/thunarx-renamer.h -include/thunarx-2/thunarx/thunarx.h +include/thunarx-3/thunarx/thunarx-config.h +include/thunarx-3/thunarx/thunarx-file-info.h +include/thunarx-3/thunarx/thunarx-menu-item.h +include/thunarx-3/thunarx/thunarx-menu-provider.h +include/thunarx-3/thunarx/thunarx-menu.h +include/thunarx-3/thunarx/thunarx-preferences-provider.h +include/thunarx-3/thunarx/thunarx-property-page-provider.h +include/thunarx-3/thunarx/thunarx-property-page.h +include/thunarx-3/thunarx/thunarx-provider-factory.h +include/thunarx-3/thunarx/thunarx-provider-module.h +include/thunarx-3/thunarx/thunarx-provider-plugin.h +include/thunarx-3/thunarx/thunarx-renamer-provider.h +include/thunarx-3/thunarx/thunarx-renamer.h +include/thunarx-3/thunarx/thunarx.h lib/Thunar/ThunarBulkRename lib/Thunar/thunar-sendto-email -lib/libthunarx-2.la -lib/pkgconfig/thunarx-2.pc -lib/thunarx-2/thunar-apr.la -lib/thunarx-2/thunar-sbr.la -lib/thunarx-2/thunar-uca.la -lib/thunarx-2/thunar-wallpaper-plugin.la +lib/libthunarx-3.la +lib/pkgconfig/thunarx-3.pc +lib/systemd/user/thunar.service +lib/thunarx-3/thunar-apr.la +lib/thunarx-3/thunar-sbr.la +lib/thunarx-3/thunar-uca.la +lib/thunarx-3/thunar-wallpaper-plugin.la lib/xfce4/panel/plugins/libthunar-tpa.la man/man1/Thunar.1 share/Thunar/sendto/thunar-sendto-email.desktop @@ -32,6 +36,41 @@ share/dbus-1/services/org.xfce.FileManag share/dbus-1/services/org.xfce.Thunar.service share/doc/Thunar/README.gtkrc share/examples/xfce4/Thunar/uca.xml +share/gtk-doc/html/thunarx/ThunarxFileInfo.html +share/gtk-doc/html/thunarx/ThunarxMenu.html +share/gtk-doc/html/thunarx/ThunarxMenuItem.html +share/gtk-doc/html/thunarx/ThunarxMenuProvider.html +share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html +share/gtk-doc/html/thunarx/ThunarxPropertyPage.html +share/gtk-doc/html/thunarx/ThunarxPropertyPageProvider.html +share/gtk-doc/html/thunarx/ThunarxProviderFactory.html +share/gtk-doc/html/thunarx/ThunarxProviderPlugin.html +share/gtk-doc/html/thunarx/ThunarxRenamer.html +share/gtk-doc/html/thunarx/ThunarxRenamerProvider.html +share/gtk-doc/html/thunarx/abstraction.png +share/gtk-doc/html/thunarx/bulk-rename.png +share/gtk-doc/html/thunarx/home.png +share/gtk-doc/html/thunarx/index.html +share/gtk-doc/html/thunarx/ix01.html +share/gtk-doc/html/thunarx/left-insensitive.png +share/gtk-doc/html/thunarx/left.png +share/gtk-doc/html/thunarx/menu-provider.png +share/gtk-doc/html/thunarx/right-insensitive.png +share/gtk-doc/html/thunarx/right.png +share/gtk-doc/html/thunarx/say-hello.png +share/gtk-doc/html/thunarx/style.css +share/gtk-doc/html/thunarx/thunarx-Variables-and-functions-to-check-the-library-version.html +share/gtk-doc/html/thunarx/thunarx-abstraction-layer.html +share/gtk-doc/html/thunarx/thunarx-fundamentals.html +share/gtk-doc/html/thunarx/thunarx-overview.html +share/gtk-doc/html/thunarx/thunarx-providers.html +share/gtk-doc/html/thunarx/thunarx-using-extensions.html +share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html +share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html +share/gtk-doc/html/thunarx/thunarx-writing-extensions.html +share/gtk-doc/html/thunarx/thunarx.devhelp2 +share/gtk-doc/html/thunarx/up-insensitive.png +share/gtk-doc/html/thunarx/up.png share/icons/hicolor/128x128/apps/Thunar.png share/icons/hicolor/16x16/apps/Thunar.png share/icons/hicolor/16x16/stock/navigation/stock_folder-copy.png Index: pkgsrc/sysutils/xfce4-thunar/buildlink3.mk diff -u pkgsrc/sysutils/xfce4-thunar/buildlink3.mk:1.41 pkgsrc/sysutils/xfce4-thunar/buildlink3.mk:1.42 --- pkgsrc/sysutils/xfce4-thunar/buildlink3.mk:1.41 Mon Apr 16 14:33:56 2018 +++ pkgsrc/sysutils/xfce4-thunar/buildlink3.mk Tue May 15 22:25:31 2018 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.41 2018/04/16 14:33:56 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.42 2018/05/15 22:25:31 youri Exp $ BUILDLINK_TREE+= xfce4-thunar @@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-thunar XFCE4_THUNAR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=1.6.6 -BUILDLINK_ABI_DEPENDS.xfce4-thunar?= xfce4-thunar>=1.6.11nb3 +BUILDLINK_ABI_DEPENDS.xfce4-thunar+= xfce4-thunar>=1.6.11nb3 BUILDLINK_PKGSRCDIR.xfce4-thunar?= ../../sysutils/xfce4-thunar .include "../../graphics/libexif/buildlink3.mk" Index: pkgsrc/sysutils/xfce4-thunar/distinfo diff -u pkgsrc/sysutils/xfce4-thunar/distinfo:1.13 pkgsrc/sysutils/xfce4-thunar/distinfo:1.14 --- pkgsrc/sysutils/xfce4-thunar/distinfo:1.13 Sun Jun 18 21:40:45 2017 +++ pkgsrc/sysutils/xfce4-thunar/distinfo Tue May 15 22:25:31 2018 @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.13 2017/06/18 21:40:45 youri Exp $ +$NetBSD: distinfo,v 1.14 2018/05/15 22:25:31 youri Exp $ -SHA1 (Thunar-1.6.11.tar.bz2) = 843e6f9d5194fc9d405c1af62d0f1bbee162cf62 -RMD160 (Thunar-1.6.11.tar.bz2) = a31b64da746b803c964917970a95a78b5abbdfbe -SHA512 (Thunar-1.6.11.tar.bz2) = 05cdce5bb741f2d7a6ddb2f7d30dac4dc4ff539e41963b31b7f694e69be5b8ae211c442e943dc8745f8c0a634f2eb18734b7a3ea8c9c7d380c1af87a01b64e03 -Size (Thunar-1.6.11.tar.bz2) = 1929426 bytes -SHA1 (patch-ThunarBulkRename.in) = 445ac26d97e6f982db6cc37cba9a0d8fab76656f -SHA1 (patch-ac) = 7e4996b29dbc26f5250fd9e53d44c175d568f776 -SHA1 (patch-org.xfce.FileManager.service.in) = cb0587cbede11acae47e95cb9f2877b53feb93d6 -SHA1 (patch-org.xfce.Thunar.service.in) = 86d9e3896de837f94437dbee76271798acfcf338 -SHA1 (patch-thunar_Makefile.in) = 629e2150354249eda9fc179ab3caa1ebaf33910a -SHA1 (patch-thunar_thunar-gdk-extensions.c) = 8086ad1ebadbde65bd6a310619760d6f9b70d2c8 +SHA1 (Thunar-1.7.2.tar.bz2) = 75efbdcf6f6cdcd469fe7871e9b5145b7e34d06a +RMD160 (Thunar-1.7.2.tar.bz2) = b4ecb316624e0904add5f0aa5b716be193aaef07 +SHA512 (Thunar-1.7.2.tar.bz2) = b98b72558c9a8872f89632820be816f2c2e7f7e07750cc62eace741794cde4aa4daf2f4ed7fd52a5b1e3c4e9965925a038a948124d32ed6d392db65b8780ccdb +Size (Thunar-1.7.2.tar.bz2) = 2236176 bytes +SHA1 (patch-ThunarBulkRename.in) = 5a1604e9e75064d6080f4e9571f62ea8fca10e11 +SHA1 (patch-ac) = ea36f7085ad7ebfc113ab6b7bb049e3da31f4e36 +SHA1 (patch-org.xfce.FileManager.service.in) = 6c47d3e55d13deaad6024ed9f5ec1ebe2c42a192 +SHA1 (patch-org.xfce.Thunar.service.in) = 135924d555e486a7e2a689f8d53f3a442e72754e +SHA1 (patch-thunar_Makefile.in) = cc5c906e0f370ff436cbe85bc28f1ace8a4643c9 Index: pkgsrc/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in diff -u pkgsrc/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in:1.3 pkgsrc/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in:1.4 --- pkgsrc/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in:1.3 Sun Jun 18 21:40:45 2017 +++ pkgsrc/sysutils/xfce4-thunar/patches/patch-ThunarBulkRename.in Tue May 15 22:25:31 2018 @@ -1,8 +1,8 @@ -$NetBSD: patch-ThunarBulkRename.in,v 1.3 2017/06/18 21:40:45 youri Exp $ +$NetBSD: patch-ThunarBulkRename.in,v 1.4 2018/05/15 22:25:31 youri Exp $ -Look for the right thunar binary. +Lower-case thunar. ---- ThunarBulkRename.in.orig 2015-05-22 13:25:36.000000000 +0000 +--- ThunarBulkRename.in.orig 2017-09-23 19:56:19.000000000 +0000 +++ ThunarBulkRename.in @@ -20,6 +20,6 @@ # This is an ugly hack, required because xfdesktop simply Index: pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in diff -u pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in:1.3 pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in:1.4 --- pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in:1.3 Sun Jun 18 21:40:45 2017 +++ pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.FileManager.service.in Tue May 15 22:25:31 2018 @@ -1,11 +1,14 @@ -$NetBSD: patch-org.xfce.FileManager.service.in,v 1.3 2017/06/18 21:40:45 youri Exp $ +$NetBSD: patch-org.xfce.FileManager.service.in,v 1.4 2018/05/15 22:25:31 youri Exp $ Our installed thunar is all lower-case. ---- org.xfce.FileManager.service.in.orig 2015-05-22 13:25:36.000000000 +0000 +--- org.xfce.FileManager.service.in.orig 2018-03-28 22:16:22.000000000 +0000 +++ org.xfce.FileManager.service.in -@@ -1,3 +1,3 @@ +@@ -1,4 +1,4 @@ [D-BUS Service] Name=org.xfce.FileManager --Exec=@bindir@/Thunar --daemon -+Exec=@bindir@/thunar --daemon +-Exec=@bindir@/Thunar --gapplication-service +-SystemdService=thunar.service +\ No newline at end of file ++Exec=@bindir@/thunar --gapplication-service ++SystemdService=thunar.service Index: pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in diff -u pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in:1.3 pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in:1.4 --- pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in:1.3 Sun Jun 18 21:40:45 2017 +++ pkgsrc/sysutils/xfce4-thunar/patches/patch-org.xfce.Thunar.service.in Tue May 15 22:25:31 2018 @@ -1,11 +1,14 @@ -$NetBSD: patch-org.xfce.Thunar.service.in,v 1.3 2017/06/18 21:40:45 youri Exp $ +$NetBSD: patch-org.xfce.Thunar.service.in,v 1.4 2018/05/15 22:25:31 youri Exp $ Our installed thunar is all lower-case. ---- org.xfce.Thunar.service.in.orig 2015-05-22 13:25:36.000000000 +0000 +--- org.xfce.Thunar.service.in.orig 2018-03-28 22:16:22.000000000 +0000 +++ org.xfce.Thunar.service.in -@@ -1,3 +1,3 @@ +@@ -1,4 +1,4 @@ [D-BUS Service] Name=org.xfce.Thunar --Exec=@bindir@/Thunar --daemon -+Exec=@bindir@/thunar --daemon +-Exec=@bindir@/Thunar --gapplication-service +-SystemdService=thunar.service +\ No newline at end of file ++Exec=@bindir@/thunar --gapplication-service ++SystemdService=thunar.service Index: pkgsrc/sysutils/xfce4-thunar/patches/patch-ac diff -u pkgsrc/sysutils/xfce4-thunar/patches/patch-ac:1.5 pkgsrc/sysutils/xfce4-thunar/patches/patch-ac:1.6 --- pkgsrc/sysutils/xfce4-thunar/patches/patch-ac:1.5 Sun Jun 18 21:40:45 2017 +++ pkgsrc/sysutils/xfce4-thunar/patches/patch-ac Tue May 15 22:25:31 2018 @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.5 2017/06/18 21:40:45 youri Exp $ +$NetBSD: patch-ac,v 1.6 2018/05/15 22:25:31 youri Exp $ Adjust config path. ---- plugins/thunar-uca/Makefile.in.orig 2015-05-22 20:47:31.000000000 +0000 +--- plugins/thunar-uca/Makefile.in.orig 2018-04-05 20:34:19.000000000 +0000 +++ plugins/thunar-uca/Makefile.in -@@ -496,7 +496,7 @@ thunar_uca_la_LIBADD = \ - thunar_uca_la_DEPENDENCIES = \ - $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la +@@ -531,7 +531,7 @@ thunar_uca_templates = \ + GLIB_COMPILE_RESOURCES = $(shell $(PKG_CONFIG) --variable=glib_compile_resources gio-2.0) + resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/thunar-uca.gresource.xml) -defaultsdir = $(sysconfdir)/xdg/Thunar +defaultsdir = $(datadir)/examples/xfce4/Thunar defaults_in_files = uca.xml.in Index: pkgsrc/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in diff -u pkgsrc/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in:1.4 pkgsrc/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in:1.5 --- pkgsrc/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in:1.4 Sun Jun 18 21:40:45 2017 +++ pkgsrc/sysutils/xfce4-thunar/patches/patch-thunar_Makefile.in Tue May 15 22:25:31 2018 @@ -1,10 +1,10 @@ -$NetBSD: patch-thunar_Makefile.in,v 1.4 2017/06/18 21:40:45 youri Exp $ +$NetBSD: patch-thunar_Makefile.in,v 1.5 2018/05/15 22:25:31 youri Exp $ Don't link Thunar to thunar. ---- thunar/Makefile.in.orig 2015-05-22 20:47:32.000000000 +0000 +--- thunar/Makefile.in.orig 2018-04-05 20:34:19.000000000 +0000 +++ thunar/Makefile.in -@@ -2603,7 +2603,7 @@ install-dvi-am: +@@ -2551,7 +2551,7 @@ install-dvi-am: install-exec-am: install-binPROGRAMS install-binSCRIPTS @$(NORMAL_INSTALL) @@ -13,7 +13,7 @@ Don't link Thunar to thunar. install-html: install-html-am install-html-am: -@@ -2667,9 +2667,9 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -2617,9 +2617,9 @@ uninstall-am: uninstall-binPROGRAMS unin @INTLTOOL_DESKTOP_RULE@ # install symlink to 'thunar' @@ -24,5 +24,5 @@ Don't link Thunar to thunar. +# $(mkinstalldirs) $(DESTDIR)$(bindir) +# -( cd $(DESTDIR)$(bindir) ; test -x Thunar || ln -sf thunar Thunar ) - clean-local: - rm -f *.core core core.* *.o + uninstall-local: + -( cd $(DESTDIR)$(bindir) ; test -h Thunar && rm -f Thunar ) --_----------=_1526423131153750--