From f7aab42a2ada7c1cddb7ae7a835a0486263cff23 Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 26 Dec 2011 18:44:29 +0000 Subject: [PATCH] Update to thunar-media-tags 0.2.0, ported to newer exo/thunarx apis, remove now useless patches. --- x11/xfce4/thunar-media-tags/Makefile | 7 +- x11/xfce4/thunar-media-tags/distinfo | 10 +- .../thunar-media-tags/patches/patch-configure | 163 ------------------ .../patches/patch-thunar-plugin_Makefile_in | 28 --- .../patch-thunar-plugin_audio-tags-page_c | 137 --------------- .../patches/patch-thunar-plugin_tag-renamer_c | 53 ------ x11/xfce4/thunar-media-tags/pkg/PLIST | 41 ++++- 7 files changed, 48 insertions(+), 391 deletions(-) delete mode 100644 x11/xfce4/thunar-media-tags/patches/patch-configure delete mode 100644 x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_Makefile_in delete mode 100644 x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_audio-tags-page_c delete mode 100644 x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_tag-renamer_c diff --git a/x11/xfce4/thunar-media-tags/Makefile b/x11/xfce4/thunar-media-tags/Makefile index c666cc5687b..1b43de69080 100644 --- a/x11/xfce4/thunar-media-tags/Makefile +++ b/x11/xfce4/thunar-media-tags/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.17 2011/10/14 11:37:24 jasper Exp $ +# $OpenBSD: Makefile,v 1.18 2011/12/26 18:44:29 landry Exp $ COMMENT= Thunar media tags plugin -XFCE_VERSION= 0.1.2 +XFCE_VERSION= 0.2.0 THUNAR_PLUGIN= thunar-media-tags-plugin -REVISION= 13 # GPLv3 PERMIT_PACKAGE_CDROM= Yes @@ -19,7 +18,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \ gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pcre pixman-1 png stdc++ z pthread-stubs xcb ffi \ + pcre pixman-1 png stdc++ z pthread-stubs xcb ffi ICE SM exo-1 xfce4util \ thunarx-2 tag tag_c xcb-render GL Xxf86vm drm xcb-shm LIB_DEPENDS= x11/xfce4/thunar \ diff --git a/x11/xfce4/thunar-media-tags/distinfo b/x11/xfce4/thunar-media-tags/distinfo index 5a717c2ebfa..ddc1d72ab0a 100644 --- a/x11/xfce4/thunar-media-tags/distinfo +++ b/x11/xfce4/thunar-media-tags/distinfo @@ -1,5 +1,5 @@ -MD5 (xfce4/thunar-media-tags-plugin-0.1.2.tar.bz2) = ipXw6k3291fByU61RC0v9Q== -RMD160 (xfce4/thunar-media-tags-plugin-0.1.2.tar.bz2) = MbPhcZvnmD0zVB+2K7jpkgNBrTI= -SHA1 (xfce4/thunar-media-tags-plugin-0.1.2.tar.bz2) = X3+rXmR6JnhinMKXo2dhFxWtilc= -SHA256 (xfce4/thunar-media-tags-plugin-0.1.2.tar.bz2) = QTBRcaPyoJYrEyT6QCvJfj4ek1ld0xaPb+d48Hm7AkA= -SIZE (xfce4/thunar-media-tags-plugin-0.1.2.tar.bz2) = 282877 +MD5 (xfce4/thunar-media-tags-plugin-0.2.0.tar.bz2) = 4/5GQBrRKlzeQLlUrh2PgA== +RMD160 (xfce4/thunar-media-tags-plugin-0.2.0.tar.bz2) = qFUj4+TUCu+9rVWFZqUzG+bIXAw= +SHA1 (xfce4/thunar-media-tags-plugin-0.2.0.tar.bz2) = ERG02uEBVquRrbTq2yZYZZOxsCM= +SHA256 (xfce4/thunar-media-tags-plugin-0.2.0.tar.bz2) = chs0qKgB69A5RpyLhgWwuzMtSYpgGKG5eN9ch724dQ8= +SIZE (xfce4/thunar-media-tags-plugin-0.2.0.tar.bz2) = 321001 diff --git a/x11/xfce4/thunar-media-tags/patches/patch-configure b/x11/xfce4/thunar-media-tags/patches/patch-configure deleted file mode 100644 index f75d6e94309..00000000000 --- a/x11/xfce4/thunar-media-tags/patches/patch-configure +++ /dev/null @@ -1,163 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2011/02/02 08:41:30 landry Exp $ ---- configure.orig Sat Jan 20 16:29:52 2007 -+++ configure Tue Feb 1 22:38:19 2011 -@@ -22462,22 +22462,22 @@ echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6; } - fi - - -- { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.1.3" >&5 --echo $ECHO_N "checking for exo-0.3 >= 0.3.1.3... $ECHO_C" >&6; } -- if $PKG_CONFIG "--atleast-version=0.3.1.3" "exo-0.3" >/dev/null 2>&1; then -- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"` -+ { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.1.3" >&5 -+echo $ECHO_N "checking for exo-1 >= 0.3.1.3... $ECHO_C" >&6; } -+ if $PKG_CONFIG "--atleast-version=0.3.1.3" "exo-1" >/dev/null 2>&1; then -+ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5 - echo "${ECHO_T}$EXO_VERSION" >&6; } - - { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5 - echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; } -- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"` -+ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5 - echo "${ECHO_T}$EXO_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking EXO_LIBS" >&5 - echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; } -- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"` -+ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5 - echo "${ECHO_T}$EXO_LIBS" >&6; } - -@@ -22489,15 +22489,15 @@ echo "${ECHO_T}$EXO_LIBS" >&6; } - - - -- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then -- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"` -+ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then -+ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"` - { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5 - echo "${ECHO_T}found, but $xdt_cv_version" >&6; } - - -- echo "*** The required package exo-0.3 was found on your system," -+ echo "*** The required package exo-1 was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." -- echo "*** Please upgrade exo-0.3 to atleast version 0.3.1.3, or adjust" -+ echo "*** Please upgrade exo-1 to atleast version 0.3.1.3, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." -@@ -22508,8 +22508,8 @@ echo "${ECHO_T}found, but $xdt_cv_version" >&6; } - echo "${ECHO_T}not found" >&6; } - - -- echo "*** The required package exo-0.3 was not found on your system." -- echo "*** Please install exo-0.3 (atleast version 0.3.1.3) or adjust" -+ echo "*** The required package exo-1 was not found on your system." -+ echo "*** Please install exo-1 (atleast version 0.3.1.3) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." -@@ -22602,20 +22602,20 @@ echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6; } - - { echo "$as_me:$LINENO: checking for thunarx-1 >= 0.2.3svn-r20526" >&5 - echo $ECHO_N "checking for thunarx-1 >= 0.2.3svn-r20526... $ECHO_C" >&6; } -- if $PKG_CONFIG "--atleast-version=0.2.3svn-r20526" "thunarx-1" >/dev/null 2>&1; then -- THUNARX_VERSION=`$PKG_CONFIG --modversion "thunarx-1"` -+ if $PKG_CONFIG "--atleast-version=0.2.3svn-r20526" "thunarx-2" >/dev/null 2>&1; then -+ THUNARX_VERSION=`$PKG_CONFIG --modversion "thunarx-2"` - { echo "$as_me:$LINENO: result: $THUNARX_VERSION" >&5 - echo "${ECHO_T}$THUNARX_VERSION" >&6; } - - { echo "$as_me:$LINENO: checking THUNARX_CFLAGS" >&5 - echo $ECHO_N "checking THUNARX_CFLAGS... $ECHO_C" >&6; } -- THUNARX_CFLAGS=`$PKG_CONFIG --cflags "thunarx-1"` -+ THUNARX_CFLAGS=`$PKG_CONFIG --cflags "thunarx-2"` - { echo "$as_me:$LINENO: result: $THUNARX_CFLAGS" >&5 - echo "${ECHO_T}$THUNARX_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking THUNARX_LIBS" >&5 - echo $ECHO_N "checking THUNARX_LIBS... $ECHO_C" >&6; } -- THUNARX_LIBS=`$PKG_CONFIG --libs "thunarx-1"` -+ THUNARX_LIBS=`$PKG_CONFIG --libs "thunarx-2"` - { echo "$as_me:$LINENO: result: $THUNARX_LIBS" >&5 - echo "${ECHO_T}$THUNARX_LIBS" >&6; } - -@@ -22627,8 +22627,8 @@ echo "${ECHO_T}$THUNARX_LIBS" >&6; } - - - -- elif $PKG_CONFIG --exists "thunarx-1" >/dev/null 2>&1; then -- xdt_cv_version=`$PKG_CONFIG --modversion "thunarx-1"` -+ elif $PKG_CONFIG --exists "thunarx-2" >/dev/null 2>&1; then -+ xdt_cv_version=`$PKG_CONFIG --modversion "thunarx-2"` - { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5 - echo "${ECHO_T}found, but $xdt_cv_version" >&6; } - -@@ -22736,63 +22736,6 @@ echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSION" >&6; } - exit 1 - fi - fi -- -- -- { echo "$as_me:$LINENO: checking for thunar-vfs-1 >= 0.2.3svn-r20526" >&5 --echo $ECHO_N "checking for thunar-vfs-1 >= 0.2.3svn-r20526... $ECHO_C" >&6; } -- if $PKG_CONFIG "--atleast-version=0.2.3svn-r20526" "thunar-vfs-1" >/dev/null 2>&1; then -- THUNARVFS_VERSION=`$PKG_CONFIG --modversion "thunar-vfs-1"` -- { echo "$as_me:$LINENO: result: $THUNARVFS_VERSION" >&5 --echo "${ECHO_T}$THUNARVFS_VERSION" >&6; } -- -- { echo "$as_me:$LINENO: checking THUNARVFS_CFLAGS" >&5 --echo $ECHO_N "checking THUNARVFS_CFLAGS... $ECHO_C" >&6; } -- THUNARVFS_CFLAGS=`$PKG_CONFIG --cflags "thunar-vfs-1"` -- { echo "$as_me:$LINENO: result: $THUNARVFS_CFLAGS" >&5 --echo "${ECHO_T}$THUNARVFS_CFLAGS" >&6; } -- -- { echo "$as_me:$LINENO: checking THUNARVFS_LIBS" >&5 --echo $ECHO_N "checking THUNARVFS_LIBS... $ECHO_C" >&6; } -- THUNARVFS_LIBS=`$PKG_CONFIG --libs "thunar-vfs-1"` -- { echo "$as_me:$LINENO: result: $THUNARVFS_LIBS" >&5 --echo "${ECHO_T}$THUNARVFS_LIBS" >&6; } -- -- THUNARVFS_REQUIRED_VERSION=0.2.3svn-r20526 -- -- -- -- -- -- -- -- elif $PKG_CONFIG --exists "thunar-vfs-1" >/dev/null 2>&1; then -- xdt_cv_version=`$PKG_CONFIG --modversion "thunar-vfs-1"` -- { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5 --echo "${ECHO_T}found, but $xdt_cv_version" >&6; } -- -- -- echo "*** The required package thunar-vfs-1 was found on your system," -- echo "*** but the installed version ($xdt_cv_version) is too old." -- echo "*** Please upgrade thunar-vfs-1 to atleast version 0.2.3svn-r20526, or adjust" -- echo "*** the PKG_CONFIG_PATH environment variable if you installed" -- echo "*** the new version of the package in a nonstandard prefix so" -- echo "*** pkg-config is able to find it." -- exit 1 -- -- else -- { echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6; } -- -- -- echo "*** The required package thunar-vfs-1 was not found on your system." -- echo "*** Please install thunar-vfs-1 (atleast version 0.2.3svn-r20526) or adjust" -- echo "*** the PKG_CONFIG_PATH environment variable if you" -- echo "*** installed the package in a nonstandard prefix so that" -- echo "*** pkg-config is able to find it." -- exit 1 -- -- fi -- - - - # minimum supported version of pkg-config diff --git a/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_Makefile_in b/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_Makefile_in deleted file mode 100644 index 144de6d09a4..00000000000 --- a/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_Makefile_in +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-thunar-plugin_Makefile_in,v 1.1 2011/01/18 20:53:58 landry Exp $ ---- thunar-plugin/Makefile.in.orig Sat Jan 15 23:13:31 2011 -+++ thunar-plugin/Makefile.in Sat Jan 15 23:13:46 2011 -@@ -266,7 +266,7 @@ INCLUDES = \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - $(PLATFORM_CPPFLAGS) - --extensionsdir = $(libdir)/thunarx-1 -+extensionsdir = $(libdir)/thunarx-2 - extensions_LTLIBRARIES = \ - thunar-media-tags-plugin.la - -@@ -283,7 +283,6 @@ thunar_media_tags_plugin_la_CFLAGS = \ - $(EXO_CFLAGS) \ - $(PLATFORM_CFLAGS) \ - $(THUNARX_CFLAGS) \ -- $(THUNARVFS_CFLAGS) \ - $(TAGLIB_CFLAGS) \ - $(TAGLIBC_CFLAGS) - -@@ -292,7 +291,6 @@ thunar_media_tags_plugin_la_LDFLAGS = \ - -export-dynamic \ - -module \ - $(THUNARX_LIBS) \ -- $(THUNARVFS_LIBS) \ - $(TAGLIB_LIBS) \ - $(TAGLIBC_LIBS) \ - $(PLATFORM_LDFLAGS) diff --git a/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_audio-tags-page_c b/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_audio-tags-page_c deleted file mode 100644 index 42da3b4165b..00000000000 --- a/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_audio-tags-page_c +++ /dev/null @@ -1,137 +0,0 @@ -$OpenBSD: patch-thunar-plugin_audio-tags-page_c,v 1.2 2011/02/02 08:41:30 landry Exp $ -http://svn.debian.org/viewsvn/pkg-xfce/goodies/branches/experimental/thunar-media-tags-plugin/debian/patches/ ---- thunar-plugin/audio-tags-page.c.orig Mon Sep 11 11:40:56 2006 -+++ thunar-plugin/audio-tags-page.c Tue Feb 1 20:16:19 2011 -@@ -32,7 +32,6 @@ - #include - - #include --#include - - #include - -@@ -90,7 +89,6 @@ struct _AudioTagsPage - ThunarxPropertyPage __parent__; - - /* Widgets */ -- GtkTooltips *tooltips; - GtkWidget *table; - GtkWidget *save_button; - GtkWidget *info_button; -@@ -282,10 +280,6 @@ audio_tags_page_init (AudioTagsPage *page) - - 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 +311,7 @@ audio_tags_page_init (AudioTagsPage *page) - /* 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 +334,7 @@ audio_tags_page_init (AudioTagsPage *page) - /* 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 +349,7 @@ audio_tags_page_init (AudioTagsPage *page) - /* 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 +364,7 @@ audio_tags_page_init (AudioTagsPage *page) - /* 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 +378,7 @@ audio_tags_page_init (AudioTagsPage *page) - /* 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 +392,7 @@ audio_tags_page_init (AudioTagsPage *page) - /* 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 +406,7 @@ audio_tags_page_init (AudioTagsPage *page) - /* 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 +506,6 @@ audio_tags_page_finalize (GObject *object) - 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); - } - -@@ -977,8 +968,8 @@ audio_tags_page_info_activate (GtkAction *action, - - gchar *mimetype; - -- ThunarVfsInfo *vfs_info; -- gchar *filename; -+ GFileInfo *fileinfo; -+ const char *filename; - gchar *filesize; - - g_return_val_if_fail (page != NULL || IS_AUDIO_TAGS_PAGE (page), FALSE); -@@ -1007,9 +998,9 @@ audio_tags_page_info_activate (GtkAction *action, - - /* Additional information */ - mimetype = thunarx_file_info_get_mime_type (page->file); -- vfs_info = thunarx_file_info_get_vfs_info (page->file); -- filename = vfs_info->display_name; -- filesize = thunar_vfs_humanize_size (vfs_info->size, NULL, 0); -+ fileinfo = thunarx_file_info_get_file_info (page->file); -+ filename = g_file_info_get_display_name (fileinfo); -+ filesize = g_format_size_for_display (g_file_info_get_size (fileinfo)); - - /* Create layout table */ - table = gtk_table_new (7, 2, FALSE); -@@ -1121,7 +1112,7 @@ audio_tags_page_info_activate (GtkAction *action, - g_free (filesize); - g_free (mimetype); - -- thunar_vfs_info_unref (vfs_info); -+ g_object_unref (fileinfo); - - return TRUE; - } diff --git a/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_tag-renamer_c b/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_tag-renamer_c deleted file mode 100644 index 5b1133e39ce..00000000000 --- a/x11/xfce4/thunar-media-tags/patches/patch-thunar-plugin_tag-renamer_c +++ /dev/null @@ -1,53 +0,0 @@ -$OpenBSD: patch-thunar-plugin_tag-renamer_c,v 1.1 2011/01/18 20:53:58 landry Exp $ -http://svn.debian.org/viewsvn/pkg-xfce/goodies/branches/experimental/thunar-media-tags-plugin/debian/patches/ ---- thunar-plugin/tag-renamer.c.orig Sat Jun 17 21:10:05 2006 -+++ thunar-plugin/tag-renamer.c Sat Jan 15 23:11:13 2011 -@@ -116,9 +116,6 @@ struct _TagRenamer - { - ThunarxRenamer __parent__; - -- /* Widgets */ -- GtkTooltips *tooltips; -- - /* Properties */ - TagRenamerFormat format; - gboolean replace_spaces; -@@ -209,10 +206,6 @@ tag_renamer_init (TagRenamer *tag_renamer) - 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 @@ tag_renamer_init (TagRenamer *tag_renamer) - - 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); - -@@ -271,9 +264,6 @@ static void - tag_renamer_finalize (GObject *object) - { - TagRenamer *tag_renamer = TAG_RENAMER (object); -- -- /* release the tooltips */ -- g_object_unref (G_OBJECT (tag_renamer->tooltips)); - - /* Free strings */ - g_free (tag_renamer->artist); diff --git a/x11/xfce4/thunar-media-tags/pkg/PLIST b/x11/xfce4/thunar-media-tags/pkg/PLIST index 540771951bc..b98ad65f818 100644 --- a/x11/xfce4/thunar-media-tags/pkg/PLIST +++ b/x11/xfce4/thunar-media-tags/pkg/PLIST @@ -1,21 +1,60 @@ -@comment $OpenBSD: PLIST,v 1.4 2011/01/18 21:34:58 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.5 2011/12/26 18:44:29 landry Exp $ %%SHARED%% lib/thunarx-2/ @comment lib/thunarx-2/thunar-media-tags-plugin.a @comment lib/thunarx-2/thunar-media-tags-plugin.la +share/locale/ar/ +share/locale/ar/LC_MESSAGES/ +share/locale/ar/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/ast/ +share/locale/ast/LC_MESSAGES/ +share/locale/ast/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/ca/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/cs/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/da/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/de/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/el/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/en_GB/ +share/locale/en_GB/LC_MESSAGES/ +share/locale/en_GB/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/es/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/eu/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/fi/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/fr/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/gl/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/hr/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/hu/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/id/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/it/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/ja/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/kk/ +share/locale/kk/LC_MESSAGES/ +share/locale/kk/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/lv/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/nb/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/nl/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/pa/ share/locale/pa/LC_MESSAGES/ share/locale/pa/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/pl/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/pt/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/pt_BR/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/ru/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/sk/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/sq/ +share/locale/sq/LC_MESSAGES/ +share/locale/sq/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/sv/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/tr/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/ug/ +share/locale/ug/LC_MESSAGES/ +share/locale/ug/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/uk/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/ur/ +share/locale/ur/LC_MESSAGES/ +share/locale/ur/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/ur_PK/ +share/locale/ur_PK/LC_MESSAGES/ +share/locale/ur_PK/LC_MESSAGES/thunar-media-tags-plugin.mo +share/locale/zh_CN/LC_MESSAGES/thunar-media-tags-plugin.mo share/locale/zh_TW/LC_MESSAGES/thunar-media-tags-plugin.mo