cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove uneeded patch now that we have pango >=1.44

Browse Source
This commit is contained in:
ajacoutot 2019-12-16 15:51:07 +00:00
parent 82e65374f5
commit c1442dad17
3 changed files with 2 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/nautilus/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.195 2019/11/23 10:14:55 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.196 2019/12/16 15:51:07 ajacoutot Exp $
COMMENT= GNOME file manager
GNOME_PROJECT= nautilus
GNOME_VERSION= 3.34.2
REVISION= 0
SHARED_LIBS += nautilus-extension 3.0 # 1.5.0

44
x11/gnome/nautilus/patches/patch-src_nautilus-canvas-item_c
View File

@ -1,44 +0,0 @@
$OpenBSD: patch-src_nautilus-canvas-item_c,v 1.1 2019/11/23 10:14:55 ajacoutot Exp $
REVERT (remove when we have pango >=1.44)
From 9738d8561ed38a87b4d72db3e49653641edd9a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
Date: Wed, 4 Sep 2019 21:45:05 +0000
Subject: [PATCH] canvas-item, view-icon-item-ui: Don't hyphenate filenames
Index: src/nautilus-canvas-item.c
--- src/nautilus-canvas-item.c.orig
+++ src/nautilus-canvas-item.c
@@ -1381,14 +1381,12 @@ create_label_layout (NautilusCanvasItem *item,
GString *str;
char *zeroified_text;
const char *p;
- PangoAttrList *attr_list;
canvas_item = EEL_CANVAS_ITEM (item);
container = NAUTILUS_CANVAS_CONTAINER (canvas_item->canvas);
context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas));
layout = pango_layout_new (context);
- attr_list = pango_attr_list_new ();
zeroified_text = NULL;
@@ -1417,9 +1415,6 @@ create_label_layout (NautilusCanvasItem *item,
pango_layout_set_spacing (layout, LABEL_LINE_SPACING);
pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
- pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
- pango_layout_set_attributes (layout, attr_list);
-
/* Create a font description */
if (container->details->font)
{
@@ -1432,7 +1427,6 @@ create_label_layout (NautilusCanvasItem *item,
pango_layout_set_font_description (layout, desc);
pango_font_description_free (desc);
g_free (zeroified_text);
- pango_attr_list_unref (attr_list);
return layout;
}

38
x11/gnome/nautilus/patches/patch-src_nautilus-view-icon-item-ui_c
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-src_nautilus-view-icon-item-ui_c,v 1.1 2019/11/23 10:14:55 ajacoutot Exp $
REVERT (remove when we have pango >=1.44)
From 9738d8561ed38a87b4d72db3e49653641edd9a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
Date: Wed, 4 Sep 2019 21:45:05 +0000
Subject: [PATCH] canvas-item, view-icon-item-ui: Don't hyphenate filenames
Index: src/nautilus-view-icon-item-ui.c
--- src/nautilus-view-icon-item-ui.c.orig
+++ src/nautilus-view-icon-item-ui.c
@@ -128,7 +128,6 @@ constructed (GObject *object)
GtkBox *container;
GtkBox *item_selection_background;
GtkLabel *label;
- PangoAttrList *attr_list;
GtkStyleContext *style_context;
NautilusFile *file;
guint icon_size;
@@ -150,9 +149,6 @@ constructed (GObject *object)
label = GTK_LABEL (gtk_label_new (nautilus_file_get_display_name (file)));
gtk_widget_show (GTK_WIDGET (label));
- attr_list = pango_attr_list_new ();
- pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE));
- gtk_label_set_attributes (label, attr_list);
gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
gtk_label_set_line_wrap (label, TRUE);
gtk_label_set_line_wrap_mode (label, PANGO_WRAP_WORD_CHAR);
@@ -182,8 +178,6 @@ constructed (GObject *object)
(GCallback) on_view_item_size_changed, self);
g_signal_connect (self->model, "notify::file",
(GCallback) on_view_item_file_changed, self);
-
- pango_attr_list_unref (attr_list);
}
static void