diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2019-11-16 16:42:12 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2019-11-16 16:42:12 +0000 |
commit | 4f8f4e5d8518e22f53fed72fddf6bb1eda813b83 (patch) | |
tree | 3dd24bd5f171fbb309010dd3db42f73603e2e984 /x11-fm | |
parent | c2a4ce785cac09e98a359a4252e433b31d99cfa4 (diff) |
Notes
Diffstat (limited to 'x11-fm')
-rw-r--r-- | x11-fm/thunar/Makefile | 2 | ||||
-rw-r--r-- | x11-fm/thunar/distinfo | 6 | ||||
-rw-r--r-- | x11-fm/thunar/files/patch-fix-startup-crash | 53 |
3 files changed, 4 insertions, 57 deletions
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index 580f1c19ddab..e33b30fd0ba3 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunar -DISTVERSION= 1.8.10 +DISTVERSION= 1.8.11 CATEGORIES= x11-fm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo index 4d1f4fc801fd..6e21a8dfe134 100644 --- a/x11-fm/thunar/distinfo +++ b/x11-fm/thunar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1573380747 -SHA256 (xfce4/thunar-1.8.10.tar.bz2) = 3d448d81c0e49efbaa5ae6bf34ac3c88a614178a1127afaee6b3a1b5ee12e709 -SIZE (xfce4/thunar-1.8.10.tar.bz2) = 2359582 +TIMESTAMP = 1573860262 +SHA256 (xfce4/thunar-1.8.11.tar.bz2) = 18de4db3a40e8e75377fcb5f7d78efdae8659f6a454f1b9cf77bb5f083e1b238 +SIZE (xfce4/thunar-1.8.11.tar.bz2) = 2362727 diff --git a/x11-fm/thunar/files/patch-fix-startup-crash b/x11-fm/thunar/files/patch-fix-startup-crash deleted file mode 100644 index 3be9f0067e41..000000000000 --- a/x11-fm/thunar/files/patch-fix-startup-crash +++ /dev/null @@ -1,53 +0,0 @@ -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); |