1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00

- Update thunar to 1.8.11

- Remove patch included upstream
This commit is contained in:
Guido Falsi 2019-11-16 16:42:12 +00:00
parent c2a4ce785c
commit 4f8f4e5d85
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=517761
3 changed files with 4 additions and 57 deletions

View File

@ -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

View File

@ -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

View File

@ -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);