Hello community,
here is the log from the commit of package thunar-plugins for openSUSE:Factory
checked in at Mon Feb 7 12:37:40 CET 2011.
--------
--- thunar-plugins/thunar-plugins.changes 2009-11-11 17:42:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/thunar-plugins/thunar-plugins.changes 2011-02-04 20:18:54.000000000 +0100
@@ -1,0 +2,43 @@
+Fri Feb 4 18:45:34 UTC 2011 - gber@opensuse.org
+
+- fixed typo
+- remove unsupported locales
+
+-------------------------------------------------------------------
+Thu Feb 3 20:30:59 UTC 2011 - gber@opensuse.org
+
+- use thunar_version_min for Requires
+- determine thunar_version automatically
+
+-------------------------------------------------------------------
+Sun Jan 23 18:11:33 UTC 2011 - gber@opensuse.org
+
+- update thunar-archive-plugin to version 0.3.0
+ - ported the plugin to thunarx-2 and exo-1
+ - added support for extracting 7z, lzma and xa archives
+ - bugfixes
+ - translation updates
+- dropped obsolete thunar-archive-plugin-0.2.4-port-to-gio.patch
+
+-------------------------------------------------------------------
+Mon Jan 17 23:05:24 UTC 2011 - gber@opensuse.org
+
+- added thunar-archive-plugin-0.2.4-port-to-gio.patch,
+ thunar-media-tags-plugin-0.1.2-port-to-exo-1.patch,
+ thunar-media-tags-plugin-0.1.2-port-to-thunarx-2.patch,
+ thunar-shares-plugin-0.2.0-port-to-thunarx-2.patch in order to
+ make thunar-archive-plugin, thunar-media-tags-plugin, and
+ thunar-shares-plugin build with Xfce 4.8 libraries
+- added thunar-media-tags-plugin-0.1.2-check-valid-audio.patch
+ which fixes a crash in thunar-media-tags-plugin due to not
+ checking for valid audio data
+- added thunar-shares-plugin-0.2.0-fix-missing-include.patch in
+ order to fix a missing include
+- disabled thunar-vcs-plugin which has not been completely ported
+ to thunarx-2 yet
+- removed thunar-thumbnailers since thunar has switched to
+ DBus-based thumbnail management
+- improved Summaries/Descriptions
+- use same Group as Thunar
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
thunar-archive-plugin-0.2.4.tar.bz2
thunar-thumbnailers-0.4.1.tar.bz2
New:
----
thunar-archive-plugin-0.3.0.tar.bz2
thunar-media-tags-plugin-0.1.2-check-valid-audio.patch
thunar-media-tags-plugin-0.1.2-port-to-exo-1.patch
thunar-media-tags-plugin-0.1.2-port-to-thunarx-2.patch
thunar-shares-plugin-0.2.0-fix-missing-include.patch
thunar-shares-plugin-0.2.0-port-to-thunarx-2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ thunar-plugins.spec ++++++
--- /var/tmp/diff_new_pack.Yp1wwv/_old 2011-02-07 12:37:33.000000000 +0100
+++ /var/tmp/diff_new_pack.Yp1wwv/_new 2011-02-07 12:37:33.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package thunar-plugins (Version 1.0.0)
+# spec file for package thunar-plugins
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,179 +16,156 @@
#
-
-Name: thunar-plugins
-%define archive_version 0.2.4
+%define thunar_version %(rpm -q --queryformat '%{VERSION}' thunar)
+%define thunar_version_min 1.2.0
+%define archive_version 0.3.0
%define media_tags_version 0.1.2
%define shares_version 0.2.0
%define vcs_version 0.1.2
%define shares_version 0.2.0
-%define thumbnailers_version 0.4.1
+# thunar-vcs-plugin has not been completely ported to thunarx-2 yet
+%define plugins thunar-archive-plugin thunar-media-tags-plugin thunar-shares-plugin
+
+Name: thunar-plugins
Group: System/GUI/XFCE
Url: http://thunar.xfce.org/plugins.html
License: GPLv2+
-# keep thunar version
-Version: 1.0.0
-Release: 2
-%define plugins thunar-archive-plugin thunar-media-tags-plugin thunar-shares-plugin thunar-vcs-plugin thunar-thumbnailers
+Version: %{thunar_version}
+Release: 1
Source0: thunar-archive-plugin-%{archive_version}.tar.bz2
Source1: thunar-media-tags-plugin-%{media_tags_version}.tar.bz2
Source2: thunar-shares-plugin-%{shares_version}.tar.bz2
Source3: thunar-vcs-plugin-%{vcs_version}.tar.bz2
-Source4: thunar-thumbnailers-%{thumbnailers_version}.tar.bz2
-Summary: Set of plugins for Thunar
+# PATCH-FIX-UPSTREAM thunar-media-tags-plugin-0.1.2-port-to-thunarx-2.patch bxo#6295 gber@opensuse.org -- Port of thunar-media-tags-plugin to thunarx-2 from upstream bugzilla.
+Patch1: thunar-media-tags-plugin-%{media_tags_version}-port-to-thunarx-2.patch
+# PATCH-FIX-UPSTREAM thunar-media-tags-plugin-0.1.2-port-to-exo-1.patch bxo#6295 gber@opensuse.org -- Port of thunar-media-tags-plugin to exo-1 from upstream bugzilla.
+Patch2: thunar-media-tags-plugin-%{media_tags_version}-port-to-exo-1.patch
+# PATCH-FIX-UPSTREAM bxo#6297 thunar-media-tags-plugin-0.1.2-check-valid-audio.patch gber@opensuse.org -- Fix preventing crash by checking for valid audio data backported from upstream git.
+Patch3: thunar-media-tags-plugin-%{media_tags_version}-check-valid-audio.patch
+# PATCH-FIX-UPSTREAM thunar-shares-plugin-0.2.0-port-to-thunarx-2.patch gber@opensuse.org -- Port of thunar-shares-plugin to thunarx-2 from upstream git.
+Patch4: thunar-shares-plugin-%{shares_version}-port-to-thunarx-2.patch
+# PATCH-FIX-UPSTREAM thunar-shares-plugin-0.2.0-fix-missing-include.patch gber@opensuse.org -- Fix missing include of glib/gi18n-lib.h for gettext support from upstream git.
+Patch5: thunar-shares-plugin-%{shares_version}-fix-missing-include.patch
+Summary: Set of Plugins for Thunar
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: ImageMagick-devel dcraw gtk2-devel intltool libapr1-devel perl-XML-Parser subversion-devel taglib-devel texlive-latex thunar-devel unzip xfce4-dev-tools xmgrace
-%if 0%{?suse_version} > 1030
-BuildRequires: raw-thumbnailer
-%endif
+BuildRequires: intltool
+BuildRequires: perl-XML-Parser
+BuildRequires: unzip
+BuildRequires: xfce4-dev-tools
+BuildRequires: subversion-devel
+BuildRequires: taglib-devel
+BuildRequires: thunar-devel >= %{thunar_version_min}
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(thunarx-2)
+BuildRequires: pkgconfig(exo-1)
+BuildRequires: pkgconfig(libxfce4util-1.0)
%description
This source package contains various plugins for thunar file manager.
-
-
-Authors:
---------
- Benedikt Meurer
-
%package -n thunar-archive-plugin
Version: %{archive_version}
-Release: 57
+Release: 1
License: GPLv2+
Group: System/GUI/XFCE
-Requires: xarchiver thunar >= %{version}
-Summary: Plugin enable using xarchive for Thunar
+Summary: Thunar Plugin Providing Xarchiver Integration
+Requires: xarchiver
+Requires: thunar >= %{thunar_version_min}
%description -n thunar-archive-plugin
-The thunar-archive-plugin is a plugin for the Thunar File Manager,
-which adds archive operations to the file context menus. Using this
-plugin you will be able to extract and create archive files from within
-Thunar using a single click.
-
-
-
-Authors:
---------
- Benedikt Meurer
+The Thunar Archive Plugin adds file archive operations to the Thunar file context
+menus and allows for extracting and creating archive files from within Thunar
+with a single click.
%package -n thunar-media-tags-plugin
Version: %{media_tags_version}
-Release: 57
+Release: 58
License: GPLv2+
Group: System/GUI/XFCE
-Summary: OGG support for Thunar
-Requires: thunar >= %{version}
+Summary: Thunar Plugin for Editing Media File Metadata and Renaming Based on Metadata
+Requires: thunar >= %{thunar_version_min}
%description -n thunar-media-tags-plugin
-The thunar-media-tags-plugin is a plugin for the Thunar File Manager,
-which adds ID3/OGG tag support to the bulk rename dialog.
-
+The Thunar Media Tags Plugin enables editing media file metatdata from within
+the Thunar file properties dialog and allows for bulk renaming based on
+metadata.
-Authors:
---------
- Benedikt Meurer
-
%package -n thunar-shares-plugin
Version: %{shares_version}
-Release: 2
+Release: 9
License: GPLv2+
Group: System/GUI/XFCE
-Summary: Thunar Shares plugin
-Requires: thunar >= %{version}
+Summary: Thunar Plugin for Sharing files using Samba
+Requires: thunar >= %{thunar_version_min}
%description -n thunar-shares-plugin
-Thunar-shares-plugin allows you to quickly share a folder using Samba
-from Thunar (the XFCE file manager) without requiring root access.
+The Thunar Shares Plugin allows for quickly sharing a directory using Samba
+from within Thunar without requiring root access.
+
-Authors:
---------
- Daniel Morales
+%if 0
%package -n thunar-vcs-plugin
Version: %{vcs_version}
-Release: 1
+Release: 9
License: GPLv2+
Group: System/GUI/XFCE
-Summary: Thunar VCS plugin
-Requires: thunar >= %{version}
+Summary: Thunar Plugin providing VCS Integration
+Requires: thunar >= %{thunar_version_min}
%description -n thunar-vcs-plugin
-The Thunar VCS Plugin adds Subversion and GIT actions to the context
-menu of thunar. This gives a SVN integration and GIT integration
-to Thunar.
-
-
-Authors:
---------
- Peter de Ridder
-
-%package -n thunar-thumbnailers
-Version: %{thumbnailers_version}
-Release: 2
-License: GPLv2+
-Group: System/GUI/XFCE
-Summary: Thumbnailers for Thunar
-Requires: thunar >= %{version}
-Requires: ImageMagick
-%if 0%{?suse_version} > 1030
-Recommends: raw-thumbnailer
+The Thunar VCS Plugin integrates Thunar with several VCS and allows to execute
+VCS commands from the context menu.
%endif
-Suggests: texlive-latex xmgrace
-
-%description -n thunar-thumbnailers
-Additional thumbnailers which can be used with thunar to enable
-thumbnail generation for less common file formats.
-
-Authors:
---------
- Benedikt Meurer
%prep
-%setup -q -c -n thunar-plugins -a0 -a1 -a2 -a3 -a4
+%setup -q -c -n thunar-plugins -a0 -a1 -a2 -a3
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
%build
for plugin in %{plugins} ; do
cd ${plugin}*
+ ./autogen.sh || xdt-autogen
%configure \
- --disable-static \
-%if 0%{?suse_version} > 1030
- --enable-raw \
-%endif
- --enable-tex \
- --enable-grace
- make %{?jobs:-j%jobs}
+ --disable-static
+ make %{?_smp_mflags}
cd ..
done
%install
for plugin in %{plugins} ; do
cd ${plugin}*
- make DESTDIR="$RPM_BUILD_ROOT" install
+ %make_install
cd ..
- if [ "$plugin" != 'thunar-thumbnailers' ]; then
+ # remove unsupported locales
+ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
%find_lang $plugin
- fi
done
+find %{buildroot}%{_libdir} -name '*.la' | xargs rm -f
%clean
rm -rf "$RPM_BUILD_ROOT"
%files -n thunar-archive-plugin -f thunar-archive-plugin.lang
%defattr(-,root,root)
-%{_libdir}/thunarx-1/thunar-archive-plugin*
-%dir %{_libexecdir}/thunar-archive-plugin
-%{_libexecdir}/thunar-archive-plugin/*.tap
+%{_libdir}/thunarx-2/thunar-archive-plugin.so
+%{_libexecdir}/thunar-archive-plugin
%{_datadir}/icons/*/*/*/tap-*.png
%files -n thunar-media-tags-plugin -f thunar-media-tags-plugin.lang
%defattr(-,root,root)
-%{_libdir}/thunarx-1/thunar-media-tags-plugin*
+%{_libdir}/thunarx-2/thunar-media-tags-plugin.so
%files -n thunar-shares-plugin -f thunar-shares-plugin.lang
%defattr(-,root,root)
-%{_libdir}/thunarx-1/thunar-shares-plugin*
+%{_libdir}/thunarx-2/thunar-shares-plugin.so
+
+%if 0
%files -n thunar-vcs-plugin -f thunar-vcs-plugin.lang
%defattr(-,root,root)
@@ -197,11 +174,6 @@
%{_libexecdir}/tvp-svn-helper
%{_datadir}/icons/hicolor/*/apps/git.*
%{_datadir}/icons/hicolor/*/apps/subversion.*
-
-%files -n thunar-thumbnailers
-%defattr(-,root,root)
-%{_libexecdir}/*-thumbnailer
-%{_datadir}/mime/packages/thunar-thumbnailers.xml
-%{_datadir}/thumbnailers/*-thumbnailer.desktop
+%endif
%changelog
++++++ thunar-archive-plugin-0.2.4.tar.bz2 -> thunar-archive-plugin-0.3.0.tar.bz2 ++++++
++++ 80113 lines of diff (skipped)
++++++ thunar-media-tags-plugin-0.1.2-check-valid-audio.patch ++++++
diff -urNp thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/media-tags-provider.c thunar-media-tags-plugin-0.1.2/thunar-plugin/media-tags-provider.c
--- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/media-tags-provider.c 2006-08-02 08:55:57.000000000 +0200
+++ thunar-media-tags-plugin-0.1.2/thunar-plugin/media-tags-provider.c 2011-01-23 13:17:33.000000000 +0100
@@ -163,10 +163,11 @@ media_tags_get_audio_file_supported (Thu
if (G_LIKELY (taglib_file != NULL))
{
+ /* Check that the file contains valid audio info */
+ supported = taglib_file_is_valid (taglib_file);
+
/* Free the taglib file */
taglib_file_free (taglib_file);
-
- supported = TRUE;
}
g_free (filename);
++++++ thunar-media-tags-plugin-0.1.2-port-to-exo-1.patch ++++++
diff -urp thunar-media-tags-plugin-0.1.2.orig/configure.in thunar-media-tags-plugin-0.1.2/configure.in
--- thunar-media-tags-plugin-0.1.2.orig/configure.in 2011-01-18 01:24:42.000000000 +0100
+++ thunar-media-tags-plugin-0.1.2/configure.in 2011-01-18 01:25:24.000000000 +0100
@@ -64,7 +64,8 @@ XDT_I18N([ca cs de el eu fr gl hu ja nl
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1])
XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4])
diff -urp thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/audio-tags-page.c thunar-media-tags-plugin-0.1.2/thunar-plugin/audio-tags-page.c
--- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/audio-tags-page.c 2011-01-18 01:24:42.000000000 +0100
+++ thunar-media-tags-plugin-0.1.2/thunar-plugin/audio-tags-page.c 2011-01-18 01:25:24.000000000 +0100
@@ -89,7 +89,6 @@ struct _AudioTagsPage
ThunarxPropertyPage __parent__;
/* Widgets */
- GtkTooltips *tooltips;
GtkWidget *table;
GtkWidget *save_button;
GtkWidget *info_button;
@@ -281,10 +280,6 @@ audio_tags_page_init (AudioTagsPage *pag
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);
@@ -316,7 +311,7 @@ audio_tags_page_init (AudioTagsPage *pag
/* 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);
@@ -339,7 +334,7 @@ audio_tags_page_init (AudioTagsPage *pag
/* 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);
@@ -354,7 +349,7 @@ audio_tags_page_init (AudioTagsPage *pag
/* 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);
@@ -369,7 +364,7 @@ audio_tags_page_init (AudioTagsPage *pag
/* 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);
@@ -383,7 +378,7 @@ audio_tags_page_init (AudioTagsPage *pag
/* 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);
@@ -397,7 +392,7 @@ audio_tags_page_init (AudioTagsPage *pag
/* 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);
@@ -411,7 +406,7 @@ audio_tags_page_init (AudioTagsPage *pag
/* 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);
@@ -511,9 +506,6 @@ audio_tags_page_finalize (GObject *objec
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 -urp thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/tag-renamer.c thunar-media-tags-plugin-0.1.2/thunar-plugin/tag-renamer.c
--- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/tag-renamer.c 2006-06-17 21:10:05.000000000 +0200
+++ thunar-media-tags-plugin-0.1.2/thunar-plugin/tag-renamer.c 2011-01-18 01:25:24.000000000 +0100
@@ -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_rename
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_rename
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 @@ 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);
g_free (tag_renamer->title);
++++++ thunar-media-tags-plugin-0.1.2-port-to-thunarx-2.patch ++++++
diff -urp thunar-media-tags-plugin-0.1.2.orig/configure.in thunar-media-tags-plugin-0.1.2/configure.in
--- thunar-media-tags-plugin-0.1.2.orig/configure.in 2007-01-20 16:29:39.000000000 +0100
+++ thunar-media-tags-plugin-0.1.2/configure.in 2011-01-18 01:24:42.000000000 +0100
@@ -65,8 +65,7 @@ dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
-XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.2.3svn-r20526])
-XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.2.3svn-r20526])
+XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1])
XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4])
dnl ***********************************
diff -urp thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/audio-tags-page.c thunar-media-tags-plugin-0.1.2/thunar-plugin/audio-tags-page.c
--- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/audio-tags-page.c 2006-09-11 11:40:56.000000000 +0200
+++ thunar-media-tags-plugin-0.1.2/thunar-plugin/audio-tags-page.c 2011-01-18 01:24:42.000000000 +0100
@@ -32,7 +32,6 @@
#include
#include
-#include
#include
@@ -977,8 +976,8 @@ audio_tags_page_info_activate (GtkAction
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 +1006,9 @@ audio_tags_page_info_activate (GtkAction
/* 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 +1120,7 @@ audio_tags_page_info_activate (GtkAction
g_free (filesize);
g_free (mimetype);
- thunar_vfs_info_unref (vfs_info);
+ g_object_unref (fileinfo);
return TRUE;
}
diff -urp thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/Makefile.am thunar-media-tags-plugin-0.1.2/thunar-plugin/Makefile.am
--- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/Makefile.am 2006-06-08 15:04:45.000000000 +0200
+++ thunar-media-tags-plugin-0.1.2/thunar-plugin/Makefile.am 2011-01-18 01:24:42.000000000 +0100
@@ -8,7 +8,7 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
$(PLATFORM_CPPFLAGS)
-extensionsdir = $(libdir)/thunarx-1
+extensionsdir = $(libdir)/thunarx-2
extensions_LTLIBRARIES = \
thunar-media-tags-plugin.la
@@ -25,7 +25,6 @@ thunar_media_tags_plugin_la_CFLAGS =
$(EXO_CFLAGS) \
$(PLATFORM_CFLAGS) \
$(THUNARX_CFLAGS) \
- $(THUNARVFS_CFLAGS) \
$(TAGLIB_CFLAGS) \
$(TAGLIBC_CFLAGS)
@@ -34,7 +33,6 @@ thunar_media_tags_plugin_la_LDFLAGS =
-export-dynamic \
-module \
$(THUNARX_LIBS) \
- $(THUNARVFS_LIBS) \
$(TAGLIB_LIBS) \
$(TAGLIBC_LIBS) \
$(PLATFORM_LDFLAGS)
++++++ thunar-shares-plugin-0.2.0-fix-missing-include.patch ++++++
diff -urNp thunar-shares-plugin-0.2.0.orig/libshares/libshares-util.c thunar-shares-plugin-0.2.0/libshares/libshares-util.c
--- thunar-shares-plugin-0.2.0.orig/libshares/libshares-util.c 2011-01-23 14:23:48.000000000 +0100
+++ thunar-shares-plugin-0.2.0/libshares/libshares-util.c 2011-01-23 14:29:21.000000000 +0100
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
++++++ thunar-shares-plugin-0.2.0-port-to-thunarx-2.patch ++++++
diff -urNp thunar-shares-plugin-0.2.0.orig/configure.in thunar-shares-plugin-0.2.0/configure.in
--- thunar-shares-plugin-0.2.0.orig/configure.in 2009-02-15 21:00:53.000000000 +0100
+++ thunar-shares-plugin-0.2.0/configure.in 2011-01-23 11:16:26.000000000 +0100
@@ -21,7 +21,7 @@ m4_define([tsp_debug_default], [ifelse(t
dnl -------------------------------------------------------
dnl Init autoconf
dnl -------------------------------------------------------
-AC_COPYRIGHT([Copyright (c) 2008 Daniel Morales .])
+AC_COPYRIGHT([Copyright (c) 2009-2010 Daniel Morales .])
AC_INIT([thunar-shares-plugin], [tsp_version], [thunar-dev@xfce.org])
AC_CONFIG_SRCDIR([thunar-plugin/thunar-shares-plugin.c])
AC_PREREQ(2.59)
@@ -49,15 +49,14 @@ AC_PROG_INTLTOOL([0.31])
dnl -------------------------------------------------------
dnl Check headers
dnl -------------------------------------------------------
-AC_CHECK_HEADERS([string.h sys/types.h sys/wait.h time.h])
+AC_CHECK_HEADERS([string.h sys/types.h sys/wait.h time.h sys/stat.h unistd.h])
dnl -------------------------------------------------------
dnl Packages checks
dnl -------------------------------------------------------
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.10.0])
-XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.8.0])
-XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.8.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
+XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1])
dnl -------------------------------------------------------
dnl Languages
diff -urNp thunar-shares-plugin-0.2.0.orig/libshares/libshares-util.c thunar-shares-plugin-0.2.0/libshares/libshares-util.c
--- thunar-shares-plugin-0.2.0.orig/libshares/libshares-util.c 2009-02-15 20:54:41.000000000 +0100
+++ thunar-shares-plugin-0.2.0/libshares/libshares-util.c 2011-01-23 13:06:43.000000000 +0100
@@ -25,18 +25,23 @@
#include
#include
-#include
+#include
+
+#ifdef HAVE_UNISTD_H
+#include
+#endif
+
+#include
#include
#include "libshares-util.h"
#include "shares.h"
-static gboolean tsp_ask_perms (gboolean need_r,
- gboolean need_w,
- gboolean need_x);
+static gboolean tsp_ask_perms (void);
static gboolean tsp_check_perms (const gchar *path,
- gboolean is_writable);
+ gboolean is_writable,
+ gboolean guests_ok);
/**
* libshares_get_local_file:
@@ -190,7 +195,7 @@ libshares_shares_share (const gchar *fi
}
}
- if (tsp_check_perms (file_local, is_writable))
+ if (tsp_check_perms (file_local, is_writable, guests_ok))
{
share_info = g_new0 (ShareInfo, 1);
@@ -289,17 +294,17 @@ gboolean
libshares_is_shareable (ThunarxFileInfo *info)
{
gboolean retval;
- gchar *scheme;
+ GFile *file;
if (!thunarx_file_info_is_directory (info)){
return FALSE;
}
- scheme = thunarx_file_info_get_uri_scheme (info);
+ file = thunarx_file_info_get_location (info);
- retval = g_str_equal ("file", scheme);
+ retval = g_file_is_native (file);
- g_free (scheme);
+ g_object_unref (file);
return retval;
}
@@ -315,19 +320,22 @@ libshares_is_shareable (ThunarxFileInfo
gboolean
libshares_check_owner (ThunarxFileInfo *info)
{
- ThunarVfsInfo *vfsinfo;
- gboolean retval = TRUE;
- gboolean owner_only;
+ GFileInfo *fileinfo;
+ gboolean retval = TRUE;
+ gboolean owner_only;
+ guint32 uid;
if (shares_has_owner_only (&owner_only, NULL))
{
if (owner_only)
{
- vfsinfo = thunarx_file_info_get_vfs_info (info);
+ fileinfo = thunarx_file_info_get_file_info (info);
- retval = (geteuid () == vfsinfo->uid);
+ uid = g_file_info_get_attribute_uint32 (fileinfo, G_FILE_ATTRIBUTE_UNIX_UID);
- thunar_vfs_info_unref (vfsinfo);
+ retval = (geteuid () == uid);
+
+ g_object_unref (fileinfo);
}
}
@@ -336,9 +344,7 @@ libshares_check_owner (ThunarxFileInfo *
/* Asks to the user if we can change the permissions of the folder */
static gboolean
-tsp_ask_perms (gboolean need_r,
- gboolean need_w,
- gboolean need_x)
+tsp_ask_perms (void)
{
return libshares_ask_user (_("Thunar needs to add some permissions to your folder in order to share it. Do you agree?"));
}
@@ -346,35 +352,33 @@ tsp_ask_perms (gboolean need_r,
/* Checks if the current file has the necesary permissions */
static gboolean
tsp_check_perms (const gchar *path,
- gboolean is_writable)
+ gboolean is_writable,
+ gboolean guests_ok)
{
struct stat st;
- gboolean need_r;
- gboolean need_w;
- gboolean need_x;
mode_t new_mode;
mode_t mode;
+ mode_t need_mask;
- if (stat (path, &st) != 0)
+ if (g_stat (path, &st) != 0)
return FALSE;
- mode = st.st_mode;
-
- new_mode = mode;
+ new_mode = mode = st.st_mode;
- need_r = (mode & THUNAR_VFS_FILE_MODE_OTH_READ) == 0;
- new_mode |= THUNAR_VFS_FILE_MODE_OTH_READ;
+ /* go+rx is necesary to guest enabled shares */
+ if (guests_ok)
+ new_mode |= (S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
- need_w = is_writable && (mode & THUNAR_VFS_FILE_MODE_OTH_WRITE) == 0;
- if (need_w)
- new_mode |= THUNAR_VFS_FILE_MODE_OTH_WRITE;
+ /* go+w is necesary to writable shares */
+ if (is_writable)
+ new_mode |= (S_IWGRP | S_IWOTH);
- need_x = (mode & THUNAR_VFS_FILE_MODE_OTH_EXEC) == 0;
- new_mode |= THUNAR_VFS_FILE_MODE_OTH_EXEC;
+ /* Compare both modes */
+ need_mask = new_mode & ~mode;
- if (need_r || need_w || need_x)
+ if (need_mask != 0)
{
- if (!tsp_ask_perms (need_r, need_w, need_x))
+ if (!tsp_ask_perms ())
return FALSE;
#ifdef G_ENABLE_DEBUG
g_message ("Changing permissions of '%s'", path);
diff -urNp thunar-shares-plugin-0.2.0.orig/libshares/Makefile.am thunar-shares-plugin-0.2.0/libshares/Makefile.am
--- thunar-shares-plugin-0.2.0.orig/libshares/Makefile.am 2009-02-15 20:54:41.000000000 +0100
+++ thunar-shares-plugin-0.2.0/libshares/Makefile.am 2011-01-23 11:16:26.000000000 +0100
@@ -17,14 +17,12 @@ libshares_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS) \
- $(THUNARX_CFLAGS) \
- $(THUNARVFS_CFLAGS)
+ $(THUNARX_CFLAGS)
libshares_la_LDFLAGS = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(THUNARX_LIBS) \
- $(THUNARVFS_LIBS) \
$(PLATFORM_LDFLAGS)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -urNp thunar-shares-plugin-0.2.0.orig/thunar-plugin/Makefile.am thunar-shares-plugin-0.2.0/thunar-plugin/Makefile.am
--- thunar-shares-plugin-0.2.0.orig/thunar-plugin/Makefile.am 2009-02-15 20:54:41.000000000 +0100
+++ thunar-shares-plugin-0.2.0/thunar-plugin/Makefile.am 2011-01-23 11:16:26.000000000 +0100
@@ -7,7 +7,7 @@ INCLUDES = \
-DDATADIR=\"$(datadir)\" \
$(PLATFORM_CPPFLAGS)
-extensionsdir = $(libdir)/thunarx-1
+extensionsdir = $(libdir)/thunarx-2
extensions_LTLIBRARIES = thunar-shares-plugin.la
thunar_shares_plugin_la_SOURCES = \
@@ -19,8 +19,7 @@ thunar_shares_plugin_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS) \
- $(THUNARX_CFLAGS) \
- $(THUNARVFS_CFLAGS)
+ $(THUNARX_CFLAGS)
thunar_shares_plugin_la_LDFLAGS = \
-avoid-version \
@@ -29,7 +28,6 @@ thunar_shares_plugin_la_LDFLAGS = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(THUNARX_LIBS) \
- $(THUNARVFS_LIBS) \
$(PLATFORM_LDFLAGS)
thunar_shares_plugin_la_LIBADD= \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org