[pcmanfm: 9/11] Add workaround for tab too small with GTK3

[Mamoru Tasaka]

commit 495701ead756ca448fb43eb2bd3ef6266481cb6e
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Mon Apr 1 22:55:55 2013 +0900

    Add workaround for tab too small with GTK3
    
      (bug 922729, pcmanfm-Bugs-3602000)
    - Add workaround for pcmanfm --help showing garbage message
      (pcmanfm-Bugs-3607427)

 pcmanfm-1.1.0-gettext-garbage.patch    |   11 +++++++++++
 pcmanfm-1.1.0-gtk3-tab-too-small.patch |   12 ++++++++++++
 pcmanfm.spec                           |   20 ++++++++++++++++++--
 3 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/pcmanfm-1.1.0-gettext-garbage.patch b/pcmanfm-1.1.0-gettext-garbage.patch
new file mode 100644
index 0000000..8579c42
--- /dev/null
+++ b/pcmanfm-1.1.0-gettext-garbage.patch
@@ -0,0 +1,11 @@
+--- pcmanfm-1.1.0/src/pcmanfm.c.gettext	2012-10-31 03:47:28.000000000 +0900
++++ pcmanfm-1.1.0/src/pcmanfm.c	2013-04-01 22:35:46.000000000 +0900
+@@ -183,7 +183,7 @@
+ #endif
+ 
+     /* initialize GTK+ and parse the command line arguments */
+-    if(G_UNLIKELY(!gtk_init_with_args(&argc, &argv, "", opt_entries, GETTEXT_PACKAGE, &err)))
++    if(G_UNLIKELY(!gtk_init_with_args(&argc, &argv, " ", opt_entries, GETTEXT_PACKAGE, &err)))
+     {
+         g_printf("%s\n", err->message);
+         g_error_free(err);
diff --git a/pcmanfm-1.1.0-gtk3-tab-too-small.patch b/pcmanfm-1.1.0-gtk3-tab-too-small.patch
new file mode 100644
index 0000000..c41b5c2
--- /dev/null
+++ b/pcmanfm-1.1.0-gtk3-tab-too-small.patch
@@ -0,0 +1,12 @@
+--- pcmanfm-1.1.0/src/tab-page.c.dot	2012-10-31 03:47:28.000000000 +0900
++++ pcmanfm-1.1.0/src/tab-page.c	2013-04-01 22:30:56.000000000 +0900
+@@ -493,7 +493,9 @@
+     /* create tab label */
+     tab_label = (FmTabLabel*)fm_tab_label_new("");
+     gtk_label_set_max_width_chars(tab_label->label, app_config->max_tab_chars);
++#if ! GTK_CHECK_VERSION(3, 0, 0)
+     gtk_label_set_ellipsize(tab_label->label, PANGO_ELLIPSIZE_END);
++#endif
+     page->tab_label = tab_label;
+ 
+     g_signal_connect(page->folder_view, "sel-changed",
diff --git a/pcmanfm.spec b/pcmanfm.spec
index b90ccf9..12fd4d5 100644
--- a/pcmanfm.spec
+++ b/pcmanfm.spec
@@ -2,7 +2,7 @@
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
 
 %global         usegit      0
-%global         mainrel     1
+%global         mainrel     2
 
 %global         usegtk3     0
 %if 0%{?fedora} >= 18
@@ -24,7 +24,7 @@
 
 Name:		pcmanfm
 Version:	1.1.0
-Release:	%{fedorarel}%{?dist}.1
+Release:	%{fedorarel}%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
@@ -37,6 +37,11 @@ Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 %endif
 ## Missing in the tarball, taken from git tree
 #Source1:	pcmanfm.conf
+# With gtk3, tab is too small and only dots are shown
+# bug 922729, sourceforge pcmanfm-Bugs-3607427
+Patch0:		pcmanfm-1.1.0-gtk3-tab-too-small.patch
+# With gtk3 (?) pcmanfm --help shows some garbage messages
+Patch1:		pcmanfm-1.1.0-gettext-garbage.patch
 
 BuildRequires:	libfm-gtk-devel >= %{libfm_minver}
 BuildRequires:	menu-cache-devel
@@ -60,6 +65,11 @@ which features tabbed browsing and user-friendly interface.
 %setup -q
 #install -cpm 644 %{SOURCE1} data/
 
+%if 0%{?fedora} >= 18
+%patch0 -p1 -b .dot
+%patch1 -p1 -b .gettext
+%endif
+
 #sh autogen.sh
 
 # permission fix
@@ -114,6 +124,12 @@ exit 0
 %config(noreplace) %{_sysconfdir}/xdg/%{name}/
 
 %changelog
+* Mon Apr  1 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.1.0-2
+- Add workaround for tab too small with GTK3
+  (bug 922729, pcmanfm-Bugs-3602000)
+- Add workaround for pcmanfm --help showing garbage message
+  (pcmanfm-Bugs-3607427)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild