aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-fm/thunar/Makefile4
-rw-r--r--x11-fm/thunar/distinfo6
-rw-r--r--x11-fm/thunar/files/patch-fix-startup-crash53
-rw-r--r--x11-fm/thunar/pkg-plist131
4 files changed, 123 insertions, 71 deletions
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 2656cd3460f6..580f1c19ddab 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -1,8 +1,8 @@
# Created by: Oliver Lehmann <oliver@FreeBSD.org>
# $FreeBSD$
-PORTNAME= Thunar
-DISTVERSION= 1.8.9
+PORTNAME= thunar
+DISTVERSION= 1.8.10
CATEGORIES= x11-fm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index 92d60a72ee3f..4d1f4fc801fd 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565594323
-SHA256 (xfce4/Thunar-1.8.9.tar.bz2) = 7a758e7ac03501c520c304f8845353315c954d429b17d591b8eea8b14f1350b9
-SIZE (xfce4/Thunar-1.8.9.tar.bz2) = 2375302
+TIMESTAMP = 1573380747
+SHA256 (xfce4/thunar-1.8.10.tar.bz2) = 3d448d81c0e49efbaa5ae6bf34ac3c88a614178a1127afaee6b3a1b5ee12e709
+SIZE (xfce4/thunar-1.8.10.tar.bz2) = 2359582
diff --git a/x11-fm/thunar/files/patch-fix-startup-crash b/x11-fm/thunar/files/patch-fix-startup-crash
new file mode 100644
index 000000000000..3be9f0067e41
--- /dev/null
+++ b/x11-fm/thunar/files/patch-fix-startup-crash
@@ -0,0 +1,53 @@
+diff --git a/thunar/thunar-pango-extensions.c b/thunar/thunar-pango-extensions.c
+index 3ff6262c..d42f83ba 100644
+--- thunar/thunar-pango-extensions.c
++++ thunar/thunar-pango-extensions.c
+@@ -128,18 +128,18 @@ thunar_pango_attr_list_bold (void)
+ * Return value: a #PangoAttrList for not inserting hyphens at intra-word line
+ * breaks.
+ **/
++#if PANGO_VERSION_CHECK (1, 44, 0)
+ PangoAttrList*
+ thunar_pango_attr_disable_hyphens (void)
+ {
+ static PangoAttrList *attr_list = NULL;
+
+-#ifdef PANGO_VERSION_1_44
+ if (G_UNLIKELY (attr_list == NULL))
+ attr_list = thunar_pango_attr_list_wrap (pango_attr_insert_hyphens_new (FALSE), NULL);
+-#endif
+
+ return attr_list;
+ }
++#endif
+
+
+
+diff --git a/thunar/thunar-pango-extensions.h b/thunar/thunar-pango-extensions.h
+index aa0e515b..a2300faa 100644
+--- thunar/thunar-pango-extensions.h
++++ thunar/thunar-pango-extensions.h
+@@ -31,7 +31,9 @@ PangoAttrList *thunar_pango_attr_disable_hyphens (void) G_GNUC_CONST;
+ PangoAttrList *thunar_pango_attr_list_italic (void) G_GNUC_CONST;
+ PangoAttrList *thunar_pango_attr_list_small_italic (void) G_GNUC_CONST;
+ PangoAttrList *thunar_pango_attr_list_small (void) G_GNUC_CONST;
++#if PANGO_VERSION_CHECK (1, 44, 0)
+ PangoAttrList *thunar_pango_attr_list_underline_single (void) G_GNUC_CONST;
++#endif
+
+ G_END_DECLS;
+
+diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
+index bebfdeb5..7cd99060 100644
+--- thunar/thunar-standard-view.c
++++ thunar/thunar-standard-view.c
+@@ -729,7 +729,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
+
+ /* setup the name renderer */
+ standard_view->name_renderer = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT,
++#if PANGO_VERSION_CHECK (1, 44, 0)
+ "attributes", thunar_pango_attr_disable_hyphens (),
++#endif
+ "alignment", PANGO_ALIGN_CENTER,
+ "xalign", 0.5,
+ FALSE);
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index df74eabeb27f..428cae994a74 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -30,9 +30,8 @@ lib/libthunarx-3.so.0.0.0
libdata/pkgconfig/thunarx-3.pc
man/man1/Thunar.1.gz
share/Thunar/sendto/thunar-sendto-email.desktop
-share/applications/Thunar-bulk-rename.desktop
-share/applications/Thunar-folder-handler.desktop
-share/applications/Thunar.desktop
+share/applications/thunar-bulk-rename.desktop
+share/applications/thunar.desktop
share/applications/thunar-settings.desktop
share/dbus-1/services/org.xfce.Thunar.FileManager1.service
share/dbus-1/services/org.xfce.FileManager.service
@@ -85,69 +84,69 @@ share/icons/hicolor/48x48/apps/Thunar.png
share/icons/hicolor/64x64/apps/Thunar.png
share/icons/hicolor/128x128/apps/Thunar.png
share/icons/hicolor/scalable/apps/Thunar.svg
-%%NLS%%share/locale/am/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/en_AU/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/be/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/bn/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/da/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/de/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/el/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/es/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/et/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/fa_IR/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/he/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/hy/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/hy_AM/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/id/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ie/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/is/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/it/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/si/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/te/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/th/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/zh_HK/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/am/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/be/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/da/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/de/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/el/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/es/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/et/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/fa_IR/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/he/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/id/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/is/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/it/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/si/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/te/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/th/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/thunar.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/thunar.mo
share/metainfo/org.xfce.thunar.appdata.xml
share/pixmaps/Thunar/Thunar-about-logo.png
share/polkit-1/actions/org.xfce.thunar.policy