FreeBSD Bugzilla – Attachment 115317 Details for
Bug 157092
[PATCH] audio/thunar-media-tags-plugin, broken with libexo >= 0.6.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 10.23 KB, created by
Olivier Duchateau
on 2011-05-16 20:30:10 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Olivier Duchateau
Created:
2011-05-16 20:30:10 UTC
Size:
10.23 KB
patch
obsolete
>diff -urN /usr/ports/audio/thunar-media-tags-plugin/Makefile audio/thunar-media-tags-plugin/Makefile >--- /usr/ports/audio/thunar-media-tags-plugin/Makefile 2011-03-03 11:12:20.000000000 +0100 >+++ audio/thunar-media-tags-plugin/Makefile 2011-05-15 20:21:14.000000000 +0200 >@@ -7,7 +7,7 @@ > > PORTNAME= thunar-media-tags-plugin > PORTVERSION= 0.1.2 >-PORTREVISION= 16 >+PORTREVISION= 17 > CATEGORIES= audio xfce > MASTER_SITES= ${MASTER_SITE_XFCE} > MASTER_SITE_SUBDIR=/src/thunar-plugins//${PORTNAME}/${PORTVERSION:R} >@@ -16,20 +16,22 @@ > MAINTAINER= miwi@FreeBSD.org > COMMENT= A Media Tags Plugin > >-LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib >+LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib > > USE_BZIP2= yes > USE_GMAKE= yes >-INSTALLS_ICONS= yes > USE_GETTEXT= yes > GNU_CONFIGURE= yes >-USE_GNOME= gnometarget gnomehack gtk20 intltool intlhack pkgconfig >+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> >diff -urN /usr/ports/audio/thunar-media-tags-plugin/files/patch-thunar-plugin_Makefile.am audio/thunar-media-tags-plugin/files/patch-thunar-plugin_Makefile.am >--- /usr/ports/audio/thunar-media-tags-plugin/files/patch-thunar-plugin_Makefile.am 1970-01-01 01:00:00.000000000 +0100 >+++ audio/thunar-media-tags-plugin/files/patch-thunar-plugin_Makefile.am 2011-05-15 20:21:14.000000000 +0200 >@@ -0,0 +1,10 @@ >+--- thunar-plugin/Makefile.am.orig 2006-06-08 15:04:45.000000000 +0200 >++++ thunar-plugin/Makefile.am 2011-05-15 19:53:34.000000000 +0200 >+@@ -33,6 +33,7 @@ >+ -avoid-version \ >+ -export-dynamic \ >+ -module \ >++ $(EXO_LIBS) \ >+ $(THUNARX_LIBS) \ >+ $(THUNARVFS_LIBS) \ >+ $(TAGLIB_LIBS) \ >diff -urN /usr/ports/audio/thunar-media-tags-plugin/files/patch-thunar-plugin_audio-tags-page.c audio/thunar-media-tags-plugin/files/patch-thunar-plugin_audio-tags-page.c >--- /usr/ports/audio/thunar-media-tags-plugin/files/patch-thunar-plugin_audio-tags-page.c 1970-01-01 01:00:00.000000000 +0100 >+++ audio/thunar-media-tags-plugin/files/patch-thunar-plugin_audio-tags-page.c 2011-05-15 20:21:14.000000000 +0200 >@@ -0,0 +1,95 @@ >+--- 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); >+ } >+ >diff -urN /usr/ports/audio/thunar-media-tags-plugin/files/patch-thunar-plugin_tag-renamer.c audio/thunar-media-tags-plugin/files/patch-thunar-plugin_tag-renamer.c >--- /usr/ports/audio/thunar-media-tags-plugin/files/patch-thunar-plugin_tag-renamer.c 1970-01-01 01:00:00.000000000 +0100 >+++ audio/thunar-media-tags-plugin/files/patch-thunar-plugin_tag-renamer.c 2011-05-15 20:21:14.000000000 +0200 >@@ -0,0 +1,51 @@ >+--- 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); >diff -urN /usr/ports/audio/thunar-media-tags-plugin/pkg-plist audio/thunar-media-tags-plugin/pkg-plist >--- /usr/ports/audio/thunar-media-tags-plugin/pkg-plist 2007-05-19 21:59:53.000000000 +0200 >+++ audio/thunar-media-tags-plugin/pkg-plist 2011-05-15 20:21:14.000000000 +0200 >@@ -1,6 +1,6 @@ >-lib/thunarx-1/thunar-media-tags-plugin.a >-lib/thunarx-1/thunar-media-tags-plugin.la >-lib/thunarx-1/thunar-media-tags-plugin.so >+lib/thunarx-2/thunar-media-tags-plugin.a >+lib/thunarx-2/thunar-media-tags-plugin.la >+lib/thunarx-2/thunar-media-tags-plugin.so > share/locale/ca/LC_MESSAGES/thunar-media-tags-plugin.mo > share/locale/cs/LC_MESSAGES/thunar-media-tags-plugin.mo > share/locale/de/LC_MESSAGES/thunar-media-tags-plugin.mo >@@ -15,4 +15,4 @@ > share/locale/pl/LC_MESSAGES/thunar-media-tags-plugin.mo > share/locale/ru/LC_MESSAGES/thunar-media-tags-plugin.mo > share/locale/zh_TW/LC_MESSAGES/thunar-media-tags-plugin.mo >-@dirrm lib/thunarx-1 >+@dirrmtry lib/thunarx-2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 157092
: 115317