[fvwm] Ver. 2.6.4
Peter Lemenkov
peter at fedoraproject.org
Thu Apr 19 19:57:59 UTC 2012
commit d8dda8397618c1557309b2370779b64746c1f82d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Apr 19 23:57:52 2012 +0400
Ver. 2.6.4
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
fvwm-0001-Change-html-viewer-to-xdg-open.patch | 25 ++++++++++++++++
fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch | 25 ++++++++++++++++
...-generate-menus-in-the-Setup-Form-config-.patch | 23 ++++++++++++--
...ncrease-number-of-mouse-buttons-supported.patch | 25 ++++++++++++++++
fvwm-0005-Explicitly-link-against-fontconfig.patch | 30 --------------------
fvwm-2.5.30-mimeopen.patch | 12 --------
fvwm-2.5.30-more-mouse-buttons.patch | 12 --------
fvwm-2.5.30-xdg-open.patch | 13 --------
fvwm.spec | 26 ++++++++--------
sources | 2 +-
11 files changed, 109 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e0d75ae..96cc535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
fvwm-2.5.30.tar.bz2
+/fvwm-2.6.4.tar.bz2
diff --git a/fvwm-0001-Change-html-viewer-to-xdg-open.patch b/fvwm-0001-Change-html-viewer-to-xdg-open.patch
new file mode 100644
index 0000000..9ac2763
--- /dev/null
+++ b/fvwm-0001-Change-html-viewer-to-xdg-open.patch
@@ -0,0 +1,25 @@
+From 715e45807a304395150fc318a2a23851b552a4a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Thu, 19 Apr 2012 23:29:16 +0400
+Subject: [PATCH 1/4] Change html viewer to xdg-open
+
+---
+ bin/fvwm-menu-headlines.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/fvwm-menu-headlines.in b/bin/fvwm-menu-headlines.in
+index 2a27953..4209b38 100644
+--- a/bin/fvwm-menu-headlines.in
++++ b/bin/fvwm-menu-headlines.in
+@@ -208,7 +208,7 @@ my $site = undef;
+ my $name = undef;
+ my $title = undef;
+ my $itemf = '%h\t%[(%Y-%m-%d %H:%M)]';
+-my $execf = q(firefox '%u');
++my $execf = q(xdg-open '%u');
+ my $commf = undef;
+ my $icont = '';
+ my $iconi = '';
+--
+1.7.9.3
+
diff --git a/fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch b/fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch
new file mode 100644
index 0000000..90d0034
--- /dev/null
+++ b/fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch
@@ -0,0 +1,25 @@
+From 587648187dbfc9d79dcfb0923836ad48febea5e8 Mon Sep 17 00:00:00 2001
+From: Adam Goode <agoode at fedoraproject.org>
+Date: Thu, 19 Apr 2012 23:31:41 +0400
+Subject: [PATCH 2/4] Use mimeopen instead of EDITOR
+
+---
+ bin/fvwm-menu-directory.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/fvwm-menu-directory.in b/bin/fvwm-menu-directory.in
+index 8e1ff42..038f6b6 100644
+--- a/bin/fvwm-menu-directory.in
++++ b/bin/fvwm-menu-directory.in
+@@ -40,7 +40,7 @@ my $home = $ENV{'HOME'} || '/tmp';
+ my $dir = $home;
+ my $xterm = "xterm -e"; # the X terminal program to invoke
+ my $exect = $ENV{'SHELL'} || '/bin/sh';
+-my $execf = $ENV{'EDITOR'} || "vi"; # the command to execute on plain files
++my $execf = "mimeopen -n"; # the command to execute on plain files
+ my $execa = undef;
+ my $commt = undef;
+ my $commf = undef;
+--
+1.7.9.3
+
diff --git a/fvwm-2.5.21-menu-generate.patch b/fvwm-0003-Enable-auto-generate-menus-in-the-Setup-Form-config-.patch
similarity index 69%
rename from fvwm-2.5.21-menu-generate.patch
rename to fvwm-0003-Enable-auto-generate-menus-in-the-Setup-Form-config-.patch
index 7e5da2d..e9a0231 100644
--- a/fvwm-2.5.21-menu-generate.patch
+++ b/fvwm-0003-Enable-auto-generate-menus-in-the-Setup-Form-config-.patch
@@ -1,6 +1,18 @@
---- fvwm-2.5.21/fvwm/ConfigFvwmSetup.xdg 2007-01-23 11:13:32.000000000 +0100
-+++ fvwm-2.5.21/fvwm/ConfigFvwmSetup 2007-01-25 12:14:26.000000000 +0100
-@@ -90,7 +90,6 @@
+From da5d7752f267f444451c295d87af6e5803ecfb6c Mon Sep 17 00:00:00 2001
+From: Adam Goode <agoode at fedoraproject.org>
+Date: Thu, 19 Apr 2012 23:34:36 +0400
+Subject: [PATCH 3/4] Enable auto-generate menus in the Setup Form config
+ generator
+
+---
+ fvwm/ConfigFvwmSetup | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/fvwm/ConfigFvwmSetup b/fvwm/ConfigFvwmSetup
+index 30d6326..e8226f7 100644
+--- a/fvwm/ConfigFvwmSetup
++++ b/fvwm/ConfigFvwmSetup
+@@ -90,7 +90,6 @@ AddToFunc SessionInitFunction
DestroyMenu MenuFvwmRoot
AddToMenu MenuFvwmRoot "$[gt.Root Menu]" Title
+ "&1. XTerm" Exec exec xterm
@@ -8,7 +20,7 @@
+ "" Nop
+ "&R. $[gt.Remote Logins]" Popup MenuFvwmLogins
+ "" Nop
-@@ -106,19 +105,7 @@
+@@ -106,19 +105,7 @@ AddToMenu MenuFvwmRoot "$[gt.Root Menu]" Title
+ "&X. $[gt.Exit Fvwm]" Popup MenuFvwmQuitVerify
DestroyMenu MenuFvwmUtilities
@@ -29,3 +41,6 @@
DestroyMenu MenuFvwmConfig
AddToMenu MenuFvwmConfig "$[gt.Fvwm Config Ops]" Title
+--
+1.7.9.3
+
diff --git a/fvwm-0004-Increase-number-of-mouse-buttons-supported.patch b/fvwm-0004-Increase-number-of-mouse-buttons-supported.patch
new file mode 100644
index 0000000..4b8cd73
--- /dev/null
+++ b/fvwm-0004-Increase-number-of-mouse-buttons-supported.patch
@@ -0,0 +1,25 @@
+From abf2fa22ddf8100545ab8d49711285feb620b485 Mon Sep 17 00:00:00 2001
+From: Bill Pemberton <wfp5p at virginia.edu>
+Date: Thu, 19 Apr 2012 23:37:44 +0400
+Subject: [PATCH 4/4] Increase number of mouse buttons supported
+
+---
+ libs/defaults.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/defaults.h b/libs/defaults.h
+index ad39f8b..ad15994 100644
+--- a/libs/defaults.h
++++ b/libs/defaults.h
+@@ -25,7 +25,7 @@
+ /* The "extended" buttons do not provide the full functionality because X has
+ * no bit mask value for them. Things like dragging windows don't work with
+ * them. */
+-#define NUMBER_OF_EXTENDED_MOUSE_BUTTONS 9
++#define NUMBER_OF_EXTENDED_MOUSE_BUTTONS 15
+ #if NUMBER_OF_EXTENDED_MOUSE_BUTTONS > 31
+ #error No more than 31 mouse buttons can be supported on 32 bit platforms
+ #endif
+--
+1.7.9.3
+
diff --git a/fvwm.spec b/fvwm.spec
index cf5f17b..d6a098f 100644
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -1,6 +1,6 @@
Name: fvwm
-Version: 2.5.30
-Release: 6%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
Summary: Highly configurable multiple virtual desktop window manager
Group: User Interface/X
@@ -10,12 +10,10 @@ Source0: ftp://ftp.fvwm.org/pub/fvwm/version-2/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: http://www.cl.cam.ac.uk/~pz215/fvwm-scripts/scripts/fvwm-xdg-menu.py
-
-Patch0: fvwm-2.5.30-xdg-open.patch
-Patch1: fvwm-2.5.30-mimeopen.patch
-Patch2: fvwm-2.5.21-menu-generate.patch
-Patch3: fvwm-2.5.30-more-mouse-buttons.patch
-Patch5: fvwm-0005-Explicitly-link-against-fontconfig.patch
+Patch1: fvwm-0001-Change-html-viewer-to-xdg-open.patch
+Patch2: fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch
+Patch3: fvwm-0003-Enable-auto-generate-menus-in-the-Setup-Form-config-.patch
+Patch4: fvwm-0004-Increase-number-of-mouse-buttons-supported.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -46,11 +44,10 @@ and implement a virtual desktop.
%prep
%setup -q
-%patch0 -p1 -b .xdg-open
-%patch1 -p1 -b .mimeopen
-%patch2 -p1 -b .menu-generate
-%patch3 -p1 -b .more-mouse-buttons
-%patch5 -p1 -b .implicit_dso_linking
+%patch1 -p1 -b .xdg-open
+%patch2 -p1 -b .mimeopen
+%patch3 -p1 -b .menu-generate
+%patch4 -p1 -b .more-mouse-buttons
# Filter out false Perl provides
cat << \EOF > %{name}-prov
@@ -112,6 +109,9 @@ install -D -m0755 -p %{SOURCE2} \
%changelog
+* Thu Apr 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 2.6.4-1
+- Ver. 2.6.4
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.30-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index fc4e505..096ba7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d1f787e5ad5a8f886a8e711ec2e5690 fvwm-2.5.30.tar.bz2
+ba6dc158ccad8108d6e4016a4a6a5693 fvwm-2.6.4.tar.bz2
More information about the scm-commits
mailing list