Attachment #115317 for bug #157092

View | Details | Raw Unified | Return to bug 157092
Collapse All | Expand All





PORTNAME=	thunar-media-tags-plugin
PORTVERSION=	0.1.2
PORTREVISION=	17
CATEGORIES=	audio xfce
MASTER_SITES=	${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/thunar-plugins//${PORTNAME}/${PORTVERSION:R}

MAINTAINER=	miwi@FreeBSD.org
COMMENT=	A Media Tags Plugin

LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib

USE_BZIP2=	yes
USE_GMAKE=	yes
INSTALLS_ICONS=	yes
USE_GETTEXT=	yes
GNU_CONFIGURE=	yes
USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig
USE_XFCE=	configenv libexo thunar thunarvfs
USE_AUTOTOOLS=	libtool
USE_LDCONFIG=	yes

post-patch:
	@${REINPLACE_CMD} -e 's|exo-0\.3|exo-1|g; \
		s|thunarx-1|thunarx-2|g' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|(libdir)/thunarx-1|(libdir)/thunarx-2|' \
		${WRKSRC}/thunar-plugin/Makefile.in

.include <bsd.port.mk>

Line 0 Link Here

(-)audio/thunar-media-tags-plugin/files/patch-thunar-plugin_Makefile.am (+10 lines)
	1	--- thunar-plugin/Makefile.am.orig 2006-06-08 15:04:45.000000000 +0200
	2	+++ thunar-plugin/Makefile.am 2011-05-15 19:53:34.000000000 +0200
	3	@@ -33,6 +33,7 @@
	4	-avoid-version \
	5	-export-dynamic \
	6	-module \
	7	+ $(EXO_LIBS) \
	8	$(THUNARX_LIBS) \
	9	$(THUNARVFS_LIBS) \
	10	$(TAGLIB_LIBS) \




--- thunar-plugin/audio-tags-page.c.orig	2006-09-11 11:40:56.000000000 +0200
+++ thunar-plugin/audio-tags-page.c	2011-05-15 19:44:12.000000000 +0200
@@ -90,7 +90,6 @@
   ThunarxPropertyPage __parent__;
 
   /* Widgets */
-  GtkTooltips     *tooltips;
   GtkWidget       *table;
   GtkWidget       *save_button;
   GtkWidget       *info_button;
@@ -282,10 +281,6 @@
 
   gtk_container_set_border_width (GTK_CONTAINER (page), 8);
 
-  /* Allocate the shared tooltips */
-  page->tooltips = gtk_tooltips_new ();
-  exo_gtk_object_ref_sink (GTK_OBJECT (page->tooltips));
-
   /* Main container */
   vbox = gtk_vbox_new (FALSE, 8);
   gtk_container_add (GTK_CONTAINER (page), vbox);
@@ -317,7 +312,8 @@
   /* Track spin button */
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
   exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "track");
-  gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the track number here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the track number here."));
+
   gtk_container_add (GTK_CONTAINER (alignment), spin);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
   gtk_widget_show (spin);
@@ -340,7 +336,7 @@
   /* Year spin button */
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
   exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "year");
-  gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the release year here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the release year here."));
   gtk_container_add (GTK_CONTAINER (alignment), spin);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
   gtk_widget_show (spin);
@@ -355,7 +351,7 @@
   /* Artist entry */
   entry = gtk_entry_new ();
   exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "artist");
-  gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the name of the artist or author of this file here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the name of the artist or author of this file here."));
   gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
   gtk_widget_show (entry);
@@ -370,7 +366,7 @@
   /* Title entry */
   entry = gtk_entry_new ();
   exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "title");
-  gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the song title here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the song title here."));
   gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (entry);
 
@@ -384,7 +380,7 @@
   /* Album entry */
   entry = gtk_entry_new ();
   exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "album");
-  gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the album/record title here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the album/record title here."));
   gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (entry);
   
@@ -398,7 +394,7 @@
   /* Comment entry */
   entry = gtk_entry_new ();
   exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "comment");
-  gtk_tooltips_set_tip (page->tooltips, entry, _("Enter your comments here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter your comments here."));
   gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 4, 5, GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (entry);
 
@@ -412,7 +408,7 @@
   /* Genre combo box */
   combo = gtk_combo_box_entry_new_text ();
   exo_mutual_binding_new (G_OBJECT (GTK_BIN (combo)->child), "text", G_OBJECT (page), "genre");
-  gtk_tooltips_set_tip (page->tooltips, combo, _("Select or enter the genre of this song here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (combo), _("Select or enter the genre of this song here."));
   gtk_table_attach (GTK_TABLE (page->table), combo, 1, 4, 5, 6, GTK_FILL, 0, 0, 0);
   gtk_widget_show (combo);
 
@@ -512,9 +508,6 @@
   if (G_LIKELY (page->genre != NULL))
     g_free (page->genre);
 
-  /* Release the tooltips */
-  g_object_unref (G_OBJECT (page->tooltips));
-
   (*G_OBJECT_CLASS (audio_tags_page_parent_class)->finalize) (object);
 }
 




--- thunar-plugin/tag-renamer.c.orig	2006-06-17 21:10:05.000000000 +0200
+++ thunar-plugin/tag-renamer.c	2011-05-15 19:51:13.000000000 +0200
@@ -116,9 +116,6 @@
 {
   ThunarxRenamer __parent__;
 
-  /* Widgets */
-  GtkTooltips     *tooltips;
-
   /* Properties */
   TagRenamerFormat format;
   gboolean         replace_spaces;
@@ -209,10 +206,6 @@
   GEnumClass     *klass;
   gint            n;
 
-  /* Allocate shared tooltips */
-  tag_renamer->tooltips = gtk_tooltips_new ();
-  exo_gtk_object_ref_sink (GTK_OBJECT (tag_renamer->tooltips));
-
   table = gtk_table_new (2, 3, FALSE);
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
   gtk_table_set_col_spacings (GTK_TABLE (table), 12);
@@ -245,14 +238,14 @@
 
   button = gtk_check_button_new_with_mnemonic (_("_Underscores"));
   exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "replace-spaces");
-  gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("Activating this option will replace all spaces in the target filename "
-        "with underscores."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Activating this option will replace all spaces in the target filename "
+        "with underscores."));
   gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
   gtk_widget_show (button);
 
   button = gtk_check_button_new_with_mnemonic (_("_Lowercase"));
   exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "lowercase");
-  gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("If you activate this, the resulting filename will only contain lowercase letters."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("If you activate this, the resulting filename will only contain lowercase letters."));
   gtk_table_attach (GTK_TABLE (table), button, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
   gtk_widget_show (button);
 
@@ -272,9 +265,6 @@
 {
   TagRenamer *tag_renamer = TAG_RENAMER (object);
 
-  /* release the tooltips */
-  g_object_unref (G_OBJECT (tag_renamer->tooltips));
-
   /* Free strings */
   g_free (tag_renamer->artist);
   g_free (tag_renamer->title);

Lines 1-6 Link Here

(-)audio/thunar-media-tags-plugin/pkg-plist (-4 / +4 lines)
1	lib/thunarx-1/thunar-media-tags-plugin.a	1	lib/thunarx-2/thunar-media-tags-plugin.a
2	lib/thunarx-1/thunar-media-tags-plugin.la	2	lib/thunarx-2/thunar-media-tags-plugin.la
3	lib/thunarx-1/thunar-media-tags-plugin.so	3	lib/thunarx-2/thunar-media-tags-plugin.so
4	share/locale/ca/LC_MESSAGES/thunar-media-tags-plugin.mo	4	share/locale/ca/LC_MESSAGES/thunar-media-tags-plugin.mo
5	share/locale/cs/LC_MESSAGES/thunar-media-tags-plugin.mo	5	share/locale/cs/LC_MESSAGES/thunar-media-tags-plugin.mo
6	share/locale/de/LC_MESSAGES/thunar-media-tags-plugin.mo	6	share/locale/de/LC_MESSAGES/thunar-media-tags-plugin.mo
Lines 15-18 Link Here
15	share/locale/pl/LC_MESSAGES/thunar-media-tags-plugin.mo	15	share/locale/pl/LC_MESSAGES/thunar-media-tags-plugin.mo
16	share/locale/ru/LC_MESSAGES/thunar-media-tags-plugin.mo	16	share/locale/ru/LC_MESSAGES/thunar-media-tags-plugin.mo
17	share/locale/zh_TW/LC_MESSAGES/thunar-media-tags-plugin.mo	17	share/locale/zh_TW/LC_MESSAGES/thunar-media-tags-plugin.mo
18	@dirrm lib/thunarx-1	18	@dirrmtry lib/thunarx-2

Return to bug 157092

Lines 7-13 Link Here

(-)audio/thunar-media-tags-plugin/Makefile (-4 / +6 lines)
7		7
8	PORTNAME= thunar-media-tags-plugin	8	PORTNAME= thunar-media-tags-plugin
9	PORTVERSION= 0.1.2	9	PORTVERSION= 0.1.2
10	PORTREVISION= 16	10	PORTREVISION= 17
11	CATEGORIES= audio xfce	11	CATEGORIES= audio xfce
12	MASTER_SITES= ${MASTER_SITE_XFCE}	12	MASTER_SITES= ${MASTER_SITE_XFCE}
13	MASTER_SITE_SUBDIR=/src/thunar-plugins//${PORTNAME}/${PORTVERSION:R}	13	MASTER_SITE_SUBDIR=/src/thunar-plugins//${PORTNAME}/${PORTVERSION:R}
Lines 16-35 Link Here
16	MAINTAINER= miwi@FreeBSD.org	16	MAINTAINER= miwi@FreeBSD.org
17	COMMENT= A Media Tags Plugin	17	COMMENT= A Media Tags Plugin
18		18
19	LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib	19	LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib
20		20
21	USE_BZIP2= yes	21	USE_BZIP2= yes
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	INSTALLS_ICONS= yes
24	USE_GETTEXT= yes	23	USE_GETTEXT= yes
25	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
26	USE_GNOME= gnometarget gnomehack gtk20 intltool intlhack pkgconfig	25	USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig
27	USE_XFCE= configenv libexo thunar thunarvfs	26	USE_XFCE= configenv libexo thunar thunarvfs
28	USE_AUTOTOOLS= libtool	27	USE_AUTOTOOLS= libtool
		28	USE_LDCONFIG= yes
29		29
30	post-patch:	30	post-patch:
31	@${REINPLACE_CMD} -e 's\|exo-0\.3\|exo-1\|g; \	31	@${REINPLACE_CMD} -e 's\|exo-0\.3\|exo-1\|g; \
32	s\|thunarx-1\|thunarx-2\|g' \	32	s\|thunarx-1\|thunarx-2\|g' \
33	${WRKSRC}/configure	33	${WRKSRC}/configure
		34	@${REINPLACE_CMD} -e 's\|(libdir)/thunarx-1\|(libdir)/thunarx-2\|' \
		35	${WRKSRC}/thunar-plugin/Makefile.in
34		36
35	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Line 0 Link Here

(-)audio/thunar-media-tags-plugin/files/patch-thunar-plugin_audio-tags-page.c (+95 lines)
		1	--- thunar-plugin/audio-tags-page.c.orig 2006-09-11 11:40:56.000000000 +0200
		2	+++ thunar-plugin/audio-tags-page.c 2011-05-15 19:44:12.000000000 +0200
		3	@@ -90,7 +90,6 @@
		4	ThunarxPropertyPage __parent__;
		5
		6	/* Widgets */
		7	- GtkTooltips *tooltips;
		8	GtkWidget *table;
		9	GtkWidget *save_button;
		10	GtkWidget *info_button;
		11	@@ -282,10 +281,6 @@
		12
		13	gtk_container_set_border_width (GTK_CONTAINER (page), 8);
		14
		15	- /* Allocate the shared tooltips */
		16	- page->tooltips = gtk_tooltips_new ();
		17	- exo_gtk_object_ref_sink (GTK_OBJECT (page->tooltips));
		18	-
		19	/* Main container */
		20	vbox = gtk_vbox_new (FALSE, 8);
		21	gtk_container_add (GTK_CONTAINER (page), vbox);
		22	@@ -317,7 +312,8 @@
		23	/* Track spin button */
		24	spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
		25	exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "track");
		26	- gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the track number here."), NULL);
		27	+ gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the track number here."));
		28	+
		29	gtk_container_add (GTK_CONTAINER (alignment), spin);
		30	gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
		31	gtk_widget_show (spin);
		32	@@ -340,7 +336,7 @@
		33	/* Year spin button */
		34	spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
		35	exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "year");
		36	- gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the release year here."), NULL);
		37	+ gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the release year here."));
		38	gtk_container_add (GTK_CONTAINER (alignment), spin);
		39	gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
		40	gtk_widget_show (spin);
		41	@@ -355,7 +351,7 @@
		42	/* Artist entry */
		43	entry = gtk_entry_new ();
		44	exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "artist");
		45	- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the name of the artist or author of this file here."), NULL);
		46	+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the name of the artist or author of this file here."));
		47	gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 1, 2, GTK_EXPAND \| GTK_FILL, 0, 0, 0);
		48	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
		49	gtk_widget_show (entry);
		50	@@ -370,7 +366,7 @@
		51	/* Title entry */
		52	entry = gtk_entry_new ();
		53	exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "title");
		54	- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the song title here."), NULL);
		55	+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the song title here."));
		56	gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 2, 3, GTK_EXPAND \| GTK_FILL, 0, 0, 0);
		57	gtk_widget_show (entry);
		58
		59	@@ -384,7 +380,7 @@
		60	/* Album entry */
		61	entry = gtk_entry_new ();
		62	exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "album");
		63	- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the album/record title here."), NULL);
		64	+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the album/record title here."));
65	gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 3, 4, GTK_EXPAND \| GTK_FILL, 0, 0, 0);
66	gtk_widget_show (entry);
67
68	@@ -398,7 +394,7 @@
69	/* Comment entry */
70	entry = gtk_entry_new ();
71	exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "comment");
72	- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter your comments here."), NULL);
73	+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter your comments here."));
74	gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 4, 5, GTK_EXPAND \| GTK_FILL, 0, 0, 0);
75	gtk_widget_show (entry);
76
77	@@ -412,7 +408,7 @@
78	/* Genre combo box */
79	combo = gtk_combo_box_entry_new_text ();
80	exo_mutual_binding_new (G_OBJECT (GTK_BIN (combo)->child), "text", G_OBJECT (page), "genre");
81	- gtk_tooltips_set_tip (page->tooltips, combo, _("Select or enter the genre of this song here."), NULL);
82	+ gtk_widget_set_tooltip_text (GTK_WIDGET (combo), _("Select or enter the genre of this song here."));
83	gtk_table_attach (GTK_TABLE (page->table), combo, 1, 4, 5, 6, GTK_FILL, 0, 0, 0);
84	gtk_widget_show (combo);
85
86	@@ -512,9 +508,6 @@
87	if (G_LIKELY (page->genre != NULL))
88	g_free (page->genre);
89
90	- /* Release the tooltips */
91	- g_object_unref (G_OBJECT (page->tooltips));
92	-
93	(*G_OBJECT_CLASS (audio_tags_page_parent_class)->finalize) (object);
94	}
95

Line 0 Link Here

(-)audio/thunar-media-tags-plugin/files/patch-thunar-plugin_tag-renamer.c (+51 lines)
	1	--- thunar-plugin/tag-renamer.c.orig 2006-06-17 21:10:05.000000000 +0200
	2	+++ thunar-plugin/tag-renamer.c 2011-05-15 19:51:13.000000000 +0200
	3	@@ -116,9 +116,6 @@
	4	{
	5	ThunarxRenamer __parent__;
	6
	7	- /* Widgets */
	8	- GtkTooltips *tooltips;
	9	-
	10	/* Properties */
	11	TagRenamerFormat format;
	12	gboolean replace_spaces;
	13	@@ -209,10 +206,6 @@
	14	GEnumClass *klass;
	15	gint n;
	16
	17	- /* Allocate shared tooltips */
	18	- tag_renamer->tooltips = gtk_tooltips_new ();
	19	- exo_gtk_object_ref_sink (GTK_OBJECT (tag_renamer->tooltips));
	20	-
	21	table = gtk_table_new (2, 3, FALSE);
	22	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
	23	gtk_table_set_col_spacings (GTK_TABLE (table), 12);
	24	@@ -245,14 +238,14 @@
	25
	26	button = gtk_check_button_new_with_mnemonic (_("_Underscores"));
	27	exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "replace-spaces");
	28	- gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("Activating this option will replace all spaces in the target filename "
	29	- "with underscores."), NULL);
	30	+ gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Activating this option will replace all spaces in the target filename "
	31	+ "with underscores."));
	32	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
	33	gtk_widget_show (button);
	34
	35	button = gtk_check_button_new_with_mnemonic (_("_Lowercase"));
	36	exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "lowercase");
	37	- gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("If you activate this, the resulting filename will only contain lowercase letters."), NULL);
	38	+ gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("If you activate this, the resulting filename will only contain lowercase letters."));
	39	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
	40	gtk_widget_show (button);
	41
	42	@@ -272,9 +265,6 @@
	43	{
	44	TagRenamer *tag_renamer = TAG_RENAMER (object);
	45
	46	- /* release the tooltips */
	47	- g_object_unref (G_OBJECT (tag_renamer->tooltips));
	48	-
	49	/* Free strings */
	50	g_free (tag_renamer->artist);
	51	g_free (tag_renamer->title);